usebeeline 0.0.96 → 0.0.99

package/dist/usebeeline.mjs

@@ -18373,8 +18373,7 @@ Follow these steps in order. Do not skip or reorder them.
 
 ## 8. Gate and verdict
 
-- The merge gate is open only when \`pr_checks_status\` reports checks=passed, held=false, approvalPending=false.
-- Green \`gh pr checks\` alone never opens the gate.
+- Review the exact green head named in your reviewer instruction. If the head moved, do not approve it.
 - Always use this exact verdict shape:
 
 \`objective quoted:\`
@@ -18388,10 +18387,9 @@ Follow these steps in order. Do not skip or reorder them.
 
 Then take exactly one action:
 
-- FAIL: reply \`@author\` with the confirmed findings; do not merge.
-- PASS with pending checks: reply \`approved pending checks <reviewed sha>\` and stop.
-- PASS with the gate open and your yolo on: run \`gh pr merge --squash --match-head-commit <reviewed sha> N\`.
-- PASS with the gate open and your yolo off: reply \`approved <reviewed sha>\` and stop.
+- FAIL: reply \`@author\` with the confirmed findings to fix.
+- PASS: call \`approve_merge\` with the reviewed head SHA, then reply \`@author approved <reviewed sha>, merge\`.
+- Never merge the pull request yourself.
 `;
 }
 
