@sideboard-ai/core 0.1.291 → 0.1.293

package/dist/index.js

@@ -186,7 +186,7 @@ import {
   worktreeBoardStatus,
   worktreeCleanupSettings,
   writeWorktreeFile
-} from "./chunk-QOUTSISS.js";
+} from "./chunk-LSHGJI4S.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -281,7 +281,7 @@ import {
   userMcpNamesToDisable,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-VNCPRMIK.js";
+} from "./chunk-XZW3BXZW.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -356,6 +356,7 @@ import {
   getRunScript,
   isAskUserToolName,
   isIncompleteTaskState,
+  isJobContinuePrompt,
   isOtherWorktreeListenerCwd,
   isPlanQuestionAnswersMessage,
   isTerminalTaskState,
@@ -408,7 +409,7 @@ import {
   workspaceAgentChatSummaries,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-GBAACE3C.js";
+} from "./chunk-4YXXLWDI.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -608,7 +609,7 @@ import {
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads,
   takenTeamSlugsForOrchestration
-} from "./chunk-V3BSO2O6.js";
+} from "./chunk-ZRQWV3MS.js";
 import {
   GITHUB_PR_BODY_MAX_CHARS,
   GITHUB_PR_BODY_SAFE_CHARS,
@@ -696,7 +697,7 @@ import {
   suggestSlug,
   switchWorktreeBranch,
   warmGithubAgentAuth
-} from "./chunk-2IXKTAIT.js";
+} from "./chunk-2VGLZIU6.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   allocateTeamName,
@@ -5126,7 +5127,7 @@ async function handleJobStop(params, _ctx) {
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-GSOW3RPA.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BOGVTCWI.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -9624,6 +9625,97 @@ function pickArtifactMatch(items, request) {
   return null;
 }
 
+// src/remote/phone-panes.ts
+var MAX_ROWS = 200;
+var MAX_QUERY = 200;
+function parsePhonePane(value, chatId) {
+  const pane = value && typeof value === "object" ? value.pane : void 0;
+  if (pane !== "files" && pane !== "changes" && pane !== "checks") return "invalid";
+  const scopeRaw = value.scope;
+  const scope = scopeRaw === "uncommitted" || scopeRaw === "commits" ? scopeRaw : void 0;
+  const queryRaw = value.query;
+  const query = typeof queryRaw === "string" ? queryRaw.trim().slice(0, MAX_QUERY) : "";
+  return {
+    op: "pane",
+    chatId,
+    pane,
+    ...scope && pane === "changes" ? { scope } : {},
+    ...query && pane === "files" ? { query } : {}
+  };
+}
+function filterPhoneFiles(paths, query) {
+  const q = query.trim().toLowerCase();
+  if (!q) return paths;
+  return paths.filter((path2) => path2.toLowerCase().includes(q));
+}
+async function readPhonePane(thread, pane, scope, query) {
+  try {
+    if (pane === "files") return await readFiles(thread.id, query);
+    if (pane === "changes") return await readChanges(thread.id, scope ?? "commits");
+    return await readChecks(thread.id);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { rows: [], note: message };
+  }
+}
+async function readFiles(threadId, query) {
+  const paths = filterPhoneFiles(await getOrchestrator().listFiles(threadId), query ?? "");
+  const shown = paths.slice(0, MAX_ROWS);
+  const extra = paths.length - shown.length;
+  const note = extra > 0 ? query?.trim() ? `${extra} more matching files` : `${extra} more files on the Mac` : void 0;
+  return {
+    rows: shown.map((path2) => ({ label: path2, path: path2 })),
+    ...note ? { note } : {}
+  };
+}
+async function readChanges(threadId, scope) {
+  const diff = await getOrchestrator().diff(threadId, { includePatches: false, scope });
+  const shown = diff.files.slice(0, MAX_ROWS);
+  return {
+    rows: shown.map((file) => {
+      const detail = changeDetail(file.additions, file.deletions);
+      return {
+        label: file.path,
+        path: file.path,
+        ...file.status ? { status: file.status } : {},
+        ...detail ? { detail } : {}
+      };
+    }),
+    ...diff.files.length > shown.length ? { note: `${diff.files.length - shown.length} more changed files` } : {}
+  };
+}
+function changeDetail(additions, deletions) {
+  const add = additions ?? 0;
+  const del = deletions ?? 0;
+  if (add === 0 && del === 0) return void 0;
+  return `+${add} \u2212${del}`;
+}
+async function readPhoneChangePatch(threadId, path2) {
+  const diff = await getOrchestrator().diff(threadId, {
+    path: path2,
+    scope: "commits",
+    includePatches: true,
+    includeMeta: false,
+    includeUntracked: false
+  });
+  const file = diff.files.find((row2) => row2.path === path2) ?? diff.files[0];
+  if (!file) return null;
+  const content = file.patch ?? "";
+  return { content, truncated: content.includes("\u2026 truncated") };
+}
+async function readChecks(threadId) {
+  const checks = await getOrchestrator().getPrChecks(threadId);
+  if (!checks) return { rows: [], note: "No pull request on this branch." };
+  const shown = checks.slice(0, MAX_ROWS);
+  return {
+    rows: shown.map((check) => ({
+      label: check.name,
+      detail: check.bucket || check.state,
+      ...check.link ? { href: check.link } : {}
+    }))
+  };
+}
+
 // src/remote/phone-chats.ts
 import { randomUUID as randomUUID7 } from "crypto";
 
@@ -9788,80 +9880,6 @@ function parsePhoneCodeRefs(value) {
   return refs;
 }
 
-// src/remote/phone-panes.ts
-var MAX_ROWS = 200;
-var MAX_QUERY = 200;
-function parsePhonePane(value, chatId) {
-  const pane = value && typeof value === "object" ? value.pane : void 0;
-  if (pane !== "files" && pane !== "changes" && pane !== "checks") return "invalid";
-  const scopeRaw = value.scope;
-  const scope = scopeRaw === "uncommitted" || scopeRaw === "commits" ? scopeRaw : void 0;
-  const queryRaw = value.query;
-  const query = typeof queryRaw === "string" ? queryRaw.trim().slice(0, MAX_QUERY) : "";
-  return {
-    op: "pane",
-    chatId,
-    pane,
-    ...scope && pane === "changes" ? { scope } : {},
-    ...query && pane === "files" ? { query } : {}
-  };
-}
-function filterPhoneFiles(paths, query) {
-  const q = query.trim().toLowerCase();
-  if (!q) return paths;
-  return paths.filter((path2) => path2.toLowerCase().includes(q));
-}
-async function readPhonePane(thread, pane, scope, query) {
-  try {
-    if (pane === "files") return await readFiles(thread.id, query);
-    if (pane === "changes") return await readChanges(thread.id, scope ?? "commits");
-    return await readChecks(thread.id);
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    return { rows: [], note: message };
-  }
-}
-async function readFiles(threadId, query) {
-  const paths = filterPhoneFiles(await getOrchestrator().listFiles(threadId), query ?? "");
-  const shown = paths.slice(0, MAX_ROWS);
-  const extra = paths.length - shown.length;
-  const note = extra > 0 ? query?.trim() ? `${extra} more matching files` : `${extra} more files on the Mac` : void 0;
-  return {
-    rows: shown.map((path2) => ({ label: path2, path: path2 })),
-    ...note ? { note } : {}
-  };
-}
-async function readChanges(threadId, scope) {
-  const diff = await getOrchestrator().diff(threadId, { includePatches: false, scope });
-  const shown = diff.files.slice(0, MAX_ROWS);
-  return {
-    rows: shown.map((file) => ({
-      label: file.path,
-      path: file.path,
-      detail: changeDetail(file.additions, file.deletions)
-    })),
-    ...diff.files.length > shown.length ? { note: `${diff.files.length - shown.length} more changed files` } : {}
-  };
-}
-function changeDetail(additions, deletions) {
-  const add = additions ?? 0;
-  const del = deletions ?? 0;
-  if (add === 0 && del === 0) return void 0;
-  return `+${add} \u2212${del}`;
-}
-async function readChecks(threadId) {
-  const checks = await getOrchestrator().getPrChecks(threadId);
-  if (!checks) return { rows: [], note: "No pull request on this branch." };
-  const shown = checks.slice(0, MAX_ROWS);
-  return {
-    rows: shown.map((check) => ({
-      label: check.name,
-      detail: check.bucket || check.state,
-      ...check.link ? { href: check.link } : {}
-    }))
-  };
-}
-
 // src/remote/phone-defaults.ts
 function row(resolved) {
   return {
@@ -9922,6 +9940,11 @@ function phoneStreamFlushNow(event) {
 var PHONE_USER_PREFIX = "Phone\n\n";
 var TRANSCRIPT_LIMIT = 40;
 var MESSAGE_LIMIT = 4e3;
+var CRASH_CONTINUE_PREFIX = "The previous agent process ended before it finished.";
+function isHostContinuePrompt(text5) {
+  const trimmed = text5.trim();
+  return isJobContinuePrompt(trimmed) || trimmed.startsWith(CRASH_CONTINUE_PREFIX);
+}
 function phoneVisibleText(role, text5) {
   const trimmed = text5.trim();
   if (role === "user" && trimmed.startsWith(PHONE_USER_PREFIX)) {
@@ -9947,6 +9970,9 @@ function listPhoneMessages(thread) {
   const out = [];
   for (const message of thread.messages) {
     if (message.role !== "user" && message.role !== "agent") continue;
+    if (message.origin === "continue" || message.role === "user" && isHostContinuePrompt(message.text)) {
+      continue;
+    }
     const names = (message.attachments ?? []).map((item) => item.name.trim()).filter(Boolean);
     const visible = [phoneVisibleText(message.role, message.text), names.length ? names.join(", ") : ""].filter(Boolean).join("\n");
     const text5 = message.role === "agent" ? phoneArtifactText(visible, message.parts, MESSAGE_LIMIT) : clip(visible, MESSAGE_LIMIT);
@@ -9955,6 +9981,7 @@ function listPhoneMessages(thread) {
   }
   const live = withLiveTail(thread, out);
   for (const prompt of thread.queue) {
+    if (isHostContinuePrompt(prompt)) continue;
     const text5 = clip(phoneVisibleText("user", prompt), MESSAGE_LIMIT);
     if (text5) live.push({ role: "user", text: text5 });
   }
@@ -10079,12 +10106,14 @@ function parsePhoneControl(value) {
     if (op === "media") return { op, chatId, path: path2 };
     const startLine = lineField(value, "startLine");
     const endLine = lineField(value, "endLine");
+    const view = textField(value, "view") === "diff" ? "diff" : void 0;
     return {
       op,
       chatId,
       path: path2,
       ...startLine != null ? { startLine } : {},
-      ...endLine != null ? { endLine } : {}
+      ...endLine != null ? { endLine } : {},
+      ...view ? { view } : {}
     };
   }
   const draft = parsePhoneDraft(value);
@@ -11093,6 +11122,30 @@ function handlePhoneControl(cmd, opts) {
       emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That file is not in this worktree." });
       return;
     }
+    if (cmd.view === "diff") {
+      void readPhoneChangePatch(thread.id, relative).then((body) => {
+        if (!body) {
+          emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That file has no changes to show." });
+          return;
+        }
+        emitControl(opts, {
+          op: "file",
+          chatId: cmd.chatId,
+          path: relative,
+          content: body.content,
+          encoding: "utf8",
+          view: "diff",
+          ...body.truncated ? { truncated: true } : {}
+        });
+      }).catch(() => {
+        emitControl(opts, {
+          op: "error",
+          chatId: cmd.chatId,
+          message: "That file could not be opened on the phone."
+        });
+      });
+      return;
+    }
     void getOrchestrator().statPath(thread.id, relative).then((kind) => {
       if (kind === "missing") {
         emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That file is not in this worktree." });
@@ -13187,7 +13240,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-GSOW3RPA.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BOGVTCWI.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }

package/dist/mcp/run-stdio.cjs

@@ -8577,15 +8577,8 @@ async function fetchOriginForWorktree(repoPath, sourceRef, opts) {
 async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
   try {
     const branch = opts?.branch?.trim() || await resolveDefaultBranch(repoPath, { network: false });
-    const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], repoPath, {
-      reject: false
-    });
-    const current = head.stdout.trim();
-    if (head.exitCode !== 0 || !current || current === "HEAD" || current !== branch) {
-      return { updated: false, reason: "not-on-default" };
-    }
-    if (await isDirty(repoPath)) {
-      return { updated: false, reason: "dirty" };
+    if (!branch || branch === "HEAD" || branch.includes("..")) {
+      return { updated: false, reason: "ff-failed" };
     }
     const remote = `origin/${branch}`;
     const remoteOk = await git(["rev-parse", "--verify", remote], repoPath, {
@@ -8594,8 +8587,27 @@ async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
     if (remoteOk.exitCode !== 0) {
       return { updated: false, reason: "no-origin-tip" };
     }
+    const worktrees = await listWorktrees(repoPath);
+    if (worktrees.length === 0) {
+      return { updated: false, reason: "ff-failed" };
+    }
+    const checkout = worktrees.find((entry) => entry.branch === branch) ?? null;
+    const localRef = `refs/heads/${branch}`;
+    const localOk = await git(["rev-parse", "--verify", localRef], repoPath, {
+      reject: false
+    });
+    if (localOk.exitCode !== 0) {
+      if (checkout) return { updated: false, reason: "ff-failed" };
+      const created = await git(["branch", "--track", branch, remote], repoPath, {
+        reject: false
+      });
+      if (created.exitCode !== 0) {
+        return { updated: false, reason: "ff-failed" };
+      }
+      return { updated: true, reason: "updated" };
+    }
     const ancestor = await git(
-      ["merge-base", "--is-ancestor", "HEAD", remote],
+      ["merge-base", "--is-ancestor", localRef, remote],
       repoPath,
       { reject: false }
     );
@@ -8603,7 +8615,7 @@ async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
       return { updated: false, reason: "diverged" };
     }
     const behind = await git(
-      ["rev-list", "--count", `HEAD..${remote}`],
+      ["rev-list", "--count", `${localRef}..${remote}`],
       repoPath,
       { reject: false }
     );
@@ -8611,10 +8623,22 @@ async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
     if (behind.exitCode !== 0 || !Number.isFinite(n) || n <= 0) {
       return { updated: false, reason: "already-current" };
     }
-    const ff = await git(["merge", "--ff-only", remote], repoPath, {
+    if (checkout) {
+      if (await isDirty(checkout.path)) {
+        return { updated: false, reason: "dirty" };
+      }
+      const ff = await git(["merge", "--ff-only", remote], checkout.path, {
+        reject: false
+      });
+      if (ff.exitCode !== 0) {
+        return { updated: false, reason: "ff-failed" };
+      }
+      return { updated: true, reason: "updated" };
+    }
+    const moved = await git(["branch", "-f", branch, remote], repoPath, {
       reject: false
     });
-    if (ff.exitCode !== 0) {
+    if (moved.exitCode !== 0) {
       return { updated: false, reason: "ff-failed" };
     }
     return { updated: true, reason: "updated" };

package/dist/mcp/run-stdio.js

@@ -50,7 +50,7 @@ import {
   syncBoardPins,
   updateSchedule,
   workspaceTagTargetRef
-} from "../chunk-4VXWLY3L.js";
+} from "../chunk-IP5WSADC.js";
 import "../chunk-LX5R5JOR.js";
 import {
   commentAbleTimeTask,
@@ -93,7 +93,7 @@ import {
   sideboardMcpProfile,
   trustSystemCertificates,
   worktreeMcpToolNames
-} from "../chunk-LUQ7MIVD.js";
+} from "../chunk-RPCKGO3J.js";
 import "../chunk-W2KZTDET.js";
 import "../chunk-7IAMHN2N.js";
 import "../chunk-PXMLMBMI.js";
@@ -110,7 +110,7 @@ import {
   waitForDetachedJob,
   waitForTurnToolResult,
   workspaceAgentChatSummaries
-} from "../chunk-G74TSBJ3.js";
+} from "../chunk-WRDKJRWF.js";
 import {
   clipToolResultForStore,
   isInternalAgentStatusText,
@@ -119,7 +119,7 @@ import {
 import {
   GLOBAL_WORKSPACE_ID,
   isCloudCoordinatorThread
-} from "../chunk-O4324MXE.js";
+} from "../chunk-PO3PDNMV.js";
 import {
   canonicalizeRepoPath,
   formatGhLandError,
@@ -130,7 +130,7 @@ import {
   resolveListPrsOptions,
   resolveRepoRoot,
   warmGithubAgentAuth
-} from "../chunk-5HPMKLJ7.js";
+} from "../chunk-UO5C2L2G.js";
 import {
   CLI_DIR
 } from "../chunk-N2WW62LF.js";

package/dist/{orchestrator-EQSK2RMI.js → orchestrator-4QVF6CE2.js}

@@ -11,20 +11,20 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-4VXWLY3L.js";
+} from "./chunk-IP5WSADC.js";
 import "./chunk-LX5R5JOR.js";
 import "./chunk-4BXRRHDC.js";
 import "./chunk-4GK32AYX.js";
 import "./chunk-5DZUWGKV.js";
-import "./chunk-LUQ7MIVD.js";
+import "./chunk-RPCKGO3J.js";
 import "./chunk-W2KZTDET.js";
 import "./chunk-7IAMHN2N.js";
 import "./chunk-PXMLMBMI.js";
 import "./chunk-2GPQZZLY.js";
-import "./chunk-G74TSBJ3.js";
+import "./chunk-WRDKJRWF.js";
 import "./chunk-AFLNFGGB.js";
-import "./chunk-O4324MXE.js";
-import "./chunk-5HPMKLJ7.js";
+import "./chunk-PO3PDNMV.js";
+import "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{orchestrator-GSOW3RPA.js → orchestrator-BOGVTCWI.js}

@@ -9,17 +9,17 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-QOUTSISS.js";
+} from "./chunk-LSHGJI4S.js";
 import "./chunk-PGPSIEMW.js";
-import "./chunk-VNCPRMIK.js";
+import "./chunk-XZW3BXZW.js";
 import "./chunk-VGNLMGBK.js";
-import "./chunk-GBAACE3C.js";
+import "./chunk-4YXXLWDI.js";
 import "./chunk-YSLCWCMJ.js";
 import "./chunk-7H655NEW.js";
 import "./chunk-AF2DMY3K.js";
 import "./chunk-NXXQFLNQ.js";
-import "./chunk-V3BSO2O6.js";
-import "./chunk-2IXKTAIT.js";
+import "./chunk-ZRQWV3MS.js";
+import "./chunk-2VGLZIU6.js";
 import "./chunk-QB5MDOHL.js";
 import "./chunk-2P4XKWV2.js";
 import "./chunk-33KDPEK4.js";

package/dist/{workspaces-ELO2YVTU.js → workspaces-QNKFBA63.js}

@@ -11,8 +11,8 @@ import {
   removeWorkspace,
   sameWorkspacePath,
   syncWorkspacesFromThreads
-} from "./chunk-O4324MXE.js";
-import "./chunk-5HPMKLJ7.js";
+} from "./chunk-PO3PDNMV.js";
+import "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{workspaces-RFD6I4FM.js → workspaces-YNZXVBSF.js}

@@ -9,8 +9,8 @@ import {
   removeWorkspace,
   sameWorkspacePath,
   syncWorkspacesFromThreads
-} from "./chunk-V3BSO2O6.js";
-import "./chunk-2IXKTAIT.js";
+} from "./chunk-ZRQWV3MS.js";
+import "./chunk-2VGLZIU6.js";
 import "./chunk-QB5MDOHL.js";
 import "./chunk-2P4XKWV2.js";
 import "./chunk-6K64FJDD.js";

package/dist/{worktree-ADVQ6X6C.js → worktree-EMCWDPZJ.js}

@@ -50,7 +50,7 @@ import {
   slugify,
   suggestSlug,
   switchWorktreeBranch
-} from "./chunk-5HPMKLJ7.js";
+} from "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{worktree-TN7DZDJZ.js → worktree-ERRH4TAG.js}

@@ -48,7 +48,7 @@ import {
   slugify,
   suggestSlug,
   switchWorktreeBranch
-} from "./chunk-2IXKTAIT.js";
+} from "./chunk-2VGLZIU6.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   allocateTeamName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.291",
+  "version": "0.1.293",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",