@corvio/cli 0.1.0-beta.4 → 0.1.0-beta.6

package/dist/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { lstat, mkdir, readFile, readdir, rename, stat, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -9,6 +10,8 @@ import {
   ApiClient,
   CliError,
   EXIT,
+  assertKnownOptions,
+  assertPositionalCount,
   clearWorkspaceContext,
   clearWorkspaceCredential,
   idempotencyKey,
@@ -18,6 +21,7 @@ import {
   openBrowser,
   option,
   readTextFile,
+  readAgentCredential,
   readWorkspaceContext,
   readWorkspaceCredential,
   requireConfirmation,
@@ -31,22 +35,90 @@ import {
   writeTextFile,
 } from "./core.js";
 
-const VERSION = "0.1.0-beta.4";
+const VERSION = "0.1.0-beta.6";
 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 GLOBAL_OPTIONS = Object.freeze([
+  "api-base",
+  "workspace",
+  "workspace-id",
+  "json",
+  "no-input",
+  "yes",
+  "help",
+  "version",
+]);
+
+const COMMAND_OPTIONS = Object.freeze({
+  "auth:login": ["force"],
+  "auth:status": [],
+  "auth:logout": [],
+  "workspaces:list": [],
+  "workspaces:current": [],
+  "workspaces:use": ["id"],
+  "workspaces:create": ["name", "kind", "description", "idempotency-key"],
+  "capabilities:": [],
+  "ask:": ["prompt", "conversation-id", "sources", "allow-actions", "context-file", "idempotency-key"],
+  "agents:list": ["include-revoked"],
+  "agents:create": ["handle", "display-name", "avatar-url", "provider", "permissions"],
+  "agents:update": ["id", "display-name", "avatar-url", "status", "permissions"],
+  "agents:rotate": ["id"],
+  "agent:claim": ["worker-id", "lease-seconds", "wait-seconds"],
+  "agent:complete": ["id", "lease-token", "result-file", "question-id", "comment-entry-id", "no-change-reason"],
+  "agent:renew": ["id", "lease-token", "lease-seconds"],
+  "agent:fail": ["id", "lease-token", "error", "retryable"],
+  "agent:comments": ["document-id"],
+  "agent:comment": ["document-id", "body", "selection-file", "start-new-chain"],
+  "agent:reply": ["document-id", "id", "body", "source-event-id", "source-event-lease-token", "start-new-chain"],
+  "agent:status": ["document-id", "id", "status"],
+  "agent:run": ["once", "handler", "worker-id", "lease-seconds", "wait-seconds", "sources"],
+  "questions:list": ["limit", "cursor", "conversation-id"],
+  "questions:get": ["id"],
+  "conversations:list": ["limit", "cursor"],
+  "conversations:get": ["id"],
+  "search:": ["query", "limit", "page-id", "node-id"],
+  "docs:list": ["limit", "cursor"],
+  "docs:get": ["id", "output"],
+  "docs:create": ["title", "file", "markdown", "parent-node-id", "idempotency-key"],
+  "docs:update": ["id", "title", "file", "markdown", "expected-revision"],
+  "docs:move": ["id", "parent-node-id", "before-node-id", "after-node-id", "idempotency-key"],
+  "docs:archive": ["id"],
+  "docs:share": ["id", "display-name"],
+  "docs:open": ["id"],
+  "projects:create": ["title", "idempotency-key"],
+  "files:list": ["limit"],
+  "files:get": ["id"],
+  "files:download": ["id", "output"],
+  "files:upload": ["file", "mime-type"],
+  "files:organize": ["id", "instruction", "target-root-node-id"],
+  "files:open": ["id"],
+  "sync:init": ["root-node-id", "dir", "name", "force"],
+  "sync:status": ["dir"],
+  "sync:plan": ["dir"],
+  "sync:pull": ["dir"],
+  "sync:push": ["dir"],
+  "sync:resolve": ["dir", "conflict-id", "strategy"],
+  "update:check": [],
+});
 
 const HELP = `Corvio Workspace CLI ${VERSION}
 
 Usage:
   corvio auth login|status|logout
-  corvio workspaces list|use|current [id]
+  corvio workspaces list|use|current|create [id]
   corvio capabilities
   corvio ask --prompt <text> [--conversation-id <id>] [--allow-actions]
+  corvio agents list|create|update|rotate [id]
+  corvio agent claim|renew|complete|fail|comments|comment|reply|status|run [id]
   corvio questions list|get [id]
   corvio conversations list|get [id]
   corvio search <query>
-  corvio docs list|get|create|update|archive|share|open [id]
+  corvio docs list|get|create|update|move|archive|share|open [id]
+  corvio projects create --title <title>
   corvio files list|get|download|upload|organize|open [id]
   corvio sync init|status|plan|pull|push|resolve
   corvio update check
@@ -57,14 +129,117 @@ Global options:
 Authentication:
   CORVIO_API_KEY=cvu_... takes precedence over the stored device-link login.
   Legacy Workspace-bound cvk_ keys remain supported.
+  Agent runtime commands use CORVIO_AGENT_API_KEY=cvg_... and never borrow the user's credential.
   Select the target with 'corvio workspaces use <id>', --workspace, or CORVIO_WORKSPACE_ID.
   Run 'corvio auth login' when no environment key is configured.
 `;
 
+const COMMAND_HELP = Object.freeze({
+  auth: `Usage: corvio auth login|status|logout\n\nAuthenticate with a user-level device link, inspect the current principal, or revoke the stored credential.`,
+  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.`,
+  ask: `Usage: corvio ask --prompt <text> [--conversation-id <id>] [--sources workspace,web,memory] [--allow-actions] [--context-file <json>] [--idempotency-key <key>]`,
+  agents: `Usage:\n  corvio agents list\n  corvio agents create --handle <handle> --display-name <name> [--provider codex|claude_code|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\nAgent creation and rotation print the cvg_ secret once.`,
+  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 comments --document-id <id>\n  corvio agent comment --document-id <id> --body <text> [--selection-file <json>]\n  corvio agent reply <thread-id> --document-id <id> --body <text>\n  corvio agent status <thread-id> --document-id <id> --status open|resolved\n  corvio agent run --handler <executable> [--once]\n\nThe runner leases durable events and renews its lease while work is active. The handler reads event JSON from stdin and returns {"instruction":"...","reply":"..."}; Corvio Query owns document changes and returns the durable receipt.`,
+  questions: `Usage:\n  corvio questions list [--limit <n>] [--cursor <cursor>] [--conversation-id <id>]\n  corvio questions get <question-id>`,
+  conversations: `Usage:\n  corvio conversations list [--limit <n>] [--cursor <cursor>]\n  corvio conversations get <conversation-id>`,
+  search: `Usage: corvio search <query> [--limit <n>] [--page-id <id>] [--node-id <id>]`,
+  docs: `Usage:\n  corvio docs list [--limit <n>] [--cursor <cursor>]\n  corvio docs get <id> [--output <path>]\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>]\n  corvio docs move <id> --parent-node-id <id>\n  corvio docs archive <id> --yes\n  corvio docs share <id> --yes [--display-name <name>]\n  corvio docs open <id>`,
+  projects: `Usage: corvio projects create --title <title> [--idempotency-key <key>]\n\nProjects are the user-visible folder/container owner in the Corvio Docs tree. 'corvio folders' is an alias.`,
+  files: `Usage:\n  corvio files list [--limit <n>]\n  corvio files get <id>\n  corvio files download <id> [--output <path>]\n  corvio files upload --file <path> [--mime-type <type>]\n  corvio files organize <id> --instruction <text> --yes [--target-root-node-id <id>]\n  corvio files open <id>`,
+  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.`,
+});
+
+function contextualHelp(command, action) {
+  const normalizedCommand = command === "workspace" ? "workspaces" : command === "folders" ? "projects" : command;
+  const commandHelp = COMMAND_HELP[normalizedCommand];
+  if (!commandHelp) return HELP.trimEnd();
+  if (!action) return commandHelp;
+  const matchingLine = commandHelp
+    .split("\n")
+    .find((line) => line.trim().startsWith(`corvio ${normalizedCommand} ${action}`));
+  return matchingLine ? `Usage:\n  ${matchingLine.trim()}\n\n${commandHelp}` : commandHelp;
+}
+
+function normalizeInvocation(command, action) {
+  const normalizedCommand = command === "workspace" ? "workspaces" : command === "folders" ? "projects" : command;
+  const defaultActions = {
+    workspaces: "list",
+    questions: "list",
+    conversations: "list",
+    docs: "list",
+    projects: "create",
+    files: "list",
+    agents: "list",
+    agent: "claim",
+    sync: "status",
+    update: "check",
+  };
+  return {
+    command: normalizedCommand,
+    action: ["ask", "search", "capabilities"].includes(normalizedCommand)
+      ? ""
+      : action || defaultActions[normalizedCommand] || "",
+  };
+}
+
+function validateInvocation(options, positionals) {
+  const [rawCommand, rawAction] = positionals;
+  if (!rawCommand || rawCommand === "help" || rawCommand === "version" || options.help || options.version) return;
+  const { command, action } = normalizeInvocation(rawCommand, rawAction);
+  const schema = COMMAND_OPTIONS[`${command}:${action}`];
+  if (!schema) throw new CliError(`Unknown command: ${positionals.join(" ")}`, { code: "unknown_command" });
+  assertKnownOptions(options, [...GLOBAL_OPTIONS, ...schema]);
+  if (command !== "ask" && command !== "search") {
+    const actionsWithId = new Set([
+      "workspaces:use",
+      "questions:get",
+      "conversations:get",
+      "docs:get",
+      "docs:update",
+      "docs:move",
+      "docs:archive",
+      "docs:share",
+      "docs:open",
+      "files:get",
+      "files:download",
+      "files:organize",
+      "files:open",
+      "agents:update",
+      "agents:rotate",
+      "agent:complete",
+      "agent:renew",
+      "agent:fail",
+      "agent:reply",
+      "agent:status",
+    ]);
+    assertPositionalCount(positionals, actionsWithId.has(`${command}:${action}`) ? 3 : command === "capabilities" ? 1 : 2);
+  }
+}
+
+function rejectTogether(options, left, right) {
+  if (options[left] !== undefined && options[right] !== undefined) {
+    throw new CliError(`Options --${left} and --${right} cannot be used together.`, {
+      code: "mutually_exclusive_options",
+    });
+  }
+}
+
 function baseUrl(options) {
   return normalizeApiBase(options["api-base"] || process.env.CORVIO_API_BASE, DEFAULT_API_BASE);
 }
 
+function resourcePath(value) {
+  return encodeURIComponent(String(value));
+}
+
+function safeRemoteFileName(value, fallback) {
+  const normalized = String(value || "").replaceAll("\\", "/");
+  const name = basename(normalized).trim();
+  return name && name !== "." && name !== ".." ? name : fallback;
+}
+
 async function resolveWorkspaceSelection(options, credential) {
   const explicit = String(options.workspace || options["workspace-id"] || "").trim();
   if (explicit) return { workspaceId: explicit, workspaceName: null, source: "option" };
@@ -110,6 +285,30 @@ async function client(options, { auth = true, workspace = "required" } = {}) {
   };
 }
 
+function agentClient(options) {
+  const credential = readAgentCredential();
+  return new ApiClient({
+    baseUrl: baseUrl(options),
+    credential: credential.key,
+    userAgent: USER_AGENT,
+  });
+}
+
+async function readJsonObject(path, label) {
+  let value;
+  try {
+    value = JSON.parse(await readFile(resolve(String(path)), "utf8"));
+  } catch (error) {
+    throw new CliError(`${label} must be a readable JSON file: ${error instanceof Error ? error.message : String(error)}`, {
+      code: "invalid_json_file",
+    });
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new CliError(`${label} must contain one JSON object.`, { code: "invalid_json_file" });
+  }
+  return value;
+}
+
 async function authLogin(options) {
   const current = await readWorkspaceCredential();
   if (current?.source === "environment" && !options.force) {
@@ -136,6 +335,7 @@ async function authLogin(options) {
         "assets:write",
         "sync:read",
         "sync:write",
+        "workspaces:write",
       ],
     },
   });
@@ -296,13 +496,40 @@ async function workspaces(options, action, id) {
     await storeWorkspaceContext({ workspaceId: identity.workspace.id, workspaceName: identity.workspace.name });
     return writeResult({ selected: true, workspace: identity.workspace }, { json: options.json });
   }
-  throw new CliError("workspaces action must be list, use, or current.");
+  if (action === "create") {
+    if (!credential.key.startsWith("cvu_")) {
+      throw new CliError("Creating a Workspace requires a user-level cvu_ credential.", {
+        code: "user_api_key_required",
+        exitCode: EXIT.AUTH,
+      });
+    }
+    const api = new ApiClient({ baseUrl: baseUrl(options), credential: credential.key, userAgent: USER_AGENT });
+    const kind = String(options.kind || "personal");
+    if (!new Set(["personal", "team"]).has(kind)) {
+      throw new CliError("--kind must be personal or team.", { code: "workspace_kind_invalid" });
+    }
+    const result = await api.request("/workspaces", {
+      method: "POST",
+      headers: { "idempotency-key": idempotencyKey(options) },
+      body: {
+        name: option(options, "name", { required: true }),
+        kind,
+        description: options.description || null,
+      },
+    });
+    await storeWorkspaceContext({ workspaceId: result.id, workspaceName: result.name });
+    return writeResult({ created: true, selected: true, workspace: result }, { json: options.json });
+  }
+  throw new CliError("workspaces action must be list, use, current, or create.");
 }
 
 async function ask(options, positionals) {
   const prompt = String(options.prompt || positionals.join(" ")).trim();
   if (!prompt) throw new CliError("Provide --prompt <text> or a positional prompt.");
   const { api } = await client(options);
+  const context = options["context-file"]
+    ? await readJsonObject(options["context-file"], "--context-file")
+    : null;
   const result = await api.request("/questions", {
     method: "POST",
     headers: { "idempotency-key": idempotencyKey(options) },
@@ -311,14 +538,334 @@ async function ask(options, positionals) {
       conversation_id: options["conversation-id"] || null,
       mode: options["allow-actions"] ? "allow_actions" : "answer_only",
       sources: listOption(options, "sources", ["workspace", "web", "memory"]),
+      context,
+    },
+    timeoutMs: 330_000,
+  });
+  writeResult(result, { json: options.json });
+}
+
+async function agents(options, action, id) {
+  const { api } = await client(options);
+  let result;
+  if (action === "list") {
+    result = await api.request("/agents", { query: { include_revoked: options["include-revoked"] || undefined } });
+  } else if (action === "create") {
+    result = await api.request("/agents", {
+      method: "POST",
+      body: {
+        handle: option(options, "handle", { required: true }),
+        display_name: option(options, "display-name", { required: true }),
+        avatar_url: options["avatar-url"] || null,
+        provider: options.provider || "custom",
+        permissions: listOption(options, "permissions", ["read", "comment"]),
+      },
+    });
+  } else if (action === "update") {
+    const agentId = id || option(options, "id", { required: true });
+    const body = {};
+    if (options["display-name"] !== undefined) body.display_name = options["display-name"];
+    if (options["avatar-url"] !== undefined) body.avatar_url = options["avatar-url"];
+    if (options.status !== undefined) body.status = options.status;
+    if (options.permissions !== undefined) body.permissions = listOption(options, "permissions");
+    if (Object.keys(body).length === 0) throw new CliError("Provide an Agent field to update.", { code: "agent_update_required" });
+    result = await api.request(`/agents/${resourcePath(agentId)}`, { method: "PATCH", body });
+  } else if (action === "rotate") {
+    const agentId = id || option(options, "id", { required: true });
+    result = await api.request(`/agents/${resourcePath(agentId)}/credentials:rotate`, { method: "POST" });
+  } else {
+    throw new CliError("agents action must be list, create, update, or rotate.");
+  }
+  writeResult(result, { json: options.json });
+}
+
+async function claimAgentEvent(api, options, waitFallback = 0) {
+  return api.request("/agent-events:claim", {
+    method: "POST",
+    body: {
+      worker_id: options["worker-id"] || `corvio-cli-${process.pid}`,
+      lease_seconds: numberOption(options, "lease-seconds", 300, { minimum: 30, maximum: 900 }),
+      wait_seconds: numberOption(options, "wait-seconds", waitFallback, { minimum: 0, maximum: 30 }),
     },
+    timeoutMs: 45_000,
   });
+}
+
+function runAgentHandler(executable, event) {
+  return new Promise((resolvePromise, rejectPromise) => {
+    const handlerEvent = { ...event, delivery: { ...(event?.delivery || {}) } };
+    delete handlerEvent.delivery.lease_token;
+    const handlerEnv = { ...process.env, CORVIO_AGENT_EVENT_ID: String(event.id || "") };
+    delete handlerEnv.CORVIO_API_KEY;
+    const child = spawn(String(executable), [], {
+      shell: false,
+      stdio: ["pipe", "pipe", "pipe"],
+      env: handlerEnv,
+    });
+    let stdout = "";
+    let stderr = "";
+    const maximumBytes = 1024 * 1024;
+    child.stdout.setEncoding("utf8");
+    child.stderr.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk;
+      if (Buffer.byteLength(stdout) > maximumBytes) child.kill("SIGTERM");
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr = `${stderr}${chunk}`.slice(-20_000);
+    });
+    child.on("error", (error) => rejectPromise(new CliError(`Agent handler could not start: ${error.message}`, { code: "agent_handler_failed" })));
+    child.on("close", (code) => {
+      if (code !== 0) {
+        rejectPromise(new CliError(`Agent handler exited with ${code}: ${stderr.trim() || "no error output"}`, { code: "agent_handler_failed" }));
+        return;
+      }
+      let decision;
+      try {
+        decision = JSON.parse(stdout.trim());
+      } catch {
+        rejectPromise(new CliError("Agent handler must print one JSON object.", { code: "agent_handler_result_invalid" }));
+        return;
+      }
+      const instruction = String(decision?.instruction || "").trim();
+      if (!instruction) {
+        rejectPromise(new CliError("Agent handler result requires a non-empty instruction.", { code: "agent_handler_result_invalid" }));
+        return;
+      }
+      resolvePromise({ instruction, reply: String(decision?.reply || "").trim() || null });
+    });
+    child.stdin.end(`${JSON.stringify(handlerEvent)}\n`);
+  });
+}
+
+async function startAgentLeaseHeartbeat(api, event, leaseToken, leaseSeconds) {
+  let stopped = false;
+  let timer = null;
+  let inFlight = null;
+  let failure = null;
+  const intervalMs = Math.max(10_000, Math.min(60_000, Math.floor(leaseSeconds * 1_000 / 3)));
+  const renew = async () => {
+    if (stopped || failure) return;
+    try {
+      await api.request(`/agent-events/${resourcePath(event.id)}:renew`, {
+        method: "POST",
+        body: { lease_token: leaseToken, lease_seconds: leaseSeconds },
+      });
+    } catch (error) {
+      failure = error;
+      return;
+    }
+    if (!stopped) timer = setTimeout(() => { inFlight = renew(); }, intervalMs);
+  };
+  inFlight = renew();
+  await inFlight;
+  if (failure) throw failure;
+  return {
+    async stop() {
+      stopped = true;
+      if (timer) clearTimeout(timer);
+      if (inFlight) await inFlight;
+    },
+    assertHealthy() {
+      if (failure) throw failure;
+    },
+  };
+}
+
+async function processClaimedAgentEvent(api, event, options) {
+  const leaseToken = String(event?.delivery?.lease_token || "");
+  if (!event?.id || !leaseToken) throw new CliError("Claimed event is missing its lease receipt.", { code: "agent_event_invalid" });
+  const leaseSeconds = numberOption(options, "lease-seconds", 300, { minimum: 30, maximum: 900 });
+  let heartbeat = null;
+  try {
+    heartbeat = await startAgentLeaseHeartbeat(api, event, leaseToken, leaseSeconds);
+    const decision = await runAgentHandler(option(options, "handler", { required: true }), event);
+    const question = await api.request("/questions", {
+      method: "POST",
+      headers: { "idempotency-key": `agent-event:${event.id}:query` },
+      body: {
+        prompt: decision.instruction,
+        mode: "allow_actions",
+        sources: listOption(options, "sources", ["workspace", "web", "memory"]),
+        context: {
+          agent_event: {
+            id: event.id,
+            kind: event.kind,
+            object_kind: event.object_kind,
+            object_id: event.object_id,
+            actor_user_id: event.actor_user_id,
+            actor_agent_id: event.actor_agent_id,
+            lineage: event.lineage,
+          },
+          collaboration: event.context,
+        },
+      },
+      timeoutMs: 330_000,
+    });
+    if (String(question.status || "") !== "completed") {
+      throw new CliError(`Corvio Query did not complete durably (status: ${question.status || "unknown"}).`, {
+        code: "agent_query_not_completed",
+      });
+    }
+    const documentId = String(event?.context?.document?.document_id || "");
+    const threadId = String(event?.context?.comment?.thread_id || "");
+    let commentEntryId = null;
+    if (documentId && threadId) {
+      const reply = String(decision.reply || question.answer || "Completed the requested review.").trim().slice(0, 12_000);
+      const thread = await api.request(`/documents/${resourcePath(documentId)}/comments/${resourcePath(threadId)}/replies`, {
+        method: "POST",
+        body: {
+          body: reply,
+          entry_point: "external_agent_runner",
+          source_event_id: event.id,
+          source_event_lease_token: leaseToken,
+        },
+      });
+      const entries = Array.isArray(thread?.entries) ? thread.entries : [];
+      commentEntryId = entries.at(-1)?.id || null;
+    }
+    await heartbeat.stop();
+    heartbeat.assertHealthy();
+    const completed = await api.request(`/agent-events/${resourcePath(event.id)}:complete`, {
+      method: "POST",
+      body: {
+        lease_token: leaseToken,
+        result: {
+          question_id: question.id,
+          ...(commentEntryId ? { comment_entry_id: commentEntryId } : {}),
+          status: question.status,
+          artifact_ids: Array.isArray(question.artifacts) ? question.artifacts.map((item) => item.document_id).filter(Boolean) : [],
+        },
+      },
+    });
+    return { event: completed, question, comment_entry_id: commentEntryId };
+  } catch (error) {
+    if (heartbeat) {
+      try {
+        await heartbeat.stop();
+      } catch {
+        // The original execution error remains the failure authority.
+      }
+    }
+    try {
+      await api.request(`/agent-events/${resourcePath(event.id)}:fail`, {
+        method: "POST",
+        body: { lease_token: leaseToken, error: error instanceof Error ? error.message : String(error), retryable: true },
+      });
+    } catch {
+      // Preserve the original execution failure; the expired lease remains reclaimable.
+    }
+    throw error;
+  }
+}
+
+async function runAgent(options) {
+  const api = agentClient(options);
+  while (true) {
+    const claimed = await claimAgentEvent(api, options, options.once ? 0 : 30);
+    if (!claimed.event) {
+      if (options.once) return writeResult({ processed: false, reason: "no_event", retry_after_seconds: claimed.retry_after_seconds }, { json: options.json });
+      continue;
+    }
+    const receipt = await processClaimedAgentEvent(api, claimed.event, options);
+    if (options.once) return writeResult({ processed: true, ...receipt }, { json: options.json });
+    process.stdout.write(`${JSON.stringify({ processed: true, ...receipt })}\n`);
+  }
+}
+
+async function agentCommand(options, action, id) {
+  if (action === "run") return runAgent(options);
+  const api = agentClient(options);
+  let result;
+  if (action === "claim") {
+    result = await claimAgentEvent(api, options);
+  } else if (action === "renew") {
+    const eventId = id || option(options, "id", { required: true });
+    result = await api.request(`/agent-events/${resourcePath(eventId)}:renew`, {
+      method: "POST",
+      body: {
+        lease_token: option(options, "lease-token", { required: true }),
+        lease_seconds: numberOption(options, "lease-seconds", 300, { minimum: 30, maximum: 900 }),
+      },
+    });
+  } else if (action === "complete") {
+    const eventId = id || option(options, "id", { required: true });
+    const receipt = options["result-file"]
+      ? await readJsonObject(options["result-file"], "--result-file")
+      : {
+          ...(options["question-id"] ? { question_id: options["question-id"] } : {}),
+          ...(options["comment-entry-id"] ? { comment_entry_id: options["comment-entry-id"] } : {}),
+          ...(options["no-change-reason"] ? { no_change_reason: options["no-change-reason"] } : {}),
+        };
+    if (Object.keys(receipt).length === 0) throw new CliError("Provide a durable completion receipt.", { code: "agent_event_receipt_required" });
+    result = await api.request(`/agent-events/${resourcePath(eventId)}:complete`, {
+      method: "POST",
+      body: { lease_token: option(options, "lease-token", { required: true }), result: receipt },
+    });
+  } else if (action === "fail") {
+    const eventId = id || option(options, "id", { required: true });
+    result = await api.request(`/agent-events/${resourcePath(eventId)}:fail`, {
+      method: "POST",
+      body: {
+        lease_token: option(options, "lease-token", { required: true }),
+        error: option(options, "error", { required: true }),
+        retryable: String(options.retryable ?? "true").toLowerCase() !== "false",
+      },
+    });
+  } else if (action === "comments") {
+    result = await api.request(`/documents/${resourcePath(option(options, "document-id", { required: true }))}/comments`);
+  } else if (action === "comment") {
+    const selection = options["selection-file"]
+      ? await readJsonObject(options["selection-file"], "--selection-file")
+      : { target_scope: "document" };
+    result = await api.request(`/documents/${resourcePath(option(options, "document-id", { required: true }))}/comments`, {
+      method: "POST",
+      body: {
+        body: option(options, "body", { required: true }),
+        selection,
+        entry_point: "external_agent_cli",
+        start_new_chain: Boolean(options["start-new-chain"]),
+      },
+    });
+  } else if (action === "reply") {
+    const threadId = id || option(options, "id", { required: true });
+    const hasSourceEventId = Boolean(options["source-event-id"]);
+    const hasSourceEventLease = Boolean(options["source-event-lease-token"]);
+    if (hasSourceEventId !== hasSourceEventLease) {
+      throw new CliError("Provide --source-event-id and --source-event-lease-token together.", {
+        code: "agent_reply_source_incomplete",
+      });
+    }
+    if (hasSourceEventId && options["start-new-chain"]) {
+      throw new CliError("A source event reply cannot also start a new chain.", {
+        code: "agent_reply_source_conflict",
+      });
+    }
+    result = await api.request(`/documents/${resourcePath(option(options, "document-id", { required: true }))}/comments/${resourcePath(threadId)}/replies`, {
+      method: "POST",
+      body: {
+        body: option(options, "body", { required: true }),
+        entry_point: "external_agent_cli_reply",
+        ...(options["source-event-id"] ? { source_event_id: options["source-event-id"] } : {}),
+        ...(options["source-event-lease-token"] ? { source_event_lease_token: options["source-event-lease-token"] } : {}),
+        start_new_chain: Boolean(options["start-new-chain"]),
+      },
+    });
+  } else if (action === "status") {
+    const threadId = id || option(options, "id", { required: true });
+    result = await api.request(`/documents/${resourcePath(option(options, "document-id", { required: true }))}/comments/${resourcePath(threadId)}/status`, {
+      method: "POST",
+      body: { status: option(options, "status", { required: true }), entry_point: "external_agent_cli_status" },
+    });
+  } else {
+    throw new CliError("Unknown agent runtime action.");
+  }
   writeResult(result, { json: options.json });
 }
 
 function pageQuery(options) {
   return {
-    limit: numberOption(options, "limit", 20),
+    limit: numberOption(options, "limit", 20, { maximum: 100 }),
     cursor: options.cursor,
     conversation_id: options["conversation-id"],
   };
@@ -328,7 +875,7 @@ async function questions(options, action, id) {
   const { api } = await client(options);
   const result = action === "list"
     ? await api.request("/questions", { query: pageQuery(options) })
-    : await api.request(`/questions/${id || option(options, "id", { required: true })}`);
+    : await api.request(`/questions/${resourcePath(id || option(options, "id", { required: true }))}`);
   writeResult(result, { json: options.json });
 }
 
@@ -336,7 +883,7 @@ async function conversations(options, action, id) {
   const { api } = await client(options);
   const result = action === "list"
     ? await api.request("/conversations", { query: pageQuery(options) })
-    : await api.request(`/conversations/${id || option(options, "id", { required: true })}`);
+    : await api.request(`/conversations/${resourcePath(id || option(options, "id", { required: true }))}`);
   writeResult(result, { json: options.json });
 }
 
@@ -346,9 +893,10 @@ async function search(options, positionals) {
   const { api } = await client(options);
   const result = await api.request("/search", {
     method: "POST",
+    retrySafe: true,
     body: {
       query,
-      limit: numberOption(options, "limit", 10),
+      limit: numberOption(options, "limit", 10, { maximum: 50 }),
       page_id: options["page-id"] || null,
       node_id: options["node-id"] || null,
     },
@@ -363,12 +911,13 @@ async function docs(options, action, id) {
   if (action === "list") {
     result = await api.request("/documents", { query: pageQuery(options) });
   } else if (action === "get") {
-    result = await api.request(`/documents/${documentId || option(options, "id", { required: true })}`);
+    result = await api.request(`/documents/${resourcePath(documentId || option(options, "id", { required: true }))}`);
     if (options.output) {
       await writeTextFile(options.output, String(result.markdown || ""));
       result = { ...result, output: options.output };
     }
   } else if (action === "create") {
+    rejectTogether(options, "file", "markdown");
     const markdown = options.file ? await readTextFile(options.file) : String(options.markdown || "");
     result = await api.request("/documents", {
       method: "POST",
@@ -381,36 +930,81 @@ async function docs(options, action, id) {
       },
     });
   } else if (action === "update") {
+    rejectTogether(options, "file", "markdown");
     const markdown = options.file ? await readTextFile(options.file) : options.markdown;
-    result = await api.request(`/documents/${documentId || option(options, "id", { required: true })}`, {
+    if (options.title === undefined && markdown === undefined) {
+      throw new CliError("Document update requires --title, --file, or --markdown.", {
+        code: "document_update_empty",
+      });
+    }
+    const targetId = documentId || option(options, "id", { required: true });
+    let expectedRevision;
+    if (options["expected-revision"] !== undefined) {
+      expectedRevision = numberOption(options, "expected-revision", undefined, { minimum: 0 });
+    } else {
+      const current = await api.request(`/documents/${resourcePath(targetId)}`);
+      if (!Number.isSafeInteger(current?.content_revision) || current.content_revision < 0) {
+        throw new CliError("Corvio did not return a valid document content revision.", {
+          code: "document_revision_missing",
+          exitCode: EXIT.REMOTE,
+        });
+      }
+      expectedRevision = current.content_revision;
+    }
+    result = await api.request(`/documents/${resourcePath(targetId)}`, {
       method: "PUT",
       body: {
-        ...(options.title ? { title: options.title } : {}),
+        ...(options.title !== undefined ? { title: options.title } : {}),
         ...(markdown !== undefined ? { markdown } : {}),
-        ...(options["expected-revision"] !== undefined
-          ? { expected_content_revision: Number.parseInt(options["expected-revision"], 10) }
-          : {}),
+        expected_content_revision: expectedRevision,
+      },
+    });
+  } else if (action === "move") {
+    rejectTogether(options, "before-node-id", "after-node-id");
+    const current = await api.request(`/documents/${resourcePath(documentId || option(options, "id", { required: true }))}`);
+    result = await api.request(`/nodes/${resourcePath(current.node_id)}:move`, {
+      method: "POST",
+      headers: { "idempotency-key": idempotencyKey(options) },
+      body: {
+        parent_node_id: option(options, "parent-node-id", { required: true }),
+        before_node_id: options["before-node-id"] || null,
+        after_node_id: options["after-node-id"] || null,
       },
     });
   } else if (action === "archive") {
     requireConfirmation(options, "Archiving a document");
-    result = await api.request(`/documents/${documentId || option(options, "id", { required: true })}`, { method: "DELETE" });
+    result = await api.request(`/documents/${resourcePath(documentId || option(options, "id", { required: true }))}`, { method: "DELETE" });
   } else if (action === "share") {
     requireConfirmation(options, "Creating a document share link");
-    result = await api.request(`/documents/${documentId || option(options, "id", { required: true })}/shares`, {
+    result = await api.request(`/documents/${resourcePath(documentId || option(options, "id", { required: true }))}/shares`, {
       method: "POST",
+      retrySafe: true,
       body: { public_display_name: options["display-name"] || null },
     });
   } else if (action === "open") {
-    const target = `${String(process.env.CORVIO_APP_BASE || DEFAULT_APP_BASE).replace(/\/+$/, "")}/app/d/${documentId || option(options, "id", { required: true })}`;
+    const targetId = documentId || option(options, "id", { required: true });
+    const target = `${String(process.env.CORVIO_APP_BASE || DEFAULT_APP_BASE).replace(/\/+$/, "")}/app/d/${resourcePath(targetId)}`;
     const opened = options["no-input"] ? false : await openBrowser(target);
-    result = { document_id: documentId, url: target, opened };
+    result = { document_id: targetId, url: target, opened };
   } else {
-    throw new CliError("docs action must be list, get, create, update, archive, share, or open.");
+    throw new CliError("docs action must be list, get, create, update, move, archive, share, or open.");
   }
   writeResult(result, { json: options.json });
 }
 
+async function projects(options, action) {
+  if (action !== "create") {
+    throw new CliError("projects action must be create.");
+  }
+  const { api } = await client(options);
+  const result = await api.request("/projects", {
+    method: "POST",
+    headers: { "idempotency-key": idempotencyKey(options) },
+    body: { title: option(options, "title", { required: true }) },
+  });
+  writeResult(result, { json: options.json });
+}
+
 async function buildUpdateStatus(index, { allowRegistryFailure = false } = {}) {
   return resolveNpmUpdateStatus({
     currentVersion: VERSION,
@@ -511,30 +1105,50 @@ async function files(options, action, id) {
   const assetId = id || options.id;
   let result;
   if (action === "list") {
-    result = await api.request("/files", { query: { limit: numberOption(options, "limit", 50) } });
+    result = await api.request("/files", { query: { limit: numberOption(options, "limit", 50, { maximum: 100 }) } });
   } else if (action === "get") {
-    result = await api.request(`/files/${assetId || option(options, "id", { required: true })}`);
+    result = await api.request(`/files/${resourcePath(assetId || option(options, "id", { required: true }))}`);
   } else if (action === "download") {
     const targetId = assetId || option(options, "id", { required: true });
-    const metadata = await api.request(`/files/${targetId}`);
-    const bytes = await api.requestBytes(`/files/${targetId}/content`);
-    const output = options.output || metadata.original_file_name || `${targetId}.bin`;
+    const metadata = await api.request(`/files/${resourcePath(targetId)}`);
+    const bytes = await api.requestBytes(`/files/${resourcePath(targetId)}/content`);
+    if (metadata.content_sha256 && sha256(bytes) !== metadata.content_sha256) {
+      throw new CliError("Downloaded file content did not match Corvio's SHA-256 receipt.", {
+        code: "download_integrity_mismatch",
+        exitCode: EXIT.REMOTE,
+      });
+    }
+    const output = options.output || safeRemoteFileName(metadata.original_file_name, `${targetId}.bin`);
     const written = await writeBinaryFile(output, bytes);
     result = { ...metadata, output: written };
   } else if (action === "upload") {
     const input = resolve(String(option(options, "file", { required: true })));
     const info = await stat(input);
     if (!info.isFile()) throw new CliError("--file must point to a regular file.", { code: "upload_file_invalid" });
+    if (info.size < 1 || info.size > MAX_UPLOAD_BYTES) {
+      throw new CliError(`--file must be between 1 byte and ${MAX_UPLOAD_BYTES} bytes.`, {
+        code: "upload_file_size_invalid",
+      });
+    }
     const bytes = await readFile(input);
+    if (bytes.length < 1 || bytes.length > MAX_UPLOAD_BYTES) {
+      throw new CliError(`--file must be between 1 byte and ${MAX_UPLOAD_BYTES} bytes.`, {
+        code: "upload_file_size_invalid",
+      });
+    }
     const fileName = basename(input);
     const mimeType = String(options["mime-type"] || mimeTypeFor(input));
     const initialized = await api.request("/files/uploads", {
       method: "POST",
       body: { file_name: fileName, mime_type: mimeType, size_bytes: bytes.length },
     });
-    await api.putUrl(initialized.upload_url, bytes, { headers: initialized.upload_headers || {} });
+    await api.putUrl(initialized.upload_url, bytes, {
+      headers: initialized.upload_headers || {},
+      timeoutMs: 5 * 60_000,
+    });
     result = await api.request("/files/uploads:finalize", {
       method: "POST",
+      retrySafe: true,
       body: {
         upload_id: initialized.upload_id,
         blob_name: initialized.blob_name,
@@ -543,9 +1157,15 @@ async function files(options, action, id) {
         size_bytes: bytes.length,
       },
     });
+    if (result.content_sha256 && result.content_sha256 !== sha256(bytes)) {
+      throw new CliError("Uploaded file content did not match Corvio's SHA-256 receipt.", {
+        code: "upload_integrity_mismatch",
+        exitCode: EXIT.REMOTE,
+      });
+    }
   } else if (action === "organize") {
     requireConfirmation(options, "Starting a file organization run");
-    result = await api.request(`/files/${assetId || option(options, "id", { required: true })}:organize`, {
+    result = await api.request(`/files/${resourcePath(assetId || option(options, "id", { required: true }))}:organize`, {
       method: "POST",
       body: {
         instruction: option(options, "instruction", { required: true }),
@@ -554,7 +1174,7 @@ async function files(options, action, id) {
     });
   } 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/${targetId}`;
+    const target = `${String(process.env.CORVIO_APP_BASE || DEFAULT_APP_BASE).replace(/\/+$/, "")}/app/a/${resourcePath(targetId)}`;
     result = { file_id: targetId, url: target, opened: options["no-input"] ? false : await openBrowser(target) };
   } else {
     throw new CliError("files action must be list, get, download, upload, organize, or open.");
@@ -609,6 +1229,9 @@ async function writeSyncState(root, state) {
 }
 
 function localSyncPath(root, relativePath) {
+  if (String(relativePath).includes("\0")) {
+    throw new CliError("Unsafe sync path returned by Corvio.", { code: "sync_path_unsafe" });
+  }
   const parts = String(relativePath).replaceAll("\\", "/").split("/").filter(Boolean);
   if (parts[0] !== "corvio_docs" || parts.some((part) => part === "." || part === "..")) {
     throw new CliError(`Unsafe sync path returned by Corvio: ${relativePath}`, { code: "sync_path_unsafe" });
@@ -620,9 +1243,56 @@ function localSyncPath(root, relativePath) {
   return target;
 }
 
+async function assertNoSyncSymlink(root, target) {
+  const rootInfo = await lstat(root);
+  if (rootInfo.isSymbolicLink()) {
+    throw new CliError(`Sync root must not be a symbolic link: ${root}`, {
+      code: "sync_symlink_unsafe",
+    });
+  }
+  const relativeTarget = relative(root, target);
+  if (relativeTarget === "" || relativeTarget.startsWith(`..${sep}`) || relativeTarget === "..") {
+    throw new CliError(`Unsafe local sync target: ${target}`, { code: "sync_path_unsafe" });
+  }
+  let current = root;
+  for (const part of relativeTarget.split(sep).filter(Boolean)) {
+    current = join(current, part);
+    try {
+      const info = await lstat(current);
+      if (info.isSymbolicLink()) {
+        throw new CliError(`Sync path crosses a symbolic link: ${current}`, {
+          code: "sync_symlink_unsafe",
+        });
+      }
+    } catch (error) {
+      if (error?.code === "ENOENT") return;
+      throw error;
+    }
+  }
+}
+
+function verifiedRemoteMarkdown(item) {
+  const markdown = String(item?.markdown || "");
+  if (markdown.length > MAX_MARKDOWN_CHARACTERS) {
+    throw new CliError("Remote Markdown exceeds the supported sync size.", {
+      code: "sync_markdown_too_large",
+      exitCode: EXIT.REMOTE,
+    });
+  }
+  const contentHash = sha256(Buffer.from(markdown, "utf8"));
+  if (contentHash !== item?.content_sha256) {
+    throw new CliError("Remote Markdown did not match Corvio's SHA-256 receipt.", {
+      code: "sync_integrity_mismatch",
+      exitCode: EXIT.REMOTE,
+    });
+  }
+  return { markdown, contentHash };
+}
+
 async function scanMarkdown(root) {
   const mirror = join(root, "corvio_docs");
   await mkdir(mirror, { recursive: true });
+  await assertNoSyncSymlink(root, mirror);
   const manifest = [];
   async function walk(directory) {
     for (const entry of await readdir(directory, { withFileTypes: true })) {
@@ -639,6 +1309,11 @@ async function scanMarkdown(root) {
           size_bytes: bytes.length,
           mtime_ms: Math.trunc(info.mtimeMs),
         });
+        if (manifest.length > MAX_SYNC_FILES) {
+          throw new CliError(`Sync supports at most ${MAX_SYNC_FILES} Markdown files per source.`, {
+            code: "sync_file_limit_exceeded",
+          });
+        }
       }
     }
   }
@@ -682,6 +1357,7 @@ async function syncManifest(root, state) {
 async function syncPlan(api, state, root) {
   return api.request("/sync/plan", {
     method: "POST",
+    retrySafe: true,
     body: { source_id: state.source_id, local: await syncManifest(root, state) },
   });
 }
@@ -735,7 +1411,7 @@ async function syncCommand(options, action) {
     );
   }
   if (action === "status") {
-    const remote = await api.request(`/sync/sources/${state.source_id}`);
+    const remote = await api.request(`/sync/sources/${resourcePath(state.source_id)}`);
     return writeResult({ ...remote, directory: root, state_file: syncStatePath(root) }, { json: options.json });
   }
   if (action === "plan") {
@@ -757,9 +1433,12 @@ async function syncCommand(options, action) {
       const item = actionItem.remote;
       if (!item) continue;
       const target = localSyncPath(root, item.relative_path);
+      await assertNoSyncSymlink(root, target);
+      const verified = verifiedRemoteMarkdown(item);
       const previous = mappings[item.page_id];
       if (previous?.relative_path && previous.relative_path !== item.relative_path) {
         const oldTarget = localSyncPath(root, previous.relative_path);
+        await assertNoSyncSymlink(root, oldTarget);
         try {
           const oldBytes = await readFile(oldTarget);
           if (sha256(oldBytes) === previous.content_sha256) await unlink(oldTarget);
@@ -767,13 +1446,13 @@ async function syncCommand(options, action) {
           if (cause?.code !== "ENOENT") throw cause;
         }
       }
-      await writeTextFile(target, item.markdown || "");
+      await writeTextFile(target, verified.markdown);
       const info = await stat(target);
       committed.push({
         page_id: item.page_id,
         node_id: item.node_id,
         relative_path: item.relative_path,
-        content_sha256: item.content_sha256,
+        content_sha256: verified.contentHash,
         mtime_ms: Math.trunc(info.mtimeMs),
       });
       mappings[item.page_id] = {
@@ -813,7 +1492,14 @@ async function syncCommand(options, action) {
     const mappings = { ...(state.mappings || {}) };
     for (const actionItem of plan.actions.filter((item) => item.action === "push")) {
       const path = localSyncPath(root, actionItem.relative_path);
+      await assertNoSyncSymlink(root, path);
       const bytes = await readFile(path);
+      const markdown = bytes.toString("utf8");
+      if (markdown.length > MAX_MARKDOWN_CHARACTERS) {
+        throw new CliError(`Markdown exceeds ${MAX_MARKDOWN_CHARACTERS} characters: ${actionItem.relative_path}`, {
+          code: "sync_markdown_too_large",
+        });
+      }
       const info = await stat(path);
       const previous = actionItem.page_id ? mappings[actionItem.page_id] : null;
       const result = await api.request("/sync/push", {
@@ -821,7 +1507,7 @@ async function syncCommand(options, action) {
         body: {
           source_id: state.source_id,
           relative_path: actionItem.relative_path,
-          markdown: bytes.toString("utf8"),
+          markdown,
           content_sha256: sha256(bytes),
           mtime_ms: Math.trunc(info.mtimeMs),
           page_id: actionItem.page_id || null,
@@ -835,6 +1521,9 @@ async function syncCommand(options, action) {
         content_sha256: result.item.content_sha256,
         content_revision: result.item.content_revision,
       };
+      state.mappings = mappings;
+      state.last_push_at = new Date().toISOString();
+      await writeSyncState(root, state);
     }
     state.mappings = mappings;
     state.last_push_at = new Date().toISOString();
@@ -849,12 +1538,14 @@ async function syncCommand(options, action) {
     requireConfirmation(options, "Resolving a sync conflict");
     const conflictId = option(options, "conflict-id", { required: true });
     const strategy = option(options, "strategy", { required: true });
-    const conflict = await api.request(`/sync/conflicts/${conflictId}`);
+    const conflict = await api.request(`/sync/conflicts/${resourcePath(conflictId)}`);
     if (strategy === "use-remote") {
       if (!conflict.remote) throw new CliError("The remote document is no longer available.", { code: "sync_remote_missing" });
       const item = conflict.remote;
       const target = localSyncPath(root, item.relative_path);
-      await writeTextFile(target, item.markdown || "");
+      await assertNoSyncSymlink(root, target);
+      const verified = verifiedRemoteMarkdown(item);
+      await writeTextFile(target, verified.markdown);
       const info = await stat(target);
       await api.request("/sync/commit", {
         method: "POST",
@@ -864,12 +1555,12 @@ async function syncCommand(options, action) {
             page_id: item.page_id,
             node_id: item.node_id,
             relative_path: item.relative_path,
-            content_sha256: item.content_sha256,
+            content_sha256: verified.contentHash,
             mtime_ms: Math.trunc(info.mtimeMs),
           }],
         },
       });
-      const result = await api.request(`/sync/conflicts/${conflictId}:resolve`, {
+      const result = await api.request(`/sync/conflicts/${resourcePath(conflictId)}:resolve`, {
         method: "POST",
         body: { strategy: "use_remote" },
       });
@@ -884,14 +1575,21 @@ async function syncCommand(options, action) {
     }
     if (strategy === "keep-local") {
       const target = localSyncPath(root, conflict.relative_path);
+      await assertNoSyncSymlink(root, target);
       const bytes = await readFile(target);
+      const markdown = bytes.toString("utf8");
+      if (markdown.length > MAX_MARKDOWN_CHARACTERS) {
+        throw new CliError(`Markdown exceeds ${MAX_MARKDOWN_CHARACTERS} characters: ${conflict.relative_path}`, {
+          code: "sync_markdown_too_large",
+        });
+      }
       const info = await stat(target);
       const result = await api.request("/sync/push", {
         method: "POST",
         body: {
           source_id: state.source_id,
           relative_path: conflict.relative_path,
-          markdown: bytes.toString("utf8"),
+          markdown,
           content_sha256: sha256(bytes),
           mtime_ms: Math.trunc(info.mtimeMs),
           page_id: conflict.remote?.page_id || null,
@@ -915,7 +1613,12 @@ async function syncCommand(options, action) {
 async function main({ options, positionals }) {
   const [command, action, id, ...rest] = positionals;
   if (options.version || command === "version") return writeResult(VERSION, { json: options.json });
-  if (options.help || !command || command === "help") return writeResult(HELP.trimEnd(), { json: false });
+  if (options.help || !command || command === "help") {
+    const helpCommand = command === "help" ? action : command;
+    const helpAction = command === "help" ? id : action;
+    return writeResult(contextualHelp(helpCommand, helpAction), { json: false });
+  }
+  validateInvocation(options, positionals);
   if (command !== "update") await maybeNotifyUpdate(options);
   if (command === "auth") {
     if (action === "login") return authLogin(options);
@@ -928,10 +1631,13 @@ async function main({ options, positionals }) {
   }
   if (command === "capabilities") return capabilities(options);
   if (command === "ask") return ask(options, [action, id, ...rest].filter(Boolean));
+  if (command === "agents") return agents(options, action || "list", id);
+  if (command === "agent") return agentCommand(options, action || "claim", id);
   if (command === "questions") return questions(options, action || "list", id);
   if (command === "conversations") return conversations(options, action || "list", id);
   if (command === "search") return search(options, [action, id, ...rest].filter(Boolean));
   if (command === "docs") return docs(options, action || "list", id);
+  if (command === "projects" || command === "folders") return projects(options, action || "create");
   if (command === "files") return files(options, action || "list", id);
   if (command === "sync") return syncCommand(options, action || "status");
   if (command === "update" && (action || "check") === "check") return updateCheck(options);