fixing legacy code

Author: igorcosta

src/browser/chrome.ts

@@ -389,6 +389,18 @@ export function buildNativeHostManifest(options: {
   };
 }
 
+function extensionIdFromAllowedOrigin(origin: string): string | null {
+  const match = /^chrome-extension:\/\/([^/]+)\/$/.exec(origin);
+  return match?.[1] ?? null;
+}
+
+function mergeExtensionIds(extensionIds: string[], allowedOrigins: string[] | undefined): string[] {
+  const existingIds = (allowedOrigins ?? [])
+    .map(extensionIdFromAllowedOrigin)
+    .filter((id): id is string => Boolean(id));
+  return Array.from(new Set([...existingIds, ...extensionIds].filter(Boolean)));
+}
+
 function resolveNodePath(): string {
   // Don't use bun or the compiled autohand binary as the shebang —
   // Chrome native messaging host scripts must use Node.js because they
@@ -623,13 +635,15 @@ export async function ensureNativeHostInstalled(options?: {
   const expectedExtensionIds = [options?.extensionId].filter((id): id is string => Boolean(id));
   const expectedAllowedOrigins = expectedExtensionIds.map((extensionId) => `chrome-extension://${extensionId}/`);
   const hostScriptPath = path.join(getBrowserDataRoot(homeDir), 'host.js');
+  let installExtensionIds = expectedExtensionIds;
 
   // If the Chrome manifest already exists and its host script is reachable
   // with a valid shebang and it is paired with the current extension id,
   // don't overwrite.
   if (await pathExists(chromeManifest.manifestPath)) {
     try {
       const manifest = await readJson(chromeManifest.manifestPath) as { path?: string; allowed_origins?: string[] };
+      installExtensionIds = mergeExtensionIds(expectedExtensionIds, manifest.allowed_origins);
       if (manifest.path && await pathExists(manifest.path)) {
         // Check shebang is a valid Node.js interpreter (not bun, not the autohand binary itself)
         const firstLine = (await readFile(manifest.path, 'utf8')).split('\n')[0] ?? '';
@@ -656,7 +670,7 @@ export async function ensureNativeHostInstalled(options?: {
   const { command, args } = resolveCliLaunchSpec();
 
   await installNativeHost({
-    extensionIds: expectedExtensionIds,
+    extensionIds: installExtensionIds,
     cliCommand: command,
     cliArgPrefix: args.length ? args : undefined,
   });

src/core/agent/AgentUIRuntime.ts

@@ -51,6 +51,8 @@ export function initializeAgentUIManager(host: AgentUIRuntimeHost): void {
           // Ctrl+C handling - could trigger graceful shutdown
         },
         enableQueueInput: true,
+        onImageDetected: (data: Buffer, mimeType: string, filename?: string) =>
+          host.imageManager.add(data, mimeType, filename),
         filesProvider: () => host.workspaceFileCollector.getCachedFiles(),
         slashCommands: SLASH_COMMANDS,
         skillsProvider: () =>

src/index.ts

@@ -1147,7 +1147,7 @@ async function runCLI(options: CLIOptions): Promise<void> {
 
     // Handle --chrome flag: trigger Chrome handoff before entering interactive mode
     if (options.chrome) {
-      // Ensure native host is installed and paired to the current extension id.
+      // Ensure native host is installed and paired to the configured extension id.
       const { ensureNativeHostInstalled, createBrowserHandoff, buildChromeOpenUrl, openChromeContinuation } = await import('./browser/chrome.js');
       const extensionId = config.chrome?.extensionId;
       await ensureNativeHostInstalled({ extensionId }).catch(() => {});

tests/browser/chrome.spec.ts

@@ -449,8 +449,8 @@ describe('browser/chrome', () => {
 
   // Regression: ensureNativeHostInstalled must repair stale manifests even
   // when the referenced host file is reachable. A valid shebang is not enough:
-  // Chrome will reject the host if allowed_origins is still paired to an old
-  // extension id such as ext123.
+  // Chrome will reject the host if allowed_origins is paired to another
+  // extension id.
   it('repairs manifest when the allowed origin does not match the extension id', async () => {
     const { getManifestTarget } = await import('../../src/browser/chrome.js');
     const target = getManifestTarget('chrome');
@@ -475,17 +475,20 @@ describe('browser/chrome', () => {
         description: 'test',
         path: hostPath,
         type: 'stdio',
-        allowed_origins: ['chrome-extension://ext123/'],
+        allowed_origins: ['chrome-extension://oldextensionid/'],
       });
 
       // Re-import to get fresh module
       const { ensureNativeHostInstalled } = await import('../../src/browser/chrome.js');
 
-      await ensureNativeHostInstalled({ extensionId: 'testid' });
+      await ensureNativeHostInstalled({ extensionId: 'newextensionid' });
 
       const manifest = await readJson(target.manifestPath);
       expect(manifest.path).not.toBe(hostPath);
-      expect(manifest.allowed_origins).toEqual(['chrome-extension://testid/']);
+      expect(manifest.allowed_origins).toEqual([
+        'chrome-extension://oldextensionid/',
+        'chrome-extension://newextensionid/',
+      ]);
       expect(await pathExists(manifest.path)).toBe(true);
     } finally {
       // Restore original manifest

tests/core/agent.startup-ui.spec.ts

@@ -1689,6 +1689,44 @@ describe('agent startup and active input UI', () => {
     }
   });
 
+  it('wires the image manager into Ink composer image detection', () => {
+    const agent = Object.create(AutohandAgent.prototype) as any;
+    let restoreStdoutTTY: () => void = () => {};
+    let restoreStdinTTY: () => void = () => {};
+    const imageData = Buffer.from('fake-png-data');
+
+    agent.useInkRenderer = true;
+    agent.ui = null;
+    agent.workspaceFileCollector = {
+      getCachedFiles: vi.fn(() => []),
+    };
+    agent.skillsRegistry = {
+      listSkills: vi.fn(() => []),
+    };
+    agent.imageManager = {
+      add: vi.fn(() => 42),
+    };
+
+    try {
+      restoreStdoutTTY = overrideStreamTTY(process.stdout, true);
+      restoreStdinTTY = overrideStreamTTY(process.stdin, true);
+
+      (agent as any).initializeUIManager();
+
+      const options = (agent.ui as any).options;
+      expect(options.onImageDetected).toBeTypeOf('function');
+      expect(options.onImageDetected(imageData, 'image/png', 'Screenshot.png')).toBe(42);
+      expect(agent.imageManager.add).toHaveBeenCalledWith(
+        imageData,
+        'image/png',
+        'Screenshot.png'
+      );
+    } finally {
+      restoreStdoutTTY();
+      restoreStdinTTY();
+    }
+  });
+
   it('handleInkSubmittedInstruction executes shell commands immediately instead of queueing them', async () => {
     const agent = Object.create(AutohandAgent.prototype) as any;
     agent.inkRenderer = {