@tea-agent/loop-agent 0.10.0 → 0.11.0

package/dist/worker/preflight.js

@@ -1,14 +1,27 @@
 import { access } from "node:fs/promises";
 import path from "node:path";
+import { controllerIdentityExpectationFailure, resolveControllerIdentity, } from "./loop-agent/loop-agent-client.js";
 export const DEFAULT_CHECK_REPO_TIMEOUT_MS = 300_000;
 export async function preflightTargetRepo(input) {
     const commands = [];
+    const identity = resolveControllerIdentity(input.client);
+    const expectationFailure = controllerIdentityExpectationFailure(identity, input.expectation);
+    if (expectationFailure) {
+        return {
+            ok: false,
+            code: expectationFailure.code,
+            message: expectationFailure.message,
+            commands,
+            controllerIdentity: identity,
+        };
+    }
     if (!(await exists(path.join(input.repoRoot, "harness.json")))) {
         return {
             ok: false,
             code: "target-not-initialized",
             message: "target repo is missing harness.json",
             commands,
+            controllerIdentity: identity,
         };
     }
     if (!(await exists(path.join(input.repoRoot, ".harness")))) {
@@ -17,6 +30,7 @@ export async function preflightTargetRepo(input) {
             code: "target-not-initialized",
             message: "target repo is missing .harness",
             commands,
+            controllerIdentity: identity,
         };
     }
     const version = await input.client.run(["--version"], {
@@ -30,8 +44,36 @@ export async function preflightTargetRepo(input) {
             code: "version-failed",
             message: "loop-agent --version failed",
             commands,
+            controllerIdentity: identity,
         };
     }
+    const reportedVersion = version.stdout.trim();
+    let controllerIdentity = identity
+        ? { ...identity, reportedVersion }
+        : undefined;
+    if (identity && reportedVersion !== identity.packageVersion) {
+        return {
+            ok: false,
+            code: "reported-version-mismatch",
+            message: `reported version ${reportedVersion} does not match package version ${identity.packageVersion}`,
+            commands,
+            controllerIdentity,
+        };
+    }
+    if (identity && input.client.observeReportedVersion) {
+        try {
+            controllerIdentity = input.client.observeReportedVersion(reportedVersion) ?? controllerIdentity;
+        }
+        catch (error) {
+            return {
+                ok: false,
+                code: "reported-version-mismatch",
+                message: error instanceof Error ? error.message : String(error),
+                commands,
+                controllerIdentity,
+            };
+        }
+    }
     const inspect = await input.client.run(["inspect"], {
         cwd: input.repoRoot,
         artifactName: "inspect",
@@ -44,6 +86,7 @@ export async function preflightTargetRepo(input) {
             code: "inspect-failed",
             message: "loop-agent inspect failed or did not return JSON",
             commands,
+            controllerIdentity,
         };
     }
     const docsAudit = await input.client.run(["docs", "audit"], {
@@ -57,6 +100,7 @@ export async function preflightTargetRepo(input) {
             code: "docs-audit-failed",
             message: "loop-agent docs audit failed",
             commands,
+            controllerIdentity,
         };
     }
     const gitStatus = await input.client.runExternal("git", ["status", "--short", "--branch"], {
@@ -70,6 +114,7 @@ export async function preflightTargetRepo(input) {
             code: "git-status-failed",
             message: "git status --short --branch failed",
             commands,
+            controllerIdentity,
         };
     }
     if (input.runCheckRepo) {
@@ -86,15 +131,18 @@ export async function preflightTargetRepo(input) {
                 code: "check-repo-failed",
                 message: `${[command, ...args].join(" ")} failed`,
                 commands,
+                controllerIdentity,
             };
         }
     }
     return {
         ok: true,
-        version: version.stdout.trim(),
+        version: reportedVersion,
+        reportedVersion: controllerIdentity?.reportedVersion,
         inspect: inspect.json,
         gitStatus: gitStatus.stdout,
         commands,
+        controllerIdentity,
     };
 }
 async function exists(filePath) {

package/dist/worker/run-task/run-task.js

@@ -3,12 +3,18 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { formatDuration, noopProgressReporter } from "../progress-reporter.js";
 import { redactForPreview, truncatePreview } from "../observability/events.js";
+import { controllerIdentityExpectationFailure, resolveControllerIdentity, } from "../loop-agent/loop-agent-client.js";
 import { materializeTaskSpec, } from "../materialize/harness-task-materializer.js";
 import { preflightTargetRepo } from "../preflight.js";
 import { getTaskPoolRoot } from "../pool/run-store.js";
 export const DEFAULT_RUN_DAG_TIMEOUT_MS = 1_800_000;
 export const MAX_WORKER_TIMEOUT_MS = 7_200_000;
 export async function runTaskSpec(options) {
+    let controllerIdentity = resolveControllerIdentity(options.client, options.controllerIdentity);
+    const identityFailure = controllerIdentityExpectationFailure(controllerIdentity, options.controllerExpectation);
+    if (identityFailure) {
+        throw new Error(`${identityFailure.code}: ${identityFailure.message}`);
+    }
     const now = options.now ?? new Date();
     const workerRunId = options.workerRunId ?? buildWorkerRunId(options.taskSpec.id, now);
     const commands = [];
@@ -26,11 +32,13 @@ export async function runTaskSpec(options) {
                 repoRoot: options.repoRoot,
                 client,
                 ...(typeof options.preflight === "object" ? options.preflight : {}),
+                ...(options.controllerExpectation ? { expectation: options.controllerExpectation } : {}),
             });
             if (!preflight.ok) {
                 progress.note(`preflight FAILED: ${preflight.code}`);
                 throw new Error(`target repo preflight failed: ${preflight.code}: ${preflight.message}`);
             }
+            controllerIdentity = preflight.controllerIdentity ?? controllerIdentity;
         });
         progress.step(`preflight ok in ${formatDuration(Date.now() - preflightStartedAt)}`);
     }
@@ -66,7 +74,6 @@ export async function runTaskSpec(options) {
             dagPath,
             "--cwd",
             options.repoRoot,
-            ...noCursorArgs(options.taskSpec),
         ], true, undefined, eventCtx);
     });
     progress.step(`dag generated in ${formatDuration(Date.now() - dagGenStartedAt)}`);
