@odla-ai/cli 0.15.0 → 0.16.1

package/README.md

@@ -29,8 +29,8 @@ For a project you keep working in, install it as a dev dependency so the
 shorter `npx odla-ai` form works and the version is pinned by your lockfile:
 
 ```bash
-npm view @odla-ai/cli@0.15.0 version
-npm i -D --save-exact @odla-ai/cli@0.15.0
+npm view @odla-ai/cli@0.16.1 version
+npm i -D --save-exact @odla-ai/cli@0.16.1
 ```
 
 ## Prerequisites

package/dist/bin.cjs

@@ -2540,7 +2540,7 @@ async function stageWorkspacePair(baselineSource, workspaceSource, options = {})
   }
 }
 
-// ../harness/dist/chunk-QEW6NNAO.js
+// ../harness/dist/chunk-5E2R3LHE.js
 var import_crypto = require("crypto");
 var import_promises5 = require("fs/promises");
 var import_path5 = require("path");
@@ -2877,7 +2877,7 @@ function validateSnapshot(snapshot, limits) {
   }
 }
 
-// ../harness/dist/chunk-QEW6NNAO.js
+// ../harness/dist/chunk-5E2R3LHE.js
 var import_child_process4 = require("child_process");
 var import_promises6 = require("fs/promises");
 var import_path6 = require("path");
@@ -3170,7 +3170,7 @@ function looksLikeDestination(value) {
   return /^(?:[a-z][a-z0-9+.-]*:\/\/|\/|\\\\)/i.test(text) || /^[\w.-]+\.[a-z]{2,}(?:[/:]|$)/i.test(text);
 }
 
