@odla-ai/cli 0.42.1 → 0.43.0

package/dist/bin.cjs

@@ -7915,7 +7915,7 @@ var init_code2 = __esm({
   }
 });
 
-// ../harness/dist/chunk-QZXCQSPZ.js
+// ../harness/dist/chunk-GYWQM76X.js
 async function digestStagedWorkspace(root, limits) {
   const files = [];
   const walk = async (directory) => {
@@ -8862,18 +8862,26 @@ async function materializeCommandWorkspace(input) {
 }
 function codeSkill(opts) {
   let seq = 0;
+  let nextCompletion = 1;
+  const completed = /* @__PURE__ */ new Map();
   const call4 = async (tool, input, signal) => {
+    const sequence = ++seq;
     const startedAt = Date.now();
     const response2 = await opts.broker.execute(
       { lease: opts.lease, workspaceDir: opts.workspaceDir, signal },
-      { requestId: `bench-${tool}-${++seq}`, tool, input }
+      { requestId: `bench-${tool}-${sequence}`, tool, input }
     );
-    opts.onToolCall?.({
+    completed.set(sequence, {
       tool,
       ok: response2.ok,
       durationMs: Date.now() - startedAt,
       ...response2.ok ? {} : { error: String(response2.content).slice(0, 300) }
     });
+    while (completed.has(nextCompletion)) {
+      const completion = completed.get(nextCompletion);
+      completed.delete(nextCompletion++);
+      opts.onToolCall?.(completion);
+    }
     return { content: response2.content, isError: !response2.ok };
   };
   const read22 = {
@@ -8889,6 +8897,7 @@ function codeSkill(opts) {
       },
       additionalProperties: false
     },
+    concurrency: "parallel",
     handler: (input, ctx) => call4("sandbox.read", input, ctx.signal)
   };
   const applyPatch = {
@@ -8930,6 +8939,7 @@ function codeSkill(opts) {
       },
       additionalProperties: false
     },
+    concurrency: "parallel",
     handler: (input, ctx) => call4("sandbox.list", input, ctx.signal)
   };
   const searchFiles = {
@@ -8946,11 +8956,13 @@ function codeSkill(opts) {
       },
       additionalProperties: false
     },
+    concurrency: "parallel",
     handler: (input, ctx) => call4("sandbox.search", input, ctx.signal)
   };
   const graphTool = (name, tool, description, required) => ({
     name,
     description,
+    concurrency: "parallel",
     inputSchema: {
       type: "object",
       ...required ? { required: ["query"] } : {},
@@ -9125,6 +9137,24 @@ function createCodeRuntimeInference(options) {
     catalog: {}
   };
 }
+function createWorkspaceFileRegistry(limit = DEFAULT_MAX_FILES, enumerate = registeredFiles) {
+  const cache2 = /* @__PURE__ */ new Map();
+  return {
+    files(root) {
+      const existing = cache2.get(root);
+      if (existing) return existing;
+      const pending = enumerate(root, limit).then((paths) => Object.freeze(paths));
+      cache2.set(root, pending);
+      void pending.catch(() => {
+        if (cache2.get(root) === pending) cache2.delete(root);
+      });
+      return pending;
+    },
+    invalidate(root) {
+      cache2.delete(root);
+    }
+  };
+}
 async function registeredFiles(root, limit = DEFAULT_MAX_FILES) {
   const paths = [];
   const walk = async (directory) => {
@@ -9155,28 +9185,121 @@ function listWorkspace(paths, options = {}) {
   return scoped.slice(0, max);
 }
 async function searchWorkspace(root, paths, options) {
-  const query = options.caseSensitive === false ? options.query.toLowerCase() : options.query;
-  if (!query) throw new TypeError("search query must be a non-empty string");
+  options.signal?.throwIfAborted();
+  if (!options.query) throw new TypeError("search query must be a non-empty string");
   const maxResults = options.maxResults ?? DEFAULT_MAX_RESULTS;
   const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
   const scoped = listWorkspace(paths, { ...options.prefix ? { prefix: options.prefix } : {}, maxEntries: paths.length });
+  if (scoped.length === 0) return [];
+  try {
+    return await nativeSearch(root, scoped, { ...options, maxResults, maxFileBytes });
+  } catch (error) {
+    options.signal?.throwIfAborted();
+    return fallbackSearch(root, scoped, { ...options, maxResults, maxFileBytes });
+  }
+}
+async function nativeSearch(root, paths, options) {
+  const batches = [];
+  let batch = [];
+  let bytes = 0;
+  for (const path of paths) {
+    const size = Buffer.byteLength(path) + 1;
+    if (batch.length > 0 && bytes + size > MAX_NATIVE_ARG_BYTES) {
+      batches.push(batch);
+      batch = [];
+      bytes = 0;
+    }
+    batch.push(path);
+    bytes += size;
+  }
+  if (batch.length > 0) batches.push(batch);
+  const matches = [];
+  for (const files of batches) {
+    const remaining = options.maxResults - matches.length;
+    if (remaining <= 0) break;
+    matches.push(...await nativeSearchBatch(root, files, options, remaining));
+  }
+  return matches;
+}
+function nativeSearchBatch(root, paths, options, remaining) {
+  return new Promise((resolveMatches, reject) => {
+    const args = [
+      "--fixed-strings",
+      "--json",
+      "--no-messages",
+      "--sort=path",
+      `--max-filesize=${options.maxFileBytes}`,
+      "--max-columns=4096",
+      "--max-columns-preview",
+      options.caseSensitive === false ? "--ignore-case" : "--case-sensitive",
+      "--",
+      options.query,
+      ...paths
+    ];
+    const child = (0, import_child_process6.spawn)("rg", args, {
+      cwd: root,
+      stdio: ["ignore", "pipe", "ignore"],
+      ...options.signal ? { signal: options.signal } : {}
+    });
+    const matches = [];
+    let carry = "";
+    let stopped = false;
+    const consume = (line2) => {
+      if (matches.length >= remaining) return;
+      let event;
+      try {
+        event = JSON.parse(line2);
+      } catch {
+        return;
+      }
+      const path = event.data?.path?.text;
+      const lineNumber = event.data?.line_number;
+      const source = event.data?.lines?.text;
+      if (event.type !== "match" || path === void 0 || lineNumber === void 0 || source === void 0) return;
+      matches.push({ path, line: lineNumber, text: source.trim().slice(0, 240) });
+      if (matches.length >= remaining) {
+        stopped = true;
+        child.kill();
+      }
+    };
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      carry += chunk;
+      let newline = carry.indexOf("\n");
+      while (newline >= 0) {
+        consume(carry.slice(0, newline));
+        carry = carry.slice(newline + 1);
+        newline = carry.indexOf("\n");
+      }
+    });
+    child.once("error", reject);
+    child.once("close", (code) => {
+      if (carry) consume(carry);
+      if (stopped || code === 0 || code === 1) resolveMatches(matches);
+      else reject(new Error(`native search exited with status ${code ?? "unknown"}`));
+    });
+  });
+}
+async function fallbackSearch(root, scoped, options) {
+  const query = options.caseSensitive === false ? options.query.toLowerCase() : options.query;
   const matches = [];
   for (const path of scoped) {
-    if (matches.length >= maxResults) break;
+    options.signal?.throwIfAborted();
+    if (matches.length >= options.maxResults) break;
     let source;
     try {
       source = await (0, import_promises9.readFile)((0, import_path9.resolve)(root, path));
     } catch {
       continue;
     }
-    if (source.byteLength > maxFileBytes || source.includes(0)) continue;
+    if (source.byteLength > options.maxFileBytes || source.includes(0)) continue;
     const lines = source.toString("utf8").split("\n");
     for (let index = 0; index < lines.length; index += 1) {
       const raw = lines[index];
       const haystack = options.caseSensitive === false ? raw.toLowerCase() : raw;
       if (!haystack.includes(query)) continue;
       matches.push({ path, line: index + 1, text: raw.trim().slice(0, 240) });
-      if (matches.length >= maxResults) break;
+      if (matches.length >= options.maxResults) break;
     }
   }
   return matches;
@@ -9390,6 +9513,9 @@ function workspaceGraphs(workspaceDir, paths) {
   cache.set(workspaceDir, built);
   return built;
 }
+function forgetWorkspaceGraphs(workspaceDir) {
+  cache.delete(workspaceDir);
+}
 function renderOverview(graphs, prefix) {
   const rows = rollup(graphs.graph, FILE, prefix === void 0 ? {} : { prefix });
   if (rows.length === 0) return prefix ? `No source under "${prefix}".` : "No source files.";
@@ -9427,7 +9553,7 @@ function renderWhoTouches(graphs, query) {
     ].join("\n");
   }).join("\n\n");
 }
-async function read(context, request3, options, policy) {
+async function read(context, request3, options, policy, registry) {
   exactKeys(request3.input, ["path", "startLine", "endLine"]);
   const path = stringField(request3.input, "path");
   const startLine = optionalInteger(request3.input.startLine) ?? 1;
@@ -9435,7 +9561,7 @@ async function read(context, request3, options, policy) {
   if (endLine < startLine || endLine - startLine + 1 > (options.maxReadLines ?? 2e3)) {
     throw new TypeError("requested line range exceeds its bound");
   }
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   if (!paths.includes(path)) {
     throw new TypeError(`no such file in the staged workspace: "${path}". Use sandbox.overview, sandbox.where_is or sandbox.search to find the correct path.`);
   }
@@ -9455,13 +9581,13 @@ async function read(context, request3, options, policy) {
   }
   return response(request3, true, content2, { path, startLine, endLine: Math.min(endLine, lines.length) });
 }
-async function list(context, request3, options, policy) {
+async function list(context, request3, options, policy, registry) {
   exactKeys(request3.input, ["prefix", "maxEntries"]);
   const raw = request3.input.prefix;
   const prefix = typeof raw === "string" && raw.length > 0 ? raw : void 0;
   const maxEntries = optionalInteger(request3.input.maxEntries) ?? 1e3;
   if (maxEntries > 5e3) throw new TypeError("maxEntries exceeds its bound");
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   const allowed = await policy.list(policyContext(context, request3, options, { paths, ...prefix ? { prefix } : {} }));
   if (!allowed) return response(request3, false, "tool denied by CaMeL policy");
   const entries = listWorkspace(paths, { ...prefix ? { prefix } : {}, maxEntries });
@@ -9479,7 +9605,7 @@ async function list(context, request3, options, policy) {
     { count: entries.length, truncated }
   );
 }
-async function search(context, request3, options, policy) {
+async function search(context, request3, options, policy, registry) {
   exactKeys(request3.input, ["query", "prefix", "maxResults", "caseSensitive"]);
   const query = stringField(request3.input, "query");
   if (query.length > 512) throw new TypeError("search query exceeds its bound");
@@ -9488,21 +9614,22 @@ async function search(context, request3, options, policy) {
   const maxResults = optionalInteger(request3.input.maxResults) ?? 100;
   if (maxResults > 500) throw new TypeError("maxResults exceeds its bound");
   const caseSensitive = request3.input.caseSensitive === void 0 ? true : request3.input.caseSensitive === true;
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   const allowed = await policy.search(policyContext(context, request3, options, { paths, query, ...prefix ? { prefix } : {} }));
   if (!allowed) return response(request3, false, "tool denied by CaMeL policy");
   const matches = await searchWorkspace(context.workspaceDir, paths, {
     query,
     maxResults,
     caseSensitive,
-    ...prefix ? { prefix } : {}
+    ...prefix ? { prefix } : {},
+    ...context.signal ? { signal: context.signal } : {}
   });
   if (!matches.length) return response(request3, true, `No match for "${query}".`, { count: 0 });
   return response(request3, true, matches.map((match) => `${match.path}:${match.line}: ${match.text}`).join("\n"), {
     count: matches.length
   });
 }
-async function graphQuery(context, request3, options, policy) {
+async function graphQuery(context, request3, options, policy, registry) {
   exactKeys(request3.input, ["query"]);
   const raw = request3.input.query;
   const query = typeof raw === "string" ? raw : "";
@@ -9512,7 +9639,7 @@ async function graphQuery(context, request3, options, policy) {
     selector: query
   }));
   if (!allowed) return response(request3, false, "tool denied by CaMeL policy");
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   const graphs = await workspaceGraphs(context.workspaceDir, paths);
   if (request3.tool === "sandbox.overview") {
     return response(request3, true, renderOverview(graphs, query || void 0));
@@ -9526,23 +9653,38 @@ function createCodeToolBroker(options) {
   validateOptions(options);
   const recipes = new Map(options.recipes.map((recipe2) => [recipe2.id, recipe2]));
   const policy = createCodePolicyGate(options);
-  let tail = Promise.resolve();
+  const registry = createWorkspaceFileRegistry();
+  let barrier = Promise.resolve();
+  const activeReads = /* @__PURE__ */ new Set();
   return {
     execute(context, request3) {
-      const result = tail.then(() => route2(context, request3, options, recipes, policy));
-      tail = result.then(() => void 0, () => void 0);
+      if (isReadTool(request3.tool)) {
+        const result2 = barrier.then(() => route2(context, request3, options, recipes, policy, registry));
+        const settled = result2.then(() => void 0, () => void 0);
+        activeReads.add(settled);
+        void settled.then(() => {
+          activeReads.delete(settled);
+        });
+        return result2;
+      }
+      const earlierReads = [...activeReads];
+      const result = barrier.then(() => Promise.all(earlierReads)).then(() => route2(context, request3, options, recipes, policy, registry));
+      barrier = result.then(() => void 0, () => void 0);
       return result;
     }
   };
 }
-async function route2(context, request3, options, recipes, policy) {
+function isReadTool(tool) {
+  return tool === "sandbox.read" || tool === "sandbox.list" || tool === "sandbox.search" || GRAPH_TOOLS.has(tool);
+}
+async function route2(context, request3, options, recipes, policy, registry) {
   try {
     if (context.signal?.aborted) throw new TypeError("tool request was cancelled");
-    if (request3.tool === "sandbox.read") return await read(context, request3, options, policy);
-    if (request3.tool === "sandbox.list") return await list(context, request3, options, policy);
-    if (request3.tool === "sandbox.search") return await search(context, request3, options, policy);
-    if (GRAPH_TOOLS.has(request3.tool)) return await graphQuery(context, request3, options, policy);
-    if (request3.tool === "sandbox.apply_patch") return await patch(context, request3, options, policy);
+    if (request3.tool === "sandbox.read") return await read(context, request3, options, policy, registry);
+    if (request3.tool === "sandbox.list") return await list(context, request3, options, policy, registry);
+    if (request3.tool === "sandbox.search") return await search(context, request3, options, policy, registry);
+    if (GRAPH_TOOLS.has(request3.tool)) return await graphQuery(context, request3, options, policy, registry);
+    if (request3.tool === "sandbox.apply_patch") return await patch(context, request3, options, policy, registry);
     return await recipe(context, request3, options, recipes, policy);
   } catch (reason) {
     return response(request3, false, toolFailureMessage(reason));
@@ -9557,7 +9699,7 @@ function toolFailureMessage(reason) {
   if (code === "EACCES" || code === "EPERM") return "that path is not readable through this tool";
   return "tool failed closed";
 }
-async function patch(context, request3, options, policy) {
+async function patch(context, request3, options, policy, registry) {
   exactKeys(request3.input, ["patch"]);
   const value2 = stringField(request3.input, "patch");
   const paths = validateCodePatch(value2, options.maxPatchBytes ?? 256 * 1024);
@@ -9567,6 +9709,8 @@ async function patch(context, request3, options, policy) {
   const allowed = await policy.patch(policyContext(context, request3, options, { patch: value2 }));
   if (!allowed) return response(request3, false, "tool denied by CaMeL policy");
   await applyCodePatch(context.workspaceDir, value2, paths);
+  registry.invalidate(context.workspaceDir);
+  forgetWorkspaceGraphs(context.workspaceDir);
   return response(request3, true, `Applied patch to ${paths.length} file(s).`, { paths });
 }
 async function recipe(context, request3, options, recipes, policy) {
@@ -9917,9 +10061,9 @@ async function appendCodeRuntimeEvent(control, command, event, refs) {
   const bounded = event.type === "message" ? { ...event, body: event.body.trim().slice(0, 2e4) || `${event.actor} event` } : event;
   await control.appendSessionEvent(command.sessionId, eventId, bounded);
 }
-var import_crypto, import_promises5, import_path5, import_child_process4, import_promises6, import_path6, import_child_process5, import_process2, import_crypto2, import_crypto3, import_fs2, import_promises7, import_path7, import_promises8, import_os3, import_path8, import_ai4, import_ai5, import_promises9, import_path9, import_promises10, import_promises11, import_path10, import_crypto4, CODE_RUNTIME_PROTOCOL_VERSION, CodeRuntimeReconciler, CodeRuntimeControlError, record5, invalid, RESERVED, SECRET, PATH, FORBIDDEN, ARTIFACT_PATH, PRIVATE_ARTIFACT_PART, SHA3, DIGEST3, ID3, RULE, DEFAULT_PREFIXES, DEFAULT_SUFFIXES, message, CodeRuntimeCheckpointManager, record22, SOURCE_LIMITS, RESERVED2, SECRET2, SOURCE_MAX_FILES, SOURCE_MAX_BYTES, SOURCE_SET_MAX_BYTES, V1_SYSTEM_PROMPT, V2_SYSTEM_PROMPT, V3_SYSTEM_PROMPT, SYSTEM_PROMPT_FOR, DEFAULT_MAX_FILES, DEFAULT_MAX_RESULTS, DEFAULT_MAX_FILE_BYTES, DESTINATIONS, READ, LIST, SEARCH, GRAPH, PATCH, RECIPE, cache, shortId, GRAPH_TOOLS, MAX_MEMORY_BODY, POSITIVE, digestRuntimeValue, runtimeErrorMessage, TheseusRuntimeEngine;
-var init_chunk_QZXCQSPZ = __esm({
-  "../harness/dist/chunk-QZXCQSPZ.js"() {
+var import_crypto, import_promises5, import_path5, import_child_process4, import_promises6, import_path6, import_child_process5, import_process2, import_crypto2, import_crypto3, import_fs2, import_promises7, import_path7, import_promises8, import_os3, import_path8, import_ai4, import_ai5, import_child_process6, import_promises9, import_path9, import_promises10, import_promises11, import_path10, import_crypto4, CODE_RUNTIME_PROTOCOL_VERSION, CodeRuntimeReconciler, CodeRuntimeControlError, record5, invalid, RESERVED, SECRET, PATH, FORBIDDEN, ARTIFACT_PATH, PRIVATE_ARTIFACT_PART, SHA3, DIGEST3, ID3, RULE, DEFAULT_PREFIXES, DEFAULT_SUFFIXES, message, CodeRuntimeCheckpointManager, record22, SOURCE_LIMITS, RESERVED2, SECRET2, SOURCE_MAX_FILES, SOURCE_MAX_BYTES, SOURCE_SET_MAX_BYTES, V1_SYSTEM_PROMPT, V2_SYSTEM_PROMPT, V3_SYSTEM_PROMPT, SYSTEM_PROMPT_FOR, DEFAULT_MAX_FILES, DEFAULT_MAX_RESULTS, DEFAULT_MAX_FILE_BYTES, MAX_NATIVE_ARG_BYTES, DESTINATIONS, READ, LIST, SEARCH, GRAPH, PATCH, RECIPE, cache, shortId, GRAPH_TOOLS, MAX_MEMORY_BODY, POSITIVE, digestRuntimeValue, runtimeErrorMessage, TheseusRuntimeEngine;
+var init_chunk_GYWQM76X = __esm({
+  "../harness/dist/chunk-GYWQM76X.js"() {
     "use strict";
     init_cjs_shims();
     init_chunk_K76I2TCQ();
@@ -9945,6 +10089,7 @@ var init_chunk_QZXCQSPZ = __esm({
     import_path8 = require("path");
     import_ai4 = require("@odla-ai/ai");
     import_ai5 = require("@odla-ai/ai");
+    import_child_process6 = require("child_process");
     import_promises9 = require("fs/promises");
     import_path9 = require("path");
     init_dist();
@@ -10073,7 +10218,10 @@ Never claim a build or test passed unless odla_run_recipe returned that result.`
     V2_SYSTEM_PROMPT = `You are the coding agent inside an odla Code harness.
 Start by orienting: odla_list shows the files in the workspace and odla_search
 finds a literal string across them. Prefer those over guessing a path.
-Then odla_read a bounded range, and odla_apply_git_diff to mutate.
+Then odla_read a bounded range, and odla_apply_git_diff to mutate. When you
+need several independent searches or file ranges, issue those read-only calls
+together in one turn; their results stay ordered and the harness overlaps them.
+Never issue odla_apply_git_diff or odla_run_recipe alongside another tool call.
 For mutations, call odla_apply_git_diff with raw git diff text. It must start
 with "diff --git a/<path> b/<path>", include matching "---" and "+++" file
 headers and numbered "@@" hunks, and never use "*** Begin Patch" wrappers.
@@ -10105,6 +10253,7 @@ Never claim a build or test passed unless odla_run_recipe returned that result.`
     DEFAULT_MAX_FILES = 2e4;
     DEFAULT_MAX_RESULTS = 100;
     DEFAULT_MAX_FILE_BYTES = 512 * 1024;
+    MAX_NATIVE_ARG_BYTES = 96 * 1024;
     DESTINATIONS = "code-workspaces.v1";
     READ = descriptor("sandbox.read", "scoped_data_read", {
       workspace: "destination",
@@ -10442,7 +10591,7 @@ var init_node = __esm({
   "../harness/dist/node.js"() {
     "use strict";
     init_cjs_shims();
-    init_chunk_QZXCQSPZ();
+    init_chunk_GYWQM76X();
     init_chunk_K76I2TCQ();
     MEASURED_PREMIUM = Object.freeze({
       /** 3 racers vs pure depth at equal budget: 21,044 / 7,936. */
@@ -11500,7 +11649,8 @@ Usage:
   odla-ai pm bug list [--app <id>] [--status <s>] [--severity <s>] [--goal <id>] [--assignee <id>] [--decision <id>] [--q <text>] [--limit <n>] [--offset <n>] [--json]
   odla-ai pm goal add --app <id> --title <t> [--status <s>] [--proof <text>] [--target <pct>] [--mutation-id <id>] [--json]
   odla-ai pm task add --app <id> --title <t> [--column <backlog|ready|doing|review|done>] [--goal <id>|--alignment-decision <id>] [--assignee <id>] [--description <text>|--body <text>] [--acceptance <text>] [--execution <human|agent|either>] [--due <epoch-ms>] [--mutation-id <id>] [--json]
-  odla-ai pm next --app <id> [--project <id>] [--json]
+  odla-ai pm next --app <id> [--project <id>] [--verbose] [--json]
+  odla-ai pm start --app <id> [<task-id>] [--goal <id>] [--verbose] [--mutation-id <id>] [--json]   [claims the top Ready task in one call]
   odla-ai pm watch --app <id> [--cursor <cursor>] [--entity goal|task|decision|bug] [--action created|updated|deleted|comment.created|comment.updated] [--state <state>] [--by <principalId>] [--self <principalId>] [--interval <s>] [--timeout <s>] [--json|--jsonl]
   odla-ai pm task ready <id> --expected-revision <n> [--goal <id>|--alignment-decision <id>] [--description <text>|--body <text>] [--acceptance <text>] [--execution <human|agent|either>] [--mutation-id <id>] [--json]
   odla-ai pm task claim <id> --expected-revision <n> [--mutation-id <id>] [--json]
@@ -11521,7 +11671,7 @@ Usage:
   odla-ai pm <goal|task|decision|bug> comments <id> [--json]
   odla-ai pm <goal|task|decision|bug> history <id> [--limit <n>] [--json]
   odla-ai pm <goal|task|decision|bug> rm <id>
-  odla-ai pm handoff --app <id> [--project <id>] [--json]
+  odla-ai pm handoff --app <id> [--project <id>] [--verbose] [--json]
   odla-ai discuss groups [--json]
   odla-ai discuss list [--app <id>] [--q <text>] [--state open|resolved|all] [--mentions] [--json]
   odla-ai discuss read <topic> [--limit <n> --offset <n>] [--json]
@@ -11688,6 +11838,16 @@ Commands:
                execution contract and a reviewed revision. Any caller with PM
                mutation access to that app/project may do it; claims coordinate
                execution but never own or lock the PM record.
+               To pick up work: "pm next" reads open goals, Ready candidates,
+               and work in progress; "pm start" claims the top Ready task in
+               one call, compare-and-swapped on the revision it just read, and
+               returns the task, its goal, and the acceptance criteria to work
+               against. Finish with "pm task done <id>", or hand it back with
+               "pm task release <id> --expected-revision <n>". "pm start" never
+               marks work Ready: that contract is reviewed separately so an
+               agent cannot authorize its own work.
+               Intake output is projected to the fields an executing caller
+               acts on; --verbose returns whole records with their audit trail.
   bug          Intent-first alias for PM bugs. "bug report" writes to
                odla PM; odla product defects do not belong in GitHub Issues.
   discuss      Group discussions (via @odla-ai/chat) for the apps you co-own:
@@ -12499,7 +12659,8 @@ async function pmRequest(ctx, method, path, body) {
       const message2 = error.message;
       if (typeof message2 === "string" && message2.length > 0) detail = message2;
     }
-    throw new Error(
+    throw new PmRequestError(
+      response2.status,
       `pm ${method} ${path} failed: ${detail ?? `registry returned ${response2.status}`} (${response2.status})`
     );
   }
@@ -12559,7 +12720,7 @@ function emit2(ctx, value2, human) {
   if (ctx.json) ctx.out.log(JSON.stringify(value2, null, 2));
   else human();
 }
-var DONE, writeMutationId2, FIELD_MAP, STUDIO_SECTION;
+var DONE, writeMutationId2, FIELD_MAP, PmRequestError, isRevisionConflict, STUDIO_SECTION;
 var init_pm_action_core = __esm({
   "src/pm-action-core.ts"() {
     "use strict";
@@ -12592,6 +12753,15 @@ var init_pm_action_core = __esm({
       execution: { key: "executionMode" },
       "expected-revision": { key: "expectedRevision", num: true }
     };
+    PmRequestError = class extends Error {
+      constructor(status, message2) {
+        super(message2);
+        this.status = status;
+        this.name = "PmRequestError";
+      }
+      status;
+    };
+    isRevisionConflict = (error) => error instanceof PmRequestError && error.status === 409;
     STUDIO_SECTION = {
       goal: "goals",
       task: "board",
@@ -12723,110 +12893,231 @@ async function pmTaskLifecycle(ctx, id2, action2, parsed) {
     ctx.out.log(`task: ${label} \u2192 ${state2}`);
   });
 }
-async function allRecords(ctx, entity, appId, projectId) {
+async function pmRemove(ctx, entity, id2) {
+  await pmRequest(ctx, "DELETE", `/${entity}/${encodeURIComponent(id2)}`);
+  ctx.out.log(`deleted ${entity} ${id2}`);
+}
+var init_pm_actions = __esm({
+  "src/pm-actions.ts"() {
+    "use strict";
+    init_cjs_shims();
+    init_argv();
+    init_pm_action_core();
+  }
+});
+
+// src/pm-lean.ts
+function leanRecord(entity, record11) {
+  const out = {};
+  for (const key of [...COMMON, ...PER_ENTITY[entity]]) {
+    const value2 = record11[key];
+    if (value2 !== void 0 && value2 !== null) out[key] = value2;
+  }
+  return out;
+}
+function leanRecords(entity, records, verbose) {
+  return verbose ? records : records.map((record11) => leanRecord(entity, record11));
+}
+var COMMON, PER_ENTITY;
+var init_pm_lean = __esm({
+  "src/pm-lean.ts"() {
+    "use strict";
+    init_cjs_shims();
+    COMMON = ["id", "appId", "projectId", "title", "revision"];
+    PER_ENTITY = {
+      goal: ["status", "proof", "targetPct", "currentPct"],
+      task: [
+        "column",
+        "goalId",
+        "alignmentDecisionId",
+        "description",
+        "acceptanceCriteria",
+        "executionMode",
+        "assigneeId",
+        "claimedByPrincipalId",
+        "dueAt"
+      ],
+      decision: ["status", "body", "supersedesId"],
+      bug: ["status", "severity", "description", "goalId", "assigneeId", "decisionId"]
+    };
+  }
+});
+
+// src/pm-intake.ts
+async function listFiltered(ctx, entity, appId, projectId, filters) {
   const records = [];
   for (; ; ) {
-    const q = new URLSearchParams({
-      app: appId,
-      limit: "100",
-      offset: String(records.length)
-    });
+    const q = new URLSearchParams({ app: appId, limit: "100", offset: String(records.length) });
     if (projectId) q.set("project", projectId);
+    for (const [key, value2] of Object.entries(filters)) q.set(key, value2);
     const page2 = await pmRequest(ctx, "GET", `/${entity}?${q}`);
     records.push(...page2.records);
     if (records.length >= page2.total || page2.records.length === 0) return records;
   }
 }
-async function pmNext(ctx, parsed) {
+function requireApp(ctx, parsed, command) {
   const appId = stringOpt(parsed.options.app) ?? ctx.appId;
-  const projectId = stringOpt(parsed.options.project) ?? ctx.projectId;
-  if (!appId) throw new Error("pm next needs --app <appId>");
+  if (!appId) throw new Error(`pm ${command} needs --app <appId>`);
+  return { appId, projectId: stringOpt(parsed.options.project) ?? ctx.projectId };
+}
+async function pmNext(ctx, parsed) {
+  const { appId, projectId } = requireApp(ctx, parsed, "next");
+  const verbose = wantsVerbose(parsed);
   const [goals, tasks] = await Promise.all([
-    allRecords(ctx, "goal", appId, projectId),
-    allRecords(ctx, "task", appId, projectId)
+    listFiltered(ctx, "goal", appId, projectId, { status: UNMET_GOAL_STATUS }),
+    // One request for both live columns; the split below is over open work only.
+    listFiltered(ctx, "task", appId, projectId, { column: `${READY_COLUMN},doing` })
   ]);
+  const ready = tasks.filter((record11) => record11.column === READY_COLUMN);
+  const doing = tasks.filter((record11) => record11.column === "doing");
+  const guidance = !goals.length ? "discuss alignment with the user before creating or claiming project work" : !ready.length ? 'refine a linked Backlog task and mark it Ready with "pm task ready <id>"' : `claim the top Ready task in one call: odla-ai pm start --app ${appId}`;
   const result = {
     appId,
     projectId,
-    openGoals: goals.filter((record11) => record11.status === "open"),
-    doing: tasks.filter((record11) => record11.column === "doing"),
-    ready: tasks.filter((record11) => record11.column === "todo")
+    openGoals: leanRecords("goal", goals, verbose),
+    doing: leanRecords("task", doing, verbose),
+    ready: leanRecords("task", ready, verbose),
+    next: guidance
   };
   emit2(ctx, result, () => {
     ctx.out.log(`${appId}: goal-aligned work intake (read only)`);
-    for (const [label, records] of [
-      ["doing", result.doing],
-      ["ready", result.ready],
-      ["open goals", result.openGoals]
+    for (const [label, entity, records] of [
+      ["doing", "task", doing],
+      ["ready", "task", ready],
+      ["open goals", "goal", goals]
     ]) {
       ctx.out.log(`${label}:`);
       if (!records.length) ctx.out.log("- (none)");
-      else for (const record11 of records) printRecord(
-        ctx,
-        label === "open goals" ? "goal" : "task",
-        record11
-      );
-    }
-    if (!result.openGoals.length) {
-      ctx.out.log("next: discuss alignment with the user before creating or claiming project work");
-    } else if (!result.ready.length) {
-      ctx.out.log("next: refine a linked Backlog task and mark it Ready");
-    } else {
-      ctx.out.log("next: review a Ready task, then claim it with its revision");
+      else for (const record11 of records) printRecord(ctx, entity, record11);
     }
+    ctx.out.log(`next: ${guidance}`);
   });
 }
 async function pmHandoff(ctx, parsed) {
-  const appId = stringOpt(parsed.options.app) ?? ctx.appId;
-  const projectId = stringOpt(parsed.options.project) ?? ctx.projectId;
-  if (!appId) throw new Error("pm handoff needs --app <appId>");
+  const { appId, projectId } = requireApp(ctx, parsed, "handoff");
+  const verbose = wantsVerbose(parsed);
   const [goals, tasks, bugs] = await Promise.all([
-    allRecords(ctx, "goal", appId, projectId),
-    allRecords(ctx, "task", appId, projectId),
-    allRecords(ctx, "bug", appId, projectId)
+    listFiltered(ctx, "goal", appId, projectId, { status: UNMET_GOAL_STATUS }),
+    listFiltered(ctx, "task", appId, projectId, { column: ACTIVE_TASK_COLUMNS }),
+    listFiltered(ctx, "bug", appId, projectId, { status: OPEN_BUG_STATUSES })
   ]);
-  const handoff = {
+  const clean4 = !goals.length && !tasks.length && !bugs.length;
+  const result = {
     appId,
     projectId,
-    unmetGoals: goals.filter((record11) => record11.status !== "met"),
-    activeTasks: tasks.filter((record11) => record11.column !== "done"),
-    openBugs: bugs.filter((record11) => record11.status !== "fixed" && record11.status !== "wontfix")
-  };
-  const result = {
-    ...handoff,
-    clean: !handoff.unmetGoals.length && !handoff.activeTasks.length && !handoff.openBugs.length
+    unmetGoals: leanRecords("goal", goals, verbose),
+    activeTasks: leanRecords("task", tasks, verbose),
+    openBugs: leanRecords("bug", bugs, verbose),
+    clean: clean4
   };
   emit2(ctx, result, () => {
-    if (result.clean) {
+    if (clean4) {
       ctx.out.log(`${appId}: no unresolved PM work`);
       return;
     }
     ctx.out.log(`${appId}: authoritative PM handoff`);
-    for (const [label, records] of [
-      ["unmet goals", result.unmetGoals],
-      ["active tasks", result.activeTasks],
-      ["open bugs", result.openBugs]
+    for (const [label, entity, records] of [
+      ["unmet goals", "goal", goals],
+      ["active tasks", "task", tasks],
+      ["open bugs", "bug", bugs]
     ]) {
       ctx.out.log(`${label}:`);
       if (!records.length) ctx.out.log("- (none)");
-      else for (const record11 of records) printRecord(
-        ctx,
-        label === "unmet goals" ? "goal" : label === "active tasks" ? "task" : "bug",
-        record11
-      );
+      else for (const record11 of records) printRecord(ctx, entity, record11);
     }
   });
 }
-async function pmRemove(ctx, entity, id2) {
-  await pmRequest(ctx, "DELETE", `/${entity}/${encodeURIComponent(id2)}`);
-  ctx.out.log(`deleted ${entity} ${id2}`);
+var READY_COLUMN, UNMET_GOAL_STATUS, ACTIVE_TASK_COLUMNS, OPEN_BUG_STATUSES, wantsVerbose;
+var init_pm_intake = __esm({
+  "src/pm-intake.ts"() {
+    "use strict";
+    init_cjs_shims();
+    init_argv();
+    init_pm_action_core();
+    init_pm_lean();
+    READY_COLUMN = "todo";
+    UNMET_GOAL_STATUS = "open";
+    ACTIVE_TASK_COLUMNS = "backlog,todo,doing,review";
+    OPEN_BUG_STATUSES = "open,triaged";
+    wantsVerbose = (parsed) => parsed.options.verbose === true;
+  }
+});
+
+// src/pm-start.ts
+async function claimAt(ctx, task, parsed) {
+  const res = await pmRequest(
+    ctx,
+    "POST",
+    `/task/${encodeURIComponent(task.id)}/claim`,
+    { expectedRevision: task.revision, mutationId: writeMutationId2(parsed) }
+  );
+  return res.record;
+}
+async function selectTask(ctx, parsed, appId, projectId) {
+  const named = parsed.positionals[2];
+  if (named) return getTask(ctx, named);
+  const goalId = stringOpt(parsed.options.goal);
+  const ready = await listFiltered(ctx, "task", appId, projectId, {
+    column: READY_COLUMN,
+    ...goalId ? { goalId } : {}
+  });
+  const candidate = ready[0];
+  if (!candidate) {
+    throw new Error(
+      `no Ready task to claim in ${appId}${goalId ? ` for goal ${goalId}` : ""}. Run "odla-ai pm next --app ${appId}" to see open goals and Backlog work, then "odla-ai pm task ready <id>" once a task has a complete contract.`
+    );
+  }
+  return candidate;
 }
-var init_pm_actions = __esm({
-  "src/pm-actions.ts"() {
+async function pmStart(ctx, parsed) {
+  const appId = stringOpt(parsed.options.app) ?? ctx.appId;
+  if (!appId) throw new Error("pm start needs --app <appId>");
+  const projectId = stringOpt(parsed.options.project) ?? ctx.projectId;
+  const verbose = wantsVerbose(parsed);
+  const selected = await selectTask(ctx, parsed, appId, projectId);
+  if (selected.column !== READY_COLUMN) {
+    throw new Error(
+      `task ${selected.id} is ${selected.column === "doing" ? "already claimed" : `in ${selected.column}`}, not Ready. Only Ready work can be started; run "odla-ai pm task ready ${selected.id} --expected-revision ${selected.revision}" once its goal, description, and acceptance criteria are complete.`
+    );
+  }
+  let claimed;
+  try {
+    claimed = await claimAt(ctx, selected, parsed);
+  } catch (error) {
+    if (!isRevisionConflict(error)) throw error;
+    const reloaded = await getTask(ctx, selected.id);
+    if (reloaded.column !== READY_COLUMN) {
+      throw new Error(
+        `task ${selected.id} was taken while starting it (now ${reloaded.column}). Run "odla-ai pm start --app ${appId}" again to take the next Ready task.`
+      );
+    }
+    claimed = await claimAt(ctx, reloaded, parsed);
+  }
+  const task = claimed ?? await getTask(ctx, selected.id);
+  const goalId = typeof task.goalId === "string" ? task.goalId : void 0;
+  const goal = goalId ? await pmRequest(ctx, "GET", `/goal/${encodeURIComponent(goalId)}`).then((res) => res.record).catch(() => null) : null;
+  const result = {
+    claimed: verbose ? task : leanRecord("task", task),
+    goal: goal ? verbose ? goal : leanRecord("goal", goal) : null,
+    next: 'work the acceptance criteria, then "odla-ai pm task done <id>" (or "odla-ai pm task release <id> --expected-revision <n>" to hand it back)'
+  };
+  emit2(ctx, result, () => {
+    ctx.out.log(`claimed: ${studioRecordLink(ctx, "task", task)}`);
+    if (goal) ctx.out.log(`goal: ${studioRecordLink(ctx, "goal", goal)}`);
+    if (typeof task.acceptanceCriteria === "string") ctx.out.log(`acceptance: ${task.acceptanceCriteria}`);
+    ctx.out.log(`next: ${result.next}`);
+  });
+}
+var getTask;
+var init_pm_start = __esm({
+  "src/pm-start.ts"() {
     "use strict";
     init_cjs_shims();
     init_argv();
     init_pm_action_core();
+    init_pm_lean();
+    init_pm_intake();
+    getTask = async (ctx, id2) => (await pmRequest(ctx, "GET", `/task/${encodeURIComponent(id2)}`)).record;
   }
 });
 
@@ -13308,9 +13599,13 @@ async function pmCommand(parsed, deps = {}) {
     throw new Error(`unknown pm project action "${action3}". Try list|add|use.`);
   }
   if (word === "next") {
-    assertArgs(parsed, [...COMMON_OPTIONS, "app", "project"], 2);
+    assertArgs(parsed, [...COMMON_OPTIONS, "app", "project", "verbose"], 2);
     return pmNext(await buildContext2(parsed, deps), parsed);
   }
+  if (word === "start") {
+    assertArgs(parsed, [...COMMON_OPTIONS, "app", "project", "goal", "verbose", "mutation-id"], 3);
+    return pmStart(await buildContext2(parsed, deps), parsed);
+  }
   if (word === "watch") {
     assertArgs(parsed, [
       ...COMMON_OPTIONS,
@@ -13328,11 +13623,11 @@ async function pmCommand(parsed, deps = {}) {
     return pmWatch(await buildContext2(parsed, deps), parsed).then(() => void 0);
   }
   if (word === "handoff") {
-    assertArgs(parsed, [...COMMON_OPTIONS, "app", "project"], 2);
+    assertArgs(parsed, [...COMMON_OPTIONS, "app", "project", "verbose"], 2);
     return pmHandoff(await buildContext2(parsed, deps), parsed);
   }
   const entity = ALIASES[word];
-  if (!entity) throw new Error(`unknown pm entity "${word}". Try "odla-ai pm bug list" (goal|task|decision|bug).`);
+  if (!entity) throw new Error(`unknown pm entity "${word}". Try "odla-ai pm start" to claim Ready work, or "odla-ai pm bug list" (goal|task|decision|bug).`);
   const requestedAction = parsed.positionals[2] ?? "list";
   const action2 = canonicalAction(requestedAction);
   if (!action2) throw new Error(`unknown pm action "${requestedAction}". Try list|add|get|set|done|link|ref|comment|comments|history|rm.`);
@@ -13379,6 +13674,8 @@ var init_pm_command = __esm({
     init_argv();
     init_operator_context();
     init_pm_actions();
+    init_pm_intake();
+    init_pm_start();
     init_pm_links();
     init_pm_comments();
     init_pm_history();