@corvio/cli 0.1.0-beta.35 → 0.1.0-beta.37

package/README.md

@@ -12,9 +12,9 @@ corvio collaboration status --json --no-input
 corvio ask --prompt 'Summarize recurring launch risks' --json
 corvio files upload --file ./research.pdf --json
 corvio files get <asset_id> --content --json
-corvio files organize <asset_id> --instruction 'Create a reusable decision brief' --yes --json
-corvio files operation <operation_id> --json
-corvio files resume <operation_id> --yes --json
+corvio files organize <asset_id> --instruction 'Create a reusable decision brief' --yes --wait-until-terminal --timeout-seconds 1200 --json
+corvio files operation <operation_id> --wait-until-terminal --timeout-seconds 1200 --json
+corvio files resume <operation_id> --yes --wait-until-terminal --timeout-seconds 1200 --json
 corvio docs read <workspace_id/document_id> --mode auto --json
 corvio docs patch <workspace_id/document_id> --input ./patch.json --operation-id <id> --yes --json
 corvio docs table-read <workspace_id/document_id> --limit 25 --json
@@ -38,8 +38,19 @@ require reauthorization.
 
 The CLI rejects unknown/duplicate options and malformed integer bounds before network access. Normal API calls have a bounded timeout (`CORVIO_REQUEST_TIMEOUT_MS`, maximum ten minutes); only reads, explicit idempotency contracts, revision guards, and other owner-declared safe operations retry automatically. Document commands accept both bare document IDs and canonical `workspace_id/document_id` handles; a canonical handle that disagrees with the selected Workspace fails before remote access, and successful reads return `canonical_id` for direct reuse. `docs read --mode auto` returns a complete small Page or a large-Page overview, then supports exact section, line-range, literal-search, and full projections. `docs patch` applies 1–20 exact non-overlapping L# replacements at the fetched revision and returns a compact readback instead of replaying untouched content. `docs get --output` keeps compatibility full-body download but omits the body from stdout; create/update request compact mutation receipts. Document updates preflight only a bounded overview for the current revision when `--expected-revision` is omitted. `docs table-read` returns a bounded stable-ID projection; `docs table-mutate` accepts a JSON payload for at most 50 cell updates or row appends and requires the fetched revision, while formulas, styles, structure, sorting, and semantic transformations remain `corvio ask --allow-actions` work. When the executing principal is a connected Agent, document and table mutations also require `--change-summary`, create a visible document-level comment after the guarded update, and return its receipt; a comment failure is reported as a partial effect rather than silent success. When a Corvio document or comment supplied the task, use `corvio agent closeout` to return the verified outcome, optionally resolve the thread, and read both document and thread back. Downloads, uploads, and Markdown pulls verify SHA-256 receipts before replacing local files; local writes are atomic, remote default filenames cannot escape the current directory, and Sync refuses symbolic-link traversal while checkpointing each successful push.
 
-For `corvio ask`, pass the user's natural goal, complete decision-relevant context, and explicit constraints. Unless the user chose them,
-do not invent taxonomy, titles, artifact counts, or Corvio's internal plan. Read the terminal Question receipt and use `artifact.url` or
+For `corvio ask`, keep the user's natural question unchanged, then append the smallest complete decision-relevant context or stable handles
+as a separate clause. A carried Project handle normally bounds a cross-branch question without enumerating all descendants. Handles are
+evidence addresses: do not invent a comparison rubric, prescribe reasoning steps, substitute another user objective, or turn current Tree
+labels into a detailed task plan. Unless the user chose them, do not invent taxonomy, titles, artifact counts, or Corvio's internal plan.
+In a bounded read-only continuation, use `corvio ask --workspace <workspace_id> --prompt "<unchanged question; Context: project handle>"
+--json --no-input` when a trusted current-task or prior receipt already
+proves this authenticated CLI and exact Workspace. Answer-only is
+the default: omit `--allow-actions`; the CLI has no `--mode` option. Start the command once; do not launch an identical Question concurrently
+or retry before terminal exit. The command returns the terminal Question without model-visible
+polling. Transport continuity does not prove a cheaper processing profile; leave profile selection on `auto` unless the unresolved semantic
+bottleneck independently justifies another profile. Do not install, probe, or switch to the CLI only for that optimization, and do not
+extend it to an unbound Workspace.
+Read the terminal Question receipt and use `artifact.url` or
 `links.primary_artifact` verbatim; `reader_output` artifacts are deliverables, `structure_container` artifacts are hierarchy, and
 `node_id` is never a document URL.
 
