@cat-factory/executor-harness 1.70.0 → 1.74.0

package/dist/job.js

@@ -309,8 +309,12 @@ export function parsePackageRegistries(value, env = process.env) {
         if (!allowed.has(host)) {
             throw new Error(`Invalid job: 'packageRegistries[${i}].host' '${host}' is not an allowed npm registry host`);
         }
-        if (!Array.isArray(entry.scopes) || entry.scopes.length === 0) {
-            throw new Error(`Invalid job: 'packageRegistries[${i}].scopes' must be a non-empty array`);
+        // An EMPTY scope list is valid and deliberate: the entry then only authenticates its
+        // host, leaving every package to resolve from the default registry unless a dependency
+        // pins this one itself. Mapping a scope is all-or-nothing, so a workspace mixing private
+        // and public packages under one scope must be able to skip it.
+        if (!Array.isArray(entry.scopes)) {
+            throw new Error(`Invalid job: 'packageRegistries[${i}].scopes' must be an array`);
         }
         const scopes = entry.scopes.map((scope, j) => {
             const s = str(scope, `packageRegistries[${i}].scopes[${j}]`).trim();
@@ -703,6 +707,8 @@ function assembleAgentJob(o, mode, agentField, parts) {
  */
 function collectOptionalRequestFields(o) {
     return {
+        ...(typeof o.workspaceId === 'string' && o.workspaceId ? { workspaceId: o.workspaceId } : {}),
+        ...(typeof o.executionId === 'string' && o.executionId ? { executionId: o.executionId } : {}),
         ...(typeof o.githubApiBase === 'string' ? { githubApiBase: o.githubApiBase } : {}),
         ...(typeof o.webToolsGuidance === 'string' ? { webToolsGuidance: o.webToolsGuidance } : {}),
         ...(o.webSearch === true ? { webSearch: true } : {}),

package/dist/server.js

@@ -65,6 +65,11 @@ describe) {
 // image carries no runtime deps.
 const KINDS = {
     agent: defineKind(parseAgentJob, handleAgent, (job) => ({
+        // The backend's correlation ids first, so EVERY line this job emits joins to the run in the
+        // backend's own logs. Absent on a body from a backend older than the field — the rest of the
+        // description is unaffected.
+        ...(job.workspaceId ? { workspaceId: job.workspaceId } : {}),
+        ...(job.executionId ? { executionId: job.executionId } : {}),
         mode: job.mode,
         repo: `${job.repo.owner}/${job.repo.name}`,
         branch: job.branch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cat-factory/executor-harness",
-  "version": "1.70.0",
+  "version": "1.74.0",
   "description": "Container payload: a thin TypeScript wrapper that runs the Pi coding agent against a cloned repo and opens a PR. Runs in the Cloudflare Container (and, in local native mode, as a host process); carries no secrets.",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "hono": "^4.12.32",
     "typescript": "7.0.2",
     "vitest": "^4.1.10",
-    "@cat-factory/kernel": "0.179.0",
-    "@cat-factory/server": "0.167.0",
-    "@cat-factory/spend": "0.12.108"
+    "@cat-factory/kernel": "0.185.1",
+    "@cat-factory/server": "0.172.2",
+    "@cat-factory/spend": "0.12.115"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/src/job.ts

@@ -420,7 +420,7 @@ export interface PackageRegistrySpec {
   ecosystem: 'npm'
   /** Registry host, e.g. `registry.npmjs.org` — allowlisted, never a full URL. */
   host: string
-  /** npm scopes (`@org`) routed to this registry. */
+  /** npm scopes (`@org`) routed to this registry; EMPTY ⇒ authenticate the host only. */
   scopes: string[]
   token: string
 }
@@ -468,8 +468,12 @@ export function parsePackageRegistries(
         `Invalid job: 'packageRegistries[${i}].host' '${host}' is not an allowed npm registry host`,
       )
     }
-    if (!Array.isArray(entry.scopes) || entry.scopes.length === 0) {
-      throw new Error(`Invalid job: 'packageRegistries[${i}].scopes' must be a non-empty array`)
+    // An EMPTY scope list is valid and deliberate: the entry then only authenticates its
+    // host, leaving every package to resolve from the default registry unless a dependency
+    // pins this one itself. Mapping a scope is all-or-nothing, so a workspace mixing private
+    // and public packages under one scope must be able to skip it.
+    if (!Array.isArray(entry.scopes)) {
+      throw new Error(`Invalid job: 'packageRegistries[${i}].scopes' must be an array`)
     }
     const scopes = entry.scopes.map((scope, j) => {
       const s = str(scope, `packageRegistries[${i}].scopes[${j}]`).trim()
@@ -703,6 +707,17 @@ export interface ValidationSpec {
 
 export interface AgentJob extends HarnessAuthFields {
   jobId: string
+  /**
+   * The backend run this job belongs to, bound onto the per-job logger beside `jobId` and used
+   * for NOTHING else. The container is the far side of the platform's longest seam: the backend
+   * knows a run as `executionId` and the harness knew it only as `jobId`, so a container log line
+   * could not be joined to the run that dispatched it except through the
+   * `${executionId}-${agentKind}` job-id naming convention. Optional because a body predating the
+   * field (or a hand-rolled acceptance fixture) must still run — an absent id costs correlation,
+   * never the job.
+   */
+  workspaceId?: string
+  executionId?: string
   mode: AgentMode
   systemPrompt: string
   userPrompt: string
@@ -1435,6 +1450,8 @@ function assembleAgentJob(
  */
 function collectOptionalRequestFields(o: Record<string, unknown>): Partial<AgentJob> {
   return {
+    ...(typeof o.workspaceId === 'string' && o.workspaceId ? { workspaceId: o.workspaceId } : {}),
+    ...(typeof o.executionId === 'string' && o.executionId ? { executionId: o.executionId } : {}),
     ...(typeof o.githubApiBase === 'string' ? { githubApiBase: o.githubApiBase } : {}),
     ...(typeof o.webToolsGuidance === 'string' ? { webToolsGuidance: o.webToolsGuidance } : {}),
     ...(o.webSearch === true ? { webSearch: true } : {}),

package/src/server.ts

@@ -82,6 +82,11 @@ function defineKind<TJob extends { jobId: string }, TResult extends JobResultBas
 // image carries no runtime deps.
 const KINDS: Record<string, KindEntry> = {
   agent: defineKind(parseAgentJob, handleAgent, (job) => ({
+    // The backend's correlation ids first, so EVERY line this job emits joins to the run in the
+    // backend's own logs. Absent on a body from a backend older than the field — the rest of the
+    // description is unaffected.
+    ...(job.workspaceId ? { workspaceId: job.workspaceId } : {}),
+    ...(job.executionId ? { executionId: job.executionId } : {}),
     mode: job.mode,
     repo: `${job.repo.owner}/${job.repo.name}`,
     branch: job.branch,