agent-hitch 0.2.0 → 0.2.2

package/dist/src/workspaces/index.js

@@ -0,0 +1,6 @@
+export { WORKSPACE_MODES } from "./types.js";
+export { planWorkspace } from "./planner.js";
+export { abandonPlannedWorkspace, cancelPlannedWorkspace, finalizeWorkspace, inspectWorkspace, markWorkspaceFinalizationFailed, markWorkspaceRunning, prepareWorkspace, recoverInterruptedWorkspace, removeWorkspace } from "./lifecycle.js";
+export { workspaceDigest } from "./digest.js";
+export { workspaceManifestFields, workspaceRecordPath } from "./store.js";
+//# sourceMappingURL=index.js.map

package/dist/src/workspaces/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workspaces/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,+BAA+B,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC7O,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC"}

package/dist/src/workspaces/lifecycle.js

@@ -0,0 +1,313 @@
+import { chmod, mkdir, rm } from "node:fs/promises";
+import path from "node:path";
+import { HitchError, atomicWriteJSON, invalidInput, readJSON, statePaths } from "../foundation/index.js";
+import { prepareCopy } from "./copy.js";
+import { workspaceDigest } from "./digest.js";
+import { isolatedGitMetadataDigest, prepareWorktree, registeredWorktree, runGit, tryGitOutput } from "./git.js";
+import { withWorkspaceLock, workspaceRecordPath } from "./store.js";
+import { ACTIVE_WORKSPACE_STATES } from "./types.js";
+import { assertRunId, canonicalizePotentialPath, isWithin, pathExists, throwIfAborted } from "./utils.js";
+export async function prepareWorkspace(plan, { recordPath, signal } = {}) {
+    if (plan.mode === "shared") {
+        const ready = {
+            ...plan,
+            status: "ready",
+            prepared_at: new Date().toISOString(),
+        };
+        if (recordPath)
+            await atomicWriteJSON(recordPath, ready);
+        return ready;
+    }
+    const provisioning = { ...plan, status: "provisioning", provisioning_at: new Date().toISOString() };
+    if (recordPath)
+        await atomicWriteJSON(recordPath, provisioning);
+    let ownsManagedDirectory = false;
+    try {
+        throwIfAborted(signal);
+        await assertManagedPlan(plan);
+        await mkdir(path.dirname(plan.managed_directory), { recursive: true, mode: 0o700 });
+        await chmod(path.dirname(plan.managed_directory), 0o700);
+        if (await pathExists(plan.managed_directory)) {
+            throw new HitchError(`managed workspace already exists for ${plan.run_id}`, {
+                code: "workspace_already_exists",
+                exitCode: 11,
+            });
+        }
+        await mkdir(plan.managed_directory, { mode: 0o700 });
+        ownsManagedDirectory = true;
+        const preparation = plan.mode === "worktree"
+            ? await prepareWorktree(plan, { signal })
+            : await prepareCopy(plan, { signal });
+        await chmod(plan.managed_directory, 0o700);
+        await chmod(plan.execution_root, 0o700);
+        const baselineDigest = preparation?.baseline_digest || await workspaceDigest(plan.execution_root, {
+            signal,
+            excludedTopLevel: gitMetadataExclusion(plan),
+        });
+        const baselineGitMetadataDigest = plan.mode === "copy" && plan.git
+            ? await isolatedGitMetadataDigest(plan.execution_root, { signal })
+            : null;
+        const preparedAt = new Date().toISOString();
+        const ready = {
+            ...provisioning,
+            status: "ready",
+            baseline_digest: baselineDigest,
+            baseline_git_metadata_digest: baselineGitMetadataDigest,
+            snapshot: { ...plan.snapshot, content_digest: baselineDigest, captured_at: preparedAt },
+            retained: true,
+            prepared_at: preparedAt,
+        };
+        if (recordPath)
+            await atomicWriteJSON(recordPath, ready);
+        return ready;
+    }
+    catch (error) {
+        if (ownsManagedDirectory)
+            await cleanupProvisioning(plan).catch(() => { });
+        const errno = error;
+        const workspaceError = errno?.code === "EEXIST"
+            ? new HitchError(`managed workspace already exists for ${plan.run_id}`, {
+                code: "workspace_already_exists",
+                exitCode: 11,
+                cause: error,
+            })
+            : error;
+        const hitchWorkspaceError = workspaceError;
+        const failed = {
+            ...provisioning,
+            status: workspaceError instanceof Error && workspaceError.name === "HitchError" && hitchWorkspaceError.code === "cancelled" ? "cancelled" : "failed",
+            retained: false,
+            error: { code: hitchWorkspaceError.code || "workspace_provision_failed", message: workspaceError?.message || String(workspaceError) },
+            completed_at: new Date().toISOString(),
+        };
+        if (recordPath)
+            await atomicWriteJSON(recordPath, failed);
+        if (workspaceError instanceof HitchError)
+            throw workspaceError;
+        throw new HitchError(`failed to provision isolated workspace: ${workspaceError.message}`, {
+            code: "workspace_provision_failed",
+            exitCode: 5,
+            cause: workspaceError,
+        });
+    }
+}
+export async function markWorkspaceRunning(workspace, { recordPath } = {}) {
+    const running = { ...workspace, status: "running", started_at: new Date().toISOString() };
+    if (recordPath)
+        await atomicWriteJSON(recordPath, running);
+    return running;
+}
+export async function finalizeWorkspace(workspace, { recordPath } = {}) {
+    if (!workspace)
+        return null;
+    if (workspace.mode === "shared") {
+        const released = {
+            ...workspace,
+            status: "released",
+            retained: false,
+            changed: null,
+            finalized_at: new Date().toISOString(),
+        };
+        if (recordPath)
+            await atomicWriteJSON(recordPath, released);
+        return released;
+    }
+    const finalDigest = await workspaceDigest(workspace.execution_root, {
+        excludedTopLevel: gitMetadataExclusion(workspace),
+    });
+    let headAfter = null;
+    let gitStatus = null;
+    let finalGitMetadataDigest = null;
+    if (workspace.git) {
+        headAfter = await tryGitOutput(["-C", workspace.execution_root, "rev-parse", "--verify", "HEAD^{commit}"]);
+        gitStatus = await tryGitOutput(["-C", workspace.execution_root, "status", "--porcelain=v1", "--untracked-files=all"]);
+        if (workspace.mode === "copy")
+            finalGitMetadataDigest = await isolatedGitMetadataDigest(workspace.execution_root);
+    }
+    const gitStateChanged = workspace.git
+        ? gitStatus === null
+            || (workspace.git.head ? !headAfter || headAfter !== workspace.git.head : Boolean(headAfter))
+            || (workspace.mode === "copy" && finalGitMetadataDigest !== workspace.baseline_git_metadata_digest)
+        : false;
+    const retained = {
+        ...workspace,
+        status: "retained",
+        retained: true,
+        changed: finalDigest !== workspace.baseline_digest || gitStateChanged,
+        final_digest: finalDigest,
+        ...(finalGitMetadataDigest ? { final_git_metadata_digest: finalGitMetadataDigest } : {}),
+        ...(headAfter ? { head_after: headAfter } : {}),
+        ...(gitStatus !== null ? { git_dirty: Boolean(gitStatus) } : {}),
+        finalized_at: new Date().toISOString(),
+    };
+    if (recordPath)
+        await atomicWriteJSON(recordPath, retained);
+    return retained;
+}
+export async function markWorkspaceFinalizationFailed(workspace, { recordPath, warning } = {}) {
+    if (!workspace)
+        return null;
+    const terminal = {
+        ...workspace,
+        status: workspace.mode === "shared" ? "released" : "orphaned",
+        retained: workspace.mode !== "shared",
+        changed: null,
+        warning: warning || {
+            code: "workspace_finalization_failed",
+            message: "workspace finalization failed",
+        },
+        finalized_at: new Date().toISOString(),
+    };
+    if (recordPath)
+        await atomicWriteJSON(recordPath, terminal);
+    return terminal;
+}
+export async function cancelPlannedWorkspace({ root, runId }) {
+    return abandonPlannedWorkspace({ root, runId, status: "cancelled" });
+}
+export async function abandonPlannedWorkspace({ root, runId, status = "unused" }) {
+    const recordPath = workspaceRecordPath(root, runId);
+    const workspace = await readJSON(recordPath, null);
+    if (!workspace || workspace.status !== "planned")
+        return workspace;
+    const completed = { ...workspace, status, completed_at: new Date().toISOString() };
+    await atomicWriteJSON(recordPath, completed);
+    return completed;
+}
+export async function recoverInterruptedWorkspace({ root, runId }) {
+    const recordPath = workspaceRecordPath(root, runId);
+    const workspace = await readJSON(recordPath, null);
+    if (!workspace)
+        return null;
+    if (workspace.status === "provisioning") {
+        await cleanupProvisioning(workspace).catch(() => { });
+        const failed = {
+            ...workspace,
+            status: "failed",
+            retained: false,
+            error: { code: "daemon_restarted", message: "daemon stopped while provisioning the workspace" },
+            completed_at: new Date().toISOString(),
+        };
+        await atomicWriteJSON(recordPath, failed);
+        return failed;
+    }
+    if (["ready", "running"].includes(workspace.status)) {
+        const orphaned = {
+            ...workspace,
+            status: workspace.mode === "shared" ? "released" : "orphaned",
+            retained: workspace.mode !== "shared",
+            completed_at: new Date().toISOString(),
+        };
+        await atomicWriteJSON(recordPath, orphaned);
+        return orphaned;
+    }
+    if (workspace.status === "planned")
+        return cancelPlannedWorkspace({ root, runId });
+    return workspace;
+}
+export async function inspectWorkspace({ root, runId }) {
+    assertRunId(runId);
+    return readJSON(workspaceRecordPath(root, runId), null);
+}
+export async function removeWorkspace({ root, runId, force = false }) {
+    assertRunId(runId);
+    const recordPath = workspaceRecordPath(root, runId);
+    const workspace = await readJSON(recordPath, null);
+    if (!workspace) {
+        throw new HitchError(`workspace record not found: ${runId}`, { code: "workspace_not_found", exitCode: 3 });
+    }
+    if (workspace.mode === "shared") {
+        throw invalidInput(`run ${runId} used a shared workspace that Hitch does not own`);
+    }
+    if (ACTIVE_WORKSPACE_STATES.has(workspace.status)) {
+        throw new HitchError(`workspace is still in use by ${runId}`, { code: "workspace_in_use", exitCode: 11 });
+    }
+    if (!force && workspace.changed !== false) {
+        throw new HitchError("workspace may contain changes; pass --force to remove it", {
+            code: "workspace_has_changes",
+            exitCode: 11,
+        });
+    }
+    const expectedDirectory = path.join(await canonicalizePotentialPath(statePaths(root).workspaces), runId);
+    const expectedExecutionRoot = path.join(expectedDirectory, "root");
+    const recordedDirectory = workspace.managed_directory
+        ? await canonicalizePotentialPath(workspace.managed_directory)
+        : null;
+    const recordedExecutionRoot = workspace.execution_root
+        ? await canonicalizePotentialPath(workspace.execution_root)
+        : null;
+    if (!recordedDirectory
+        || !recordedExecutionRoot
+        || path.resolve(recordedDirectory) !== path.resolve(expectedDirectory)
+        || path.resolve(recordedExecutionRoot) !== path.resolve(expectedExecutionRoot)) {
+        throw new HitchError("workspace record points outside the managed workspace root", {
+            code: "workspace_cleanup_rejected",
+            exitCode: 11,
+        });
+    }
+    if (workspace.mode === "worktree" && workspace.git?.common_dir) {
+        const git = workspace.git;
+        await withWorkspaceLock(root, git.common_dir, async () => {
+            if (await pathExists(git.common_dir) && await registeredWorktree(git.common_dir, workspace.execution_root)) {
+                await runGit(["--git-dir", git.common_dir, "worktree", "remove", "--force", workspace.execution_root], {
+                    failureCode: "workspace_cleanup_failed",
+                    failureExitCode: 12,
+                });
+            }
+        });
+    }
+    await rm(expectedDirectory, { recursive: true, force: true });
+    const removed = {
+        ...workspace,
+        status: "removed",
+        retained: false,
+        removed_at: new Date().toISOString(),
+    };
+    await atomicWriteJSON(recordPath, removed);
+    return removed;
+}
+async function cleanupProvisioning(workspace) {
+    await assertManagedPlan(workspace);
+    const git = workspace.git;
+    if (workspace.mode === "worktree"
+        && git?.common_dir
+        && await pathExists(git.common_dir)
+        && await registeredWorktree(git.common_dir, workspace.execution_root)) {
+        await withWorkspaceLock(workspace.state_root, git.common_dir, () => runGit([
+            "--git-dir",
+            git.common_dir,
+            "worktree",
+            "remove",
+            "--force",
+            workspace.execution_root,
+        ], {
+            failureCode: "workspace_cleanup_failed",
+            failureExitCode: 12,
+        })).catch(() => { });
+    }
+    if (workspace.managed_directory)
+        await rm(workspace.managed_directory, { recursive: true, force: true });
+}
+async function assertManagedPlan(workspace) {
+    assertRunId(workspace.run_id);
+    if (!workspace.state_root) {
+        throw new HitchError("workspace plan is missing its state root", {
+            code: "workspace_cleanup_rejected",
+            exitCode: 11,
+        });
+    }
+    const expectedDirectory = path.join(await canonicalizePotentialPath(statePaths(workspace.state_root).workspaces), workspace.run_id);
+    const expectedRoot = path.join(expectedDirectory, "root");
+    if (path.resolve(workspace.managed_directory || "") !== path.resolve(expectedDirectory)
+        || path.resolve(workspace.execution_root || "") !== path.resolve(expectedRoot)
+        || !isWithin(expectedRoot, path.resolve(workspace.execution_workspace || ""))) {
+        throw new HitchError("workspace plan points outside the managed workspace root", {
+            code: "workspace_cleanup_rejected",
+            exitCode: 11,
+        });
+    }
+}
+function gitMetadataExclusion(workspace) {
+    return workspace.git ? new Set([".git"]) : new Set();
+}
+//# sourceMappingURL=lifecycle.js.map

