@sideboard-ai/core 0.1.291 → 0.1.293

package/dist/index.cjs

@@ -10260,15 +10260,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, {
@@ -10277,8 +10270,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 }
     );
@@ -10286,7 +10298,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 }
     );
@@ -10294,10 +10306,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" };
@@ -40353,6 +40377,98 @@ function pickArtifactMatch(items, request) {
   return null;
 }
 
+// src/remote/phone-panes.ts
+init_orchestrator();
+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-workspace-ops.ts
 init_orchestrator();
 
@@ -40534,81 +40650,6 @@ function parsePhoneCodeRefs(value) {
   return refs;
 }
 
-// src/remote/phone-panes.ts
-init_orchestrator();
-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
 init_app_settings();
 function row(resolved) {
@@ -40650,6 +40691,7 @@ function refreshPhoneViewerLogin(force = false) {
 }
 
 // src/remote/phone-transcript.ts
+init_wait_for_job();
 init_turn_live();
 
 // src/remote/phone-stream.ts
@@ -40674,6 +40716,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(text7) {
+  const trimmed = text7.trim();
+  return isJobContinuePrompt(trimmed) || trimmed.startsWith(CRASH_CONTINUE_PREFIX);
+}
 function phoneVisibleText(role, text7) {
   const trimmed = text7.trim();
   if (role === "user" && trimmed.startsWith(PHONE_USER_PREFIX)) {
@@ -40699,6 +40746,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 text7 = message.role === "agent" ? phoneArtifactText(visible, message.parts, MESSAGE_LIMIT) : clip(visible, MESSAGE_LIMIT);
@@ -40707,6 +40757,7 @@ function listPhoneMessages(thread) {
   }
   const live = withLiveTail(thread, out);
   for (const prompt of thread.queue) {
+    if (isHostContinuePrompt(prompt)) continue;
     const text7 = clip(phoneVisibleText("user", prompt), MESSAGE_LIMIT);
     if (text7) live.push({ role: "user", text: text7 });
   }
@@ -40833,12 +40884,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);
@@ -41858,6 +41911,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." });

package/dist/index.d.cts

@@ -2396,12 +2396,18 @@ declare function fetchOriginForWorktree(repoPath: string, sourceRef: string, opt
 }): Promise<boolean>;
 type FastForwardMainResult = {
     updated: boolean;
-    reason: 'updated' | 'already-current' | 'not-on-default' | 'dirty' | 'diverged' | 'no-origin-tip' | 'ff-failed';
+    reason: 'updated' | 'already-current' | 'dirty' | 'diverged' | 'no-origin-tip' | 'ff-failed';
 };
 /**
- * Fast-forward the project-folder checkout to `origin/<default>` when that is
- * safe: already on the default branch, clean, and a strict ancestor of the
- * remote tip. Never checkout, reset, or merge if it would not fast-forward.
+ * Fast-forward the local default branch to `origin/<default>` when that is a
+ * strict fast-forward.
+ *
+ * Sidecar worktrees do the work, so the project folder is often on some other
+ * branch and `refs/heads/<default>` would otherwise stay stale after every
+ * fetch. When that branch is not checked out anywhere, move the ref only
+ * (`git branch -f`). When it is checked out and that worktree is clean,
+ * `git merge --ff-only` updates the working tree too. Never checkout, reset,
+ * or move a diverged or dirty branch.
  */
 declare function fastForwardMainCheckoutIfSafe(repoPath: string, opts?: {
     branch?: string;

package/dist/index.d.ts

@@ -2396,12 +2396,18 @@ declare function fetchOriginForWorktree(repoPath: string, sourceRef: string, opt
 }): Promise<boolean>;
 type FastForwardMainResult = {
     updated: boolean;
-    reason: 'updated' | 'already-current' | 'not-on-default' | 'dirty' | 'diverged' | 'no-origin-tip' | 'ff-failed';
+    reason: 'updated' | 'already-current' | 'dirty' | 'diverged' | 'no-origin-tip' | 'ff-failed';
 };
 /**
- * Fast-forward the project-folder checkout to `origin/<default>` when that is
- * safe: already on the default branch, clean, and a strict ancestor of the
- * remote tip. Never checkout, reset, or merge if it would not fast-forward.
+ * Fast-forward the local default branch to `origin/<default>` when that is a
+ * strict fast-forward.
+ *
+ * Sidecar worktrees do the work, so the project folder is often on some other
+ * branch and `refs/heads/<default>` would otherwise stay stale after every
+ * fetch. When that branch is not checked out anywhere, move the ref only
+ * (`git branch -f`). When it is checked out and that worktree is clean,
+ * `git merge --ff-only` updates the working tree too. Never checkout, reset,
+ * or move a diverged or dirty branch.
  */
 declare function fastForwardMainCheckoutIfSafe(repoPath: string, opts?: {
     branch?: string;