opendevbrowser 0.0.16 → 0.0.17

package/dist/cli/index.js

@@ -6,7 +6,6 @@ import {
   EXIT_USAGE,
   buildAnnotateResult,
   callDaemon,
-  cleanupExpiredArtifacts,
   createOpenDevBrowserCore,
   createUsageError,
   extractExtension,
@@ -20,10 +19,17 @@ import {
   readDaemonMetadata,
   resolveExitCode,
   startDaemon,
-  toCliError,
+  toCliError
+} from "../chunk-5J3IFL3X.js";
+import "../chunk-Y2KL55OG.js";
+import {
   writeFileAtomic
-} from "../chunk-ST7CO5FA.js";
-import "../chunk-7W3SPXIB.js";
+} from "../chunk-TBUCZX4A.js";
+import "../chunk-V7KUDHDG.js";
+import {
+  cleanupExpiredArtifacts
+} from "../chunk-D633UO34.js";
+import "../chunk-FUSXMW3G.js";
 
 // src/cli/args.ts
 var CLI_COMMANDS = [
@@ -81,6 +87,7 @@ var CLI_COMMANDS = [
   "cookie-list",
   "macro-resolve",
   "annotate",
+  "canvas",
   "rpc"
 ];
 var CLI_COMMAND_SET = new Set(CLI_COMMANDS);
@@ -207,6 +214,7 @@ var VALID_FLAGS = [
   "--expression",
   "--default-provider",
   "--include-catalog",
+  "--command",
   "--execute",
   "--params",
   "--params-file",
@@ -224,6 +232,7 @@ var VALID_FLAGS = [
   "--screenshot-mode",
   "--debug",
   "--context",
+  "--stored",
   "--topic",
   "--days",
   "--from",
@@ -269,6 +278,7 @@ var VALID_EQUALS_FLAGS = [
   "--persist-profile",
   "--expression",
   "--default-provider",
+  "--command",
   "--request-id",
   "--strict",
   "--params",
@@ -441,7 +451,7 @@ function listCommands() {
 
 // src/cli/help.ts
 var LABEL_WIDTH = 42;
-var EXPECTED_TOOL_COUNT = 48;
+var EXPECTED_TOOL_COUNT = 49;
 var COMMAND_SET = new Set(CLI_COMMANDS);
 var FLAG_SET = new Set(VALID_FLAGS);
 var HELP_COMMAND_GROUPS = [
@@ -465,6 +475,11 @@ var HELP_COMMAND_GROUPS = [
     summary: "Run research/shopping/media workflows and macro plans.",
     commands: ["research", "shopping", "product-video", "artifacts", "macro-resolve"]
   },
+  {
+    title: "Design Canvas",
+    summary: "Execute design-canvas session, document, overlay, and preview commands.",
+    commands: ["canvas"]
+  },
   {
     title: "Navigation",
     summary: "Move through pages and capture fresh refs.",
@@ -522,7 +537,7 @@ var HELP_FLAG_GROUPS = [
       { flag: "--help", alias: "-h", description: "Show CLI help output." },
       { flag: "--version", alias: "-v", description: "Show CLI version." },
       { flag: "--output-format", description: "Output mode: text, json, stream-json." },
-      { flag: "--transport", description: "Annotation transport: relay (default) or native." }
+      { flag: "--transport", description: "Transport selector for transport-aware commands. `status` uses relay/native; `annotate` uses auto/direct/relay." }
     ]
   },
   {
@@ -543,7 +558,7 @@ var HELP_FLAG_GROUPS = [
       { flag: "--profile", description: "Use a named browser profile directory." },
       { flag: "--persist-profile", description: "Keep generated profile directory after exit." },
       { flag: "--chrome-path", description: "Use a specific Chrome/Chromium binary." },
-      { flag: "--start-url", description: "Open this URL immediately after launch." },
+      { flag: "--start-url", description: "Open this URL immediately after launch or connect." },
       { flag: "--flag", description: "Pass one or more extra Chrome CLI flags." },
       { flag: "--no-extension", description: "Force managed mode without extension relay." },
       { flag: "--extension-only", description: "Fail unless extension relay is connected." },
@@ -558,7 +573,7 @@ var HELP_FLAG_GROUPS = [
     flags: [
       { flag: "--url", description: "Target URL for navigation, connect, or workflow commands." },
       { flag: "--wait-until", description: "Navigation wait strategy (load, domcontentloaded, etc.)." },
-      { flag: "--timeout-ms", description: "Operation timeout in milliseconds (for example goto, wait, screenshot, annotate, rpc, and macro-resolve)." },
+      { flag: "--timeout-ms", description: "Operation timeout in milliseconds (for example goto, wait, screenshot, annotate, canvas, rpc, and macro-resolve)." },
       { flag: "--ref", description: "Snapshot ref id for element-targeted commands." },
       { flag: "--state", description: "Wait state selector for wait-style commands." },
       { flag: "--until", description: "Wait condition selector for wait-style commands." },
@@ -586,9 +601,10 @@ var HELP_FLAG_GROUPS = [
       { flag: "--cookies", description: "Inline cookie payload for cookie-import command." },
       { flag: "--cookies-file", description: "File path containing cookies for cookie-import." },
       { flag: "--strict", description: "Fail cookie import on invalid entries." },
-      { flag: "--screenshot-mode", description: "Annotation screenshot mode: crop, full, or none." },
+      { flag: "--screenshot-mode", description: "Annotation screenshot mode: visible, full, or none." },
       { flag: "--debug", description: "Enable debug-level annotation capture extras." },
-      { flag: "--context", description: "Free-form annotation context for reviewers/agents." }
+      { flag: "--context", description: "Free-form annotation context for reviewers/agents." },
+      { flag: "--stored", description: "Return the last stored annotation payload instead of starting a new capture." }
     ]
   },
   {
@@ -599,8 +615,9 @@ var HELP_FLAG_GROUPS = [
       { flag: "--default-provider", description: "Provider fallback for shorthand macro expressions." },
       { flag: "--include-catalog", description: "Include macro catalog metadata in response." },
       { flag: "--execute", description: "Execute resolved macro action after planning (pair with --timeout-ms on slow runs)." },
-      { flag: "--params", description: "Inline JSON params for rpc command." },
-      { flag: "--params-file", description: "Path to JSON params file for rpc command." },
+      { flag: "--command", description: "Canvas command name for the canvas CLI command." },
+      { flag: "--params", description: "Inline JSON params for canvas or rpc commands." },
+      { flag: "--params-file", description: "Path to JSON params file for canvas or rpc commands." },
       { flag: "--unsafe-internal", description: "Required safety gate for rpc command." },
       { flag: "--topic", description: "Research topic input." },
       { flag: "--days", description: "Lookback window in days for research commands." },
@@ -618,7 +635,7 @@ var HELP_FLAG_GROUPS = [
       { flag: "--product-url", description: "Target product URL for product-video/artifacts workflows." },
       { flag: "--product-name", description: "Product name override for media workflows." },
       { flag: "--provider-hint", description: "Provider hint override for product workflows." },
-      { flag: "--include-screenshots", description: "Include screenshots in product presentation output." },
+      { flag: "--include-screenshots", description: "Include screenshots in product presentation output, or prefer screenshots when fetching stored annotations." },
       { flag: "--include-all-images", description: "Include all discovered product images." },
       { flag: "--include-copy", description: "Include product marketing copy metadata." },
       { flag: "--output-dir", description: "Directory where generated artifacts are written." },
@@ -669,6 +686,7 @@ var HELP_TOOL_ENTRIES = [
   { name: "opendevbrowser_research_run", description: "Run research workflow directly." },
   { name: "opendevbrowser_shopping_run", description: "Run shopping workflow directly." },
   { name: "opendevbrowser_product_video_run", description: "Run product-video asset workflow directly." },
+  { name: "opendevbrowser_canvas", description: "Execute a design-canvas command surface call." },
   { name: "opendevbrowser_clone_page", description: "Export active page into React code." },
   { name: "opendevbrowser_clone_component", description: "Export component by ref into React code." },
   { name: "opendevbrowser_perf", description: "Collect browser performance metrics." },
@@ -681,7 +699,8 @@ var HELP_REFERENCE_ENTRIES = [
   { label: "docs/CLI.md", description: "Full command docs, flag matrix, and examples." },
   { label: "docs/SURFACE_REFERENCE.md", description: "Canonical CLI/tool/channel inventory matrix." },
   { label: "src/tools/index.ts", description: "Code-level tool registry (source of truth)." },
-  { label: "opendevbrowser --help", description: "Always safe first command for quick discovery." }
+  { label: "opendevbrowser --help", description: "Primary full help invocation for quick discovery." },
+  { label: "opendevbrowser help", description: "Alias that prints the same full help inventory." }
 ];
 function formatRows(rows) {
   return rows.map((row) => `  ${row.label.padEnd(LABEL_WIDTH)} ${row.description}`).join("\n");
@@ -1379,6 +1398,26 @@ function parseNumberFlag(value, flag, options = {}) {
   }
   return parsed;
 }
+function parseOptionalStringFlag(rawArgs, flag) {
+  for (let i = 0; i < rawArgs.length; i += 1) {
+    const arg = rawArgs[i];
+    if (arg === flag) {
+      const value = rawArgs[i + 1];
+      if (!value) {
+        throw createUsageError(`Missing value for ${flag}`);
+      }
+      return value;
+    }
+    if (arg?.startsWith(`${flag}=`)) {
+      const value = arg.split("=", 2)[1];
+      if (!value) {
+        throw createUsageError(`Missing value for ${flag}`);
+      }
+      return value;
+    }
+  }
+  return void 0;
+}
 
 // src/cli/commands/native.ts
 import * as fs9 from "fs";
@@ -1620,39 +1659,6 @@ var getExtensionPathCandidates = () => {
   }
   return [...candidates];
 };
-var getNativeStatusSnapshot = () => {
-  const hostScript = getHostScriptPath();
-  const manifestPath = getManifestPath();
-  const wrapperPath = getWrapperPath();
-  const registryPath = readRegistryPath();
-  let installed = false;
-  let manifestExists = false;
-  let wrapperExists = false;
-  let extensionIdValue = null;
-  if (fs9.existsSync(manifestPath)) {
-    manifestExists = true;
-    installed = true;
-    const manifest = readManifest(manifestPath);
-    extensionIdValue = manifest.extensionId;
-  }
-  if (fs9.existsSync(wrapperPath)) {
-    wrapperExists = true;
-  }
-  if (!manifestExists || !wrapperExists) {
-    installed = false;
-  }
-  if (process.platform === "win32" && !registryPath) {
-    installed = false;
-  }
-  return {
-    installed,
-    manifestPath: manifestExists ? manifestPath : null,
-    wrapperPath: wrapperExists ? wrapperPath : null,
-    hostScriptPath: hostScript,
-    extensionId: extensionIdValue,
-    registryPath
-  };
-};
 function discoverExtensionId() {
   const extensionPaths = getExtensionPathCandidates();
   const roots = getChromeUserDataRoots();
@@ -1687,6 +1693,81 @@ function discoverExtensionId() {
   }
   return { extensionId: null };
 }
+var resolveExpectedExtension = () => {
+  let configuredExtensionId = null;
+  try {
+    configuredExtensionId = normalizeExtensionId(loadGlobalConfig().nativeExtensionId);
+  } catch {
+    configuredExtensionId = null;
+  }
+  const discovered = discoverExtensionId();
+  const discoveredExtensionId = discovered.extensionId ?? null;
+  const discoveredMatchedBy = discovered.matchedBy ?? null;
+  if (discoveredExtensionId) {
+    return {
+      discoveredExtensionId,
+      discoveredMatchedBy,
+      expectedExtensionId: discoveredExtensionId,
+      expectedExtensionSource: discoveredMatchedBy
+    };
+  }
+  if (configuredExtensionId) {
+    return {
+      discoveredExtensionId,
+      discoveredMatchedBy,
+      expectedExtensionId: configuredExtensionId,
+      expectedExtensionSource: "config"
+    };
+  }
+  return {
+    discoveredExtensionId,
+    discoveredMatchedBy,
+    expectedExtensionId: null,
+    expectedExtensionSource: null
+  };
+};
+var getNativeStatusSnapshot = () => {
+  const expectation = resolveExpectedExtension();
+  const hostScript = getHostScriptPath();
+  const manifestPath = getManifestPath();
+  const wrapperPath = getWrapperPath();
+  const registryPath = readRegistryPath();
+  let installed = false;
+  let manifestExists = false;
+  let wrapperExists = false;
+  let extensionIdValue = null;
+  if (fs9.existsSync(manifestPath)) {
+    manifestExists = true;
+    installed = true;
+    const manifest = readManifest(manifestPath);
+    extensionIdValue = manifest.extensionId;
+  }
+  if (fs9.existsSync(wrapperPath)) {
+    wrapperExists = true;
+  }
+  if (!manifestExists || !wrapperExists) {
+    installed = false;
+  }
+  if (process.platform === "win32" && !registryPath) {
+    installed = false;
+  }
+  const mismatch = Boolean(
+    installed && extensionIdValue && expectation.expectedExtensionId && extensionIdValue !== expectation.expectedExtensionId
+  );
+  return {
+    installed,
+    manifestPath: manifestExists ? manifestPath : null,
+    wrapperPath: wrapperExists ? wrapperPath : null,
+    hostScriptPath: hostScript,
+    extensionId: extensionIdValue,
+    registryPath,
+    discoveredExtensionId: expectation.discoveredExtensionId,
+    discoveredMatchedBy: expectation.discoveredMatchedBy,
+    expectedExtensionId: expectation.expectedExtensionId,
+    expectedExtensionSource: expectation.expectedExtensionSource,
+    mismatch
+  };
+};
 function installNativeHost(extensionId) {
   const normalized = normalizeExtensionId(extensionId);
   if (!normalized) {
@@ -1748,6 +1829,14 @@ async function runNativeCommand(args) {
       exitCode: EXIT_DISCONNECTED
     };
   }
+  if (data.mismatch && data.extensionId && data.expectedExtensionId) {
+    return {
+      success: false,
+      message: `Native host targets ${data.extensionId}, but the current extension is ${data.expectedExtensionId}. Reinstall with \`opendevbrowser native install ${data.expectedExtensionId}\` or rerun \`opendevbrowser serve\`.`,
+      data,
+      exitCode: EXIT_DISCONNECTED
+    };
+  }
   const message = data.extensionId ? `Native host installed for extension ${data.extensionId}.` : "Native host installed (extension id missing).";
   return { success: true, message, data };
 }
@@ -1917,19 +2006,22 @@ async function runServe(args) {
   }
   let nativeStatus = getNativeStatusSnapshot();
   let nativeMessage = null;
-  if (!nativeStatus.installed) {
+  if (!nativeStatus.installed || nativeStatus.mismatch) {
     const discovered = discoverExtensionId();
-    const extensionId = config.nativeExtensionId ?? discovered.extensionId ?? null;
-    const usedDiscovery = !config.nativeExtensionId && Boolean(discovered.extensionId);
+    const extensionId = nativeStatus.expectedExtensionId ?? config.nativeExtensionId ?? discovered.extensionId ?? null;
+    const usedDiscovery = nativeStatus.expectedExtensionSource !== "config" && Boolean(extensionId);
+    const previousExtensionId = nativeStatus.extensionId;
     if (extensionId) {
       const installResult = installNativeHost(extensionId);
       if (installResult.success) {
         const suffix = usedDiscovery && discovered.matchedBy ? ` (auto-detected by ${discovered.matchedBy})` : "";
-        nativeMessage = `${installResult.message ?? "Native host installed."}${suffix}`;
+        nativeMessage = nativeStatus.mismatch && previousExtensionId ? `Native host reinstalled for extension ${extensionId} (replacing stale ${previousExtensionId}).${suffix}` : `${installResult.message ?? "Native host installed."}${suffix}`;
         nativeStatus = getNativeStatusSnapshot();
       } else {
-        nativeMessage = `Native host install skipped: ${installResult.message ?? "unknown error"}`;
+        nativeMessage = nativeStatus.mismatch ? `Native host reinstall skipped: ${installResult.message ?? "unknown error"}` : `Native host install skipped: ${installResult.message ?? "unknown error"}`;
       }
+    } else if (nativeStatus.mismatch && previousExtensionId) {
+      nativeMessage = `Native host targets stale extension ${previousExtensionId}, but no current extension id could be resolved for reinstall.`;
     } else {
       nativeMessage = "Native host not installed. Set nativeExtensionId in opendevbrowser.jsonc to auto-install.";
     }
@@ -2778,6 +2870,19 @@ function parseConnectArgs(rawArgs) {
       parsed.port = parseNumberFlag(value, "--cdp-port", { min: 1, max: 65535 });
       continue;
     }
+    if (arg === "--start-url") {
+      const value = rawArgs[i + 1];
+      if (!value) throw createUsageError("Missing value for --start-url");
+      parsed.startUrl = value;
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--start-url=")) {
+      const value = arg.split("=", 2)[1];
+      if (!value) throw createUsageError("Missing value for --start-url");
+      parsed.startUrl = value;
+      continue;
+    }
     if (arg === "--extension-legacy") {
       parsed.extensionLegacy = true;
       continue;
@@ -2900,6 +3005,14 @@ async function runStatus(args) {
         exitCode: EXIT_DISCONNECTED
       };
     }
+    if (nativeStatus2.mismatch && nativeStatus2.extensionId && nativeStatus2.expectedExtensionId) {
+      return {
+        success: false,
+        message: `Native host targets ${nativeStatus2.extensionId}, but the current extension is ${nativeStatus2.expectedExtensionId}.`,
+        data: nativeStatus2,
+        exitCode: EXIT_DISCONNECTED
+      };
+    }
     return {
       success: true,
       message: nativeStatus2.extensionId ? `Native host installed for extension ${nativeStatus2.extensionId}.` : "Native host installed.",
@@ -2911,12 +3024,13 @@ async function runStatus(args) {
     throw createUsageError("Daemon not running. Start with `opendevbrowser serve`.");
   }
   const nativeStatus = getNativeStatusSnapshot();
+  const nativeSummary = !nativeStatus.installed ? "not installed" : nativeStatus.mismatch && nativeStatus.extensionId && nativeStatus.expectedExtensionId ? `mismatch (${nativeStatus.extensionId} != ${nativeStatus.expectedExtensionId})` : `installed${nativeStatus.extensionId ? ` (${nativeStatus.extensionId})` : ""}`;
   const baseMessage = [
     `Daemon OK (pid=${daemonStatus.pid})`,
-    `Relay: port=${daemonStatus.relay.port ?? "n/a"} ext=${daemonStatus.relay.extensionConnected ? "on" : "off"} handshake=${daemonStatus.relay.extensionHandshakeComplete ? "on" : "off"} cdp=${daemonStatus.relay.cdpConnected ? "on" : "off"} annotate=${daemonStatus.relay.annotationConnected ? "on" : "off"} ops=${daemonStatus.relay.opsConnected ? "on" : "off"} pairing=${daemonStatus.relay.pairingRequired ? "on" : "off"} health=${daemonStatus.relay.health?.reason ?? "n/a"}`,
-    `Native: ${nativeStatus.installed ? "installed" : "not installed"}${nativeStatus.extensionId ? ` (${nativeStatus.extensionId})` : ""}`,
+    `Relay: port=${daemonStatus.relay.port ?? "n/a"} ext=${daemonStatus.relay.extensionConnected ? "on" : "off"} handshake=${daemonStatus.relay.extensionHandshakeComplete ? "on" : "off"} cdp=${daemonStatus.relay.cdpConnected ? "on" : "off"} annotate=${daemonStatus.relay.annotationConnected ? "on" : "off"} ops=${daemonStatus.relay.opsConnected ? "on" : "off"} canvas=${daemonStatus.relay.canvasConnected ? "on" : "off"} pairing=${daemonStatus.relay.pairingRequired ? "on" : "off"} health=${daemonStatus.relay.health?.reason ?? "n/a"}`,
+    `Native: ${nativeSummary}`,
     daemonStatus.relay.lastHandshakeError ? `Relay last handshake error: ${daemonStatus.relay.lastHandshakeError.code} (${daemonStatus.relay.lastHandshakeError.message})` : "Relay last handshake error: none",
-    "Legend: ext=extension websocket, handshake=extension handshake, cdp=active /cdp client, annotate=annotation channel, ops=ops clients, pairing=token required, health=relay status"
+    "Legend: ext=extension websocket, handshake=extension handshake, cdp=active /cdp client, annotate=annotation channel, ops=ops clients, canvas=canvas clients, pairing=token required, health=relay status"
   ].join("\n");
   const message = daemon || args.outputFormat !== "text" ? baseMessage : [
     "Warning: `status` defaults to daemon status. Use --daemon explicitly or --session-id for session status.",
@@ -2985,9 +3099,16 @@ function parseGotoArgs(rawArgs) {
 }
 async function runGoto(args) {
   const { sessionId, url, waitUntil, timeoutMs } = parseGotoArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!url) throw createUsageError("Missing --url");
-  const result = await callDaemon("nav.goto", { sessionId, url, waitUntil, timeoutMs });
+  const result = await callDaemon("nav.goto", {
+    sessionId,
+    url,
+    waitUntil,
+    timeoutMs,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: `Navigated: ${url}`, data: result };
 }
 
@@ -3058,8 +3179,16 @@ function parseWaitArgs(rawArgs) {
 }
 async function runWait(args) {
   const { sessionId, ref, state, until, timeoutMs } = parseWaitArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
-  const result = await callDaemon("nav.wait", { sessionId, ref, state, until, timeoutMs });
+  const result = await callDaemon("nav.wait", {
+    sessionId,
+    ref,
+    state,
+    until,
+    timeoutMs,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Wait complete.", data: result };
 }
 
@@ -3117,8 +3246,15 @@ function parseSnapshotArgs(rawArgs) {
 }
 async function runSnapshot(args) {
   const { sessionId, mode, maxChars, cursor } = parseSnapshotArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
-  const result = await callDaemon("nav.snapshot", { sessionId, mode, maxChars, cursor });
+  const result = await callDaemon("nav.snapshot", {
+    sessionId,
+    mode,
+    maxChars,
+    cursor,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Snapshot captured.", data: result };
 }
 
@@ -3154,6 +3290,14 @@ var parseAnnotateArgs = (rawArgs) => {
       parsed.sessionId = value;
       continue;
     }
+    if (arg === "--stored") {
+      parsed.stored = true;
+      continue;
+    }
+    if (arg === "--include-screenshots") {
+      parsed.includeScreenshots = true;
+      continue;
+    }
     if (arg === "--url") {
       const value = requireValue2(rawArgs[i + 1], "--url");
       parsed.url = value;
@@ -3239,13 +3383,27 @@ var parseAnnotateArgs = (rawArgs) => {
   return parsed;
 };
 async function runAnnotate(args) {
-  const { sessionId, url, screenshotMode, debug, context, timeoutMs, transport, targetId, tabId } = parseAnnotateArgs(args.rawArgs);
+  const {
+    sessionId,
+    stored,
+    includeScreenshots,
+    url,
+    screenshotMode,
+    debug,
+    context,
+    timeoutMs,
+    transport,
+    targetId,
+    tabId
+  } = parseAnnotateArgs(args.rawArgs);
   if (!sessionId) throw createUsageError("Missing --session-id");
   const client = new DaemonClient({ autoRenew: true });
   const callTimeoutMs = typeof timeoutMs === "number" ? timeoutMs + 1e4 : void 0;
   try {
     const response = await client.call("annotate", {
       sessionId,
+      stored,
+      includeScreenshots,
       transport,
       targetId,
       tabId,
@@ -3255,6 +3413,13 @@ async function runAnnotate(args) {
       context,
       timeoutMs
     }, { timeoutMs: callTimeoutMs });
+    if (response.status === "cancelled") {
+      return {
+        success: true,
+        message: response.error?.message ?? "Annotation cancelled.",
+        data: { cancelled: true }
+      };
+    }
     if (response.status !== "ok" || !response.payload) {
       const message2 = response.error?.message ?? "Annotation failed.";
       throw new Error(message2);
@@ -3267,8 +3432,130 @@ async function runAnnotate(args) {
   }
 }
 
-// src/cli/commands/rpc.ts
+// src/cli/commands/canvas.ts
 import { readFileSync as readFileSync5 } from "fs";
+var DEFAULT_FEEDBACK_STREAM_TIMEOUT_MS = 3e4;
+var MIN_FEEDBACK_STREAM_POLL_MS = 250;
+var MAX_FEEDBACK_STREAM_POLL_MS = 1e3;
+var isRecord = (value) => {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+};
+var asString = (value) => {
+  return typeof value === "string" && value.length > 0 ? value : null;
+};
+var asNumber = (value) => {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+};
+var asRecordArray = (value) => {
+  return Array.isArray(value) ? value.filter(isRecord) : [];
+};
+var sleep = async (ms) => {
+  await new Promise((resolve6) => setTimeout(resolve6, ms));
+};
+var toFeedbackPollResult = (value) => {
+  if (!isRecord(value)) {
+    return { items: [], nextCursor: null };
+  }
+  const retention = isRecord(value.retention) ? {
+    activeTargetIds: Array.isArray(value.retention.activeTargetIds) ? value.retention.activeTargetIds.filter((entry) => typeof entry === "string") : void 0
+  } : void 0;
+  return {
+    items: asRecordArray(value.items),
+    nextCursor: asString(value.nextCursor),
+    retention
+  };
+};
+async function streamFeedbackViaPolling(client, args, canvasArgs, params, initial) {
+  const outputOptions = { format: args.outputFormat, quiet: args.quiet };
+  writeOutput({
+    success: true,
+    message: `Canvas executed: ${canvasArgs.command}`,
+    data: {
+      command: canvasArgs.command,
+      result: initial
+    }
+  }, outputOptions);
+  const heartbeatMs = Math.max(asNumber(initial.heartbeatMs) ?? 15e3, 1e3);
+  const pollIntervalMs = Math.min(
+    MAX_FEEDBACK_STREAM_POLL_MS,
+    Math.max(MIN_FEEDBACK_STREAM_POLL_MS, Math.floor(heartbeatMs / 3))
+  );
+  const streamTimeoutMs = canvasArgs.timeoutMs ?? DEFAULT_FEEDBACK_STREAM_TIMEOUT_MS;
+  const deadline = Date.now() + streamTimeoutMs;
+  let cursor = asString(initial.cursor);
+  let lastHeartbeatAt = Date.now();
+  while (Date.now() < deadline) {
+    await sleep(pollIntervalMs);
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) {
+      break;
+    }
+    const polled = toFeedbackPollResult(await client.call(
+      "canvas.execute",
+      {
+        command: "canvas.feedback.poll",
+        params: {
+          ...params,
+          afterCursor: cursor
+        }
+      },
+      { timeoutMs: remainingMs }
+    ));
+    if (polled.items.length > 0) {
+      for (const item of polled.items) {
+        const itemCursor = asString(item.cursor);
+        if (itemCursor) {
+          cursor = itemCursor;
+        }
+        writeOutput({
+          success: true,
+          message: `Canvas feedback: ${canvasArgs.command}`,
+          data: {
+            command: canvasArgs.command,
+            streamEvent: {
+              eventType: "feedback.item",
+              item,
+              cursor: cursor ?? null
+            }
+          }
+        }, outputOptions);
+      }
+      lastHeartbeatAt = Date.now();
+      continue;
+    }
+    if (polled.nextCursor) {
+      cursor = polled.nextCursor;
+    }
+    if (Date.now() - lastHeartbeatAt >= heartbeatMs) {
+      writeOutput({
+        success: true,
+        message: `Canvas feedback: ${canvasArgs.command}`,
+        data: {
+          command: canvasArgs.command,
+          streamEvent: {
+            eventType: "feedback.heartbeat",
+            cursor: cursor ?? null,
+            ts: (/* @__PURE__ */ new Date()).toISOString(),
+            activeTargetIds: polled.retention?.activeTargetIds ?? []
+          }
+        }
+      }, outputOptions);
+      lastHeartbeatAt = Date.now();
+    }
+  }
+  writeOutput({
+    success: true,
+    message: `Canvas feedback: ${canvasArgs.command}`,
+    data: {
+      command: canvasArgs.command,
+      streamEvent: {
+        eventType: "feedback.complete",
+        cursor: cursor ?? null,
+        completeReason: "timeout"
+      }
+    }
+  }, outputOptions);
+}
 var requireValue3 = (value, flag) => {
   if (!value) throw createUsageError(`Missing value for ${flag}`);
   return value;
@@ -3286,6 +3573,138 @@ var parseJsonObject = (raw, source) => {
   }
   return parsed;
 };
+var parseCanvasArgs = (rawArgs) => {
+  const parsed = {};
+  for (let i = 0; i < rawArgs.length; i += 1) {
+    const arg = rawArgs[i];
+    if (arg === "--command") {
+      parsed.command = requireValue3(rawArgs[i + 1], "--command");
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--command=")) {
+      parsed.command = requireValue3(arg.split("=", 2)[1], "--command");
+      continue;
+    }
+    if (arg === "--params") {
+      parsed.params = requireValue3(rawArgs[i + 1], "--params");
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--params=")) {
+      parsed.params = requireValue3(arg.split("=", 2)[1], "--params");
+      continue;
+    }
+    if (arg === "--params-file") {
+      parsed.paramsFile = requireValue3(rawArgs[i + 1], "--params-file");
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--params-file=")) {
+      parsed.paramsFile = requireValue3(arg.split("=", 2)[1], "--params-file");
+      continue;
+    }
+    if (arg === "--timeout-ms") {
+      parsed.timeoutMs = parseNumberFlag(requireValue3(rawArgs[i + 1], "--timeout-ms"), "--timeout-ms", { min: 1 });
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--timeout-ms=")) {
+      parsed.timeoutMs = parseNumberFlag(requireValue3(arg.split("=", 2)[1], "--timeout-ms"), "--timeout-ms", { min: 1 });
+    }
+  }
+  return parsed;
+};
+var resolveCanvasParams = (canvasArgs) => {
+  const hasParams = typeof canvasArgs.params === "string";
+  const hasParamsFile = typeof canvasArgs.paramsFile === "string";
+  if (Number(hasParams) + Number(hasParamsFile) > 1) {
+    throw createUsageError("Provide only one params source: --params or --params-file.");
+  }
+  if (hasParams) {
+    return parseJsonObject(canvasArgs.params ?? "", "--params");
+  }
+  if (hasParamsFile) {
+    let raw = "";
+    try {
+      raw = readFileSync5(canvasArgs.paramsFile ?? "", "utf8");
+    } catch (error) {
+      const message = error instanceof Error ? error.message : "Unable to read file";
+      throw createUsageError(`Invalid --params-file: ${message}`);
+    }
+    if (!raw.trim()) {
+      throw createUsageError("Invalid JSON from --params-file: empty input");
+    }
+    return parseJsonObject(raw, "--params-file");
+  }
+  return {};
+};
+async function runCanvas(args) {
+  const canvasArgs = parseCanvasArgs(args.rawArgs);
+  if (!canvasArgs.command) {
+    throw createUsageError("Usage: opendevbrowser canvas --command <canvas.command> [--params <json> | --params-file <path>]");
+  }
+  if (!canvasArgs.command.startsWith("canvas.")) {
+    throw createUsageError("Canvas command names must start with 'canvas.'.");
+  }
+  const client = new DaemonClient({ autoRenew: true });
+  try {
+    const params = resolveCanvasParams(canvasArgs);
+    const result = await client.call(
+      "canvas.execute",
+      {
+        command: canvasArgs.command,
+        params
+      },
+      { timeoutMs: canvasArgs.timeoutMs }
+    );
+    if (canvasArgs.command === "canvas.feedback.subscribe" && args.outputFormat === "stream-json" && isRecord(result)) {
+      await streamFeedbackViaPolling(client, args, canvasArgs, params, result);
+      return {
+        success: true,
+        message: `Canvas executed: ${canvasArgs.command}`,
+        data: {
+          suppressOutput: true
+        }
+      };
+    }
+    if (args.outputFormat === "text") {
+      const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
+      return { success: true, message: output };
+    }
+    return {
+      success: true,
+      message: `Canvas executed: ${canvasArgs.command}`,
+      data: {
+        command: canvasArgs.command,
+        result
+      }
+    };
+  } finally {
+    await client.releaseBinding().catch(() => {
+    });
+  }
+}
+
+// src/cli/commands/rpc.ts
+import { readFileSync as readFileSync6 } from "fs";
+var requireValue4 = (value, flag) => {
+  if (!value) throw createUsageError(`Missing value for ${flag}`);
+  return value;
+};
+var parseJsonObject2 = (raw, source) => {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : "Invalid JSON";
+    throw createUsageError(`Invalid JSON from ${source}: ${message}`);
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw createUsageError(`Invalid JSON from ${source}: expected object`);
+  }
+  return parsed;
+};
 var parseRpcArgs = (rawArgs) => {
   const parsed = {};
   for (let i = 0; i < rawArgs.length; i += 1) {
@@ -3295,40 +3714,40 @@ var parseRpcArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--name") {
-      parsed.name = requireValue3(rawArgs[i + 1], "--name");
+      parsed.name = requireValue4(rawArgs[i + 1], "--name");
       i += 1;
       continue;
     }
     if (arg?.startsWith("--name=")) {
-      parsed.name = requireValue3(arg.split("=", 2)[1], "--name");
+      parsed.name = requireValue4(arg.split("=", 2)[1], "--name");
       continue;
     }
     if (arg === "--params") {
-      parsed.params = requireValue3(rawArgs[i + 1], "--params");
+      parsed.params = requireValue4(rawArgs[i + 1], "--params");
       i += 1;
       continue;
     }
     if (arg?.startsWith("--params=")) {
-      parsed.params = requireValue3(arg.split("=", 2)[1], "--params");
+      parsed.params = requireValue4(arg.split("=", 2)[1], "--params");
       continue;
     }
     if (arg === "--params-file") {
-      parsed.paramsFile = requireValue3(rawArgs[i + 1], "--params-file");
+      parsed.paramsFile = requireValue4(rawArgs[i + 1], "--params-file");
       i += 1;
       continue;
     }
     if (arg?.startsWith("--params-file=")) {
-      parsed.paramsFile = requireValue3(arg.split("=", 2)[1], "--params-file");
+      parsed.paramsFile = requireValue4(arg.split("=", 2)[1], "--params-file");
       continue;
     }
     if (arg === "--timeout-ms") {
-      const value = requireValue3(rawArgs[i + 1], "--timeout-ms");
+      const value = requireValue4(rawArgs[i + 1], "--timeout-ms");
       parsed.timeoutMs = parseNumberFlag(value, "--timeout-ms", { min: 1 });
       i += 1;
       continue;
     }
     if (arg?.startsWith("--timeout-ms=")) {
-      const value = requireValue3(arg.split("=", 2)[1], "--timeout-ms");
+      const value = requireValue4(arg.split("=", 2)[1], "--timeout-ms");
       parsed.timeoutMs = parseNumberFlag(value, "--timeout-ms", { min: 1 });
       continue;
     }
@@ -3343,12 +3762,12 @@ var resolveRpcParams = (rpcArgs) => {
     throw createUsageError("Provide only one params source: --params or --params-file.");
   }
   if (hasParamsArg) {
-    return parseJsonObject(rpcArgs.params ?? "", "--params");
+    return parseJsonObject2(rpcArgs.params ?? "", "--params");
   }
   if (hasParamsFile) {
     let raw = "";
     try {
-      raw = readFileSync5(rpcArgs.paramsFile ?? "", "utf8");
+      raw = readFileSync6(rpcArgs.paramsFile ?? "", "utf8");
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unable to read file";
       throw createUsageError(`Invalid --params-file: ${message}`);
@@ -3356,7 +3775,7 @@ var resolveRpcParams = (rpcArgs) => {
     if (!raw.trim()) {
       throw createUsageError("Invalid JSON from --params-file: empty input");
     }
-    return parseJsonObject(raw, "--params-file");
+    return parseJsonObject2(raw, "--params-file");
   }
   return {};
 };
@@ -3424,9 +3843,14 @@ function parseClickArgs(rawArgs) {
 }
 async function runClick(args) {
   const { sessionId, ref } = parseClickArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("interact.click", { sessionId, ref });
+  const result = await callDaemon("interact.click", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Click complete.", data: result };
 }
 
@@ -3462,9 +3886,14 @@ function parseHoverArgs(rawArgs) {
 }
 async function runHover(args) {
   const { sessionId, ref } = parseHoverArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("interact.hover", { sessionId, ref });
+  const result = await callDaemon("interact.hover", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Hover complete.", data: result };
 }
 
@@ -3511,9 +3940,15 @@ function parsePressArgs(rawArgs) {
 }
 async function runPress(args) {
   const { sessionId, key, ref } = parsePressArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!key) throw createUsageError("Missing --key");
-  const result = await callDaemon("interact.press", { sessionId, key, ref });
+  const result = await callDaemon("interact.press", {
+    sessionId,
+    key,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Key press complete.", data: result };
 }
 
@@ -3549,9 +3984,14 @@ function parseCheckArgs(rawArgs) {
 }
 async function runCheck(args) {
   const { sessionId, ref } = parseCheckArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("interact.check", { sessionId, ref });
+  const result = await callDaemon("interact.check", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Check complete.", data: result };
 }
 
@@ -3587,9 +4027,14 @@ function parseUncheckArgs(rawArgs) {
 }
 async function runUncheck(args) {
   const { sessionId, ref } = parseUncheckArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("interact.uncheck", { sessionId, ref });
+  const result = await callDaemon("interact.uncheck", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Uncheck complete.", data: result };
 }
 
@@ -3644,10 +4089,18 @@ function parseTypeArgs(rawArgs) {
 }
 async function runType(args) {
   const { sessionId, ref, text, clear, submit } = parseTypeArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
   if (!text) throw createUsageError("Missing --text");
-  const result = await callDaemon("interact.type", { sessionId, ref, text, clear, submit });
+  const result = await callDaemon("interact.type", {
+    sessionId,
+    ref,
+    text,
+    clear,
+    submit,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Type complete.", data: result };
 }
 
@@ -3696,10 +4149,16 @@ function parseSelectArgs(rawArgs) {
 }
 async function runSelect(args) {
   const { sessionId, ref, values } = parseSelectArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
   if (!values || values.length === 0) throw createUsageError("Missing --values");
-  const result = await callDaemon("interact.select", { sessionId, ref, values });
+  const result = await callDaemon("interact.select", {
+    sessionId,
+    ref,
+    values,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Select complete.", data: result };
 }
 
@@ -3746,9 +4205,15 @@ function parseScrollArgs(rawArgs) {
 }
 async function runScroll(args) {
   const { sessionId, ref, dy } = parseScrollArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (typeof dy !== "number" || Number.isNaN(dy)) throw createUsageError("Missing --dy");
-  const result = await callDaemon("interact.scroll", { sessionId, ref, dy });
+  const result = await callDaemon("interact.scroll", {
+    sessionId,
+    ref,
+    dy,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Scroll complete.", data: result };
 }
 
@@ -3784,9 +4249,14 @@ function parseScrollIntoViewArgs(rawArgs) {
 }
 async function runScrollIntoView(args) {
   const { sessionId, ref } = parseScrollIntoViewArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("interact.scrollIntoView", { sessionId, ref });
+  const result = await callDaemon("interact.scrollIntoView", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Scroll into view complete.", data: result };
 }
 
@@ -4088,9 +4558,15 @@ function parseDomHtmlArgs(rawArgs) {
 }
 async function runDomHtml(args) {
   const { sessionId, ref, maxChars } = parseDomHtmlArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("dom.getHtml", { sessionId, ref, maxChars });
+  const result = await callDaemon("dom.getHtml", {
+    sessionId,
+    ref,
+    maxChars,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "DOM HTML captured.", data: result };
 }
 
@@ -4137,9 +4613,15 @@ function parseDomTextArgs(rawArgs) {
 }
 async function runDomText(args) {
   const { sessionId, ref, maxChars } = parseDomTextArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("dom.getText", { sessionId, ref, maxChars });
+  const result = await callDaemon("dom.getText", {
+    sessionId,
+    ref,
+    maxChars,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "DOM text captured.", data: result };
 }
 
@@ -4186,10 +4668,16 @@ function parseDomAttrArgs(rawArgs) {
 }
 async function runDomAttr(args) {
   const { sessionId, ref, attr } = parseDomAttrArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
   if (!attr) throw createUsageError("Missing --attr");
-  const result = await callDaemon("dom.getAttr", { sessionId, ref, name: attr });
+  const result = await callDaemon("dom.getAttr", {
+    sessionId,
+    ref,
+    name: attr,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "DOM attribute captured.", data: result };
 }
 
@@ -4225,9 +4713,14 @@ function parseDomValueArgs(rawArgs) {
 }
 async function runDomValue(args) {
   const { sessionId, ref } = parseDomValueArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("dom.getValue", { sessionId, ref });
+  const result = await callDaemon("dom.getValue", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "DOM value captured.", data: result };
 }
 
@@ -4263,9 +4756,14 @@ function parseDomVisibleArgs(rawArgs) {
 }
 async function runDomVisible(args) {
   const { sessionId, ref } = parseDomVisibleArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("dom.isVisible", { sessionId, ref });
+  const result = await callDaemon("dom.isVisible", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Visibility checked.", data: result };
 }
 
@@ -4301,9 +4799,14 @@ function parseDomEnabledArgs(rawArgs) {
 }
 async function runDomEnabled(args) {
   const { sessionId, ref } = parseDomEnabledArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("dom.isEnabled", { sessionId, ref });
+  const result = await callDaemon("dom.isEnabled", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Enabled state checked.", data: result };
 }
 
@@ -4339,9 +4842,14 @@ function parseDomCheckedArgs(rawArgs) {
 }
 async function runDomChecked(args) {
   const { sessionId, ref } = parseDomCheckedArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("dom.isChecked", { sessionId, ref });
+  const result = await callDaemon("dom.isChecked", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Checked state reported.", data: result };
 }
 
@@ -4361,13 +4869,27 @@ function parseClonePageArgs(rawArgs) {
       parsed.sessionId = arg.split("=", 2)[1];
       continue;
     }
+    if (arg === "--target-id") {
+      const value = rawArgs[i + 1];
+      if (!value) throw createUsageError("Missing value for --target-id");
+      parsed.targetId = value;
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--target-id=")) {
+      parsed.targetId = arg.split("=", 2)[1];
+      continue;
+    }
   }
   return parsed;
 }
 async function runClonePage(args) {
-  const { sessionId } = parseClonePageArgs(args.rawArgs);
+  const { sessionId, targetId } = parseClonePageArgs(args.rawArgs);
   if (!sessionId) throw createUsageError("Missing --session-id");
-  const result = await callDaemon("export.clonePage", { sessionId });
+  const result = await callDaemon("export.clonePage", {
+    sessionId,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Page cloned.", data: result };
 }
 
@@ -4398,14 +4920,29 @@ function parseCloneComponentArgs(rawArgs) {
       parsed.ref = arg.split("=", 2)[1];
       continue;
     }
+    if (arg === "--target-id") {
+      const value = rawArgs[i + 1];
+      if (!value) throw createUsageError("Missing value for --target-id");
+      parsed.targetId = value;
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--target-id=")) {
+      parsed.targetId = arg.split("=", 2)[1];
+      continue;
+    }
   }
   return parsed;
 }
 async function runCloneComponent(args) {
-  const { sessionId, ref } = parseCloneComponentArgs(args.rawArgs);
+  const { sessionId, ref, targetId } = parseCloneComponentArgs(args.rawArgs);
   if (!sessionId) throw createUsageError("Missing --session-id");
   if (!ref) throw createUsageError("Missing --ref");
-  const result = await callDaemon("export.cloneComponent", { sessionId, ref });
+  const result = await callDaemon("export.cloneComponent", {
+    sessionId,
+    ref,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Component cloned.", data: result };
 }
 
@@ -4430,13 +4967,17 @@ function parsePerfArgs(rawArgs) {
 }
 async function runPerf(args) {
   const { sessionId } = parsePerfArgs(args.rawArgs);
+  const targetId = parseOptionalStringFlag(args.rawArgs, "--target-id");
   if (!sessionId) throw createUsageError("Missing --session-id");
-  const result = await callDaemon("devtools.perf", { sessionId });
+  const result = await callDaemon("devtools.perf", {
+    sessionId,
+    ...typeof targetId === "string" ? { targetId } : {}
+  });
   return { success: true, message: "Performance metrics captured.", data: result };
 }
 
 // src/cli/commands/devtools/screenshot.ts
-var requireValue4 = (value, flag) => {
+var requireValue5 = (value, flag) => {
   if (!value) throw createUsageError(`Missing value for ${flag}`);
   return value;
 };
@@ -4445,39 +4986,52 @@ function parseScreenshotArgs(rawArgs) {
   for (let i = 0; i < rawArgs.length; i += 1) {
     const arg = rawArgs[i];
     if (arg === "--session-id") {
-      parsed.sessionId = requireValue4(rawArgs[i + 1], "--session-id");
+      parsed.sessionId = requireValue5(rawArgs[i + 1], "--session-id");
       i += 1;
       continue;
     }
     if (arg?.startsWith("--session-id=")) {
-      parsed.sessionId = requireValue4(arg.split("=", 2)[1], "--session-id");
+      parsed.sessionId = requireValue5(arg.split("=", 2)[1], "--session-id");
+      continue;
+    }
+    if (arg === "--target-id") {
+      parsed.targetId = requireValue5(rawArgs[i + 1], "--target-id");
+      i += 1;
+      continue;
+    }
+    if (arg?.startsWith("--target-id=")) {
+      parsed.targetId = requireValue5(arg.split("=", 2)[1], "--target-id");
       continue;
     }
     if (arg === "--path") {
-      parsed.path = requireValue4(rawArgs[i + 1], "--path");
+      parsed.path = requireValue5(rawArgs[i + 1], "--path");
       i += 1;
       continue;
     }
     if (arg?.startsWith("--path=")) {
-      parsed.path = requireValue4(arg.split("=", 2)[1], "--path");
+      parsed.path = requireValue5(arg.split("=", 2)[1], "--path");
       continue;
     }
     if (arg === "--timeout-ms") {
-      parsed.timeoutMs = parseNumberFlag(requireValue4(rawArgs[i + 1], "--timeout-ms"), "--timeout-ms", { min: 1 });
+      parsed.timeoutMs = parseNumberFlag(requireValue5(rawArgs[i + 1], "--timeout-ms"), "--timeout-ms", { min: 1 });
       i += 1;
       continue;
     }
     if (arg?.startsWith("--timeout-ms=")) {
-      parsed.timeoutMs = parseNumberFlag(requireValue4(arg.split("=", 2)[1], "--timeout-ms"), "--timeout-ms", { min: 1 });
+      parsed.timeoutMs = parseNumberFlag(requireValue5(arg.split("=", 2)[1], "--timeout-ms"), "--timeout-ms", { min: 1 });
       continue;
     }
   }
   return parsed;
 }
 async function runScreenshot(args) {
-  const { sessionId, path: path8, timeoutMs } = parseScreenshotArgs(args.rawArgs);
+  const { sessionId, targetId, path: path8, timeoutMs } = parseScreenshotArgs(args.rawArgs);
   if (!sessionId) throw createUsageError("Missing --session-id");
-  const params = { sessionId, path: path8 };
+  const params = {
+    sessionId,
+    path: path8,
+    ...typeof targetId === "string" ? { targetId } : {}
+  };
   const result = typeof timeoutMs === "number" ? await callDaemon("page.screenshot", params, { timeoutMs }) : await callDaemon("page.screenshot", params);
   return { success: true, message: "Screenshot captured.", data: result };
 }
@@ -4683,8 +5237,8 @@ async function runDebugTraceSnapshot(args) {
 }
 
 // src/cli/commands/session/cookie-import.ts
-import { readFileSync as readFileSync6 } from "fs";
-var requireValue5 = (value, flag) => {
+import { readFileSync as readFileSync7 } from "fs";
+var requireValue6 = (value, flag) => {
   if (!value) {
     throw createUsageError(`Missing value for ${flag}`);
   }
@@ -4701,30 +5255,30 @@ var parseCookieImportArgs = (rawArgs) => {
   for (let index = 0; index < rawArgs.length; index += 1) {
     const arg = rawArgs[index];
     if (arg === "--session-id") {
-      parsed.sessionId = requireValue5(rawArgs[index + 1], "--session-id");
+      parsed.sessionId = requireValue6(rawArgs[index + 1], "--session-id");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--session-id=")) {
-      parsed.sessionId = requireValue5(arg.split("=", 2)[1], "--session-id");
+      parsed.sessionId = requireValue6(arg.split("=", 2)[1], "--session-id");
       continue;
     }
     if (arg === "--cookies") {
-      parsed.cookies = requireValue5(rawArgs[index + 1], "--cookies");
+      parsed.cookies = requireValue6(rawArgs[index + 1], "--cookies");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--cookies=")) {
-      parsed.cookies = requireValue5(arg.split("=", 2)[1], "--cookies");
+      parsed.cookies = requireValue6(arg.split("=", 2)[1], "--cookies");
       continue;
     }
     if (arg === "--cookies-file") {
-      parsed.cookiesFile = requireValue5(rawArgs[index + 1], "--cookies-file");
+      parsed.cookiesFile = requireValue6(rawArgs[index + 1], "--cookies-file");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--cookies-file=")) {
-      parsed.cookiesFile = requireValue5(arg.split("=", 2)[1], "--cookies-file");
+      parsed.cookiesFile = requireValue6(arg.split("=", 2)[1], "--cookies-file");
       continue;
     }
     if (arg === "--strict") {
@@ -4732,16 +5286,16 @@ var parseCookieImportArgs = (rawArgs) => {
       continue;
     }
     if (arg?.startsWith("--strict=")) {
-      parsed.strict = parseStrictValue(requireValue5(arg.split("=", 2)[1], "--strict"), "--strict");
+      parsed.strict = parseStrictValue(requireValue6(arg.split("=", 2)[1], "--strict"), "--strict");
       continue;
     }
     if (arg === "--request-id") {
-      parsed.requestId = requireValue5(rawArgs[index + 1], "--request-id");
+      parsed.requestId = requireValue6(rawArgs[index + 1], "--request-id");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--request-id=")) {
-      parsed.requestId = requireValue5(arg.split("=", 2)[1], "--request-id");
+      parsed.requestId = requireValue6(arg.split("=", 2)[1], "--request-id");
       continue;
     }
   }
@@ -4798,7 +5352,7 @@ var resolveCookies = (parsed) => {
   }
   let raw = "";
   try {
-    raw = readFileSync6(parsed.cookiesFile ?? "", "utf8");
+    raw = readFileSync7(parsed.cookiesFile ?? "", "utf8");
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unable to read file";
     throw createUsageError(`Invalid --cookies-file: ${message}`);
@@ -4829,7 +5383,7 @@ async function runCookieImport(args) {
 }
 
 // src/cli/commands/session/cookie-list.ts
-var requireValue6 = (value, flag) => {
+var requireValue7 = (value, flag) => {
   if (!value) {
     throw createUsageError(`Missing value for ${flag}`);
   }
@@ -4866,31 +5420,31 @@ var parseCookieListArgs = (rawArgs) => {
   for (let index = 0; index < rawArgs.length; index += 1) {
     const arg = rawArgs[index];
     if (arg === "--session-id") {
-      parsed.sessionId = requireValue6(rawArgs[index + 1], "--session-id");
+      parsed.sessionId = requireValue7(rawArgs[index + 1], "--session-id");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--session-id=")) {
-      parsed.sessionId = requireValue6(arg.split("=", 2)[1], "--session-id");
+      parsed.sessionId = requireValue7(arg.split("=", 2)[1], "--session-id");
       continue;
     }
     if (arg === "--url") {
-      const rawValue = requireValue6(rawArgs[index + 1], "--url");
+      const rawValue = requireValue7(rawArgs[index + 1], "--url");
       parsed.urls.push(...rawValue.split(","));
       index += 1;
       continue;
     }
     if (arg?.startsWith("--url=")) {
-      parsed.urls.push(...requireValue6(arg.split("=", 2)[1], "--url").split(","));
+      parsed.urls.push(...requireValue7(arg.split("=", 2)[1], "--url").split(","));
       continue;
     }
     if (arg === "--request-id") {
-      parsed.requestId = requireValue6(rawArgs[index + 1], "--request-id");
+      parsed.requestId = requireValue7(rawArgs[index + 1], "--request-id");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--request-id=")) {
-      parsed.requestId = requireValue6(arg.split("=", 2)[1], "--request-id");
+      parsed.requestId = requireValue7(arg.split("=", 2)[1], "--request-id");
       continue;
     }
   }
@@ -4916,7 +5470,7 @@ async function runCookieList(args) {
 }
 
 // src/cli/commands/macro-resolve.ts
-var requireValue7 = (value, flag) => {
+var requireValue8 = (value, flag) => {
   if (!value) {
     throw createUsageError(`Missing value for ${flag}`);
   }
@@ -4927,21 +5481,21 @@ var parseMacroResolveArgs = (rawArgs) => {
   for (let index = 0; index < rawArgs.length; index += 1) {
     const arg = rawArgs[index];
     if (arg === "--expression") {
-      parsed.expression = requireValue7(rawArgs[index + 1], "--expression");
+      parsed.expression = requireValue8(rawArgs[index + 1], "--expression");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--expression=")) {
-      parsed.expression = requireValue7(arg.split("=", 2)[1], "--expression");
+      parsed.expression = requireValue8(arg.split("=", 2)[1], "--expression");
       continue;
     }
     if (arg === "--default-provider") {
-      parsed.defaultProvider = requireValue7(rawArgs[index + 1], "--default-provider");
+      parsed.defaultProvider = requireValue8(rawArgs[index + 1], "--default-provider");
       index += 1;
       continue;
     }
     if (arg?.startsWith("--default-provider=")) {
-      parsed.defaultProvider = requireValue7(arg.split("=", 2)[1], "--default-provider");
+      parsed.defaultProvider = requireValue8(arg.split("=", 2)[1], "--default-provider");
       continue;
     }
     if (arg === "--include-catalog") {
@@ -4953,13 +5507,13 @@ var parseMacroResolveArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--timeout-ms") {
-      const value = requireValue7(rawArgs[index + 1], "--timeout-ms");
+      const value = requireValue8(rawArgs[index + 1], "--timeout-ms");
       parsed.timeoutMs = parseNumberFlag(value, "--timeout-ms", { min: 1 });
       index += 1;
       continue;
     }
     if (arg?.startsWith("--timeout-ms=")) {
-      parsed.timeoutMs = parseNumberFlag(requireValue7(arg.split("=", 2)[1], "--timeout-ms"), "--timeout-ms", { min: 1 });
+      parsed.timeoutMs = parseNumberFlag(requireValue8(arg.split("=", 2)[1], "--timeout-ms"), "--timeout-ms", { min: 1 });
       continue;
     }
   }
@@ -4989,7 +5543,7 @@ var SOURCE_VALUES = /* @__PURE__ */ new Set(["web", "community", "social", "shop
 var SOURCE_SELECTION_VALUES = /* @__PURE__ */ new Set(["auto", "web", "community", "social", "shopping", "all"]);
 var MODE_VALUES = /* @__PURE__ */ new Set(["compact", "json", "md", "context", "path"]);
 var COOKIE_POLICY_VALUES = /* @__PURE__ */ new Set(["off", "auto", "required"]);
-var requireValue8 = (rawArgs, index, flag) => {
+var requireValue9 = (rawArgs, index, flag) => {
   const value = rawArgs[index + 1];
   if (!value) {
     throw createUsageError(`Missing value for ${flag}`);
@@ -5019,7 +5573,7 @@ var parseResearchRunArgs = (rawArgs) => {
   for (let index = 0; index < rawArgs.length; index += 1) {
     const arg = rawArgs[index];
     if (arg === "--topic") {
-      parsed.topic = requireValue8(rawArgs, index, "--topic");
+      parsed.topic = requireValue9(rawArgs, index, "--topic");
       index += 1;
       continue;
     }
@@ -5028,7 +5582,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--days") {
-      parsed.days = parseNumberFlag(requireValue8(rawArgs, index, "--days"), "--days", { min: 1, max: 365 });
+      parsed.days = parseNumberFlag(requireValue9(rawArgs, index, "--days"), "--days", { min: 1, max: 365 });
       index += 1;
       continue;
     }
@@ -5037,7 +5591,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--from") {
-      parsed.from = requireValue8(rawArgs, index, "--from");
+      parsed.from = requireValue9(rawArgs, index, "--from");
       index += 1;
       continue;
     }
@@ -5046,7 +5600,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--to") {
-      parsed.to = requireValue8(rawArgs, index, "--to");
+      parsed.to = requireValue9(rawArgs, index, "--to");
       index += 1;
       continue;
     }
@@ -5055,7 +5609,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--source-selection") {
-      const value = requireValue8(rawArgs, index, "--source-selection").toLowerCase();
+      const value = requireValue9(rawArgs, index, "--source-selection").toLowerCase();
       if (!SOURCE_SELECTION_VALUES.has(value)) {
         throw createUsageError(`Invalid --source-selection: ${value}`);
       }
@@ -5072,7 +5626,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--sources") {
-      parsed.sources = parseSources(requireValue8(rawArgs, index, "--sources"));
+      parsed.sources = parseSources(requireValue9(rawArgs, index, "--sources"));
       index += 1;
       continue;
     }
@@ -5081,7 +5635,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--mode") {
-      const value = requireValue8(rawArgs, index, "--mode").toLowerCase();
+      const value = requireValue9(rawArgs, index, "--mode").toLowerCase();
       if (!MODE_VALUES.has(value)) {
         throw createUsageError(`Invalid --mode: ${value}`);
       }
@@ -5102,7 +5656,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--limit-per-source") {
-      parsed.limitPerSource = parseNumberFlag(requireValue8(rawArgs, index, "--limit-per-source"), "--limit-per-source", { min: 1, max: 100 });
+      parsed.limitPerSource = parseNumberFlag(requireValue9(rawArgs, index, "--limit-per-source"), "--limit-per-source", { min: 1, max: 100 });
       index += 1;
       continue;
     }
@@ -5111,7 +5665,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--output-dir") {
-      parsed.outputDir = requireValue8(rawArgs, index, "--output-dir");
+      parsed.outputDir = requireValue9(rawArgs, index, "--output-dir");
       index += 1;
       continue;
     }
@@ -5120,7 +5674,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--ttl-hours") {
-      parsed.ttlHours = parseNumberFlag(requireValue8(rawArgs, index, "--ttl-hours"), "--ttl-hours", { min: 1, max: 168 });
+      parsed.ttlHours = parseNumberFlag(requireValue9(rawArgs, index, "--ttl-hours"), "--ttl-hours", { min: 1, max: 168 });
       index += 1;
       continue;
     }
@@ -5137,7 +5691,7 @@ var parseResearchRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--cookie-policy-override" || arg === "--cookie-policy") {
-      const value = requireValue8(rawArgs, index, arg).toLowerCase();
+      const value = requireValue9(rawArgs, index, arg).toLowerCase();
       if (!COOKIE_POLICY_VALUES.has(value)) {
         throw createUsageError(`Invalid ${arg}: ${value}`);
       }
@@ -5191,7 +5745,7 @@ async function runResearchCommand(args) {
 var SORT_VALUES = /* @__PURE__ */ new Set(["best_deal", "lowest_price", "highest_rating", "fastest_shipping"]);
 var MODE_VALUES2 = /* @__PURE__ */ new Set(["compact", "json", "md", "context", "path"]);
 var COOKIE_POLICY_VALUES2 = /* @__PURE__ */ new Set(["off", "auto", "required"]);
-var requireValue9 = (rawArgs, index, flag) => {
+var requireValue10 = (rawArgs, index, flag) => {
   const value = rawArgs[index + 1];
   if (!value) {
     throw createUsageError(`Missing value for ${flag}`);
@@ -5215,7 +5769,7 @@ var parseShoppingRunArgs = (rawArgs) => {
   for (let index = 0; index < rawArgs.length; index += 1) {
     const arg = rawArgs[index];
     if (arg === "--query") {
-      parsed.query = requireValue9(rawArgs, index, "--query");
+      parsed.query = requireValue10(rawArgs, index, "--query");
       index += 1;
       continue;
     }
@@ -5224,7 +5778,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--providers") {
-      parsed.providers = parseProviders(requireValue9(rawArgs, index, "--providers"));
+      parsed.providers = parseProviders(requireValue10(rawArgs, index, "--providers"));
       index += 1;
       continue;
     }
@@ -5233,7 +5787,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--budget") {
-      parsed.budget = parseNumberFlag(requireValue9(rawArgs, index, "--budget"), "--budget", { min: 1, integer: false });
+      parsed.budget = parseNumberFlag(requireValue10(rawArgs, index, "--budget"), "--budget", { min: 1, integer: false });
       index += 1;
       continue;
     }
@@ -5242,7 +5796,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--region") {
-      parsed.region = requireValue9(rawArgs, index, "--region");
+      parsed.region = requireValue10(rawArgs, index, "--region");
       index += 1;
       continue;
     }
@@ -5251,7 +5805,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--sort") {
-      const value = requireValue9(rawArgs, index, "--sort").toLowerCase();
+      const value = requireValue10(rawArgs, index, "--sort").toLowerCase();
       if (!SORT_VALUES.has(value)) {
         throw createUsageError(`Invalid --sort: ${value}`);
       }
@@ -5268,7 +5822,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--mode") {
-      const value = requireValue9(rawArgs, index, "--mode").toLowerCase();
+      const value = requireValue10(rawArgs, index, "--mode").toLowerCase();
       if (!MODE_VALUES2.has(value)) {
         throw createUsageError(`Invalid --mode: ${value}`);
       }
@@ -5285,7 +5839,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--timeout-ms") {
-      parsed.timeoutMs = parseNumberFlag(requireValue9(rawArgs, index, "--timeout-ms"), "--timeout-ms", { min: 1 });
+      parsed.timeoutMs = parseNumberFlag(requireValue10(rawArgs, index, "--timeout-ms"), "--timeout-ms", { min: 1 });
       index += 1;
       continue;
     }
@@ -5294,7 +5848,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--output-dir") {
-      parsed.outputDir = requireValue9(rawArgs, index, "--output-dir");
+      parsed.outputDir = requireValue10(rawArgs, index, "--output-dir");
       index += 1;
       continue;
     }
@@ -5303,7 +5857,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--ttl-hours") {
-      parsed.ttlHours = parseNumberFlag(requireValue9(rawArgs, index, "--ttl-hours"), "--ttl-hours", { min: 1, max: 168 });
+      parsed.ttlHours = parseNumberFlag(requireValue10(rawArgs, index, "--ttl-hours"), "--ttl-hours", { min: 1, max: 168 });
       index += 1;
       continue;
     }
@@ -5320,7 +5874,7 @@ var parseShoppingRunArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--cookie-policy-override" || arg === "--cookie-policy") {
-      const value = requireValue9(rawArgs, index, arg).toLowerCase();
+      const value = requireValue10(rawArgs, index, arg).toLowerCase();
       if (!COOKIE_POLICY_VALUES2.has(value)) {
         throw createUsageError(`Invalid ${arg}: ${value}`);
       }
@@ -5370,7 +5924,7 @@ async function runShoppingCommand(args) {
 }
 
 // src/cli/commands/product-video.ts
-var requireValue10 = (rawArgs, index, flag) => {
+var requireValue11 = (rawArgs, index, flag) => {
   const value = rawArgs[index + 1];
   if (!value) {
     throw createUsageError(`Missing value for ${flag}`);
@@ -5388,7 +5942,7 @@ var parseProductVideoArgs = (rawArgs) => {
   for (let index = 0; index < rawArgs.length; index += 1) {
     const arg = rawArgs[index];
     if (arg === "--product-url") {
-      parsed.productUrl = requireValue10(rawArgs, index, "--product-url");
+      parsed.productUrl = requireValue11(rawArgs, index, "--product-url");
       index += 1;
       continue;
     }
@@ -5397,7 +5951,7 @@ var parseProductVideoArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--product-name") {
-      parsed.productName = requireValue10(rawArgs, index, "--product-name");
+      parsed.productName = requireValue11(rawArgs, index, "--product-name");
       index += 1;
       continue;
     }
@@ -5406,7 +5960,7 @@ var parseProductVideoArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--provider-hint") {
-      parsed.providerHint = requireValue10(rawArgs, index, "--provider-hint");
+      parsed.providerHint = requireValue11(rawArgs, index, "--provider-hint");
       index += 1;
       continue;
     }
@@ -5439,7 +5993,7 @@ var parseProductVideoArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--output-dir") {
-      parsed.outputDir = requireValue10(rawArgs, index, "--output-dir");
+      parsed.outputDir = requireValue11(rawArgs, index, "--output-dir");
       index += 1;
       continue;
     }
@@ -5448,7 +6002,7 @@ var parseProductVideoArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--ttl-hours") {
-      parsed.ttlHours = parseNumberFlag(requireValue10(rawArgs, index, "--ttl-hours"), "--ttl-hours", { min: 1, max: 168 });
+      parsed.ttlHours = parseNumberFlag(requireValue11(rawArgs, index, "--ttl-hours"), "--ttl-hours", { min: 1, max: 168 });
       index += 1;
       continue;
     }
@@ -5457,7 +6011,7 @@ var parseProductVideoArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--timeout-ms") {
-      parsed.timeoutMs = parseNumberFlag(requireValue10(rawArgs, index, "--timeout-ms"), "--timeout-ms", { min: 1 });
+      parsed.timeoutMs = parseNumberFlag(requireValue11(rawArgs, index, "--timeout-ms"), "--timeout-ms", { min: 1 });
       index += 1;
       continue;
     }
@@ -5474,7 +6028,7 @@ var parseProductVideoArgs = (rawArgs) => {
       continue;
     }
     if (arg === "--cookie-policy-override" || arg === "--cookie-policy") {
-      const value = requireValue10(rawArgs, index, arg).toLowerCase();
+      const value = requireValue11(rawArgs, index, arg).toLowerCase();
       if (!COOKIE_POLICY_VALUES3.has(value)) {
         throw createUsageError(`Invalid ${arg}: ${value}`);
       }
@@ -5525,7 +6079,7 @@ async function runProductVideoCommand(args) {
 // package.json
 var package_default = {
   name: "opendevbrowser",
-  version: "0.0.16",
+  version: "0.0.17",
   description: "OpenCode plugin for browser automation via CDP with snapshot-refs-actions workflow",
   type: "module",
   main: "dist/index.js",
@@ -5537,6 +6091,7 @@ var package_default = {
     "dist",
     "skills",
     "scripts/native",
+    "extension/canvas.html",
     "extension/manifest.json",
     "extension/popup.html",
     "extension/dist",
@@ -5579,7 +6134,7 @@ for (const [src, dst] of pairs) {
     dev: "tsup src/index.ts src/cli/index.ts --format esm --dts --watch",
     lint: 'eslint "src/**/*.ts" "tests/**/*.ts"',
     typecheck: "tsc --noEmit -p tsconfig.json",
-    test: "vitest run --coverage",
+    test: `node --input-type=module -e "import { mkdirSync } from 'node:fs'; mkdirSync('coverage/.tmp', { recursive: true });" && vitest run --coverage`,
     "test:release-gate": "node scripts/release-gate-test-groups.mjs",
     "test:release-gate:g1": "node scripts/release-gate-test-groups.mjs --group 1",
     "test:release-gate:g2": "node scripts/release-gate-test-groups.mjs --group 2",
@@ -5588,7 +6143,7 @@ for (const [src, dst] of pairs) {
     "test:release-gate:g5": "node scripts/release-gate-test-groups.mjs --group 5",
     "extension:sync": "node scripts/sync-extension-version.mjs",
     "extension:build": "npm run extension:sync && tsc -p extension/tsconfig.json && node scripts/copy-extension-assets.mjs",
-    "extension:pack": "cd extension && zip -r ../opendevbrowser-extension.zip manifest.json popup.html dist/ icons/",
+    "extension:pack": "cd extension && zip -r ../opendevbrowser-extension.zip manifest.json popup.html canvas.html dist/ icons/",
     "extension:store": "node scripts/chrome-store-publish.mjs",
     "version:check": "node scripts/verify-versions.mjs",
     prepack: "npm run version:check && npm run build && npm run extension:build"
@@ -5599,7 +6154,9 @@ for (const [src, dst] of pairs) {
     "async-mutex": "^0.5.0",
     "jsonc-parser": "^3.2.0",
     "playwright-core": "^1.58.2",
+    typescript: "^5.9.3",
     ws: "^8.19.0",
+    yjs: "^13.6.29",
     zod: "^3.25.76"
   },
   devDependencies: {
@@ -5612,7 +6169,6 @@ for (const [src, dst] of pairs) {
     eslint: "^9.39.3",
     "happy-dom": "^20.7.0",
     tsup: "^8.5.1",
-    typescript: "^5.9.3",
     vitest: "^4.0.18"
   }
 };
@@ -5936,9 +6492,14 @@ async function main() {
     });
     registerCommand({
       name: "annotate",
-      description: "Request interactive annotations (extension relay)",
+      description: "Request interactive annotations via direct or relay transport",
       run: async () => runAnnotate(args)
     });
+    registerCommand({
+      name: "canvas",
+      description: "Execute a design-canvas command",
+      run: async () => runCanvas(args)
+    });
     registerCommand({
       name: "rpc",
       description: "Execute an internal daemon RPC command (power-user)",