package/dist/src/workspaces/lifecycle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/workspaces/lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/src/workspaces/planner.js

@@ -0,0 +1,80 @@
+import { realpath, stat } from "node:fs/promises";
+import path from "node:path";
+import { HitchError, SCHEMA_VERSION, atomicWriteJSON, invalidInput, statePaths } from "../foundation/index.js";
+import { inspectGitWorkspace } from "./git.js";
+import { WORKSPACE_MODES } from "./types.js";
+import { assertNoWorkspaceOverlap, assertRunId, canonicalizePotentialPath, isWithin } from "./utils.js";
+export async function planWorkspace({ runId, sourceCwd, mode = "shared", root, recordPath }) {
+    assertRunId(runId);
+    if (!WORKSPACE_MODES.has(mode)) {
+        throw invalidInput(`workspace_mode must be one of: ${[...WORKSPACE_MODES].join(", ")}`);
+    }
+    let sourceRealPath;
+    let sourceInfo;
+    try {
+        sourceRealPath = await realpath(sourceCwd);
+        sourceInfo = await stat(sourceRealPath);
+    }
+    catch (error) {
+        throw invalidInput(`workspace does not exist: ${sourceCwd}`, { cause: error });
+    }
+    if (!sourceInfo.isDirectory())
+        throw invalidInput(`workspace is not a directory: ${sourceCwd}`);
+    const paths = statePaths(root);
+    const managedDirectory = path.join(await canonicalizePotentialPath(paths.workspaces), runId);
+    let git = null;
+    let sourceBase = sourceRealPath;
+    let sourceSubdirectory = ".";
+    if (mode !== "shared") {
+        git = await inspectGitWorkspace(sourceRealPath, { required: mode === "worktree" });
+        if (git) {
+            sourceBase = git.repository_root;
+            sourceSubdirectory = path.relative(sourceBase, sourceRealPath) || ".";
+        }
+        const stateRoot = await canonicalizePotentialPath(paths.root);
+        if (isWithin(sourceBase, stateRoot)) {
+            throw new HitchError("the Hitch state root is inside the source workspace; use a --root outside the source repository", { code: "workspace_root_overlap", exitCode: 2 });
+        }
+        assertNoWorkspaceOverlap(sourceBase, managedDirectory);
+    }
+    if (mode === "worktree") {
+        if (git?.status) {
+            throw new HitchError("worktree isolation requires a clean Git workspace; use workspace_mode=copy to preserve local changes", { code: "workspace_dirty", exitCode: 2 });
+        }
+    }
+    const executionRoot = mode === "shared" ? sourceRealPath : path.join(managedDirectory, "root");
+    const executionWorkspace = sourceSubdirectory === "."
+        ? executionRoot
+        : path.join(executionRoot, sourceSubdirectory);
+    const snapshot = mode === "worktree"
+        ? { consistency: "git_commit", ...(git?.head ? { commit: git.head } : {}), source_subdirectory: sourceSubdirectory }
+        : mode === "copy"
+            ? {
+                consistency: "best_effort",
+                ...(git?.head ? { commit: git.head } : {}),
+                source_subdirectory: sourceSubdirectory,
+            }
+            : { consistency: "none", source_subdirectory: "." };
+    const plan = {
+        schema_version: SCHEMA_VERSION,
+        run_id: runId,
+        state_root: path.resolve(root),
+        mode: mode,
+        status: "planned",
+        source_workspace: path.resolve(sourceCwd),
+        source_realpath: sourceRealPath,
+        source_base: sourceBase,
+        source_subdirectory: sourceSubdirectory,
+        execution_root: executionRoot,
+        execution_workspace: executionWorkspace,
+        managed_directory: mode === "shared" ? null : managedDirectory,
+        snapshot,
+        git,
+        retained: false,
+        planned_at: new Date().toISOString(),
+    };
+    if (recordPath)
+        await atomicWriteJSON(recordPath, plan);
+    return plan;
+}
+//# sourceMappingURL=planner.js.map

