harnery 0.23.0 → 0.24.0

package/README.md

@@ -22,7 +22,7 @@
 - **Multi-agent coordination:** per-agent heartbeats in `.harnery/active/`, claim-time and commit-time guards, the canonical event stream, councils, a decision docket, per-agent scratchpads, and harness adapters for Claude Code / Cursor / Codex.
 - **Cross-machine presence:** sessions on every machine that shares a repo see each other, labeled by machine. Zero-config over the repo's own git remote (presence refs), with an optional live-socket upgrade via an end-to-end-encrypted relay — the public `relay.harnery.com`, or self-host with `harn relay serve` / the bundled Cloudflare Worker (`relay/worker/`). The relay sees only ciphertext in opaquely-named rooms.
 - **Coordination-aware workflows:** `harn workflow run <script>` executes bounded, schema-gated multi-subagent workflow scripts — plain JS stages fanning out to headless harness-CLI subagents that are born coordination-registered (heartbeats, events, claim guards), with deterministic code deciding the routing between stages. An optional host-owned policy gates dispatch and declared external mutations with `ALLOW`, `ASK`, and `DENY`; CLI `ASK` requests park durably for an explicit approve/deny and same-run resume, while library callers remain fail-closed by default.
-- **Optional isolated workspaces:** add `--isolation worktree --workspace-root <dir>` to run a workflow in a host-owned local Git worktree. Harnery freezes the allocation and provider identity, verifies the workspace before execution and resume, requires review and policy authority before fast-forward integration, and keeps cleanup conservative. `harn workflow workspace <run-id>` and the dashboard show the validated lifecycle; shared execution remains the default.
+- **Optional isolated workspaces:** add `--isolation worktree --workspace-root <dir>` to run a workflow in a host-owned local Git worktree. Harnery freezes the allocation and provider identity, verifies the workspace before execution and resume, requires review and policy authority before fast-forward integration, and keeps cleanup conservative. Inspect with `harn workflow workspace`, then use the separate `workflow integration prepare`, `integration apply`, and `cleanup` phases; shared execution remains the default.
 - **Durable work above attempts:** `harn work` preserves an objective across bounded workflow attempts, dependencies, approval parks, failures, and review. Reusable workflow code receives the exact work ID, title, objective, acceptance criteria, and attempt identity as frozen typed context. A retry also receives the prior run's bounded error and unresolved proof criteria, while retry authority and attempt ceilings remain unchanged. The manifest, proof, and append-only ledger bind the same context, and the one-shot reconciler reports the next explicit action without silently spawning, retrying, or accepting work.
 - **Bounded goal supervision:** `harn supervisor` freezes a mission or existing root graph, specialist team, and safety limits, then runs scheduling cycles until reviewed mission success, human attention, no progress, or budget exhaustion. Its optional planner can create the first milestone, reassess accepted milestone proof, or recover a terminal graph using only a frozen workflow-template catalog. Plans can require independent bounded specialist review before ordinary approval or auto-apply authority, old generations remain immutable evidence, and all attempts still consume the goal budget. Use explicit foreground ticks or enroll goals in the optional heartbeat-backed background service.
 - **Standalone web UI:** `harn web up` boots a local Next.js dashboard for the coord layer, councils, per-project state, and a local coding-agent status view (Claude Code / Codex / Cursor usage, backed by `harn devtools`). Ships with the git clone, not the npm package (see [Install](#install)).

package/dist/commands/workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/commands/workflow.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAiDnD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAmejF"}
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/commands/workflow.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAiEnD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAqqBjF"}

package/dist/commands/workflow.js

@@ -1,5 +1,6 @@
-import { resolve } from "node:path";
-import { workflowSubscriptionOnly } from "../core/config.js";
+import { existsSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { resolveBinName, workflowSubscriptionOnly } from "../core/config.js";
 import { createBuiltinHarnessRegistry } from "../core/harnesses/index.js";
 import { findCoordRoot } from "../core/hooks/resolve/coord-root.js";
 import { loadPolicyFile } from "../core/policy/index.js";
@@ -134,7 +135,7 @@ export function registerWorkflowCommand(program, emit) {
                 else {
                     emit.text(`run ${err.runId} parked\napproval: ${err.approvalId}\n` +
                         `journal: ${err.journalPath}\n` +
-                        `resume after resolution: harn workflow resume ${err.runId}\n`);
+                        `resume after resolution: ${resolveBinName()} workflow resume ${err.runId}\n`);
                 }
                 return;
             }
@@ -288,6 +289,186 @@ export function registerWorkflowCommand(program, emit) {
             : `${inspection.run_id}\tinvalid\t${inspection.error}`)
             .join("\n")}\n`);
     });
+    const integration = workflow
+        .command("integration")
+        .description("Prepare and apply proof-gated isolated-workspace integration.");
+    integration
+        .command("prepare <run-id>")
+        .description("Preview integration and write exact review and policy authority.")
+        .option("--policy <file>", "Current host policy JSON/JSONC for the Git mutation")
+        .option("--reviewer <name>", "Explicit reviewer for a standalone workflow")
+        .option("--reason <text>", "Reason recorded with the standalone review")
+        .option("--target-root <dir>", "Explicit target checkout (default: frozen source checkout)")
+        .option("--accept-unknown <code>", "Accept one verification unknown by code (repeatable)", collectOption, [])
+        .option("--approval-to <address>", "Address a durable policy ASK request")
+        .option("--json", "Emit the durable integration plan as JSON")
+        .action(async (runId, opts) => {
+        const coordRoot = findCoordRoot();
+        if (!coordRoot) {
+            emit.error({
+                code: "no_coord_root",
+                message: "no .harnery/ coordination root found; run `init` first",
+            });
+            process.exit(1);
+        }
+        if (!opts.policy) {
+            emit.error({
+                code: "integration_policy_required",
+                message: "integration prepare requires --policy <file>",
+            });
+            process.exit(1);
+        }
+        if (opts.reason && !opts.reviewer) {
+            emit.error({
+                code: "integration_reviewer_required",
+                message: "--reason requires --reviewer <name>",
+            });
+            process.exit(1);
+        }
+        try {
+            const provider = await builtInProviderForRun(coordRoot, runId);
+            const { IntegrationPrepareParkedError, prepareIntegration } = await import("../core/workflow/index.js");
+            try {
+                const plan = await prepareIntegration({
+                    coordRoot,
+                    runId,
+                    provider,
+                    policy: loadPolicyFile(opts.policy),
+                    targetRoot: opts.targetRoot,
+                    review: opts.reviewer ? { actor: opts.reviewer, reason: opts.reason } : undefined,
+                    acceptedUnknowns: opts.acceptUnknown,
+                    approvalAddressee: opts.approvalTo,
+                });
+                if (opts.json) {
+                    emit.config({ format: "json" });
+                    emit.data(plan);
+                    return;
+                }
+                emit.text(`integration plan ${plan.plan_id} authorized\n` +
+                    `source: ${plan.provider_preview.source_commit}\n` +
+                    `target: ${plan.provider_preview.target_ref} at ${plan.provider_preview.target_commit}\n` +
+                    `changes: ${plan.provider_preview.changed_paths.length}\n` +
+                    `apply: ${resolveBinName()} workflow integration apply ${runId} --yes\n`);
+            }
+            catch (error) {
+                if (error instanceof IntegrationPrepareParkedError) {
+                    if (opts.json) {
+                        emit.config({ format: "json" });
+                        emit.data({
+                            status: "parked",
+                            runId: error.runId,
+                            planId: error.planId,
+                            approvalId: error.approvalId,
+                        });
+                    }
+                    else {
+                        emit.text(`integration preparation parked\n` +
+                            `run: ${error.runId}\n` +
+                            `plan: ${error.planId}\n` +
+                            `approval: ${error.approvalId}\n` +
+                            `approve: ${resolveBinName()} workflow approvals approve ${error.approvalId}\n`);
+                    }
+                    return;
+                }
+                throw error;
+            }
+        }
+        catch (error) {
+            emit.error({
+                code: "workflow_integration_prepare_failed",
+                message: error instanceof Error ? error.message : String(error),
+            });
+            process.exit(1);
+        }
+    });
+    integration
+        .command("apply <run-id>")
+        .description("Apply an authorized durable integration plan.")
+        .option("--yes", "Confirm the target-branch mutation")
+        .option("--json", "Emit the durable integration receipt as JSON")
+        .action(async (runId, opts) => {
+        const coordRoot = findCoordRoot();
+        if (!coordRoot) {
+            emit.error({
+                code: "no_coord_root",
+                message: "no .harnery/ coordination root found; run `init` first",
+            });
+            process.exit(1);
+        }
+        if (!opts.yes) {
+            emit.error({
+                code: "integration_confirmation_required",
+                message: "integration apply changes the target branch; pass --yes to confirm",
+            });
+            process.exit(1);
+        }
+        try {
+            const provider = await builtInProviderForRun(coordRoot, runId);
+            const { applyIntegration } = await import("../core/workflow/index.js");
+            const receipt = await applyIntegration({ coordRoot, runId, provider });
+            if (opts.json) {
+                emit.config({ format: "json" });
+                emit.data(receipt);
+                return;
+            }
+            emit.text(`integration ${receipt.status}: ${receipt.target_ref} at ${receipt.target_commit}\n` +
+                `receipt: ${receipt.receipt_id}\n` +
+                `cleanup: ${resolveBinName()} workflow cleanup ${runId} --yes\n`);
+        }
+        catch (error) {
+            emit.error({
+                code: "workflow_integration_apply_failed",
+                message: error instanceof Error ? error.message : String(error),
+            });
+            process.exit(1);
+        }
+    });
+    workflow
+        .command("cleanup <run-id>")
+        .description("Conservatively release a provider-owned isolated workspace.")
+        .option("--yes", "Confirm the worktree and provider-branch removal attempt")
+        .option("--json", "Emit the cleanup attempt or receipt as JSON")
+        .action(async (runId, opts) => {
+        const coordRoot = findCoordRoot();
+        if (!coordRoot) {
+            emit.error({
+                code: "no_coord_root",
+                message: "no .harnery/ coordination root found; run `init` first",
+            });
+            process.exit(1);
+        }
+        if (!opts.yes) {
+            emit.error({
+                code: "cleanup_confirmation_required",
+                message: "workspace cleanup may remove a worktree and branch; pass --yes to confirm",
+            });
+            process.exit(1);
+        }
+        try {
+            const provider = await builtInProviderForRun(coordRoot, runId);
+            const { cleanupWorkspace } = await import("../core/workflow/index.js");
+            const result = await cleanupWorkspace({ coordRoot, runId, provider });
+            if (opts.json) {
+                emit.config({ format: "json" });
+                emit.data(result);
+                return;
+            }
+            const receipt = "receipt_id" in result && typeof result.receipt_id === "string"
+                ? `\nreceipt: ${result.receipt_id}`
+                : "";
+            const reason = "reason" in result && typeof result.reason === "string"
+                ? `\nreason: ${result.reason}`
+                : "";
+            emit.text(`workspace cleanup ${result.status}: ${result.binding_id}${receipt}${reason}\n`);
+        }
+        catch (error) {
+            emit.error({
+                code: "workflow_cleanup_failed",
+                message: error instanceof Error ? error.message : String(error),
+            });
+            process.exit(1);
+        }
+    });
     const approvals = workflow
         .command("approvals")
         .description("Inspect and resolve durable workflow policy approvals.");
@@ -379,7 +560,7 @@ export function registerWorkflowCommand(program, emit) {
                 else {
                     emit.text(`${renderWorkflowApproval(resolved.approval)}` +
                         `${resolved.applied ? "decision recorded" : "decision already recorded"}\n` +
-                        `resume: harn workflow resume ${resolved.approval.request.run_id}\n`);
+                        approvalNextActionHint(coordRoot, resolved.approval));
                 }
             }
             catch (err) {
@@ -422,3 +603,30 @@ export function registerWorkflowCommand(program, emit) {
         }
     });
 }
+async function builtInProviderForRun(coordRoot, runId) {
+    const { createLocalGitWorktreeProvider, readWorkflowRunManifest } = await import("../core/workflow/index.js");
+    const manifest = readWorkflowRunManifest(coordRoot, runId);
+    const binding = manifest.execution.workspace_binding;
+    if (!binding) {
+        throw new Error(`workflow run ${runId} has no isolated workspace binding`);
+    }
+    if (binding.provider.id !== "local-git-worktree") {
+        throw new Error(`workflow run ${runId} requires unavailable workspace provider ${binding.provider.id}`);
+    }
+    return createLocalGitWorktreeProvider({ coordRoot });
+}
+function collectOption(value, previous) {
+    return [...previous, value];
+}
+/** Next operator command after resolving an approval. Mid-run parks resume the
+ * workflow; integration prepare parks after the run is already terminal, so
+ * the durable plan is authorized by re-running prepare (resume would fail). */
+function approvalNextActionHint(coordRoot, approval) {
+    const bin = resolveBinName();
+    const runId = approval.request.run_id;
+    const integrationPlanPath = join(coordRoot, ".harnery", "workflows", runId, "integration", "plan.json");
+    if (existsSync(integrationPlanPath)) {
+        return `prepare: ${bin} workflow integration prepare ${runId}\n`;
+    }
+    return `resume: ${bin} workflow resume ${runId}\n`;
+}

package/dist/core/workflow/index.d.ts

@@ -8,5 +8,5 @@ export { acquireWorkflowResumeLease, assertWorkflowRunResumable, assertWorkflowS
 export type { AcceptanceCriterion, AcceptanceResult, AcceptanceStatus, AcceptanceSummary, AgentOpts, EngineOpts, EvidenceKind, EvidenceSource, EvidenceStatus, HarnessEvidenceCapability, HarnessEvidenceCoverage, HarnessName, ResultDigest, RunReport, Spawner, SpawnRequest, SpawnResult, StageSchema, WorkflowAgentProof, WorkflowApprovalMode, WorkflowAttemptContext, WorkflowAttemptFailureCause, WorkflowAttemptPriorContext, WorkflowAttemptUnresolvedCriterion, WorkflowContext, WorkflowEvidenceInput, WorkflowEvidenceRecord, WorkflowMeta, WorkflowModule, WorkflowPolicyProof, WorkflowProof, WorkflowProofUnknown, WorkflowRepoEvidence, WorkflowRepoSnapshot, WorkflowRunStatus, WorkflowSpecialistProfile, WorkflowWorkContext, } from "./types.js";
 export { WORKFLOW_ATTEMPT_CONTEXT_SCHEMA_VERSION, WORKFLOW_PROOF_SCHEMA_VERSION, WORKFLOW_WORK_CONTEXT_SCHEMA_VERSION, } from "./types.js";
 export type { ApplyIntegrationInput, AuthorizedIntegrationPlan, AuthorizedProviderIntegrationInput, CancelWorkspaceInput, CleanupWorkspaceInput, FilesystemIdentity, IntegrationApplyAttempt, IntegrationApplyReceipt, IntegrationAuthorization, IntegrationPlan, IntegrationReviewRecord, IntegrationTarget, LocalGitWorktreeProviderOptions, PrepareIntegrationInput, ProviderIntegrationInput, ProviderIntegrationPreview, ProviderIntegrationResult, ProviderUnknown, ProviderUnsupportedReason, RepositoryBinding, ValidatedFilesystemPath, WorkflowWorkspaceInspection, WorkflowWorkspaceSelection, WorkflowWorkspaceStatus, WorkflowWorkspaceVerification, WorkspaceAllocationRequest, WorkspaceAttestation, WorkspaceBinding, WorkspaceBoundExecutionEvidence, WorkspaceCancellationReceipt, WorkspaceCancellationResult, WorkspaceCleanupAttempt, WorkspaceCleanupIntent, WorkspaceCleanupMode, WorkspaceCleanupReceipt, WorkspaceCleanupResult, WorkspaceCompatibilityExecutionEvidence, WorkspaceExecutionEvidence, WorkspaceIntegrationState, WorkspaceIsolation, WorkspaceLifecycleProjection, WorkspaceLifecycleProjectionInput, WorkspaceLifecycleState, WorkspaceObservation, WorkspaceOwner, WorkspaceProbeInput, WorkspaceProbeResult, WorkspaceProofOutcome, WorkspaceProvider, WorkspaceProviderCapabilities, WorkspaceProviderRef, WorkspaceResourceState, WorkspaceUnsupportedExecutionEvidence, } from "./workspaces/index.js";
-export { applyIntegration, assertWorkspaceLifecycleTransition, cancelWorkspace, cleanupWorkspace, createLocalGitWorktreeProvider, deriveWorkspaceLifecycle, inspectWorkflowWorkspace, isWorkspaceLifecycleState, listWorkflowWorkspaceInspections, prepareIntegration, probeLocalGitWorktreeProvider, readWorkflowWorkspaceStatus, renderWorkflowWorkspaceStatus, validateProviderEventChain, WORKSPACE_BINDING_SCHEMA_VERSION, WORKSPACE_RECEIPT_SCHEMA_VERSION, } from "./workspaces/index.js";
+export { applyIntegration, assertWorkspaceLifecycleTransition, cancelWorkspace, cleanupWorkspace, createLocalGitWorktreeProvider, deriveWorkspaceLifecycle, IntegrationPrepareParkedError, inspectWorkflowWorkspace, isWorkspaceLifecycleState, listWorkflowWorkspaceInspections, prepareIntegration, probeLocalGitWorktreeProvider, readWorkflowWorkspaceStatus, renderWorkflowWorkspaceStatus, validateProviderEventChain, WORKSPACE_BINDING_SCHEMA_VERSION, WORKSPACE_RECEIPT_SCHEMA_VERSION, } from "./workspaces/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/workflow/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/workflow/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/workflow/index.ts"],"names":[],"mappings":"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"}

package/dist/core/workflow/index.js

@@ -4,4 +4,4 @@ export { runWorkflow, WorkflowParkedError, WorkflowRunError } from "./engine.js"
 export { buildWorkflowProof, createEvidenceRecord, digestResult, normalizeWorkflowMeta, readWorkflowProof, renderWorkflowProof, rollupAcceptance, writeWorkflowProof, } from "./proof.js";
 export { acquireWorkflowResumeLease, assertWorkflowRunResumable, assertWorkflowScriptUnchanged, readWorkflowRunManifest, WORKFLOW_RUN_MANIFEST_SCHEMA_VERSION, workflowRunManifestPath, workflowScriptDigest, writeWorkflowRunManifest, } from "./run-state.js";
 export { WORKFLOW_ATTEMPT_CONTEXT_SCHEMA_VERSION, WORKFLOW_PROOF_SCHEMA_VERSION, WORKFLOW_WORK_CONTEXT_SCHEMA_VERSION, } from "./types.js";
-export { applyIntegration, assertWorkspaceLifecycleTransition, cancelWorkspace, cleanupWorkspace, createLocalGitWorktreeProvider, deriveWorkspaceLifecycle, inspectWorkflowWorkspace, isWorkspaceLifecycleState, listWorkflowWorkspaceInspections, prepareIntegration, probeLocalGitWorktreeProvider, readWorkflowWorkspaceStatus, renderWorkflowWorkspaceStatus, validateProviderEventChain, WORKSPACE_BINDING_SCHEMA_VERSION, WORKSPACE_RECEIPT_SCHEMA_VERSION, } from "./workspaces/index.js";
+export { applyIntegration, assertWorkspaceLifecycleTransition, cancelWorkspace, cleanupWorkspace, createLocalGitWorktreeProvider, deriveWorkspaceLifecycle, IntegrationPrepareParkedError, inspectWorkflowWorkspace, isWorkspaceLifecycleState, listWorkflowWorkspaceInspections, prepareIntegration, probeLocalGitWorktreeProvider, readWorkflowWorkspaceStatus, renderWorkflowWorkspaceStatus, validateProviderEventChain, WORKSPACE_BINDING_SCHEMA_VERSION, WORKSPACE_RECEIPT_SCHEMA_VERSION, } from "./workspaces/index.js";

package/dist/core/workflow/spawn-cursor.d.ts

@@ -10,6 +10,9 @@
  *   session_id, …}`).
  * - `--trust` is required: headless runs refuse untrusted workspaces (exit 1,
  *   "Workspace Trust Required") — see the argv comment below.
