@sideboard-ai/core 0.1.73 → 0.1.74

package/dist/mcp/run-stdio.js

@@ -16,14 +16,14 @@ import {
   resolveQuotaFallbackAgent,
   sideboardMcpProfile,
   summarizeTurnStderr
-} from "../chunk-AFW3M6LU.js";
+} from "../chunk-KBKPVKYZ.js";
 import "../chunk-VROPG6QF.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-CXT2PLO7.js";
+} from "../chunk-GJ2LZQJI.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -38,14 +38,14 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-POW7JCB5.js";
+} from "../chunk-2NKSHIRI.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-6RFPKZNC.js";
+} from "../chunk-XA2FQJTN.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -882,14 +882,28 @@ function sumOptional(a, b) {
   if (a == null && b == null) return void 0;
   return (a ?? 0) + (b ?? 0);
 }
+function requestOccupancy(u) {
+  return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
+}
 function mergeUsage(a, b) {
   return {
     inputTokens: (a?.inputTokens ?? 0) + b.inputTokens,
     outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
     cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
-    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens)
+    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
+    lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
   };
 }
+function applyTurnUsage(current, incoming, scope = "request") {
+  if (scope === "turn") {
+    return {
+      ...incoming,
+      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
+    };
+  }
+  const merged = mergeUsage(current, incoming);
+  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
+}
 
 // src/agents/spawn.ts
 async function spawnAgentTurn(thread, input, onEvent) {
@@ -899,9 +913,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-VF56FTPY.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-PJU6HISJ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-ZHBDHMZB.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-RTUCCPCI.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -963,7 +977,7 @@ async function spawnAgentTurn(thread, input, onEvent) {
           continue;
         }
         if (parsed.type === "usage") {
-          usage = mergeUsage(usage, parsed.data);
+          usage = applyTurnUsage(usage, parsed.data, parsed.scope ?? "request");
           onEvent(parsed);
           continue;
         }
@@ -1003,6 +1017,31 @@ async function spawnAgentTurn(thread, input, onEvent) {
   };
 }
 