package/dist/src/workspaces/planner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../../src/workspaces/planner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAExG,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,GAAG,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAwB;IAC/G,WAAW,CAAC,KAAK,CAAC,CAAC;IACnB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,MAAM,YAAY,CAAC,kCAAkC,CAAC,GAAG,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,IAAI,cAAsB,CAAC;IAC3B,IAAI,UAA4C,CAAC;IACjD,IAAI,CAAC;QACH,cAAc,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3C,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,CAAC,6BAA6B,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;QAAE,MAAM,YAAY,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAC;IAEhG,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,yBAAyB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7F,IAAI,GAAG,GAA4B,IAAI,CAAC;IACxC,IAAI,UAAU,GAAG,cAAc,CAAC;IAChC,IAAI,kBAAkB,GAAG,GAAG,CAAC;IAE7B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,GAAG,GAAG,MAAM,mBAAmB,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC,CAAC;QACnF,IAAI,GAAG,EAAE,CAAC;YACR,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC;YACjC,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,IAAI,GAAG,CAAC;QACxE,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,UAAU,CAClB,iGAAiG,EACjG,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAC,EAAE,CAChD,CAAC;QACJ,CAAC;QACD,wBAAwB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,UAAU,CAClB,sGAAsG,EACtG,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,EAAE,CACzC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAC/F,MAAM,kBAAkB,GAAG,kBAAkB,KAAK,GAAG;QACnD,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAsB,IAAI,KAAK,UAAU;QACrD,CAAC,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,mBAAmB,EAAE,kBAAkB,EAAE;QACpH,CAAC,CAAC,IAAI,KAAK,MAAM;YACf,CAAC,CAAC;gBACE,WAAW,EAAE,aAAa;gBAC1B,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,mBAAmB,EAAE,kBAAkB;aACxC;YACH,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC;IAExD,MAAM,IAAI,GAAkB;QAC1B,cAAc,EAAE,cAAc;QAC9B,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC9B,IAAI,EAAE,IAAsC;QAC5C,MAAM,EAAE,SAAS;QACjB,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QACzC,eAAe,EAAE,cAAc;QAC/B,WAAW,EAAE,UAAU;QACvB,mBAAmB,EAAE,kBAAkB;QACvC,cAAc,EAAE,aAAa;QAC7B,mBAAmB,EAAE,kBAAkB;QACvC,iBAAiB,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB;QAC9D,QAAQ;QACR,GAAG;QACH,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACrC,CAAC;IACF,IAAI,UAAU;QAAE,MAAM,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACxD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/src/workspaces/store.js