+ * - `--force` is required: print mode has no channel for an operator to approve
+ *   shell commands, so Smart Auto can leave a child able to patch files but
+ *   unable to test or commit them.
  * - Envelope drift guard: when stdout doesn't parse as JSON but the process
  *   exited 0, the raw stdout is returned as the reply text.
  * - No per-run cost surface → undefined. No max-turns equivalent → `maxTurns`

package/dist/core/workflow/spawn-cursor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawn-cursor.d.ts","sourceRoot":"","sources":["../../../src/core/workflow/spawn-cursor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AASrE,gEAAgE;AAChE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB,CAWA;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,iBAAiB,CAS1E;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,WAAW,CA6BxE;AAED,eAAO,MAAM,aAAa,EAAE,OAe3B,CAAC"}
+{"version":3,"file":"spawn-cursor.d.ts","sourceRoot":"","sources":["../../../src/core/workflow/spawn-cursor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AASrE,gEAAgE;AAChE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB,CAWA;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,iBAAiB,CAU1E;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,WAAW,CA6BxE;AAED,eAAO,MAAM,aAAa,EAAE,OAe3B,CAAC"}

package/dist/core/workflow/spawn-cursor.js

@@ -10,6 +10,9 @@
  *   session_id, …}`).
  * - `--trust` is required: headless runs refuse untrusted workspaces (exit 1,
  *   "Workspace Trust Required") — see the argv comment below.
+ * - `--force` is required: print mode has no channel for an operator to approve
+ *   shell commands, so Smart Auto can leave a child able to patch files but
+ *   unable to test or commit them.
  * - Envelope drift guard: when stdout doesn't parse as JSON but the process
  *   exited 0, the raw stdout is returned as the reply text.
  * - No per-run cost surface → undefined. No max-turns equivalent → `maxTurns`
@@ -36,10 +39,11 @@ export function parseCursorOutput(stdout) {
 export function buildCursorInvocation(req) {
     validateHarnessEffort("cursor", req.effort);
     // --trust: headless cursor-agent refuses untrusted workspaces (exit 1,
-    // "Workspace Trust Required"). Workflow children run in the engine's cwd
-    // deliberately and may edit files — the same posture as the codex adapter's
-    // `--sandbox workspace-write` — so trusting that directory is implied.
-    const argv = ["cursor-agent", "-p", req.prompt, "--output-format", "json", "--trust"];
+    // "Workspace Trust Required"). --force: a print-mode child has no interactive
+    // approval channel, so host-authorized workflow dispatch must let it run
+    // commands. Neither flag maps host policy into child tools; that capability
+    // remains explicitly unsupported.
+    const argv = ["cursor-agent", "-p", req.prompt, "--output-format", "json", "--trust", "--force"];
     if (req.model)
         argv.push("--model", req.model);
     return { argv };

package/dist/core/workflow/workspaces/index.d.ts

@@ -5,7 +5,7 @@ export { cleanupWorkspace } from "./cleanup.js";
 export type { WorkflowWorkspaceInspection, WorkflowWorkspaceSelection, WorkflowWorkspaceStatus, WorkflowWorkspaceVerification, } from "./inspect.js";
 export { inspectWorkflowWorkspace, listWorkflowWorkspaceInspections, readWorkflowWorkspaceStatus, renderWorkflowWorkspaceStatus, } from "./inspect.js";
 export type { ApplyIntegrationInput, PrepareIntegrationInput } from "./integration.js";
-export { applyIntegration, prepareIntegration } from "./integration.js";
+export { applyIntegration, IntegrationPrepareParkedError, prepareIntegration, } from "./integration.js";
 export type { WorkspaceLifecycleProjection, WorkspaceLifecycleProjectionInput, } from "./lifecycle.js";
 export { assertWorkspaceLifecycleTransition, deriveWorkspaceLifecycle, isWorkspaceLifecycleState, validateProviderEventChain, } from "./lifecycle.js";
 export type { LocalGitWorktreeProviderOptions } from "./local-git.js";

package/dist/core/workflow/workspaces/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/workflow/workspaces/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,YAAY,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,6BAA6B,GAC9B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,wBAAwB,EACxB,gCAAgC,EAChC,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACxE,YAAY,EACV,4BAA4B,EAC5B,iCAAiC,GAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,kCAAkC,EAClC,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EACL,8BAA8B,EAC9B,KAAK,IAAI,6BAA6B,GACvC,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,yBAAyB,EACzB,kCAAkC,EAClC,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,eAAe,EACf,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,EACxB,0BAA0B,EAC1B,yBAAyB,EACzB,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,EACpB,gBAAgB,EAChB,+BAA+B,EAC/B,4BAA4B,EAC5B,2BAA2B,EAC3B,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,uCAAuC,EACvC,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,EACvB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,4BAA4B,EAC5B,qBAAqB,EACrB,iBAAiB,EACjB,6BAA6B,EAC7B,oBAAoB,EACpB,sBAAsB,EACtB,qCAAqC,GACtC,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,GACjC,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/workflow/workspaces/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,YAAY,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,6BAA6B,GAC9B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,wBAAwB,EACxB,gCAAgC,EAChC,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,4BAA4B,EAC5B,iCAAiC,GAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,kCAAkC,EAClC,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EACL,8BAA8B,EAC9B,KAAK,IAAI,6BAA6B,GACvC,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,yBAAyB,EACzB,kCAAkC,EAClC,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,eAAe,EACf,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,EACxB,0BAA0B,EAC1B,yBAAyB,EACzB,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,EACpB,gBAAgB,EAChB,+BAA+B,EAC/B,4BAA4B,EAC5B,2BAA2B,EAC3B,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,uCAAuC,EACvC,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,EACvB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,4BAA4B,EAC5B,qBAAqB,EACrB,iBAAiB,EACjB,6BAA6B,EAC7B,oBAAoB,EACpB,sBAAsB,EACtB,qCAAqC,GACtC,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,GACjC,MAAM,YAAY,CAAC"}

package/dist/core/workflow/workspaces/index.js

@@ -1,7 +1,7 @@
 export { cancelWorkspace } from "./cancellation.js";
 export { cleanupWorkspace } from "./cleanup.js";
 export { inspectWorkflowWorkspace, listWorkflowWorkspaceInspections, readWorkflowWorkspaceStatus, renderWorkflowWorkspaceStatus, } from "./inspect.js";
-export { applyIntegration, prepareIntegration } from "./integration.js";
+export { applyIntegration, IntegrationPrepareParkedError, prepareIntegration, } from "./integration.js";
 export { assertWorkspaceLifecycleTransition, deriveWorkspaceLifecycle, isWorkspaceLifecycleState, validateProviderEventChain, } from "./lifecycle.js";
 export { createLocalGitWorktreeProvider, probe as probeLocalGitWorktreeProvider, } from "./local-git.js";
 export { WORKSPACE_BINDING_SCHEMA_VERSION, WORKSPACE_RECEIPT_SCHEMA_VERSION, } from "./types.js";

package/dist/core/workflow/workspaces/integration.d.ts

@@ -19,6 +19,14 @@ export interface ApplyIntegrationInput {
     provider: WorkspaceProvider;
     plan?: IntegrationPlan;
 }
+/** Host-policy ASK still pending during integration prepare. Carries the exact
+ * durable IDs an operator needs to approve and resume the same plan. */
+export declare class IntegrationPrepareParkedError extends Error {
+    readonly runId: string;
+    readonly planId: string;
+    readonly approvalId: string;
+    constructor(runId: string, planId: string, approvalId: string);
+}
 export declare function prepareIntegration(input: PrepareIntegrationInput): Promise<IntegrationPlan>;
 export declare function applyIntegration(input: ApplyIntegrationInput): Promise<IntegrationApplyReceipt>;
 //# sourceMappingURL=integration.d.ts.map

package/dist/core/workflow/workspaces/integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../../../src/core/workflow/workspaces/integration.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,gBAAgB,EAGrB,KAAK,UAAU,EAGhB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,KAAK,EAEV,uBAAuB,EAEvB,eAAe,EAOf,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,UAAU,GAAG,gBAAgB,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,eAAe,CAAC,CA2GjG;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,uBAAuB,CAAC,CAuNlC"}
+{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../../../src/core/workflow/workspaces/integration.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,gBAAgB,EAGrB,KAAK,UAAU,EAGhB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,KAAK,EAEV,uBAAuB,EAEvB,eAAe,EAOf,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,UAAU,GAAG,gBAAgB,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB;AAED;wEACwE;AACxE,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEhB,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;CAO9D;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,eAAe,CAAC,CA2GjG;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,uBAAuB,CAAC,CAuNlC"}

package/dist/core/workflow/workspaces/integration.js

@@ -10,6 +10,20 @@ import { appendIntegrationAttempt, appendWorkflowJournalEvent, fileSha256, readI
 import { isWorkspaceAllocationRequest, isWorkspaceAttestation, isWorkspaceBoundExecutionEvidence, } from "./validate.js";
 const INTEGRATION_DECISION_ID = "p99999";
 const TARGET_LEASE_STALE_MS = 5 * 60 * 1_000;
+/** Host-policy ASK still pending during integration prepare. Carries the exact
+ * durable IDs an operator needs to approve and resume the same plan. */
+export class IntegrationPrepareParkedError extends Error {
+    runId;
+    planId;
+    approvalId;
+    constructor(runId, planId, approvalId) {
+        super(`integration preparation parked: run ${runId}, plan ${planId}, approval ${approvalId}`);
+        this.name = "IntegrationPrepareParkedError";
+        this.runId = runId;
+        this.planId = planId;
+        this.approvalId = approvalId;
+    }
+}
 export async function prepareIntegration(input) {
     const evidence = await readAndValidateEvidence(input.coordRoot, input.runId, input.provider);
     const targetRoot = resolve(input.targetRoot ?? requiredIntegrationRoot(evidence.binding));
@@ -476,7 +490,7 @@ function authorizePlan(input, plan) {
         });
         approvalId = created.approval.request.id;
         if (created.approval.status === "pending") {
-            throw new Error(`integration approval ${approvalId} is pending`);
+            throw new IntegrationPrepareParkedError(input.runId, plan.plan_id, approvalId);
         }
         if (created.approval.status !== "approved" || !created.approval.decision) {
             throw new Error(`integration approval ${approvalId} was denied`);

package/dist/core/workflow/workspaces/leases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leases.d.ts","sourceRoot":"","sources":["../../../../src/core/workflow/workspaces/leases.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,CAAC,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,cAAc,GACd,iBAAiB,GACjB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC;IAC7D,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,OAAO,IAAI,IAAI,CAAC;CACjB;AAUD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,cAAc,CA6FvF"}
+{"version":3,"file":"leases.d.ts","sourceRoot":"","sources":["../../../../src/core/workflow/workspaces/leases.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,CAAC,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,cAAc,GACd,iBAAiB,GACjB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC;IAC7D,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,OAAO,IAAI,IAAI,CAAC;CACjB;AAUD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,0BAA0B,GAAG,cAAc,CAmGvF"}

package/dist/core/workflow/workspaces/leases.js

@@ -66,8 +66,15 @@ export function acquireNoClobberLease(input) {
         recoveryClaimed = true;
         input.onRecoveryStep?.("claim_created");
         const pinPath = join(recoveryPath, "stale-pin");
-        linkSync(currentPath, pinPath);
-        assertSameInodeAndBytes(currentPath, pinPath, observed.bytes);
+        try {
+            linkSync(currentPath, pinPath);
+            assertSameInodeAndBytes(currentPath, pinPath, observed.bytes);
+        }
+        catch {
+            abortUnchangedRecoveryClaim(leaseDir, recoveryPath, pinPath, owner);
+            recoveryClaimed = false;
+            throw new Error(`lease ${input.scope} recovery raced with another contender`);
+        }
         fsyncDirectory(recoveryPath);
         input.onRecoveryStep?.("stale_pinned");
         assertSameInodeAndBytes(currentPath, pinPath, observed.bytes);
@@ -199,6 +206,16 @@ function reclaimAbandonedRecovery(leaseDir, recoveryPath, input, now) {
     rmdirSync(quarantine);
     fsyncDirectory(leaseDir);
 }
+function abortUnchangedRecoveryClaim(leaseDir, recoveryPath, pinPath, claimant) {
+    const claim = readRecoveryClaim(recoveryPath);
+    if (claim.claimant.owner_id !== claimant.owner_id) {
+        throw new Error(`lease ${claimant.scope} recovery ownership changed`);
+    }
+    safeUnlink(pinPath);
+    unlinkSync(join(recoveryPath, "claim.json"));
+    rmdirSync(recoveryPath);
+    fsyncDirectory(leaseDir);
+}
 function readRecoveryClaim(recoveryPath) {
     const path = join(recoveryPath, "claim.json");
     const size = lstatSync(path).size;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harnery",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "Multi-agent coordination for AI coding agents - Claude Code, Cursor, and Codex.",
   "license": "MIT",
   "author": "Ryan Kelly",

package/src/commands/workflow.ts

@@ -1,13 +1,15 @@
-import { resolve } from "node:path";
+import { existsSync } from "node:fs";
+import { join, resolve } from "node:path";
 import type { Command } from "commander";
 import type { EmitContext } from "../commander.ts";
-import { workflowSubscriptionOnly } from "../core/config.ts";
+import { resolveBinName, workflowSubscriptionOnly } from "../core/config.ts";
 import { createBuiltinHarnessRegistry } from "../core/harnesses/index.ts";
 import { findCoordRoot } from "../core/hooks/resolve/coord-root.ts";
 import type { PolicyIsolation } from "../core/policy/index.ts";
 import { loadPolicyFile } from "../core/policy/index.ts";
-import type { WorkflowApprovalStatus } from "../core/workflow/approvals.ts";
+import type { WorkflowApproval, WorkflowApprovalStatus } from "../core/workflow/approvals.ts";
 import { WorkflowParkedError } from "../core/workflow/engine.ts";
+import type { WorkspaceProvider } from "../core/workflow/index.ts";
 
 /**
  * `workflow run <script>`: execute a workflow script — bounded, schema-gated,
@@ -49,6 +51,21 @@ interface WorkflowApprovalDecisionOpts {
   json?: boolean;
 }
 
+interface WorkflowIntegrationPrepareOpts {
+  policy?: string;
+  reviewer?: string;
+  reason?: string;
+  targetRoot?: string;
+  acceptUnknown?: string[];
+  approvalTo?: string;
+  json?: boolean;
+}
+
+interface WorkflowConfirmedMutationOpts {
+  yes?: boolean;
+  json?: boolean;
+}
+
 export function registerWorkflowCommand(program: Command, emit: EmitContext): void {
   const registry = createBuiltinHarnessRegistry();
   const harnesses = registry.ids();
@@ -211,7 +228,7 @@ export function registerWorkflowCommand(program: Command, emit: EmitContext): vo
             emit.text(
               `run ${err.runId} parked\napproval: ${err.approvalId}\n` +
                 `journal: ${err.journalPath}\n` +
-                `resume after resolution: harn workflow resume ${err.runId}\n`,
+                `resume after resolution: ${resolveBinName()} workflow resume ${err.runId}\n`,
             );
           }
           return;
@@ -387,6 +404,200 @@ export function registerWorkflowCommand(program: Command, emit: EmitContext): vo
       );
     });
 
+  const integration = workflow
+    .command("integration")
+    .description("Prepare and apply proof-gated isolated-workspace integration.");
+
+  integration
+    .command("prepare <run-id>")
+    .description("Preview integration and write exact review and policy authority.")
+    .option("--policy <file>", "Current host policy JSON/JSONC for the Git mutation")
+    .option("--reviewer <name>", "Explicit reviewer for a standalone workflow")
+    .option("--reason <text>", "Reason recorded with the standalone review")
+    .option("--target-root <dir>", "Explicit target checkout (default: frozen source checkout)")
+    .option(
+      "--accept-unknown <code>",
+      "Accept one verification unknown by code (repeatable)",
+      collectOption,
+      [],
+    )
+    .option("--approval-to <address>", "Address a durable policy ASK request")
+    .option("--json", "Emit the durable integration plan as JSON")
+    .action(async (runId: string, opts: WorkflowIntegrationPrepareOpts) => {
+      const coordRoot = findCoordRoot();
+      if (!coordRoot) {
+        emit.error({
+          code: "no_coord_root",
+          message: "no .harnery/ coordination root found; run `init` first",
+        });
+        process.exit(1);
+      }
+      if (!opts.policy) {
+        emit.error({
+          code: "integration_policy_required",
+          message: "integration prepare requires --policy <file>",
+        });
+        process.exit(1);
+      }
+      if (opts.reason && !opts.reviewer) {
+        emit.error({
+          code: "integration_reviewer_required",
+          message: "--reason requires --reviewer <name>",
+        });
+        process.exit(1);
+      }
+      try {
+        const provider = await builtInProviderForRun(coordRoot, runId);
+        const { IntegrationPrepareParkedError, prepareIntegration } = await import(
+          "../core/workflow/index.ts"
+        );
+        try {
+          const plan = await prepareIntegration({
+            coordRoot,
+            runId,
+            provider,
+            policy: loadPolicyFile(opts.policy),
+            targetRoot: opts.targetRoot,
+            review: opts.reviewer ? { actor: opts.reviewer, reason: opts.reason } : undefined,
+            acceptedUnknowns: opts.acceptUnknown,
+            approvalAddressee: opts.approvalTo,
+          });
+          if (opts.json) {
+            emit.config({ format: "json" });
+            emit.data(plan);
+            return;
+          }
+          emit.text(
+            `integration plan ${plan.plan_id} authorized\n` +
+              `source: ${plan.provider_preview.source_commit}\n` +
+              `target: ${plan.provider_preview.target_ref} at ${plan.provider_preview.target_commit}\n` +
+              `changes: ${plan.provider_preview.changed_paths.length}\n` +
+              `apply: ${resolveBinName()} workflow integration apply ${runId} --yes\n`,
+          );
+        } catch (error) {
+          if (error instanceof IntegrationPrepareParkedError) {
+            if (opts.json) {
+              emit.config({ format: "json" });
+              emit.data({
+                status: "parked",
+                runId: error.runId,
+                planId: error.planId,
+                approvalId: error.approvalId,
+              });
+            } else {
+              emit.text(
+                `integration preparation parked\n` +
+                  `run: ${error.runId}\n` +
+                  `plan: ${error.planId}\n` +
+                  `approval: ${error.approvalId}\n` +
+                  `approve: ${resolveBinName()} workflow approvals approve ${error.approvalId}\n`,
+              );
+            }
+            return;
+          }
+          throw error;
+        }
+      } catch (error) {
+        emit.error({
+          code: "workflow_integration_prepare_failed",
+          message: error instanceof Error ? error.message : String(error),
+        });
+        process.exit(1);
+      }
+    });
+
+  integration
+    .command("apply <run-id>")
+    .description("Apply an authorized durable integration plan.")
+    .option("--yes", "Confirm the target-branch mutation")
+    .option("--json", "Emit the durable integration receipt as JSON")
+    .action(async (runId: string, opts: WorkflowConfirmedMutationOpts) => {
+      const coordRoot = findCoordRoot();
+      if (!coordRoot) {
+        emit.error({
+          code: "no_coord_root",
+          message: "no .harnery/ coordination root found; run `init` first",
+        });
+        process.exit(1);
+      }
+      if (!opts.yes) {
+        emit.error({
+          code: "integration_confirmation_required",
+          message: "integration apply changes the target branch; pass --yes to confirm",
+        });
+        process.exit(1);
+      }
+      try {
+        const provider = await builtInProviderForRun(coordRoot, runId);
+        const { applyIntegration } = await import("../core/workflow/index.ts");
+        const receipt = await applyIntegration({ coordRoot, runId, provider });
+        if (opts.json) {
+          emit.config({ format: "json" });
+          emit.data(receipt);
+          return;
+        }
+        emit.text(
+          `integration ${receipt.status}: ${receipt.target_ref} at ${receipt.target_commit}\n` +
+            `receipt: ${receipt.receipt_id}\n` +
+            `cleanup: ${resolveBinName()} workflow cleanup ${runId} --yes\n`,
+        );
+      } catch (error) {
+        emit.error({
+          code: "workflow_integration_apply_failed",
+          message: error instanceof Error ? error.message : String(error),
+        });
+        process.exit(1);
+      }
+    });
+
+  workflow
+    .command("cleanup <run-id>")
+    .description("Conservatively release a provider-owned isolated workspace.")
+    .option("--yes", "Confirm the worktree and provider-branch removal attempt")
+    .option("--json", "Emit the cleanup attempt or receipt as JSON")
+    .action(async (runId: string, opts: WorkflowConfirmedMutationOpts) => {
+      const coordRoot = findCoordRoot();
+      if (!coordRoot) {
+        emit.error({
+          code: "no_coord_root",
+          message: "no .harnery/ coordination root found; run `init` first",
+        });
+        process.exit(1);
+      }
+      if (!opts.yes) {
+        emit.error({
+          code: "cleanup_confirmation_required",
+          message: "workspace cleanup may remove a worktree and branch; pass --yes to confirm",
+        });
+        process.exit(1);
+      }
+      try {
+        const provider = await builtInProviderForRun(coordRoot, runId);
+        const { cleanupWorkspace } = await import("../core/workflow/index.ts");
+        const result = await cleanupWorkspace({ coordRoot, runId, provider });
+        if (opts.json) {
+          emit.config({ format: "json" });
+          emit.data(result);
+          return;
+        }
+        const receipt =
+          "receipt_id" in result && typeof result.receipt_id === "string"
+            ? `\nreceipt: ${result.receipt_id}`
+            : "";
+        const reason =
+          "reason" in result && typeof result.reason === "string"
+            ? `\nreason: ${result.reason}`
+            : "";
+        emit.text(`workspace cleanup ${result.status}: ${result.binding_id}${receipt}${reason}\n`);
+      } catch (error) {
+        emit.error({
+          code: "workflow_cleanup_failed",
+          message: error instanceof Error ? error.message : String(error),
+        });
+        process.exit(1);
+      }
+    });
+
   const approvals = workflow
     .command("approvals")
     .description("Inspect and resolve durable workflow policy approvals.");
@@ -488,7 +699,7 @@ export function registerWorkflowCommand(program: Command, emit: EmitContext): vo
             emit.text(
               `${renderWorkflowApproval(resolved.approval)}` +
                 `${resolved.applied ? "decision recorded" : "decision already recorded"}\n` +
-                `resume: harn workflow resume ${resolved.approval.request.run_id}\n`,
+                approvalNextActionHint(coordRoot, resolved.approval),
             );
           }
         } catch (err) {
@@ -533,3 +744,44 @@ export function registerWorkflowCommand(program: Command, emit: EmitContext): vo
       }
     });
 }
+
+async function builtInProviderForRun(coordRoot: string, runId: string): Promise<WorkspaceProvider> {
+  const { createLocalGitWorktreeProvider, readWorkflowRunManifest } = await import(
+    "../core/workflow/index.ts"
+  );
+  const manifest = readWorkflowRunManifest(coordRoot, runId);
+  const binding = manifest.execution.workspace_binding;
+  if (!binding) {
+    throw new Error(`workflow run ${runId} has no isolated workspace binding`);
+  }
+  if (binding.provider.id !== "local-git-worktree") {
+    throw new Error(
+      `workflow run ${runId} requires unavailable workspace provider ${binding.provider.id}`,
+    );
+  }
+  return createLocalGitWorktreeProvider({ coordRoot });
+}
+
+function collectOption(value: string, previous: string[]): string[] {
+  return [...previous, value];
+}
+
+/** Next operator command after resolving an approval. Mid-run parks resume the
+ * workflow; integration prepare parks after the run is already terminal, so
+ * the durable plan is authorized by re-running prepare (resume would fail). */
+function approvalNextActionHint(coordRoot: string, approval: WorkflowApproval): string {
+  const bin = resolveBinName();
+  const runId = approval.request.run_id;
+  const integrationPlanPath = join(
+    coordRoot,
+    ".harnery",
+    "workflows",
+    runId,
+    "integration",
+    "plan.json",
+  );
+  if (existsSync(integrationPlanPath)) {
+    return `prepare: ${bin} workflow integration prepare ${runId}\n`;
+  }
+  return `resume: ${bin} workflow resume ${runId}\n`;
+}

package/src/core/workflow/index.ts

@@ -149,6 +149,7 @@ export {
   cleanupWorkspace,
   createLocalGitWorktreeProvider,
   deriveWorkspaceLifecycle,
+  IntegrationPrepareParkedError,
   inspectWorkflowWorkspace,
   isWorkspaceLifecycleState,
   listWorkflowWorkspaceInspections,

package/src/core/workflow/spawn-cursor.ts

@@ -10,6 +10,9 @@
  *   session_id, …}`).
  * - `--trust` is required: headless runs refuse untrusted workspaces (exit 1,
  *   "Workspace Trust Required") — see the argv comment below.