@@ -47,7 +58,7 @@ Treat files as a value ladder, not one upload event. Upload/finalize preserves t
 
 Use `corvio files get <asset_id> --content` when the task needs only bounded facts from one retained source. The response preserves the immutable original as authority, reports its source hash and whether the projection is complete or truncated, and does not create a Question or materialize another document. Never infer unseen workbook rows/sheets or document sections.
 
-File organization is asynchronous. A queued organization receipt is progress, not completion: continue from its stable operation ID with `corvio files operation <operation_id>`. Blocked operations expose their typed error and can be continued with `corvio files resume <operation_id> --yes`; queued/running/blocked operations can be stopped with `corvio files cancel <operation_id> --yes`. Report completion only after the terminal receipt exposes the output document, source reconciliation, Skill evaluation, and durable links. `skills_extraction_mode=always` requires the evaluation; `evaluated_no_qualifying_skill` is a valid terminal result and is preferable to a fabricated Skill.
+File organization is asynchronous. A queued organization receipt is progress, not completion. When this authenticated CLI is already the natural transport, `--wait-until-terminal` keeps deterministic status reads inside one foreground process; `--timeout-seconds` is a bounded local deadline, and expiry returns the latest non-terminal receipt with `transport_wait.status=deadline_reached`. Without that flag, `corvio files operation <operation_id>` remains one immediate read. Blocked operations expose their typed error and can be continued with `corvio files resume <operation_id> --yes`; queued/running/blocked operations can be stopped with `corvio files cancel <operation_id> --yes`. Report completion only after the terminal receipt exposes the output document, source reconciliation, Skill evaluation, and durable links. `skills_extraction_mode=always` requires the evaluation; `evaluated_no_qualifying_skill` is a valid terminal result and is preferable to a fabricated Skill.
 
 ## Project Agent collaboration
 

package/dist/cli.js

@@ -39,13 +39,17 @@ import {
   agentCredentialPath,
 } from "./core.js";
 
-const VERSION = "0.1.0-beta.35";
+const VERSION = "0.1.0-beta.37";
 const DEFAULT_API_BASE = "https://api.corvio.ai/v1";
 const DEFAULT_APP_BASE = "https://corvio.ai";
 const USER_AGENT = `corvio-cli/${VERSION}`;
 const MAX_UPLOAD_BYTES = 100 * 1024 * 1024;
 const MAX_SYNC_FILES = 2_000;
 const MAX_MARKDOWN_CHARACTERS = 120_000;