@@ -0,0 +1,25 @@
+import { sha256Bytes, statePaths, withFileLock } from "../foundation/index.js";
+import path from "node:path";
+export function workspaceRecordPath(root, runId) {
+    return path.join(statePaths(root).runs, runId, "workspace.json");
+}
+export function workspaceManifestFields(workspace) {
+    if (!workspace)
+        return {};
+    return {
+        workspace_mode: workspace.mode,
+        source_workspace: workspace.source_workspace,
+        execution_workspace: workspace.execution_workspace,
+        workspace_snapshot: workspace.snapshot,
+        workspace_retained: Boolean(workspace.retained),
+        ...(workspace.changed !== undefined ? { workspace_changed: workspace.changed } : {}),
+    };
+}
+export async function withWorkspaceLock(root, identity, operation, { signal } = {}) {
+    return withFileLock(statePaths(root).workspaceLocks, sha256Bytes(identity), operation, {
+        timeoutCode: "workspace_locked",
+        timeoutExitCode: 5,
+        ...(signal ? { signal } : {}),
+    });
+}
+//# sourceMappingURL=store.js.map

package/dist/src/workspaces/store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/workspaces/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,UAAU,mBAAmB,CAAC,IAAY,EAAE,KAAY;IAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,SAA2C;IACjF,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,OAAO;QACL,cAAc,EAAE,SAAS,CAAC,IAAI;QAC9B,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;QAC5C,mBAAmB,EAAE,SAAS,CAAC,mBAAmB;QAClD,kBAAkB,EAAE,SAAS,CAAC,QAAQ;QACtC,kBAAkB,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC/C,GAAG,CAAC,SAAS,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAI,IAAY,EAAE,QAAgB,EAAE,SAA2B,EAAE,EAAE,MAAM,KAA2C,EAAE;IAC3J,OAAO,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE;QACrF,WAAW,EAAE,kBAAkB;QAC/B,eAAe,EAAE,CAAC;QAClB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC"}

