@schoolai/shipyard 3.3.0 → 3.3.1-nightly.20260425.0

package/dist/{serve-QLYUK5XN.js → serve-ULDOVKX7.js}

@@ -53,7 +53,7 @@ import {
   VaultKeyPutRequestSchema,
   VaultKeyPutResponseSchema,
   classifyClaudeCodeCompatibility
-} from "./chunk-UWBX6UGC.js";
+} from "./chunk-SDMIFWEZ.js";
 import "./chunk-EHQITHQX.js";
 import {
   loadAuthToken
@@ -14592,7 +14592,7 @@ function parseWorktreeListOutput(output, repoPath) {
 // src/shared/capabilities/index.ts
 import { readFile as readFile3 } from "fs/promises";
 import { homedir as homedir2 } from "os";
-import { join as join7 } from "path";
+import { join as join6 } from "path";
 
 // src/shared/capabilities/agents.ts
 async function detectAgentProviders() {
@@ -14850,7 +14850,6 @@ async function detectMarketplacePlugins() {
 // src/shared/capabilities/effort-probe.ts
 import { existsSync as existsSync2, readFileSync } from "fs";
 import { createRequire } from "module";
-import { dirname as dirname3, join as join6 } from "path";
 
 // ../../packages/loro-schema/dist/index.js
 import { LoroDoc as LoroDoc4 } from "loro-crdt";
@@ -28056,8 +28055,7 @@ var RequestPublishShape = external_exports.object({
     external_exports.object({
       kind: external_exports.literal("previewPort"),
       previewPort: external_exports.number().int().positive().max(65535),
-      canvasElementId: external_exports.string().optional(),
-      projectRoot: external_exports.string().optional()
+      canvasElementId: external_exports.string().optional()
     })
   ]),
   ttl: external_exports.enum(["24h", "7d", "30d"]),
@@ -28106,6 +28104,20 @@ var PublishedArtifactsStateShape = external_exports.object({
   taskId: external_exports.string(),
   entries: external_exports.array(PublishedArtifactRecordShape)
 });
+var PreviewElementStateShape = external_exports.object({
+  elementId: external_exports.string().min(1),
+  ownerUserId: external_exports.string(),
+  port: external_exports.number().int().positive().optional(),
+  url: external_exports.string().optional(),
+  proxyPort: external_exports.number().int().positive().optional(),
+  initialPath: external_exports.string().optional(),
+  projectRoot: external_exports.string().optional()
+});
+var PreviewElementsStateShape = external_exports.object({
+  type: external_exports.literal("preview_elements_state"),
+  taskId: external_exports.string(),
+  entries: external_exports.array(PreviewElementStateShape)
+});
 var BrowserToDaemonControlMessageSchema = external_exports.discriminatedUnion("type", [
   external_exports.object({
     type: external_exports.literal("permission_response"),
@@ -28451,6 +28463,7 @@ var RateLimitInfoSchema = external_exports.object({
     "org_service_level_disabled",
     "org_service_zero_credit_limit",
     "no_limits_configured",
+    "fetch_error",
     "unknown"
   ]).optional(),
   isUsingOverage: external_exports.boolean().optional(),
@@ -28938,7 +28951,8 @@ var DaemonToBrowserControlMessageSchema = external_exports.discriminatedUnion("t
   }),
   PublishProgressShape,
   PublishResultShape,
-  PublishedArtifactsStateShape
+  PublishedArtifactsStateShape,
+  PreviewElementsStateShape
 ]);
 var TASK_MESSAGES_PREFIX = "task-messages:";
 var DAEMON_CONTROL_LABEL = "daemon-control";
@@ -29319,8 +29333,7 @@ var PublishTargetSchema = external_exports.discriminatedUnion("kind", [
   external_exports.object({
     kind: external_exports.literal("previewPort"),
     previewPort: external_exports.number().int().positive().max(65535),
-    canvasElementId: external_exports.string().optional(),
-    projectRoot: external_exports.string().optional()
+    canvasElementId: external_exports.string().optional()
   })
 ]);
 var PublishInputSchema = external_exports.object({
@@ -30319,21 +30332,27 @@ function isReasoningEffort(value) {
 }
 function probeCli() {
   try {
-    const req = createRequire(import.meta.url);
-    const sdkMain = req.resolve("@anthropic-ai/claude-agent-sdk");
-    const cliPath = join6(dirname3(sdkMain), "cli.js");
-    if (!existsSync2(cliPath)) {
+    const binaryPath = resolveBundledClaudeBinary();
+    if (!binaryPath || !existsSync2(binaryPath)) {
+      logger.warn(
+        { binaryPath },
+        "bundled Claude Code binary not found; using conservative effort set"
+      );
+      return { supported: CONSERVATIVE_FALLBACK, source: "fallback" };
+    }
+    const slice2 = readEffortDescriptionFromBinary(binaryPath);
+    if (slice2 === null) {
       logger.warn(
-        { cliPath },
-        "bundled Claude Code cli.js not found; using conservative effort set"
+        { binaryPath },
+        "effort description not found in bundled binary; using conservative effort set"
       );
       return { supported: CONSERVATIVE_FALLBACK, source: "fallback" };
     }
-    const parsed = parseEffortsFromCliText(readFileSync(cliPath, "utf-8"));
+    const parsed = parseEffortsFromCliText(slice2);
     if (!parsed) {
       logger.warn(
-        { cliPath },
-        "could not parse effort tokens from bundled cli.js; using conservative effort set"
+        { binaryPath },
+        "could not parse effort tokens from bundled binary; using conservative effort set"
       );
       return { supported: CONSERVATIVE_FALLBACK, source: "fallback" };
     }
@@ -30343,6 +30362,32 @@ function probeCli() {
     return { supported: CONSERVATIVE_FALLBACK, source: "fallback" };
   }
 }
+function resolveBundledClaudeBinary() {
+  const req = createRequire(import.meta.url);
+  const sdkMain = req.resolve("@anthropic-ai/claude-agent-sdk");
+  const sdkReq = createRequire(sdkMain);
+  const ext2 = process.platform === "win32" ? ".exe" : "";
+  const candidates = process.platform === "linux" ? [
+    `@anthropic-ai/claude-agent-sdk-linux-${process.arch}-musl`,
+    `@anthropic-ai/claude-agent-sdk-linux-${process.arch}`
+  ] : [`@anthropic-ai/claude-agent-sdk-${process.platform}-${process.arch}`];
+  for (const pkg of candidates) {
+    try {
+      return sdkReq.resolve(`${pkg}/claude${ext2}`);
+    } catch (err) {
+      logger.debug({ pkg, err }, "platform claude binary candidate not resolvable");
+    }
+  }
+  return null;
+}
+function readEffortDescriptionFromBinary(binaryPath) {
+  const buf = readFileSync(binaryPath);
+  const needle = Buffer.from("Effort level for the current session");
+  const idx = buf.indexOf(needle);
+  if (idx === -1) return null;
+  const end = Math.min(idx + 200, buf.length);
+  return buf.toString("utf-8", idx, end);
+}
 
 // src/shared/capabilities/models.ts
 async function detectModels() {
@@ -31139,7 +31184,7 @@ var AutoModeConfigSchema = external_exports.object({
 }).passthrough();
 async function detectAutoModeEnabled() {
   try {
-    const claudeConfig = await readFile3(join7(homedir2(), ".claude.json"), "utf-8");
+    const claudeConfig = await readFile3(join6(homedir2(), ".claude.json"), "utf-8");
     const result = AutoModeConfigSchema.safeParse(JSON.parse(claudeConfig));
     return result.success && result.data.cachedGrowthBookFeatures.tengu_auto_mode_config.enabled === "enabled";
   } catch {
@@ -31208,7 +31253,7 @@ async function detectCapabilitiesWithInitialRetry(tokenStore, methodHint, lastKn
 
 // src/shared/file-storage-adapter.ts
 import { access, mkdir as mkdir2, readdir as readdir3, readFile as readFile4, rename as rename2, unlink as unlink2, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname4, join as join8, sep } from "path";
+import { dirname as dirname3, join as join7, sep } from "path";
 var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
   #dataDir;
   constructor(dataDir) {
@@ -31226,7 +31271,7 @@ var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
   }
   async save(key, data) {
     const filePath = this.#keyToPath(key);
-    const dir = dirname4(filePath);
+    const dir = dirname3(filePath);
     await mkdir2(dir, { recursive: true, mode: 448 });
     const tmpPath = `${filePath}.tmp`;
     await writeFile2(tmpPath, data, { mode: 384 });
@@ -31268,7 +31313,7 @@ var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
    * docId is the first key segment (e.g. "canvas:<taskId>:<epoch>").
    */
   async hasDoc(docId) {
-    const dirPath = join8(this.#dataDir, encodeURIComponent(docId));
+    const dirPath = join7(this.#dataDir, encodeURIComponent(docId));
     try {
       await access(dirPath);
       return true;
@@ -31282,7 +31327,7 @@ var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
   }
   #keyToPath(key) {
     const sanitized = key.map((part) => encodeURIComponent(part));
-    return join8(this.#dataDir, ...sanitized);
+    return join7(this.#dataDir, ...sanitized);
   }
   #pathToKey(filePath) {
     const relative5 = filePath.slice(this.#dataDir.length + 1);
@@ -31300,7 +31345,7 @@ var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
       return;
     }
     for (const entry of entries) {
-      const fullPath = join8(dir, entry.name);
+      const fullPath = join7(dir, entry.name);
       if (entry.isDirectory()) {
         await this.#walkDir(fullPath, keyPrefix, results);
       } else if (entry.isFile() && !entry.name.endsWith(".tmp")) {
@@ -31478,7 +31523,7 @@ var KeepAwakeManager = class {
 // src/shared/mcp/token-store.ts
 import { readFileSync as readFileSync2, statSync } from "fs";
 import { readFile as readFile5, rename as rename3, stat as stat3, writeFile as writeFile3 } from "fs/promises";
-import { join as join9 } from "path";
+import { join as join8 } from "path";
 var TOKEN_FILE = "mcp-tokens.json";
 var REFRESH_THRESHOLD_MS = 5 * 60 * 1e3;
 var MCPTokenStore = class {
@@ -31496,7 +31541,7 @@ var MCPTokenStore = class {
     this.#onChange = cb;
   }
   #filePath() {
-    return join9(this.#shipyardHome, TOKEN_FILE);
+    return join8(this.#shipyardHome, TOKEN_FILE);
   }
   /** Read mtime from disk. Returns -1 if file does not exist. */
   #readMtimeMs() {
@@ -31608,7 +31653,7 @@ var MCPTokenStore = class {
 // src/services/bootstrap/lifecycle.ts
 import { unlinkSync } from "fs";
 import { readFile as readFile6, unlink as unlink3, writeFile as writeFile4 } from "fs/promises";
-import { join as join10 } from "path";
+import { join as join9 } from "path";
 
 // src/services/bootstrap/classify-uncaught-error.ts
 function classifyUncaughtError(error2) {
@@ -31742,7 +31787,7 @@ var LifecycleManager = class {
     this.#removePidFileSync();
   }
   async acquirePidFile(shipyardHome) {
-    const pidFilePath = join10(shipyardHome, "daemon.pid");
+    const pidFilePath = join9(shipyardHome, "daemon.pid");
     try {
       const existing = await readFile6(pidFilePath, "utf-8");
       const raw = existing.trim();
@@ -31939,10 +31984,10 @@ var LifecycleManager = class {
 // src/services/bootstrap/load-or-create-peer-id.ts
 import { randomUUID } from "crypto";
 import { mkdir as mkdir3, readFile as readFile7, rename as rename4, writeFile as writeFile5 } from "fs/promises";
-import { dirname as dirname5, join as join11 } from "path";
+import { dirname as dirname4, join as join10 } from "path";
 var PEER_ID_FILE = "daemon-peer-id";
 async function loadOrCreateDaemonPeerId(shipyardDataDir) {
-  const target = join11(shipyardDataDir, PEER_ID_FILE);
+  const target = join10(shipyardDataDir, PEER_ID_FILE);
   const existing = await readExistingPeerId(target);
   if (existing !== null) return existing;
   const peerId = generatePeerId();
@@ -31967,7 +32012,7 @@ async function readExistingPeerId(target) {
   return candidate;
 }
 async function writePeerIdAtomic(target, peerId) {
-  await mkdir3(dirname5(target), { recursive: true });
+  await mkdir3(dirname4(target), { recursive: true });
   const tmp = `${target}.${randomUUID()}.tmp`;
   await writeFile5(tmp, peerId, "utf-8");
   await rename4(tmp, target);
@@ -31975,10 +32020,10 @@ async function writePeerIdAtomic(target, peerId) {
 
 // src/services/bootstrap/pid-tracking.ts
 import { readFile as readFile8, writeFile as writeFile6 } from "fs/promises";
-import { join as join12 } from "path";
+import { join as join11 } from "path";
 var PID_FILE = "children.pid";
 function buildPidTracker(shipyardHome) {
-  const filePath = join12(shipyardHome, PID_FILE);
+  const filePath = join11(shipyardHome, PID_FILE);
   let queue = Promise.resolve();
   function enqueue(fn) {
     const next = queue.then(fn);
@@ -32061,7 +32106,7 @@ function buildReloadDocsFromStorage(repoRef, log) {
 // src/services/bootstrap/signaling.ts
 import { mkdirSync, readFileSync as readFileSync3, writeFileSync } from "fs";
 import { hostname } from "os";
-import { dirname as dirname6, join as join13 } from "path";
+import { dirname as dirname5, join as join12 } from "path";
 
 // ../../node_modules/.pnpm/nanoid@5.1.6/node_modules/nanoid/index.js
 import { webcrypto as crypto2 } from "crypto";
@@ -32094,7 +32139,7 @@ function nanoid(size2 = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.3.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.3.1" : "unknown";
 function createDaemonSignaling(config2) {
   const agentId = config2.agentId ?? nanoid();
   function send(msg) {
@@ -32123,7 +32168,7 @@ function createDaemonSignaling(config2) {
   };
 }
 function getOrCreateAgentId(shipyardHome) {
-  const filePath = join13(shipyardHome, "agent-id");
+  const filePath = join12(shipyardHome, "agent-id");
   try {
     const existing = readFileSync3(filePath, "utf-8").trim();
     if (existing) return existing;
@@ -32131,7 +32176,7 @@ function getOrCreateAgentId(shipyardHome) {
   }
   const id = crypto.randomUUID();
   try {
-    mkdirSync(dirname6(filePath), { recursive: true });
+    mkdirSync(dirname5(filePath), { recursive: true });
     writeFileSync(filePath, id, { mode: 384 });
   } catch {
   }
@@ -32339,7 +32384,7 @@ function createPeerRoleRegistry() {
 
 // src/services/epoch-pruning.ts
 import { readdir as readdir4, rm } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join13 } from "path";
 var LEGACY_PREFIXES = [
   "task-meta",
   "task-conv",
@@ -32379,7 +32424,7 @@ async function pruneOldEpochData(dataDir, currentEpoch, log) {
     }
     if (!shouldPrune(decoded, currentEpoch)) continue;
     removals.push(
-      rm(join14(dataDir, entry.name), { recursive: true }).then(() => {
+      rm(join13(dataDir, entry.name), { recursive: true }).then(() => {
         pruned++;
       }).catch((err) => {
         log({
@@ -34385,7 +34430,7 @@ function onConnection(ws, deps, peers) {
 
 // src/services/local-direct/local-direct-token.ts
 import { chmod, mkdir as mkdir4, rename as rename5, rm as rm2, writeFile as writeFile7 } from "fs/promises";
-import { dirname as dirname7, join as join15 } from "path";
+import { dirname as dirname6, join as join14 } from "path";
 var ADVERTISEMENT_FILE = "local-direct.json";
 var ADVERTISEMENT_MODE = 384;
 var ADVERTISEMENT_DIR_MODE = 448;
@@ -34394,11 +34439,11 @@ function generateLocalDirectToken() {
   return nanoid(TOKEN_LENGTH);
 }
 function advertisementPath(shipyardHome) {
-  return join15(shipyardHome, "data", ADVERTISEMENT_FILE);
+  return join14(shipyardHome, "data", ADVERTISEMENT_FILE);
 }
 async function writeAdvertisement(shipyardHome, ad) {
   const target = advertisementPath(shipyardHome);
-  const dir = dirname7(target);
+  const dir = dirname6(target);
   await mkdir4(dir, { recursive: true, mode: ADVERTISEMENT_DIR_MODE });
   try {
     await chmod(dir, ADVERTISEMENT_DIR_MODE);
@@ -34523,7 +34568,7 @@ function createMetricsCollector(workerUrl, authToken, telemetryEnabled) {
 // src/services/plugins/plugin-file-watcher.ts
 import { existsSync as existsSync3, watch } from "fs";
 import { readdir as readdir5, readFile as readFile9, stat as stat4 } from "fs/promises";
-import { join as join16 } from "path";
+import { join as join15 } from "path";
 import { pathToFileURL } from "url";
 
 // src/shared/plugins/plugin-registry.ts
@@ -34624,7 +34669,7 @@ var PluginFileWatcher = class {
     }
     const loaded = [];
     for (const entry of entries) {
-      const pluginDir = join16(dir, entry);
+      const pluginDir = join15(dir, entry);
       let stats;
       try {
         stats = await stat4(pluginDir);
@@ -34639,7 +34684,7 @@ var PluginFileWatcher = class {
     this.#reconcile(loaded);
   }
   async #loadPlugin(id, pluginDir) {
-    const manifestPath = join16(pluginDir, "plugin.json");
+    const manifestPath = join15(pluginDir, "plugin.json");
     let manifestRaw;
     try {
       manifestRaw = await readFile9(manifestPath, "utf-8");
@@ -34666,7 +34711,7 @@ var PluginFileWatcher = class {
     }
     const manifest = parsed.data;
     let template = "";
-    const templatePath = join16(pluginDir, "template.html");
+    const templatePath = join15(pluginDir, "template.html");
     try {
       template = await readFile9(templatePath, "utf-8");
     } catch {
@@ -34681,7 +34726,7 @@ var PluginFileWatcher = class {
     };
   }
   async #loadAndRegisterHandler(id, pluginDir, title) {
-    const handlerPath = join16(pluginDir, "handler.mjs");
+    const handlerPath = join15(pluginDir, "handler.mjs");
     let handlerFn;
     try {
       const handlerStat = await stat4(handlerPath);
@@ -35348,7 +35393,7 @@ function handlePluginAuthRequest(pluginId, sendControl, deps, logAdapter) {
 // src/services/port-detection.ts
 import { execFile as execFile3 } from "child_process";
 import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname8, join as join17 } from "path";
+import { dirname as dirname7, join as join16 } from "path";
 import { promisify as promisify2 } from "util";
 var execFileAsync = promisify2(execFile3);
 var EXEC_TIMEOUT_MS2 = 5e3;
@@ -35463,7 +35508,7 @@ function hasStringName(val) {
 function resolveProjectRoot(cwd) {
   let dir = cwd;
   while (true) {
-    const candidate = join17(dir, "package.json");
+    const candidate = join16(dir, "package.json");
     if (existsSync4(candidate)) {
       let packageName;
       try {
@@ -35476,7 +35521,7 @@ function resolveProjectRoot(cwd) {
       }
       return { projectRoot: dir, packageName };
     }
-    const parent = dirname8(dir);
+    const parent = dirname7(dir);
     if (parent === dir) {
       return {};
     }
@@ -35573,6 +35618,175 @@ async function getCwdByPid(pids) {
   }
 }
 
+// src/services/preview/preview-state-store.ts
+import { randomUUID as randomUUID2 } from "crypto";
+import {
+  mkdirSync as mkdirSync2,
+  readdirSync,
+  readFileSync as readFileSync5,
+  renameSync,
+  unlinkSync as unlinkSync2,
+  writeFileSync as writeFileSync2
+} from "fs";
+import { join as join17 } from "path";
+function isEnoent2(err) {
+  return err instanceof Error && Reflect.get(err, "code") === "ENOENT";
+}
+function atomicWriteSync(filePath, content) {
+  const tmpPath = `${filePath}.${randomUUID2()}.tmp`;
+  writeFileSync2(tmpPath, content, "utf-8");
+  renameSync(tmpPath, filePath);
+}
+function recordFilePath(rootDir, taskId, elementId) {
+  return join17(rootDir, taskId, `${elementId}.json`);
+}
+function parseRecord(filePath, logger2) {
+  let raw;
+  try {
+    raw = readFileSync5(filePath, "utf-8");
+  } catch {
+    return null;
+  }
+  let obj;
+  try {
+    obj = JSON.parse(raw);
+  } catch {
+    logger2.warn({ filePath }, "preview_state_store: invalid JSON, skipping");
+    return null;
+  }
+  const result = PreviewElementStateShape.safeParse(obj);
+  if (!result.success) {
+    logger2.warn(
+      { filePath, issues: result.error.issues },
+      "preview_state_store: schema validation failed, skipping"
+    );
+    return null;
+  }
+  return result.data;
+}
+function createPreviewStateStore(opts) {
+  const { rootDir, logger: logger2 } = opts;
+  const registry = /* @__PURE__ */ new Map();
+  let sendFn = null;
+  mkdirSync2(rootDir, { recursive: true });
+  function getTaskMap(taskId) {
+    let taskMap = registry.get(taskId);
+    if (!taskMap) {
+      taskMap = /* @__PURE__ */ new Map();
+      registry.set(taskId, taskMap);
+    }
+    return taskMap;
+  }
+  function scanTaskDir(taskId) {
+    const taskPath = join17(rootDir, taskId);
+    let files;
+    try {
+      files = readdirSync(taskPath);
+    } catch {
+      return;
+    }
+    for (const file of files) {
+      if (!file.endsWith(".json")) continue;
+      const record = parseRecord(join17(taskPath, file), logger2);
+      if (record) getTaskMap(taskId).set(record.elementId, record);
+    }
+  }
+  function scanRootDir() {
+    let taskDirs;
+    try {
+      taskDirs = readdirSync(rootDir);
+    } catch {
+      return;
+    }
+    for (const taskId of taskDirs) {
+      scanTaskDir(taskId);
+    }
+  }
+  scanRootDir();
+  function broadcastTask(taskId) {
+    if (!sendFn) return;
+    const taskMap = registry.get(taskId);
+    const entries = taskMap ? [...taskMap.values()] : [];
+    entries.sort((a, b2) => a.elementId < b2.elementId ? -1 : a.elementId > b2.elementId ? 1 : 0);
+    sendFn({ type: "preview_elements_state", taskId, entries });
+  }
+  function writeToDisk(taskId, state) {
+    const filePath = recordFilePath(rootDir, taskId, state.elementId);
+    try {
+      mkdirSync2(join17(rootDir, taskId), { recursive: true });
+      atomicWriteSync(filePath, JSON.stringify(state, null, 2));
+    } catch (err) {
+      logger2.warn(
+        {
+          taskId,
+          elementId: state.elementId,
+          err: err instanceof Error ? err.message : String(err)
+        },
+        "preview_state_store: putState disk write failed"
+      );
+    }
+  }
+  function removeFromDisk(taskId, elementId) {
+    const filePath = recordFilePath(rootDir, taskId, elementId);
+    try {
+      unlinkSync2(filePath);
+    } catch (err) {
+      if (!isEnoent2(err)) {
+        logger2.warn(
+          { taskId, elementId, err: err instanceof Error ? err.message : String(err) },
+          "preview_state_store: deleteByElementId disk unlink failed"
+        );
+      }
+    }
+  }
+  return {
+    getByElementId(taskId, elementId) {
+      return registry.get(taskId)?.get(elementId);
+    },
+    findByProjectRoot(taskId, projectRoot) {
+      const taskMap = registry.get(taskId);
+      if (!taskMap) return void 0;
+      for (const state of taskMap.values()) {
+        if (state.projectRoot === projectRoot) return state;
+      }
+      return void 0;
+    },
+    putState(taskId, state) {
+      writeToDisk(taskId, state);
+      const taskMap = getTaskMap(taskId);
+      taskMap.set(state.elementId, state);
+      broadcastTask(taskId);
+    },
+    deleteByElementId(taskId, elementId) {
+      const taskMap = registry.get(taskId);
+      if (!taskMap) return;
+      const existed = taskMap.has(elementId);
+      if (!existed) return;
+      removeFromDisk(taskId, elementId);
+      taskMap.delete(elementId);
+      if (taskMap.size === 0) registry.delete(taskId);
+      broadcastTask(taskId);
+    },
+    listByTask(taskId) {
+      const taskMap = registry.get(taskId);
+      if (!taskMap) return [];
+      const entries = [...taskMap.values()];
+      entries.sort((a, b2) => a.elementId < b2.elementId ? -1 : a.elementId > b2.elementId ? 1 : 0);
+      return entries;
+    },
+    setSendControlMessage(fn) {
+      sendFn = fn;
+    },
+    broadcast(taskId) {
+      broadcastTask(taskId);
+    },
+    dispose() {
+      registry.clear();
+      sendFn = null;
+    }
+  };
+}
+
 // src/services/preview-proxy.ts
 import http2 from "http";
 
@@ -36449,30 +36663,30 @@ function createPreviewProxy(config2) {
 }
 
 // src/services/publish/published-artifact-store.ts
-import { createHash, randomUUID as randomUUID2 } from "crypto";
-import { mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync5, watch as watch2 } from "fs";
+import { createHash, randomUUID as randomUUID3 } from "crypto";
+import { mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync6, watch as watch2 } from "fs";
 import { mkdir as mkdir5, readFile as readFile10, rename as rename6, unlink as unlink4, writeFile as writeFile8 } from "fs/promises";
-import { dirname as dirname9, join as join18, relative as relative2 } from "path";
+import { dirname as dirname8, join as join18, relative as relative2 } from "path";
 var DEBOUNCE_MS2 = 200;
 function bindMapKey(bindKind, bindKey) {
   return `${bindKind}:${bindKey}`;
 }
-function recordFilePath(rootDir, taskId, bindKind, bindKey) {
+function recordFilePath2(rootDir, taskId, bindKind, bindKey) {
   return join18(rootDir, taskId, bindKind, `${bindKey}.json`);
 }
 function sha256Hex(input) {
   return createHash("sha256").update(input, "utf-8").digest("hex");
 }
 async function atomicWrite(filePath, content) {
-  await mkdir5(dirname9(filePath), { recursive: true });
-  const tmpPath = `${filePath}.${randomUUID2()}.tmp`;
+  await mkdir5(dirname8(filePath), { recursive: true });
+  const tmpPath = `${filePath}.${randomUUID3()}.tmp`;
   await writeFile8(tmpPath, content, "utf-8");
   await rename6(tmpPath, filePath);
 }
-function parseRecord(filePath, logger2) {
+function parseRecord2(filePath, logger2) {
   let raw;
   try {
-    raw = readFileSync5(filePath, "utf-8");
+    raw = readFileSync6(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -36493,7 +36707,7 @@ function parseRecord(filePath, logger2) {
   }
   return result.data;
 }
-function isEnoent2(err) {
+function isEnoent3(err) {
   return err instanceof Error && Reflect.get(err, "code") === "ENOENT";
 }
 function createPublishedArtifactStore(opts) {
@@ -36504,17 +36718,17 @@ function createPublishedArtifactStore(opts) {
   const ownWrites = /* @__PURE__ */ new Set();
   let watcher = null;
   let disposed = false;
-  mkdirSync2(rootDir, { recursive: true });
+  mkdirSync3(rootDir, { recursive: true });
   function scanKindDir(taskId, kindPath) {
     let files;
     try {
-      files = readdirSync(kindPath);
+      files = readdirSync2(kindPath);
     } catch {
       return;
     }
     for (const file of files) {
       if (!file.endsWith(".json")) continue;
-      const record = parseRecord(join18(kindPath, file), logger2);
+      const record = parseRecord2(join18(kindPath, file), logger2);
       if (record) inMemorySet(taskId, record);
     }
   }
@@ -36522,7 +36736,7 @@ function createPublishedArtifactStore(opts) {
     const taskPath = join18(rootDir, taskId);
     let kindDirs;
     try {
-      kindDirs = readdirSync(taskPath);
+      kindDirs = readdirSync2(taskPath);
     } catch {
       return;
     }
@@ -36534,7 +36748,7 @@ function createPublishedArtifactStore(opts) {
   function scanRootDir() {
     let taskDirs;
     try {
-      taskDirs = readdirSync(rootDir);
+      taskDirs = readdirSync2(rootDir);
     } catch {
       return;
     }
@@ -36658,7 +36872,7 @@ function createPublishedArtifactStore(opts) {
       return entries;
     },
     async putBinding(taskId, record) {
-      const filePath = recordFilePath(rootDir, taskId, record.bindKind, record.bindKey);
+      const filePath = recordFilePath2(rootDir, taskId, record.bindKind, record.bindKey);
       ownWrites.add(filePath);
       try {
         await atomicWrite(filePath, JSON.stringify(record, null, 2));
@@ -36670,12 +36884,12 @@ function createPublishedArtifactStore(opts) {
       broadcastTask(taskId);
     },
     async deleteBinding(taskId, bindKind, bindKey) {
-      const filePath = recordFilePath(rootDir, taskId, bindKind, bindKey);
+      const filePath = recordFilePath2(rootDir, taskId, bindKind, bindKey);
       ownWrites.add(filePath);
       try {
         await unlink4(filePath);
       } catch (err) {
-        if (!isEnoent2(err)) {
+        if (!isEnoent3(err)) {
           ownWrites.delete(filePath);
           throw err;
         }
@@ -37878,44 +38092,51 @@ async function storePreviewArtifact(input, bindKey, resolvedProjectRoot, existin
     expiresAt: result.expiresAt,
     ttl: input.ttl,
     lastSize: files.reduce((sum, f2) => sum + f2.content.length, 0),
-    projectRoot: resolvedProjectRoot ?? void 0,
+    projectRoot: resolvedProjectRoot,
     canvasElementId: input.target.kind === "previewPort" ? input.target.canvasElementId : void 0
   };
   await input.publishedArtifactStore.putBinding(input.taskId, newRecord);
 }
+function resolvePreviewProjectRoot(input, target) {
+  const canvasElementId = target.canvasElementId;
+  const storeEntry = canvasElementId && input.previewStateStore ? input.previewStateStore.getByElementId(input.taskId, canvasElementId) ?? null : null;
+  const storeProjectRoot = storeEntry?.projectRoot ?? null;
+  const detectedPortMatch = input.getDetectedPorts().find((p2) => p2.port === target.previewPort);
+  const detectedProjectRoot = detectedPortMatch?.projectRoot ?? null;
+  const resolvedProjectRoot = storeProjectRoot ?? detectedProjectRoot ?? null;
+  const resolvedFrom = storeProjectRoot ? "store" : detectedProjectRoot ? "detected_ports" : "none";
+  return { resolvedProjectRoot, resolvedFrom, storeProjectRoot, detectedProjectRoot };
+}
 async function runPublishPreviewPort(input, ctx) {
   if (input.target.kind !== "previewPort") {
     return { ok: false, phase: "failed", error: "Internal error: wrong target kind" };
   }
-  const agentHint = input.target.projectRoot;
-  const previewPortNumber = input.target.previewPort;
-  const detectedPortMatch = input.getDetectedPorts().find((p2) => p2.port === previewPortNumber);
-  const resolvedProjectRoot = agentHint ?? detectedPortMatch?.projectRoot ?? null;
-  const bindKey = resolvedProjectRoot !== null ? sha256Hex(resolvedProjectRoot) : null;
-  const existing = bindKey !== null ? input.publishedArtifactStore?.getBinding(input.taskId, "preview", bindKey) ?? null : null;
-  const buildRoot = resolvedProjectRoot ?? input.projectRoot;
+  const target = input.target;
+  const canvasElementId = target.canvasElementId;
+  const resolution = resolvePreviewProjectRoot(input, target);
+  const { resolvedProjectRoot } = resolution;
   ctx.log?.({
     event: "publish_preview_resolved",
-    agentHint: agentHint ?? null,
-    detectedPortMatch: detectedPortMatch?.projectRoot ?? null,
+    canvasElementId: canvasElementId ?? null,
+    previewPort: target.previewPort,
+    storeProjectRoot: resolution.storeProjectRoot,
+    detectedPortProjectRoot: resolution.detectedProjectRoot,
     resolvedProjectRoot,
-    buildRoot
+    resolvedFrom: resolution.resolvedFrom
   });
-  const built = await detectAndBuild(buildRoot, ctx);
+  if (!resolvedProjectRoot) {
+    const error2 = canvasElementId ? `Preview element has no resolvable projectRoot \u2014 was \`present({projectRoot})\` called? (canvasElementId: ${canvasElementId})` : "Preview publish requires a canvasElementId. The browser must send the stable canvas element id so the daemon can resolve projectRoot from the preview state store.";
+    ctx.onProgress("failed", error2);
+    return { ok: false, phase: "detecting_framework", error: error2 };
+  }
+  const bindKey = sha256Hex(resolvedProjectRoot);
+  const existing = input.publishedArtifactStore?.getBinding(input.taskId, "preview", bindKey) ?? null;
+  const built = await detectAndBuild(resolvedProjectRoot, ctx);
   if (!built.ok) return built.outcome;
   ctx.onProgress("uploading");
   try {
     const result = await uploadPreviewFiles(input, built.framework, built.files, existing);
-    if (bindKey !== null) {
-      await storePreviewArtifact(
-        input,
-        bindKey,
-        resolvedProjectRoot,
-        existing,
-        result,
-        built.files
-      );
-    }
+    await storePreviewArtifact(input, bindKey, resolvedProjectRoot, existing, result, built.files);
     ctx.onProgress("completed");
     return { ok: true, id: result.id, url: result.url, expiresAt: result.expiresAt };
   } catch (err) {
@@ -37966,6 +38187,7 @@ function createPublishTools(ctx) {
             taskId: ctx.taskId.current,
             vizWatcher: ctx.vizWatcher,
             publishedArtifactStore: ctx.publishedArtifactStore,
+            previewStateStore: ctx.previewStateStore,
             getDetectedPorts: ctx.getDetectedPorts
           },
           { onProgress: () => {
@@ -38068,6 +38290,7 @@ async function handlePublishRequest(params) {
       taskId: params.taskId,
       vizWatcher: params.vizWatcher,
       publishedArtifactStore: params.publishedArtifactStore,
+      previewStateStore: params.previewStateStore,
       getDetectedPorts: params.getDetectedPorts
     },
     { onProgress: emitProgress, ...params.log !== void 0 && { log: params.log } }
@@ -39178,38 +39401,22 @@ async function rehydrateCollabQueues(persistence, taskManager, log) {
     })
   );
 }
-function isPreviewData(raw) {
-  return typeof raw === "object" && raw !== null && !Array.isArray(raw);
-}
-function collectOwnedPreviews(canvasRepo, taskId, selfUserId) {
-  try {
-    const elements = canvasRepo.getElements(taskId);
-    const ports = [];
-    for (const el of elements) {
-      if (el.data.type !== "preview") continue;
-      const data = isPreviewData(el.data.data) ? el.data.data : null;
-      if (!data || data.ownerUserId !== selfUserId) continue;
-      if (typeof data.port === "number") ports.push(data.port);
-    }
-    return ports;
-  } catch {
-    return [];
-  }
+function collectOwnedPreviews(_canvasRepo, _taskId, _selfUserId) {
+  return [];
 }
 async function rehydrateCanvasPreviews(canvasRepo, previewProxy, selfUserId, taskStateStore, log) {
   const tasks = await taskStateStore.listTasks();
   const refs = [];
   for (const taskId of Object.keys(tasks)) {
     if (!await canvasRepo.hasLocalDoc(taskId)) continue;
-    for (const port of collectOwnedPreviews(canvasRepo, taskId, selfUserId)) {
-      refs.push({ taskId, port });
+    for (const ref of collectOwnedPreviews(canvasRepo, taskId, selfUserId)) {
+      refs.push(ref);
     }
   }
   const warmedTaskIds = /* @__PURE__ */ new Set();
   for (const { taskId, port } of refs) {
     try {
-      const newProxyPort = await previewProxy.acquire(port);
-      await reconcileProxyPortInCanvas(canvasRepo, taskId, port, newProxyPort);
+      await previewProxy.acquire(port);
       warmedTaskIds.add(taskId);
       log({ event: "canvas_preview_warmed", taskId, port });
     } catch (err) {
@@ -39223,19 +39430,6 @@ async function rehydrateCanvasPreviews(canvasRepo, previewProxy, selfUserId, tas
   }
   return Array.from(warmedTaskIds);
 }
-async function reconcileProxyPortInCanvas(canvasRepo, taskId, upstreamPort, newProxyPort) {
-  if (!await canvasRepo.hasLocalDoc(taskId)) return;
-  for (const el of canvasRepo.getElements(taskId)) {
-    if (el.data.type !== "preview") continue;
-    const rec = el.data.data;
-    if (!isPreviewData(rec)) continue;
-    if (rec.port !== upstreamPort) continue;
-    if (rec.proxyPort === newProxyPort) continue;
-    canvasRepo.updateElement(taskId, el.id, {
-      data: { ...rec, proxyPort: newProxyPort }
-    });
-  }
-}
 async function migratePinnedToFavoriteTasks(taskStateStore, userSettingsStore, log) {
   const settings = await userSettingsStore.getSettings();
   if (settings.favoriteTasks.length > 0) return;
@@ -39245,6 +39439,77 @@ async function migratePinnedToFavoriteTasks(taskStateStore, userSettingsStore, l
   await userSettingsStore.updateSetting("favoriteTasks", pinnedIds);
   log({ event: "pinned_to_favorites_migrated", count: pinnedIds.length });
 }
+function isObjectRecord(v2) {
+  return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
+}
+function extractLegacyPreviewState(elementId, rawData) {
+  if (!isObjectRecord(rawData)) return null;
+  const ownerUserId = typeof rawData.ownerUserId === "string" && rawData.ownerUserId.length > 0 ? rawData.ownerUserId : null;
+  if (!ownerUserId) return null;
+  const state = { elementId, ownerUserId };
+  let hasLegacyField = false;
+  if (typeof rawData.port === "number" && Number.isInteger(rawData.port) && rawData.port > 0) {
+    state.port = rawData.port;
+    hasLegacyField = true;
+  }
+  if (typeof rawData.url === "string" && rawData.url.length > 0) {
+    state.url = rawData.url;
+    hasLegacyField = true;
+  }
+  if (typeof rawData.proxyPort === "number" && Number.isInteger(rawData.proxyPort) && rawData.proxyPort > 0) {
+    state.proxyPort = rawData.proxyPort;
+    hasLegacyField = true;
+  }
+  if (typeof rawData.initialPath === "string" && rawData.initialPath.length > 0) {
+    state.initialPath = rawData.initialPath;
+    hasLegacyField = true;
+  }
+  if (typeof rawData.projectRoot === "string" && rawData.projectRoot.length > 0) {
+    state.projectRoot = rawData.projectRoot;
+    hasLegacyField = true;
+  }
+  return hasLegacyField ? state : null;
+}
+function migrateLegacyPreviewDataForTask(taskId, canvasRepo, store, log) {
+  let seededCount = 0;
+  const elements = canvasRepo.getElements(taskId);
+  for (const el of elements) {
+    if (el.data.type !== "preview") continue;
+    const elementId = String(el.id);
+    if (store.getByElementId(taskId, elementId)) continue;
+    const legacy = extractLegacyPreviewState(elementId, el.data.data);
+    if (!legacy) continue;
+    store.putState(taskId, legacy);
+    seededCount += 1;
+    log({
+      event: "preview_legacy_migrated",
+      taskId,
+      elementId,
+      port: legacy.port,
+      projectRoot: legacy.projectRoot
+    });
+  }
+  return seededCount;
+}
+async function migrateLegacyPreviewData(canvasRepo, previewStateStore, taskStateStore, log) {
+  const tasks = await taskStateStore.listTasks();
+  let totalSeeded = 0;
+  for (const taskId of Object.keys(tasks)) {
+    if (!await canvasRepo.hasLocalDoc(taskId)) continue;
+    try {
+      totalSeeded += migrateLegacyPreviewDataForTask(taskId, canvasRepo, previewStateStore, log);
+    } catch (err) {
+      log({
+        event: "preview_legacy_migrate_task_failed",
+        taskId,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  if (totalSeeded > 0) {
+    log({ event: "preview_legacy_migrate_complete", seededCount: totalSeeded });
+  }
+}
 async function sweepStaleTasks(taskStateStore, taskManager, log) {
   const tasks = await taskStateStore.listTasks();
   const actions = planStaleSweep(tasks, (id) => taskManager.isRunning(id));
@@ -39372,7 +39637,7 @@ function assertNever3(value) {
 
 // src/services/bootstrap/self-update-lock.ts
 import { mkdir as mkdir7, readFile as readFile16, stat as stat5, unlink as unlink6, writeFile as writeFile11 } from "fs/promises";
-import { dirname as dirname10, join as join24 } from "path";
+import { dirname as dirname9, join as join24 } from "path";
 var LOCK_FILENAME = ".lock";
 var STALE_LOCK_MS = 10 * 60 * 1e3;
 var LockFileSchema = external_exports.object({
@@ -39464,7 +39729,7 @@ async function resolveEexist(shipyardHome, path2, ownerPid, now, isProcessAlive2
 }
 async function tryAcquireLockExclusive(shipyardHome, pid, now, isProcessAlive2) {
   const path2 = lockPath(shipyardHome);
-  await mkdir7(dirname10(path2), { recursive: true });
+  await mkdir7(dirname9(path2), { recursive: true });
   const body = JSON.stringify({ pid, startedAt: now() });
   while (true) {
     try {
@@ -40025,7 +40290,7 @@ function createCanvasResourceResolver(deps) {
 
 // src/services/credentials/vault-key-manager.ts
 import { mkdir as mkdir8, readFile as readFile17, writeFile as writeFile12 } from "fs/promises";
-import { dirname as dirname11, join as join26 } from "path";
+import { dirname as dirname10, join as join26 } from "path";
 
 // src/services/credentials/vault-crypto.ts
 async function generateVaultKey() {
@@ -40111,12 +40376,12 @@ async function resolveMachineId(shipyardHome) {
   } catch {
   }
   const id = globalThis.crypto.randomUUID();
-  await mkdir8(dirname11(idPath), { recursive: true });
+  await mkdir8(dirname10(idPath), { recursive: true });
   await writeFile12(idPath, id, { encoding: "utf-8", mode: 384 });
   return id;
 }
 async function saveKeyLocally(keyPath, key) {
-  await mkdir8(dirname11(keyPath), { recursive: true });
+  await mkdir8(dirname10(keyPath), { recursive: true });
   await writeFile12(keyPath, key, { encoding: "utf-8", mode: 384 });
 }
 
@@ -40814,7 +41079,7 @@ function createGitCheckpointService() {
 import { createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
 
 // src/services/harness/comment-server.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID4 } from "crypto";
 import { access as access2, readFile as readFile20 } from "fs/promises";
 import { join as join29, relative as relative3 } from "path";
 var TOOL_DESCRIPTION = [
@@ -40933,7 +41198,7 @@ function resolveShortCommentId(annotations, input) {
 }
 function buildReplyAnnotation(parent, body) {
   const base3 = {
-    commentId: randomUUID3(),
+    commentId: randomUUID4(),
     body,
     authorName: "Claude Code",
     authorKind: "agent",
@@ -41235,7 +41500,7 @@ async function handleReplyComment(ctx, parentCommentId, comment2) {
 async function handlePlanComment(ctx, anchorText, comment2) {
   const annotation = {
     annotationType: "plan-text",
-    commentId: randomUUID3(),
+    commentId: randomUUID4(),
     anchorText,
     anchorContext: null,
     body: comment2,
@@ -41285,7 +41550,7 @@ async function handleDiffComment(ctx, filePath, lineNumber, comment2) {
   const lineContentHash = lineContent ? djb2Hash(lineContent) : "";
   const annotation = {
     annotationType: "diff-hunk",
-    commentId: randomUUID3(),
+    commentId: randomUUID4(),
     filePath: normalizedPath,
     lineNumber,
     lineContent,
@@ -41977,7 +42242,7 @@ var PresentPortSchema = external_exports.object({
   width: external_exports.number().int().positive().optional().describe("Canvas only."),
   height: external_exports.number().int().positive().optional().describe("Canvas only."),
   projectRoot: external_exports.string().optional().describe(
-    "Absolute path to the dev server's package.json directory. Overrides cwd-based auto-detection. Provide this when you know the project root (e.g. the app you just spawned) \u2014 it makes the canvas publish URL stable across port changes. Use for Docker / remote / monorepo cases where lsof cwd detection would land on the wrong package.json."
+    "Absolute path to the dev server's package.json directory. Binds this preview to a stable app identity. Restarting your dev server on a new port (or a fresh `present` call) with the same projectRoot will reuse the same canvas element \u2014 no duplicate frames, and the published URL is stable across port restarts. Without projectRoot, every port change creates a new element."
   )
 });
 var PresentUrlSchema = external_exports.object({
@@ -42006,7 +42271,7 @@ var PresentToolInputShape = {
   height: external_exports.number().int().positive().optional().describe("Canvas only; ignored elsewhere."),
   initialPath: external_exports.string().optional().describe('SPA route for source="port" on canvas (e.g. "/settings").'),
   projectRoot: external_exports.string().optional().describe(
-    `Absolute path to the dev server's package.json dir (source="port" only). Overrides lsof cwd auto-detect. Provide when you know it \u2014 makes the publish URL stable across port restarts.`
+    `Absolute path to the dev server's package.json dir (source="port" only). Binds this preview to a stable app identity. Restarting your dev server on a new port with the same projectRoot will reuse the same canvas element \u2014 no duplicate frames, and the published URL is stable across port restarts. Without projectRoot, every port change creates a new element.`
   ),
   force: external_exports.boolean().optional().describe("Re-apply an already-placed slug to canvas after editing. Slug+canvas only.")
 };
@@ -51285,6 +51550,7 @@ function createHarnessMcpServer(ctx) {
     projectRoot: ctx.projectRoot,
     previewProxy: ctx.previewProxy,
     publishedArtifactStore: ctx.publishedArtifactStore,
+    previewStateStore: ctx.previewStateStore,
     getDetectedPorts: ctx.getDetectedPorts
   };
   const server = createSdkMcpServer({
@@ -51307,37 +51573,53 @@ function createHarnessMcpServer(ctx) {
 }
 
 // src/services/harness/visualization-file-watcher.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 import { watch as watch3 } from "fs";
 import { mkdir as mkdir10, readFile as readFile22, rename as rename9, writeFile as writeFile15 } from "fs/promises";
-import { dirname as dirname12, join as join31 } from "path";
+import { dirname as dirname11, join as join31 } from "path";
 var PREVIEW_DEFAULT_W = 1200;
 var PREVIEW_DEFAULT_H = 800;
 function previewDataToLoroValue(data) {
-  const out = { ownerUserId: data.ownerUserId };
-  if (data.port !== void 0) out.port = data.port;
-  if (data.url !== void 0) out.url = data.url;
-  if (data.proxyPort !== void 0) out.proxyPort = data.proxyPort;
-  if (data.initialPath !== void 0) out.initialPath = data.initialPath;
-  return out;
+  return { ownerUserId: data.ownerUserId };
 }
-function isObjectRecord(v2) {
+function isObjectRecord2(v2) {
   return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
 }
 function extractPreviewData(raw) {
-  if (!isObjectRecord(raw)) return null;
+  if (!isObjectRecord2(raw)) return null;
   const out = {};
-  if (typeof raw.port === "number") out.port = raw.port;
-  if (typeof raw.url === "string") out.url = raw.url;
-  if (typeof raw.proxyPort === "number") out.proxyPort = raw.proxyPort;
   if (typeof raw.ownerUserId === "string") out.ownerUserId = raw.ownerUserId;
-  if (typeof raw.initialPath === "string") out.initialPath = raw.initialPath;
+  return out;
+}
+function buildPreviewState(elementId, params, ownerUserId, existing) {
+  const state = { elementId, ownerUserId };
+  const port = params.port ?? existing?.port;
+  if (port !== void 0) state.port = port;
+  const url = params.url ?? existing?.url;
+  if (url !== void 0) state.url = url;
+  const proxyPort = params.proxyPort ?? existing?.proxyPort;
+  if (proxyPort !== void 0) state.proxyPort = proxyPort;
+  const initialPath = params.initialPath ?? existing?.initialPath;
+  if (initialPath !== void 0) state.initialPath = initialPath;
+  const projectRoot = params.projectRoot ?? existing?.projectRoot;
+  if (typeof projectRoot === "string" && projectRoot.length > 0) state.projectRoot = projectRoot;
+  return state;
+}
+function mergedPreviewData(data, state) {
+  const out = {
+    ownerUserId: data.ownerUserId
+  };
+  if (state.port !== void 0) out.port = state.port;
+  if (state.url !== void 0) out.url = state.url;
+  if (state.proxyPort !== void 0) out.proxyPort = state.proxyPort;
+  if (state.initialPath !== void 0) out.initialPath = state.initialPath;
+  if (state.projectRoot !== void 0) out.projectRoot = state.projectRoot;
   return out;
 }
 var DEBOUNCE_MS3 = 200;
 async function atomicWrite2(filePath, content) {
-  await mkdir10(dirname12(filePath), { recursive: true });
-  const tmpPath = `${filePath}.${randomUUID4()}.tmp`;
+  await mkdir10(dirname11(filePath), { recursive: true });
+  const tmpPath = `${filePath}.${randomUUID5()}.tmp`;
   await writeFile15(tmpPath, content, "utf-8");
   await rename9(tmpPath, filePath);
 }
@@ -51506,7 +51788,7 @@ var VisualizationFileWatcher = class {
     if (this.#disposed) return;
     if (this.#watchedFiles.has(filePath)) return;
     this.#watchedFiles.add(filePath);
-    const dirPath = dirname12(filePath);
+    const dirPath = dirname11(filePath);
     const existing = this.#dirWatchers.get(dirPath);
     if (existing) {
       existing.refCount += 1;
@@ -51546,7 +51828,7 @@ var VisualizationFileWatcher = class {
   }
   #stopFileWatch(filePath) {
     if (!this.#watchedFiles.delete(filePath)) return;
-    const dirPath = dirname12(filePath);
+    const dirPath = dirname11(filePath);
     const entry = this.#dirWatchers.get(dirPath);
     if (entry) {
       entry.refCount -= 1;
@@ -51564,39 +51846,56 @@ var VisualizationFileWatcher = class {
   /**
    * Idempotent create-or-update of a preview canvas element.
    *
-   * The match key is `{taskId, port || url}`: if an element already exists
-   * with the same type='preview' and matching port (or url), we update its
-   * `data` in place and return its id. Otherwise we create a new element.
+   * Dedupe order (pointer-only CRDT, PROTOCOL_VERSION 36):
+   *   1. If params has `projectRoot` AND `previewStateStore` already has
+   *      an entry with a matching `projectRoot` → update that entry's
+   *      port / url / proxyPort in place (same elementId, no new canvas
+   *      element). This is the port-swap upsert: Vite restarts on a new
+   *      port, daemon calls `present({projectRoot})` again, and the
+   *      existing element's iframe URL flips — no duplicates.
+   *   2. Else if the CRDT has a `preview` element with matching
+   *      `ownerUserId` AND the store has an entry with matching port —
+   *      update that entry. This covers the legacy / no-projectRoot path
+   *      where dedupe keys off the live port alone.
+   *   3. Else create a new canvas element (pointer-only) + a new store
+   *      entry carrying the mutable state.
+   *
+   * In every case, the store is written with the element's projectRoot
+   * (if known) so the publish pipeline can look it up by elementId.
    *
-   * The check+write happens in the same tick — this function is synchronous
-   * with respect to the canvas repository, so a concurrent caller cannot
-   * race the lookup. (loro-crdt mutations are synchronous via `change()`.)
+   * loro-crdt mutations are synchronous via `change()`, so the
+   * check+write against the CRDT cannot race a concurrent caller.
    */
   createOrUpdatePreviewElement(params) {
     const data = this.registry.planPreviewElement(params);
     const loroData = previewDataToLoroValue(data);
+    const store = this.#deps.previewStateStore ?? null;
+    if (store && params.projectRoot !== void 0 && params.projectRoot.length > 0) {
+      const existing = store.findByProjectRoot(params.taskId, params.projectRoot);
+      if (existing) {
+        const elementId2 = existing.elementId;
+        const mergedState = buildPreviewState(elementId2, params, data.ownerUserId, existing);
+        store.putState(params.taskId, mergedState);
+        return {
+          kind: "updated",
+          elementId: elementId2,
+          data: mergedPreviewData(data, mergedState)
+        };
+      }
+    }
     const existingElements = this.#deps.canvasRepo.getElements(params.taskId);
-    const match2 = existingElements.find((el) => {
-      if (el.data.type !== "preview") return false;
-      const elData = extractPreviewData(el.data.data);
-      if (!elData) return false;
-      if (params.port !== void 0) return elData.port === params.port;
-      if (params.url !== void 0) return elData.url === params.url;
-      return false;
-    });
-    if (match2) {
-      const matchTreeId = match2.id;
-      const preservedData = (() => {
-        if (data.projectRoot !== void 0) return data;
-        const existing = extractPreviewData(match2.data.data);
-        if (existing?.projectRoot) {
-          return { ...data, projectRoot: existing.projectRoot };
-        }
-        return data;
-      })();
-      const preservedLoroData = previewDataToLoroValue(preservedData);
-      this.#deps.canvasRepo.updateElement(params.taskId, matchTreeId, { data: preservedLoroData });
-      return { kind: "updated", elementId: `${match2.id}`, data: preservedData };
+    const legacyMatch = store ? this.#findLegacyPreviewMatch(existingElements, params, data.ownerUserId) : null;
+    if (legacyMatch && store) {
+      const matchTreeId = legacyMatch.id;
+      const elementId2 = `${matchTreeId}`;
+      const existingState = store.getByElementId(params.taskId, elementId2);
+      const mergedState = buildPreviewState(elementId2, params, data.ownerUserId, existingState);
+      store.putState(params.taskId, mergedState);
+      return {
+        kind: "updated",
+        elementId: elementId2,
+        data: mergedPreviewData(data, mergedState)
+      };
     }
     const positionable = existingElements.map((el) => ({
       x: el.data.x,
@@ -51616,7 +51915,26 @@ var VisualizationFileWatcher = class {
       zIndex: position.zIndex,
       data: loroData
     });
-    return { kind: "created", elementId: `${nodeId}`, data };
+    const elementId = `${nodeId}`;
+    if (store) {
+      const freshState = buildPreviewState(elementId, params, data.ownerUserId, void 0);
+      store.putState(params.taskId, freshState);
+    }
+    return { kind: "created", elementId, data };
+  }
+  #findLegacyPreviewMatch(existingElements, params, ownerUserId) {
+    const store = this.#deps.previewStateStore;
+    if (!store) return null;
+    for (const el of existingElements) {
+      if (el.data.type !== "preview") continue;
+      const elData = extractPreviewData(el.data.data);
+      if (!elData || elData.ownerUserId !== ownerUserId) continue;
+      const state = store.getByElementId(params.taskId, `${el.id}`);
+      if (!state) continue;
+      if (params.port !== void 0 && state.port === params.port) return el;
+      if (params.url !== void 0 && state.url === params.url) return el;
+    }
+    return null;
   }
   async #createCanvasElement(effect) {
     const existingElements = this.#deps.canvasRepo.getElements(effect.taskId);
@@ -51757,17 +52075,7 @@ var VisualizationRegistry = class {
    * idempotency key derived from `{taskId, port || url}`.
    */
   planPreviewElement(params) {
-    const data = {
-      ownerUserId: params.ownerUserId
-    };
-    if (params.port !== void 0) data.port = params.port;
-    if (params.url !== void 0) data.url = params.url;
-    if (params.proxyPort !== void 0) data.proxyPort = params.proxyPort;
-    if (params.initialPath !== void 0) data.initialPath = params.initialPath;
-    if (typeof params.projectRoot === "string" && params.projectRoot.length > 0) {
-      data.projectRoot = params.projectRoot;
-    }
-    return data;
+    return { ownerUserId: params.ownerUserId };
   }
   /**
    * Force-refresh the canvas element for a presented visualization, regardless
@@ -75398,7 +75706,7 @@ var ScheduleEvaluator = class {
 };
 
 // src/services/serve-factory-helpers.ts
-import { existsSync as existsSync6, readdirSync as readdirSync2, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync6, readdirSync as readdirSync3, readFileSync as readFileSync7 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join34 } from "path";
 
@@ -77978,7 +78286,7 @@ function rehydrateVizRegistry(registry, vizWatcher, resolvedTaskId, vizDir, log)
   const registryPath = join34(vizDir, resolvedTaskId, "registry.json");
   if (!existsSync6(registryPath)) return Promise.resolve();
   try {
-    const raw = readFileSync6(registryPath, "utf-8");
+    const raw = readFileSync7(registryPath, "utf-8");
     const parsed = PersistedVisualizationRegistrySchema.safeParse(JSON.parse(raw));
     if (parsed.success) {
       const effects = registry.rehydrate(resolvedTaskId, parsed.data);
@@ -78003,7 +78311,7 @@ function rehydrateVizRegistry(registry, vizWatcher, resolvedTaskId, vizDir, log)
 }
 function prehydrateAllVizWatchers(vizDir, getOrCreateVizWatcher) {
   try {
-    for (const entry of readdirSync2(vizDir, { withFileTypes: true })) {
+    for (const entry of readdirSync3(vizDir, { withFileTypes: true })) {
       if (entry.isDirectory() && existsSync6(join34(vizDir, entry.name, "registry.json"))) {
         getOrCreateVizWatcher(entry.name);
       }
@@ -78729,7 +79037,7 @@ function resolveModelFamily(model) {
   if (model.includes("haiku")) return "haiku";
   return "sonnet";
 }
-var CC_VERSION = "2.1.111";
+var CC_VERSION = "2.1.120";
 var BILLING_HEADER_PREFIX = `x-anthropic-billing-header: cc_version=${CC_VERSION}; cc_entrypoint=sdk-ts;`;
 function buildConversationSystemPrompt(model) {
   const family = resolveModelFamily(model);
@@ -78825,7 +79133,7 @@ async function resolveDirectApiCredentials(method) {
 }
 
 // src/services/session/direct-api-subprocess.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 
 // ../../node_modules/.pnpm/@anthropic-ai+sdk@0.90.0_zod@4.3.6/node_modules/@anthropic-ai/sdk/internal/tslib.mjs
 function __classPrivateFieldSet(receiver, state, value, kind, f2) {
@@ -84994,7 +85302,7 @@ var DirectApiSubprocess = class _DirectApiSubprocess {
     const allToolNames = [...SERVER_SIDE_TOOLS.map((t) => t.name), ...tools.map((t) => t.name)];
     onEvent({
       type: "init_received",
-      sessionId: `direct-api-${randomUUID5()}`,
+      sessionId: `direct-api-${randomUUID6()}`,
       metadata: {
         tools: allToolNames,
         skills: [],
@@ -85347,8 +85655,7 @@ async function handlePublish(ctx, input) {
     previewPort: target.previewPort,
     ...target.canvasElementId !== void 0 && {
       canvasElementId: target.canvasElementId
-    },
-    ...target.projectRoot !== void 0 && { projectRoot: target.projectRoot }
+    }
   } : { kind: "canvasElementId", canvasElementId: target.canvasElementId };
   const outcome = await runPublish(
     {
@@ -85361,6 +85668,7 @@ async function handlePublish(ctx, input) {
       taskId: ctx.taskId,
       vizWatcher: ctx.vizWatcher,
       publishedArtifactStore: ctx.publishedArtifactStore,
+      previewStateStore: ctx.previewStateStore,
       getDetectedPorts: ctx.getDetectedPorts
     },
     { onProgress: () => {
@@ -85680,7 +85988,7 @@ function createShipyardResolver() {
 
 // src/services/storage/annotation-store.ts
 import { mkdir as mkdir11, readFile as readFile25, rename as rename10, writeFile as writeFile16 } from "fs/promises";
-import { dirname as dirname13, join as join35 } from "path";
+import { dirname as dirname12, join as join35 } from "path";
 var LegacyBaseFields = external_exports.object({
   commentId: external_exports.string(),
   body: external_exports.string(),
@@ -85732,7 +86040,7 @@ function buildAnnotationStore(dataDir) {
   }
   async function atomicWrite4(taskId, data) {
     const fp = filePath(taskId);
-    await mkdir11(dirname13(fp), { recursive: true });
+    await mkdir11(dirname12(fp), { recursive: true });
     const tmpPath = `${fp}.tmp`;
     await writeFile16(tmpPath, JSON.stringify(data, null, 2), "utf-8");
     await rename10(tmpPath, fp);
@@ -86102,7 +86410,7 @@ async function seedBuiltInTemplates(store, builtIns, dismissed) {
 
 // src/services/storage/credentials-vault-store.ts
 import { mkdir as mkdir13, readFile as readFile27, rename as rename12, writeFile as writeFile18 } from "fs/promises";
-import { dirname as dirname14 } from "path";
+import { dirname as dirname13 } from "path";
 function buildCredentialsVaultStore(filePath) {
   let cache2 = null;
   const listeners = /* @__PURE__ */ new Set();
@@ -86116,7 +86424,7 @@ function buildCredentialsVaultStore(filePath) {
     }
   }
   async function ensureDir() {
-    await mkdir13(dirname14(filePath), { recursive: true });
+    await mkdir13(dirname13(filePath), { recursive: true });
   }
   async function readStore() {
     if (cache2) return cache2;
@@ -86646,9 +86954,9 @@ function buildObservableConversationStore(inner) {
 }
 
 // src/services/storage/projects-store.ts
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 import { mkdir as mkdir15, readFile as readFile29, rename as rename14, writeFile as writeFile20 } from "fs/promises";
-import { dirname as dirname15 } from "path";
+import { dirname as dirname14 } from "path";
 var ProjectsArraySchema = external_exports.array(ProjectSchema);
 function buildProjectsStore(filePath) {
   let cache2 = null;
@@ -86663,7 +86971,7 @@ function buildProjectsStore(filePath) {
     }
   }
   async function ensureDir() {
-    await mkdir15(dirname15(filePath), { recursive: true });
+    await mkdir15(dirname14(filePath), { recursive: true });
   }
   async function readStore() {
     if (cache2) return cache2;
@@ -86723,7 +87031,7 @@ function buildProjectsStore(filePath) {
         const current2 = await readStore();
         const nextOrder = current2.length === 0 ? 0 : Math.max(...current2.map((p2) => p2.order)) + 1;
         const project = {
-          id: randomUUID6(),
+          id: randomUUID7(),
           name,
           order: nextOrder,
           createdAt: Date.now(),
@@ -86787,7 +87095,7 @@ function buildProjectsStore(filePath) {
 
 // src/services/storage/rate-limit-store.ts
 import { mkdir as mkdir16, readFile as readFile30, rename as rename15, writeFile as writeFile21 } from "fs/promises";
-import { dirname as dirname16, join as join38 } from "path";
+import { dirname as dirname15, join as join38 } from "path";
 var RATE_LIMIT_STORE_VERSION = 2;
 var RateLimitRecordSchema = external_exports.object({
   info: RateLimitInfoSchema,
@@ -86969,7 +87277,7 @@ function migrateV1toV2(v1) {
   return { schemaVersion: RATE_LIMIT_STORE_VERSION, records };
 }
 async function atomicWrite3(filePath, data) {
-  await mkdir16(dirname16(filePath), { recursive: true });
+  await mkdir16(dirname15(filePath), { recursive: true });
   const tmpPath = `${filePath}.tmp`;
   await writeFile21(tmpPath, JSON.stringify(data, null, 2), "utf-8");
   await rename15(tmpPath, filePath);
@@ -86980,7 +87288,7 @@ import { join as join39 } from "path";
 
 // src/services/storage/json-document-store.ts
 import { mkdir as mkdir17, readFile as readFile31, rename as rename16, writeFile as writeFile22 } from "fs/promises";
-import { dirname as dirname17 } from "path";
+import { dirname as dirname16 } from "path";
 function buildJsonDocumentStore(opts) {
   const { filePath, recordSchema, currentVersion, migrate } = opts;
   let cache2 = null;
@@ -86995,7 +87303,7 @@ function buildJsonDocumentStore(opts) {
     }
   }
   async function ensureDir() {
-    await mkdir17(dirname17(filePath), { recursive: true });
+    await mkdir17(dirname16(filePath), { recursive: true });
   }
   async function readStore() {
     if (cache2) return cache2;
@@ -87231,7 +87539,7 @@ function buildTemplateStore(dataDir) {
 
 // src/services/storage/user-settings-store.ts
 import { mkdir as mkdir19, readFile as readFile33, rename as rename18, writeFile as writeFile24 } from "fs/promises";
-import { dirname as dirname18 } from "path";
+import { dirname as dirname17 } from "path";
 function buildUserSettingsStore(filePath) {
   let cache2 = null;
   const listeners = /* @__PURE__ */ new Set();
@@ -87245,7 +87553,7 @@ function buildUserSettingsStore(filePath) {
     }
   }
   async function ensureDir() {
-    await mkdir19(dirname18(filePath), { recursive: true });
+    await mkdir19(dirname17(filePath), { recursive: true });
   }
   async function readStore() {
     if (cache2) return cache2;
@@ -87336,7 +87644,7 @@ function buildUserSettingsStore(filePath) {
 }
 
 // src/services/task/orchestrator/task.ts
-import { randomUUID as randomUUID9 } from "crypto";
+import { randomUUID as randomUUID10 } from "crypto";
 import { join as join50 } from "path";
 
 // src/services/event-batching.ts
@@ -90190,13 +90498,13 @@ function skipForMainChannel(content) {
 }
 
 // src/services/plan/plan-handler.ts
-import { existsSync as existsSync8, readdirSync as readdirSync3, statSync as statSync2 } from "fs";
+import { existsSync as existsSync8, readdirSync as readdirSync4, statSync as statSync2 } from "fs";
 import { readFile as readFile35 } from "fs/promises";
 import { homedir as homedir5 } from "os";
 import { join as join44 } from "path";
 
 // src/services/plan/plan-file-bridge.ts
-import { createHash as createHash3, randomUUID as randomUUID7 } from "crypto";
+import { createHash as createHash3, randomUUID as randomUUID8 } from "crypto";
 import { existsSync as existsSync7, watch as watch4 } from "fs";
 import { readFile as readFile34, rename as rename19, writeFile as writeFile25 } from "fs/promises";
 import { homedir as homedir4 } from "os";
@@ -90461,7 +90769,7 @@ var PlanFileBridge = class _PlanFileBridge {
     const content = this.#config.planRepo.getContent(this.#config.taskId);
     const hash = contentHash(content);
     if (hash === this.#lastWrittenHash) return;
-    const tmpPath = `${this.#filePath}.${randomUUID7()}.tmp`;
+    const tmpPath = `${this.#filePath}.${randomUUID8()}.tmp`;
     await writeFile25(tmpPath, content, "utf-8");
     await rename19(tmpPath, this.#filePath);
     this.#lastWrittenHash = hash;
@@ -91214,7 +91522,7 @@ var PlanHandler = class {
     const plansDir = join44(homedir5(), ".claude", "plans");
     if (!existsSync8(plansDir)) return null;
     try {
-      const files = readdirSync3(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
+      const files = readdirSync4(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
         path: join44(plansDir, f2),
         mtime: statSync2(join44(plansDir, f2)).mtimeMs
       })).sort((a, b2) => b2.mtime - a.mtime);
@@ -91833,14 +92141,14 @@ function planPostCompactPending(input) {
 }
 
 // src/services/task/compaction-snapshot.ts
-import { randomUUID as randomUUID8 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 import { homedir as homedir6 } from "os";
 import { join as pathJoin } from "path";
 function resolveArchiveAbsolutePath(channelId) {
   return pathJoin(homedir6(), ".shipyard", "data", "channels", `${channelId}.jsonl`);
 }
 function planCompactionSnapshot(input) {
-  const threadId = randomUUID8();
+  const threadId = randomUUID9();
   const channelId = buildThreadChannelId(input.taskId, threadId);
   const compactionCount = input.messages.filter(
     (m2) => m2.content.some((b2) => b2.type === "compaction_boundary")
@@ -91877,7 +92185,7 @@ function planCompactionSnapshot(input) {
     stats
   };
   const boundaryMessage = {
-    messageId: randomUUID8(),
+    messageId: randomUUID9(),
     channelId: input.channelId,
     participantId: input.humanParticipantId,
     senderKind: "human",
@@ -92757,7 +93065,7 @@ var RewindCheckpointHandler = class {
 
 // src/services/task/side-thread-registry.ts
 import { mkdir as mkdir20, readFile as readFile36, rename as rename20, writeFile as writeFile26 } from "fs/promises";
-import { dirname as dirname19, join as join45 } from "path";
+import { dirname as dirname18, join as join45 } from "path";
 var ThreadFileSchema = external_exports.object({
   threads: external_exports.record(external_exports.string(), ThreadMetadataSchema)
 });
@@ -93118,7 +93426,7 @@ var SideThreadRegistry = class {
       threads[threadId] = entry.metadata;
     }
     const filePath = this.#filePath();
-    await mkdir20(dirname19(filePath), { recursive: true });
+    await mkdir20(dirname18(filePath), { recursive: true });
     const tmpPath = `${filePath}.tmp`;
     await writeFile26(tmpPath, JSON.stringify({ threads }, null, 2), "utf-8");
     await rename20(tmpPath, filePath);
@@ -93533,7 +93841,7 @@ async function resolveResources(ctx, content, history2, excludeUris) {
 import { watch as watch5 } from "fs";
 import { readdir as readdir10, readFile as readFile37 } from "fs/promises";
 import { homedir as homedir7 } from "os";
-import { basename as basename5, dirname as dirname20, join as join46 } from "path";
+import { basename as basename5, dirname as dirname19, join as join46 } from "path";
 var VALID_STATUSES2 = /* @__PURE__ */ new Set(["pending", "in_progress", "completed"]);
 function sanitize(id) {
   return id.replace(/[^a-zA-Z0-9_-]/g, "-");
@@ -93586,7 +93894,7 @@ function createCCTaskFileWatcher(listId, log) {
     let debounceTimer = null;
     const DEBOUNCE_MS4 = 200;
     const targetDirName = basename5(dir);
-    const parentDir = dirname20(dir);
+    const parentDir = dirname19(dir);
     function scheduleRead() {
       if (debounceTimer) clearTimeout(debounceTimer);
       debounceTimer = setTimeout(() => {
@@ -96285,7 +96593,7 @@ var Task = class {
       instructions
     });
     const archiveMessages = plan.messagesToCopy.map((msg) => ({
-      messageId: randomUUID9(),
+      messageId: randomUUID10(),
       channelId: plan.threadMetadata.channelId,
       participantId: msg.participantId,
       senderKind: msg.senderKind,
@@ -100444,7 +100752,7 @@ function buildThemeStore(dataDir) {
 // src/services/themes/vscode-scanner.ts
 import { readdir as readdir13, readFile as readFile39, stat as stat11 } from "fs/promises";
 import { homedir as homedir9 } from "os";
-import { dirname as dirname21, join as join53, normalize as normalize5, resolve as resolve2 } from "path";
+import { dirname as dirname20, join as join53, normalize as normalize5, resolve as resolve2 } from "path";
 var VSCodeThemeEntrySchema2 = external_exports.object({
   extensionId: external_exports.string(),
   name: external_exports.string(),
@@ -100599,7 +100907,7 @@ async function readVSCodeThemeWithIncludes(absolutePath) {
     const obj = await readObject(canonical);
     const include = typeof obj.include === "string" ? obj.include : null;
     if (!include) return obj;
-    const basePath = resolve2(dirname21(canonical), include);
+    const basePath = resolve2(dirname20(canonical), include);
     const base3 = await walk(basePath, depth + 1);
     return mergeThemeObjects(base3, obj);
   };
@@ -100912,7 +101220,8 @@ async function createDaemon(deps) {
     const watcher = new VisualizationFileWatcher(registry, {
       canvasRepo,
       vizDir,
-      log: deps.log
+      log: deps.log,
+      previewStateStore: deps.previewStateStore ?? null
     });
     watcher.setSendControlMessage((msg) => taskManager.broadcastControl(msg));
     watcher.setRehydrationPromise(
@@ -100937,26 +101246,25 @@ async function createDaemon(deps) {
   }
   const trackedPreviewPorts = /* @__PURE__ */ new Map();
   const previewLifecycleSubs = /* @__PURE__ */ new Map();
-  function readLocalPreviewPort(dataField, selfUserId) {
-    if (!isRecord4(dataField)) return void 0;
-    if (dataField.ownerUserId !== selfUserId) return void 0;
-    const port = dataField.port;
-    return typeof port === "number" ? port : void 0;
+  function isLocalPreviewElement(dataField, selfUserId) {
+    if (!isRecord4(dataField)) return false;
+    return dataField.ownerUserId === selfUserId;
   }
   function collectLocalPreviewPorts(taskId) {
     const current2 = /* @__PURE__ */ new Map();
+    const store2 = deps.previewStateStore ?? null;
+    if (!store2) return current2;
     for (const el of canvasRepo.getElements(taskId)) {
       if (el.data.type !== "preview") continue;
-      const port = readLocalPreviewPort(el.data.data, deps.auth.userId);
-      if (port !== void 0) current2.set(String(el.id), port);
+      if (!isLocalPreviewElement(el.data.data, deps.auth.userId)) continue;
+      const state = store2.getByElementId(taskId, String(el.id));
+      const port = state?.port;
+      if (typeof port === "number") current2.set(String(el.id), port);
     }
     return current2;
   }
-  function reconcilePreviewRefs(taskId) {
-    const current2 = collectLocalPreviewPorts(taskId);
-    const tracked = trackedPreviewPorts.get(taskId) ?? /* @__PURE__ */ new Map();
-    trackedPreviewPorts.set(taskId, current2);
-    for (const [elementId, port] of tracked) {
+  function releaseRemovedProxyRefs(previous, current2) {
+    for (const [elementId, port] of previous) {
       const stillPresent = current2.get(elementId);
       if (stillPresent === void 0 || stillPresent !== port) {
         deps.previewProxy.release(port).catch(() => {
@@ -100964,6 +101272,22 @@ async function createDaemon(deps) {
       }
     }
   }
+  function sweepOrphanedPreviewState(taskId, liveElementIds) {
+    const store2 = deps.previewStateStore ?? null;
+    if (!store2) return;
+    for (const state of store2.listByTask(taskId)) {
+      if (liveElementIds.has(state.elementId)) continue;
+      const el = canvasRepo.getElements(taskId).find((e) => String(e.id) === state.elementId);
+      if (!el) store2.deleteByElementId(taskId, state.elementId);
+    }
+  }
+  function reconcilePreviewRefs(taskId) {
+    const current2 = collectLocalPreviewPorts(taskId);
+    const tracked = trackedPreviewPorts.get(taskId) ?? /* @__PURE__ */ new Map();
+    trackedPreviewPorts.set(taskId, current2);
+    releaseRemovedProxyRefs(tracked, current2);
+    sweepOrphanedPreviewState(taskId, new Set(current2.keys()));
+  }
   function ensurePreviewLifecycleTracking(taskId) {
     if (previewLifecycleSubs.has(taskId)) return;
     const unsub = canvasRepo.subscribe(
@@ -101003,6 +101327,7 @@ async function createDaemon(deps) {
       getAuthToken: () => deps.auth.token,
       projectRoot: cwd ?? deps.workspaceRoot,
       publishedArtifactStore: deps.publishedArtifactStore ?? null,
+      previewStateStore: deps.previewStateStore ?? null,
       getDetectedPorts: deps.getDetectedPorts ?? (() => [])
     });
     const options = buildSpawnOptions({
@@ -101042,6 +101367,7 @@ async function createDaemon(deps) {
       getAuthToken: () => deps.auth.token,
       projectRoot,
       publishedArtifactStore: deps.publishedArtifactStore ?? null,
+      previewStateStore: deps.previewStateStore ?? null,
       getDetectedPorts: deps.getDetectedPorts ?? (() => [])
     });
     deps.log({ event: "conversation_backend", backend: "direct-api", model, taskId });
@@ -101334,6 +101660,9 @@ async function createDaemon(deps) {
   await sweepStaleTasks(taskStateStore, taskManager, deps.log);
   await migratePinnedToFavoriteTasks(taskStateStore, userSettingsStore, deps.log);
   await rehydrateCollabQueues(collabQueuePersistence, taskManager, deps.log);
+  if (deps.previewStateStore) {
+    await migrateLegacyPreviewData(canvasRepo, deps.previewStateStore, taskStateStore, deps.log);
+  }
   const warmedPreviewTasks = await rehydrateCanvasPreviews(
     canvasRepo,
     deps.previewProxy,
@@ -101931,6 +102260,14 @@ function filterOutboundForCollab(msg, collabTaskId, getTaskSync) {
     case "background_agent_update":
     case "viz_content":
     case "viz_content_batch":
+    /**
+     * published_artifacts_state and preview_elements_state are per-task
+     * but visible to all collaborators so the chip + iframe on each
+     * canvas element reflect the same reality for everyone. Same rule
+     * as the other task-scoped messages: match taskId or drop.
+     */
+    case "published_artifacts_state":
+    case "preview_elements_state":
       if ("taskId" in msg && msg.taskId !== collabTaskId) return null;
       return msg;
     /** Preview: collab peers need port detection and preview targets */
@@ -101956,13 +102293,6 @@ function filterOutboundForCollab(msg, collabTaskId, getTaskSync) {
     case "publish_progress":
     case "publish_result":
       return null;
-    /**
-     * published_artifacts_state is per-task but visible to all collaborators
-     * so the chip on each element reflects the same reality for everyone.
-     * Filter by taskId so a peer only sees state for tasks they participate in.
-     */
-    case "published_artifacts_state":
-      return msg.taskId === collabTaskId ? msg : null;
     /** Exhaustiveness check: compile error if a new type is unhandled */
     default: {
       const _exhaustive = msg;
@@ -102516,7 +102846,7 @@ import { readdir as readdir14 } from "fs/promises";
 import { execFile as execFile8, spawn as spawn5 } from "child_process";
 import { closeSync, openSync } from "fs";
 import { access as access3, chmod as chmod2, constants, mkdir as mkdir24, writeFile as writeFile30 } from "fs/promises";
-import { dirname as dirname22, isAbsolute as isAbsolute2, join as join55 } from "path";
+import { dirname as dirname21, isAbsolute as isAbsolute2, join as join55 } from "path";
 var GIT_TIMEOUT_MS = 3e4;
 var MAX_BUFFER = 10 * 1024 * 1024;
 var BASE_REF_PATTERN = /^[a-zA-Z0-9][a-zA-Z0-9/_.-]*$/;
@@ -102779,7 +103109,7 @@ async function removeWorktree(worktreePath) {
   if (!worktreePath.includes("-wt/")) {
     throw new Error("worktreePath must be under a -wt/ parent directory");
   }
-  await runGit(["worktree", "remove", worktreePath], dirname22(worktreePath));
+  await runGit(["worktree", "remove", worktreePath], dirname21(worktreePath));
 }
 
 // src/services/channels/control-channel-infra-handlers.ts
@@ -103274,7 +103604,7 @@ function runPluginOp(pluginName, marketplace, action, ctx) {
 }
 
 // src/services/channels/read-recent-logs.ts
-import { createReadStream, readdirSync as readdirSync4 } from "fs";
+import { createReadStream, readdirSync as readdirSync5 } from "fs";
 import { join as join56 } from "path";
 import { createInterface } from "readline";
 var MAX_BYTES = 5e4;
@@ -103332,7 +103662,7 @@ async function readRecentLogs(logDir, windowMinutes, maxBytes = MAX_BYTES) {
 function discoverLogFiles(logDir) {
   let entries;
   try {
-    entries = readdirSync4(logDir);
+    entries = readdirSync5(logDir);
   } catch {
     return [];
   }
@@ -104919,6 +105249,7 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
           }
         };
         const publishedArtifactStore = deps.publishedArtifactStore;
+        const previewStateStore = deps.previewStateStore;
         const getDetectedPorts = deps.getDetectedPorts;
         handlePublishRequest({
           correlationId,
@@ -104931,6 +105262,7 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
           projectRoot: wsRoot,
           vizWatcher,
           publishedArtifactStore,
+          previewStateStore,
           getDetectedPorts,
           sendControl: wrappedSendControl,
           log: (entry) => {
@@ -105150,6 +105482,24 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
       });
     });
   }
+  if (deps?.previewStateStore) {
+    const previewStore = deps.previewStateStore;
+    daemon.taskStateStore.listTasks().then((tasks) => {
+      for (const taskId of Object.keys(tasks)) {
+        const entries = previewStore.listByTask(taskId);
+        controlHandler.sendControl({
+          type: "preview_elements_state",
+          taskId,
+          entries
+        });
+      }
+    }).catch((err) => {
+      logAdapter({
+        event: "preview_elements_initial_push_failed",
+        error: err instanceof Error ? err.message : String(err)
+      });
+    });
+  }
   const userSettingsUnsub = daemon.userSettingsStore.subscribe((settings) => {
     controlHandler.sendControl({ type: "user_settings_updated", settings });
   });
@@ -105684,7 +106034,7 @@ import { promisify as promisify7 } from "util";
 
 // src/shared/file-io-path-safety.ts
 import { realpath } from "fs/promises";
-import { basename as basename6, dirname as dirname23, join as join57, normalize as normalize6 } from "path";
+import { basename as basename6, dirname as dirname22, join as join57, normalize as normalize6 } from "path";
 async function safeAbsolutePath(userPath, isHidden2, allowedHiddenNames) {
   const normalized = prepareAbsolutePath(userPath, isHidden2, allowedHiddenNames);
   if (normalized === null) return null;
@@ -105706,13 +106056,13 @@ async function canonicalizeOrRecombine(path2) {
   try {
     return await realpath(path2);
   } catch (err) {
-    if (!isEnoent3(err)) return null;
-    const parentCanonical = await realpath(dirname23(path2)).catch(() => null);
+    if (!isEnoent4(err)) return null;
+    const parentCanonical = await realpath(dirname22(path2)).catch(() => null);
     if (parentCanonical === null) return null;
     return join57(parentCanonical, basename6(path2));
   }
 }
-function isEnoent3(err) {
+function isEnoent4(err) {
   return typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT";
 }
 function checkSegmentsAllowed(path2, isHidden2, allowedHiddenNames) {
@@ -107022,13 +107372,13 @@ function wireThreadErrorFallback(daemon, dc, taskId, threadId, channelId, log) {
 // src/shared/pty-manager.ts
 import { accessSync, chmodSync, constants as constants2 } from "fs";
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname24, resolve as resolve4 } from "path";
+import { dirname as dirname23, resolve as resolve4 } from "path";
 import * as pty from "node-pty";
 function ensureSpawnHelperExecutable() {
   if (globalThis.process.platform === "win32") return;
   try {
     const req = createRequire4(import.meta.url);
-    const nodePtyDir = dirname24(req.resolve("node-pty/package.json"));
+    const nodePtyDir = dirname23(req.resolve("node-pty/package.json"));
     const spawnHelper = resolve4(
       nodePtyDir,
       "prebuilds",
@@ -107487,8 +107837,9 @@ function buildCollabRoomManager(deps) {
           configStore: pluginConfigStore,
           previewProxy,
           presencePool: presencePoolRef,
-          /** Collab peers cannot publish — null store and empty ports enforce read-only access. */
+          /** Collab peers cannot publish — null stores enforce read-only access. */
           publishedArtifactStore: null,
+          previewStateStore: null,
           getDetectedPorts: () => []
         });
         if (loadedPluginsRef.current.length > 0) {
@@ -107770,7 +108121,7 @@ function buildCollabRoomManager(deps) {
 import { execSync } from "child_process";
 import { existsSync as existsSync9 } from "fs";
 import { createRequire as createRequire5 } from "module";
-import { dirname as dirname25, join as join59 } from "path";
+import { dirname as dirname24, join as join59 } from "path";
 
 // src/services/bootstrap/self-update.ts
 import { execFile as execFile11, spawn as spawn9 } from "child_process";
@@ -108433,7 +108784,7 @@ function resolveClaudeCodePath(log) {
   try {
     const req = createRequire5(import.meta.url);
     const sdkMain = req.resolve("@anthropic-ai/claude-agent-sdk");
-    const p2 = join59(dirname25(sdkMain), "cli.js");
+    const p2 = join59(dirname24(sdkMain), "cli.js");
     if (existsSync9(p2)) return ok("sdk_bundled", p2);
   } catch {
   }
@@ -108697,7 +109048,8 @@ function buildSharedChannelCallbacks(deps) {
     terminalPtys,
     signalingHandle,
     sessionServerUrl,
-    publishedArtifactStore
+    publishedArtifactStore,
+    previewStateStore
   } = deps;
   return {
     onPeerDataChannel: (machineId) => {
@@ -108720,6 +109072,7 @@ function buildSharedChannelCallbacks(deps) {
         sessionServerUrl,
         getAuthToken: () => auth3.token,
         publishedArtifactStore,
+        previewStateStore,
         getDetectedPorts: () => detectedPortsRef.current
       });
       portDetectorRef.current?.resend();
@@ -109133,6 +109486,10 @@ async function serve(options = {}) {
     rootDir: join62(dataDir, "published"),
     logger: log
   });
+  const previewStateStore = createPreviewStateStore({
+    rootDir: join62(dataDir, "preview-state"),
+    logger: log
+  });
   const daemon = await createDaemon({
     shipyardHome,
     dataDir,
@@ -109152,10 +109509,12 @@ async function serve(options = {}) {
     previewProxy,
     sessionServerUrl,
     publishedArtifactStore,
+    previewStateStore,
     getDetectedPorts: () => detectedPortsRef.current
   });
   daemon.healthMetrics.start();
   publishedArtifactStore.setSendControlMessage((msg) => daemon.taskManager.broadcastControl(msg));
+  previewStateStore.setSendControlMessage((msg) => daemon.taskManager.broadcastControl(msg));
   const pluginsDir = join62(shipyardHome, "plugins");
   await mkdir28(pluginsDir, { recursive: true });
   let loadedPlugins = [];
@@ -109287,7 +109646,8 @@ async function serve(options = {}) {
     fileWatcherPool,
     terminalPtys,
     sessionServerUrl,
-    publishedArtifactStore
+    publishedArtifactStore,
+    previewStateStore
   } : null;
   const peerManager = peerSetupDeps ? buildPeerManager(peerSetupDeps) : null;
   if (peerSetupDeps && !localDirectRef.current) {
@@ -109400,6 +109760,7 @@ async function serve(options = {}) {
     log.info("Graceful shutdown initiated");
     portDetector.dispose();
     publishedArtifactStore.dispose();
+    previewStateStore.dispose();
     await previewProxy.stop();
     pluginFileWatcher.dispose();
     await fileWatcherPool.dispose();
@@ -109436,4 +109797,4 @@ export {
   _testing,
   serve
 };
-//# sourceMappingURL=serve-QLYUK5XN.js.map
+//# sourceMappingURL=serve-ULDOVKX7.js.map