runwork 0.28.0 → 0.29.1

package/dist/index.js

@@ -1793,6 +1793,20 @@ function isRelPathIgnored(relPath, sets) {
   }
   return isPathIgnored(path, sets);
 }
+function isIgnoredDirectory(relDir, sets) {
+  const path = toPosixRelPath(relDir);
+  if (!path || path === ".")
+    return false;
+  for (const ignored of sets.paths) {
+    if (path === ignored || path.startsWith(`${ignored}/`))
+      return true;
+  }
+  for (const segment of path.split("/")) {
+    if (sets.dirs.has(segment))
+      return true;
+  }
+  return false;
+}
 function toPosixRelPath(relPath) {
   return relPath.includes("\\") ? relPath.replace(/\\/g, "/") : relPath;
 }
@@ -2711,6 +2725,7 @@ var init_registry_data = __esm(() => {
         app: { macos: "Claude", windows: "Claude" },
         deepLink: "claude://claude.ai/new?q={prompt}",
         deepLinkInFolder: "claude://cowork/new?q={prompt}&folder={folder}",
+        deepLinkInFolderSplit: { gapMs: 500 },
         openInFolder: {
           rank: 4,
           instruction: "Open Claude Desktop and add {dir} as a project folder",
@@ -4079,6 +4094,18 @@ var init_types = __esm(() => {
   toSlug = toSkillSlug;
 });
 
+// ../../shared/spaces/launch-preamble.ts
+function isRunworkLaunchPreamble(text2) {
+  const trimmed = text2.trim();
+  if (trimmed.startsWith(LAUNCH_IN_FOLDER)) {
+    return trimmed.includes(LAUNCH_FOLDER_IS_SPACE) || trimmed.includes(LAUNCH_CONTINUE_CONVERSATION);
+  }
+  if (trimmed.startsWith(LAUNCH_NO_FOLDER))
+    return trimmed.includes(LAUNCH_SPACE_IN_RUNWORK);
+  return false;
+}
+var LAUNCH_IN_FOLDER = "Work in ", LAUNCH_FOLDER_IS_SPACE = ". That folder is ", LAUNCH_CONTINUE_CONVERSATION = ". Continue the conversation we had there", LAUNCH_NO_FOLDER = "Work on ", LAUNCH_SPACE_IN_RUNWORK = "space in Runwork";
+
 // src/agents/utils/session-digest.ts
 import { posix, win32 } from "path";
 function pathFlavourOf(path) {
@@ -4253,6 +4280,12 @@ function buildAssetMarkers(acc, epochMs) {
   }
   return markers;
 }
+function isInjectedUserText(text2) {
+  const trimmed = text2.trim();
+  if (!trimmed)
+    return true;
+  return SKIP_PREFIXES.some((p) => trimmed.startsWith(p)) || isRunworkLaunchPreamble(trimmed);
+}
 function formatCombinedDigest(sessions, opts = { days: 7 }) {
   const sorted = [...sessions].sort((a, b) => (a.start ?? "").localeCompare(b.start ?? ""));
   const lines = [];
@@ -4767,6 +4800,7 @@ function parseMcpPrefixedToolName(name) {
 
 // src/agents/utils/session-listing.ts
 import { openSync, readSync, closeSync, fstatSync } from "fs";
+import { StringDecoder } from "string_decoder";
 function isReflectionOwnSession(titleOrFirstMessage) {
   if (!titleOrFirstMessage)
     return false;
@@ -4839,7 +4873,44 @@ function titleFromText(text2) {
     return null;
   return oneLine.length > MAX_TITLE_CHARS ? oneLine.slice(0, MAX_TITLE_CHARS - 3) + "..." : oneLine;
 }
-var HEAD_BYTES, CONVERSATION_PROMPT_MARKER = "# Conversation reflection:", WEEKLY_PROMPT_MARKER = "# Weekly reflection:", TRIAGE_PROMPT_MARKER = "# Reflection triage:", REFLECTION_SESSION_MARKERS, MAX_TITLE_CHARS = 80, TAIL_BYTES;
+function readTranscriptRecords(path, onRecord, maxBytes = DEEP_SCAN_BYTES) {
+  let fd = null;
+  try {
+    fd = openSync(path, "r");
+    const buf = Buffer.alloc(Math.min(HEAD_BYTES, maxBytes));
+    const decoder = new StringDecoder("utf-8");
+    let position = 0;
+    let carry = "";
+    while (position < maxBytes) {
+      const bytesRead = readSync(fd, buf, 0, Math.min(buf.length, maxBytes - position), position);
+      if (bytesRead <= 0)
+        break;
+      position += bytesRead;
+      const lines = (carry + decoder.write(buf.subarray(0, bytesRead))).split(`
+`);
+      carry = lines.pop() ?? "";
+      for (const raw of lines) {
+        if (!raw.trim())
+          continue;
+        let record;
+        try {
+          record = JSON.parse(raw);
+        } catch {
+          continue;
+        }
+        if (onRecord(record))
+          return;
+      }
+    }
+  } catch {} finally {
+    if (fd !== null) {
+      try {
+        closeSync(fd);
+      } catch {}
+    }
+  }
+}
+var HEAD_BYTES, CONVERSATION_PROMPT_MARKER = "# Conversation reflection:", WEEKLY_PROMPT_MARKER = "# Weekly reflection:", TRIAGE_PROMPT_MARKER = "# Reflection triage:", REFLECTION_SESSION_MARKERS, MAX_TITLE_CHARS = 80, TAIL_BYTES, DEEP_SCAN_BYTES;
 var init_session_listing = __esm(() => {
   HEAD_BYTES = 64 * 1024;
   REFLECTION_SESSION_MARKERS = [
@@ -4848,12 +4919,60 @@ var init_session_listing = __esm(() => {
     TRIAGE_PROMPT_MARKER
   ];
   TAIL_BYTES = 16 * 1024;
+  DEEP_SCAN_BYTES = 1536 * 1024;
 });
 
 // src/agents/claude/jsonl-listing.ts
-function scanClaudeJsonlHead(head) {
-  const result = { firstTimestamp: null, title: null, cwd: null };
-  let firstUserText = null;
+function claudeTitleCandidate(record) {
+  if (record.type === "custom-title" && typeof record.customTitle === "string" && record.customTitle.trim()) {
+    return { source: "custom-title", text: record.customTitle };
+  }
+  if (record.type === "ai-title" && typeof record.aiTitle === "string" && record.aiTitle.trim()) {
+    return { source: "ai-title", text: record.aiTitle };
+  }
+  if (record.type !== "user")
+    return null;
+  const message = record.message;
+  if (!message || message.role !== "user")
+    return null;
+  const texts = [];
+  if (typeof message.content === "string")
+    texts.push(message.content);
+  else if (Array.isArray(message.content)) {
+    for (const item of message.content) {
+      const it = item;
+      if (it && it.type === "text" && typeof it.text === "string")
+        texts.push(it.text);
+    }
+  }
+  for (const text2 of texts) {
+    const trimmed = text2.trim();
+    if (isInjectedUserText(trimmed))
+      continue;
+    return { source: "user-text", text: trimmed };
+  }
+  return null;
+}
+function absorbClaudeRecord(state, o, rankTitles) {
+  const { result } = state;
+  if (!result.firstTimestamp && typeof o.timestamp === "string")
+    result.firstTimestamp = o.timestamp;
+  if (!result.cwd && typeof o.cwd === "string")
+    result.cwd = o.cwd;
+  if (!result.surface && typeof o.entrypoint === "string")
+    result.surface = o.entrypoint;
+  const candidate = claudeTitleCandidate(o);
+  if (candidate && (rankTitles ? TITLE_RANK[candidate.source] < state.bestRank : result.title === null)) {
+    state.bestRank = TITLE_RANK[candidate.source];
+    result.title = titleFromText(candidate.text);
+  }
+  const complete = Boolean(result.firstTimestamp && result.cwd && result.surface);
+  return rankTitles ? state.bestRank === 0 && complete : result.title !== null && complete;
+}
+function emptyState() {
+  return { result: { firstTimestamp: null, title: null, cwd: null }, bestRank: Number.POSITIVE_INFINITY };
+}
+function scanHeadInto(state, head) {
   for (const line of head.split(`
 `)) {
     if (!line.trim())
@@ -4864,47 +4983,30 @@ function scanClaudeJsonlHead(head) {
     } catch {
       continue;
     }
-    if (!result.firstTimestamp && typeof o.timestamp === "string")
-      result.firstTimestamp = o.timestamp;
-    if (!result.cwd && typeof o.cwd === "string")
-      result.cwd = o.cwd;
-    if (!result.surface && typeof o.entrypoint === "string")
-      result.surface = o.entrypoint;
-    if (!result.title && o.type === "ai-title" && typeof o.aiTitle === "string") {
-      result.title = titleFromText(o.aiTitle);
-    }
-    if (firstUserText === null && o.type === "user") {
-      const message = o.message;
-      if (message && message.role === "user") {
-        const texts = [];
-        if (typeof message.content === "string")
-          texts.push(message.content);
-        else if (Array.isArray(message.content)) {
-          for (const item of message.content) {
-            const it = item;
-            if (it && it.type === "text" && typeof it.text === "string")
-              texts.push(it.text);
-          }
-        }
-        for (const text2 of texts) {
-          const trimmed = text2.trim();
-          if (!trimmed || SKIP_PREFIXES.some((p) => trimmed.startsWith(p)))
-            continue;
-          firstUserText = trimmed;
-          break;
-        }
-      }
-    }
-    if (result.title && result.firstTimestamp && result.cwd && result.surface)
-      break;
+    if (absorbClaudeRecord(state, o, true))
+      return true;
   }
-  if (!result.title && firstUserText)
-    result.title = titleFromText(firstUserText);
+  return false;
+}
+function scanClaudeTranscript(path, head, maxBytes) {
+  const state = emptyState();
+  const { result } = state;
+  if (scanHeadInto(state, head))
+    return result;
+  if (result.title && result.firstTimestamp && result.cwd && result.surface)
+    return result;
+  readTranscriptRecords(path, (o) => absorbClaudeRecord(state, o, false), maxBytes);
   return result;
 }
+var TITLE_RANK;
 var init_jsonl_listing = __esm(() => {
   init_session_listing();
   init_session_digest();
+  TITLE_RANK = {
+    "custom-title": 0,
+    "ai-title": 1,
+    "user-text": 2
+  };
 });
 
 // src/agents/utils/skill-name.ts
@@ -5080,23 +5182,39 @@ function spaceKindsSentence() {
 function sentenceName(plural) {
   return /^[A-Z]{2,}\b/.test(plural) ? plural : plural.toLowerCase();
 }
-var SPACE_KINDS, BY_ID;
+var SPACE_TABS, APPS_AND_AUTOMATIONS, SPACE_KINDS, TAB_BY_NAME, BY_ID;
 var init_kinds = __esm(() => {
+  SPACE_TABS = [
+    { id: "appsAuto", label: "Apps and automations" },
+    { id: "skills", label: "Skills" },
+    { id: "files", label: "Files" },
+    { id: "integ", label: "Integrations" },
+    { id: "conversations", label: "Chats" }
+  ];
+  APPS_AND_AUTOMATIONS = SPACE_TABS[0];
   SPACE_KINDS = [
-    { id: "app", singular: "app", plural: "Apps", tab: "apps" },
+    { id: "app", singular: "app", plural: "Apps", tab: "appsAuto" },
     { id: "skill", singular: "skill", plural: "Skills", tab: "skills" },
-    { id: "agent", singular: "agent", plural: "Agents", tab: "agents" },
+    { id: "agent", singular: "agent", plural: "Agents", tab: "appsAuto" },
     { id: "file", singular: "file", plural: "Files", tab: "files" },
     { id: "conversation", singular: "chat", plural: "Chats", tab: "conversations" },
-    { id: "data", singular: "entity", plural: "Data", tab: "data" },
-    { id: "fileStorage", singular: "file storage", plural: "File storage", tab: "data" },
-    { id: "component", singular: "component", plural: "Components", tab: "data" },
-    { id: "schedule", singular: "scheduled job", plural: "Scheduled work", tab: "auto" },
-    { id: "workflow", singular: "workflow", plural: "Workflows", tab: "auto" },
-    { id: "endpoint", singular: "public endpoint", plural: "Endpoints", tab: "auto" },
+    { id: "data", singular: "entity", plural: "Data", tab: "appsAuto" },
+    { id: "fileStorage", singular: "file storage", plural: "File storage", tab: "appsAuto" },
+    { id: "component", singular: "component", plural: "Components", tab: "appsAuto" },
+    { id: "schedule", singular: "scheduled job", plural: "Scheduled work", tab: "appsAuto" },
+    { id: "workflow", singular: "workflow", plural: "Workflows", tab: "appsAuto" },
+    { id: "endpoint", singular: "public endpoint", plural: "Endpoints", tab: "appsAuto" },
     { id: "integration", singular: "integration", plural: "Integrations", tab: "integ" },
     { id: "mcpServer", singular: "MCP server", plural: "MCP servers", tab: "integ" }
   ];
+  TAB_BY_NAME = new Map([
+    ...SPACE_TABS.map((tab) => [tab.id, tab.id]),
+    ["chats", "conversations"],
+    ["apps", "appsAuto"],
+    ["auto", "appsAuto"],
+    ["agents", "appsAuto"],
+    ["data", "appsAuto"]
+  ]);
   BY_ID = new Map(SPACE_KINDS.map((k) => [k.id, k]));
 });
 
@@ -5175,7 +5293,7 @@ function annotateSpacesMcp(tree) {
     visit(root);
   return tree;
 }
-var SPACE_DEFINITION = 'A space is where one piece of work lives: its files, how your AI should handle it, the apps and automations around it, and the conversations. Start a chat from a space and the AI already knows the job. Share a file and a teammate picks it up where you left it. Think "Q3 board deck", "Customer onboarding", "Website redesign".', SPACE_API_PREFIX = "/api/workspaces/:id/spaces", SPACE_JOBS, SPACE_LAUNCH_SENTENCE = "Start a chat in a space with the `runwork://launch?space=<space id>` link on the person's computer, or ask the `space_launch_link` tool for that URL.", machineOnlySpaceJobs = () => SPACE_JOBS.filter((j) => j.mcp === null), SPACES_ROUTING_SENTENCE = "Keep a document the team should have in a space (`space_list`, then `space_write_file`; the CLI twins are `runwork spaces list` and `runwork spaces put`, and the route is `POST /api/workspaces/:id/spaces/:spaceId/files`), not in a local file or a storage bucket.", SPACES_GROUP_DESCRIPTION, HELP_FOOTER_DOORS, SPACES_SUBCOMMAND_MCP, TEAM_BLOCK_RUNWORK_LINE = "Runwork is connected here: the `runwork` block above says what it can do, and any folder mapped to a space carries its own `runwork-space` block in its AGENTS.md.";
+var SPACE_DEFINITION = 'A space is where one piece of work lives: its files, how your AI should handle it, the apps and automations around it, and the conversations. Start a chat from a space and the AI already knows the job. Share a file and a teammate picks it up where you left it. Think "Q3 board deck", "Customer onboarding", "Website redesign".', SPACE_API_PREFIX = "/api/workspaces/:id/spaces", SPACE_JOBS, SPACE_LAUNCH_SENTENCE = "Start a chat in a space with the `runwork://launch?space=<space id>` link on the person's computer, or ask the `space_launch_link` tool for that URL.", machineOnlySpaceJobs = () => SPACE_JOBS.filter((j) => j.mcp === null), SPACES_GROUP_DESCRIPTION, HELP_FOOTER_DOORS, SPACES_SUBCOMMAND_MCP, TEAM_BLOCK_RUNWORK_LINE = "Runwork is connected here: the `runwork` block above says what it can do, and any folder mapped to a space carries its own `runwork-space` block in its AGENTS.md.";
 var init_spaces = __esm(() => {
   init_kinds();
   SPACE_JOBS = [
@@ -6521,7 +6639,7 @@ ${instructions}`;
             const head = readFileHead(filePath);
             if (head === null)
               continue;
-            const scanned = scanClaudeJsonlHead(head);
+            const scanned = scanClaudeTranscript(filePath, head);
             if (isReflectionOwnSession(scanned.title))
               continue;
             const sessionId = file.slice(0, -".jsonl".length);
@@ -10174,7 +10292,7 @@ function extractCodexRolloutSession(raw, agentSlug) {
   digest.assetMarkers = buildAssetMarkers(assetAcc, epochMs);
   return digest;
 }
-var CODEX_SKIP_PREFIXES, CODEX_UNKNOWN_PROJECT = "codex";
+var CODEX_ASSESSOR_PROMPT_PREFIX = "The following is the Codex agent history", CODEX_SKIP_PREFIXES, CODEX_UNKNOWN_PROJECT = "codex";
 var init_rollout_digest = __esm(() => {
   init_session_digest();
   CODEX_SKIP_PREFIXES = [
@@ -10185,7 +10303,9 @@ var init_rollout_digest = __esm(() => {
     "<environment_context",
     "<system",
     "AGENTS.md instructions",
-    "<recommended_plugins"
+    "<recommended_plugins",
+    CODEX_ASSESSOR_PROMPT_PREFIX,
+    ">>> TRANSCRIPT START"
   ];
 });
 
@@ -10379,6 +10499,50 @@ var init_analyst = __esm(() => {
 function codexUuidFromRolloutName(basenameNoExt) {
   return UUID_TAIL.exec(basenameNoExt)?.[1] ?? null;
 }
+function codexTitleCandidate(record) {
+  const p = record.payload;
+  if (!p || typeof p !== "object")
+    return null;
+  if (record.type !== "response_item" || p.type !== "message" || p.role !== "user" || !Array.isArray(p.content))
+    return null;
+  const isAssessorTurn = p.content.some((item) => {
+    const it = item;
+    return typeof it.text === "string" && it.text.trim().startsWith(CODEX_ASSESSOR_PROMPT_PREFIX);
+  });
+  if (isAssessorTurn)
+    return null;
+  for (const item of p.content) {
+    const it = item;
+    if (it.type !== "input_text" && it.type !== "text")
+      continue;
+    if (typeof it.text !== "string")
+      continue;
+    const trimmed = it.text.trim();
+    if (CODEX_SKIP_PREFIXES.some((pre) => trimmed.startsWith(pre)) || isInjectedUserText(trimmed))
+      continue;
+    return { source: "user-text", text: trimmed };
+  }
+  return null;
+}
+function absorbCodexRecord(result, o) {
+  if (!result.firstTimestamp && typeof o.timestamp === "string")
+    result.firstTimestamp = o.timestamp;
+  const p = o.payload;
+  if (p && typeof p === "object" && o.type === "session_meta") {
+    if (typeof p.cwd === "string" && !result.cwd)
+      result.cwd = p.cwd;
+    if (typeof p.id === "string" && !result.sessionId)
+      result.sessionId = p.id;
+    if (typeof p.originator === "string" && !result.surface)
+      result.surface = p.originator;
+  }
+  if (!result.title) {
+    const candidate = codexTitleCandidate(o);
+    if (candidate)
+      result.title = titleFromText(candidate.text);
+  }
+  return Boolean(result.title && result.firstTimestamp && result.cwd);
+}
 function scanCodexRolloutHead(head) {
   const result = { firstTimestamp: null, title: null, cwd: null };
   for (const line of head.split(`
@@ -10391,36 +10555,18 @@ function scanCodexRolloutHead(head) {
     } catch {
       continue;
     }
-    if (!result.firstTimestamp && typeof o.timestamp === "string")
-      result.firstTimestamp = o.timestamp;
-    const p = o.payload;
-    if (!p || typeof p !== "object")
-      continue;
-    if (o.type === "session_meta") {
-      if (typeof p.cwd === "string" && !result.cwd)
-        result.cwd = p.cwd;
-      if (typeof p.id === "string" && !result.sessionId)
-        result.sessionId = p.id;
-      if (typeof p.originator === "string" && !result.surface)
-        result.surface = p.originator;
-    }
-    if (!result.title && o.type === "response_item" && p.type === "message" && p.role === "user" && Array.isArray(p.content)) {
-      for (const item of p.content) {
-        const it = item;
-        if ((it.type === "input_text" || it.type === "text") && typeof it.text === "string") {
-          const trimmed = it.text.trim();
-          if (!trimmed || CODEX_SKIP_PREFIXES.some((pre) => trimmed.startsWith(pre)) || SKIP_PREFIXES.some((pre) => trimmed.startsWith(pre)))
-            continue;
-          result.title = titleFromText(trimmed);
-          break;
-        }
-      }
-    }
-    if (result.title && result.firstTimestamp && result.cwd)
+    if (absorbCodexRecord(result, o))
       break;
   }
   return result;
 }
+function scanCodexRollout(path, head, maxBytes) {
+  const result = scanCodexRolloutHead(head);
+  if (result.title && result.firstTimestamp && result.cwd)
+    return result;
+  readTranscriptRecords(path, (o) => absorbCodexRecord(result, o), maxBytes);
+  return result;
+}
 var CODEX_HEAD_BYTES, UUID_TAIL;
 var init_rollout_listing = __esm(() => {
   init_session_listing();
@@ -11145,7 +11291,7 @@ var init_adapter3 = __esm(async () => {
           const head = readFileHead(file, CODEX_HEAD_BYTES);
           if (head === null)
             continue;
-          const scanned = scanCodexRolloutHead(head);
+          const scanned = scanCodexRollout(file, head);
           if (isReflectionOwnSession(scanned.title))
             continue;
           sessions.push({
@@ -12434,6 +12580,18 @@ function findAgentFiles(folder, env) {
   }
   return out;
 }
+function liveFolderActivity(conversations) {
+  const live = [];
+  for (const c of conversations) {
+    if (c.status !== "live")
+      continue;
+    const folders = c.folders ?? [];
+    if (folders.length === 0)
+      continue;
+    live.push({ agentSlug: c.agentSlug, folders, lastActivityAt: c.lastActivityAt });
+  }
+  return live;
+}
 function buildAssetCensus(input) {
   const env = input.env ?? defaultCensusEnvironment();
   const now = input.now ?? new Date;
@@ -12455,6 +12613,18 @@ function buildAssetCensus(input) {
       byFolder.set(f, cur);
     }
   }
+  for (const live of input.liveActivity ?? []) {
+    for (const folder of live.folders) {
+      const cur = byFolder.get(resolve3(folder));
+      if (!cur)
+        continue;
+      const agent = cur.agents.get(live.agentSlug);
+      if (agent && live.lastActivityAt > agent.last)
+        agent.last = live.lastActivityAt;
+      if (live.lastActivityAt > cur.last)
+        cur.last = live.lastActivityAt;
+    }
+  }
   const outerFolders = [...byFolder.keys()].filter((f) => spaceExclusionReason(f, env) === null).map((f) => resolve3(f));
   const isNested = (folder) => {
     const f = resolve3(folder);
@@ -18827,7 +18997,7 @@ function createKeyboardListener() {
 }
 
 // src/generated/version.ts
-var VERSION = "0.28.0";
+var VERSION = "0.29.1";
 
 // src/commands/dev.ts
 var exports_dev = {};
@@ -21362,6 +21532,17 @@ function localAppDataRoot(input) {
   const join53 = joiner(input);
   return input.localAppData ?? join53(home(input), "AppData", "Local");
 }
+function desktopStateDirs(input) {
+  const join53 = joiner(input);
+  const named = (root) => join53(root, DESKTOP_APP_IDENTIFIER);
+  if (input.platform === "win32") {
+    return [named(appDataRoot(input)), named(localAppDataRoot(input))];
+  }
+  if (input.platform === "darwin")
+    return [named(appDataRoot(input))];
+  return [named(join53(home(input), ".local", "share")), named(appDataRoot(input))];
+}
+var DESKTOP_APP_IDENTIFIER = "ai.runwork.desktop";
 
 // src/agents/claude/declarations.ts
 function claudeEntrypoint(head) {
@@ -21393,7 +21574,7 @@ function attributeClaudeEntrypoint(marker) {
       return null;
   }
 }
-var CLAUDE_HEAD, CLAUDE_PROJECTS_STORE, CLAUDE_COWORK_STORE, CLAUDE_CODE_CAPTURE_TARGETS, CLAUDE_DESKTOP_CAPTURE_TARGETS, CLAUDE_ACCOUNT_PROFILE_FIELDS;
+var CLAUDE_HEAD, CLAUDE_PROJECTS_STORE, CLAUDE_COWORK_STORE, CLAUDE_CODE_CAPTURE_TARGETS, CLAUDE_DESKTOP_CAPTURE_TARGETS, CLAUDE_ACCOUNT_PROFILE_FIELD = "conversation_preferences";
 var init_declarations = __esm(() => {
   CLAUDE_HEAD = 64 * 1024;
   CLAUDE_PROJECTS_STORE = {
@@ -21440,10 +21621,6 @@ var init_declarations = __esm(() => {
       note: "the MCP config we write for Claude Desktop, next to its session store"
     }
   ];
-  CLAUDE_ACCOUNT_PROFILE_FIELDS = {
-    full: "cowork_global_instructions",
-    compact: "conversation_preferences"
-  };
 });
 
 // src/agents/codex/declarations.ts
@@ -26188,6 +26365,7 @@ var SPACE_SIZE_LIMIT_BYTES = 300 * 1024 * 1024;
 var SPACE_PUSH_BATCH_BYTES = 75 * 1024 * 1024;
 var SPACE_FILE_SIZE_LIMIT_BYTES = SPACE_PUSH_BATCH_BYTES;
 var SPACE_SETTLE_MS = 90000;
+var SPACE_CLOCK_AHEAD_MS = 2000;
 var SPACE_THUMBNAIL_MAX_BYTES = 8 * 1024 * 1024;
 function formatBytes(bytes) {
   if (bytes < 1024)
@@ -26362,6 +26540,44 @@ function isExplicitlyIncluded(relPath, rules) {
   }
   return false;
 }
+function admitsNothingUnder(relDir, rules) {
+  const dir = includeRulePath(relDir);
+  if (!dir)
+    return false;
+  const lineage = pathAndAncestors(dir);
+  for (const step of lineage) {
+    if (rules.denies.has(step))
+      return true;
+  }
+  for (const step of lineage) {
+    if (rules.directories.has(step))
+      return false;
+  }
+  const under2 = `${dir}/`;
+  for (const path2 of rules.paths) {
+    if (path2 === dir || path2.startsWith(under2))
+      return false;
+  }
+  for (const directory of rules.directories) {
+    if (directory.startsWith(under2))
+      return false;
+  }
+  return true;
+}
+function sharesNothingUnder(relDir, rules) {
+  const dir = includeRulePath(relDir);
+  if (!dir)
+    return false;
+  for (const step of pathAndAncestors(dir)) {
+    if (rules.denies.has(step))
+      return true;
+  }
+  if (rules.names.size > 0)
+    return false;
+  if (rules.directories.size === 0 && rules.paths.size === 0)
+    return false;
+  return admitsNothingUnder(dir, rules);
+}
 function includeRulePath(relPath) {
   return relPath.replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
 }
@@ -26432,6 +26648,13 @@ function hiddenFromSpace(relPath, ignoreSets, rules, floor = buildSpaceFloorSets
     return true;
   return !isExplicitlyIncluded(relPath, rules);
 }
+function spaceSkipsDirectory(relDir, ignoreSets, rules, floor = buildSpaceFloorSets()) {
+  if (sharesNothingUnder(relDir, rules))
+    return true;
+  if (!isIgnoredDirectory(relDir, ignoreSets))
+    return false;
+  return isIgnoredDirectory(relDir, floor) || admitsNothingUnder(relDir, rules);
+}
 function agentManagedInstructionPaths() {
   const paths = new Set;
   for (const adapter2 of getAllAdapters()) {
@@ -26462,6 +26685,10 @@ function readIncludeRules(folder) {
 
 // src/spaces/space-repo.ts
 init_instruction_hint();
+// ../../shared/spaces/refusal.ts
+var SPACE_RESET_COMMAND = "runwork spaces reset";
+var SPACE_EXCLUDE_COMMAND = "runwork spaces exclude";
+
 // ../../shared/spaces/waiting-changes.ts
 var WAITING_SUMMARY_ENTRY_CAP = 200;
 
@@ -26633,6 +26860,7 @@ function normaliseMtime(ms) {
 
 // src/spaces/space-repo.ts
 init_atomic_json();
+init_trash();
 var SPACE_BRANCH = "main";
 var REMOTE_MAIN = `refs/remotes/${RUNWORK_REMOTE}/${SPACE_BRANCH}`;
 var LOCAL_MAIN = `refs/heads/${SPACE_BRANCH}`;
@@ -26667,7 +26895,13 @@ function spaceRemainingBytes(storage, fallbackLimit = SPACE_SIZE_LIMIT_BYTES) {
 function spaceGitdir(folder) {
   const normalized = resolve7(folder);
   const hash = createHash7("sha256").update(normalized).digest("hex").slice(0, 12);
-  return join59(homedir36(), ".runwork", "space-repos", `${basename9(normalized)}-${hash}`);
+  return join59(spaceReposRoot(), `${basename9(normalized)}-${hash}`);
+}
+function spaceReposRoot() {
+  return join59(homedir36(), ".runwork", "space-repos");
+}
+function isSpaceHistoryPath(gitdir) {
+  return dirname17(gitdir) === spaceReposRoot();
 }
 function repoAt(folder) {
   return { fs: fs6, dir: folder, gitdir: spaceGitdir(folder) };
@@ -26678,8 +26912,80 @@ function normalizeUrl(url) {
 async function repoMappingRefusal(folder, spaceRemoteUrl) {
   return null;
 }
+function spaceIdFromRemoteUrl(url) {
+  const match = /\/spaces\/(spc_[A-Za-z0-9_-]+)(?:[/?#]|$)/.exec(url);
+  return match ? match[1] : null;
+}
+async function foreignSpaceHistory(folder, spaceRemoteUrl) {
+  const gitdir = spaceGitdir(folder);
+  if (!existsSync59(gitdir))
+    return null;
+  const now = spaceIdFromRemoteUrl(spaceRemoteUrl);
+  if (!now)
+    return null;
+  let was = null;
+  try {
+    const url = (await git.listRemotes({ fs: fs6, gitdir })).find((r) => r.remote === RUNWORK_REMOTE)?.url;
+    was = url ? spaceIdFromRemoteUrl(url) : null;
+  } catch {
+    return null;
+  }
+  return was && was !== now ? { was, now } : null;
+}
+function directoryWeight(dir) {
+  let bytes = 0;
+  let files = 0;
+  const pending = [dir];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    let entries;
+    try {
+      entries = readdirSync24(current, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      const full = join59(current, entry.name);
+      if (entry.isDirectory()) {
+        pending.push(full);
+        continue;
+      }
+      try {
+        const stats = lstatSync2(full);
+        if (stats.isFile()) {
+          bytes += stats.size;
+          files++;
+        }
+      } catch {}
+    }
+  }
+  return { bytes, files };
+}
+function discardSpaceHistory(folder, reason) {
+  const gitdir = spaceGitdir(folder);
+  if (!isSpaceHistoryPath(gitdir))
+    return { state: "outside", gitdir, root: spaceReposRoot() };
+  if (!existsSync59(gitdir))
+    return { state: "none", gitdir };
+  const weight = directoryWeight(gitdir);
+  const trash = moveToTrash(gitdir, reason);
+  if (trash === null)
+    return { state: "stuck", gitdir, trashRoot: trashRoot() };
+  forgetWaitingCache(folder);
+  return { state: "discarded", gitdir, trash, bytes: weight.bytes, files: weight.files };
+}
 async function ensureSpaceRepo(folder, spaceRemoteUrl) {
   const gitdir = spaceGitdir(folder);
+  let setAside = null;
+  const foreign = await foreignSpaceHistory(folder, spaceRemoteUrl);
+  if (foreign) {
+    const discarded = discardSpaceHistory(folder, `space history for ${foreign.was}: ${folder} is now mapped to ${foreign.now}`);
+    if (discarded.state === "stuck") {
+      throw new Error(`This folder's earlier history belonged to another space and could not be moved to ${discarded.trashRoot}, so nothing was synced. It is at ${discarded.gitdir}.`);
+    }
+    if (discarded.state === "discarded")
+      setAside = { spaceId: foreign.was, trash: discarded.trash, bytes: discarded.bytes };
+  }
   let created = false;
   if (!existsSync59(gitdir)) {
     migrateLegacyInFolderRepo(folder, gitdir);
@@ -26694,7 +27000,7 @@ async function ensureSpaceRepo(folder, spaceRemoteUrl) {
   if (!current || normalizeUrl(current.url) !== normalizeUrl(spaceRemoteUrl)) {
     await git.addRemote({ ...repoAt(folder), remote: RUNWORK_REMOTE, url: spaceRemoteUrl, force: true });
   }
-  return { created };
+  return { created, setAside };
 }
 function migrateLegacyInFolderRepo(folder, gitdir) {
   const inFolder = join59(folder, ".git");
@@ -26931,9 +27237,29 @@ function unaddressableNamesIn(folder) {
   walk(folder, "");
   return found.sort();
 }
-async function readStatusMatrix(folder) {
+function spaceVisibleFs(folder, skip) {
+  const root = resolve7(folder).replace(/\\/g, "/").replace(/\/+$/, "");
+  const relativeToFolder = (target) => {
+    const path2 = String(target).replace(/\\/g, "/").replace(/\/+$/, "");
+    if (path2 === root)
+      return "";
+    return path2.startsWith(`${root}/`) ? path2.slice(root.length + 1) : null;
+  };
+  return {
+    promises: {
+      ...fs6.promises,
+      readdir: async (target) => {
+        const rel = relativeToFolder(String(target));
+        if (rel !== null && rel !== "" && skip(rel))
+          return [];
+        return fs6.promises.readdir(target);
+      }
+    }
+  };
+}
+async function readStatusMatrix(folder, skip) {
   try {
-    return await git.statusMatrix({ ...repoAt(folder) });
+    return await git.statusMatrix({ ...repoAt(folder), fs: spaceVisibleFs(folder, skip) });
   } catch (err) {
     const offenders = unaddressableNamesIn(folder);
     if (offenders.length === 0)
@@ -26970,14 +27296,14 @@ async function planFolderChanges(folder, opts = {}) {
   const ignoreSets = buildSpaceIgnoreSets(folder);
   const managedInstructionPaths = new Set(agentManagedInstructionPaths());
   const includeRules = readIncludeRules(folder);
-  const matrix = await readStatusMatrix(folder);
+  const floor = buildSpaceFloorSets();
+  const matrix = await readStatusMatrix(folder, (relDir) => spaceSkipsDirectory(relDir, ignoreSets, includeRules, floor));
   const changes = [];
   const skipped = [];
   let addedBytes = 0;
   const remove = (filepath) => {
     changes.push({ path: filepath, kind: "remove", bytes: 0 });
   };
-  const floor = buildSpaceFloorSets();
   for (const [filepath, head, workdir] of matrix) {
     if (hiddenFromSpace(filepath, ignoreSets, includeRules, floor))
       continue;
@@ -27101,8 +27427,8 @@ function splitPlannedChanges(changes, rules) {
         split.heldNewestMtimeMs = Math.max(split.heldNewestMtimeMs ?? 0, change.mtimeMs);
       continue;
     }
-    const age = nowMs - (change.mtimeMs ?? 0);
-    const unfinished = change.kind !== "remove" && rules.settle !== false && age >= 0 && age < SPACE_SETTLE_MS;
+    const age = nowMs - Math.floor(change.mtimeMs ?? 0);
+    const unfinished = change.kind !== "remove" && rules.settle !== false && age > -SPACE_CLOCK_AHEAD_MS && age < SPACE_SETTLE_MS;
     if (unfinished && !namedForSharing(change.path, shareNow)) {
       split.settling.push(change.path);
       continue;
@@ -27272,7 +27598,7 @@ function weightSentence(heaviest) {
 function ceilingMessage(refusal) {
   const sizes = `${formatBytes(refusal.bytesToPush)} and the space has ${formatBytes(refusal.remainingBytes)} left`;
   if (refusal.pendingCommits === 0) {
-    const nothingWritten = `Sharing this folder would send ${sizes}, so nothing was committed here and nothing went up.${weightSentence(refusal.heaviest)} Share less of it with \`runwork spaces exclude <path>\`, or remove the large files, then sync again.`;
+    const nothingWritten = `Sharing this folder would send ${sizes}, so nothing was committed here and nothing went up.${weightSentence(refusal.heaviest)} Share less of it with \`${SPACE_EXCLUDE_COMMAND} <path>\`, or remove the large files, then sync again.`;
     if (!refusal.spaceHasWorkToGive)
       return nothingWritten;
     return `${nothingWritten} The space's own newer work is still waiting for this folder and arrives on the first sync that is not refused.`;
@@ -27280,7 +27606,7 @@ function ceilingMessage(refusal) {
   const commits = refusal.pendingCommits === 1 ? "Its commit is" : `Its ${refusal.pendingCommits} commits are`;
   const alreadyWritten = `This push carries ${sizes}. ${commits} already in this folder's space history, so removing files now adds another commit and takes nothing away. What has to start over is that history: it lives at ${refusal.historyPath}, outside your folder, and neither your files nor your own git repository are part of it.`;
   const bothWays = refusal.spaceHasWorkToGive ? " Until the push lands, this folder cannot take the space's newer work either, because the space combines the two sides when a push arrives." : "";
-  const exit = ` Start it over with \`runwork spaces reset ${refusal.folder}\`: this machine's copy of that history is discarded and the next sync rebuilds it from the space. Those commits never reached the space, so they go with it; your own files stay where they are.`;
+  const exit = ` Start it over with \`${SPACE_RESET_COMMAND} ${refusal.folder}\`: this machine's copy of that history is discarded and the next sync rebuilds it from the space. Those commits never reached the space, so they go with it; your own files stay where they are.`;
   return `${alreadyWritten}${bothWays}${exit}`;
 }
 async function resolveOid(folder, ref) {
@@ -27388,7 +27714,7 @@ async function localVersionsToKeep(folder, commit) {
   }
   return keep;
 }
-async function ceilingCheck(input, limits, plan) {
+async function ceilingCheck(input, limits, plan, now) {
   const local = await resolveOid(input.folder, LOCAL_MAIN);
   const remote = await resolveOid(input.folder, REMOTE_MAIN);
   const common = local && remote ? await mergeBase(input.folder, local, remote) : null;
@@ -27399,7 +27725,9 @@ async function ceilingCheck(input, limits, plan) {
   if (isUnreadableStorage(input.spaceStorage))
     return { decision, refusal: null, unmeasured: input.spaceStorage.unreadable };
   const pending = local && (decision === "push" || decision === "push-then-fast-forward") ? await unpushedCommits(input.folder, local, common) : [];
-  const bytesToPush = pending.reduce((sum, c) => sum + c.bytes, 0) + plan.addedBytes;
+  const staging = splitPlannedChanges(plan.changes, { settle: input.settle, shareNow: input.shareNow, auto: input.auto, now }).staging;
+  const addingBytes = staging.reduce((sum, change) => change.kind === "remove" ? sum : sum + change.bytes, 0);
+  const bytesToPush = pending.reduce((sum, c) => sum + c.bytes, 0) + addingBytes;
   const remainingBytes = spaceRemainingBytes(input.spaceStorage, limits.spaceBytes);
   if (!pushWouldExceed(remainingBytes, bytesToPush))
     return nothingToSay;
@@ -27412,7 +27740,7 @@ async function ceilingCheck(input, limits, plan) {
       bytesToPush,
       pendingCommits: pending.length,
       historyPath: spaceGitdir(input.folder),
-      heaviest: pending.length === 0 ? heaviestShares(plan.changes) : [],
+      heaviest: pending.length === 0 ? heaviestShares(staging) : [],
       spaceHasWorkToGive: decision === "fast-forward" || decision === "checkout-remote" || decision === "push-then-fast-forward"
     }
   };
@@ -27420,11 +27748,13 @@ async function ceilingCheck(input, limits, plan) {
 async function syncSpaceFolder(input) {
   const limits = input.limits ?? DEFAULT_SPACE_REPO_LIMITS;
   const platform9 = input.platform ?? hostPathPlatform();
+  const now = input.now ?? new Date;
   const onAuth = spaceRepoAuth(input.apiKey);
   const base = {
     folder: input.folder,
     decision: "nothing",
     initialized: false,
+    historySetAside: null,
     commit: { committed: false, commits: [], added: [], removed: [], skipped: [], settling: [], held: [], heldNewestMtimeMs: null, heldSummary: noWaiting(), addedBytes: 0 },
     pushed: false,
     batches: 0,
@@ -27439,7 +27769,9 @@ async function syncSpaceFolder(input) {
   };
   let measured = null;
   try {
-    base.initialized = (await ensureSpaceRepo(input.folder, input.spaceRemoteUrl)).created;
+    const ensured = await ensureSpaceRepo(input.folder, input.spaceRemoteUrl);
+    base.initialized = ensured.created;
+    base.historySetAside = ensured.setAside;
     base.skippedForPlatform = [...platformSkippedPaths(input.folder, platform9)];
     let fetchFailure = null;
     try {
@@ -27452,7 +27784,7 @@ async function syncSpaceFolder(input) {
     const plan = firstFromSpace ? await dropAlreadyInSpace(input.folder, walked, REMOTE_MAIN) : walked;
     measured = plan;
     const holding = input.auto !== true && !askedToShare(input);
-    const ceiling = fetchFailure || holding ? { decision: "nothing", refusal: null, unmeasured: null } : await ceilingCheck(input, limits, plan);
+    const ceiling = fetchFailure || holding ? { decision: "nothing", refusal: null, unmeasured: null } : await ceilingCheck(input, limits, plan, now);
     const refused = ceiling.unmeasured !== null ? unmeasuredMessage(ceiling.unmeasured) : ceiling.refusal ? ceilingMessage(ceiling.refusal) : null;
     if (refused) {
       base.commit = { committed: false, commits: [], added: [], removed: [], skipped: plan.skipped, settling: [], held: [], heldNewestMtimeMs: null, heldSummary: noWaiting(), addedBytes: plan.addedBytes };
@@ -27470,7 +27802,7 @@ async function syncSpaceFolder(input) {
       settle: input.settle,
       shareNow: input.shareNow,
       auto: input.auto,
-      now: input.now
+      now
     });
     if (fetchFailure)
       throw fetchFailure;
@@ -27540,7 +27872,7 @@ async function syncSpaceFolder(input) {
     base.error = describeError(err);
     return base;
   } finally {
-    rememberWaitingChanges(input.folder, measured, base, { auto: input.auto, now: input.now });
+    rememberWaitingChanges(input.folder, measured, base, { auto: input.auto, now });
   }
 }
 function rememberWaitingChanges(folder, plan, result, rules) {
@@ -27829,11 +28161,13 @@ function scopeOfMappedFolder(folder, opts = {}) {
   const ignoreSets = buildSpaceIgnoreSets(folder);
   const rules = readIncludeRules(folder);
   const shares = at ? () => true : (rel) => rel === SPACE_INCLUDE_FILE || isIncluded(rel, rules);
+  const hidden = hiddenPredicate(ignoreSets, rules);
+  const outOfSight = at ? hidden : (rel) => hidden(rel) || sharesNothingUnder(rel, rules);
   const groups = new Map;
   let files = 0;
   let bytes = 0;
   const groupPrefix = at ? `${at}/` : "";
-  countUnder(at ? join60(folder, at) : folder, folder, hiddenPredicate(ignoreSets, rules), shares, {
+  countUnder(at ? join60(folder, at) : folder, folder, outOfSight, shares, {
     maxDepth: Number.POSITIVE_INFINITY,
     budget: { left: Number.POSITIVE_INFINITY },
     followLinks: false,
@@ -27852,6 +28186,32 @@ function scopeOfMappedFolder(folder, opts = {}) {
   const largest = [...groups.values()].sort((a, b) => b.files - a.files || a.name.localeCompare(b.name)).slice(0, limit);
   return { folder, files, bytes, largest };
 }
+function holdsMoreFilesThan(folder, max) {
+  const hidden = hiddenPredicate(buildSpaceIgnoreSets(folder), readIncludeRules(folder));
+  let found = 0;
+  const walk = (dir) => {
+    for (const name of safeReadDir(dir)) {
+      const full = join60(dir, name);
+      const rel = relative8(folder, full).split(sep9).join("/");
+      if (hidden(rel))
+        continue;
+      if (weigh(full, false).directory) {
+        if (walk(full))
+          return true;
+        continue;
+      }
+      found += 1;
+      if (found > max)
+        return true;
+    }
+    return false;
+  };
+  return walk(folder);
+}
+function topLevelSpaceEntries(folder) {
+  const hidden = hiddenPredicate(buildSpaceIgnoreSets(folder), readIncludeRules(folder));
+  return safeReadDir(folder).filter((name) => !hidden(name)).sort();
+}
 function safeReadDir(dir) {
   try {
     return readdirSync25(dir);
@@ -27881,6 +28241,10 @@ function measure(path2) {
 // ../../shared/spaces/map-scope.ts
 var MAP_SCOPE_MAX_FILES = 1e4;
 var MAP_SCOPE_MAX_BYTES = 500 * 1024 * 1024;
+var MAP_SEED_MAX_FILES = 5000;
+function mapSeededNothingSentence() {
+  return `This folder holds more than ${MAP_SEED_MAX_FILES.toLocaleString("en-US")} files, so nothing is shared until you pick what to share.`;
+}
 function isOverMapScope(scope) {
   return scope.files > MAP_SCOPE_MAX_FILES || scope.bytes > MAP_SCOPE_MAX_BYTES;
 }
@@ -27926,6 +28290,10 @@ function mapScopeWarning(scope) {
     example: mapScopeIncludeExample(scope)
   };
 }
+function historySetAsideSentence(setAside) {
+  const where = setAside.trash ? ` at ${setAside.trash}` : "";
+  return `This folder's earlier history belonged to another space and was set aside${where} (${formatBytes(setAside.bytes)}). Your files were not touched.`;
+}
 
 // src/commands/spaces.ts
 init_remote();
@@ -28033,8 +28401,12 @@ function lockPath2() {
   return join61(runworkDir(), "sync.lock");
 }
 var STALE_LOCK_MS = 5 * 60 * 1000;
-var DEFAULT_WAIT_MS = 30000;
+var HEARTBEAT_MS = 30000;
+var POLL_START_MS = 250;
+var POLL_MAX_MS = 5000;
+var WAIT_NOTICE_MS = 15000;
 var exitHandlerRegistered = false;
+var heartbeat = null;
 function ensureExitHandler() {
   if (exitHandlerRegistered)
     return;
@@ -28056,12 +28428,21 @@ function readLock() {
     return null;
   }
 }
+function heardFrom(existing) {
+  return existing.refreshedAt ?? existing.startedAt;
+}
+function holderAlive(existing) {
+  if (Date.now() - heardFrom(existing) > STALE_LOCK_MS)
+    return false;
+  return isProcessAlive2(existing.pid);
+}
 function writeLockExclusive() {
   try {
     if (!existsSync61(runworkDir())) {
       mkdirSync34(runworkDir(), { recursive: true });
     }
-    writeFileSync32(lockPath2(), JSON.stringify({ pid: process.pid, startedAt: Date.now() }), {
+    const now = Date.now();
+    writeFileSync32(lockPath2(), JSON.stringify({ pid: process.pid, startedAt: now, refreshedAt: now }), {
       flag: "wx"
     });
     return true;
@@ -28069,20 +28450,40 @@ function writeLockExclusive() {
     return false;
   }
 }
+function startHeartbeat() {
+  if (heartbeat)
+    return;
+  heartbeat = setInterval(() => {
+    const existing = readLock();
+    if (existing?.pid !== process.pid)
+      return;
+    try {
+      writeFileSync32(lockPath2(), JSON.stringify({ ...existing, refreshedAt: Date.now() }));
+    } catch {}
+  }, HEARTBEAT_MS);
+  heartbeat.unref();
+}
+function stopHeartbeat() {
+  if (!heartbeat)
+    return;
+  clearInterval(heartbeat);
+  heartbeat = null;
+}
 function tryAcquireOnce() {
   if (writeLockExclusive()) {
     ensureExitHandler();
+    startHeartbeat();
     return true;
   }
   const existing = readLock();
-  const stale = !existing || Date.now() - existing.startedAt > STALE_LOCK_MS || !isProcessAlive2(existing.pid);
-  if (!stale)
+  if (existing && holderAlive(existing))
     return false;
   try {
     unlinkSync9(lockPath2());
   } catch {}
   if (writeLockExclusive()) {
     ensureExitHandler();
+    startHeartbeat();
     return true;
   }
   return false;
@@ -28090,20 +28491,34 @@ function tryAcquireOnce() {
 function sleep(ms) {
   return new Promise((resolve8) => setTimeout(resolve8, ms));
 }
-async function acquireSyncLock(waitMs = DEFAULT_WAIT_MS) {
-  const deadline = Date.now() + waitMs;
-  let delay = 250;
+function noticeWaiting(pid, waitedMs) {
+  if (waitedMs < WAIT_NOTICE_MS) {
+    console.error(`Another Runwork sync is running on this machine (pid ${pid}). Waiting for it to finish.`);
+    return;
+  }
+  console.error(`Still waiting for that sync, ${Math.round(waitedMs / 1000)}s so far.`);
+}
+async function acquireSyncLock() {
+  const startedWaiting = Date.now();
+  let delay = POLL_START_MS;
+  let notices = 0;
   for (;; ) {
     if (tryAcquireOnce())
       return true;
-    const remaining = deadline - Date.now();
-    if (remaining <= 0)
+    const existing = readLock();
+    if (!existing || !holderAlive(existing))
       return false;
-    await sleep(Math.min(delay, remaining));
-    delay = Math.min(delay * 2, 5000);
+    const waitedMs = Date.now() - startedWaiting;
+    if (waitedMs >= notices * WAIT_NOTICE_MS) {
+      noticeWaiting(existing.pid, waitedMs);
+      notices += 1;
+    }
+    await sleep(delay);
+    delay = Math.min(delay * 2, POLL_MAX_MS);
   }
 }
 function releaseSyncLock() {
+  stopHeartbeat();
   const existing = readLock();
   if (existing?.pid === process.pid) {
     try {
@@ -28353,6 +28768,7 @@ function failedFolder(folder, err) {
     folder,
     decision: "nothing",
     initialized: false,
+    historySetAside: null,
     commit: { committed: false, commits: [], added: [], removed: [], skipped: [], settling: [], held: [], heldNewestMtimeMs: null, heldSummary: noWaiting(), addedBytes: 0 },
     pushed: false,
     batches: 0,
@@ -28434,7 +28850,12 @@ spacesCommand.command("suggest").description("Propose spaces and things to keep
     saveCensusStore(store);
   const records = Object.fromEntries([...candidates.keys()].map((key) => [key, store.sessions[key]]).filter(([, r]) => Boolean(r)));
   const knownSkills = opts.offline ? null : await fetchKnownSkills();
-  const census = buildAssetCensus({ records, knownSkills, mappedFolders: mappedFolderIndex(loadSpaceMappings().mappings) });
+  const census = buildAssetCensus({
+    records,
+    knownSkills,
+    mappedFolders: mappedFolderIndex(loadSpaceMappings().mappings),
+    liveActivity: liveFolderActivity(listing.conversations)
+  });
   if (json) {
     jsonOut({ captured, days, census });
     return;
@@ -28536,6 +28957,13 @@ spacesCommand.command("map <folder>").description("Keep a folder in a space: eve
       writeFileSync33(localList, fromSpace);
     }
   }
+  const narrowed = !existsSync64(localList) && holdsMoreFilesThan(target, MAP_SEED_MAX_FILES) ? mapSeededNothingSentence() : null;
+  if (narrowed) {
+    let seeded = readIncludeRules(target);
+    for (const entry of topLevelSpaceEntries(target))
+      seeded = excludePath(seeded, entry);
+    writeIncludeRules(target, seeded);
+  }
   if (existsSync64(localList)) {
     excludeFromTheirGit(target, SPACE_INCLUDE_FILE);
   }
@@ -28574,7 +29002,7 @@ spacesCommand.command("map <folder>").description("Keep a folder in a space: eve
   writeSpaceMarker(mapping);
   excludeFromTheirGit(target, ".runwork/");
   if (!json) {
-    console.log(dim(mapScopeWarning(scope).count));
+    console.log(dim(narrowed ?? mapScopeWarning(scope).count));
     if (overScope && !auto) {
       console.log(dim(`${waitingScopeSentence(scope)}, and none of it leaves this computer until you share it.`));
     }
@@ -28591,7 +29019,7 @@ spacesCommand.command("map <folder>").description("Keep a folder in a space: eve
   }
   const problem = firstSyncProblem(firstSync, firstSyncError);
   if (json) {
-    jsonOut({ mapped: mapping, path: spaceMappingsPath(), refused: false, scope, createdFolder, adoptedInstructions: adopted, firstSync, firstSyncError, firstSyncOk: problem === null, firstSyncProblem: problem });
+    jsonOut({ mapped: mapping, path: spaceMappingsPath(), refused: false, scope, createdFolder, adoptedInstructions: adopted, narrowed, firstSync, firstSyncError, firstSyncOk: problem === null, firstSyncProblem: problem });
     if (problem)
       process.exitCode = MAP_FIRST_SYNC_FAILED;
     return;
@@ -28600,6 +29028,9 @@ spacesCommand.command("map <folder>").description("Keep a folder in a space: eve
     console.log(dim(`Created ${mapping.folder}.`));
   console.log(green(`Mapped ${mapping.folder} to ${spaceDisplayName(space)}.`));
   const outcome = firstSync?.results[0];
+  if (outcome?.historySetAside) {
+    console.log(dim(`  ${historySetAsideSentence(outcome.historySetAside)}`));
+  }
   if (outcome && !problem) {
     console.log(dim(`  ${describeFolderSync(outcome)}`));
     const kept = outcome.keptLocalCopies;
@@ -28693,9 +29124,6 @@ function writeIncludeRules(folder, rules) {
   writeFileSync33(file, existing === null ? formatIncludeFile(rules) : updateIncludeFile(existing, rules));
   excludeFromTheirGit(folder, SPACE_INCLUDE_FILE);
 }
-function spaceReposRoot() {
-  return join64(homedir39(), ".runwork", "space-repos");
-}
 var LOCAL_MAIN_REF = `refs/heads/${SPACE_BRANCH}`;
 var REMOTE_MAIN_REF = `refs/remotes/${RUNWORK_REMOTE}/${SPACE_BRANCH}`;
 async function readSpaceRef(gitdir, ref) {
@@ -28780,35 +29208,6 @@ function describeOrphan(repo) {
   const state = repo.state === "unpushed" ? red(`holds ${repo.unpushedCommits || "some"} commit(s) the space does not have`) : repo.state === "in-sync" ? green("the space has all of it") : repo.state === "behind" ? green("the space has moved past it") : dim("never committed anything");
   return `  ${repo.name}  ${dim(formatBytes(repo.bytes))}  ${state}${repo.spaceId ? dim(`  ${repo.spaceId}`) : ""}`;
 }
-function directoryWeight(dir) {
-  let bytes = 0;
-  let files = 0;
-  const pending = [dir];
-  while (pending.length > 0) {
-    const current = pending.pop();
-    let entries;
-    try {
-      entries = readdirSync26(current, { withFileTypes: true });
-    } catch {
-      continue;
-    }
-    for (const entry of entries) {
-      const full = join64(current, entry.name);
-      if (entry.isDirectory()) {
-        pending.push(full);
-        continue;
-      }
-      try {
-        const stats = lstatSync4(full);
-        if (stats.isFile()) {
-          bytes += stats.size;
-          files++;
-        }
-      } catch {}
-    }
-  }
-  return { bytes, files };
-}
 async function readStdinBytes() {
   if (process.stdin.isTTY)
     return null;
@@ -29356,7 +29755,7 @@ async function underSyncLock(json, run) {
   const acquired = await acquireSyncLock();
   if (!acquired) {
     if (!json)
-      console.log("  Another sync appears to be in progress on this machine; proceeding anyway.");
+      console.log("  This machine's sync lock could not be taken, and nothing is holding it; proceeding anyway.");
     await run();
     return;
   }
@@ -29567,12 +29966,24 @@ spacesCommand.command("reset <folder>").description("Throw away this machine's c
     process.exit(1);
   }
   const gitdir = spaceGitdir(found.folder);
-  const root = join64(homedir39(), ".runwork", "space-repos");
-  if (dirname18(gitdir) !== root) {
+  const root = spaceReposRoot();
+  if (!isSpaceHistoryPath(gitdir)) {
     console.error(`Error: refusing to remove ${gitdir}. A space history is a folder directly under ${root}, and this is not one.`);
     process.exit(1);
   }
-  if (!existsSync64(gitdir)) {
+  if (opts.yes !== true && !json && existsSync64(gitdir)) {
+    const confirmed = await promptConfirm(`Throw away ${formatBytes(directoryWeight(gitdir).bytes)} of ${found.mapping.spaceName} history for ${found.folder}? Your files stay where they are.`);
+    if (!confirmed) {
+      console.log("Cancelled.");
+      return;
+    }
+  }
+  const discarded = discardSpaceHistory(found.folder, `runwork spaces reset ${found.folder}`);
+  if (discarded.state === "outside") {
+    console.error(`Error: refusing to remove ${discarded.gitdir}. A space history is a folder directly under ${discarded.root}, and this is not one.`);
+    process.exit(1);
+  }
+  if (discarded.state === "none") {
     if (json) {
       jsonOut({ folder: found.folder, spaceId: found.mapping.spaceId, spaceName: found.mapping.spaceName, gitdir, removed: false, bytes: 0, files: 0, trash: null });
       return;
@@ -29580,25 +29991,15 @@ spacesCommand.command("reset <folder>").description("Throw away this machine's c
     console.log(dim(`${found.folder} has no space history on this machine. The next sync builds one: runwork spaces sync ${found.folder}`));
     return;
   }
-  const weight = directoryWeight(gitdir);
-  if (opts.yes !== true && !json) {
-    const confirmed = await promptConfirm(`Throw away ${formatBytes(weight.bytes)} of ${found.mapping.spaceName} history for ${found.folder}? Your files stay where they are.`);
-    if (!confirmed) {
-      console.log("Cancelled.");
-      return;
-    }
-  }
-  const trashed = moveToTrash(gitdir, `runwork spaces reset ${found.folder}`);
-  if (trashed === null) {
-    console.error(`Error: ${gitdir} could not be moved to ${join64(homedir39(), ".runwork", "trash")}, so nothing was removed.`);
+  if (discarded.state === "stuck") {
+    console.error(`Error: ${gitdir} could not be moved to ${discarded.trashRoot}, so nothing was removed.`);
     process.exit(1);
   }
-  forgetWaitingCache(found.folder);
   if (json) {
-    jsonOut({ folder: found.folder, spaceId: found.mapping.spaceId, spaceName: found.mapping.spaceName, gitdir, removed: true, bytes: weight.bytes, files: weight.files, trash: trashed });
+    jsonOut({ folder: found.folder, spaceId: found.mapping.spaceId, spaceName: found.mapping.spaceName, gitdir, removed: true, bytes: discarded.bytes, files: discarded.files, trash: discarded.trash });
     return;
   }
-  console.log(green(`${found.folder} starts over with ${found.mapping.spaceName}.`) + dim(`  ${formatBytes(weight.bytes)} of history moved to ${trashed}`));
+  console.log(green(`${found.folder} starts over with ${found.mapping.spaceName}.`) + dim(`  ${formatBytes(discarded.bytes)} of history moved to ${discarded.trash}`));
   console.log(dim(`Nothing in your folder was touched. Rebuild from the space with: runwork spaces sync ${found.folder}`));
   console.log(dim(`If the pushes were being refused for size, narrow what this folder shares first: runwork spaces files ${found.folder}`));
 });
@@ -29863,9 +30264,8 @@ function routingTable(surface) {
   ];
 }
 var PRODUCT_DEV_EXCEPTION = "**Exception -- product development:** Editing your current codebase, running tests, git operations, and building features in the product you're working on are NOT Runwork territory. Runwork is for infrastructure and team tooling, not the product itself.";
-var ROUTING_PROSE = `Save or update a skill with \`save_skill\`, not local SKILL.md files. Store structured data with \`entity_{Name}\` tools, not SQLite or JSON files. Schedule recurring jobs as Runwork schedules (\`schedule_{name}\`), not OS cron. Run multi-step processes as Runwork workflows (\`workflow_{name}\`), not ad-hoc scripts. Call third-party services (Slack, HubSpot, Gmail, Google) through \`{id}_api\` tools, not raw \`fetch\`. ${SPACES_ROUTING_SENTENCE} Store other files in Runwork file storage, not the local filesystem. Expose public APIs as Runwork endpoints (\`endpoint_*\`), not standalone servers.`;
 function buildRunworkInstructions(ctx) {
-  const { workspaceName, workspaceId, workspaceSlug, inventory, surface = "machine", form = "full" } = ctx;
+  const { workspaceName, workspaceId, workspaceSlug, inventory, surface = "machine" } = ctx;
   const dashboardUrl = workspaceSlug ? `https://${workspaceSlug}.runwork.ai` : "https://runwork.ai";
   const workspaceIdLine = `Workspace ID: \`${workspaceId}\`${workspaceSlug ? ` | Dashboard: ${dashboardUrl}` : ""}`;
   const connection = surface === "mcp" ? `You are connected to the **${workspaceName}** Runwork workspace` : `This machine is connected to the **${workspaceName}** Runwork workspace`;
@@ -29878,11 +30278,7 @@ function buildRunworkInstructions(ctx) {
     workspaceIdLine,
     ""
   ];
-  if (form === "compact") {
-    lines.push(`**Default to Runwork -- team sync beats local files.** ${ROUTING_PROSE} These sync across every teammate's AI agents; local alternatives only work for you.`, "", PRODUCT_DEV_EXCEPTION, "", `**Available now:** ${buildInventoryLine(inventory)}`, "", `Runwork MCP tools are always connected -- use them for data access, integration API calls, skill management, and resource discovery.${integrationToolHint} Web dashboard: ${dashboardUrl}. Invoke the \`runwork\` skill for the full capability reference, or run \`runwork doctor\` to check setup.`, ...buildPersonaBlock(ctx.persona));
-  } else {
-    lines.push("**Default to Runwork -- team sync beats local files.** When the user asks for any of the following, use the Runwork tool shown. These operations sync across every teammate's AI agents; local alternatives only work for the current user.", "", ...routingTable(surface), "", ...spacesInstructionBlock(surface), "", PRODUCT_DEV_EXCEPTION, "", `**Available now:** ${buildInventoryLine(inventory)}`, "", `Runwork MCP tools are always connected -- use them for data access, integration API calls, skill management, and resource discovery.${integrationToolHint} Use \`runwork\` CLI to create (\`runwork init\`), develop (\`runwork dev\`), and deploy (\`runwork deploy\`) apps. Install CLI: \`curl -fsSL https://runwork.ai/install.sh | sh\`. Web dashboard: ${dashboardUrl}. Invoke the \`runwork\` skill for full capability reference.`, ...buildPersonaBlock(ctx.persona));
-  }
+  lines.push("**Default to Runwork -- team sync beats local files.** When the user asks for any of the following, use the Runwork tool shown. These operations sync across every teammate's AI agents; local alternatives only work for the current user.", "", ...routingTable(surface), "", ...spacesInstructionBlock(surface), "", PRODUCT_DEV_EXCEPTION, "", `**Available now:** ${buildInventoryLine(inventory)}`, "", `Runwork MCP tools are always connected -- use them for data access, integration API calls, skill management, and resource discovery.${integrationToolHint} Use \`runwork\` CLI to create (\`runwork init\`), develop (\`runwork dev\`), and deploy (\`runwork deploy\`) apps. Install CLI: \`curl -fsSL https://runwork.ai/install.sh | sh\`. Web dashboard: ${dashboardUrl}. Invoke the \`runwork\` skill for full capability reference, or run \`runwork doctor\` to check setup.`, ...buildPersonaBlock(ctx.persona));
   return lines.join(`
 `);
 }
@@ -30229,15 +30625,14 @@ function generateIntroSkill(ctx) {
     description: "TRIGGER when user asks to: save/create/share/update a skill, store or persist data, schedule a recurring job, run a workflow or pipeline, call Slack/HubSpot/Gmail/any third-party integration, upload or persist a file, share team knowledge or expertise, connect AI tools via MCP, expose a public API, or build a team app or internal tool. Runwork is the team's shared infrastructure platform -- these operations sync across every teammate's AI agents, while local files only work for the current user. Always invoke BEFORE reaching for local files, native cron, SQLite, raw fetch calls, or one-off scripts. Features: skills, MCP servers, entities, file storage, schedules, workflows, integrations, agents, public endpoints, components. Interact via MCP tools (always available), CLI (`runwork`), web dashboard, desktop app, or API."
   };
 }
-function generateInstructionHint(ctx, form = "full") {
+function generateInstructionHint(ctx) {
   const body = buildRunworkInstructions({
     workspaceName: ctx.workspaceName,
     workspaceId: ctx.workspaceId,
     workspaceSlug: ctx.workspaceSlug,
     inventory: toRunworkInventory(ctx),
     persona: ctx.persona,
-    surface: "machine",
-    form
+    surface: "machine"
   });
   return [
     "<!-- runwork:start -->",
@@ -30288,7 +30683,7 @@ function readSetupExtras(workspaceId) {
   }
   return {};
 }
-var instructionsCommand = new Command17("instructions").description("Print the Runwork instruction block sync writes into each agent's config").option("--workspace <name-or-id>", "Workspace name or ID").option("--form <full|compact>", "Which rendering to print (default: full)", "full").action(async (opts, command) => {
+var instructionsCommand = new Command17("instructions").description("Print the Runwork instruction block sync writes into each agent's config").option("--workspace <name-or-id>", "Workspace name or ID").action(async (opts, command) => {
   const useJson = shouldOutputJson(command.optsWithGlobals().json);
   const credentials = requireAuth();
   const client = new ApiClient(credentials);
@@ -30300,18 +30695,16 @@ var instructionsCommand = new Command17("instructions").description("Print the R
     workspaceSlug: extras.workspaceSlug,
     persona: extras.persona
   });
-  const full = generateInstructionHint(ctx, "full");
-  const compact = generateInstructionHint(ctx, "compact");
+  const block = generateInstructionHint(ctx);
   if (useJson) {
     jsonOut({
       workspaceId,
       workspaceName: ctx.workspaceName,
-      [CLAUDE_ACCOUNT_PROFILE_FIELDS.full]: full,
-      [CLAUDE_ACCOUNT_PROFILE_FIELDS.compact]: compact
+      [CLAUDE_ACCOUNT_PROFILE_FIELD]: block
     });
     return;
   }
-  process.stdout.write((opts.form === "compact" ? compact : full) + `
+  process.stdout.write(block + `
 `);
 });
 
@@ -32978,7 +33371,7 @@ function ensureWorkspacePointer(state, statePath2, credentials) {
 async function syncFromState(state, statePath2, credentials, opts) {
   const acquired = await acquireSyncLock();
   if (!acquired) {
-    console.log("  Another sync appears to be in progress on this machine; proceeding anyway.");
+    console.log("  This machine's sync lock could not be taken, and nothing is holding it; proceeding anyway.");
     await runSyncFromState(state, statePath2, credentials, opts);
     return;
   }
@@ -35798,6 +36191,7 @@ function buildCapturePlan(input) {
   const home2 = input.homeDir.replace(/[/\\]+$/, "");
   const rw = (...parts) => join75(home2, ".runwork", ...parts);
   const steps = [];
+  const storePathsInput = { platform: input.platform, homeDir: home2, sep: sep12, appData: input.appData, localAppData: input.localAppData };
   steps.push({ id: "env", kind: "env", names: ENV_NAMES, note: "process environment (proxy credentials stripped)" });
   for (const [id, file] of [
     ["runwork.setup", "setup.json"],
@@ -35818,13 +36212,28 @@ function buildCapturePlan(input) {
     steps.push({ id, kind: "stat", path: rw(file), note: "size and mtime only: contains conversation text" });
   }
   steps.push({ id: "runwork.dir", kind: "census", path: rw(), depth: 1, maxEntries: CENSUS_MAX_ENTRIES }, { id: "runwork.bin", kind: "census", path: rw("bin"), depth: 1, maxEntries: 50, note: "which CLI binaries are installed here" }, { id: "runwork.sessions", kind: "census", path: rw("sessions"), depth: 1, maxEntries: CENSUS_MAX_ENTRIES, note: "written by the agent hooks we install" }, { id: "runwork.waiting", kind: "census", path: rw("waiting"), depth: 1, maxEntries: CENSUS_MAX_ENTRIES, note: "size and mtime only: each holds a mapped folder's own file names" }, { id: "runwork.log", kind: "file", path: rw("desktop-launch.log"), maxBytes: LOG_TAIL_BYTES, tail: true, note: "tail: this log has no rotation" });
-  const storeInput = { platform: input.platform, homeDir: home2, sep: sep12, appData: input.appData, localAppData: input.localAppData };
+  desktopStateDirs(storePathsInput).forEach((dir, i) => {
+    steps.push({
+      id: i === 0 ? "desktop.app-state" : `desktop.app-state.alt${i - 1}`,
+      kind: "file",
+      path: join75(dir, "app-state.json"),
+      maxBytes: CONFIG_MAX_BYTES,
+      note: "desktop state: onboarding, updater, the last vendor account-write refusal"
+    });
+    steps.push({
+      id: i === 0 ? "desktop.window-state" : `desktop.window-state.alt${i - 1}`,
+      kind: "file",
+      path: join75(dir, ".window-state.json"),
+      maxBytes: CONFIG_MAX_BYTES,
+      note: "window geometry: size, position, maximized, fullscreen"
+    });
+  });
   for (const target of CAPTURE_TARGETS) {
     const note = target.note ? { note: target.note } : {};
-    steps.push(target.kind === "file" ? { id: target.id, kind: "file", path: target.path(storeInput), maxBytes: target.maxBytes ?? CONFIG_MAX_BYTES, ...note } : { id: target.id, kind: "census", path: target.path(storeInput), depth: 1, maxEntries: CENSUS_MAX_ENTRIES, ...note });
+    steps.push(target.kind === "file" ? { id: target.id, kind: "file", path: target.path(storePathsInput), maxBytes: target.maxBytes ?? CONFIG_MAX_BYTES, ...note } : { id: target.id, kind: "census", path: target.path(storePathsInput), depth: 1, maxEntries: CENSUS_MAX_ENTRIES, ...note });
   }
   steps.push({ id: "agents.skills", kind: "census", path: join75(home2, ".agents", "skills"), depth: 1, maxEntries: CENSUS_MAX_ENTRIES });
-  for (const store of resolveTranscriptStores(storeInput)) {
+  for (const store of resolveTranscriptStores(storePathsInput)) {
     const id = `stores.${store.def.id.replace(/\//g, ".")}`;
     steps.push(store.def.kind === "file" ? { id, kind: "stat", path: store.path, ...store.def.note ? { note: store.def.note } : {} } : { id, kind: "census", path: store.path, depth: 2, maxEntries: CENSUS_MAX_ENTRIES, ...store.def.note ? { note: store.def.note } : {} });
     for (const parent of parentsWorthProbing(store.path, sep12)) {