package/dist/src/workspaces/types.js

@@ -0,0 +1,4 @@
+export const WORKSPACE_MODES = new Set(["shared", "worktree", "copy"]);
+export const COMMAND_TIMEOUT_MS = 120_000;
+export const ACTIVE_WORKSPACE_STATES = new Set(["planned", "provisioning", "ready", "running"]);
+//# sourceMappingURL=types.js.map

package/dist/src/workspaces/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/workspaces/types.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAC1C,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC"}

package/dist/src/workspaces/utils.js

@@ -0,0 +1,56 @@
+import { lstat, realpath } from "node:fs/promises";
+import path from "node:path";
+import { HitchError, invalidInput } from "../foundation/index.js";
+export function assertNoWorkspaceOverlap(source, managedDirectory) {
+    const sourcePath = path.resolve(source);
+    const managedPath = path.resolve(managedDirectory);
+    if (isWithin(sourcePath, managedPath) || isWithin(managedPath, sourcePath)) {
+        throw new HitchError("managed workspace storage overlaps the source workspace; use a Hitch --root outside the source repository", { code: "workspace_root_overlap", exitCode: 2 });
+    }
+}
+export function isWithin(parent, candidate) {
+    const relative = path.relative(parent, candidate);
+    return relative === "" || (!relative.startsWith(`..${path.sep}`) && relative !== "..");
+}
+export async function pathExists(file) {
+    try {
+        await lstat(file);
+        return true;
+    }
+    catch (error) {
+        if (error?.code === "ENOENT")
+            return false;
+        throw error;
+    }
+}
+export async function canonicalizePotentialPath(file) {
+    const missing = [];
+    let current = path.resolve(file);
+    for (;;) {
+        try {
+            const resolved = await realpath(current);
+            return path.join(resolved, ...missing.reverse());
+        }
+        catch (error) {
+            if (error?.code !== "ENOENT")
+                throw error;
+            const parent = path.dirname(current);
+            if (parent === current)
+                throw error;
+            missing.push(path.basename(current));
+            current = parent;
+        }
+    }
+}
+export function assertRunId(runId) {
+    if (!/^run_[a-f0-9]{32}$/.test(runId || ""))
+        throw invalidInput(`invalid run ID: ${runId || ""}`);
+}
+export function throwIfAborted(signal) {
+    if (signal?.aborted)
+        throw cancelledError();
+}
+export function cancelledError() {
+    return new HitchError("workspace preparation cancelled", { code: "cancelled", exitCode: 9 });
+}
+//# sourceMappingURL=utils.js.map