+const DEFAULT_FILE_OPERATION_WAIT_TIMEOUT_SECONDS = 1_200;
+const MAX_FILE_OPERATION_WAIT_TIMEOUT_SECONDS = 7_200;
+const FILE_OPERATION_PENDING_STATUSES = new Set(["accepted", "pending", "prepared", "queued", "running"]);
+const READ_ONLY_LOCAL_STATE_ERROR_CODES = new Set(["EACCES", "EPERM", "EROFS"]);
 const CORVIO_SKILL_ARCHIVE = "https://corvio.ai/developers/skills/corvio-operate-workspace/corvio-operate-workspace.zip";
 const AGENT_SKILLS_INSTALLER_VERSION = "1.5.23";
 const GLOBAL_OPTIONS = Object.freeze([
@@ -60,6 +64,17 @@ const GLOBAL_OPTIONS = Object.freeze([
   "version",
 ]);
 
+function isReadOnlyLocalStateError(error) {
+  const visited = new Set();
+  let current = error;
+  while (current && typeof current === "object" && !visited.has(current)) {
+    visited.add(current);
+    if (READ_ONLY_LOCAL_STATE_ERROR_CODES.has(String(current.code || "").toUpperCase())) return true;
+    current = current.cause;
+  }
+  return false;
+}
+
 const COMMAND_OPTIONS = Object.freeze({
   "auth:login": ["force"],
   "auth:status": [],
@@ -126,13 +141,15 @@ const COMMAND_OPTIONS = Object.freeze({
   "files:upload": [
     "file", "mime-type", "organize", "instruction", "target-root-node-id", "additional-asset-ids",
     "processing-profile", "max-processing-profile", "scan-mode", "skills-extraction-mode", "caller-model",
+    "wait-until-terminal", "timeout-seconds",
   ],
   "files:organize": [
     "id", "additional-asset-ids", "instruction", "target-root-node-id",
     "processing-profile", "max-processing-profile", "scan-mode", "skills-extraction-mode", "caller-model",
+    "wait-until-terminal", "timeout-seconds",
   ],
-  "files:operation": ["id"],
-  "files:resume": ["id"],
+  "files:operation": ["id", "wait-until-terminal", "timeout-seconds"],
+  "files:resume": ["id", "wait-until-terminal", "timeout-seconds"],
   "files:cancel": ["id"],
   "files:open": ["id"],
   "sync:init": ["root-node-id", "dir", "name", "force"],
@@ -180,7 +197,7 @@ const COMMAND_HELP = Object.freeze({
   workspaces: `Usage:\n  corvio workspaces list\n  corvio workspaces use <workspace-id>\n  corvio workspaces current\n  corvio workspaces create --name <name> [--kind personal|team]\n\nWorkspace status and blocked capability reasons are returned with each item.`,
   capabilities: `Usage: corvio capabilities [--json]\n\nShow live API resources, principal scopes, selected Workspace status, and CLI compatibility.`,
   collaboration: `Usage:\n  corvio collaboration status [--project <path>] [--provider codex|claude_code|copilot|workbuddy]\n\nCheck local Corvio prerequisites and every discoverable Corvio Skill copy. Current copies stay quiet; non-current receipts include one compact Agent notice and a source-aware next action. Standalone refresh commands pin the verified installer, select exactly one provider, and preserve project/global scope. WorkBuddy inspection is read-only and never changes ~/.workbuddy. The CLI cannot prove that the current host task loaded a particular copy, or whether remote MCP or host memory is active.`,
-  ask: `Usage: corvio ask --prompt <text> [--file <path>] [--asset-ids <id,id>] [--conversation-id <id>] [--sources workspace,web,memory] [--allow-actions] [--processing-profile auto|economy|standard|deep] [--max-processing-profile economy|standard|deep] [--scan-mode auto|always|off] [--skills-extraction-mode auto|always|off] [--caller-model <host-model>] [--context-file <json>] [--idempotency-key <key>]\n\nPass the user's natural goal, complete decision-relevant context, and explicit constraints. Unless the user chose them, do not invent taxonomy, titles, artifact count, or Corvio's internal plan; Corvio chooses the cognitive structure and carriers. --file retains the selected local file, verifies its hash, and attaches the finalized Asset to this exact question. --asset-ids attaches already-retained Corvio Assets. Use --allow-actions when Corvio should create the Page, Spreadsheet, Presentation, Code, HTML Artifact, Memory, or qualifying Project Skill that best serves the result. A continuation handle is subject evidence, not necessarily the durable write destination: for a reusable pattern or method, resolve the fitting same-scope Memory or Skill owner before admitting or merging it. Read the terminal Question receipt and use artifact.url or links.primary_artifact verbatim; reader_output artifacts are deliverables, structure_container artifacts are hierarchy, and node_id is never a document URL. Upload alone is not evidence of interpretation. Skill extraction mode always requires --allow-actions and an evidence-backed decision, not forced Skill creation; answer-only questions may use auto or off.`,
+  ask: `Usage: corvio ask --prompt <text> [--file <path>] [--asset-ids <id,id>] [--conversation-id <id>] [--sources workspace,web,memory] [--allow-actions] [--processing-profile auto|economy|standard|deep] [--max-processing-profile economy|standard|deep] [--scan-mode auto|always|off] [--skills-extraction-mode auto|always|off] [--caller-model <host-model>] [--context-file <json>] [--idempotency-key <key>]\n\nAnswer-only is the default: omit --allow-actions; there is no --mode option. Keep the user's natural question unchanged, then append the smallest complete decision-relevant context or stable handles as a separate clause. A carried Project handle normally bounds a cross-branch question without enumerating all descendants. Handles are evidence addresses: do not invent a comparison rubric, prescribe reasoning steps, substitute another user objective, or turn current Tree labels into a detailed task plan. Unless the user chose them, do not invent taxonomy, titles, artifact count, or Corvio's internal plan; Corvio chooses the cognitive structure and carriers. In a bounded read-only continuation, start this foreground command exactly once when a trusted current-task or prior receipt already proves this authenticated CLI and exact Workspace; do not launch an identical Question concurrently or retry before terminal exit. If the host shell yields a running-session handle, wait on that exact handle until the CLI exits instead of answering from prior context. It returns the terminal Question without model-visible polling. Transport continuity does not prove a cheaper processing profile; leave processing on auto unless the remaining transformation independently justifies another profile. Do not install, probe, or switch to the CLI only for that optimization, and do not extend it to an unbound Workspace. --file retains the selected local file, verifies its hash, and attaches the finalized Asset to this exact question. --asset-ids attaches already-retained Corvio Assets. Use --allow-actions when Corvio should create the Page, Spreadsheet, Presentation, Code, HTML Artifact, Memory, or qualifying Project Skill that best serves the result. A continuation handle is subject evidence, not necessarily the durable write destination: for a reusable pattern or method, resolve the fitting same-scope Memory or Skill owner before admitting or merging it. Read the terminal Question receipt and use artifact.url or links.primary_artifact verbatim; reader_output artifacts are deliverables, structure_container artifacts are hierarchy, and node_id is never a document URL. Upload alone is not evidence of interpretation. Skill extraction mode always requires --allow-actions and an evidence-backed decision, not forced Skill creation; answer-only questions may use auto or off.`,
   agents: `Usage:\n  corvio agents list\n  corvio agents connect [--provider codex|claude_code|copilot] [--project <path>] [--permission-profile read_only|workspace_write|danger_full_access] [--trigger-policy owner_only|workspace_members] [--display-name <name>] [--recover-credential] [--no-listen]\n  corvio agents create --handle <handle> --display-name <name> [--provider codex|claude_code|copilot|custom] [--permissions read,comment,edit]\n  corvio agents update <id> [--display-name <name>] [--status active|paused|revoked] [--permissions <list>]\n  corvio agents rotate <id>\n\n'connect' binds the current Git project (or --project path) to one stable personal Agent. Repeating it is idempotent; another project creates another Agent. It reports provider/CLI, listener, and local Skill prerequisites separately; run corvio collaboration status after installing or refreshing the Skill. The CLI cannot prove that the current host task loaded those surfaces. The default workspace_write profile is limited by the provider's native sandbox. owner_only is the safe trigger default. Secrets and absolute project paths stay local.`,
   agent: `Usage:\n  corvio agent claim [--worker-id <id>] [--wait-seconds <0-30>]\n  corvio agent renew <event-id> --lease-token <token> [--lease-seconds <30-900>]\n  corvio agent complete <event-id> --lease-token <token> [--result-file <json>]\n  corvio agent fail <event-id> --lease-token <token> --error <message>\n  corvio agent mentions --document-id <id> [--query <name>]\n  corvio agent comments --document-id <id>\n  corvio agent comment --document-id <id> --body <text> [--selection-file <json>] [--start-new-chain] [--idempotency-key <key>]\n  corvio agent reply <thread-id> --document-id <id> --body <text> [--source-event-id <id> --source-event-lease-token <token>|--start-new-chain] [--idempotency-key <key>]\n  corvio agent status <thread-id> --document-id <id> --status open|resolved\n  corvio agent closeout --document-id <id> [--thread-id <id>] --body <verified-result> [--status open|resolved] [--idempotency-key <key>]\n  corvio agent run [--provider codex|claude_code|copilot|custom] [--handler <executable>] [--agent <id>] [--once] [--processing-profile auto|economy|standard|deep] [--max-processing-profile economy|standard|deep] [--scan-mode auto|always|off] [--skills-extraction-mode auto|always|off] [--caller-model <host-model>]\n\nUse mentions before commenting when the target is uncertain; aliases resolve to stable user or Agent IDs and ambiguity fails closed. Use closeout when a Corvio document or comment owned the task: it returns the verified result to that surface and reads document/comments back. Agent-to-Agent comments require either a claimed source event or explicit --start-new-chain. The runner iteratively exchanges origin-scoped evidence with Corvio Query/Writer, then invokes the bound provider inside its local project. Local code changes use the recorded provider permission profile; complex Corvio document changes belong to Query/Writer. Provider children never receive Corvio credentials.`,
   questions: `Usage:\n  corvio questions list [--limit <n>] [--cursor <cursor>] [--conversation-id <id>]\n  corvio questions get <question-id>`,
@@ -188,7 +205,7 @@ const COMMAND_HELP = Object.freeze({
   search: `Usage: corvio search <query> [--limit <n>] [--page-id <id>] [--node-id <id>]`,
   docs: `Usage:\n  corvio docs list [--limit <n>] [--cursor <cursor>] [--lifecycle active|archived]\n  corvio docs get <id> [--output <path>]\n  corvio docs read <id> [--mode auto|overview|line-range|section|search|full] [--start-line <n> --end-line <n>|--section-ref <S#>|--query <text>] [--max-chars <n>]\n  corvio docs patch <id> --input <json> --yes [--operation-id <id>] [--change-summary <text>]\n  corvio docs table-read <id> [--table-id <id>] [--after-row-id <id>] [--limit <1-100>]\n  corvio docs table-mutate <id> --input <json> --yes [--operation-id <id>] [--change-summary <text>]\n  corvio docs create --title <title> [--file <path>|--markdown <text>] [--parent-node-id <id>] [--idempotency-key <key>]\n  corvio docs update <id> [--title <title>] [--file <path>|--markdown <text>] [--expected-revision <n>] [--change-summary <text>]\n  corvio docs move <id> --parent-node-id <id>\n  corvio docs archive <id> --yes\n  corvio docs restore <id> --yes\n  corvio docs share <id> --yes [--display-name <name>]\n  corvio docs open <id>\n\nUse \`docs read --mode auto\` first for a small full body or a large-document overview, then read an exact section or line range. Use \`docs patch\` when the host already knows 1-20 exact L# replacements; it preserves untouched lines and returns a compact verified delta. A selected Markdown file can become an editable Page without resending the body through the model. Use \`docs update\` only when whole-body replacement is the smallest faithful change. Delegate document-wide judgment, cross-source synthesis, structure/formatting interpretation, and typed Spreadsheet, Presentation, Code, or HTML work to \`corvio ask --allow-actions\`. A Project is a structure container; body writes fail with project_structure_container_body_write_disabled, while a title-only Project rename remains valid. Projects stay at the Workspace root and cannot be nested; use \`files organize\` or \`ask --allow-actions\` for Work Model maintenance. Use table-read plus table-mutate for bounded stable-ID cell updates or row appends. Agent-authenticated document changes require --change-summary and create a visible document-level comment after the guarded update. When a document/comment is the task owner, use \`corvio agent closeout\` to return verified work to that same collaboration surface and read it back.`,
   projects: `Usage:\n  corvio projects list [--limit <n>]\n  corvio projects create --title <title> [--idempotency-key <key>]\n\nProjects are durable root-level grouping owners in the Corvio Docs tree and cannot be nested under another Project. Reuse a matching Project instead of creating one ceremonial Project per file; use semantic branch Pages and leaves for deeper Work Models. 'corvio folders' is an alias.`,
-  files: `Usage:\n  corvio files list [--limit <n>]\n  corvio files get <id> [--content]\n  corvio files download <id> [--output <path>]\n  corvio files upload --file <path> [--mime-type <type>] [--organize --instruction <text> --additional-asset-ids <id,id> --yes]\n  corvio files organize <id> --instruction <text> --yes [--additional-asset-ids <id,id>] [--target-root-node-id <project-node-id>] [--processing-profile auto|economy|standard|deep] [--scan-mode auto|always|off] [--skills-extraction-mode auto|always|off]\n  corvio files operation <operation-id>\n  corvio files resume <operation-id> --yes\n  corvio files cancel <operation-id> --yes\n  corvio files open <id>\n\nUse --content only when source facts are needed. It returns one bounded AI-safe projection with hash, completeness, and truncation receipts; it does not rewrite or materialize the original. Upload alone preserves the exact original, provenance, hash, policy, and stable Asset ID. Organization is a separate asynchronous value step: one coherent source set can produce reader-facing structure, source reconciliation, Memory candidates, and qualifying Project Skills. Pass --instruction a weak natural goal plus explicit user constraints and only authority facts needed to prevent wrong identity or scope. Keep source-derived facts in the source; do not precompute an outline, edit checklist, taxonomy, titles, artifact count, or sole leaf target from current visibility. A heterogeneous source may update several real Projects while its provenance carrier stays a standalone document; do not direct Corvio to make the source Page an umbrella Project. For a newly finalized Asset that should enter a Work Model or Skill evaluation, use one organize operation as the sole semantic owner; do not open ask before or after it for the same Asset set. --target-root-node-id is optional and accepts only a Project node_id returned by projects list, never a Page/document UUID or leaf node; omit it when the Project is not known. Use 'files operation' to reach terminal and inspect output_document plus skills_evaluation; always requires evaluation but may correctly return evaluated_no_qualifying_skill. Resume reuses the same durable operation after resolving its blocker; cancel is idempotent.`,
+  files: `Usage:\n  corvio files list [--limit <n>]\n  corvio files get <id> [--content]\n  corvio files download <id> [--output <path>]\n  corvio files upload --file <path> [--mime-type <type>] [--organize --instruction <text> --additional-asset-ids <id,id> --yes] [--wait-until-terminal] [--timeout-seconds <1-7200>]\n  corvio files organize <id> --instruction <text> --yes [--additional-asset-ids <id,id>] [--target-root-node-id <project-node-id>] [--processing-profile auto|economy|standard|deep] [--scan-mode auto|always|off] [--skills-extraction-mode auto|always|off] [--wait-until-terminal] [--timeout-seconds <1-7200>]\n  corvio files operation <operation-id> [--wait-until-terminal] [--timeout-seconds <1-7200>]\n  corvio files resume <operation-id> --yes [--wait-until-terminal] [--timeout-seconds <1-7200>]\n  corvio files cancel <operation-id> --yes\n  corvio files open <id>\n\nUse --content only when source facts are needed. It returns one bounded AI-safe projection with hash, completeness, and truncation receipts; it does not rewrite or materialize the original. Upload alone preserves the exact original, provenance, hash, policy, and stable Asset ID. Organization is a separate asynchronous value step: one coherent source set can produce reader-facing structure, source reconciliation, Memory candidates, and qualifying Project Skills. Pass --instruction a weak natural goal plus explicit user constraints and only authority facts needed to prevent wrong identity or scope. Keep source-derived facts in the source; do not precompute an outline, edit checklist, taxonomy, titles, artifact count, or sole leaf target from current visibility. A heterogeneous source may update several real Projects while its provenance carrier stays a standalone document; do not direct Corvio to make the source Page an umbrella Project. For a newly finalized Asset that should enter a Work Model or Skill evaluation, use one organize operation as the sole semantic owner; do not open ask before or after it for the same Asset set. --target-root-node-id is optional and accepts only a Project node_id returned by projects list, never a Page/document UUID or leaf node; omit it when the Project is not known. Use --wait-until-terminal when a filesystem-capable Host should keep deterministic polling inside this one foreground CLI invocation; --timeout-seconds is a local wait deadline, and reaching it returns the latest non-terminal receipt rather than claiming completion. Without that flag, 'files operation' remains an immediate read. Inspect terminal output_document plus skills_evaluation; evaluated_no_qualifying_skill is valid. Resume reuses the same durable operation after resolving its blocker; cancel is idempotent.`,
   sync: `Usage:\n  corvio sync init --root-node-id <id> [--dir <path>] [--name <name>]\n  corvio sync status|plan|pull [--dir <path>]\n  corvio sync push --yes [--dir <path>]\n  corvio sync resolve --conflict-id <id> --strategy use-remote|keep-local --yes [--dir <path>]`,
   update: `Usage: corvio update check [--json]\n\nCompare this executable with the reviewed API policy and the npm beta dist-tag.`,
 });
@@ -1295,18 +1312,31 @@ async function ask(options, positionals) {
     throw error;
   }
   const conversationId = String(result?.conversation_id || result?.data?.conversation_id || "").trim();
+  let localContinuity = null;
   if (conversationId && execution.selection?.workspaceId) {
-    await storeConversationRoutingReceipt({
-      conversationId,
-      workspaceId: execution.selection.workspaceId,
-      agentId: execution.credential?.metadata?.agent_id || null,
-      apiBase: baseUrl(options),
-    });
+    try {
+      await storeConversationRoutingReceipt({
+        conversationId,
+        workspaceId: execution.selection.workspaceId,
+        agentId: execution.credential?.metadata?.agent_id || null,
+        apiBase: baseUrl(options),
+      });
+    } catch (error) {
+      if (!isReadOnlyLocalStateError(error)) throw error;
+      localContinuity = {
+        status: "not_persisted",
+        reason: "local_config_read_only",
+        error_code: String(error.code || "").toUpperCase(),
+        conversation_id: conversationId,
+        workspace_id: execution.selection.workspaceId,
+      };
+    }
   }
   writeResult(
     {
       ...result,
       ...(attachedAssets.length > 0 ? { attached_assets: attachedAssets } : {}),
+      ...(localContinuity ? { local_continuity: localContinuity } : {}),
       routing: execution.routing,
     },
     { json: options.json },
@@ -3456,7 +3486,77 @@ async function uploadWorkspaceFile(api, inputPath, mimeTypeOverride) {
   return result;
 }
 
+function fileOperationWaitTimeoutSeconds(options) {
+  if (!options["wait-until-terminal"]) {
+    if (options["timeout-seconds"] !== undefined) {
+      throw new CliError("--timeout-seconds requires --wait-until-terminal.", {
+        code: "file_operation_wait_required",
+      });
+    }
+    return null;
+  }
+  return numberOption(
+    options,
+    "timeout-seconds",
+    DEFAULT_FILE_OPERATION_WAIT_TIMEOUT_SECONDS,
+    { minimum: 1, maximum: MAX_FILE_OPERATION_WAIT_TIMEOUT_SECONDS },
+  );
+}
+
+function fileOperationIsPending(result) {
+  return FILE_OPERATION_PENDING_STATUSES.has(String(result?.status || "").trim().toLowerCase());
+}
+
+function fileOperationDeadlineReceipt(result, { timeoutSeconds, startedAtMs, operationReadCount }) {
+  return {
+    ...result,
+    transport_wait: {
+      status: "deadline_reached",
+      terminal: false,
+      timeout_seconds: timeoutSeconds,
+      elapsed_seconds: Math.max(0, Math.round((Date.now() - startedAtMs) / 1000)),
+      operation_read_count: operationReadCount,
+      continuation: "Run the same files operation command with --wait-until-terminal; do not start a replacement operation.",
+    },
+  };
+}
+
+async function waitForFileOperation(api, operationId, { initialResult = null, timeoutSeconds }) {
+  const startedAtMs = Date.now();
+  const deadlineAtMs = startedAtMs + timeoutSeconds * 1000;
+  let result = initialResult;
+  let operationReadCount = 0;
+  while (true) {
+    if (!result) {
+      result = await api.request(`/file-operations/${resourcePath(operationId)}`);
+      operationReadCount += 1;
+    }
+    if (!fileOperationIsPending(result)) return result;
+
+    const remainingMs = deadlineAtMs - Date.now();
+    if (remainingMs <= 0) {
+      return fileOperationDeadlineReceipt(result, {
+        timeoutSeconds,
+        startedAtMs,
+        operationReadCount,
+      });
+    }
+    const retryAfterSeconds = Number(result.retry_after_seconds);
+    const requestedDelayMs = Number.isFinite(retryAfterSeconds) && retryAfterSeconds >= 0
+      ? retryAfterSeconds * 1000
+      : 5_000;
+    await sleep(Math.min(remainingMs, Math.max(50, Math.min(30_000, requestedDelayMs))));
+    result = null;
+  }
+}
+
 async function files(options, action, id) {
+  const waitTimeoutSeconds = fileOperationWaitTimeoutSeconds(options);
+  if (action === "upload" && waitTimeoutSeconds !== null && !options.organize) {
+    throw new CliError("--wait-until-terminal requires --organize for files upload.", {
+      code: "file_operation_wait_requires_organize",
+    });
+  }
   const { api } = await executionClient(options);
   const assetId = id || options.id;
   let result;
@@ -3492,27 +3592,50 @@ async function files(options, action, id) {
         headers: options["caller-model"] ? { "x-corvio-caller-model": String(options["caller-model"]) } : {},
         body: fileOrganizationBody(options),
       });
-      result = { file: result, organization };
+      result = {
+        file: result,
+        organization: waitTimeoutSeconds === null
+          ? organization
+          : await waitForFileOperation(api, organization.operation_id, {
+            initialResult: organization,
+            timeoutSeconds: waitTimeoutSeconds,
+          }),
+      };
     }
   } else if (action === "organize") {
     requireConfirmation(options, "Starting a file organization run");
-    result = await api.request(`/files/${resourcePath(assetId || option(options, "id", { required: true }))}:organize`, {
+    const organization = await api.request(`/files/${resourcePath(assetId || option(options, "id", { required: true }))}:organize`, {
       method: "POST",
       headers: options["caller-model"] ? { "x-corvio-caller-model": String(options["caller-model"]) } : {},
       body: fileOrganizationBody(options),
     });
+    result = waitTimeoutSeconds === null
+      ? organization
+      : await waitForFileOperation(api, organization.operation_id, {
+        initialResult: organization,
+        timeoutSeconds: waitTimeoutSeconds,
+      });
   } else if (action === "operation") {
-    result = await api.request(`/file-operations/${resourcePath(assetId || option(options, "id", { required: true }))}`);
+    const operationId = assetId || option(options, "id", { required: true });
+    result = waitTimeoutSeconds === null
+      ? await api.request(`/file-operations/${resourcePath(operationId)}`)
+      : await waitForFileOperation(api, operationId, { timeoutSeconds: waitTimeoutSeconds });
   } else if (action === "resume" || action === "cancel") {
     const operationId = assetId || option(options, "id", { required: true });
     requireConfirmation(
       options,
       `${action === "resume" ? "Resuming" : "Cancelling"} this file organization operation`,
     );
-    result = await api.request(`/file-operations/${resourcePath(operationId)}:${action}`, {
+    const operation = await api.request(`/file-operations/${resourcePath(operationId)}:${action}`, {
       method: "POST",
       retrySafe: true,
     });
+    result = action === "resume" && waitTimeoutSeconds !== null
+      ? await waitForFileOperation(api, operationId, {
+        initialResult: operation,
+        timeoutSeconds: waitTimeoutSeconds,
+      })
+      : operation;
   } else if (action === "open") {
     const targetId = assetId || option(options, "id", { required: true });
     const target = `${String(process.env.CORVIO_APP_BASE || DEFAULT_APP_BASE).replace(/\/+$/, "")}/app/a/${resourcePath(targetId)}`;

package/dist/core.js

@@ -102,6 +102,7 @@ export function parseArgv(argv) {
     "recover-credential",
     "no-listen",
     "start-new-chain",
+    "wait-until-terminal",
     "help",
     "version",
   ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corvio/cli",
-  "version": "0.1.0-beta.35",
+  "version": "0.1.0-beta.37",
   "description": "Official Corvio Workspace CLI for questions, knowledge search, documents, and Agent workflows.",
   "type": "module",
   "bin": {