@@ -90,7 +97,6 @@ export async function runTaskSpec(options) {
             "--strict-governance",
             "--spine-task",
             materializeManifest.harnessTaskId,
-            ...forbidCursorArgs(options.taskSpec),
         ], true, undefined, eventCtx);
     });
     progress.step(`dag validated in ${formatDuration(Date.now() - validateStartedAt)}`);
@@ -111,7 +117,6 @@ export async function runTaskSpec(options) {
             "--events-jsonl",
             dagEventsPath,
             ...maxConcurrentArgs(options.taskSpec),
-            ...noCursorArgs(options.taskSpec),
         ], resolveRunDagTimeoutMs(options.taskSpec), eventCtx);
     });
     progress.step(`run-dag finished in ${formatDuration(Date.now() - runDagStartedAt)}`);
@@ -180,6 +185,7 @@ export async function runTaskSpec(options) {
         reportDecision,
         commands,
         ...(failureArtifacts ? { failureArtifacts } : {}),
+        ...(controllerIdentity ? { controllerIdentity } : {}),
     };
     await writeFile(runRecordPath, `${JSON.stringify(record, null, 2)}\n`, "utf-8");
     emit(progress, {
@@ -407,6 +413,12 @@ class RecordingRunTaskClient {
         this.delegate = delegate;
         this.records = records;
     }
+    getIdentity() {
+        return this.delegate.getIdentity?.();
+    }
+    observeReportedVersion(reportedVersion) {
+        return this.delegate.observeReportedVersion?.(reportedVersion);
+    }
     async run(args, options) {
         const result = await this.delegate.run(args, options);
         this.records.push({
@@ -452,6 +464,12 @@ class ObservedRunTaskClient {
         this.delegate = delegate;
         this.eventCtx = eventCtx;
     }
+    getIdentity() {
+        return this.delegate.getIdentity();
+    }
+    observeReportedVersion(reportedVersion) {
+        return this.delegate.observeReportedVersion(reportedVersion);
+    }
     run(args, options) {
         return this.runObserved(args, options, (observedOptions) => this.delegate.run(args, observedOptions));
     }
@@ -544,12 +562,6 @@ function commandRecordName(args, artifactName) {
         return "new-task";
     return artifactName;
 }
-function noCursorArgs(taskSpec) {
-    return taskSpec.loop_agent.no_cursor ? ["--no-cursor"] : [];
-}
-function forbidCursorArgs(taskSpec) {
-    return taskSpec.loop_agent.no_cursor ? ["--forbid-executor", "cursor"] : [];
-}
 function maxConcurrentArgs(taskSpec) {
     return ["--max-concurrent", String(taskSpec.loop_agent.max_concurrent)];
 }
@@ -563,14 +575,12 @@ function strictModelsArgs(piModel) {
 }
 /**
  * Rewrite `executorModels.pi.{LOW,MED,HIGH}` in an already-generated DAG JSON
- * so every pi executor node resolves to the smoke override model. Cursor / shell
- * slots are left untouched.
+ * so every pi executor node resolves to the smoke override model.
  */
 export async function applyPiModelOverride(dagPath, piModel) {
     const raw = await readFile(dagPath, "utf-8");
     const spec = JSON.parse(raw);
     spec.executorModels = {
-        ...(spec.executorModels?.cursor ? { cursor: spec.executorModels.cursor } : {}),
         pi: {
             LOW: piModel,
             MED: piModel,

package/dist/worker/runner/run-ready.js

@@ -2,6 +2,7 @@ import { createHash } from "node:crypto";
 import { readFile, writeFile, mkdir } from "node:fs/promises";
 import path from "node:path";
 import YAML from "yaml";
+import { controllerIdentitiesMatch, controllerIdentityExpectationFailure, resolveControllerIdentity, } from "../loop-agent/loop-agent-client.js";
 import { deriveFailureRoute, deriveFailureRouteFromError, } from "../pool/failure-routing.js";
 import { findRunByWorkerRunId, getTaskPoolRoot, readAllTaskPoolStates, recordTaskPoolRun, writeTaskPoolState, } from "../pool/run-store.js";
 import { runTaskSpec, } from "../run-task/run-task.js";
@@ -9,7 +10,26 @@ import { formatDuration, noopProgressReporter, } from "../progress-reporter.js";
 import { computeReadyQueue } from "../task-graph/ready-queue.js";
 import { taskGraphSpecSchema } from "../task-graph/task-graph-schema.js";
 import { taskSpecSchema } from "../task-spec/schema.js";
+import { preflightTargetRepo } from "../preflight.js";
 export async function runReadyTasks(options) {
+    let controllerIdentity = resolveControllerIdentity(options.client, options.controllerIdentity);
+    const identityFailure = controllerIdentityExpectationFailure(controllerIdentity, options.controllerExpectation);
+    if (identityFailure) {
+        throw new Error(`${identityFailure.code}: ${identityFailure.message}`);
+    }
+    if (!options.skipTaskPreflight && !options.runTask) {
+        const preflight = await preflightTargetRepo({
+            repoRoot: options.repoRoot,
+            client: options.client,
+            runCheckRepo: options.runCheckRepo,
+            ...(options.checkRepoCommand ? { checkRepoCommand: options.checkRepoCommand } : {}),
+            ...(options.controllerExpectation ? { expectation: options.controllerExpectation } : {}),
+        });
+        if (!preflight.ok) {
+            throw new Error(`target repo preflight failed: ${preflight.code}: ${preflight.message}`);
+        }
+        controllerIdentity = preflight.controllerIdentity ?? controllerIdentity;
+    }
     const now = options.now ?? new Date();
     const startedAt = now.toISOString();
     const batchRunId = options.batchRunId ?? buildBatchRunId(now);
@@ -43,12 +63,19 @@ export async function runReadyTasks(options) {
         const taskSpecPath = path.join(options.featureDir, "tasks", node?.task ?? `${taskId}.yaml`);
         const taskSpec = await loadTaskSpec(taskSpecPath);
         const retryOfWorkerRunId = states[taskId]?.retryOfWorkerRunId;
-        const workerRunId = retryOfWorkerRunId
+        let workerRunId = retryOfWorkerRunId
             ? buildRetryWorkerRunId(taskId, retryOfWorkerRunId, now)
             : options.workerRunIdForTask?.(taskId, taskSpec) ??
-                buildStableWorkerRunId(taskId, taskSpec, now);
+                buildStableWorkerRunId(taskId, taskSpec, now, controllerIdentity);
         if (workerRunId) {
-            const existing = await findRunByWorkerRunId(options.repoRoot, workerRunId);
+            let existing = await findRunByWorkerRunId(options.repoRoot, workerRunId);
+            if (existing && !controllerRunCanBeReused(existing, controllerIdentity)) {
+                workerRunId = buildControllerScopedWorkerRunId(workerRunId, controllerIdentity);
+                existing = await findRunByWorkerRunId(options.repoRoot, workerRunId);
+                if (existing && !controllerRunCanBeReused(existing, controllerIdentity)) {
+                    throw new Error(`workerRunId collision has incompatible controller identity: ${workerRunId}`);
+                }
+            }
             if (existing) {
                 progress.task(`task ${index}/${total} ${taskId}: reuse existing run ${workerRunId}`);
                 emit(progress, {
@@ -81,7 +108,7 @@ export async function runReadyTasks(options) {
             workerRunId,
             status: "running",
         });
-        progress.step(`preflight → materialize → dag-run-task → validate → run-dag → report`);
+        progress.step(`materialize → dag-run-task → validate → run-dag → report`);
         let result;
         try {
             await writeTaskPoolState(options.repoRoot, {
@@ -107,14 +134,11 @@ export async function runReadyTasks(options) {
                 client: options.client,
                 now,
                 workerRunId,
-                preflight: options.skipTaskPreflight
-                    ? false
-                    : {
-                        runCheckRepo: options.runCheckRepo,
-                        ...(options.checkRepoCommand ? { checkRepoCommand: options.checkRepoCommand } : {}),
-                    },
+                preflight: false,
                 progress,
                 ...(options.piModel ? { piModel: options.piModel } : {}),
+                ...(controllerIdentity ? { controllerIdentity } : {}),
+                ...(options.controllerExpectation ? { controllerExpectation: options.controllerExpectation } : {}),
             });
         }
         catch (error) {
@@ -146,6 +170,7 @@ export async function runReadyTasks(options) {
                         error: message,
                         failure,
                         ...(retryOfWorkerRunId ? { retryOfWorkerRunId } : {}),
+                        ...(controllerIdentity ? { controllerIdentity } : {}),
                     },
                 });
                 recorded = true;
@@ -214,6 +239,7 @@ export async function runReadyTasks(options) {
             ...(failure ? { failure } : {}),
             ...(retryOfWorkerRunId ? { retryOfWorkerRunId } : {}),
             ...(result.failureArtifacts ? { failureArtifacts: result.failureArtifacts } : {}),
+            ...(controllerIdentity ? { controllerIdentity } : {}),
         };
         let recorded = false;
         try {
@@ -251,6 +277,7 @@ export async function runReadyTasks(options) {
         summary,
         tasks,
         batchRunPath,
+        ...(controllerIdentity ? { controllerIdentity } : {}),
     };
     await mkdir(path.dirname(batchRunPath), { recursive: true });
     await writeFile(batchRunPath, `${JSON.stringify(output, null, 2)}\n`, "utf-8");
@@ -274,18 +301,55 @@ function emit(progress, input) {
 export function buildBatchRunId(now) {
     return `batch-${now.toISOString().replace(/[-:.]/g, "").slice(0, 15)}`;
 }
-export function buildStableWorkerRunId(taskId, taskSpec, now) {
+export function buildStableWorkerRunId(taskId, taskSpec, now, controllerIdentity) {
     const date = now.toISOString().slice(0, 10).replace(/-/g, "");
     const slug = taskId
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, "-")
         .replace(/^-+|-+$/g, "");
     const hash = createHash("sha256")
-        .update(`${taskSpec.feature_id}:${taskSpec.id}:${taskSpec.title}`)
+        .update([
+        taskSpec.feature_id,
+        taskSpec.id,
+        taskSpec.title,
+        ...(controllerIdentity
+            ? [
+                controllerIdentity.packageName,
+                controllerIdentity.packageVersion,
+                controllerIdentity.binarySha256,
+                controllerIdentity.packageFingerprint.value,
+            ]
+            : []),
+    ].join(":"))
         .digest("hex")
         .slice(0, 10);
     return `wr-${date}-${slug}-${hash}`;
 }
+function buildControllerScopedWorkerRunId(baseWorkerRunId, controllerIdentity) {
+    const hash = createHash("sha256")
+        .update(controllerIdentity
+        ? JSON.stringify({
+            packageName: controllerIdentity.packageName,
+            binName: controllerIdentity.binName,
+            packageVersion: controllerIdentity.packageVersion,
+            binarySha256: controllerIdentity.binarySha256,
+            packageFingerprint: controllerIdentity.packageFingerprint.value,
+            requested: controllerIdentity.requested,
+            entry: controllerIdentity.entry,
+            realEntry: controllerIdentity.realEntry,
+            launch: controllerIdentity.launch,
+            packageRoot: controllerIdentity.packageRoot,
+        })
+        : "legacy-unpinned-controller")
+        .digest("hex")
+        .slice(0, 10);
+    return `${baseWorkerRunId}-controller-${hash}`;
+}
+function controllerRunCanBeReused(existing, controllerIdentity) {
+    if (!existing.controllerIdentity && !controllerIdentity)
+        return true;
+    return controllerIdentitiesMatch(existing.controllerIdentity, controllerIdentity);
+}
 /** A retry is a distinct execution attempt and must not collide with failed evidence. */
 export function buildRetryWorkerRunId(taskId, previousWorkerRunId, now) {
     const date = now.toISOString().slice(0, 10).replace(/-/g, "");

package/dist/worker/task-spec/schema.js

@@ -97,7 +97,6 @@ export const taskSpecSchema = z
         profile_policy: z.literal("mapped"),
         strict_models: z.boolean().optional().default(true),
         strict_governance: z.boolean().optional().default(true),
-        no_cursor: z.boolean().optional().default(false),
         max_concurrent: z.number().int().positive().optional().default(1),
     })
         .strict(),

package/dist/workflows/dag/convergence/controller.js

@@ -5,7 +5,7 @@ import { freshNodeRecord } from "../dynamic-runtime/shared.js";
 const CONVERGENCE_CHAIN_NODE_IDS = [
     "process-supervisor-pi",
     "process-gate-shell",
-    "repair-cursor",
+    "repair-pi",
     "hard-verify-shell",
 ];
 const CONVERGENCE_NON_RETRY_FAILURES = new Set([

package/dist/workflows/dag/executor-registry.js

@@ -1,4 +1,3 @@
-import { executeDagCursorNode } from "../../executors/dag-cursor-executor.js";
 import { executeDagPiNode } from "../../executors/dag-pi-executor.js";
 import { executeDagShellNode } from "../../executors/shell-executor.js";
 import { executeDagStaticNode } from "../../executors/dag-static-executor.js";
@@ -9,7 +8,6 @@ function requireModel(input) {
     return input;
 }
 export const DEFAULT_DAG_EXECUTOR_REGISTRY = {
-    cursor: (input, meta) => executeDagCursorNode(requireModel(input), meta),
     pi: (input, meta) => executeDagPiNode(requireModel(input), meta),
     shell: executeDagShellNode,
     static: executeDagStaticNode,