nawabari 0.7.1 → 0.9.2

package/dist/contract.js

@@ -1,6 +1,11 @@
-import { RESOURCE_CLAIM_FAILURE_CODES } from "./domain/errors.js";
+import { IMPLEMENTATION_FAILURE_CODE_VOCABULARY } from "./failure-code-vocabulary.js";
 import { OPERATION_AUTHORIZATION_POLICY, OPERATION_VOCABULARY } from "./operation-authorization.js";
-import { RESOURCE_CLAIM_COMPATIBILITY_MATRIX, RESOURCE_CLAIM_MODES, RESOURCE_CLAIM_RECOVERY_ACTION_ID, RESOURCE_CLAIM_SCHEMA_VERSION, RESOURCE_CLAIM_TRANSITION_MATRIX, RESOURCE_CLAIM_TRANSITION_MODES, RESOURCE_CLAIM_TRANSITIONS, } from "./resource-claims.js";
+import { RESOURCE_CLAIM_COMPATIBILITY_MATRIX, RESOURCE_CLAIM_MODES, RESOURCE_CLAIM_RECOVERY_ACTION_ID, RESOURCE_CLAIM_SCHEMA_VERSION, RESOURCE_CLAIM_TRANSITION_MATRIX, RESOURCE_CLAIM_TRANSITION_MODES, RESOURCE_CLAIM_TRANSITIONS, LEGACY_RESOURCE_CLAIM_SCHEMA_VERSION, } from "./resource-claims.js";
+import { SESSION_LIFECYCLE_CLASSIFICATION_SCHEMA_VERSION, SESSION_LIFECYCLE_STATES, SESSION_LIFECYCLE_TRANSITION_TABLE, } from "./session-lifecycle-classification.js";
+import { SESSION_LIFECYCLE_ACTION_SCHEMA_VERSION } from "./session-lifecycle-actions.js";
+import { SANDBOX_CONTRACT_ID, SANDBOX_CONTRACT_SCHEMA_VERSION, SANDBOX_OPTIONAL_CAPABILITIES, SANDBOX_REQUIRED_CAPABILITIES, } from "./domain/sandbox.js";
+import { CLI_COMMAND_REGISTRY, resolveCliCommandDefinition } from "./cli-command-registry.js";
+import { DISCARD_PREVIEW_SCHEMA_VERSION } from "./session-registry.js";
 /** Stable discovery identifier for the standalone local execution contract. */
 export const MACHINE_CONTRACT_ID = "nawabari.standalone-execution.v1";
 export const MACHINE_CONTRACT_SCHEMA_VERSION = 1;
@@ -14,6 +19,47 @@ export const RESOURCE_CLAIM_MACHINE_CONTRACT_VERSION = 2;
 export const RESOURCE_CLAIM_RESULT_SCHEMA = "resource-claim.v2";
 export const RESOURCE_CLAIM_TRANSITION_MATRIX_ID = "resource-claim-transition-matrix.v1";
 export const RESOURCE_CLAIM_RECOVERY_SCHEMA = "resource-claim-recovery.v1";
