@sideboard-ai/core 0.1.109 → 0.1.110

package/dist/{chunk-LTPX5N6K.js → chunk-XOZDAVOP.js}

@@ -2,28 +2,35 @@
 
 import {
   PLAN_MODE_INSTRUCTION,
+  applyAgentEvent,
   applyTurnUsage,
   contextTokens,
   fallbackTurnFailDetail,
+  finalizeParts,
   formatTurnExitError,
   getAdapter,
+  isBrightsyNdjsonLine,
   isSessionQuotaLimit,
   looksLikeAgentFailureMessage,
   looksLikeInvalidAgentSession,
+  normalizeParseResult,
   parseBrightsyCliLine,
   parseSessionQuotaResetAt,
+  partsToAssistantText,
   pushTurnStderr,
   resolveQuotaFallbackAgent,
   shouldRetryFailedAgentTurn,
+  stripBrightsyNdjsonNoise,
   summarizeTurnStderr,
+  toolDescription,
   turnFailChatText
-} from "./chunk-AY2EQI2P.js";
+} from "./chunk-VOJSO3RM.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-OQDIYVDD.js";
+} from "./chunk-YFAXVUY2.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -44,14 +51,14 @@ import {
   isOrchestratorThread,
   isSlackCoordinatorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "./chunk-TROJ3PVH.js";
+} from "./chunk-VOD3HFLP.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "./chunk-VRTKGKUW.js";
+} from "./chunk-AROMOP3C.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -94,7 +101,7 @@ import {
   threadDisplayLabel,
   withRepoGitLock,
   worktreeNameFromPath
-} from "./chunk-JVIW55KT.js";
+} from "./chunk-YXDR43ZC.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -111,7 +118,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-P3BQ5DOL.js";
+} from "./chunk-KYOTBZ6S.js";
 import {
   childEnvWithAppSettings,
   isSecureFileEncrypted,
@@ -125,7 +132,7 @@ import {
   stripNestedElectronEnv,
   updateAdvancedSettings,
   writeSecureJson
-} from "./chunk-NE4TOOKS.js";
+} from "./chunk-SGEVS5SY.js";
 import {
   writePrivateFile
 } from "./chunk-NSTQ6QKD.js";
@@ -654,238 +661,13 @@ import { existsSync as existsSync16 } from "fs";
 import { createInterface } from "readline";
 import { execa } from "execa";
 
