harnery 0.13.0 → 0.14.0

package/src/core/workflow/engine.ts

@@ -35,7 +35,7 @@ import {
   policyDigest,
   summarizePolicyRequest,
 } from "../policy/index.ts";
-import { createWorkflowApproval } from "./approvals.ts";
+import { assertWorkflowRunId, createWorkflowApproval } from "./approvals.ts";
 import { type BillingProbe, probeBilling } from "./billing.ts";
 import {
   buildWorkflowProof,
@@ -101,12 +101,26 @@ export class WorkflowParkedError extends Error {
 }
 
 export async function runWorkflow(scriptPath: string, opts: EngineOpts): Promise<RunReport> {
+  if (opts.runId && opts.resumeRunId) {
+    throw new Error("runId and resumeRunId are mutually exclusive");
+  }
+  if (opts.runId) assertWorkflowRunId(opts.runId);
+  if (opts.workItemId && !/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/.test(opts.workItemId)) {
+    throw new Error(`invalid work item id ${JSON.stringify(opts.workItemId)}`);
+  }
   if (opts.resumeRunId && opts.resumeFrom) {
     throw new Error("resumeRunId and resumeFrom are mutually exclusive");
   }
   const resumeState = opts.resumeRunId
     ? assertWorkflowRunResumable(opts.coordRoot, opts.resumeRunId)
     : undefined;
+  if (
+    resumeState !== undefined &&
+    opts.workItemId !== undefined &&
+    resumeState.manifest.work_item_id !== opts.workItemId
+  ) {
+    throw new Error(`workflow run ${opts.resumeRunId} belongs to a different work item`);
+  }
   const absScript = isAbsolute(scriptPath) ? scriptPath : resolve(process.cwd(), scriptPath);
   if (resumeState) {
     if (resolve(resumeState.manifest.script.path) !== resolve(absScript)) {
@@ -145,6 +159,7 @@ async function executeWorkflow(
 
   const runId =
     opts.resumeRunId ??
+    opts.runId ??
     `wf-${new Date().toISOString().replace(/[:.]/g, "-")}-${randomBytes(3).toString("hex")}`;
   const runDir = join(opts.coordRoot, ".harnery", "workflows", runId);
   mkdirSync(runDir, { recursive: true });
@@ -178,6 +193,7 @@ async function executeWorkflow(
       manifest: {
         schema_version: 1,
         run_id: runId,
+        work_item_id: opts.workItemId,
         name,
         started_at: startedAt,
         script: { path: absScript, sha256: workflowScriptDigest(absScript) },
@@ -739,6 +755,7 @@ async function executeWorkflow(
     } else {
       journal("run.start", {
         name,
+        work_item_id: opts.workItemId ?? null,
         script: absScript,
         objective: meta.objective ?? null,
         acceptance: meta.acceptance,
@@ -763,6 +780,7 @@ async function executeWorkflow(
     try {
       proof = buildWorkflowProof({
         runId,
+        workItemId: opts.workItemId ?? resumeState?.manifest.work_item_id,
         meta,
         status: "succeeded",
         startedAt,
@@ -795,6 +813,7 @@ async function executeWorkflow(
     }
     const report: RunReport = {
       runId,
+      workItemId: opts.workItemId ?? resumeState?.manifest.work_item_id,
       name,
       result,
       agentsSpawned,
@@ -827,6 +846,7 @@ async function executeWorkflow(
     try {
       const proof = buildWorkflowProof({
         runId,
+        workItemId: opts.workItemId ?? resumeState?.manifest.work_item_id,
         meta,
         status: "failed",
         startedAt,

package/src/core/workflow/proof.ts

@@ -58,6 +58,7 @@ export interface NormalizedWorkflowMeta {
 
 export interface BuildWorkflowProofInput {
   runId: string;
+  workItemId?: string;
   meta: NormalizedWorkflowMeta;
   status: "succeeded" | "failed";
   startedAt: string;
@@ -213,6 +214,7 @@ export function buildWorkflowProof(input: BuildWorkflowProofInput): WorkflowProo
     schema_version: WORKFLOW_PROOF_SCHEMA_VERSION,
     run: {
       id: input.runId,
+      work_item_id: input.workItemId,
       name: input.meta.name,
       status: input.status,
       started_at: input.startedAt,

package/src/core/workflow/run-state.ts

@@ -31,6 +31,7 @@ const FOREIGN_LEASE_STALE_MS = 24 * 60 * 60 * 1_000;
 export interface WorkflowRunManifest {
   schema_version: typeof WORKFLOW_RUN_MANIFEST_SCHEMA_VERSION;
   run_id: string;
+  work_item_id?: string;
   name: string;
   started_at: string;
   script: { path: string; sha256: string };
@@ -97,6 +98,8 @@ export function readWorkflowRunManifest(coordRoot: string, runId: string): Workf
   if (
     manifest.schema_version !== WORKFLOW_RUN_MANIFEST_SCHEMA_VERSION ||
     manifest.run_id !== runId ||
+    (manifest.work_item_id !== undefined &&
+      !/^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/.test(manifest.work_item_id)) ||
     typeof manifest.name !== "string" ||
     manifest.name.length === 0 ||
     manifest.name.length > 200 ||

package/src/core/workflow/types.ts

@@ -147,6 +147,8 @@ export interface WorkflowProof {
   schema_version: typeof WORKFLOW_PROOF_SCHEMA_VERSION;
   run: {
     id: string;
+    /** Durable objective this execution attempt belongs to, when linked. */
+    work_item_id?: string;
     name: string;
     status: WorkflowRunStatus;
     started_at: string;
@@ -315,6 +317,10 @@ export interface EngineOpts {
    * approval has been resolved. The frozen run manifest supplies execution
    * options and the original repository-before snapshot. */
   resumeRunId?: string;
+  /** Stable id for a new run allocated by a durable-work host. */
+  runId?: string;
+  /** Durable objective this execution attempt belongs to. */
+  workItemId?: string;
   /** Total-agent ceiling for the run (default 50): the runaway backstop. */
   maxAgents?: number;
   /** Concurrent-subagent cap for parallel() (default 4). */
@@ -357,6 +363,7 @@ export interface EngineOpts {
 
 export interface RunReport {
   runId: string;
+  workItemId?: string;
   name: string;
   /** What the script's default export returned. */
   result: unknown;