+// src/git/agent-git-actions.ts
+var AGENT_GIT_ACTIONS = [
+  "commit-push",
+  "create-draft",
+  "create-web",
+  "resolve-conflicts",
+  "merge"
+];
+function agentGitPrompt(action, opts) {
+  switch (action) {
+    case "commit-push":
+      return "Commit and push.";
+    case "create-draft":
+      return "Commit, push, and open a draft PR.";
+    case "create-web":
+      return "Commit, push, and open a PR in the browser.";
+    case "resolve-conflicts": {
+      const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
+      return base ? `Merge origin/${base} into this branch. Then push.` : "Fix merge conflicts.";
+    }
+    case "merge":
+      return "Merge PR.";
+  }
+}
+
 // src/git/pr-merge-archive.ts
 function normalizePrState(state) {
   return (state ?? "").trim().toUpperCase();
@@ -1717,7 +1756,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-77GE7VRW.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-2S2JVLZ6.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2581,7 +2620,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-ZJ45O4CD.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-L4TXMUNM.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -3582,10 +3621,10 @@ async function getDiff(worktreePath, repoPath, opts) {
     listBranchCommits(worktreePath, repoPath, { base: baseLabel }),
     isDirty(worktreePath),
     countUnpushedCommits(worktreePath)
-  ]).then(([scopeStats, commits, dirty, unpushed]) => ({
+  ]).then(([scopeStats, commits, dirty2, unpushed]) => ({
     scopeStats,
     commits,
-    dirty,
+    dirty: dirty2,
     unpushed
   })) : Promise.resolve({
     scopeStats: emptyScopeStats(),
@@ -3662,13 +3701,14 @@ async function getDiff(worktreePath, repoPath, opts) {
     }
   }
   const files = [...filesMap.values()].sort((a, b) => a.path.localeCompare(b.path));
+  const dirty = includeMeta ? meta.dirty : scope === "commits" ? false : files.length > 0;
   return {
     scope,
     commitSha: scope === "commits" ? commitSha : null,
     base: labelBase,
     files,
     stat: formatStat(files),
-    dirty: fileOnly || !includeMeta ? files.length > 0 : meta.dirty,
+    dirty,
     unpushed: meta.unpushed,
     hasLastTurnBase,
     commits: meta.commits,
@@ -4380,7 +4420,7 @@ function formatRenameBranchDirective(thread, opts) {
     "- Rename the git branch to a short kebab-case name that describes this task (what you are changing), e.g. `fix/panel-width` or `feat/dark-mode`:",
     "  `git branch -m <new-name>`",
     "- Prefer Conventional Commits style prefixes when they fit (`fix/`, `feat/`, `chore/`, `docs/`).",
-    "- Never push or merge to main/master from here."
+    "- Never push this placeholder to main/master."
   ];
   const custom = opts?.customPrompt?.trim();
   if (custom) {
@@ -4423,7 +4463,7 @@ function formatWorktreeDirective(thread, opts) {
     "- Prefer a concise imperative title (Conventional Commits style when it fits: feat:/fix:/chore:/docs:). Body should summarize intent, key changes, and test notes."
   );
   lines.push(
-    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch; never push or merge to main/master from here."
+    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch. Never push directly to main/master or merge locally into the main checkout. When asked to merge the PR, use GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
   );
   if (thread.prUrl) {
     lines.push(
@@ -4455,13 +4495,13 @@ function formatWorktreeDirective(thread, opts) {
     '- "Fix CI: <name>." \u2192 investigate that failing check, fix it, commit, and push.'
   );
   lines.push(
-    '- "Update the branch." / "Fix merge conflicts." \u2192 sync with the PR base (merge or rebase), resolve conflicts carefully, commit, and push until the PR is mergeable.'
+    '- "Update the branch." / "Fix merge conflicts." / "Merge origin/<base> into this branch. Then push." \u2192 sync with the PR base (merge or rebase), resolve conflicts carefully, commit, and push until the PR is mergeable.'
   );
   lines.push(
     '- "Address review comments." \u2192 read PR review feedback, make the requested changes, commit, and push.'
   );
   lines.push(
-    '- "Merge PR." \u2192 merge this thread\'s open pull request with `gh pr merge` (respect repo defaults / squash vs merge); do not force-push main/master.'
+    '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub. If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
   );
   return lines.join("\n");
 }
@@ -5890,6 +5930,36 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: tab.id, status: tab.status });
     return tab;
   }
+  /**
+   * Queue a desktop-git-button prompt on a worktree agent (commit/push/PR/merge).
+   * Orchestrators use this instead of running git/gh from the synthetic home.
+   */
+  async askGit(threadRef, action) {
+    if (!AGENT_GIT_ACTIONS.includes(action)) {
+      throw new Error(`Unknown git action: ${action}`);
+    }
+    const thread = this.requireThread(threadRef);
+    this.assertNotGlobal(thread, "ask_git");
+    if (isOrchestratorThread(thread)) {
+      throw new Error(
+        "ask_git targets a worktree agent thread (not the orchestrator). Pass a child/worktree thread ref."
+      );
+    }
+    if (action === "merge" && !thread.prUrl) {
+      throw new Error(
+        "No pull request linked. Ask the worktree agent to open a draft PR first (ask_git create-draft)."
+      );
+    }
+    let prBase;
+    if (action === "resolve-conflicts") {
+      try {
+        const details = await this.getPrDetails(threadRef);
+        prBase = details?.baseRefName?.trim() || void 0;
+      } catch {
+      }
+    }
+    return this.send(threadRef, agentGitPrompt(action, { prBase }));
+  }
   setThreadOptions(threadRef, patch) {
     const thread = this.requireThread(threadRef);
     const next = {};
@@ -5984,7 +6054,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-ZJ45O4CD.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-L4TXMUNM.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7206,7 +7276,7 @@ async function startMcpServer() {
     );
     server.tool(
       "send_to_thread",
-      "Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.",
+      "Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. For commit/push/PR/merge, prefer ask_git (canonical desktop-button phrases). Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.",
       {
         ref: z2.string(),
         prompt: z2.string(),
@@ -7237,7 +7307,7 @@ async function startMcpServer() {
     );
     server.tool(
       "wait_for_turn",
-      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread to read the agent reply.",
+      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread or ask_git to read the agent reply.",
       {
         ref: z2.string(),
         timeoutMs: z2.number().optional()
@@ -7302,7 +7372,7 @@ async function startMcpServer() {
     );
     server.tool(
       "archive_thread",
-      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators open PRs only by asking the worktree agent.",
+      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators commit, push, open PRs, and merge only by asking the worktree agent (ask_git).",
       { ref: z2.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
@@ -7408,6 +7478,38 @@ async function startMcpServer() {
         }
       }
     );
+    server.tool(
+      "ask_git",
+      "Tell a worktree agent to commit & push, open a draft PR, resolve conflicts, or merge the linked PR \u2014 same short prompts as the desktop git buttons. The worktree agent runs git/gh (`gh pr merge`); this only queues the prompt. Pass a worktree thread ref (not the orchestrator). Then wait_for_turn / get_turn_result. Do not run git or gh from the orchestration cwd.",
+      {
+        ref: z2.string().describe("Worktree thread id/ref"),
+        action: z2.enum(AGENT_GIT_ACTIONS).describe(
+          "commit-push | create-draft | create-web | resolve-conflicts | merge"
+        )
+      },
+      async ({ ref, action }) => {
+        try {
+          const thread = await orch.askGit(ref, action);
+          return {
+            content: [
+              {
+                type: "text",
+                text: JSON.stringify({
+                  id: thread.id,
+                  status: thread.status,
+                  queueLength: thread.queue.length,
+                  action,
+                  link: `sideboard://thread/${thread.id}`
+                })
+              }
+            ]
+          };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          return { content: [{ type: "text", text: message }], isError: true };
+        }
+      }
+    );
     const agentEnum = z2.enum(["claude", "codex", "opencode", "brightsy", "cursor"]);
     server.tool(
       "list_models",
@@ -7679,7 +7781,7 @@ async function startMcpServer() {
     );
     server.tool(
       "get_pr_stack",
-      "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before mergePr on stacked PRs.",
+      "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before ask_git merge on stacked PRs.",
       { ref: z2.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);

package/dist/{workspaces-ZJ45O4CD.js → workspaces-L4TXMUNM.js}

@@ -6,9 +6,9 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-CXT2PLO7.js";
-import "./chunk-POW7JCB5.js";
-import "./chunk-6RFPKZNC.js";
+} from "./chunk-GJ2LZQJI.js";
+import "./chunk-2NKSHIRI.js";
+import "./chunk-XA2FQJTN.js";
 import "./chunk-OE7YBB5X.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";

package/dist/{workspaces-R66324S7.js → workspaces-W72KZL4B.js}

@@ -4,9 +4,9 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-CYKPUTXN.js";
-import "./chunk-NF6Y4GTE.js";
-import "./chunk-V4ACEJX2.js";
+} from "./chunk-DG3S2UXP.js";
+import "./chunk-77W62MTX.js";
+import "./chunk-HCWAIEBU.js";
 import "./chunk-W7YOTDVO.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-MF2YMEGD.js";

package/package.json

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