package/dist/src/workspaces/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/workspaces/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAElE,MAAM,UAAU,wBAAwB,CAAC,MAAc,EAAE,gBAAwB;IAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnD,IAAI,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,UAAU,CAClB,2GAA2G,EAC3G,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAC,EAAE,CAChD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAc,EAAE,SAAiB;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAClD,OAAO,QAAQ,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,QAAQ,KAAK,IAAI,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAY;IAC3C,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACtE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,IAAY;IAC1D,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,SAAS,CAAC;QACR,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAA+B,EAAE,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;YACrE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,OAAO,GAAG,MAAM,CAAC;QACnB,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAAE,MAAM,YAAY,CAAC,mBAAmB,KAAK,IAAI,EAAE,EAAE,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAA+B;IAC5D,IAAI,MAAM,EAAE,OAAO;QAAE,MAAM,cAAc,EAAE,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,OAAO,IAAI,UAAU,CAAC,iCAAiC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;AAC/F,CAAC"}

package/docs/schemas/eval-request.schema.json

@@ -9,6 +9,8 @@
     "schema_version": { "const": "1" },
     "backend": { "const": "harbor" },
     "dataset": { "type": "string", "minLength": 1 },
+    "benchmark_id": { "type": "string", "minLength": 1 },
+    "benchmark_revision": { "type": "string", "minLength": 1 },
     "harness_ref": { "type": "string", "minLength": 1 },
     "model": { "type": "string" },
     "attempts": { "type": "integer", "minimum": 1 },

