@lambdacurry/arbor 0.13.7 → 0.13.9

package/dist/arbor.js

@@ -1847,7 +1847,7 @@ var apps = sqliteTable("apps", {
   stateMode: text("state_mode").$type().notNull(),
   stateIdentity: text("state_identity").notNull(),
   stateGeneration: integer("state_generation").notNull().default(0),
-  pendingStateResetId: text("pending_state_reset_id"),
+  pendingStateOperationId: text("pending_state_reset_id"),
   currentStateSchemaVersion: integer("current_state_schema_version").notNull().default(0),
   deploymentRevision: integer("deployment_revision").notNull().default(0),
   metadataRevision: integer("metadata_revision").notNull().default(0),
@@ -1897,6 +1897,19 @@ var appStateResets = sqliteTable("app_state_resets", {
   activeDeploymentId: text("active_deployment_id"),
   deploymentRevision: integer("deployment_revision"),
   targetStateSchemaVersion: integer("target_state_schema_version"),
+  recoveryBookmark: text("recovery_bookmark"),
+  recoveryExpiresAt: ts("recovery_expires_at"),
+  previousStateSchemaVersion: integer("previous_state_schema_version"),
+  restoreIdempotencyKey: text("restore_idempotency_key"),
+  restoredByProfileId: text("restored_by_profile_id").references(() => profiles.id),
+  restoreExecutionContextId: text("restore_execution_context_id").references(() => executionContexts.id),
+  restoreProviderReceipt: text("restore_provider_receipt", {
+    mode: "json"
+  }).$type(),
+  restoreFromGeneration: integer("restore_from_generation"),
+  restoreToGeneration: integer("restore_to_generation"),
+  restoreRequestedAt: ts("restore_requested_at"),
+  restoredAt: ts("restored_at"),
   createdAt: ts("created_at").notNull(),
   completedAt: ts("completed_at")
 }, (t) => ({
@@ -16983,6 +16996,7 @@ var MCP_OUTPUT_SCHEMAS = {
   }),
   app_set_access: app2,
   app_reset_state: exports_external.looseObject({ reset: jsonObject, replayed: exports_external.boolean() }),
+  app_restore_state: exports_external.looseObject({ reset: jsonObject, replayed: exports_external.boolean() }),
   app_archive: app2,
   charter: exports_external.looseObject({
     ok: exports_external.boolean().optional(),
@@ -17231,6 +17245,7 @@ var MCP_TOOL_ANNOTATIONS = {
   app_rollback: additive,
   app_set_access: additive,
   app_reset_state: destructiveIdempotent,
+  app_restore_state: destructiveIdempotent,
   app_archive: additive,
   charter: destructive,
   computer_open: additive,
@@ -18874,7 +18889,7 @@ var ACTION_DEFINITIONS = [
       path: exports_external.string().min(1).max(2048).describe("relative App path beginning with /; may include a query string"),
       method: exports_external.enum(["GET", "HEAD"]).optional().describe("safe read method; default GET")
     },
-    surfaces: ["mcp"],
+    surfaces: ["mcp", "cli"],
     toolset: "apps",
     run: forward("app.fetch")
   },
@@ -18886,11 +18901,11 @@ var ACTION_DEFINITIONS = [
       appId: exports_external.string().describe("target App, app_…"),
       path: exports_external.string().min(1).max(2048).describe("relative App path beginning with /; may include a query string"),
       method: exports_external.enum(["POST", "PUT", "PATCH", "DELETE"]).describe("mutating HTTP method"),
-      json: exports_external.json().optional().describe("JSON request value; mutually exclusive with body and sets application/json"),
+      json: exports_external.json().optional().describe("JSON request value; mutually exclusive with body and sets application/json. On the CLI, pass serialized JSON after the command as --json '<value>'"),
       body: exports_external.string().optional().describe("UTF-8 request body; mutually exclusive with json"),
       contentType: exports_external.string().max(160).optional().describe("body media type; allowed only with body, default text/plain; charset=utf-8")
     },
-    surfaces: ["mcp"],
+    surfaces: ["mcp", "cli"],
     toolset: "apps",
     run: forward("app.request")
   },
@@ -18936,7 +18951,7 @@ var ACTION_DEFINITIONS = [
   {
     name: "app_reset_state",
     title: "Reset durable App state",
-    description: "Permanently delete one durable App facet's isolated SQLite database as an explicit attributed transition; deploying or rolling back never does this. Read app_get first, pass its expectedGeneration, and keep the same idempotencyKey across retries. A provider interruption leaves a visible pending intent that the same call resumes; do not change release or archive while pending.",
+    description: "Delete one durable App facet's isolated SQLite database as an explicit attributed transition after capturing a Cloudflare recovery point valid for 30 days. Only the App creator or an Org owner/admin may do this; deploying or rolling back never does. Read app_get first, pass its expectedGeneration, and keep the same idempotencyKey across retries. A provider interruption leaves a visible pending intent that the same call resumes; do not change release or archive while pending.",
     inputSchema: {
       appId: exports_external.string().describe("durable App, app_…"),
       expectedGeneration: exports_external.number().int().min(0).describe("state generation from app_get"),
@@ -18946,6 +18961,20 @@ var ACTION_DEFINITIONS = [
     toolset: "apps",
     run: forward("app.reset_state")
   },
+  {
+    name: "app_restore_state",
+    title: "Restore durable App state",
+    description: "Restore the latest completed durable-state reset from its automatic Cloudflare recovery point, discarding state written after that reset. Recovery is available for 30 days, only while that reset remains latest and its active release has not changed. Only the App creator or an Org owner/admin may do this. Read app_get first, pass the reset id and current generation, and keep the same idempotencyKey across retries.",
+    inputSchema: {
+      appId: exports_external.string().describe("durable App, app_…"),
+      resetId: exports_external.string().describe("latest recoverable reset from app_get, rst_…"),
+      expectedGeneration: exports_external.number().int().min(0).describe("state generation from app_get"),
+      idempotencyKey: exports_external.string().min(1).max(200).describe("stable key for this one deliberate recovery")
+    },
+    surfaces: ["mcp", "cli"],
+    toolset: "apps",
+    run: forward("app.restore_state")
+  },
   {
     name: "app_archive",
     title: "Archive an App",
@@ -19472,6 +19501,17 @@ function commandWords(action) {
 var CLI_ACTIONS = ACTIONS.filter((a) => a.surfaces.includes("cli") || a.surfaces.includes("computer-cli"));
 var BY_COMMAND = new Map(CLI_ACTIONS.map((a) => [commandWords(a), a]));
 var MAX_WORDS = Math.max(1, ...CLI_ACTIONS.map((a) => commandWords(a).split(" ").length));
+var POSITIONAL_FIELDS = {
+  app_fetch: ["appId", "path"],
+  app_request: ["appId", "path"]
+};
+function positionalSpecs(action) {
+  const fields = POSITIONAL_FIELDS[action.name];
+  if (!fields)
+    return [];
+  const specs = flagsForSchema(action.inputSchema);
+  return fields.map((field) => specs.find((spec) => spec.field === field));
+}
 var KNOWN_MISREACHES = [
   { tried: "thread list", use: "tree --depth threads", why: "threads are listed by the tree" },
   { tried: "threads", use: "tree --depth threads", why: "threads are listed by the tree" },
@@ -19530,12 +19570,15 @@ function toolNameAlias(action) {
   return action.name.includes("_") ? action.name : "";
 }
 function helpLine(action) {
-  const flags = flagsForSchema(action.inputSchema).map((f) => {
+  const positionals = positionalSpecs(action);
+  const positionalFlags = new Set(positionals.map((spec) => spec.flag));
+  const args = positionals.map((spec) => ` <${spec.field}>`).join("");
+  const flags = flagsForSchema(action.inputSchema).filter((spec) => !positionalFlags.has(spec.flag)).map((f) => {
     const token = f.kind === "boolean" ? `--${f.flag}` : `--${f.flag} <>`;
     return f.required ? token : `[${token}]`;
   }).join(" ");
   const alias2 = toolNameAlias(action);
-  const head = `  ${commandWords(action)}${alias2 ? ` (${alias2})` : ""}${flags ? `  ${flags}` : ""}`;
+  const head = `  ${commandWords(action)}${alias2 ? ` (${alias2})` : ""}${args}${flags ? `  ${flags}` : ""}`;
   return `${head}
       ${action.description}`;
 }
@@ -19547,12 +19590,15 @@ function commandHelp(positionals) {
     return;
   const { action } = match;
   const specs = flagsForSchema(action.inputSchema);
-  const primary = primaryPositionalField(action.inputSchema);
-  const usageFlags = specs.map((f) => {
+  const explicitPositionals = positionalSpecs(action);
+  const primary = explicitPositionals.length === 0 ? primaryPositionalField(action.inputSchema) : undefined;
+  const positionalFlags = new Set(explicitPositionals.map((spec) => spec.flag));
+  const usageFlags = specs.filter((spec) => !positionalFlags.has(spec.flag)).map((f) => {
     const token = f.kind === "boolean" ? `--${f.flag}` : `--${f.flag} <${f.kind}>`;
     return f.required ? token : `[${token}]`;
   }).join(" ");
-  const usage = `Usage: arbor ${commandWords(action)}${primary ? ` [<${primary.field}>]` : ""}${usageFlags ? ` ${usageFlags}` : ""}`;
+  const explicitArgs = explicitPositionals.map((spec) => ` <${spec.field}>`).join("");
+  const usage = `Usage: arbor ${commandWords(action)}${explicitArgs}${primary ? ` [<${primary.field}>]` : ""}${usageFlags ? ` ${usageFlags}` : ""}`;
   const lines = specs.map((f) => {
     const req = f.required ? "required" : "optional";
     const fileNote = f.kind === "string" ? ` (or --${f.flag}-file <path|->)` : "";
@@ -19565,6 +19611,9 @@ function commandHelp(positionals) {
   const primaryNote = primary ? `
 
 A single bare argument fills --${primary.flag} (e.g. \`arbor ${commandWords(action)} <${primary.field}>\`).` : "";
+  const explicitNote = explicitPositionals.length > 0 ? `
+
+Bare arguments fill ${explicitPositionals.map((spec) => `--${spec.flag}`).join(" then ")}; the equivalent flags remain accepted.` : "";
   const alias2 = toolNameAlias(action);
   const aliasNote = alias2 ? `
 
@@ -19575,7 +19624,7 @@ Alias: \`arbor ${alias2}\` (the tool-name form) resolves to this same command.`
 ${usage}
 
 ${lines.join(`
-`)}${primaryNote}${aliasNote}
+`)}${primaryNote}${explicitNote}${aliasNote}
 `;
 }
 function commandCatalog() {
@@ -19601,17 +19650,21 @@ async function runObjectVerb(positionals, flags, ctx) {
   const { action, words } = match;
   const extras = positionals.slice(words);
   if (extras.length > 0) {
-    const primary = primaryPositionalField(action.inputSchema);
-    if (!primary) {
+    const explicitPositionals = positionalSpecs(action);
+    const positionalTargets = explicitPositionals.length > 0 ? explicitPositionals : [primaryPositionalField(action.inputSchema)].filter((spec) => spec !== undefined);
+    if (positionalTargets.length === 0) {
       throw new UsageError(`unexpected argument: ${extras[0]} (\`${commandWords(action)}\` takes no positional — use flags)`);
     }
-    if (extras.length > 1) {
-      throw new UsageError(`too many arguments: \`${commandWords(action)}\` takes one positional (--${primary.flag}); pass the rest as flags`);
+    if (extras.length > positionalTargets.length) {
+      throw new UsageError(`too many arguments: \`${commandWords(action)}\` takes ${positionalTargets.length === 1 ? "one positional" : `${positionalTargets.length} positionals`}; pass the rest as flags`);
     }
-    if (flags[primary.flag] !== undefined || flags[`${primary.flag}-file`] !== undefined) {
-      throw new UsageError(`pass --${primary.flag} either as a flag or as the positional argument, not both`);
+    for (const [index2, value] of extras.entries()) {
+      const target = positionalTargets[index2];
+      if (flags[target.flag] !== undefined || flags[`${target.flag}-file`] !== undefined) {
+        throw new UsageError(`pass --${target.flag} either as a flag or as the positional argument, not both`);
+      }
+      flags[target.flag] = value;
     }
-    flags[primary.flag] = extras[0];
   }
   const accepted = acceptedFlags(action.inputSchema);
   const unknown2 = Object.keys(flags).filter((f) => !accepted.has(f) && !RESERVED_FLAGS.has(f));
@@ -19619,7 +19672,27 @@ async function runObjectVerb(positionals, flags, ctx) {
     const hints = unknown2.map((f) => listFileHint(action, f)).filter(Boolean);
     throw new UsageError(`unknown flag${unknown2.length > 1 ? "s" : ""}: ${unknown2.map((f) => `--${f}`).join(", ")}${hints.length > 0 ? ` — ${hints.join("; ")}` : ""}`);
   }
-  const input = buildInput(action.inputSchema, flags, commandWords(action));
+  const inputFlags = { ...flags };
+  if (action.name === "app_request" && lastValue(inputFlags.json) === true) {
+    delete inputFlags.json;
+  }
+  const input = buildInput(action.inputSchema, inputFlags, commandWords(action));
+  if (action.name === "app_request" && input.json !== undefined) {
+    if (input.body !== undefined) {
+      throw new UsageError("--json and --body are mutually exclusive", {
+        reason: "validation.invalid_value",
+        field: "body"
+      });
+    }
+    try {
+      input.json = JSON.parse(String(input.json));
+    } catch {
+      throw new UsageError("--json expects a valid serialized JSON value", {
+        reason: "validation.invalid_value",
+        field: "json"
+      });
+    }
+  }
   if (action.name === "agent_register") {
     advise(`Agent registered. Save its apiKey now — it is shown only once:
 `, ctx);
@@ -19732,6 +19805,11 @@ async function login(opts) {
 }
 
 // src/index.ts
+function resolveCommandOutput(positionals, flags, opts) {
+  const actionName = matchCommand(positionals)?.action.name;
+  const resolved = resolveOutput(flags, opts);
+  return actionName === "app_fetch" || actionName === "app_request" ? { ...resolved, json: true, quiet: true } : resolved;
+}
 function setFlag(flags, key, value) {
   const prev = flags[key];
   if (prev === undefined || typeof value === "boolean" || typeof prev === "boolean") {
@@ -19748,9 +19826,11 @@ function parseArgs(argv) {
     if (arg.startsWith("--")) {
       const body = arg.slice(2);
       const eq = body.indexOf("=");
+      const appRequestWords = positionals[0] === "app" && positionals[1] === "request" ? 2 : positionals[0] === "app_request" ? 1 : 0;
+      const hasAppRequestTarget = appRequestWords > 0 && (positionals.length >= appRequestWords + 2 || flags["app-id"] !== undefined && flags.path !== undefined);
       if (eq !== -1) {
         setFlag(flags, body.slice(0, eq), body.slice(eq + 1));
-      } else if (!GLOBAL_BOOLEAN_FLAGS.has(body) && i + 1 < argv.length && !argv[i + 1].startsWith("--")) {
+      } else if ((!GLOBAL_BOOLEAN_FLAGS.has(body) || body === "json" && hasAppRequestTarget) && i + 1 < argv.length && !argv[i + 1].startsWith("--")) {
         setFlag(flags, body, argv[++i]);
       } else {
         setFlag(flags, body, true);
@@ -19880,7 +19960,7 @@ async function renderHealth(ctx) {
 }
 async function main() {
   const { positionals, flags } = parseArgs(process.argv.slice(2));
-  const ctx = resolveOutput(flags);
+  const ctx = resolveCommandOutput(positionals, flags);
   const [cmd] = positionals;
   try {
     if (flags.version !== undefined && positionals.length === 0 || cmd === "version") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdacurry/arbor",
-  "version": "0.13.7",
+  "version": "0.13.9",
   "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",