-// src/agents/message-parts.ts
-function asRecord(input) {
-  if (input && typeof input === "object" && !Array.isArray(input)) {
-    return input;
-  }
-  return void 0;
-}
-function str(v) {
-  return typeof v === "string" && v.trim() ? v : void 0;
-}
-function toolDetail(name, input) {
-  if (!input) return void 0;
-  const command = str(input.command) ?? str(input.cmd);
-  if (command) return command;
-  const path = str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
-  if (path) return path;
-  const pattern = str(input.pattern) ?? str(input.glob) ?? str(input.glob_pattern);
-  if (pattern) return pattern;
-  const query = str(input.query) ?? str(input.prompt);
-  if (query) return query.length > 80 ? `${query.slice(0, 77)}\u2026` : query;
-  try {
-    const raw = JSON.stringify(input);
-    return raw.length > 80 ? `${raw.slice(0, 77)}\u2026` : raw;
-  } catch {
-    return name;
-  }
-}
-function toolDescription(name, input) {
-  const n = name.replace(/^mcp__/, "").replace(/__/g, " \xB7 ");
-  if (/^get_record_types$|recordTypes/i.test(name)) return "List record types";
-  if (/connectedAgentRequest/i.test(name)) {
-    return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
-  }
-  if (/present_artifact$/i.test(name)) {
-    return str(input?.title) ? `Present ${str(input?.title)}` : "Present artifact";
-  }
-  if (/present_plan$/i.test(name)) {
-    return str(input?.title) ? `Plan ${str(input?.title)}` : "Present plan";
-  }
-  if (/present_schema$/i.test(name)) {
-    return str(input?.title) ? `Schema ${str(input?.title)}` : "Present schema";
-  }
-  if (/present_files$/i.test(name)) {
-    return str(input?.title) ? `Files ${str(input?.title)}` : "Present files";
-  }
-  if (/^(create|update)_artifact$/i.test(name.replace(/^mcp__[^_]+__/, ""))) {
-    return str(input?.title) ? `Artifact ${str(input?.title)}` : "Artifact";
-  }
-  if (!input) return n;
-  if (/bash|shell|terminal/i.test(name) && str(input.command)) {
-    const cmd = str(input.command);
-    if (/git\s+fetch/i.test(cmd)) return "Fetch latest from origin and check status";
-    if (/git\s+status/i.test(cmd)) return "Check git status";
-    if (/git\s+log/i.test(cmd)) return "Inspect recent commits";
-    if (/git\s+branch/i.test(cmd)) return "List branches";
-    if (/grep|rg\b/i.test(cmd)) return "Search repository";
-    return "Run shell command";
-  }
-  if (/edit|write|apply/i.test(name)) {
-    const path = str(input.file_path) ?? str(input.path);
-    return path ? `Edit ${path.split("/").pop()}` : "Edit file";
-  }
-  if (/read/i.test(name)) {
-    const path = str(input.file_path) ?? str(input.path);
-    return path ? `Read ${path.split("/").pop()}` : "Read file";
-  }
-  if (/grep/i.test(name)) return "Search files";
-  if (/glob/i.test(name)) return "Find files";
-  return n;
-}
-function toolFilePath(input) {
-  if (!input) return void 0;
-  return str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
-}
-function countLines(text) {
-  if (!text) return 0;
-  return text.split("\n").length;
-}
-function diffFromInput(input) {
-  if (!input) return {};
-  const oldS = str(input.old_string) ?? str(input.oldString);
-  const newS = str(input.new_string) ?? str(input.newString) ?? str(input.content);
-  if (oldS != null || newS != null) {
-    return {
-      additions: countLines(newS),
-      deletions: countLines(oldS)
-    };
-  }
-  return {};
-}
-function parseDiffStat(result) {
-  if (!result) return {};
-  const paired = result.match(/\+(\d+)\s+-(\d+)/);
-  if (paired) {
-    return {
-      additions: Number(paired[1]),
-      deletions: Number(paired[2])
-    };
-  }
-  const verbose = result.match(
-    /(\d+)\s+insertions?(?:,\s*(\d+)\s+deletions?)?/i
-  );
-  if (verbose) {
-    return {
-      additions: Number(verbose[1]),
-      deletions: verbose[2] != null ? Number(verbose[2]) : void 0
-    };
-  }
-  return {};
-}
-function applyAgentEvent(parts, event) {
-  if (event.type === "stdout") {
-    const data = event.data;
-    if (!data) return parts;
-    const next = [...parts];
-    const last = next[next.length - 1];
-    if (last?.type === "text") {
-      next[next.length - 1] = { type: "text", text: last.text + data };
-    } else {
-      next.push({ type: "text", text: data });
-    }
-    return next;
-  }
-  if (event.type === "thinking") {
-    const data = event.data;
-    if (!data) return parts;
-    const next = [...parts];
-    const last = next[next.length - 1];
-    if (last?.type === "thinking") {
-      next[next.length - 1] = { type: "thinking", text: last.text + data };
-    } else {
-      next.push({ type: "thinking", text: data });
-    }
-    return next;
-  }
-  if (event.type === "tool_use") {
-    const input = asRecord(event.input);
-    const diff = diffFromInput(input);
-    const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
-    if (existing >= 0) {
-      const prev = parts[existing];
-      const next = [...parts];
-      next[existing] = {
-        ...prev,
-        name: event.name || prev.name,
-        input: input ?? prev.input,
-        description: toolDescription(event.name || prev.name, input ?? prev.input),
-        detail: toolDetail(event.name || prev.name, input ?? prev.input) ?? prev.detail,
-        filePath: toolFilePath(input) ?? prev.filePath,
-        additions: diff.additions ?? prev.additions,
-        deletions: diff.deletions ?? prev.deletions
-      };
-      return next;
-    }
-    return [
-      ...parts,
-      {
-        type: "tool",
-        id: event.id,
-        name: event.name,
-        input,
-        description: toolDescription(event.name, input),
-        detail: toolDetail(event.name, input),
-        status: "running",
-        filePath: toolFilePath(input),
-        ...diff
-      }
-    ];
-  }
-  if (event.type === "tool_result") {
-    const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
-    const fromResult = parseDiffStat(event.content);
-    if (existing < 0) {
-      return [
-        ...parts,
-        {
-          type: "tool",
-          id: event.id,
-          name: "tool",
-          description: "tool",
-          status: event.isError ? "error" : "done",
-          result: event.content,
-          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
-          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-        }
-      ];
-    }
-    return parts.map((p, i) => {
-      if (i !== existing || p.type !== "tool") return p;
-      return {
-        ...p,
-        status: event.isError ? "error" : "done",
-        result: event.content,
-        ...fromResult.additions != null ? { additions: fromResult.additions } : {},
-        ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-      };
-    });
-  }
-  return parts;
-}
-function partsToAssistantText(parts) {
-  return parts.filter((p) => p.type === "text").map((p) => p.text).join("").trim();
-}
-function stripBrightsyNdjsonNoise(text) {
-  if (!text || !text.includes('"type"')) return text;
-  let out = text;
-  out = out.replace(
-    /\{"type":"(?:tool_use|tool_result|tool|thinking|usage|done|error)"[\s\S]*?\}\s*(?=\{"type":"|$|(?=[A-Za-z*#]))/g,
-    ""
-  );
-  out = out.replace(/\{"type":"(?:tool_use|tool_result|tool)"[\s\S]*$/g, "");
-  return out.trim();
-}
-function isBrightsyNdjsonLine(line) {
-  const t = line.trim();
-  if (!t.startsWith("{")) return false;
-  return /"type"\s*:\s*"(tool_use|tool_result|tool|thinking|usage|done|error|text)"/.test(t);
-}
-function finalizeParts(parts) {
-  return parts.map(
-    (p) => p.type === "tool" && p.status === "running" ? { ...p, status: "done" } : p
-  );
-}
-function normalizeParseResult(parsed) {
-  if (!parsed) return [];
-  return Array.isArray(parsed) ? parsed : [parsed];
-}
-
 // src/agents/cursor-stream-coalesce.ts
 function isTextEvent(event) {
   return event.type === "stdout" || event.type === "thinking";
 }
+function parentKey(event) {
+  return event.parentId ?? "";
+}
 function createAgentStreamCoalescer(emit, opts) {
   const intervalMs = opts?.intervalMs ?? 32;
   let pending = null;
@@ -898,7 +680,11 @@ function createAgentStreamCoalescer(emit, opts) {
     if (!pending) return;
     const event = pending;
     pending = null;
-    emit({ type: event.type, data: event.data });
+    emit({
+      type: event.type,
+      data: event.data,
+      ...event.parentId ? { parentId: event.parentId } : {}
+    });
   };
   const schedule = () => {
     if (timer) return;
@@ -913,11 +699,15 @@ function createAgentStreamCoalescer(emit, opts) {
         return;
       }
       if (!event.data) return;
-      if (pending && pending.type === event.type) {
+      if (pending && pending.type === event.type && parentKey(pending) === parentKey(event)) {
         pending.data += event.data;
       } else {
         flush2();
-        pending = { type: event.type, data: event.data };
+        pending = {
+          type: event.type,
+          data: event.data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        };
       }
       schedule();
     },
@@ -941,9 +731,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-WBQWQQQY.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-SKFODUQQ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-V66BYTUV.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-BHMLWL64.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1510,7 +1300,8 @@ function worktreeBindingFrom(from) {
     prState: from.prState,
     skipAutoArchiveOnMerge: from.skipAutoArchiveOnMerge,
     stackId: from.stackId,
-    stackLayer: from.stackLayer
+    stackLayer: from.stackLayer,
+    cowboy: from.cowboy
   };
 }
 function threadsSharingWorktree(worktreePath) {
@@ -2495,6 +2286,55 @@ async function createThread(input, _onSetupLine) {
   if (!existsSync7(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
   }
+  if (input.cowboy) {
+    const { cowboyModeEnabled } = await import("./app-settings-5XAGNDX7.js");
+    if (!cowboyModeEnabled()) {
+      throw new Error(
+        "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
+      );
+    }
+    if (input.sourceType === "pr" || input.sourceType === "ticket" || input.sourceType === "adopt") {
+      throw new Error(
+        "Cowboy mode works on the project folder (default branch), not a PR, ticket, or adopt."
+      );
+    }
+    const defaultBranch = await resolveDefaultBranch(repoPath, { network: false });
+    const head = await currentBranch(repoPath);
+    if (head === "HEAD") {
+      throw new Error(
+        "Cowboy mode needs a named branch in the project folder (not a detached HEAD)."
+      );
+    }
+    if (head !== defaultBranch) {
+      throw new Error(
+        `Cowboy mode uses ${defaultBranch} in the project folder. Switch that checkout to ${defaultBranch} first (currently ${head}).`
+      );
+    }
+    const explicitTitle2 = input.title?.trim();
+    const thread2 = createEmptyThread({
+      title: explicitTitle2 || `Cowboy \xB7 ${head}`,
+      userSetTitle: Boolean(explicitTitle2),
+      sourceType: "branch",
+      sourceRef: head,
+      branchName: head,
+      worktreePath: repoPath,
+      repoPath,
+      agent: resolved.agent,
+      autonomy: input.autonomy ?? "default",
+      model: resolved.model,
+      effort: resolved.effort,
+      fast: resolved.fast,
+      planMode: Boolean(input.planMode),
+      attachments: input.attachments ?? [],
+      sourceIsFork: false,
+      parentThreadId: input.parentThreadId ?? null,
+      status: "idle",
+      cowboy: true
+    });
+    writeThread(thread2);
+    await ensureWorkspace(repoPath);
+    return readThread(thread2.id) ?? thread2;
+  }
   let sourceRef = input.sourceRef;
   let sourceIsFork = false;
   let prUrl = null;
@@ -2558,7 +2398,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-XB332VUJ.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-MQDW3YXL.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2567,6 +2407,18 @@ async function listLinearIssues(agent, repoPath) {
   return adapter.listLinearIssues(repoPath);
 }
 
+// src/threads/cowboy.ts
+function isCowboyThread(thread) {
+  return Boolean(thread?.cowboy);
+}
+function isPrimaryCheckoutThread(thread) {
+  if (!thread?.worktreePath || !thread.repoPath) return false;
+  return normalizeWorktreePath(thread.worktreePath) === normalizeWorktreePath(thread.repoPath);
+}
+function shouldRemoveWorktreeOnTeardown(thread) {
+  return !isCowboyThread(thread) && !isPrimaryCheckoutThread(thread);
+}
+
 // src/store/turn-live.ts
 import {
   existsSync as existsSync8,
@@ -2931,7 +2783,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-I3554R3F.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-XAQVKTLO.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4164,13 +4016,22 @@ async function previewLand(thread) {
       isFork: true
     };
   }
-  const target = await resolveDefaultBranch(thread.repoPath);
-  if (thread.branchName === target || thread.branchName === "main" || thread.branchName === "master") {
+  if (isCowboyThread(thread)) {
+    const current2 = await currentBranch(thread.worktreePath);
+    const dirty = await isDirty(thread.worktreePath);
+    const diff2 = await getDiff(thread.worktreePath, thread.repoPath, { base: current2 });
+    return {
+      branch: current2,
+      target: current2,
+      diffStat: diff2.stat,
+      dirty,
+      blocked: false,
+      isFork: false,
+      cowboy: true
+    };
   }
-  const { stdout: head } = await import("./run-XKTAJRWF.js").then(
-    ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], thread.worktreePath)
-  );
-  const current = head.trim();
+  const target = await resolveDefaultBranch(thread.repoPath);
+  const current = await currentBranch(thread.worktreePath);
   if (current === target) {
     return {
       branch: current,
@@ -4197,6 +4058,19 @@ async function confirmLand(thread, opts) {
   if (preview.blocked) {
     throw new Error(preview.blockReason ?? "Land blocked");
   }
+  if (preview.cowboy) {
+    const meta2 = await suggestPrMetadata(thread.worktreePath, {
+      base: preview.branch,
+      fallbackTitle: thread.title,
+      sourceLabel: `${thread.sourceType}:${thread.sourceRef}`
+    });
+    let committed2 = false;
+    if (preview.dirty) {
+      committed2 = await commitAll(thread.worktreePath, meta2.commitMessage);
+    }
+    await pushBranch(thread.worktreePath, preview.branch);
+    return { prUrl: null, pushed: true, committed: committed2 };
+  }
   const meta = await suggestPrMetadata(thread.worktreePath, {
     base: preview.target,
     fallbackTitle: thread.title,
@@ -5055,7 +4929,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-JVGVPKLI.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-SCATSB3O.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -5273,7 +5147,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-EBCVMFF6.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-5XAGNDX7.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -5430,7 +5304,9 @@ var Orchestrator = class {
     return thread;
   }
   async finishCreateThread(threadId, prompt) {
-    const setup = this.runSetupAfterCreate(threadId);
+    const created = this.getThread(threadId);
+    const skipSetup = isCowboyThread(created);
+    const setup = skipSetup ? Promise.resolve() : this.runSetupAfterCreate(threadId);
     if (prompt) {
       try {
         await this.send(threadId, prompt);
@@ -5442,7 +5318,8 @@ var Orchestrator = class {
       }
     }
     await setup;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-EBCVMFF6.js");
+    if (skipSetup) return;
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-5XAGNDX7.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -5727,7 +5604,7 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
-    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("./app-settings-EBCVMFF6.js");
+    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("./app-settings-5XAGNDX7.js");
     const gitAuthMode = getGithubGitAuthMode();
     const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
       githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
@@ -6486,7 +6363,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-EBCVMFF6.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-5XAGNDX7.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -6773,23 +6650,25 @@ var Orchestrator = class {
     const siblings = threadsSharingWorktree(thread.worktreePath).filter((t) => t.id !== thread.id);
     if (siblings.length === 0) {
       this.stopDev(thread.id);
-      try {
-        await runArchiveScript(thread.repoPath, thread.worktreePath, (line) => {
-          this.emit({
-            type: "turn_output",
-            threadId: thread.id,
-            event: { type: "stdout", data: `[archive] ${line}` }
+      if (shouldRemoveWorktreeOnTeardown(thread)) {
+        try {
+          await runArchiveScript(thread.repoPath, thread.worktreePath, (line) => {
+            this.emit({
+              type: "turn_output",
+              threadId: thread.id,
+              event: { type: "stdout", data: `[archive] ${line}` }
+            });
           });
-        });
-      } catch {
+        } catch {
+        }
+        await removeWorktree(thread.repoPath, thread.worktreePath);
       }
-      await removeWorktree(thread.repoPath, thread.worktreePath);
     }
     const archived = setStatus(thread.id, "archived");
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-I3554R3F.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-XAQVKTLO.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -6811,15 +6690,17 @@ var Orchestrator = class {
     const siblings = threadsSharingWorktree(thread.worktreePath).filter((t) => t.id !== thread.id);
     if (siblings.length === 0) {
       this.stopDev(thread.id);
-      try {
-        await runArchiveScript(thread.repoPath, thread.worktreePath);
-      } catch {
+      if (shouldRemoveWorktreeOnTeardown(thread)) {
+        try {
+          await runArchiveScript(thread.repoPath, thread.worktreePath);
+        } catch {
+        }
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-5XAGNDX7.js");
+        const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
+        await removeWorktree(thread.repoPath, thread.worktreePath, {
+          deleteBranch: deleteBranch ? thread.branchName : void 0
+        });
       }
-      const { deleteBranchOnPurgeEnabled } = await import("./app-settings-EBCVMFF6.js");
-      const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
-      await removeWorktree(thread.repoPath, thread.worktreePath, {
-        deleteBranch: deleteBranch ? thread.branchName : void 0
-      });
     }
     deleteThreadRecord(thread.id);
   }
@@ -6836,7 +6717,12 @@ var Orchestrator = class {
       return restored2;
     }
     if (!existsSync16(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-7H6HB6GW.js");
+      if (isCowboyThread(thread) || isPrimaryCheckoutThread(thread)) {
+        throw new Error(
+          `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
+        );
+      }
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-N2EV24EE.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -6944,7 +6830,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-7H6HB6GW.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-N2EV24EE.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -6954,7 +6840,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-DQJGDKIJ.js");
+  const { updateThread: upd } = await import("./thread-store-LPTBVW5C.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal

package/dist/{chunk-OQDIYVDD.js → chunk-YFAXVUY2.js}

@@ -2,11 +2,11 @@
 
 import {
   isGlobalRepoPath
-} from "./chunk-TROJ3PVH.js";
+} from "./chunk-VOD3HFLP.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-JVIW55KT.js";
+} from "./chunk-YXDR43ZC.js";
 import {
   appDataDir
 } from "./chunk-BD2ICC4D.js";

package/dist/{chunk-JVIW55KT.js → chunk-YXDR43ZC.js}

@@ -5,11 +5,11 @@ import {
 } from "./chunk-B3SJXYIJ.js";
 import {
   listThreads
-} from "./chunk-P3BQ5DOL.js";
+} from "./chunk-KYOTBZ6S.js";
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-NE4TOOKS.js";
+} from "./chunk-SGEVS5SY.js";
 import {
   worktreesRoot
 } from "./chunk-BD2ICC4D.js";