+/**
+ * Registry-lock recovery has a separate public platform contract because a
+ * package can run on more platforms than it can safely reclaim stale locks.
+ */
+export const REGISTRY_LOCK_RECOVERY_CONTRACT_ID = "nawabari.registry-lock-recovery.v1";
+export const REGISTRY_LOCK_RECOVERY_CONTRACT_VERSION = 1;
+/** Public discovery projection of the authoritative protected-execution contract. */
+const PROTECTED_EXECUTION_CAPABILITY = Object.freeze({
+    id: "protected-execution",
+    contract_id: SANDBOX_CONTRACT_ID,
+    schema_version: SANDBOX_CONTRACT_SCHEMA_VERSION,
+    commands: ["session run", "session exec"],
+    command_aliases: [{ alias: "session exec", canonical: "session run" }],
+    result_schema: "sandbox-execution.v1",
+    result_schema_version: SANDBOX_CONTRACT_SCHEMA_VERSION,
+    result_schemas: [
+        {
+            schema: "sandbox-execution.v1",
+            version: SANDBOX_CONTRACT_SCHEMA_VERSION,
+            commands: ["session run", "session exec"],
+        },
+    ],
+    identities: ["session_id", "repository", "worktree", "branch", "network_mode"],
+    required_capabilities: SANDBOX_REQUIRED_CAPABILITIES,
+    optional_capabilities: SANDBOX_OPTIONAL_CAPABILITIES,
+    network_mode: "inherited",
+    fail_closed: true,
+    ambient_fallback: false,
+    readiness: {
+        command: "doctor",
+        report_field: "sandbox",
+        authority: "sandboxDoctorReport",
+        fields: ["platform", "platform_supported", "capabilities", "ready", "missing_required", "network_mode"],
+    },
+    failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["protected-execution"],
+    failure_code_policy: {
+        source: "implementation-owned protected-execution vocabulary",
+        missing_or_extra: "deterministic conformance failure",
+        internal_exceptions: [],
+    },
+});
 /** Public lifecycle names are projections of the existing dispatcher/help identities. */
 const RESOURCE_CLAIM_COMMANDS = Object.freeze([
     "session claim",
@@ -29,6 +75,7 @@ const RESOURCE_CLAIM_COMMANDS = Object.freeze([
     "resource claims",
     "session release",
     "resource release",
+    "migrate",
 ]);
 const RESOURCE_CLAIM_COMMAND_ALIASES = Object.freeze([
     { alias: "resource claim", canonical: "session claim" },
@@ -85,6 +132,18 @@ const RESOURCE_CLAIM_RESULT_MAPPINGS = Object.freeze([
         required: ["claims", "claim_set_generation"],
         nested_claim_schema_version: RESOURCE_CLAIM_SCHEMA_VERSION,
     },
+    {
+        schema: "resource-claim.migration.v1",
+        version: RESOURCE_CLAIM_MACHINE_CONTRACT_VERSION,
+        commands: ["migrate"],
+        required: ["migrated", "registry_schema_version", "claim_schema_version"],
+        source_claim_schema_version: LEGACY_RESOURCE_CLAIM_SCHEMA_VERSION,
+        target_claim_schema_version: RESOURCE_CLAIM_SCHEMA_VERSION,
+        nested_claim_schema_version: RESOURCE_CLAIM_SCHEMA_VERSION,
+        atomic: true,
+        idempotent_retry: true,
+        fail_closed: true,
+    },
 ]);
 function jsonMatrix() {
     return Object.fromEntries(RESOURCE_CLAIM_TRANSITION_MODES.map((source) => [
@@ -115,55 +174,82 @@ function operationRequiredModes() {
 function jsonClone(value) {
     return JSON.parse(JSON.stringify(value));
 }
+/** Resolve every machine-contract command through the canonical CLI registry. */
+function registryCommandReference(command) {
+    const definition = resolveCliCommandDefinition(command);
+    if (definition === undefined) {
+        throw new Error(`Machine contract command is not registered: ${command}`);
+    }
+    const canonical = CLI_COMMAND_REGISTRY.find((candidate) => candidate.name === command || candidate.aliases?.includes(command));
+    if (canonical === undefined) {
+        throw new Error(`Machine contract command has no canonical identity: ${command}`);
+    }
+    return { command: definition.name, canonical_command: canonical.name };
+}
+function registryCommands(commands) {
+    return commands.map((command) => registryCommandReference(command).command);
+}
+function registryCommandReferences(commands) {
+    return commands.map((command) => registryCommandReference(command));
+}
+function registryResultSchemas(mappings) {
+    return jsonClone(mappings.map((mapping) => ({
+        ...jsonClone(mapping),
+        commands: [...registryCommands(mapping.commands)],
+    })));
+}
+function registryAliasReferences(aliases) {
+    return jsonClone(aliases.map((entry) => {
+        const alias = registryCommandReference(entry.alias);
+        const canonical = registryCommandReference(entry.canonical);
+        if (alias.canonical_command !== canonical.canonical_command) {
+            throw new Error(`Machine contract alias identity mismatch: ${entry.alias} -> ${entry.canonical}`);
+        }
+        return { alias: alias.command, canonical: canonical.canonical_command };
+    }));
+}
 const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
+    PROTECTED_EXECUTION_CAPABILITY,
     {
         id: "session-lifecycle",
         commands: ["session create", "session id", "session show", "session list", "status", "session close"],
         result_schema: "session.v1",
-        identities: ["session_id", "repository", "worktree", "branch", "state"],
-        failure_codes: [
-            "NOT_GIT_REPOSITORY",
-            "PROTECTED_WORKTREE",
-            "PROTECTED_BRANCH",
-            "WORKTREE_ALREADY_EXISTS",
-            "BRANCH_ALREADY_EXISTS",
-            "INVALID_SESSION_ID",
-            "INVALID_BASE_REF",
-            "INVALID_REMOTE",
-            "INVALID_REMOTE_BRANCH",
-            "INTEGRATION_FETCH_FAILED",
-            "INVALID_BRANCH",
-            "INVALID_WORKTREE",
-            "WORKTREE_OWNED_BY_OTHER_SESSION",
-            "BRANCH_OWNED_BY_OTHER_SESSION",
-            "REPOSITORY_MISMATCH",
-            "WORKTREE_MISMATCH",
-            "BRANCH_MISMATCH",
-            "STALE_REGISTRY",
-            "GIT_STATE_AMBIGUOUS",
-            "PHYSICAL_OBSERVATION_UNAVAILABLE",
-            "SESSION_NOT_FOUND",
-            "NO_CURRENT_SESSION",
-            "DIRTY_WORKTREE",
-            "RECOVERABLE_COMMITS",
-            "RECOVERABLE_STASHES",
-            "MISSING_WORKTREE",
-            "INVALID_REGISTRY",
-            "OPERATION_REJECTED",
-            "REGISTRY_CORRUPT",
-            "REGISTRY_UNREADABLE",
-            "REGISTRY_DURABILITY_UNCERTAIN",
-            "LOCK_CONTENTION",
-            "GIT_COMMAND_FAILED",
-            "GIT_SPAWN_FAILED",
-            "GIT_TIMEOUT",
-            "GIT_OUTPUT_LIMIT",
+        result_schema_version: 1,
+        result_schemas: [
+            {
+                schema: "session.v1",
+                version: 1,
+                commands: ["session create", "session id", "session show", "session list", "status", "session close"],
+            },
         ],
+        identities: ["session_id", "repository", "worktree", "branch", "state"],
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["session-lifecycle"],
+        failure_code_policy: {
+            source: "implementation-owned session-lifecycle vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
+        registry_lock_recovery: {
+            contract_id: REGISTRY_LOCK_RECOVERY_CONTRACT_ID,
+            contract_version: REGISTRY_LOCK_RECOVERY_CONTRACT_VERSION,
+            supported_platforms: ["linux"],
+            unsupported_platforms: "non-linux",
+            owner_identity: ["hostname", "pid", "processStartTime"],
+            process_generation_provider: "linux:/proc/<pid>/stat:starttime",
+            stale_recovery: {
+                live_owner: "never-reclaim-by-age",
+                unknown_or_remote_owner: "fail-closed",
+                pid_only_identity: "not-sufficient",
+                unsupported_platform: "LOCK_STALE; deliberate operator remediation required",
+            },
+        },
     },
     {
         id: "session-discard",
         commands: ["session discard"],
         result_schema: "session-discard.v1",
+        result_schema_version: 1,
+        result_schemas: [{ schema: "session-discard.v1", version: 1, commands: ["session discard"] }],
         identities: [
             "session_id",
             "previous_head",
@@ -177,34 +263,45 @@ const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
             "final_session_state",
             "idempotent",
         ],
-        failure_codes: [
-            "INVALID_ARGUMENT",
-            "MISSING_ARGUMENT",
-            "INVALID_SESSION_ID",
-            "SESSION_NOT_FOUND",
-            "OPERATION_REJECTED",
-            "OWNERSHIP_MISMATCH",
-            "WORKTREE_MISMATCH",
-            "BRANCH_MISMATCH",
-            "DETACHED_HEAD",
-            "GIT_STATE_AMBIGUOUS",
-            "MISSING_WORKTREE",
-            "PROTECTED_WORKTREE",
-            "PROTECTED_BRANCH",
-            "REGISTRY_CORRUPT",
-            "REGISTRY_UNREADABLE",
-            "REGISTRY_DURABILITY_UNCERTAIN",
-            "LOCK_CONTENTION",
-            "GIT_COMMAND_FAILED",
-            "GIT_SPAWN_FAILED",
-            "GIT_TIMEOUT",
-            "GIT_OUTPUT_LIMIT",
-        ],
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["session-discard"],
+        failure_code_policy: {
+            source: "implementation-owned session-discard vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
+        preview: {
+            option: "--preview",
+            read_only: true,
+            result_schema: "session-discard-preview.v1",
+            result_schema_version: DISCARD_PREVIEW_SCHEMA_VERSION,
+            identities: [
+                "session_id",
+                "repository",
+                "worktree",
+                "branch",
+                "current_state",
+                "persisted_state",
+                "physical_state",
+                "worktree_present",
+                "branch_present",
+                "head",
+                "recoverable_commits",
+                "claims",
+                "claim_count",
+                "destructive_scope",
+                "warning",
+            ],
+            evidence_sources: ["session-diagnostic", "cleanup-reconciliation", "authoritative-claim-snapshot"],
+            destructive: true,
+            one_document: true,
+        },
     },
     {
         id: "session-diagnostics",
         commands: ["session inspect"],
         result_schema: "session-diagnostic.v1",
+        result_schema_version: 1,
+        result_schemas: [{ schema: "session-diagnostic.v1", version: 1, commands: ["session inspect"] }],
         identities: [
             "session_id",
             "repository",
@@ -217,25 +314,38 @@ const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
             "result_state",
             "blockers",
             "safe_actions",
+            "next_action",
+            "next_actions",
             "integration_evidence",
+            "lifecycle_state",
+            "lifecycle",
+            "garbage_collection",
         ],
-        failure_codes: [
-            "INVALID_SESSION_ID",
-            "SESSION_NOT_FOUND",
-            "NO_CURRENT_SESSION",
-            "NOT_GIT_REPOSITORY",
-            "STALE_REGISTRY",
-            "GIT_STATE_AMBIGUOUS",
-            "PHYSICAL_OBSERVATION_UNAVAILABLE",
-            "GIT_COMMAND_FAILED",
-            "GIT_SPAWN_FAILED",
-            "GIT_TIMEOUT",
-            "GIT_OUTPUT_LIMIT",
-            "REGISTRY_CORRUPT",
-            "REGISTRY_UNREADABLE",
-            "REGISTRY_DURABILITY_UNCERTAIN",
-            "LOCK_CONTENTION",
-        ],
+        lifecycle: {
+            schema_version: SESSION_LIFECYCLE_CLASSIFICATION_SCHEMA_VERSION,
+            states: [...SESSION_LIFECYCLE_STATES],
+            transition_table: SESSION_LIFECYCLE_TRANSITION_TABLE,
+            authority: "local-session-registry-observation",
+            age_rule: "elapsed-age-is-diagnostic-only",
+            recovery_actions: {
+                schema_version: SESSION_LIFECYCLE_ACTION_SCHEMA_VERSION,
+                action_ids: [
+                    "retain-session",
+                    "supply-exact-integrated-revision",
+                    "retry-close-with-bounded-integration-fetch",
+                    "discard-session",
+                    "reconcile-physical-state",
+                ],
+                execution: "caller-must-invoke-explicit-command",
+                ambiguity: "retain-or-reconcile; no-destructive-action",
+            },
+        },
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["session-diagnostics"],
+        failure_code_policy: {
+            source: "implementation-owned session-diagnostics vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
     },
     {
         id: "resource-claims",
@@ -258,8 +368,11 @@ const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
             "updated_at",
             "claim_set_generation",
             "previous_claim_set_generation",
+            "migrated",
+            "registry_schema_version",
+            "claim_schema_version",
         ],
-        failure_codes: RESOURCE_CLAIM_FAILURE_CODES,
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["resource-claims"],
         failure_code_policy: {
             source: "implementation-owned resource-claim lifecycle vocabulary",
             missing_or_extra: "deterministic conformance failure",
@@ -348,38 +461,29 @@ const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
         id: "authorization-and-evidence",
         commands: ["guard", "authorize", "checkpoint"],
         result_schema: "decision.v1 / evidence.v1",
-        identities: ["operation", "allowed", "code", "claim_ids", "head", "in_claim", "out_of_claim"],
-        failure_codes: [
-            "INVALID_OPERATION",
-            "INVALID_SESSION_ID",
-            "INVALID_RESOURCE",
-            "MISSING_RESOURCE_CLAIM",
-            "INSUFFICIENT_CLAIM_MODE",
-            "RESOURCE_CLAIM_CONFLICT",
-            "SESSION_NOT_FOUND",
-            "SESSION_NOT_ACTIVE",
-            "NOT_GIT_REPOSITORY",
-            "MISSING_WORKTREE",
-            "REPOSITORY_MISMATCH",
-            "WORKTREE_MISMATCH",
-            "BRANCH_MISMATCH",
-            "DETACHED_HEAD",
-            "STALE_REGISTRY",
-            "GIT_STATE_AMBIGUOUS",
-            "PHYSICAL_OBSERVATION_UNAVAILABLE",
-            "GIT_COMMAND_FAILED",
-            "WORKTREE_OWNED_BY_OTHER_SESSION",
-            "BRANCH_OWNED_BY_OTHER_SESSION",
-            "OWNERSHIP_MISMATCH",
-            "REGISTRY_CORRUPT",
-            "REGISTRY_UNREADABLE",
-            "LOCK_CONTENTION",
+        result_schema_version: 1,
+        result_schemas: [
+            { schema: "decision.v1", version: 1, commands: ["guard", "authorize"] },
+            { schema: "evidence.v1", version: 1, commands: ["checkpoint"] },
         ],
+        identities: ["operation", "allowed", "code", "claim_ids", "head", "in_claim", "out_of_claim"],
+        operation_vocabulary: [...OPERATION_VOCABULARY],
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["authorization-and-evidence"],
+        failure_code_policy: {
+            source: "implementation-owned authorization-and-evidence vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
     },
     {
         id: "repository-evidence",
         commands: ["evidence snapshot", "diff"],
         result_schema: "repository-evidence.v1 / diff.v1",
+        result_schema_version: 1,
+        result_schemas: [
+            { schema: "repository-evidence.v1", version: 1, commands: ["evidence snapshot"] },
+            { schema: "diff.v1", version: 1, commands: ["diff"] },
+        ],
         identities: [
             "session_id",
             "repository",
@@ -391,34 +495,25 @@ const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
             "head",
             "evidence_hash",
         ],
-        failure_codes: [
-            "INVALID_SESSION_ID",
-            "SESSION_NOT_FOUND",
-            "STALE_REGISTRY",
-            "OWNERSHIP_MISMATCH",
-            "NOT_GIT_REPOSITORY",
-            "MISSING_WORKTREE",
-            "REPOSITORY_MISMATCH",
-            "WORKTREE_MISMATCH",
-            "BRANCH_MISMATCH",
-            "DETACHED_HEAD",
-            "GIT_STATE_AMBIGUOUS",
-            "PHYSICAL_OBSERVATION_UNAVAILABLE",
-            "GIT_COMMAND_FAILED",
-            "GIT_SPAWN_FAILED",
-            "GIT_TIMEOUT",
-            "GIT_OUTPUT_LIMIT",
-            "REGISTRY_CORRUPT",
-            "REGISTRY_UNREADABLE",
-            "LOCK_CONTENTION",
-        ],
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["repository-evidence"],
+        failure_code_policy: {
+            source: "implementation-owned repository-evidence vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
     },
     {
         id: "governed-git-mutation",
         commands: ["commit", "push"],
         result_schema: "commit.v1 / push.v1",
+        result_schema_version: 1,
+        result_schemas: [
+            { schema: "commit.v1", version: 1, commands: ["commit"] },
+            { schema: "push.v1", version: 1, commands: ["push"] },
+        ],
         identities: [
             "commit_sha",
+            "reconciliation",
             "source_sha",
             "remote",
             "branch",
@@ -427,71 +522,45 @@ const MACHINE_CONTRACT_CAPABILITIES = Object.freeze([
             "observed_remote_sha",
             "relation",
         ],
-        failure_codes: [
-            "INVALID_COMMIT_MESSAGE",
-            "INVALID_SESSION_ID",
-            "INVALID_OPERATION",
-            "INVALID_RESOURCE",
-            "MISSING_RESOURCE_CLAIM",
-            "INSUFFICIENT_CLAIM_MODE",
-            "RESOURCE_CLAIM_CONFLICT",
-            "SESSION_NOT_FOUND",
-            "SESSION_NOT_ACTIVE",
-            "COMMIT_EMPTY_DIFF",
-            "UNEXPECTED_CHANGED_PATHS",
-            "COMMIT_STAGING_FAILED",
-            "COMMIT_FAILED",
-            "COMMIT_RESULT_UNAVAILABLE",
-            "COMMIT_RESULT_DIVERGED",
-            "GIT_STATE_AMBIGUOUS",
-            "INVALID_REMOTE",
-            "INVALID_REMOTE_BRANCH",
-            "PUSH_TARGET_MISMATCH",
-            "PUSH_REMOTE_INSPECTION_FAILED",
-            "PUSH_NO_UPSTREAM",
-            "PUSH_BEHIND",
-            "PUSH_DIVERGED",
-            "PUSH_DIRTY_WORKTREE",
-            "PUSH_FAILED",
-            "GIT_COMMAND_FAILED",
-            "GIT_SPAWN_FAILED",
-            "GIT_TIMEOUT",
-            "GIT_OUTPUT_LIMIT",
-            "REGISTRY_CORRUPT",
-            "REGISTRY_UNREADABLE",
-        ],
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["governed-git-mutation"],
+        failure_code_policy: {
+            source: "implementation-owned governed-git-mutation vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
+        selectors: {
+            explicit_resources: "--resource <path> (repeatable; existing default)",
+            all_claimed: "--all-claimed (explicit opt-in; mutually exclusive with --resource)",
+            resolution: "authoritative claim snapshot plus concrete Git/repository evidence and operation authorization",
+        },
     },
     {
         id: "reconciliation-and-cleanup",
         commands: ["doctor", "gc"],
         result_schema: "reconciliation.v1 / cleanup.v1",
-        identities: ["clean", "issues", "candidates", "cleaned", "blocked", "recovery_hints"],
-        failure_codes: [
-            "RECONCILIATION_DRIFT",
-            "DOCTOR_FAILED",
-            "NOT_GIT_REPOSITORY",
-            "GIT_COMMAND_FAILED",
-            "GIT_SPAWN_FAILED",
-            "GIT_TIMEOUT",
-            "GIT_OUTPUT_LIMIT",
-            "PROTECTED_WORKTREE",
-            "PROTECTED_BRANCH",
-            "WORKTREE_ALREADY_EXISTS",
-            "BRANCH_ALREADY_EXISTS",
-            "WORKTREE_OWNED_BY_OTHER_SESSION",
-            "BRANCH_OWNED_BY_OTHER_SESSION",
-            "MISSING_WORKTREE",
-            "OWNERSHIP_MISMATCH",
-            "DIRTY_WORKTREE",
-            "RECOVERABLE_COMMITS",
-            "RECOVERABLE_STASHES",
-            "NESTED_REPOSITORY",
-            "STALE_SESSION",
-            "REGISTRY_CORRUPT",
-            "LOCK_CONTENTION",
-            "REGISTRY_UNREADABLE",
-            "REGISTRY_DURABILITY_UNCERTAIN",
+        result_schema_version: 1,
+        result_schemas: [
+            { schema: "reconciliation.v1", version: 1, commands: ["doctor"] },
+            { schema: "cleanup.v1", version: 1, commands: ["gc"] },
+        ],
+        identities: [
+            "clean",
+            "issues",
+            "candidates",
+            "eligible",
+            "cleaned",
+            "blocked",
+            "recovery_hints",
+            "suspicion",
+            "destructive_eligibility",
+            "lifecycle_state",
         ],
+        failure_codes: IMPLEMENTATION_FAILURE_CODE_VOCABULARY["reconciliation-and-cleanup"],
+        failure_code_policy: {
+            source: "implementation-owned reconciliation-and-cleanup vocabulary",
+            missing_or_extra: "deterministic conformance failure",
+            internal_exceptions: [],
+        },
     },
 ]);
 /**
@@ -523,18 +592,26 @@ export function machineContract(packageVersion) {
         },
         capabilities: MACHINE_CONTRACT_CAPABILITIES.map((capability) => ({
             id: capability.id,
-            commands: [...capability.commands],
+            commands: [...registryCommands(capability.commands)],
+            command_references: [...registryCommandReferences(capability.commands)],
             result_schema: capability.result_schema,
+            ...(capability.id !== "resource-claims"
+                ? {
+                    result_schema_version: capability.result_schema_version,
+                    result_schemas: registryResultSchemas(capability.result_schemas),
+                }
+                : {}),
             identities: [...capability.identities],
             failure_codes: [...capability.failure_codes],
+            failure_code_policy: jsonClone(capability.failure_code_policy),
             ...(capability.id === "resource-claims"
                 ? {
                     contract_id: capability.contract_id,
                     contract_version: capability.contract_version,
                     claim_schema_version: capability.claim_schema_version,
                     result_schema_version: capability.result_schema_version,
-                    command_aliases: jsonClone(capability.command_aliases),
-                    result_schemas: jsonClone(capability.result_schemas),
+                    command_aliases: registryAliasReferences(capability.command_aliases),
+                    result_schemas: registryResultSchemas(capability.result_schemas),
                     failure_code_policy: jsonClone(capability.failure_code_policy),
                     transition_matrix: jsonClone(capability.transition_matrix),
                     compatibility: jsonClone(capability.compatibility),
@@ -543,16 +620,42 @@ export function machineContract(packageVersion) {
                     recovery: jsonClone(capability.recovery),
                     operation_required_claim_modes: capability.operation_required_claim_modes,
                     help_dispatcher: {
-                        commands: [...capability.commands],
+                        commands: [...registryCommands(capability.commands)],
                         identity_rule: "each command and alias resolves to an existing dispatcher and help identity",
                     },
                     claim_set_replacement: {
-                        commands: ["session update", "resource update"],
+                        commands: [...registryCommands(["session update", "resource update"])],
                         atomic: true,
                         pairing: "adjacent-resource-mode",
                         idempotent_retry: true,
                         unchanged_on_rejection: true,
                     },
+                    migration: {
+                        command: registryCommandReference("migrate").command,
+                        source_claim_schema_version: LEGACY_RESOURCE_CLAIM_SCHEMA_VERSION,
+                        target_claim_schema_version: RESOURCE_CLAIM_SCHEMA_VERSION,
+                        result_schema: "resource-claim.migration.v1",
+                        atomic: true,
+                        idempotent_retry: true,
+                        fail_closed: true,
+                    },
+                }
+                : {}),
+            ...(capability.id === "session-lifecycle"
+                ? { registry_lock_recovery: jsonClone(capability.registry_lock_recovery) }
+                : {}),
+            ...(capability.id === "session-diagnostics" ? { lifecycle: jsonClone(capability.lifecycle) } : {}),
+            ...(capability.id === "protected-execution"
+                ? {
+                    contract_id: capability.contract_id,
+                    schema_version: capability.schema_version,
+                    command_aliases: registryAliasReferences(capability.command_aliases),
+                    required_capabilities: [...capability.required_capabilities],
+                    optional_capabilities: [...capability.optional_capabilities],
+                    network_mode: capability.network_mode,
+                    fail_closed: capability.fail_closed,
+                    ambient_fallback: capability.ambient_fallback,
+                    readiness: jsonClone(capability.readiness),
                 }
                 : {}),
         })),
@@ -593,6 +696,7 @@ export function machineContract(packageVersion) {
             commands: ["show", "inspect", "claim", "claims", "release", "update", "close", "discard"],
             ambiguity: "supplying both positional and --session is rejected",
             discard_requires_explicit_target: true,
+            discard_preview: "--preview (read-only; one bounded JSON document in machine mode)",
         },
         destructive_lifecycle: {
             command: "session discard",