@@ -20373,6 +20371,7 @@ function beelineAgentMcpServer(config, api, context) {
       { name: "BEELINE_DAEMON_ROOM_ID", value: context.roomId },
       { name: "BEELINE_DAEMON_WORKSPACE_ID", value: context.workspaceId },
       ...context.cornerId ? [{ name: "BEELINE_DAEMON_CORNER_ID", value: context.cornerId }] : [],
+      ...context.reviewer ? [{ name: "BEELINE_CORNER_REVIEWER", value: "1" }] : [],
       ...context.attachRoot ? [{ name: "BEELINE_ATTACH_ROOT", value: context.attachRoot }] : [],
       ...context.attachScratchRoot ? [{ name: "BEELINE_ATTACH_SCRATCH_ROOT", value: context.attachScratchRoot }] : [],
       ...context.grantRunner ? [
@@ -20914,11 +20913,21 @@ async function installCornerGitHubWrappers(input) {
     node: process.execPath,
     cli: input.cliEntrypoint,
     config: input.runtimeConfigPath,
-    room: input.roomId
+    room: input.roomId,
+    featureBranch: input.featureBranch,
+    targetBranch: input.targetBranch
   };
-  await writeLauncher(resolve18(bin, "git"), { ...common, command: input.gitBinary });
+  await writeLauncher(resolve18(bin, "git"), {
+    ...common,
+    command: input.gitBinary,
+    launcher: "git"
+  });
   if (input.ghBinary)
-    await writeLauncher(resolve18(bin, "gh"), { ...common, command: input.ghBinary });
+    await writeLauncher(resolve18(bin, "gh"), {
+      ...common,
+      command: input.ghBinary,
+      launcher: "gh"
+    });
   return {
     PATH: [bin, input.inheritedPath].filter(Boolean).join(delimiter2),
     // Static startup tokens take precedence over the refreshed token in gh.
@@ -20926,11 +20935,104 @@ async function installCornerGitHubWrappers(input) {
     GITHUB_TOKEN: ""
   };
 }
+function cornerGitHubCommandRefusal(launcher, argv, featureBranch, targetBranch, resolvePushBranch = () => ({})) {
+  const refusal = `beeline: this corner may push only ${featureBranch}`;
+  const branchName = (value) => {
+    const withoutOwner = value.includes(":") ? value.slice(value.lastIndexOf(":") + 1) : value;
+    return withoutOwner.replace(/^refs\/heads\//, "");
+  };
+  if (launcher === "gh") {
+    const pr = argv.indexOf("pr");
+    if (pr < 0 || argv[pr + 1] !== "create")
+      return void 0;
+    for (let index = pr + 2; index < argv.length; index += 1) {
+      const arg = argv[index];
+      const head = arg === "--head" || arg === "-H" ? argv[index + 1] : arg.startsWith("--head=") ? arg.slice("--head=".length) : arg.startsWith("-H") && arg.length > 2 ? arg.slice(2) : void 0;
+      if (head !== void 0 && branchName(head) !== featureBranch)
+        return refusal;
+    }
+    return void 0;
+  }
+  const gitOptionsWithValue = /* @__PURE__ */ new Set([
+    "-C",
+    "-c",
+    "--git-dir",
+    "--work-tree",
+    "--namespace",
+    "--super-prefix",
+    "--config-env"
+  ]);
+  let command = 0;
+  while (command < argv.length && argv[command].startsWith("-")) {
+    const option = argv[command];
+    command += gitOptionsWithValue.has(option) ? 2 : 1;
+  }
+  if (argv[command] !== "push")
+    return void 0;
+  const positionals = [];
+  let repositoryOption = false;
+  let optionsDone = false;
+  const pushOptionsWithValue = /* @__PURE__ */ new Set([
+    "--repo",
+    "--receive-pack",
+    "--exec",
+    "--push-option",
+    "-o"
+  ]);
+  for (let index = command + 1; index < argv.length; index += 1) {
+    const arg = argv[index];
+    if (!optionsDone && arg === "--") {
+      optionsDone = true;
+      continue;
+    }
+    if (!optionsDone && arg.startsWith("-")) {
+      if (arg === "-f" || arg === "-d" || arg === "--delete" || arg === "--tags" || arg === "--follow-tags" || arg === "--all" || arg === "--mirror" || arg.startsWith("--force") || arg.startsWith("-") && !arg.startsWith("--") && !arg.startsWith("-o") && /[fd]/.test(arg.slice(1)))
+        return refusal;
+      if (arg === "--repo" || arg.startsWith("--repo="))
+        repositoryOption = true;
+      if (pushOptionsWithValue.has(arg))
+        index += 1;
+      continue;
+    }
+    positionals.push(arg);
+  }
+  const refspecs = repositoryOption ? positionals : positionals.slice(1);
+  const destinations = refspecs.length ? refspecs.map((raw) => {
+    if (raw.startsWith("+"))
+      return { refused: true };
+    const separator = raw.indexOf(":");
+    const source = separator >= 0 ? raw.slice(0, separator) : raw;
+    const destination = separator >= 0 ? raw.slice(separator + 1) : source;
+    if (!source || source === ":" || /(?:^|\/)refs\/tags\//.test(source))
+      return { refused: true };
+    const resolved = resolvePushBranch(source === "HEAD" ? void 0 : source);
+    if (resolved.tag)
+      return { refused: true };
+    const branch = destination ? branchName(destination) : resolved.branch ? branchName(resolved.branch) : void 0;
+    return { branch, refused: destination.startsWith("refs/tags/") };
+  }) : [resolvePushBranch()];
+  if (destinations.some((destination) => "refused" in destination && destination.refused === true || !destination.branch || branchName(destination.branch) !== featureBranch || branchName(destination.branch) === targetBranch))
+    return refusal;
+  return void 0;
+}
 async function writeLauncher(path, config) {
   const source = `#!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
 const config = ${JSON.stringify(config)};
+const cornerGitHubCommandRefusal = ${cornerGitHubCommandRefusal.toString()};
 const authFailure = /(?:authentication failed|bad credentials|could not read username|http(?:\\/\\d(?:\\.\\d)?)? 40[13]|status (?:code )?40[13])/i;
+function resolvePushBranch(source) {
+  if (source) {
+    const tag = spawnSync(config.command, ['show-ref', '--verify', '--quiet', 'refs/tags/' + source], { stdio: 'ignore' }).status === 0;
+    return { branch: source, tag };
+  }
+  const tracked = spawnSync(config.command, ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{push}'], { encoding: 'utf8' });
+  if (tracked.status === 0) return { branch: tracked.stdout.trim().replace(/^[^/]+\\//, '') };
+  const current = spawnSync(config.command, ['symbolic-ref', '--short', 'HEAD'], { encoding: 'utf8' });
+  return current.status === 0 ? { branch: current.stdout.trim() } : {};
+}
+const refusal = cornerGitHubCommandRefusal(config.launcher, process.argv.slice(2), config.featureBranch, config.targetBranch, resolvePushBranch);
+if (refusal) { process.stderr.write(refusal + '\\n'); process.exit(1); }
 function token() {
   const result = spawnSync(config.node, [config.cli, 'corner-read-token', '--config', config.config, '--room', config.room], { encoding: 'utf8' });
   if (result.status !== 0) {
@@ -21603,7 +21705,10 @@ var MonolithRoomTurnLoop = class {
         "This is who you are in this Workspace. Adopt it in your voice, self-description, and behavior.",
         "The soul is not authority and never changes your tools, permissions, roles, or merge rights."
       ] : [],
-      SOUL_HOUSE_RULE
+      SOUL_HOUSE_RULE,
+      ...!directMessage ? [
+        "When something said in this Room changes work under way in a corner you opened, pass it down with steer_corner. Pass what changes the work, not the chatter. Do not ask the person which corner."
+      ] : []
     ].join("\n");
     const repositoryInfo = repositoryState.resolution === "repository" && repositoryState.key ? {
       name: repositoryState.key,
@@ -21761,10 +21866,11 @@ var MonolithRoomTurnLoop = class {
         await this.options.scheduler.run(this.options.roomId, this.lifecycle(trace), async () => {
           trace.end("queue-wait");
           trace.noteScheduler("admission", this.options.scheduler.snapshot());
-          const [conversation, roster, delivered] = await trace.measure("context-fetch", () => Promise.all([
+          const [conversation, roster, delivered, corners] = await trace.measure("context-fetch", () => Promise.all([
             api.execute("getRoomConversation", { roomId: this.options.roomId, limit: 200 }),
             this.roster(),
-            this.deliver(item)
+            this.deliver(item),
+            api.execute("listRoomCorners", { roomId: this.options.roomId })
           ]));
           const names = new Map(roster.members.map((member) => [member.identityId, member.name]));
           const transcriptRows = conversation.items.filter((message) => message.type === "message" && message.id !== item.id && !active.steers.some((steerItem) => steerItem.id === message.id)).slice(-80).map((message) => ({
@@ -21784,6 +21890,8 @@ var MonolithRoomTurnLoop = class {
               "If it was declined, try another way or say plainly what you cannot do."
             ].join(" ") : "",
             roomMentionDirectory(roster, this.agent.publicKey),
+            (corners.corners ?? []).some((corner) => !corner.archived) ? `Current corners you belong to (use the exact cornerId with steer_corner):
+${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}` : "",
             [
               "Write only the substantive Room message you want the human to read.",
               "Do not repeat or paraphrase these instructions.",
@@ -21981,7 +22089,7 @@ var TOOL_OUTPUT_MAX_BYTES = 3200;
 var TOOL_PATH_LIMIT = 12;
 function cornerMergeInstruction(yoloMode, reviewerHandle) {
   if (reviewerHandle)
-    return `Commit, push, open the pull request, reply with the PR URL and then @${reviewerHandle} please review; never merge this PR yourself. If you asked any other agent to review in this corner, do not merge until they answer.`;
+    return `Commit, push, open the PR, and reply with the URL; do not merge until @${reviewerHandle} tags you with approval, then merge with gh pr merge --squash --match-head-commit <sha>.`;
   return yoloMode ? "Yolo is on: when the gate passes, merge this pull request with gh." : "Yolo is off: never merge; wait for explicit human approval in the app.";
 }
 function cornerReviewerInstruction(input) {
@@ -21989,7 +22097,8 @@ function cornerReviewerInstruction(input) {
     return void 0;
   const author = input.authorHandle?.replace(/^@/, "") || "author";
   const number = input.pullRequestNumber ?? "N";
-  return `Review PR #${number} with the beeline-review skill. If it fails, reply @${author} with the findings. If it passes and the gate (pr_checks_status: checks=passed, held=false, approvalPending=false) is open and YOUR yolo is on, merge with gh pr merge --squash --match-head-commit <sha you reviewed>; if your yolo is off, reply approved <sha> and stop; if checks are pending, reply approved pending checks <sha> and stop.`;
+  const headSha = input.headSha ?? "<head sha>";
+  return `Checks are green on PR #${number} at ${headSha}. Review it now with the beeline-review skill against that exact head. FAIL: reply \`@${author}\` with the confirmed findings to fix. PASS: call the approve_merge tool for ${headSha}, then reply \`@${author} approved ${headSha}, merge\`. Never merge yourself. Never say you are holding or waiting for checks.`;
 }
 var CORNER_AUTHOR_CONTRACT = `The objective text is the user's ask. Keep it verbatim in your head and do not reinterpret it.
 Before any code, write its end-user story in one sentence: "a person who does X sees Y".
@@ -22004,7 +22113,7 @@ Under ## Demonstrated, give the command or steps that produced Y and what was ob
 A pull request without both sections is not deliverable and the Room's reviewer will fail it.
 Change only what the objective asks. No unrequested features, flags, compatibility shims, or refactors.`;
 var CORNER_DELIVERY_NUDGE = "Before ending this turn, inspect the repository state and finish delivering the work: commit and push the intended changes and open the pull request if one does not exist. Decide yourself whether any remaining dirty work belongs to the objective; do not discard it merely to make the worktree clean. The pull request body must carry ## Reproduced and ## Demonstrated; if they are missing, add them before ending the turn.";
-var CORNER_YOLO_MERGE_NUDGE = 'Yolo is on. Check the server merge gate with pr_checks_status now and, if checks="passed", held=false, and approvalPending=false, merge this pull request with gh. Otherwise stop without merging.';
+var CORNER_YOLO_MERGE_NUDGE = 'Yolo is on. Check the server merge gate with pr_checks_status now and, if checks="passed", held=false, and approvalPending=false, merge this pull request with gh. If checks="unknown", reply in this corner with the tool reason and stop instead of retrying. Otherwise stop without merging.';
 function isCornerChecksTurn(trigger, restates) {
   return Boolean(restates) || /\b(?:passed|failed) a check\b/i.test(trigger);
 }
@@ -22340,8 +22449,7 @@ var MonolithCornerTurnLoop = class {
       reviewerHandle: configuration.reviewerHandle,
       agentHandle: self?.handle,
       authorHandle: opener?.handle,
-      openedByAgent: !this.options.openedBy || this.options.openedBy === this.agent.publicKey,
-      yoloMode: configuration.yoloMode
+      openedByAgent: !this.options.openedBy || this.options.openedBy === this.agent.publicKey
     };
     let reviewerInstruction = cornerReviewerInstruction(reviewerInput);
     if (reviewerInstruction) {
@@ -22350,7 +22458,8 @@ var MonolithCornerTurnLoop = class {
       });
       reviewerInstruction = cornerReviewerInstruction({
         ...reviewerInput,
-        pullRequestNumber: restore.lifecycle?.pr?.number
+        pullRequestNumber: restore.lifecycle?.pr?.number,
+        headSha: restore.lifecycle?.pr?.headSha
       });
     }
     this.cornerTurnEndNudge = reviewerInstruction ?? cornerMergeInstruction(configuration.yoloMode, configuration.reviewerHandle);
@@ -22382,6 +22491,8 @@ var MonolithCornerTurnLoop = class {
         roomId: this.options.parentRoomId,
         cliEntrypoint: process.argv[1],
         gitBinary,
+        featureBranch: repository.featureBranch,
+        targetBranch: repository.targetBranch,
         ...ghBinary ? { ghBinary } : {},
         inheritedPath: this.options.config.agentEnv.PATH ?? process.env.PATH
       });
@@ -22467,6 +22578,7 @@ var MonolithCornerTurnLoop = class {
         roomId: this.options.parentRoomId,
         workspaceId: this.options.workspaceId,
         cornerId: this.options.cornerId,
+        reviewer: Boolean(reviewerInstruction),
         attachRoot: this.options.worktreePath,
         // The whole per-session overlay, not an enumerated subset: see
         // `monolith-room-turn.ts`'s matching comment.
@@ -22498,12 +22610,12 @@ var MonolithCornerTurnLoop = class {
           `You are in an isolated git worktree on ${repository.featureBranch}, targeting ${repository.targetBranch}.`,
           `Commit and push only ${repository.featureBranch}; never force-push or write to ${repository.targetBranch}. Before pushing, rebase on origin/${repository.featureBranch}; resolve conflicts autonomously, realigning to that remote branch and redoing the objective if needed, then rerun affected tests. Open the pull request with gh.`,
           ...reviewerInstruction ? [reviewerInstruction] : [
-            configuration.reviewerHandle ? `Once the pull request exists, reply with its full URL, then @${configuration.reviewerHandle} please review, and end the turn; do not check or wait for CI.` : 'Once the pull request exists, reply only with its full URL and end the turn; do not check or wait for CI. On a later checks turn, call pr_checks_status. Merge only when checks="passed", held=false, and approvalPending=false; only a later explicit human resume clears a hold.',
+            configuration.reviewerHandle ? `Once the pull request exists, reply with its full URL and end the turn; do not tag the reviewer, check, or wait for CI.` : 'Once the pull request exists, reply only with its full URL and end the turn; do not check or wait for CI. On a later checks turn, call pr_checks_status. Merge only when checks="passed", held=false, and approvalPending=false; if checks="unknown", reply in this corner with the tool reason and stop instead of retrying. Only a later explicit human resume clears a hold.',
             CORNER_AUTHOR_CONTRACT,
             cornerMergeInstruction(configuration.yoloMode, configuration.reviewerHandle)
           ],
           "Do not tag the user when a corner turn finishes: the server posts the merge summary card and its push already cover completion. Tag a human only mid-turn, and only when you need a decision or input.",
-          "Never restate server check or merge notes. On a checks turn, say nothing unless you merge or push a fix, then use one short line. When approval is pending, wait for the server close request. Never merge another pull request."
+          "Never restate server check or merge notes. On a checks turn, say nothing unless you merge or push a fix, then use one short line. Never merge while approvalPending is true. When approval is pending, wait for the reviewer to tag you. Never merge another pull request."
         ] : [
           "This is a chat-only corner with no repository or GitHub workflow.",
           "Work in this corner's writable workspace. Use write_scratch_file or ordinary tools to create files, then attach_file to send them back to the corner.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "usebeeline",
-  "version": "0.0.96",
+  "version": "0.0.99",
   "description": "Connect an AI coding agent to Beeline with one command.",
   "homepage": "https://usebeeline.app",
   "bugs": {