usebeeline 0.1.18 → 0.1.19

package/dist/usebeeline.mjs

@@ -16730,26 +16730,26 @@ function staleLeaseResult(value) {
     return false;
   }
 }
-function resultStatus(value, depth = 0) {
+function resultString(value, key, depth = 0) {
   if (depth > 8 || !value)
     return void 0;
   if (typeof value === "string") {
     if (value.length > 1e5 || !value.trimStart().startsWith("{"))
       return void 0;
     try {
-      return resultStatus(JSON.parse(value), depth + 1);
+      return resultString(JSON.parse(value), key, depth + 1);
     } catch {
       return void 0;
     }
   }
   if (Array.isArray(value))
-    return value.map((item2) => resultStatus(item2, depth + 1)).find(Boolean);
+    return value.map((item2) => resultString(item2, key, depth + 1)).find(Boolean);
   if (typeof value !== "object")
     return void 0;
   const item = value;
-  if (typeof item.status === "string")
-    return item.status;
-  return Object.values(item).map((entry) => resultStatus(entry, depth + 1)).find(Boolean);
+  if (typeof item[key] === "string")
+    return item[key];
+  return Object.values(item).map((entry) => resultString(entry, key, depth + 1)).find(Boolean);
 }
 var SquireTaskRelay = class {
   agentId;
@@ -17040,21 +17040,29 @@ var SquireTaskRelay = class {
       if (approval) {
         const ids = requestedIds.length ? requestedIds : [...task.sessions];
         const approvalKey = createHash("sha256").update(approval.approvalId ?? approval.approvalUrl).digest("hex");
-        const status = resultStatus(result);
+        const status = resultString(result, "status");
         const pending = status === "approval_pending" || status === "pending_approval";
-        if (pending && ids.length) {
-          task.pendingApprovals.set(approvalKey, {
+        if (pending && (ids.length || approval.approvalId)) {
+          clearTimeout(task.pendingApprovals.get(approvalKey)?.expiry);
+          const entry = {
             requestId: active.requestId,
             sessionIds: new Set(ids),
             tool: approval.tool,
             title: approval.title,
             detail: approval.detail
-          });
+          };
+          const expiresAt = Date.parse(resultString(result, "expires_at") ?? "");
+          if (approval.approvalId && Number.isFinite(expiresAt)) {
+            entry.expiry = setTimeout(() => this.expireApproval(task, approvalKey, entry, approval.approvalId), Math.min(Math.max(expiresAt - Date.now(), 0), 2 ** 31 - 1));
+            entry.expiry.unref?.();
+          }
+          task.pendingApprovals.set(approvalKey, entry);
           this.log("approval-pending", task, {
             tool: safeToolName ?? null,
             sessionId: redactedSessionId(ids[0])
           });
         } else if (!pending) {
+          clearTimeout(task.pendingApprovals.get(approvalKey)?.expiry);
           task.pendingApprovals.delete(approvalKey);
         }
       }
@@ -17083,12 +17091,35 @@ var SquireTaskRelay = class {
   }
   releasePendingApprovals(task, sessionIdsToRelease) {
     for (const [id, approval] of task.pendingApprovals) {
+      if (!approval.sessionIds.size)
+        continue;
       for (const sessionId of sessionIdsToRelease)
         approval.sessionIds.delete(sessionId);
-      if (!approval.sessionIds.size)
+      if (!approval.sessionIds.size) {
+        clearTimeout(approval.expiry);
         task.pendingApprovals.delete(id);
+      }
     }
   }
+  /**
+   * Squire stops watching an approval at its `expires_at` and sends nothing,
+   * so the relay wakes the asking turn itself with `expired`.
+   */
+  expireApproval(task, approvalKey, entry, approvalId) {
+    if (task.pendingApprovals.get(approvalKey) !== entry)
+      return;
+    task.pendingApprovals.delete(approvalKey);
+    this.onApprovalDecided({
+      requestId: entry.requestId,
+      approvalId,
+      status: "expired",
+      tool: entry.tool,
+      title: entry.title,
+      detail: entry.detail
+    });
+    if (!this.active && !this.approvalRequestId && !task.pendingApprovals.size)
+      this.scheduleIdle();
+  }
   /**
    * Squire's own unsolicited decision on an approval this task is still
    * holding a connection open for. Matched back to the pending entry by the
@@ -17108,6 +17139,7 @@ var SquireTaskRelay = class {
     const pending = task.pendingApprovals.get(approvalKey);
     if (!pending)
       return;
+    clearTimeout(pending.expiry);
     task.pendingApprovals.delete(approvalKey);
     this.onApprovalDecided({
       requestId: pending.requestId,
@@ -17990,7 +18022,7 @@ var SERVER_EVENT_KIND_DETAIL = {
   "check-failed": "fires when a corner's pull request checks turn red",
   "merged": "fires when a corner's pull request merges",
   "grant-decided": "carries the grant id and status and resumes the turn that asked for the grant",
-  "squire-approval-decided": "carries what was approved or denied and the Squire approval id, and resumes the turn that asked",
+  "squire-approval-decided": "carries what was approved, denied, or left to expire and the Squire approval id, and resumes the turn that asked",
   "connector-offer-decided": "fires when a human accepts or declines an offered connector, or a reconnect ceremony finishes, and resumes the turn that offered it",
   "turn-cancelled": "fires when a running turn is stopped",
   "choice-answered": "fires when a human answers a posted choice, starting a new turn for the asking agent",
@@ -32306,7 +32338,7 @@ Stage | Recorder | Server checks
 intent, base, tests, docs, lint_types, publication, final_authorization | implementer | current revision/head
 review | configured reviewer records the review stage | current revision/head and reviewer identity
 ci | implementer | current revision/head; passed requires passing checks
-The server merge gate is the authority: pr_checks_status reports mergeAllowed true for the current head; the server then merges that head. final_authorization grants nothing; do not wait for mergeAllowed.`;
+The server merge gate is the authority: pr_checks_status reports mergeAllowed true for the current head; merge_corner merges that head. final_authorization grants nothing; do not wait for mergeAllowed.`;
 function cornerHasRepositoryWork(brief) {
   if (!brief)
     return true;
@@ -32355,7 +32387,8 @@ No unrequested features, flags, compatibility shims or refactors.`;
 var CORNER_REVIEWER_SESSION_INSTRUCTION = "You are this Room's configured reviewer. The active turn prompt names the latest stable green PR head. Review and approve only that exact head; if no stable green head is named, end the turn without a verdict. Never merge yourself.";
 var CORNER_REVIEWER_UNSTABLE_HEAD_INSTRUCTION = "There is no stable green PR head for this active reviewer turn. Do not review or call approve_merge. End this turn without a verdict; the next green transition will wake you.";
 var CORNER_DELIVERY_NUDGE = "Only when the brief calls for repository changes, inspect the repository state and finish delivering the work unless a human hold stands: 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 brief; 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. Otherwise do not commit, push or open a PR; deliver with post_artifact.";
-var CORNER_YOLO_MERGE_NUDGE = 'Yolo is on. Call pr_checks_status now. If checks="failed", fix the failure and push. If checks="unknown", reply in this corner with the tool reason and stop instead of retrying. Otherwise stop: the server merges this pull request itself once mergeAllowed=true. Never merge it yourself.';
+var CORNER_LAND_RULE = "Then, if a human's question or proposal in the corner has no answer, name it and do not merge; otherwise call merge_corner.";
+var CORNER_YOLO_MERGE_NUDGE = `Yolo is on. Call pr_checks_status now. If checks="failed", fix the failure and push. If checks="unknown", reply in this corner with the tool reason and stop instead of retrying. Otherwise stop: a reviewer's PASS wakes you to merge with merge_corner. Never merge it any other way.`;
 var UPGRADE_INTENT_RULE = "Call this on your own judgment when the work in this corner needs the repository; nobody has to ask. Call it while answering a human message in this corner, then write the brief in the restarted code session.";
 var CORNER_PLACEHOLDER_BRIEF_RULE = "This brief is the placeholder the upgrade wrote from the request. Read the code, write the real spec with revise_corner_brief, then post it in this corner and ask the corner's opener to approve it before editing. This is best effort: if the opener is away or the request was already explicit, use your judgment and proceed. When the opener replies, record their reply as the approval in the next revision.";
 function isPlaceholderCornerBrief(brief) {
@@ -32366,7 +32399,7 @@ function cornerMergeInstruction(yoloMode, reviewerHandle) {
   if (!reviewerHandle)
     return "Once the pull request exists, reply with its full URL and end the turn; do not check or wait for CI. This Room has no configured reviewer, so the merge gate never opens for you: never merge; a person merges it.";
   const reviewer = `the reviewer (${handle(reviewerHandle)})`;
-  return yoloMode ? `Once the pull request exists, reply with its full URL and end the turn; do not tag ${reviewer}, check, or wait for CI. Green checks wake ${reviewer}; after its PASS the server merges the pull request itself. Never merge it yourself. You are woken only to fix failing checks, requested changes, or a merge GitHub refused; push the fix, and the new head needs green checks and a fresh PASS.` : `Once the pull request exists, reply with its full URL and end the turn; do not tag ${reviewer}, check, or wait for CI. Yolo is off, so the merge gate stays closed for you: never merge; a person merges it after ${reviewer} approves.`;
+  return yoloMode ? `Once the pull request exists, reply with its full URL and end the turn; do not tag ${reviewer}, check, or wait for CI. Green checks wake ${reviewer}; its PASS wakes you to merge. ${CORNER_LAND_RULE} You are also woken to fix failing checks, requested changes, or a refused merge; a fixed head needs green checks and a fresh PASS.` : `Once the pull request exists, reply with its full URL and end the turn; do not tag ${reviewer}, check, or wait for CI. Yolo is off, so the merge gate stays closed for you: never merge; a person merges it after ${reviewer} approves.`;
 }
 function cornerReviewerInstruction(input) {
   if (!input.isReviewer || input.openedByAgent)
@@ -32374,12 +32407,12 @@ function cornerReviewerInstruction(input) {
   const author = input.authorHandle ? handle(input.authorHandle) : "author";
   const number = input.pullRequestNumber ?? "N";
   const headSha = input.headSha ?? "<head sha>";
-  return `Checks are green on PR #${number} at ${headSha}${input.briefRevision ? ` with assigned brief revision ${input.briefRevision}` : ""}. Review it now with the beeline-review skill against that exact head and current assigned brief. FAIL: call record_validation_stage with stage "review", status "failed", and headSha ${headSha}, then reply \`@${author}\` with the confirmed findings and the reviewed head ${headSha} to fix. PASS: call the approve_merge tool for ${headSha}${input.briefRevision ? ` with briefRevision=${input.briefRevision}` : ""}, then reply \`approved ${headSha}\` without tagging ${author}: the server merges it, and a tag would wake the author for nothing. Never merge yourself or tell the author to merge. Never say you are holding or waiting for checks.`;
+  return `Checks are green on PR #${number} at ${headSha}${input.briefRevision ? ` with assigned brief revision ${input.briefRevision}` : ""}. Review it now with the beeline-review skill against that exact head and current assigned brief. FAIL: call record_validation_stage with stage "review", status "failed", and headSha ${headSha}, then reply \`@${author}\` with the confirmed findings and the reviewed head ${headSha} to fix. PASS: call the approve_merge tool for ${headSha}${input.briefRevision ? ` with briefRevision=${input.briefRevision}` : ""}, then reply \`approved ${headSha}\` without tagging ${author}: your PASS wakes the author to merge, so a tag adds nothing. A human's question or proposal in the corner discussion with no answer is a FAIL finding; name it. Never merge yourself or tell the author to merge. Never say you are holding or waiting for checks.`;
 }
 function cornerSelfReviewerInstruction(input) {
   if (!input.isReviewer || !input.openedByAgent)
     return void 0;
-  return "Once the pull request exists, reply with its full URL and end the turn. You are this Room's reviewer, so your own pull request needs no review: do not request one or tag any agent for review. The server merges it once checks are green, yolo is on, and no human hold stands; never merge it yourself. You are woken only to fix failing checks or a merge GitHub refused.";
+  return "Once the pull request exists, reply with its full URL and end the turn. You are this Room's reviewer, so no other agent can review your pull request: do not request one or tag any agent for review. It merges only on a human's yes: ask a Workspace owner or admin to approve the merge, then record their yes with order_corner_merge. Never merge it any other way. You are woken to fix failing checks or a merge GitHub refused.";
 }
 function shellLine(shell) {
   if (!shell)
@@ -32730,6 +32763,16 @@ var TURN_SECTIONS = [
     when: ({ task }) => task.commandReason !== "schedule" && (["corner_check", "corner_merge_refused", "corner_merge_conflict"].includes(task.commandReason ?? "") || ["check-passed", "check-failed"].includes(task.outsideEvent?.kind ?? "")),
     render: () => 'This is a checks turn about CI or the merge gate. On it, say nothing unless you push a fix or report checks="unknown", and then use one short line. Never restate server check or merge notes.'
   },
+  {
+    id: "turn.land",
+    topic: "land-turn",
+    why: "A reviewer's PASS hands the merge to the implementer, who must not merge over an unanswered human question.",
+    budgetBytes: 300,
+    layer: "turn",
+    surfaces: ["code-corner"],
+    when: ({ task }) => task.commandReason === "corner_land",
+    render: () => `The reviewer approved this pull request's current head. ${CORNER_LAND_RULE}`
+  },
   {
     id: "turn.objective",
     topic: "objective",
@@ -32951,7 +32994,7 @@ Keys belong to the human who provisioned them. Your owner's keys serve whoever a
 
 ## Connect an app
 
-When a request needs an app or service, call beeline-agent \`workbench_status\` first. For a connected app, use its ID with \`list_app_tools\`, then call \`execute_app_tool\` with the selected tool slug and arguments. The server executes against that person\u2019s account and decides permission on every call. If tool discovery reports an error, follow its cause; \`needs_connection\` means the account must be reconnected, and \`needs_permission\` means wait for the connected person's decision. Do not switch paths after denial or provider unavailability. No app token, provider key, or sign-in URL belongs in chat or a model prompt.
+When a request needs an app or service, call beeline-agent \`workbench_status\` first. For a connected app via composio, use its ID with \`list_app_tools\`, then call \`execute_app_tool\` with the selected tool slug and arguments. For an app via squire-api, call its API with \`use_credential\` (service = the app key); via squire-browser, use the \`operate_*\` tools; via registry-mcp, use its mounted MCP tools. The server executes against that person\u2019s account and decides permission on every call. If tool discovery reports an error, follow its cause; \`needs_connection\` means the account must be reconnected, and \`needs_permission\` means wait for the connected person's decision. Do not switch paths after denial or provider unavailability. No app token, provider key, or sign-in URL belongs in chat or a model prompt.
 
 For an app that is not connected, call \`connect_app\` with its name, one short reason, and a request-specific \`continuation\`: one sentence stating what you will do right after sign-in. Do not include a link, credential, account identifier, or private data in that sentence. The server chooses the route and returns \`next\`. In a corner, call it from that corner so the sign-in card and connection wake return there. A managed OAuth app presents a sign-in card to its owner; end the turn and wait for the connection wake. If the provider reports managed OAuth unsupported, follow the server's Squire route and its instructions. A provider outage is unavailable, not permission to change routes. After the person connects, read Workbench again and use the app ID. Every use is authorized as \`app:<key>\` and recorded once.
 
@@ -33075,7 +33118,8 @@ Then take exactly one action:
 
 - FAIL: call \`record_validation_stage\` with stage \`review\`, status \`failed\`, and the reviewed head SHA, then reply \`@author\` with the confirmed findings and that reviewed head SHA to fix. The recorded review stage is how an implementer who has already fixed the findings can tell whether the review is stale.
 - PASS: call \`approve_merge\` with the reviewed head SHA and assigned briefRevision (omit the revision only for a legacy corner without a brief), then reply \`approved <reviewed sha>\` without tagging the author. Do not tell the author to merge.
-- Approving is your last step as reviewer. The server squash-merges that exact head once checks are green, the worker's yolo is on, and no human hold stands. Neither you nor the author merges it.
+- A human's question or proposal in the corner discussion with no answer is a blocking finding: FAIL and name it.
+- Approving is your last step as reviewer. Your PASS wakes the author, who merges that exact head with \`merge_corner\` once checks are green, the worker's yolo is on, and no human hold stands. You never merge it yourself.
 `;
 }
 function beelineSpecSkillMarkdown(releaseId) {
@@ -42375,7 +42419,8 @@ function resumePrompt(item) {
       `This is Trusty Squire's answer to the approval you were waiting on: ${item.body}.`,
       "Your paused work resumes now.",
       "If it was approved, continue exactly where you left off with Trusty Squire; do not ask the person to approve again, and do not restart the task.",
-      "If it was denied, stop that Trusty Squire action and say plainly what you cannot do."
+      "If it was denied, stop that Trusty Squire action and say plainly what you cannot do.",
+      "If it got no answer, the approval expired; say so plainly, and ask again only if the person still wants it."
     ].join(" ");
   }
   if (item.systemEvent?.kind === "connector-offer-decided") {
@@ -43695,14 +43740,17 @@ function cornerGitHubCommandRefusal(launcher, argv, featureBranch, targetBranch,
       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;
+    const explicitDestination = separator >= 0 ? raw.slice(separator + 1) : void 0;
     if (!source || source === ":" || /(?:^|\/)refs\/tags\//.test(source))
       return { refused: true };
-    const resolved = resolvePushBranch(source === "HEAD" ? void 0 : source);
+    const resolved = resolvePushBranch(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/") };
+    const branch = explicitDestination ? branchName(explicitDestination) : resolved.branch ? branchName(resolved.branch) : void 0;
+    return {
+      branch,
+      refused: explicitDestination !== void 0 && explicitDestination.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;
@@ -43731,6 +43779,12 @@ const gitContext = (() => {
 })();
 function git(args, options) { return spawnSync(config.gitCommand, gitContext.concat(args), options); }
 function resolvePushBranch(source) {
+  if (source === 'HEAD') {
+    // git push origin HEAD targets the branch checked out now; read it
+    // directly and fail closed in a detached HEAD.
+    const current = git(['symbolic-ref', '--short', 'HEAD'], { encoding: 'utf8' });
+    return current.status === 0 ? { branch: current.stdout.trim() } : {};
+  }
   if (source) {
     const tag = git(['show-ref', '--verify', '--quiet', 'refs/tags/' + source], { stdio: 'ignore' }).status === 0;
     return { branch: source, tag };
@@ -44462,7 +44516,7 @@ function filePaths(value, worktreePath) {
   visit(value);
   return [...paths];
 }
-function resultStatus2(call) {
+function resultStatus(call) {
   const content = record4(call.content) ?? (typeof call.content === "string" ? (() => {
     try {
       return record4(JSON.parse(call.content));
@@ -44523,7 +44577,7 @@ async function cornerToolActivity(call, worktreePath, requestedBy) {
     kind: "tool",
     title: title.slice(0, 240),
     operation: operation.slice(0, 80),
-    status: resultStatus2(call),
+    status: resultStatus(call),
     ...argumentsSummary,
     ...output ? { output } : {},
     ...requestedBy ? { requestedBy } : {},

package/package.json

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