@lambdacurry/arbor 0.21.8 → 0.21.10

package/dist/arbor.js

@@ -17864,6 +17864,7 @@ var MCP_OUTPUT_SCHEMAS = {
   }),
   admin_feedback_capability: jsonObject,
   admin_feedback_evidence: jsonObject,
+  admin_feedback: jsonObject,
   admin_feedback_topic: jsonObject,
   admin_feedback_thread: jsonObject,
   admin_feedback_publish: jsonObject,
@@ -18364,7 +18365,9 @@ var MCP_OUTPUT_SCHEMAS = {
     exitCode: exports_external.number().optional(),
     processId: exports_external.string().optional(),
     status: exports_external.string().optional(),
-    cwd: exports_external.string().optional()
+    cwd: exports_external.string().optional(),
+    execution: exports_external.enum(["completed", "running"]).optional(),
+    nextAction: exports_external.literal("computer_process_read").optional()
   }),
   computer_process_read: exports_external.looseObject({
     status: exports_external.string(),
@@ -18681,6 +18684,8 @@ var OUTPUT_SHAPERS = {
     ["exitCode", result.exitCode],
     ["processId", result.processId],
     ["status", result.status],
+    ["execution", result.execution],
+    ["nextAction", result.nextAction],
     ["cwd", input.cwd === undefined ? result.cwd : undefined]
   ]),
   computer_process_read: (result) => defined([
@@ -18770,6 +18775,7 @@ var MCP_TOOL_ANNOTATIONS = {
   feedback_status: readOnly,
   admin_feedback_capability: destructiveIdempotent,
   admin_feedback_evidence: destructive,
+  admin_feedback: destructive,
   admin_feedback_topic: destructive,
   admin_feedback_thread: destructive,
   admin_feedback_publish: additive,
@@ -18904,7 +18910,9 @@ Arbor's MCP is the collaboration and durable-knowledge surface. Configure, autho
 8. DURABLE OUTPUT IS AN ARTIFACT, NOT A LONG CONTRIBUTION (AD-201). A contribution is one point in a conversation; an ARTIFACT is a first-class output the room holds and keeps CURRENT — a doc, a table, a diagram, a spec, or an uploaded file. When your point is really a deliverable the team will read or UPDATE later — a table of options, a reference doc, a plan, a rubric — make it an artifact (\`artifact\` verb=create with kind doc/table/diagram/html + \`source\`, or promote a file) instead of pasting it into prose. Text-kind artifacts are LIVING: \`artifact_get\` it, then \`artifact\` verb=edit naming the \`baseVersion\` you read — patches apply exact-match and atomically, one version per call, every version attributed. An artifact created FROM a thread is listed on that thread automatically (no link post needed); cite it inline with [label](#art_…) wherever it's relevant. WHY: a thread remembers what was SAID; an artifact holds what is TRUE NOW — a 40-row table pasted into a contribution is frozen the instant it's posted and unreadable the moment it's edited, while the same table as an artifact stays live, diffable, and findable by its content.
 
 Run \`arbor help\` (or read the MCP tool list) for the exact command/flags — those stay generated from the live action surface, so they're always current.`;
-var COMPUTER_ORIENTATION = `Arbor Computer is the complete software execution platform attached to Arbor's durable collaboration graph. It configures project environments, executes and verifies work, packages and releases Apps, and preserves reviewable evidence; it does not schedule agents or replace Arbor collaboration.
+var COMPUTER_ORIENTATION = `Long Computer work returns a handle — do not hold one tool call for a full test or build. \`computer_exec\` runs a command; if the result is still running, take \`processId\` and poll \`computer_process_read\`. Do not chain \`pnpm test && pnpm build\` in one exec; split steps or pass \`background:true\`. The CLI waits on the same handle unless \`--no-wait\`.
+
+Arbor Computer is the complete software execution platform attached to Arbor's durable collaboration graph. It configures project environments, executes and verifies work, packages and releases Apps, and preserves reviewable evidence; it does not schedule agents or replace Arbor collaboration.
 
 ${ARBOR_FEEDBACK_GUIDANCE}
 
@@ -18938,6 +18946,49 @@ function dispatch(map2, reshape) {
     return ex.call(op, reshape && verb ? reshape(verb, rest) : rest);
   };
 }
+var ADMIN_FEEDBACK_VERBS = [
+  "publish",
+  "merge",
+  "transition",
+  "edit",
+  "curate",
+  "topic",
+  "create",
+  "update",
+  "move",
+  "archive",
+  "restore"
+];
+var ADMIN_FEEDBACK_THREAD_VERBS = new Set([
+  "create",
+  "update",
+  "move",
+  "transition",
+  "archive",
+  "restore",
+  "merge"
+]);
+var ADMIN_FEEDBACK_VERB_HELP = ADMIN_FEEDBACK_VERBS.join(" | ");
+function runAdminFeedback(ex, input) {
+  const { verb, ...rest } = input;
+  if (verb === "curate") {
+    if (rest.curate === "delete")
+      return ex.call("feedback_admin.remove", rest);
+    if (rest.curate === "restore")
+      return ex.call("feedback_admin.restore", rest);
+    return Promise.reject(new Error('curate requires curate "delete" or "restore"'));
+  }
+  if (verb && ADMIN_FEEDBACK_THREAD_VERBS.has(verb)) {
+    return ex.call("feedback_admin.thread", { ...rest, action: verb });
+  }
+  if (verb === "publish")
+    return ex.call("feedback_admin.publish", rest);
+  if (verb === "edit")
+    return ex.call("feedback_admin.edit", rest);
+  if (verb === "topic")
+    return ex.call("feedback_admin.topic", rest);
+  return Promise.reject(new Error(`unknown verb "${verb ?? ""}" — expected one of: ${ADMIN_FEEDBACK_VERB_HELP}`));
+}
 var NOTIFICATION_TRIAGE_DESCRIPTION = "READ ONLY: List your awareness feed newest first with unseen count and derived triage class: `settled-context` = settled Thread context; `owed-by-me` = an open request pointing to `inbox`; `judgment-available` = live engagement inviting judgment; `closed-loop` = your request completed; `room-motion` = ambient activity. Notifications are FYI, not a second obligation surface: `inbox` alone contains work owed by you; this cannot mark notifications read or modify inbox obligations.";
 var PAGINATION_INPUT = {
   limit: exports_external.number().int().min(1).optional().describe("max items to return — enables pagination"),
@@ -19129,6 +19180,36 @@ var ACTION_DEFINITIONS = [
       status: "feedback_admin.status"
     })
   },
+  {
+    name: "admin_feedback",
+    title: "Moderate shared Arbor Feedback",
+    description: "After a ship, recall matching Feedback, merge duplicates, publish the outcome, and transition the canonical Thread to resolved. Moderators only: this cannot file reports or expose receipt metadata.",
+    inputSchema: {
+      verb: exports_external.enum(ADMIN_FEEDBACK_VERBS).describe("close loop: publish, merge, transition; also edit, curate, topic, and thread lifecycle"),
+      threadId: exports_external.string().optional().describe("publish / update / move / transition / archive / restore: Thread id"),
+      type: exports_external.enum(CONTRIBUTION_TYPES).optional().describe("publish/edit: shared contribution type, including maintainer decision"),
+      body: exports_external.string().min(1).optional().describe("publish: follow-on body · edit: replacement body"),
+      summary: exports_external.string().max(500).nullable().optional().describe("publish/edit: gist; edit null/empty clears"),
+      confidence: exports_external.number().int().min(0).max(100).optional().describe("publish: 0–100 confidence"),
+      idempotencyKey: exports_external.string().min(1).max(200).optional().describe("publish: stable retry key"),
+      feedbackId: exports_external.string().optional().describe("publish: optional receipt id; additionally requires review_private"),
+      contributionId: exports_external.string().optional().describe("edit/curate: shared contribution id"),
+      curate: exports_external.enum(["delete", "restore"]).optional().describe("curate: delete or restore a shared contribution"),
+      action: exports_external.enum(["create", "update", "archive", "restore"]).optional().describe("topic: create, update, archive, or restore"),
+      topicId: exports_external.string().optional().describe("topic / create / move / update: Feedback Topic id"),
+      title: exports_external.string().min(1).optional().describe("topic/create/update: title"),
+      purpose: exports_external.string().optional().describe("topic: purpose"),
+      sourceThreadId: exports_external.string().optional().describe("merge: duplicate source Thread id"),
+      targetThreadId: exports_external.string().optional().describe("merge: canonical destination Thread id"),
+      objective: exports_external.string().min(1).optional().describe("create/update: Thread objective"),
+      status: exports_external.enum(["active", "needs-review", "stuck", "standing", "resolved", "archived"]).optional().describe("transition/update: target Thread status"),
+      reason: exports_external.string().optional().describe("merge: concise auditable rationale")
+    },
+    surfaces: ["mcp"],
+    toolset: "admin",
+    requiresCapability: "moderate",
+    run: runAdminFeedback
+  },
   {
     name: "admin_feedback_topic",
     title: "Maintain shared Feedback Topics",
@@ -19139,7 +19220,7 @@ var ACTION_DEFINITIONS = [
       title: exports_external.string().min(1).optional().describe("create/update: Topic title"),
       purpose: exports_external.string().optional().describe("create/update: Topic purpose")
     },
-    surfaces: ["mcp", "cli"],
+    surfaces: ["cli"],
     toolset: "admin",
     run: forward("feedback_admin.topic")
   },
@@ -19158,7 +19239,7 @@ var ACTION_DEFINITIONS = [
       status: exports_external.enum(["active", "needs-review", "stuck", "standing", "resolved", "archived"]).optional().describe("transition/update: target Thread status"),
       reason: exports_external.string().optional().describe("merge: concise auditable rationale")
     },
-    surfaces: ["mcp", "cli"],
+    surfaces: ["cli"],
     toolset: "admin",
     run: forward("feedback_admin.thread")
   },
@@ -19175,7 +19256,7 @@ var ACTION_DEFINITIONS = [
       idempotencyKey: exports_external.string().min(1).max(200).optional(),
       feedbackId: exports_external.string().optional().describe("optional receipt id; additionally requires review_private")
     },
-    surfaces: ["mcp", "cli"],
+    surfaces: ["cli"],
     toolset: "admin",
     run: forward("feedback_admin.publish")
   },
@@ -19189,7 +19270,7 @@ var ACTION_DEFINITIONS = [
       summary: exports_external.string().max(500).nullable().optional().describe("replacement gist; null/empty clears"),
       type: exports_external.enum(CONTRIBUTION_TYPES).optional().describe("replacement shared contribution type")
     },
-    surfaces: ["mcp", "cli"],
+    surfaces: ["cli"],
     toolset: "admin",
     run: forward("feedback_admin.edit")
   },
@@ -19201,7 +19282,7 @@ var ACTION_DEFINITIONS = [
       verb: exports_external.enum(["delete", "restore"]),
       contributionId: exports_external.string().describe("shared Feedback contribution id")
     },
-    surfaces: ["mcp", "cli"],
+    surfaces: ["cli"],
     toolset: "admin",
     run: dispatch({ delete: "feedback_admin.remove", restore: "feedback_admin.restore" })
   },
@@ -19537,14 +19618,14 @@ var ACTION_DEFINITIONS = [
   {
     name: "computer_exec",
     title: "Run a command",
-    description: "Run one bounded shell operation in a parent Computer or Run with ambient GitHub authorization for connected humans. For long work prefer background:true + computer_process_read; explicit timeout terminates execution, while after a missed isolated response use computer_run_receipt.operations[].operationId with computer_process_read instead of repeating the mutation.",
+    description: "Run one bounded shell operation in a parent Computer or Run with ambient GitHub authorization for connected humans. A long command returns processId if still running — poll computer_process_read (background:true skips the wait; timeout kills the process); after a missed isolated response use computer_run_receipt.operations[].operationId with computer_process_read instead of repeating the mutation.",
     inputSchema: {
       computerSessionId: exports_external.string().optional().describe("the computerSessionId returned by computer_open, cms_…; required unless runId is supplied"),
       command: exports_external.string().min(1).describe("the shell command to run"),
       runId: exports_external.string().optional().describe("route this command according to this Run execution placement, run_… (from computer_run_start)"),
       cwd: exports_external.string().optional().describe("working directory under /workspace, or under the run; omit to use defaultCwd"),
-      timeout: exports_external.number().int().min(1000).max(1800000).optional().describe("command deadline in milliseconds, from 1,000 through 1,800,000"),
-      background: exports_external.boolean().optional().describe("start a container process and return its pid"),
+      timeout: exports_external.number().int().min(1000).max(1800000).optional().describe("process kill deadline in milliseconds, from 1,000 through 1,800,000 — not the RPC hold"),
+      background: exports_external.boolean().optional().describe("start the process and return immediately without the short RPC wait"),
       activityLabel: exports_external.string().min(1).max(COMPUTER_RUN_ACTIVITY_LABEL_MAX).optional().describe("short human-readable label for run-scoped background work; Arbor records this label instead of the raw command or output"),
       activityKind: exports_external.literal("verification").optional().describe("mark a labeled run-scoped background command as a verification check; its provider-observed terminal result is recorded as verification.finished"),
       strict: exports_external.boolean().optional().describe("fail on the first unhandled command or pipeline failure; defaults to true, set false only for intentional best-effort execution")
@@ -21249,6 +21330,9 @@ var ACTION_DEFINITIONS = [
   }
 ];
 var ACTIONS = ACTION_DEFINITIONS.map((action) => {
+  if (action.requiresCapability && !action.surfaces.includes("mcp")) {
+    throw new Error(`${action.name}: requiresCapability is an MCP catalog gate`);
+  }
   if (!action.surfaces.some((surface) => surface === "mcp" || surface === "computer-mcp")) {
     return action;
   }
@@ -21555,7 +21639,8 @@ var GLOBAL_BOOLEAN_FLAGS = new Set([
   "json",
   "quiet",
   "no-quiet",
-  "help"
+  "help",
+  "no-wait"
 ]);
 var RESERVED_FLAGS = new Set([
   ...GLOBAL_BOOLEAN_FLAGS,
@@ -21647,6 +21732,66 @@ function emitDual(data, human, action, ctx) {
     process.stdout.write(human);
 }
 
+// src/computer-exec-wait.ts
+var DEFAULT_PROCESS_DEADLINE_MS = 1800000;
+var POLL_MS = 400;
+var processRead = ACTIONS.find((action) => action.name === "computer_process_read");
+function record3(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function isRunning(value) {
+  const status = typeof value.status === "string" ? value.status.toLowerCase() : "";
+  if (value.done === false)
+    return true;
+  if (status === "running" || status === "started" || status === "starting")
+    return true;
+  if (value.done === true)
+    return false;
+  if (status === "completed" || status === "exited" || status === "failed" || status === "cancelled" || status === "terminated" || status === "killed" || status === "unknown") {
+    return false;
+  }
+  if (typeof value.exitCode === "number")
+    return false;
+  return typeof value.processId === "string";
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isComputerExecHandle(value) {
+  const rec = record3(value);
+  return Boolean(rec && typeof rec.processId === "string" && isRunning(rec));
+}
+async function waitForComputerExec(executor, input, value, ctx) {
+  if (!processRead || !isComputerExecHandle(value))
+    return value;
+  let latest = value;
+  let cursor = typeof latest.nextCursor === "string" && latest.nextCursor ? latest.nextCursor : undefined;
+  const deadline = Date.now() + (typeof input.timeout === "number" && Number.isFinite(input.timeout) ? input.timeout : DEFAULT_PROCESS_DEADLINE_MS);
+  advise(`Process ${String(latest.processId)} is still running; polling computer_process_read.
+`, ctx);
+  while (isRunning(latest) && Date.now() < deadline) {
+    await sleep(POLL_MS);
+    const read = record3(await processRead.run(executor, {
+      processId: latest.processId,
+      ...cursor ? { cursor } : {},
+      ...typeof input.runId === "string" ? { runId: input.runId } : {},
+      ...typeof input.computerSessionId === "string" ? { computerSessionId: input.computerSessionId } : {}
+    }));
+    if (!read) {
+      throw new Error("computer_process_read returned an empty result");
+    }
+    latest = read;
+    if (typeof read.nextCursor === "string" && read.nextCursor)
+      cursor = read.nextCursor;
+    const stdout = typeof latest.stdout === "string" ? latest.stdout : "";
+    if (stdout)
+      advise(stdout, ctx);
+    if (latest.recovery)
+      break;
+  }
+  return latest;
+}
+
 // src/schema.ts
 import { readFileSync as readFileSync2 } from "node:fs";
 function kebab(field) {
@@ -21989,11 +22134,14 @@ Bare arguments fill ${explicitPositionals.map((spec) => `--${spec.flag}`).join("
 
 Alias: \`arbor ${alias2}\` (the tool-name form) resolves to this same command.` : "";
   const heading = `${commandWords(action)}${alias2 ? ` (alias: ${alias2})` : ""}`;
+  const waitLines = action.name === "computer_exec" ? [
+    "  --no-wait [<boolean>]  [optional] — return a running processId immediately instead of polling computer_process_read"
+  ] : [];
   return `${heading} — ${action.description}
 
-${usage}
+${usage}${waitLines.length > 0 ? " [--no-wait]" : ""}
 
-${lines.join(`
+${[...lines, ...waitLines].join(`
 `)}${primaryNote}${explicitNote}${aliasNote}
 `;
 }
@@ -22002,13 +22150,24 @@ function commandCatalog() {
     command: commandWords(action),
     name: action.name,
     description: action.description,
-    flags: flagsForSchema(action.inputSchema).map((f) => ({
-      flag: f.flag,
-      kind: f.kind,
-      required: f.required,
-      acceptsFile: f.kind === "string",
-      description: f.description
-    }))
+    flags: [
+      ...flagsForSchema(action.inputSchema).map((f) => ({
+        flag: f.flag,
+        kind: f.kind,
+        required: f.required,
+        acceptsFile: f.kind === "string",
+        description: f.description
+      })),
+      ...action.name === "computer_exec" ? [
+        {
+          flag: "no-wait",
+          kind: "boolean",
+          required: false,
+          acceptsFile: false,
+          description: "return a running processId immediately instead of polling computer_process_read"
+        }
+      ] : []
+    ]
   }));
 }
 function applyPositionals(action, extras, flags) {
@@ -22087,13 +22246,16 @@ async function runObjectVerb(positionals, flags, ctx) {
     advise(`Agent registered. Save its apiKey now — it is shown only once:
 `, ctx);
   }
-  const value = await action.run(httpExecutor, input);
+  let value = await action.run(httpExecutor, input);
+  if (action.name === "computer_exec" && !truthyFlag(flags["no-wait"])) {
+    value = await waitForComputerExec(httpExecutor, input, value, ctx);
+  }
   emitData(shapeActionOutput(action.name, value, input), action.name, ctx);
 }
 
 // src/connect.ts
 var DEFAULT_POLL_INTERVAL_MS = 2000;
-var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 function bareConnectUrl(apiUrl, returnedUrl) {
   const fallback = `${apiUrl.replace(/\/$/, "")}/connect`;
   if (!returnedUrl)
@@ -22137,7 +22299,7 @@ async function connect(opts) {
     if (Date.now() > deadline) {
       throw new Error("pairing timed out — ask for a new pairing key and run `arbor connect` again");
     }
-    await sleep(pollIntervalMs);
+    await sleep2(pollIntervalMs);
     const tokRes = await fetch(`${apiUrl}/api/agent/connect/token`, {
       method: "POST",
       headers,
@@ -22163,7 +22325,7 @@ async function connect(opts) {
 // src/login.ts
 var CLIENT_ID = "arbor-cli";
 var GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
-var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
+var sleep3 = (ms) => new Promise((r) => setTimeout(r, ms));
 async function login(opts) {
   const apiUrl = opts.url ?? loadConfig().apiUrl;
   const codeRes = await fetch(`${apiUrl}/api/auth/device/code`, {
@@ -22188,7 +22350,7 @@ async function login(opts) {
   for (;; ) {
     if (Date.now() > deadline)
       throw new Error("login timed out — run `arbor login` again");
-    await sleep2(interval);
+    await sleep3(interval);
     const tokRes = await fetch(`${apiUrl}/api/auth/device/token`, {
       method: "POST",
       headers: { "content-type": "application/json" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdacurry/arbor",
-  "version": "0.21.8",
+  "version": "0.21.10",
   "description": "The Arbor CLI — a shared workspace for people and agents. The human + headless-agent write path over Arbor's guarded operation surface.",
   "keywords": [
     "agents",