-// ../harness/dist/chunk-QEW6NNAO.js
+// ../harness/dist/chunk-5E2R3LHE.js
 var import_crypto4 = require("crypto");
 async function digestStagedWorkspace(root, limits) {
   const files = [];
@@ -3285,9 +3285,13 @@ function createCodeRuntimeControlClient(options) {
   if (!Number.isSafeInteger(requestTimeoutMs) || requestTimeoutMs < 1e3 || requestTimeoutMs > 12e4) {
     throw new TypeError("requestTimeoutMs must be an integer from 1000 to 120000");
   }
+  const modelRequestTimeoutMs = options.modelRequestTimeoutMs ?? 15 * 6e4;
+  if (!Number.isSafeInteger(modelRequestTimeoutMs) || modelRequestTimeoutMs < 3e4 || modelRequestTimeoutMs > 30 * 6e4) {
+    throw new TypeError("modelRequestTimeoutMs must be an integer from 30000 to 1800000");
+  }
   const request = options.fetch ?? fetch;
-  const call = async (path, body) => {
-    const timeout = AbortSignal.timeout(requestTimeoutMs);
+  const call = async (path, body, timeoutMs = requestTimeoutMs) => {
+    const timeout = AbortSignal.timeout(timeoutMs);
     const signal = options.signal ? AbortSignal.any([options.signal, timeout]) : timeout;
     let response2;
     try {
@@ -3326,14 +3330,18 @@ function createCodeRuntimeControlClient(options) {
       await call(`/registry/code/runtime/sessions/${validSessionId(sessionId)}/source`, {})
     ),
     infer: async (sessionId, inference) => {
-      const value = record3(await call(`/registry/code/runtime/sessions/${validSessionId(sessionId)}/inference`, inference));
+      const value = record3(await call(
+        `/registry/code/runtime/sessions/${validSessionId(sessionId)}/inference`,
+        inference,
+        modelRequestTimeoutMs
+      ));
       if (!value || value.requestId !== inference.requestId || !record3(value.response) || !record3(value.receipt)) {
         throw new CodeRuntimeControlError("invalid Code inference response", 502, "invalid_response");
       }
       return value;
     },
     review: async (sessionId, review) => parseReview(
-      await call(`/registry/code/runtime/sessions/${validSessionId(sessionId)}/review`, review)
+      await call(`/registry/code/runtime/sessions/${validSessionId(sessionId)}/review`, review, modelRequestTimeoutMs)
     ),
     submitCandidate: async (sessionId, checkpointId, verification) => {
       if (!/^cpoint_[0-9a-f]{32}$/.test(checkpointId)) throw new TypeError("invalid Code checkpoint id");
@@ -3418,10 +3426,28 @@ async function parseSource(value) {
     if (!file || typeof file.path !== "string" || typeof file.content !== "string") throw invalid("source file");
     return { path: file.path, content: file.content };
   });
+  const referencesValue = snapshot.references === void 0 ? [] : snapshot.references;
+  if (!Array.isArray(referencesValue) || referencesValue.length > 5) throw invalid("reference sources");
+  const aliases = /* @__PURE__ */ new Set();
+  const references = [];
+  for (const item of referencesValue) {
+    const reference = record3(item);
+    if (!reference || typeof reference.alias !== "string" || !/^[a-z][a-z0-9-]{0,39}$/.test(reference.alias) || aliases.has(reference.alias) || reference.alias === "primary" || typeof reference.repository !== "string" || typeof reference.commitSha !== "string" || typeof reference.treeDigest !== "string" || !Array.isArray(reference.files)) throw invalid("reference source");
+    aliases.add(reference.alias);
+    const referenceFiles = reference.files.map((entry) => {
+      const file = record3(entry);
+      if (!file || typeof file.path !== "string" || typeof file.content !== "string") throw invalid("reference source file");
+      return { path: file.path, content: file.content };
+    });
+    const source2 = { repository: reference.repository, commitSha: reference.commitSha, files: referenceFiles };
+    const referenceDigest = await digestCodeRepositorySnapshot(source2, { maximumFiles: 1e4, maximumBytes: 16 * 1024 * 1024 });
+    if (referenceDigest !== reference.treeDigest) throw invalid("reference source digest");
+    references.push({ alias: reference.alias, ...source2, treeDigest: referenceDigest });
+  }
   const source = { repository: snapshot.repository, commitSha: snapshot.commitSha, files };
   const digest = await digestCodeRepositorySnapshot(source, { maximumFiles: 1e4, maximumBytes: 16 * 1024 * 1024 });
   if (digest !== snapshot.treeDigest) throw invalid("source digest");
-  return { ...source, treeDigest: digest };
+  return { ...source, treeDigest: digest, ...references.length ? { references } : {} };
 }
 function parseReview(value) {
   const review = record3(record3(value)?.review);
@@ -3952,7 +3978,7 @@ var CodeRuntimeCheckpointManager = class {
     await this.options.event(command, {
       type: "message",
       actor: "system",
-      body: `Candidate ${candidate.candidateId} is ready for exact owner publication approval`
+      body: command.payload.sourceSet ? `Candidate ${candidate.candidateId} was verified and delivered to the session PR branch` : `Candidate ${candidate.candidateId} is ready for legacy owner publication approval`
     }, pending.refs);
     this.#pending.delete(command.commandId);
     return true;
@@ -3979,12 +4005,51 @@ async function materializeCodeRuntimeSource(snapshot, tempRoot = (0, import_os3.
       await (0, import_promises8.mkdir)((0, import_path8.dirname)(target), { recursive: true });
       await (0, import_promises8.writeFile)(target, file.content, { flag: "wx", mode: 420 });
     }
+    for (const reference of snapshot.references ?? []) {
+      validateAlias(reference.alias);
+      if (!reference.files.length || reference.files.length > 1e4) throw new TypeError("Code reference file count is invalid");
+      for (const file of reference.files) {
+        validatePath(file.path);
+        const path = `.odla-references/${reference.alias}/${file.path}`;
+        if (seen.has(path)) throw new TypeError("Code reference repeats a path");
+        seen.add(path);
+        bytes += Buffer.byteLength(path) + Buffer.byteLength(file.content);
+        if (bytes > 80 * 1024 * 1024) throw new TypeError("Code source set exceeds its byte bound");
+        const target = (0, import_path8.resolve)(sourceDir, path);
+        if (!target.startsWith(`${(0, import_path8.resolve)(sourceDir)}${import_path8.sep}`)) throw new TypeError("Code reference path escapes its root");
+        await (0, import_promises8.mkdir)((0, import_path8.dirname)(target), { recursive: true });
+        await (0, import_promises8.writeFile)(target, file.content, { flag: "wx", mode: 292 });
+      }
+    }
     return { sourceDir, cleanup: () => (0, import_promises8.rm)(root, { recursive: true, force: true }) };
   } catch (cause) {
     await (0, import_promises8.rm)(root, { recursive: true, force: true });
     throw cause;
   }
 }
+function validateAlias(alias) {
+  if (!/^[a-z][a-z0-9-]{0,39}$/.test(alias) || alias === "primary") {
+    throw new TypeError("Code reference alias is invalid");
+  }
+}
+async function attachCodeRuntimeReferences(workspace, references) {
+  let bytes = 0;
+  for (const reference of references) {
+    validateAlias(reference.alias);
+    for (const file of reference.files) {
+      validatePath(file.path);
+      const path = `.odla-references/${reference.alias}/${file.path}`;
+      bytes += Buffer.byteLength(path) + Buffer.byteLength(file.content);
+      if (bytes > 64 * 1024 * 1024) throw new TypeError("Code reference set exceeds its byte bound");
+      for (const root of [workspace.baselineDir, workspace.workspaceDir]) {
+        const target = (0, import_path8.resolve)(root, path);
+        if (!target.startsWith(`${(0, import_path8.resolve)(root)}${import_path8.sep}`)) throw new TypeError("Code reference path escapes its root");
+        await (0, import_promises8.mkdir)((0, import_path8.dirname)(target), { recursive: true });
+        await (0, import_promises8.writeFile)(target, file.content, { flag: "wx", mode: 292 });
+      }
+    }
+  }
+}
 function validatePath(path) {
   const parts = path.split("/");
   if (!path || path.startsWith("/") || path.includes("\\") || path.includes("\0") || parts.some((part) => !part || part === "." || part === ".." || RESERVED2.has(part) || SECRET2.test(part))) {
@@ -4183,6 +4248,9 @@ async function patch(context, request, options, policy) {
   exactKeys(request.input, ["patch"]);
   const value = stringField(request.input, "patch");
   const paths = validateCodePatch(value, options.maxPatchBytes ?? 256 * 1024);
+  if (paths.some((path) => options.readOnlyPrefixes?.some((prefix) => path === prefix || path.startsWith(`${prefix}/`)))) {
+    throw new TypeError("patch targets a read-only reference source");
+  }
   const allowed = await policy.patch(policyContext(context, request, options, { patch: value }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
   await applyCodePatch(context.workspaceDir, value, paths);
@@ -4268,6 +4336,9 @@ function validateOptions(options) {
     throw new TypeError("Code tool broker requires a reader and unique registered recipes");
   }
   for (const recipe2 of options.recipes) assertCodeBuildRecipe(recipe2);
+  if (options.readOnlyPrefixes?.some((prefix) => !/^[A-Za-z0-9_.-]+$/.test(prefix) || prefix === "." || prefix === "..")) {
+    throw new TypeError("Code tool broker read-only prefix is invalid");
+  }
 }
 function exactKeys(input, allowed) {
   if (Object.keys(input).some((key) => !allowed.includes(key))) throw new TypeError("tool input contains an unsupported field");
@@ -4375,7 +4446,8 @@ function createCodeRuntimeToolBroker(input, lease, role) {
     recipes: input.recipes,
     recipeExecutor: createContainerRecipeExecutor(input.engine),
     recipeAuthorization: input.recipeAuthorization ?? "registered_recipe",
-    readerId: `code-session:${lease.task.taskId}`
+    readerId: `code-session:${lease.task.taskId}`,
+    readOnlyPrefixes: [".odla-references"]
   });
   return role === "coding" ? broker : { execute: (context, request) => request.tool === "sandbox.read" ? broker.execute(context, request) : Promise.resolve({ requestId: request.requestId, ok: false, content: "review sessions are read-only" }) };
 }
@@ -4453,6 +4525,14 @@ var CodePiRuntimeEngine = class {
         resume
       });
       ({ workspace, sourceDigest, trustedBaseDigest: localTrustedBaseDigest } = prepared);
+      if (command.payload.sourceSet) {
+        const selected = await this.options.control.source(command.sessionId);
+        if (selected.repository !== metadata2.repository || selected.commitSha !== metadata2.baseCommitSha || selected.treeDigest !== metadata2.sourceTreeDigest) {
+          await workspace.cleanup();
+          throw new TypeError("Code local source does not match the selected GitHub primary source");
+        }
+        await attachCodeRuntimeReferences(workspace, selected.references ?? []);
+      }
     } else {
       const source = await this.options.control.source(command.sessionId);
       const materialized = await materializeCodeRuntimeSource(source);
@@ -4480,8 +4560,8 @@ var CodePiRuntimeEngine = class {
       repository: metadata2.repository,
       sourceTreeDigest: metadata2.sourceTreeDigest,
       trustedBaseDigest: requestedLocal ? localTrustedBaseDigest : await digestStagedWorkspace(workspace.baselineDir, {
-        maxFiles: 1e4,
-        maxBytes: 16 * 1024 * 1024
+        maxFiles: 2e4,
+        maxBytes: 512 * 1024 * 1024
       }),
       planningInputDigest: metadata2.planningInputDigest ?? digestRuntimeValue(
         JSON.stringify({ attestation: metadata2.attestationDigest, prompt: metadata2.prompt, tree: sourceDigest })