@snowyroad/braid 0.97.0 → 0.98.1

package/dist/{http-7LMCYNHB.js → http-7QNDIXBN.js}

@@ -4,7 +4,7 @@ import {
   boundedJsonFetch,
   resetHttpMetricsForTest,
   snapshotHttpMetrics
-} from "./chunk-2OHYN3KD.js";
+} from "./chunk-3SHZYLWH.js";
 import "./chunk-HQNAAXUM.js";
 export {
   assertHttpEndpoint,

package/dist/mcp/server.js

@@ -34,7 +34,7 @@ function brokerClient(socketPath, token) {
       }
     );
     req.on("error", reject);
-    req.setTimeout(1e4, () => {
+    req.setTimeout(route.startsWith("/git/") ? 3e5 : 1e4, () => {
       req.destroy(new Error("broker timeout"));
     });
     req.write(data);
@@ -559,10 +559,74 @@ ${lines.join("\n")}`;
       } catch (e) {
         return canvasErrorMessage(e, brokerStatus);
       }
-    }
+    },
     // ── End channel canvas tools ───────────────────────────────────────────────
+    // ── Git gateway tools (2026-10-06 D6/D7) ──────────────────────────────────
+    // No argument names the repo: the bridge takes it from the owner's grant. A
+    // refusal's text (what to ask the owner for) is returned to the agent verbatim.
+    async braidGitStatus(args) {
+      return gitCall(call, "/git/status", withPath(args, {}));
+    },
+    async braidGitFetch(args) {
+      return gitCall(call, "/git/fetch", withPath(args, {}));
+    },
+    async braidGitPush(args) {
+      const body = branchBody(args);
+      if (typeof body === "string") return body;
+      const sha = nonEmpty(args?.sha);
+      if (sha) body.sha = sha;
+      return gitCall(call, "/git/push", withPath(args, body));
+    },
+    async braidOpenPr(args) {
+      const body = branchBody(args);
+      if (typeof body === "string") return body;
+      const title = nonEmpty(args?.title);
+      if (!title) return "Error: title is required.";
+      body.title = title;
+      if (typeof args?.body === "string") body.body = args.body;
+      const base = nonEmpty(args?.base);
+      if (base) body.base = base;
+      return gitCall(call, "/git/pr/open", withPath(args, body));
+    },
+    async braidMergePr(args) {
+      const raw = args?.number;
+      const num = typeof raw === "number" ? raw : typeof raw === "string" && raw.trim() !== "" ? Number(raw) : NaN;
+      if (!Number.isFinite(num) || !Number.isInteger(num)) return "Error: number is required (the pull request number, an integer).";
+      const body = { number: num };
+      const method = nonEmpty(args?.method);
+      if (method) body.method = method;
+      return gitCall(call, "/git/pr/merge", body);
+    }
+    // ── End git gateway tools ──────────────────────────────────────────────────
   };
 }
+function nonEmpty(v) {
+  return typeof v === "string" && v.trim() !== "" ? v : void 0;
+}
+function branchBody(args) {
+  const branch = nonEmpty(args?.branch);
+  return branch ? { branch } : "Error: branch is required.";
+}
+function withPath(args, body) {
+  const p = nonEmpty(args?.path);
+  return p ? { ...body, path: p } : body;
+}
+async function gitCall(call, route, body) {
+  try {
+    const res = await call(route, body);
+    return typeof res?.text === "string" && res.text ? res.text : "Done.";
+  } catch (e) {
+    const parsed = e?.body && typeof e.body === "object" ? e.body : (() => {
+      try {
+        return JSON.parse(String(e?.message ?? "").replace(/^broker \d+:\s*/, ""));
+      } catch {
+        return null;
+      }
+    })();
+    if (parsed && typeof parsed.text === "string" && parsed.text) return parsed.text;
+    return "The git operation could not be completed right now. Try again, or ask the owner if it keeps failing.";
+  }
+}
 
 // src/mcp/server.ts
 async function main() {
@@ -903,6 +967,60 @@ async function main() {
     },
     async (args) => ({ content: [{ type: "text", text: await tools.appendCanvasSection(args) }] })
   );
+  const gitPath = z.string().optional().describe("Worktree path; defaults to the session directory");
+  server.registerTool(
+    "braid_git_status",
+    {
+      description: "Show the GitHub repository this agent may act on through Braid (granted by its owner), the autonomy mode, the current branch and HEAD, and how far it is from the remote. Read-only. Use before braid_git_push.",
+      inputSchema: { path: gitPath }
+    },
+    async (args) => ({ content: [{ type: "text", text: await tools.braidGitStatus(args) }] })
+  );
+  server.registerTool(
+    "braid_git_fetch",
+    {
+      description: "Fetch the granted repository's branches into the current worktree under refs/remotes/braid/* (for example braid/main). Braid runs git outside the sandbox with a credential you never see.",
+      inputSchema: { path: gitPath }
+    },
+    async (args) => ({ content: [{ type: "text", text: await tools.braidGitFetch(args) }] })
+  );
+  server.registerTool(
+    "braid_git_push",
+    {
+      description: "Push a local commit (default HEAD of the worktree) to a branch of the granted repository. Braid runs the push outside the sandbox with a credential you never see and enforces the owner's rules: fast-forward only, no deletes or tags; in pr-only mode only branches under braid/<agent>/ and never the default branch; .github/workflows changes only if the owner allowed them. On refusal the text tells you what to ask the owner for.",
+      inputSchema: {
+        path: gitPath,
+        branch: z.string(),
+        sha: z.string().optional()
+      }
+    },
+    async (args) => ({ content: [{ type: "text", text: await tools.braidGitPush(args) }] })
+  );
+  server.registerTool(
+    "braid_open_pr",
+    {
+      description: "Open a pull request from a branch you pushed to the granted repository (draft in pr-only mode). Returns the PR number and URL.",
+      inputSchema: {
+        path: gitPath,
+        branch: z.string(),
+        title: z.string(),
+        body: z.string().optional(),
+        base: z.string().optional()
+      }
+    },
+    async (args) => ({ content: [{ type: "text", text: await tools.braidOpenPr(args) }] })
+  );
+  server.registerTool(
+    "braid_merge_pr",
+    {
+      description: "Merge a pull request in the granted repository. Allowed only when the owner set autonomous mode; in pr-only mode a human merges. method is squash (default), merge, or rebase.",
+      inputSchema: {
+        number: z.number().int(),
+        method: z.enum(["merge", "squash", "rebase"]).optional()
+      }
+    },
+    async (args) => ({ content: [{ type: "text", text: await tools.braidMergePr(args) }] })
+  );
   await server.connect(new StdioServerTransport());
 }
 main().catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.97.0",
+  "version": "0.98.1",
   "description": "Braid: connect your own coding agent (Claude Code, Codex, Gemini, Grok) to a Braid channel and collaborate with other agents and humans.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "SnowyRoad",

package/service-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.97.0",
+  "version": "0.98.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@snowyroad/braid",
-      "version": "0.97.0",
+      "version": "0.98.1",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@agentclientprotocol/sdk": "0.25.1",