@snowyroad/braid 0.98.0 → 0.98.1

package/dist/cli.js

@@ -2613,6 +2613,17 @@ function oneLine(s, max = 300) {
 function errText(e) {
   return oneLine(e instanceof Error ? e.message : String(e));
 }
+var GH_OWNER_RE = /^[A-Za-z0-9-]{1,100}$/;
+var GH_REPO_RE = /^(?!\.\.?$)[A-Za-z0-9._-]{1,100}$/;
+function parseGitHubOrigin(url) {
+  const s = url.trim();
+  const m = /^https:\/\/(?:[^@/\s]+@)?github\.com\/(.+)$/i.exec(s) ?? /^ssh:\/\/(?:[^@/\s]+@)?github\.com(?::22)?\/(.+)$/i.exec(s) ?? /^(?:[^@/\s:]+@)?github\.com:(?!\/)(.+)$/i.exec(s);
+  if (!m) return null;
+  const parts = m[1].replace(/\/$/, "").replace(/\.git$/i, "").split("/");
+  if (parts.length !== 2) return null;
+  const [owner, name] = parts;
+  return GH_OWNER_RE.test(owner) && GH_REPO_RE.test(name) ? { owner, name } : null;
+}
 function shellQuote(p) {
   return `'${p.replace(/'/g, `'\\''`)}'`;
 }
@@ -2625,6 +2636,9 @@ function safeSegment(s) {
 function logSafe(s) {
   return s.replace(/[^A-Za-z0-9._\/-]/g, "?").slice(0, 200) || "-";
 }
+function repoKey(g) {
+  return `${g.repoOwner}/${g.repoName}`.toLowerCase();
+}
 function isAutonomous(g) {
   return g.mode === "autonomous";
 }
@@ -2677,7 +2691,7 @@ var GitGateway = class {
   async statusInner(channelId, args) {
     const gate = this.gateChecks(channelId);
     if (gate) return gate;
-    const grant = await this.singleGrant();
+    const grant = await this.resolveGrant(channelId, args.path, true);
     if (!grant.ok) return grant;
     const g = grant.grant;
     const wt = this.worktree(channelId, args.path);
@@ -2717,12 +2731,12 @@ var GitGateway = class {
       `Worktree ${wt.path}: branch ${branch ?? "unknown"}, HEAD ${head ?? "none"}.`,
       tracking
     ];
-    return { ok: true, text: lines.join("\n"), data: { repo, mode, branch, head, ahead, behind } };
+    return { ok: true, text: lines.join("\n"), data: { repo, mode, source: g.source, branch, head, ahead, behind } };
   }
   async fetchInner(channelId, args) {
     const gate = this.gateChecks(channelId);
     if (gate) return gate;
-    const grant = await this.singleGrant();
+    const grant = await this.resolveGrant(channelId, args.path, true);
     if (!grant.ok) return grant;
     const g = grant.grant;
     const mirror = this.mirrorPath(g);
@@ -2767,7 +2781,7 @@ ${shown}${more}`,
   async pushInner(channelId, branch, args, out) {
     const gate = this.gateChecks(channelId);
     if (gate) return gate;
-    const grant = await this.singleGrant();
+    const grant = await this.resolveGrant(channelId, args.path, true);
     if (!grant.ok) return grant;
     const listed = grant.grant;
     const repo = `${listed.repoOwner}/${listed.repoName}`;
@@ -2840,7 +2854,7 @@ Compare: https://github.com/${repo}/compare/${encodeURIComponent(branch)}`,
   async openPrInner(channelId, args) {
     const gate = this.gateChecks(channelId);
     if (gate) return gate;
-    const grant = await this.singleGrant();
+    const grant = await this.resolveGrant(channelId, args.path, false);
     if (!grant.ok) return grant;
     const branch = String(args.branch ?? "");
     const badHead = await this.checkBranch(branch);
@@ -2876,7 +2890,7 @@ Compare: https://github.com/${repo}/compare/${encodeURIComponent(branch)}`,
   async mergePrInner(channelId, args) {
     const gate = this.gateChecks(channelId);
     if (gate) return gate;
-    const grant = await this.singleGrant();
+    const grant = await this.resolveGrant(channelId, void 0, false);
     if (!grant.ok) return grant;
     const num = Number(args.number);
     if (!Number.isInteger(num) || num <= 0) return fail(400, "invalid_number", "Pass the pull request number as a positive integer.");
@@ -2963,17 +2977,70 @@ Compare: https://github.com/${repo}/compare/${encodeURIComponent(branch)}`,
     if (this.disabledDepth.has(channelId)) return fail(403, "git_disabled_for_turn", "Git tools are disabled for this turn. Describe the change in your reply instead, and a later turn can push it.");
     return null;
   }
-  /** D7: one grant per agent for now; the repo is never chosen by the model. */
-  async singleGrant() {
+  /** D11 + R15: exactly one grant (server or PAT) is used as is, whatever the worktree's
+   *  origin (a fork origin keeps working, as in 0.98.0). When every grant is for the same
+   *  repo (case-insensitive owner/name, e.g. a server grant plus a local PAT), the repo is
+   *  unambiguous: no origin lookup, and grantForRepo picks the server grant over the PAT.
+   *  With grants for two or more distinct repos, "the repo" is the
+   *  worktree's GitHub origin and its grant is the server grant when one exists, else the
+   *  local PAT (resolver.grantForRepo); an origin matching no grant is no_grant_for_repo and
+   *  no usable origin is no_grant_for_worktree. The grant is still the only source of the
+   *  push/fetch target (D8.1): the origin only selects among grants the owner already made,
+   *  never names a destination. Ops that do not need a worktree (open/merge PR without a
+   *  path) treat an unusable cwd as "no origin". */
+  async resolveGrant(channelId, path2, needWorktree) {
     let grants;
     try {
       grants = await this.deps.resolver.listGrants();
     } catch (e) {
       return fail(502, "grants_unavailable", `Could not load this agent's git grants (${errText(e)}). Try again in a minute.`);
     }
-    if (grants.length === 0) return fail(404, "no_grant", `No git grant for this agent. Your owner can add one under Agents > ${this.deps.agentName} > Git access.`);
-    if (grants.length > 1) return fail(409, "multiple_grants", `This agent has ${grants.length} git grants, and the gateway supports exactly one today. Ask the owner to keep one repository under Agents > ${this.deps.agentName} > Git access.`);
-    return { ok: true, grant: grants[0] };
+    const where = `Agents > ${this.deps.agentName} > Git access`;
+    if (grants.length === 0) return fail(404, "no_grant", `No git grant for this agent. Your owner can add one under ${where}.`);
+    if (grants.length === 1) return { ok: true, grant: grants[0] };
+    if (new Set(grants.map(repoKey)).size === 1) {
+      const only = grants[0];
+      let g2;
+      try {
+        g2 = await this.deps.resolver.grantForRepo(only.repoOwner, only.repoName);
+      } catch (e) {
+        return fail(502, "grants_unavailable", `Could not load this agent's git grants (${errText(e)}). Try again in a minute.`);
+      }
+      return { ok: true, grant: g2 ?? only };
+    }
+    const wt = this.worktree(channelId, path2);
+    if (!wt.ok && (needWorktree || path2 !== void 0)) return wt;
+    const origin = wt.ok ? await this.worktreeOrigin(wt) : null;
+    if (origin && !origin.ok) return origin;
+    const repo = origin?.repo ?? null;
+    if (!repo) {
+      const example = `${grants[0].repoOwner}/${grants[0].repoName}`;
+      return fail(404, "no_grant_for_worktree", `This worktree has no GitHub origin remote and the agent has ${grants.length} git grants (${this.grantList(grants)}). Add the granted repository as origin (git remote add origin https://github.com/${example}.git, using the repository you are working on) so the gateway knows which grant applies.`);
+    }
+    let g;
+    try {
+      g = await this.deps.resolver.grantForRepo(repo.owner, repo.name);
+    } catch (e) {
+      return fail(502, "grants_unavailable", `Could not load this agent's git grants (${errText(e)}). Try again in a minute.`);
+    }
+    if (!g) return fail(404, "no_grant_for_repo", `This worktree's origin is ${repo.owner}/${repo.name}, and the agent has no git grant for that repository (its grants: ${this.grantList(grants)}). Your owner can add ${repo.owner}/${repo.name} under ${where}.`);
+    return { ok: true, grant: g };
+  }
+  grantList(grants) {
+    const byKey = /* @__PURE__ */ new Map();
+    for (const x of grants) if (!byKey.has(repoKey(x))) byKey.set(repoKey(x), `${x.repoOwner}/${x.repoName}`);
+    const names = [...byKey.values()];
+    return names.slice(0, 10).join(", ") + (names.length > 10 ? `, and ${names.length - 10} more` : "");
+  }
+  /** R15: remote.origin.url of the validated worktree, read with the hardened runner while
+   *  the worktree identity is held; null repo = no usable (GitHub) origin. */
+  async worktreeOrigin(wt) {
+    const changed = fail(400, "invalid_path", "The worktree changed while its origin remote was being read (its .git was replaced or gained alternates or a config include). Make sure nothing else is modifying the repository, then try again.");
+    const id = this.identity(wt);
+    if (!id) return changed;
+    const r = await this.git(["config", "--get", "remote.origin.url"], { gitDir: wt.gitDir, cwd: wt.path });
+    if (!this.sameIdentity(wt, id)) return changed;
+    return { ok: true, repo: r.code === 0 ? parseGitHubOrigin(r.stdout) : null };
   }
   /** Credential plus the effective policy. When the listed grant is LOOSER than the
    *  policy the cached mint carries (the owner loosened the grant after the mint), the
@@ -3323,11 +3390,13 @@ var GrantResolver = class {
     }
     return out;
   }
+  /** D11: a server (app) grant for the repo wins; otherwise the local PAT grant.
+   *  GitHub owner and repo names are case-insensitive. */
   async grantForRepo(owner, name) {
     const o = owner.toLowerCase();
     const n = name.toLowerCase();
-    const all = await this.listGrants();
-    return all.find((g) => g.repoOwner.toLowerCase() === o && g.repoName.toLowerCase() === n) ?? null;
+    const matches = (await this.listGrants()).filter((g) => g.repoOwner.toLowerCase() === o && g.repoName.toLowerCase() === n);
+    return matches.find((g) => g.source === "app") ?? matches.find((g) => g.source === "pat") ?? null;
   }
   async credentialFor(grant) {
     if (grant.source === "pat") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.98.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.98.0",
+  "version": "0.98.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@snowyroad/braid",
-      "version": "0.98.0",
+      "version": "0.98.1",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@agentclientprotocol/sdk": "0.25.1",