package/docs/schemas/eval-result.schema.json

@@ -4,7 +4,7 @@
   "title": "Hitch eval result",
   "type": "object",
   "additionalProperties": true,
-  "required": ["schema_version", "eval_id", "status", "exit_code", "started_at", "completed_at"],
+  "required": ["schema_version", "eval_id", "benchmark_id", "benchmark_revision", "status", "exit_code", "trials", "started_at", "completed_at"],
   "properties": {
     "schema_version": { "const": "1" },
     "eval_id": { "type": "string", "pattern": "^eval_[a-f0-9]{32}$" },
@@ -25,6 +25,55 @@
       "additionalProperties": true
     },
     "summary": { "type": ["object", "null"] },
+    "benchmark_id": { "type": "string", "minLength": 1 },
+    "benchmark_revision": { "type": "string", "minLength": 1 },
+    "prepared_artifact": {
+      "type": "object",
+      "required": ["artifact_id", "artifact_integrity", "entrypoint_integrity", "harness_id", "revision_identity", "platform", "source_type"],
+      "properties": {
+        "artifact_id": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "artifact_integrity": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "entrypoint_integrity": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "harness_id": { "type": "string", "pattern": "^[a-z][a-z0-9-]*$" },
+        "revision_identity": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "platform": { "type": "string", "pattern": "^(?:linux|darwin|win32)-[a-z0-9_]+$" },
+        "source_type": { "enum": ["npm", "git"] }
+      },
+      "additionalProperties": false
+    },
+    "trials": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["trial_id", "run_id", "task_id", "attempt", "observation_status"],
+        "properties": {
+          "trial_id": { "type": "string", "minLength": 1 },
+          "run_id": { "type": "string", "pattern": "^run_[a-f0-9]{32}$" },
+          "task_id": { "type": "string", "minLength": 1 },
+          "attempt": { "type": "integer", "minimum": 1 },
+          "observation_status": { "enum": ["valid", "invalid"] },
+          "reward": { "type": "number" },
+          "verifier_result_ref": { "type": "string", "minLength": 1 },
+          "invalid_reason": { "type": "string", "minLength": 1 }
+        }
+      }
+    },
+    "local_source_transport": {
+      "type": "object",
+      "required": ["kind", "resolution_identity", "commit", "tree", "payload_sha256", "payload_bytes"],
+      "properties": {
+        "kind": { "const": "local-git-commit" },
+        "resolution_identity": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "commit": { "type": "string", "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" },
+        "tree": { "type": "string", "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" },
+        "payload_sha256": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "payload_bytes": { "type": "integer", "minimum": 0 },
+        "object_count": { "type": "integer", "minimum": 0 },
+        "file_count": { "type": "integer", "minimum": 0 }
+      },
+      "additionalProperties": false
+    },
     "error": {
       "type": "object",
       "required": ["code", "message"],