+ * - `--force` is required: print mode has no channel for an operator to approve
+ *   shell commands, so Smart Auto can leave a child able to patch files but
+ *   unable to test or commit them.
  * - Envelope drift guard: when stdout doesn't parse as JSON but the process
  *   exited 0, the raw stdout is returned as the reply text.
  * - No per-run cost surface → undefined. No max-turns equivalent → `maxTurns`
@@ -51,10 +54,11 @@ export function parseCursorOutput(stdout: string): {
 export function buildCursorInvocation(req: SpawnRequest): HarnessInvocation {
   validateHarnessEffort("cursor", req.effort);
   // --trust: headless cursor-agent refuses untrusted workspaces (exit 1,
-  // "Workspace Trust Required"). Workflow children run in the engine's cwd
-  // deliberately and may edit files — the same posture as the codex adapter's
-  // `--sandbox workspace-write` — so trusting that directory is implied.
-  const argv = ["cursor-agent", "-p", req.prompt, "--output-format", "json", "--trust"];
+  // "Workspace Trust Required"). --force: a print-mode child has no interactive
+  // approval channel, so host-authorized workflow dispatch must let it run
+  // commands. Neither flag maps host policy into child tools; that capability
+  // remains explicitly unsupported.
+  const argv = ["cursor-agent", "-p", req.prompt, "--output-format", "json", "--trust", "--force"];
   if (req.model) argv.push("--model", req.model);
   return { argv };
 }

package/src/core/workflow/workspaces/index.ts

@@ -15,7 +15,11 @@ export {
   renderWorkflowWorkspaceStatus,
 } from "./inspect.ts";
 export type { ApplyIntegrationInput, PrepareIntegrationInput } from "./integration.ts";
-export { applyIntegration, prepareIntegration } from "./integration.ts";
+export {
+  applyIntegration,
+  IntegrationPrepareParkedError,
+  prepareIntegration,
+} from "./integration.ts";
 export type {
   WorkspaceLifecycleProjection,
   WorkspaceLifecycleProjectionInput,

package/src/core/workflow/workspaces/integration.ts

@@ -64,6 +64,22 @@ export interface ApplyIntegrationInput {
   plan?: IntegrationPlan;
 }
 
+/** Host-policy ASK still pending during integration prepare. Carries the exact
+ * durable IDs an operator needs to approve and resume the same plan. */
+export class IntegrationPrepareParkedError extends Error {
+  readonly runId: string;
+  readonly planId: string;
+  readonly approvalId: string;
+
+  constructor(runId: string, planId: string, approvalId: string) {
+    super(`integration preparation parked: run ${runId}, plan ${planId}, approval ${approvalId}`);
+    this.name = "IntegrationPrepareParkedError";
+    this.runId = runId;
+    this.planId = planId;
+    this.approvalId = approvalId;
+  }
+}
+
 export async function prepareIntegration(input: PrepareIntegrationInput): Promise<IntegrationPlan> {
   const evidence = await readAndValidateEvidence(input.coordRoot, input.runId, input.provider);
   const targetRoot = resolve(input.targetRoot ?? requiredIntegrationRoot(evidence.binding));
@@ -662,7 +678,7 @@ function authorizePlan(input: PrepareIntegrationInput, plan: IntegrationPlan): v
     });
     approvalId = created.approval.request.id;
     if (created.approval.status === "pending") {
-      throw new Error(`integration approval ${approvalId} is pending`);
+      throw new IntegrationPrepareParkedError(input.runId, plan.plan_id, approvalId);
     }
     if (created.approval.status !== "approved" || !created.approval.decision) {
       throw new Error(`integration approval ${approvalId} was denied`);

package/src/core/workflow/workspaces/leases.ts

@@ -134,8 +134,14 @@ export function acquireNoClobberLease(input: AcquireNoClobberLeaseInput): NoClob
     input.onRecoveryStep?.("claim_created");
 
     const pinPath = join(recoveryPath, "stale-pin");
-    linkSync(currentPath, pinPath);
-    assertSameInodeAndBytes(currentPath, pinPath, observed.bytes);
+    try {
+      linkSync(currentPath, pinPath);
+      assertSameInodeAndBytes(currentPath, pinPath, observed.bytes);
+    } catch {
+      abortUnchangedRecoveryClaim(leaseDir, recoveryPath, pinPath, owner);
+      recoveryClaimed = false;
+      throw new Error(`lease ${input.scope} recovery raced with another contender`);
+    }
     fsyncDirectory(recoveryPath);
     input.onRecoveryStep?.("stale_pinned");
 
@@ -292,6 +298,22 @@ function reclaimAbandonedRecovery(
   fsyncDirectory(leaseDir);
 }
 
+function abortUnchangedRecoveryClaim(
+  leaseDir: string,
+  recoveryPath: string,
+  pinPath: string,
+  claimant: NoClobberLeaseOwner,
+): void {
+  const claim = readRecoveryClaim(recoveryPath);
+  if (claim.claimant.owner_id !== claimant.owner_id) {
+    throw new Error(`lease ${claimant.scope} recovery ownership changed`);
+  }
+  safeUnlink(pinPath);
+  unlinkSync(join(recoveryPath, "claim.json"));
+  rmdirSync(recoveryPath);
+  fsyncDirectory(leaseDir);
+}
+
 function readRecoveryClaim(recoveryPath: string): RecoveryClaim {
   const path = join(recoveryPath, "claim.json");
   const size = lstatSync(path).size;