From 24ad6279eaa32d64a80e9f086393e55d465f19e3 Mon Sep 17 00:00:00 2001 From: elkaix Date: Thu, 27 Aug 2026 21:25:13 -0400 Subject: [PATCH 01/12] refactor(producers): declare inherited writable state on the invocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The macOS Seatbelt backend decided which host directories a Producer could write by sniffing basename(executable) and requiredEnv names — four producer-specific functions living inside src/platform/sandbox/. An adapter the sandbox failed to recognize silently ran with no state access, and every new lane had to edit the sandbox. ProducerInvocation.inheritedStateWritablePaths is now the declaration: each adapter states its own auth/config/state paths and the sandbox grants exactly those when no temporary home is in effect. The four OS-confined CLI probes also collapse into probeOsConfinedCli (resolve -> --version -> optional surface check -> confinement backend -> auth), with Pythinker's --help inspection supplied as a hook. Seatbelt tests now prove the seam (grants exactly the declared paths, ignores them under a temp home, never derives paths from identity or env names); each adapter test asserts its own declaration. The win32-separator HOME test moved with the join into the adapters, which never run on win32. --- CHANGELOG.md | 12 + runtime/server.mjs | 1108 ++++++++++------------- src/platform/sandbox/seatbelt.ts | 79 +- src/producers/agy-adapter.ts | 96 +- src/producers/cli-probe.ts | 123 +++ src/producers/opencode-adapter.ts | 102 +-- src/producers/pi-adapter.ts | 97 +- src/producers/producer-adapter.ts | 8 + src/producers/pythinker-adapter.ts | 132 +-- tests/runtime/agy-adapter.test.ts | 6 + tests/runtime/opencode-adapter.test.ts | 13 + tests/runtime/pi-adapter.test.ts | 6 + tests/runtime/pythinker-adapter.test.ts | 12 + tests/runtime/seatbelt.test.ts | 146 +-- 14 files changed, 742 insertions(+), 1198 deletions(-) create mode 100644 src/producers/cli-probe.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index ad8c8f1..ef45298 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ All notable changes to Claude Architect are recorded here. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and the project uses [semantic versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Changed + +- Producers declare their own host state directories through + `ProducerInvocation.inheritedStateWritablePaths`; the macOS Seatbelt backend + grants exactly those paths instead of guessing a Producer's config directory + from its executable name or required environment variables. A new adapter + therefore touches only its adapter file and the registry. +- The four OS-confined CLI adapters share one probe (`probeOsConfinedCli`) + instead of four copies of the resolve → version → confinement → auth flow. + ## [0.49.0] - 2026-08-08 ### Changed diff --git a/runtime/server.mjs b/runtime/server.mjs index 20b51ff..a99c384 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -34,9 +34,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge mod )); -// node_modules/ajv/dist/compile/codegen/code.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/code.js var require_code = __commonJS({ - "node_modules/ajv/dist/compile/codegen/code.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/code.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.regexpCode = exports.getEsmExportName = exports.getProperty = exports.safeStringify = exports.stringify = exports.strConcat = exports.addCodeArg = exports.str = exports._ = exports.nil = exports._Code = exports.Name = exports.IDENTIFIER = exports._CodeOrName = void 0; @@ -188,9 +188,9 @@ var require_code = __commonJS({ } }); -// node_modules/ajv/dist/compile/codegen/scope.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/scope.js var require_scope = __commonJS({ - "node_modules/ajv/dist/compile/codegen/scope.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/scope.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.ValueScope = exports.ValueScopeName = exports.Scope = exports.varKinds = exports.UsedValueState = void 0; @@ -333,9 +333,9 @@ var require_scope = __commonJS({ } }); -// node_modules/ajv/dist/compile/codegen/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/index.js var require_codegen = __commonJS({ - "node_modules/ajv/dist/compile/codegen/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.or = exports.and = exports.not = exports.CodeGen = exports.operators = exports.varKinds = exports.ValueScopeName = exports.ValueScope = exports.Scope = exports.Name = exports.regexpCode = exports.stringify = exports.getProperty = exports.nil = exports.strConcat = exports.str = exports._ = void 0; @@ -1053,9 +1053,9 @@ var require_codegen = __commonJS({ } }); -// node_modules/ajv/dist/compile/util.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/util.js var require_util = __commonJS({ - "node_modules/ajv/dist/compile/util.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/util.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.checkStrictMode = exports.getErrorPath = exports.Type = exports.useFunc = exports.setEvaluated = exports.evaluatedPropsToName = exports.mergeEvaluated = exports.eachItem = exports.unescapeJsonPointer = exports.escapeJsonPointer = exports.escapeFragment = exports.unescapeFragment = exports.schemaRefOrVal = exports.schemaHasRulesButRef = exports.schemaHasRules = exports.checkUnknownRules = exports.alwaysValidSchema = exports.toHash = void 0; @@ -1220,9 +1220,9 @@ var require_util = __commonJS({ } }); -// node_modules/ajv/dist/compile/names.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/names.js var require_names = __commonJS({ - "node_modules/ajv/dist/compile/names.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/names.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -1259,9 +1259,9 @@ var require_names = __commonJS({ } }); -// node_modules/ajv/dist/compile/errors.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/errors.js var require_errors = __commonJS({ - "node_modules/ajv/dist/compile/errors.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/errors.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.extendErrors = exports.resetErrorsCount = exports.reportExtraError = exports.reportError = exports.keyword$DataError = exports.keywordError = void 0; @@ -1381,9 +1381,9 @@ var require_errors = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/boolSchema.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/boolSchema.js var require_boolSchema = __commonJS({ - "node_modules/ajv/dist/compile/validate/boolSchema.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/boolSchema.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.boolOrEmptySchema = exports.topBoolOrEmptySchema = void 0; @@ -1432,9 +1432,9 @@ var require_boolSchema = __commonJS({ } }); -// node_modules/ajv/dist/compile/rules.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/rules.js var require_rules = __commonJS({ - "node_modules/ajv/dist/compile/rules.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/rules.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getRules = exports.isJSONType = void 0; @@ -1463,9 +1463,9 @@ var require_rules = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/applicability.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/applicability.js var require_applicability = __commonJS({ - "node_modules/ajv/dist/compile/validate/applicability.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/applicability.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.shouldUseRule = exports.shouldUseGroup = exports.schemaHasRulesForType = void 0; @@ -1486,9 +1486,9 @@ var require_applicability = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/dataType.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/dataType.js var require_dataType = __commonJS({ - "node_modules/ajv/dist/compile/validate/dataType.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/dataType.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.reportTypeError = exports.checkDataTypes = exports.checkDataType = exports.coerceAndCheckDataType = exports.getJSONTypes = exports.getSchemaTypes = exports.DataType = void 0; @@ -1670,9 +1670,9 @@ var require_dataType = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/defaults.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/defaults.js var require_defaults = __commonJS({ - "node_modules/ajv/dist/compile/validate/defaults.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/defaults.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.assignDefaults = void 0; @@ -1707,9 +1707,9 @@ var require_defaults = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/code.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/code.js var require_code2 = __commonJS({ - "node_modules/ajv/dist/vocabularies/code.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/code.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateUnion = exports.validateArray = exports.usePattern = exports.callValidateCode = exports.schemaProperties = exports.allSchemaProperties = exports.noPropertyInData = exports.propertyInData = exports.isOwnProperty = exports.hasPropFunc = exports.reportMissingProp = exports.checkMissingProp = exports.checkReportMissingProp = void 0; @@ -1840,9 +1840,9 @@ var require_code2 = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/keyword.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/keyword.js var require_keyword = __commonJS({ - "node_modules/ajv/dist/compile/validate/keyword.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/keyword.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateKeywordUsage = exports.validSchemaType = exports.funcKeywordCode = exports.macroKeywordCode = void 0; @@ -1958,9 +1958,9 @@ var require_keyword = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/subschema.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/subschema.js var require_subschema = __commonJS({ - "node_modules/ajv/dist/compile/validate/subschema.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/subschema.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.extendSubschemaMode = exports.extendSubschemaData = exports.getSubschema = void 0; @@ -2041,9 +2041,9 @@ var require_subschema = __commonJS({ } }); -// node_modules/fast-deep-equal/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-deep-equal/index.js var require_fast_deep_equal = __commonJS({ - "node_modules/fast-deep-equal/index.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-deep-equal/index.js"(exports, module) { "use strict"; module.exports = function equal(a, b) { if (a === b) return true; @@ -2076,9 +2076,9 @@ var require_fast_deep_equal = __commonJS({ } }); -// node_modules/json-schema-traverse/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/json-schema-traverse/index.js var require_json_schema_traverse = __commonJS({ - "node_modules/json-schema-traverse/index.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/json-schema-traverse/index.js"(exports, module) { "use strict"; var traverse = module.exports = function(schema, opts, cb) { if (typeof opts == "function") { @@ -2164,9 +2164,9 @@ var require_json_schema_traverse = __commonJS({ } }); -// node_modules/ajv/dist/compile/resolve.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/resolve.js var require_resolve = __commonJS({ - "node_modules/ajv/dist/compile/resolve.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/resolve.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getSchemaRefs = exports.resolveUrl = exports.normalizeId = exports._getFullPath = exports.getFullPath = exports.inlineRef = void 0; @@ -2320,9 +2320,9 @@ var require_resolve = __commonJS({ } }); -// node_modules/ajv/dist/compile/validate/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/index.js var require_validate = __commonJS({ - "node_modules/ajv/dist/compile/validate/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getData = exports.KeywordCxt = exports.validateFunctionCode = void 0; @@ -2828,9 +2828,9 @@ var require_validate = __commonJS({ } }); -// node_modules/ajv/dist/runtime/validation_error.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/validation_error.js var require_validation_error = __commonJS({ - "node_modules/ajv/dist/runtime/validation_error.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/validation_error.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var ValidationError = class extends Error { @@ -2844,9 +2844,9 @@ var require_validation_error = __commonJS({ } }); -// node_modules/ajv/dist/compile/ref_error.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/ref_error.js var require_ref_error = __commonJS({ - "node_modules/ajv/dist/compile/ref_error.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/ref_error.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var resolve_1 = require_resolve(); @@ -2861,9 +2861,9 @@ var require_ref_error = __commonJS({ } }); -// node_modules/ajv/dist/compile/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/index.js var require_compile = __commonJS({ - "node_modules/ajv/dist/compile/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.resolveSchema = exports.getCompilingSchema = exports.resolveRef = exports.compileSchema = exports.SchemaEnv = void 0; @@ -3085,9 +3085,9 @@ var require_compile = __commonJS({ } }); -// node_modules/ajv/dist/refs/data.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/data.json var require_data = __commonJS({ - "node_modules/ajv/dist/refs/data.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/data.json"(exports, module) { module.exports = { $id: "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#", description: "Meta-schema for $data reference (JSON AnySchema extension proposal)", @@ -3104,9 +3104,9 @@ var require_data = __commonJS({ } }); -// node_modules/fast-uri/lib/utils.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/utils.js var require_utils = __commonJS({ - "node_modules/fast-uri/lib/utils.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/utils.js"(exports, module) { "use strict"; var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu); var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u); @@ -3417,9 +3417,9 @@ var require_utils = __commonJS({ } }); -// node_modules/fast-uri/lib/schemes.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/schemes.js var require_schemes = __commonJS({ - "node_modules/fast-uri/lib/schemes.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/schemes.js"(exports, module) { "use strict"; var { isUUID } = require_utils(); var URN_REG = /([\da-z][\d\-a-z]{0,31}):((?:[\w!$'()*+,\-.:;=@]|%[\da-f]{2})+)/iu; @@ -3627,9 +3627,9 @@ var require_schemes = __commonJS({ } }); -// node_modules/fast-uri/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/index.js var require_fast_uri = __commonJS({ - "node_modules/fast-uri/index.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/index.js"(exports, module) { "use strict"; var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils(); var { SCHEMES, getSchemeHandler } = require_schemes(); @@ -3919,9 +3919,9 @@ var require_fast_uri = __commonJS({ } }); -// node_modules/ajv/dist/runtime/uri.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/uri.js var require_uri = __commonJS({ - "node_modules/ajv/dist/runtime/uri.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/uri.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var uri = require_fast_uri(); @@ -3930,9 +3930,9 @@ var require_uri = __commonJS({ } }); -// node_modules/ajv/dist/core.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/core.js var require_core = __commonJS({ - "node_modules/ajv/dist/core.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/core.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = void 0; @@ -4541,9 +4541,9 @@ var require_core = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/core/id.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/id.js var require_id = __commonJS({ - "node_modules/ajv/dist/vocabularies/core/id.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/id.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var def = { @@ -4556,9 +4556,9 @@ var require_id = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/core/ref.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/ref.js var require_ref = __commonJS({ - "node_modules/ajv/dist/vocabularies/core/ref.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/ref.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.callRef = exports.getValidate = void 0; @@ -4678,9 +4678,9 @@ var require_ref = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/core/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/index.js var require_core2 = __commonJS({ - "node_modules/ajv/dist/vocabularies/core/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var id_1 = require_id(); @@ -4699,9 +4699,9 @@ var require_core2 = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/limitNumber.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitNumber.js var require_limitNumber = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/limitNumber.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitNumber.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4731,9 +4731,9 @@ var require_limitNumber = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/multipleOf.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/multipleOf.js var require_multipleOf = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/multipleOf.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/multipleOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4759,9 +4759,9 @@ var require_multipleOf = __commonJS({ } }); -// node_modules/ajv/dist/runtime/ucs2length.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/ucs2length.js var require_ucs2length = __commonJS({ - "node_modules/ajv/dist/runtime/ucs2length.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/ucs2length.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); function ucs2length(str) { @@ -4785,9 +4785,9 @@ var require_ucs2length = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/limitLength.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitLength.js var require_limitLength = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/limitLength.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitLength.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4817,9 +4817,9 @@ var require_limitLength = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/pattern.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/pattern.js var require_pattern = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/pattern.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/pattern.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -4854,9 +4854,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/limitProperties.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitProperties.js var require_limitProperties = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/limitProperties.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4883,9 +4883,9 @@ var require_limitProperties = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/required.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/required.js var require_required = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/required.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/required.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -4965,9 +4965,9 @@ var require_required = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/limitItems.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitItems.js var require_limitItems = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/limitItems.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4994,9 +4994,9 @@ var require_limitItems = __commonJS({ } }); -// node_modules/ajv/dist/runtime/equal.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/equal.js var require_equal = __commonJS({ - "node_modules/ajv/dist/runtime/equal.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/equal.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var equal = require_fast_deep_equal(); @@ -5005,9 +5005,9 @@ var require_equal = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/uniqueItems.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/uniqueItems.js var require_uniqueItems = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/uniqueItems.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/uniqueItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dataType_1 = require_dataType(); @@ -5072,9 +5072,9 @@ var require_uniqueItems = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/const.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/const.js var require_const = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/const.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/const.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5101,9 +5101,9 @@ var require_const = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/enum.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/enum.js var require_enum = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/enum.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/enum.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5150,9 +5150,9 @@ var require_enum = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/index.js var require_validation = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var limitNumber_1 = require_limitNumber(); @@ -5188,9 +5188,9 @@ var require_validation = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/additionalItems.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalItems.js var require_additionalItems = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/additionalItems.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateAdditionalItems = void 0; @@ -5241,9 +5241,9 @@ var require_additionalItems = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/items.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items.js var require_items = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/items.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateTuple = void 0; @@ -5298,9 +5298,9 @@ var require_items = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/prefixItems.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/prefixItems.js var require_prefixItems = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/prefixItems.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/prefixItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var items_1 = require_items(); @@ -5315,9 +5315,9 @@ var require_prefixItems = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/items2020.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items2020.js var require_items2020 = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/items2020.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items2020.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5350,9 +5350,9 @@ var require_items2020 = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/contains.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/contains.js var require_contains = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/contains.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/contains.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5444,9 +5444,9 @@ var require_contains = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/dependencies.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependencies.js var require_dependencies = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/dependencies.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependencies.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateSchemaDeps = exports.validatePropertyDeps = exports.error = void 0; @@ -5538,9 +5538,9 @@ var require_dependencies = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/propertyNames.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/propertyNames.js var require_propertyNames = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/propertyNames.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/propertyNames.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5581,9 +5581,9 @@ var require_propertyNames = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js var require_additionalProperties = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -5687,9 +5687,9 @@ var require_additionalProperties = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/properties.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/properties.js var require_properties = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/properties.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/properties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var validate_1 = require_validate(); @@ -5745,9 +5745,9 @@ var require_properties = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/patternProperties.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/patternProperties.js var require_patternProperties = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/patternProperties.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/patternProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -5819,9 +5819,9 @@ var require_patternProperties = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/not.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/not.js var require_not = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/not.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/not.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -5850,9 +5850,9 @@ var require_not = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/anyOf.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/anyOf.js var require_anyOf = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/anyOf.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/anyOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -5867,9 +5867,9 @@ var require_anyOf = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/oneOf.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/oneOf.js var require_oneOf = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/oneOf.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/oneOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5925,9 +5925,9 @@ var require_oneOf = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/allOf.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/allOf.js var require_allOf = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/allOf.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/allOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -5952,9 +5952,9 @@ var require_allOf = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/if.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/if.js var require_if = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/if.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/if.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -6021,9 +6021,9 @@ var require_if = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/thenElse.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/thenElse.js var require_thenElse = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/thenElse.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/thenElse.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -6039,9 +6039,9 @@ var require_thenElse = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/index.js var require_applicator = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var additionalItems_1 = require_additionalItems(); @@ -6087,9 +6087,9 @@ var require_applicator = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/format/format.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/format.js var require_format = __commonJS({ - "node_modules/ajv/dist/vocabularies/format/format.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/format.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -6177,9 +6177,9 @@ var require_format = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/format/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/index.js var require_format2 = __commonJS({ - "node_modules/ajv/dist/vocabularies/format/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var format_1 = require_format(); @@ -6188,9 +6188,9 @@ var require_format2 = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/metadata.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/metadata.js var require_metadata = __commonJS({ - "node_modules/ajv/dist/vocabularies/metadata.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/metadata.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.contentVocabulary = exports.metadataVocabulary = void 0; @@ -6211,9 +6211,9 @@ var require_metadata = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/draft7.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft7.js var require_draft7 = __commonJS({ - "node_modules/ajv/dist/vocabularies/draft7.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft7.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var core_1 = require_core2(); @@ -6233,9 +6233,9 @@ var require_draft7 = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/discriminator/types.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/types.js var require_types = __commonJS({ - "node_modules/ajv/dist/vocabularies/discriminator/types.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/types.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.DiscrError = void 0; @@ -6247,9 +6247,9 @@ var require_types = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/discriminator/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/index.js var require_discriminator = __commonJS({ - "node_modules/ajv/dist/vocabularies/discriminator/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -6352,9 +6352,9 @@ var require_discriminator = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-draft-07.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-draft-07.json var require_json_schema_draft_07 = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-draft-07.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-draft-07.json"(exports, module) { module.exports = { $schema: "http://json-schema.org/draft-07/schema#", $id: "http://json-schema.org/draft-07/schema#", @@ -6509,9 +6509,9 @@ var require_json_schema_draft_07 = __commonJS({ } }); -// node_modules/ajv/dist/ajv.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/ajv.js var require_ajv = __commonJS({ - "node_modules/ajv/dist/ajv.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/ajv.js"(exports, module) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MissingRefError = exports.ValidationError = exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = exports.Ajv = void 0; @@ -6579,9 +6579,9 @@ var require_ajv = __commonJS({ } }); -// node_modules/ajv-formats/dist/formats.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/formats.js var require_formats = __commonJS({ - "node_modules/ajv-formats/dist/formats.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/formats.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.formatNames = exports.fastFormats = exports.fullFormats = void 0; @@ -6782,9 +6782,9 @@ var require_formats = __commonJS({ } }); -// node_modules/ajv-formats/dist/limit.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/limit.js var require_limit = __commonJS({ - "node_modules/ajv-formats/dist/limit.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/limit.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.formatLimitDefinition = void 0; @@ -6854,9 +6854,9 @@ var require_limit = __commonJS({ } }); -// node_modules/ajv-formats/dist/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/index.js var require_dist = __commonJS({ - "node_modules/ajv-formats/dist/index.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/index.js"(exports, module) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var formats_1 = require_formats(); @@ -6896,9 +6896,9 @@ var require_dist = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js var require_dynamicAnchor = __commonJS({ - "node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.dynamicAnchor = void 0; @@ -6931,9 +6931,9 @@ var require_dynamicAnchor = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js var require_dynamicRef = __commonJS({ - "node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.dynamicRef = void 0; @@ -6977,9 +6977,9 @@ var require_dynamicRef = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js var require_recursiveAnchor = __commonJS({ - "node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dynamicAnchor_1 = require_dynamicAnchor(); @@ -6998,9 +6998,9 @@ var require_recursiveAnchor = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js var require_recursiveRef = __commonJS({ - "node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dynamicRef_1 = require_dynamicRef(); @@ -7013,9 +7013,9 @@ var require_recursiveRef = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/dynamic/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/index.js var require_dynamic = __commonJS({ - "node_modules/ajv/dist/vocabularies/dynamic/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dynamicAnchor_1 = require_dynamicAnchor(); @@ -7027,9 +7027,9 @@ var require_dynamic = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/dependentRequired.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/dependentRequired.js var require_dependentRequired = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/dependentRequired.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/dependentRequired.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dependencies_1 = require_dependencies(); @@ -7044,9 +7044,9 @@ var require_dependentRequired = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js var require_dependentSchemas = __commonJS({ - "node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dependencies_1 = require_dependencies(); @@ -7060,9 +7060,9 @@ var require_dependentSchemas = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/validation/limitContains.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitContains.js var require_limitContains = __commonJS({ - "node_modules/ajv/dist/vocabularies/validation/limitContains.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitContains.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -7080,9 +7080,9 @@ var require_limitContains = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/next.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/next.js var require_next = __commonJS({ - "node_modules/ajv/dist/vocabularies/next.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/next.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dependentRequired_1 = require_dependentRequired(); @@ -7093,9 +7093,9 @@ var require_next = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js var require_unevaluatedProperties = __commonJS({ - "node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -7159,9 +7159,9 @@ var require_unevaluatedProperties = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js var require_unevaluatedItems = __commonJS({ - "node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -7203,9 +7203,9 @@ var require_unevaluatedItems = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/unevaluated/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/index.js var require_unevaluated = __commonJS({ - "node_modules/ajv/dist/vocabularies/unevaluated/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var unevaluatedProperties_1 = require_unevaluatedProperties(); @@ -7215,9 +7215,9 @@ var require_unevaluated = __commonJS({ } }); -// node_modules/ajv/dist/vocabularies/draft2020.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft2020.js var require_draft2020 = __commonJS({ - "node_modules/ajv/dist/vocabularies/draft2020.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft2020.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var core_1 = require_core2(); @@ -7243,9 +7243,9 @@ var require_draft2020 = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/schema.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/schema.json var require_schema = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/schema.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/schema.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/schema", @@ -7303,9 +7303,9 @@ var require_schema = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json var require_applicator2 = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/applicator", @@ -7356,9 +7356,9 @@ var require_applicator2 = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json var require_unevaluated2 = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/unevaluated", @@ -7376,9 +7376,9 @@ var require_unevaluated2 = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json var require_content = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/content", @@ -7397,9 +7397,9 @@ var require_content = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json var require_core3 = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/core", @@ -7453,9 +7453,9 @@ var require_core3 = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json var require_format_annotation = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/format-annotation", @@ -7472,9 +7472,9 @@ var require_format_annotation = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json var require_meta_data = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/meta-data", @@ -7513,9 +7513,9 @@ var require_meta_data = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json var require_validation2 = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/validation", @@ -7608,9 +7608,9 @@ var require_validation2 = __commonJS({ } }); -// node_modules/ajv/dist/refs/json-schema-2020-12/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/index.js var require_json_schema_2020_12 = __commonJS({ - "node_modules/ajv/dist/refs/json-schema-2020-12/index.js"(exports) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var metaSchema = require_schema(); @@ -7643,9 +7643,9 @@ var require_json_schema_2020_12 = __commonJS({ } }); -// node_modules/ajv/dist/2020.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/2020.js var require__ = __commonJS({ - "node_modules/ajv/dist/2020.js"(exports, module) { + "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/2020.js"(exports, module) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MissingRefError = exports.ValidationError = exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = exports.Ajv2020 = void 0; @@ -7723,7 +7723,7 @@ var require__ = __commonJS({ // src/index.ts import { pathToFileURL } from "node:url"; -// node_modules/zod/v3/helpers/util.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/helpers/util.js var util; (function(util2) { util2.assertEqual = (_) => { @@ -7857,7 +7857,7 @@ var getParsedType = (data) => { } }; -// node_modules/zod/v3/ZodError.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/ZodError.js var ZodIssueCode = util.arrayToEnum([ "invalid_type", "invalid_literal", @@ -7971,7 +7971,7 @@ ZodError.create = (issues) => { return error51; }; -// node_modules/zod/v3/locales/en.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/locales/en.js var errorMap = (issue2, _ctx) => { let message; switch (issue2.code) { @@ -8074,13 +8074,13 @@ var errorMap = (issue2, _ctx) => { }; var en_default = errorMap; -// node_modules/zod/v3/errors.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/errors.js var overrideErrorMap = en_default; function getErrorMap() { return overrideErrorMap; } -// node_modules/zod/v3/helpers/parseUtil.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/helpers/parseUtil.js var makeIssue = (params) => { const { data, path: path32, errorMaps, issueData } = params; const fullPath = [...path32, ...issueData.path || []]; @@ -8189,14 +8189,14 @@ var isDirty = (x) => x.status === "dirty"; var isValid = (x) => x.status === "valid"; var isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise; -// node_modules/zod/v3/helpers/errorUtil.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/helpers/errorUtil.js var errorUtil; (function(errorUtil2) { errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {}; errorUtil2.toString = (message) => typeof message === "string" ? message : message?.message; })(errorUtil || (errorUtil = {})); -// node_modules/zod/v3/types.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/types.js var ParseInputLazyPath = class { constructor(parent, value, path32, key) { this._cachedPath = []; @@ -11599,7 +11599,7 @@ var nullableType = ZodNullable.create; var preprocessType = ZodEffects.createWithPreprocess; var pipelineType = ZodPipeline.create; -// node_modules/zod/v4/core/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/index.js var core_exports2 = {}; __export(core_exports2, { $ZodAny: () => $ZodAny, @@ -11878,7 +11878,7 @@ __export(core_exports2, { version: () => version }); -// node_modules/zod/v4/core/core.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/core.js var _a; var NEVER = /* @__PURE__ */ Object.freeze({ status: "aborted" @@ -11955,7 +11955,7 @@ function config(newConfig) { return globalConfig; } -// node_modules/zod/v4/core/util.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/util.js var util_exports = {}; __export(util_exports, { BIGINT_FORMAT_RANGES: () => BIGINT_FORMAT_RANGES, @@ -12651,7 +12651,7 @@ var Class = class { } }; -// node_modules/zod/v4/core/errors.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/errors.js var initializer = (inst, def) => { inst.name = "$ZodError"; Object.defineProperty(inst, "_zod", { @@ -12790,7 +12790,7 @@ function prettifyError(error51) { return lines.join("\n"); } -// node_modules/zod/v4/core/parse.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/parse.js var _parse = (_Err) => (schema, value, _ctx, _params) => { const ctx = _ctx ? { ..._ctx, async: false } : { async: false }; const result = schema._zod.run({ value, issues: [] }, ctx); @@ -12878,7 +12878,7 @@ var _safeDecodeAsync = (_Err) => async (schema, value, _ctx) => { }; var safeDecodeAsync = /* @__PURE__ */ _safeDecodeAsync($ZodRealError); -// node_modules/zod/v4/core/regexes.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/regexes.js var regexes_exports = {}; __export(regexes_exports, { base64: () => base64, @@ -13037,7 +13037,7 @@ var sha512_hex = /^[0-9a-fA-F]{128}$/; var sha512_base64 = /* @__PURE__ */ fixedBase64(86, "=="); var sha512_base64url = /* @__PURE__ */ fixedBase64url(86); -// node_modules/zod/v4/core/checks.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/checks.js var $ZodCheck = /* @__PURE__ */ $constructor("$ZodCheck", (inst, def) => { var _a3; inst._zod ?? (inst._zod = {}); @@ -13585,7 +13585,7 @@ var $ZodCheckOverwrite = /* @__PURE__ */ $constructor("$ZodCheckOverwrite", (ins }; }); -// node_modules/zod/v4/core/doc.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/doc.js var Doc = class { constructor(args = []) { this.content = []; @@ -13621,14 +13621,14 @@ var Doc = class { } }; -// node_modules/zod/v4/core/versions.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/versions.js var version = { major: 4, minor: 4, patch: 3 }; -// node_modules/zod/v4/core/schemas.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/schemas.js var $ZodType = /* @__PURE__ */ $constructor("$ZodType", (inst, def) => { var _a3; inst ?? (inst = {}); @@ -15721,7 +15721,7 @@ function handleRefineResult(result, payload, input, inst) { } } -// node_modules/zod/v4/locales/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/index.js var locales_exports = {}; __export(locales_exports, { ar: () => ar_default, @@ -15778,7 +15778,7 @@ __export(locales_exports, { zhTW: () => zh_TW_default }); -// node_modules/zod/v4/locales/ar.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ar.js var error = () => { const Sizable = { string: { unit: "\u062D\u0631\u0641", verb: "\u0623\u0646 \u064A\u062D\u0648\u064A" }, @@ -15885,7 +15885,7 @@ function ar_default() { }; } -// node_modules/zod/v4/locales/az.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/az.js var error2 = () => { const Sizable = { string: { unit: "simvol", verb: "olmal\u0131d\u0131r" }, @@ -15991,7 +15991,7 @@ function az_default() { }; } -// node_modules/zod/v4/locales/be.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/be.js function getBelarusianPlural(count, one, few, many) { const absCount = Math.abs(count); const lastDigit = absCount % 10; @@ -16148,7 +16148,7 @@ function be_default() { }; } -// node_modules/zod/v4/locales/bg.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/bg.js var error4 = () => { const Sizable = { string: { unit: "\u0441\u0438\u043C\u0432\u043E\u043B\u0430", verb: "\u0434\u0430 \u0441\u044A\u0434\u044A\u0440\u0436\u0430" }, @@ -16269,7 +16269,7 @@ function bg_default() { }; } -// node_modules/zod/v4/locales/ca.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ca.js var error5 = () => { const Sizable = { string: { unit: "car\xE0cters", verb: "contenir" }, @@ -16378,7 +16378,7 @@ function ca_default() { }; } -// node_modules/zod/v4/locales/cs.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/cs.js var error6 = () => { const Sizable = { string: { unit: "znak\u016F", verb: "m\xEDt" }, @@ -16490,7 +16490,7 @@ function cs_default() { }; } -// node_modules/zod/v4/locales/da.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/da.js var error7 = () => { const Sizable = { string: { unit: "tegn", verb: "havde" }, @@ -16606,7 +16606,7 @@ function da_default() { }; } -// node_modules/zod/v4/locales/de.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/de.js var error8 = () => { const Sizable = { string: { unit: "Zeichen", verb: "zu haben" }, @@ -16715,7 +16715,7 @@ function de_default() { }; } -// node_modules/zod/v4/locales/el.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/el.js var error9 = () => { const Sizable = { string: { unit: "\u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03AE\u03C1\u03B5\u03C2", verb: "\u03BD\u03B1 \u03AD\u03C7\u03B5\u03B9" }, @@ -16825,7 +16825,7 @@ function el_default() { }; } -// node_modules/zod/v4/locales/en.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/en.js var error10 = () => { const Sizable = { string: { unit: "characters", verb: "to have" }, @@ -16938,7 +16938,7 @@ function en_default2() { }; } -// node_modules/zod/v4/locales/eo.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/eo.js var error11 = () => { const Sizable = { string: { unit: "karaktrojn", verb: "havi" }, @@ -17048,7 +17048,7 @@ function eo_default() { }; } -// node_modules/zod/v4/locales/es.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/es.js var error12 = () => { const Sizable = { string: { unit: "caracteres", verb: "tener" }, @@ -17181,7 +17181,7 @@ function es_default() { }; } -// node_modules/zod/v4/locales/fa.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fa.js var error13 = () => { const Sizable = { string: { unit: "\u06A9\u0627\u0631\u0627\u06A9\u062A\u0631", verb: "\u062F\u0627\u0634\u062A\u0647 \u0628\u0627\u0634\u062F" }, @@ -17296,7 +17296,7 @@ function fa_default() { }; } -// node_modules/zod/v4/locales/fi.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fi.js var error14 = () => { const Sizable = { string: { unit: "merkki\xE4", subject: "merkkijonon" }, @@ -17409,7 +17409,7 @@ function fi_default() { }; } -// node_modules/zod/v4/locales/fr.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fr.js var error15 = () => { const Sizable = { string: { unit: "caract\xE8res", verb: "avoir" }, @@ -17535,7 +17535,7 @@ function fr_default() { }; } -// node_modules/zod/v4/locales/fr-CA.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fr-CA.js var error16 = () => { const Sizable = { string: { unit: "caract\xE8res", verb: "avoir" }, @@ -17643,7 +17643,7 @@ function fr_CA_default() { }; } -// node_modules/zod/v4/locales/he.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/he.js var error17 = () => { const TypeNames = { string: { label: "\u05DE\u05D7\u05E8\u05D5\u05D6\u05EA", gender: "f" }, @@ -17838,7 +17838,7 @@ function he_default() { }; } -// node_modules/zod/v4/locales/hr.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/hr.js var error18 = () => { const Sizable = { string: { unit: "znakova", verb: "imati" }, @@ -17961,7 +17961,7 @@ function hr_default() { }; } -// node_modules/zod/v4/locales/hu.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/hu.js var error19 = () => { const Sizable = { string: { unit: "karakter", verb: "legyen" }, @@ -18070,7 +18070,7 @@ function hu_default() { }; } -// node_modules/zod/v4/locales/hy.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/hy.js function getArmenianPlural(count, one, many) { return Math.abs(count) === 1 ? one : many; } @@ -18218,7 +18218,7 @@ function hy_default() { }; } -// node_modules/zod/v4/locales/id.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/id.js var error21 = () => { const Sizable = { string: { unit: "karakter", verb: "memiliki" }, @@ -18325,7 +18325,7 @@ function id_default() { }; } -// node_modules/zod/v4/locales/is.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/is.js var error22 = () => { const Sizable = { string: { unit: "stafi", verb: "a\xF0 hafa" }, @@ -18435,7 +18435,7 @@ function is_default() { }; } -// node_modules/zod/v4/locales/it.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/it.js var error23 = () => { const Sizable = { string: { unit: "caratteri", verb: "avere" }, @@ -18544,7 +18544,7 @@ function it_default() { }; } -// node_modules/zod/v4/locales/ja.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ja.js var error24 = () => { const Sizable = { string: { unit: "\u6587\u5B57", verb: "\u3067\u3042\u308B" }, @@ -18652,7 +18652,7 @@ function ja_default() { }; } -// node_modules/zod/v4/locales/ka.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ka.js var error25 = () => { const Sizable = { string: { unit: "\u10E1\u10D8\u10DB\u10D1\u10DD\u10DA\u10DD", verb: "\u10E3\u10DC\u10D3\u10D0 \u10E8\u10D4\u10D8\u10EA\u10D0\u10D5\u10D3\u10D4\u10E1" }, @@ -18765,7 +18765,7 @@ function ka_default() { }; } -// node_modules/zod/v4/locales/km.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/km.js var error26 = () => { const Sizable = { string: { unit: "\u178F\u17BD\u17A2\u1780\u17D2\u179F\u179A", verb: "\u1782\u17BD\u179A\u1798\u17B6\u1793" }, @@ -18876,12 +18876,12 @@ function km_default() { }; } -// node_modules/zod/v4/locales/kh.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/kh.js function kh_default() { return km_default(); } -// node_modules/zod/v4/locales/ko.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ko.js var error27 = () => { const Sizable = { string: { unit: "\uBB38\uC790", verb: "to have" }, @@ -18993,7 +18993,7 @@ function ko_default() { }; } -// node_modules/zod/v4/locales/lt.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/lt.js var capitalizeFirstCharacter = (text) => { return text.charAt(0).toUpperCase() + text.slice(1); }; @@ -19197,7 +19197,7 @@ function lt_default() { }; } -// node_modules/zod/v4/locales/mk.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/mk.js var error29 = () => { const Sizable = { string: { unit: "\u0437\u043D\u0430\u0446\u0438", verb: "\u0434\u0430 \u0438\u043C\u0430\u0430\u0442" }, @@ -19307,7 +19307,7 @@ function mk_default() { }; } -// node_modules/zod/v4/locales/ms.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ms.js var error30 = () => { const Sizable = { string: { unit: "aksara", verb: "mempunyai" }, @@ -19415,7 +19415,7 @@ function ms_default() { }; } -// node_modules/zod/v4/locales/nl.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/nl.js var error31 = () => { const Sizable = { string: { unit: "tekens", verb: "heeft" }, @@ -19526,7 +19526,7 @@ function nl_default() { }; } -// node_modules/zod/v4/locales/no.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/no.js var error32 = () => { const Sizable = { string: { unit: "tegn", verb: "\xE5 ha" }, @@ -19635,7 +19635,7 @@ function no_default() { }; } -// node_modules/zod/v4/locales/ota.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ota.js var error33 = () => { const Sizable = { string: { unit: "harf", verb: "olmal\u0131d\u0131r" }, @@ -19745,7 +19745,7 @@ function ota_default() { }; } -// node_modules/zod/v4/locales/ps.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ps.js var error34 = () => { const Sizable = { string: { unit: "\u062A\u0648\u06A9\u064A", verb: "\u0648\u0644\u0631\u064A" }, @@ -19860,7 +19860,7 @@ function ps_default() { }; } -// node_modules/zod/v4/locales/pl.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/pl.js var error35 = () => { const Sizable = { string: { unit: "znak\xF3w", verb: "mie\u0107" }, @@ -19970,7 +19970,7 @@ function pl_default() { }; } -// node_modules/zod/v4/locales/pt.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/pt.js var error36 = () => { const Sizable = { string: { unit: "caracteres", verb: "ter" }, @@ -20079,7 +20079,7 @@ function pt_default() { }; } -// node_modules/zod/v4/locales/ro.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ro.js var error37 = () => { const Sizable = { string: { unit: "caractere", verb: "s\u0103 aib\u0103" }, @@ -20199,7 +20199,7 @@ function ro_default() { }; } -// node_modules/zod/v4/locales/ru.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ru.js function getRussianPlural(count, one, few, many) { const absCount = Math.abs(count); const lastDigit = absCount % 10; @@ -20356,7 +20356,7 @@ function ru_default() { }; } -// node_modules/zod/v4/locales/sl.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/sl.js var error39 = () => { const Sizable = { string: { unit: "znakov", verb: "imeti" }, @@ -20466,7 +20466,7 @@ function sl_default() { }; } -// node_modules/zod/v4/locales/sv.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/sv.js var error40 = () => { const Sizable = { string: { unit: "tecken", verb: "att ha" }, @@ -20577,7 +20577,7 @@ function sv_default() { }; } -// node_modules/zod/v4/locales/ta.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ta.js var error41 = () => { const Sizable = { string: { unit: "\u0B8E\u0BB4\u0BC1\u0BA4\u0BCD\u0BA4\u0BC1\u0B95\u0BCD\u0B95\u0BB3\u0BCD", verb: "\u0B95\u0BCA\u0BA3\u0BCD\u0B9F\u0BBF\u0BB0\u0BC1\u0B95\u0BCD\u0B95 \u0BB5\u0BC7\u0BA3\u0BCD\u0B9F\u0BC1\u0BAE\u0BCD" }, @@ -20688,7 +20688,7 @@ function ta_default() { }; } -// node_modules/zod/v4/locales/th.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/th.js var error42 = () => { const Sizable = { string: { unit: "\u0E15\u0E31\u0E27\u0E2D\u0E31\u0E01\u0E29\u0E23", verb: "\u0E04\u0E27\u0E23\u0E21\u0E35" }, @@ -20799,7 +20799,7 @@ function th_default() { }; } -// node_modules/zod/v4/locales/tr.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/tr.js var error43 = () => { const Sizable = { string: { unit: "karakter", verb: "olmal\u0131" }, @@ -20905,7 +20905,7 @@ function tr_default() { }; } -// node_modules/zod/v4/locales/uk.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/uk.js var error44 = () => { const Sizable = { string: { unit: "\u0441\u0438\u043C\u0432\u043E\u043B\u0456\u0432", verb: "\u043C\u0430\u0442\u0438\u043C\u0435" }, @@ -21014,12 +21014,12 @@ function uk_default() { }; } -// node_modules/zod/v4/locales/ua.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ua.js function ua_default() { return uk_default(); } -// node_modules/zod/v4/locales/ur.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ur.js var error45 = () => { const Sizable = { string: { unit: "\u062D\u0631\u0648\u0641", verb: "\u06C1\u0648\u0646\u0627" }, @@ -21130,7 +21130,7 @@ function ur_default() { }; } -// node_modules/zod/v4/locales/uz.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/uz.js var error46 = () => { const Sizable = { string: { unit: "belgi", verb: "bo\u2018lishi kerak" }, @@ -21241,7 +21241,7 @@ function uz_default() { }; } -// node_modules/zod/v4/locales/vi.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/vi.js var error47 = () => { const Sizable = { string: { unit: "k\xFD t\u1EF1", verb: "c\xF3" }, @@ -21350,7 +21350,7 @@ function vi_default() { }; } -// node_modules/zod/v4/locales/zh-CN.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/zh-CN.js var error48 = () => { const Sizable = { string: { unit: "\u5B57\u7B26", verb: "\u5305\u542B" }, @@ -21460,7 +21460,7 @@ function zh_CN_default() { }; } -// node_modules/zod/v4/locales/zh-TW.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/zh-TW.js var error49 = () => { const Sizable = { string: { unit: "\u5B57\u5143", verb: "\u64C1\u6709" }, @@ -21568,7 +21568,7 @@ function zh_TW_default() { }; } -// node_modules/zod/v4/locales/yo.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/yo.js var error50 = () => { const Sizable = { string: { unit: "\xE0mi", verb: "n\xED" }, @@ -21676,7 +21676,7 @@ function yo_default() { }; } -// node_modules/zod/v4/core/registries.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/registries.js var _a2; var $output = /* @__PURE__ */ Symbol("ZodOutput"); var $input = /* @__PURE__ */ Symbol("ZodInput"); @@ -21726,7 +21726,7 @@ function registry() { (_a2 = globalThis).__zod_globalRegistry ?? (_a2.__zod_globalRegistry = registry()); var globalRegistry = globalThis.__zod_globalRegistry; -// node_modules/zod/v4/core/api.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/api.js // @__NO_SIDE_EFFECTS__ function _string(Class2, params) { return new Class2({ @@ -22765,7 +22765,7 @@ function _stringFormat(Class2, format, fnOrRegex, _params = {}) { return inst; } -// node_modules/zod/v4/core/to-json-schema.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/to-json-schema.js function initializeContext(params) { let target = params?.target ?? "draft-2020-12"; if (target === "draft-4") @@ -23124,7 +23124,7 @@ var createStandardJSONSchemaMethod = (schema, io, processors = {}) => (params) = return finalize(ctx, schema); }; -// node_modules/zod/v4/core/json-schema-processors.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/json-schema-processors.js var formatMap = { guid: "uuid", url: "uri", @@ -23668,7 +23668,7 @@ function toJSONSchema(input, params) { return finalize(ctx, input); } -// node_modules/zod/v4/core/json-schema-generator.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/json-schema-generator.js var JSONSchemaGenerator = class { /** @deprecated Access via ctx instead */ get metadataRegistry() { @@ -23743,10 +23743,10 @@ var JSONSchemaGenerator = class { } }; -// node_modules/zod/v4/core/json-schema.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/json-schema.js var json_schema_exports = {}; -// node_modules/zod/v4/mini/schemas.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/mini/schemas.js var ZodMiniType = /* @__PURE__ */ $constructor("ZodMiniType", (inst, def) => { if (!inst._zod) throw new Error("Uninitialized schema in ZodMiniType."); @@ -23792,7 +23792,7 @@ function object(shape, params) { return new ZodMiniObject(def); } -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js function isZ4Schema(s) { const schema = s; return !!schema._zod; @@ -23952,7 +23952,7 @@ function getLiteralValue(schema) { return void 0; } -// node_modules/zod/v4/classic/external.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/external.js var external_exports = {}; __export(external_exports, { $brand: () => $brand, @@ -24195,7 +24195,7 @@ __export(external_exports, { xor: () => xor }); -// node_modules/zod/v4/classic/schemas.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/schemas.js var schemas_exports2 = {}; __export(schemas_exports2, { ZodAny: () => ZodAny2, @@ -24366,7 +24366,7 @@ __export(schemas_exports2, { xor: () => xor }); -// node_modules/zod/v4/classic/checks.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/checks.js var checks_exports2 = {}; __export(checks_exports2, { endsWith: () => _endsWith, @@ -24400,7 +24400,7 @@ __export(checks_exports2, { uppercase: () => _uppercase }); -// node_modules/zod/v4/classic/iso.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/iso.js var iso_exports2 = {}; __export(iso_exports2, { ZodISODate: () => ZodISODate, @@ -24441,7 +24441,7 @@ function duration2(params) { return _isoDuration(ZodISODuration, params); } -// node_modules/zod/v4/classic/errors.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/errors.js var initializer2 = (inst, issues) => { $ZodError.init(inst, issues); inst.name = "ZodError"; @@ -24481,7 +24481,7 @@ var ZodRealError = /* @__PURE__ */ $constructor("ZodError", initializer2, { Parent: Error }); -// node_modules/zod/v4/classic/parse.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/parse.js var parse2 = /* @__PURE__ */ _parse(ZodRealError); var parseAsync2 = /* @__PURE__ */ _parseAsync(ZodRealError); var safeParse3 = /* @__PURE__ */ _safeParse(ZodRealError); @@ -24495,7 +24495,7 @@ var safeDecode2 = /* @__PURE__ */ _safeDecode(ZodRealError); var safeEncodeAsync2 = /* @__PURE__ */ _safeEncodeAsync(ZodRealError); var safeDecodeAsync2 = /* @__PURE__ */ _safeDecodeAsync(ZodRealError); -// node_modules/zod/v4/classic/schemas.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/schemas.js var _installedGroups = /* @__PURE__ */ new WeakMap(); function _installLazyMethods(inst, group, methods) { const proto = Object.getPrototypeOf(inst); @@ -25785,7 +25785,7 @@ function preprocess(fn, schema) { }); } -// node_modules/zod/v4/classic/compat.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/compat.js var ZodIssueCode2 = { invalid_type: "invalid_type", too_big: "too_big", @@ -25811,7 +25811,7 @@ var ZodFirstPartyTypeKind2; /* @__PURE__ */ (function(ZodFirstPartyTypeKind3) { })(ZodFirstPartyTypeKind2 || (ZodFirstPartyTypeKind2 = {})); -// node_modules/zod/v4/classic/from-json-schema.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/from-json-schema.js var z = { ...schemas_exports2, ...checks_exports2, @@ -26291,7 +26291,7 @@ function fromJSONSchema(schema, params) { return convertSchema(normalized, ctx); } -// node_modules/zod/v4/classic/coerce.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/coerce.js var coerce_exports2 = {}; __export(coerce_exports2, { bigint: () => bigint3, @@ -26316,10 +26316,10 @@ function date4(params) { return _coercedDate(ZodDate2, params); } -// node_modules/zod/v4/classic/external.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/external.js config(en_default2()); -// node_modules/@modelcontextprotocol/sdk/dist/esm/types.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js var LATEST_PROTOCOL_VERSION = "2025-11-25"; var SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION, "2025-06-18", "2025-03-26", "2024-11-05", "2024-10-07"]; var RELATED_TASK_META_KEY = "io.modelcontextprotocol/related-task"; @@ -27850,12 +27850,12 @@ var UrlElicitationRequiredError = class extends McpError { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js function isTerminal(status) { return status === "completed" || status === "failed" || status === "cancelled"; } -// node_modules/zod-to-json-schema/dist/esm/Options.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/Options.js var ignoreOverride = /* @__PURE__ */ Symbol("Let zodToJsonSchema decide on which parser to use"); var defaultOptions = { name: void 0, @@ -27889,7 +27889,7 @@ var getDefaultOptions = (options) => typeof options === "string" ? { ...options }; -// node_modules/zod-to-json-schema/dist/esm/Refs.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/Refs.js var getRefs = (options) => { const _options = getDefaultOptions(options); const currentPath = _options.name !== void 0 ? [..._options.basePath, _options.definitionPath, _options.name] : _options.basePath; @@ -27910,7 +27910,7 @@ var getRefs = (options) => { }; }; -// node_modules/zod-to-json-schema/dist/esm/errorMessages.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/errorMessages.js function addErrorMessage(res, key, errorMessage2, refs) { if (!refs?.errorMessages) return; @@ -27926,7 +27926,7 @@ function setResponseValueAndErrors(res, key, value, errorMessage2, refs) { addErrorMessage(res, key, errorMessage2, refs); } -// node_modules/zod-to-json-schema/dist/esm/getRelativePath.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/getRelativePath.js var getRelativePath = (pathA, pathB) => { let i = 0; for (; i < pathA.length && i < pathB.length; i++) { @@ -27936,7 +27936,7 @@ var getRelativePath = (pathA, pathB) => { return [(pathA.length - i).toString(), ...pathB.slice(i)].join("/"); }; -// node_modules/zod-to-json-schema/dist/esm/parsers/any.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/any.js function parseAnyDef(refs) { if (refs.target !== "openAi") { return {}; @@ -27952,7 +27952,7 @@ function parseAnyDef(refs) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/array.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/array.js function parseArrayDef(def, refs) { const res = { type: "array" @@ -27976,7 +27976,7 @@ function parseArrayDef(def, refs) { return res; } -// node_modules/zod-to-json-schema/dist/esm/parsers/bigint.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/bigint.js function parseBigintDef(def, refs) { const res = { type: "integer", @@ -28022,24 +28022,24 @@ function parseBigintDef(def, refs) { return res; } -// node_modules/zod-to-json-schema/dist/esm/parsers/boolean.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/boolean.js function parseBooleanDef() { return { type: "boolean" }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/branded.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/branded.js function parseBrandedDef(_def, refs) { return parseDef(_def.type._def, refs); } -// node_modules/zod-to-json-schema/dist/esm/parsers/catch.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/catch.js var parseCatchDef = (def, refs) => { return parseDef(def.innerType._def, refs); }; -// node_modules/zod-to-json-schema/dist/esm/parsers/date.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/date.js function parseDateDef(def, refs, overrideDateStrategy) { const strategy = overrideDateStrategy ?? refs.dateStrategy; if (Array.isArray(strategy)) { @@ -28098,7 +28098,7 @@ var integerDateParser = (def, refs) => { return res; }; -// node_modules/zod-to-json-schema/dist/esm/parsers/default.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/default.js function parseDefaultDef(_def, refs) { return { ...parseDef(_def.innerType._def, refs), @@ -28106,12 +28106,12 @@ function parseDefaultDef(_def, refs) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/effects.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/effects.js function parseEffectsDef(_def, refs) { return refs.effectStrategy === "input" ? parseDef(_def.schema._def, refs) : parseAnyDef(refs); } -// node_modules/zod-to-json-schema/dist/esm/parsers/enum.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/enum.js function parseEnumDef(def) { return { type: "string", @@ -28119,7 +28119,7 @@ function parseEnumDef(def) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/intersection.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/intersection.js var isJsonSchema7AllOfType = (type) => { if ("type" in type && type.type === "string") return false; @@ -28161,7 +28161,7 @@ function parseIntersectionDef(def, refs) { } : void 0; } -// node_modules/zod-to-json-schema/dist/esm/parsers/literal.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/literal.js function parseLiteralDef(def, refs) { const parsedType2 = typeof def.value; if (parsedType2 !== "bigint" && parsedType2 !== "number" && parsedType2 !== "boolean" && parsedType2 !== "string") { @@ -28181,7 +28181,7 @@ function parseLiteralDef(def, refs) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/string.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/string.js var emojiRegex2 = void 0; var zodPatterns = { /** @@ -28506,7 +28506,7 @@ function stringifyRegExpWithFlags(regex, refs) { return pattern; } -// node_modules/zod-to-json-schema/dist/esm/parsers/record.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/record.js function parseRecordDef(def, refs) { if (refs.target === "openAi") { console.warn("Warning: OpenAI may not support records in schemas! Try an array of key-value pairs instead."); @@ -28558,7 +28558,7 @@ function parseRecordDef(def, refs) { return schema; } -// node_modules/zod-to-json-schema/dist/esm/parsers/map.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/map.js function parseMapDef(def, refs) { if (refs.mapStrategy === "record") { return parseRecordDef(def, refs); @@ -28583,7 +28583,7 @@ function parseMapDef(def, refs) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/nativeEnum.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/nativeEnum.js function parseNativeEnumDef(def) { const object3 = def.values; const actualKeys = Object.keys(def.values).filter((key) => { @@ -28597,7 +28597,7 @@ function parseNativeEnumDef(def) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/never.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/never.js function parseNeverDef(refs) { return refs.target === "openAi" ? void 0 : { not: parseAnyDef({ @@ -28607,7 +28607,7 @@ function parseNeverDef(refs) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/null.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/null.js function parseNullDef(refs) { return refs.target === "openApi3" ? { enum: ["null"], @@ -28617,7 +28617,7 @@ function parseNullDef(refs) { }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/union.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/union.js var primitiveMappings = { ZodString: "string", ZodNumber: "number", @@ -28685,7 +28685,7 @@ var asAnyOf = (def, refs) => { return anyOf.length ? { anyOf } : void 0; }; -// node_modules/zod-to-json-schema/dist/esm/parsers/nullable.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/nullable.js function parseNullableDef(def, refs) { if (["ZodString", "ZodNumber", "ZodBigInt", "ZodBoolean", "ZodNull"].includes(def.innerType._def.typeName) && (!def.innerType._def.checks || !def.innerType._def.checks.length)) { if (refs.target === "openApi3") { @@ -28717,7 +28717,7 @@ function parseNullableDef(def, refs) { return base && { anyOf: [base, { type: "null" }] }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/number.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/number.js function parseNumberDef(def, refs) { const res = { type: "number" @@ -28766,7 +28766,7 @@ function parseNumberDef(def, refs) { return res; } -// node_modules/zod-to-json-schema/dist/esm/parsers/object.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/object.js function parseObjectDef(def, refs) { const forceOptionalIntoNullable = refs.target === "openAi"; const result = { @@ -28836,7 +28836,7 @@ function safeIsOptional(schema) { } } -// node_modules/zod-to-json-schema/dist/esm/parsers/optional.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/optional.js var parseOptionalDef = (def, refs) => { if (refs.currentPath.toString() === refs.propertyPath?.toString()) { return parseDef(def.innerType._def, refs); @@ -28855,7 +28855,7 @@ var parseOptionalDef = (def, refs) => { } : parseAnyDef(refs); }; -// node_modules/zod-to-json-schema/dist/esm/parsers/pipeline.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/pipeline.js var parsePipelineDef = (def, refs) => { if (refs.pipeStrategy === "input") { return parseDef(def.in._def, refs); @@ -28875,12 +28875,12 @@ var parsePipelineDef = (def, refs) => { }; }; -// node_modules/zod-to-json-schema/dist/esm/parsers/promise.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/promise.js function parsePromiseDef(def, refs) { return parseDef(def.type._def, refs); } -// node_modules/zod-to-json-schema/dist/esm/parsers/set.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/set.js function parseSetDef(def, refs) { const items = parseDef(def.valueType._def, { ...refs, @@ -28900,7 +28900,7 @@ function parseSetDef(def, refs) { return schema; } -// node_modules/zod-to-json-schema/dist/esm/parsers/tuple.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/tuple.js function parseTupleDef(def, refs) { if (def.rest) { return { @@ -28928,24 +28928,24 @@ function parseTupleDef(def, refs) { } } -// node_modules/zod-to-json-schema/dist/esm/parsers/undefined.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/undefined.js function parseUndefinedDef(refs) { return { not: parseAnyDef(refs) }; } -// node_modules/zod-to-json-schema/dist/esm/parsers/unknown.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/unknown.js function parseUnknownDef(refs) { return parseAnyDef(refs); } -// node_modules/zod-to-json-schema/dist/esm/parsers/readonly.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/readonly.js var parseReadonlyDef = (def, refs) => { return parseDef(def.innerType._def, refs); }; -// node_modules/zod-to-json-schema/dist/esm/selectParser.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/selectParser.js var selectParser = (def, typeName, refs) => { switch (typeName) { case ZodFirstPartyTypeKind.ZodString: @@ -29021,7 +29021,7 @@ var selectParser = (def, typeName, refs) => { } }; -// node_modules/zod-to-json-schema/dist/esm/parseDef.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parseDef.js function parseDef(def, refs, forceResolution = false) { const seenItem = refs.seen.get(def); if (refs.override) { @@ -29077,7 +29077,7 @@ var addMeta = (def, refs, jsonSchema) => { return jsonSchema; }; -// node_modules/zod-to-json-schema/dist/esm/zodToJsonSchema.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/zodToJsonSchema.js var zodToJsonSchema = (schema, options) => { const refs = getRefs(options); let definitions = typeof options === "object" && options.definitions ? Object.entries(options.definitions).reduce((acc, [name2, schema2]) => ({ @@ -29139,7 +29139,7 @@ var zodToJsonSchema = (schema, options) => { return combined; }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js function mapMiniTarget(t) { if (!t) return "draft-7"; @@ -29181,7 +29181,7 @@ function parseWithCompat(schema, data) { return result.data; } -// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js var DEFAULT_REQUEST_TIMEOUT_MSEC = 6e4; var Protocol = class { constructor(_options) { @@ -30135,7 +30135,7 @@ function mergeCapabilities(base, additional) { return result; } -// node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js var import_ajv = __toESM(require_ajv(), 1); var import_ajv_formats = __toESM(require_dist(), 1); function createDefaultAjvInstance() { @@ -30203,7 +30203,7 @@ var AjvJsonSchemaValidator = class { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js var ExperimentalServerTasks = class { constructor(_server) { this._server = _server; @@ -30416,7 +30416,7 @@ var ExperimentalServerTasks = class { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js function assertToolsCallTaskCapability(requests, method, entityName) { if (!requests) { throw new Error(`${entityName} does not support task creation (required for ${method})`); @@ -30451,7 +30451,7 @@ function assertClientRequestTaskCapability(requests, method, entityName) { } } -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js var Server = class extends Protocol { /** * Initializes this server with the given name and version information. @@ -30822,7 +30822,7 @@ var Server = class extends Protocol { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/completable.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/completable.js var COMPLETABLE_SYMBOL = /* @__PURE__ */ Symbol.for("mcp.completable"); function isCompletable(schema) { return !!schema && typeof schema === "object" && COMPLETABLE_SYMBOL in schema; @@ -30836,7 +30836,7 @@ var McpZodTypeKind; McpZodTypeKind2["Completable"] = "McpCompletable"; })(McpZodTypeKind || (McpZodTypeKind = {})); -// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js var TOOL_NAME_REGEX = /^[A-Za-z0-9._-]{1,128}$/; function validateToolName(name) { const warnings = []; @@ -30894,7 +30894,7 @@ function validateAndWarnToolName(name) { return result.isValid; } -// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/mcp-server.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/mcp-server.js var ExperimentalMcpServerTasks = class { constructor(_mcpServer) { this._mcpServer = _mcpServer; @@ -30909,7 +30909,7 @@ var ExperimentalMcpServerTasks = class { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js var McpServer = class { constructor(serverInfo, options) { this._registeredResources = {}; @@ -31701,10 +31701,10 @@ var EMPTY_COMPLETION_RESULT = { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js import process3 from "node:process"; -// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js var STDIO_DEFAULT_MAX_BUFFER_SIZE = 10 * 1024 * 1024; var ReadBuffer = class { constructor(options) { @@ -31741,7 +31741,7 @@ function serializeMessage(message) { return JSON.stringify(message) + "\n"; } -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js +// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js var StdioServerTransport = class { constructor(_stdin = process3.stdin, _stdout = process3.stdout, options) { this._stdin = _stdin; @@ -36225,22 +36225,16 @@ function selectOsWriteConfinementBackend(ctx) { return backend?.id ?? null; } -// src/producers/agy-adapter.ts -var AGY_REQUIRED_ENV = ["GEMINI_API_KEY"]; +// src/producers/cli-probe.ts var VERSION_TIMEOUT_MS = 1e4; var VERSION_OUTPUT_LIMIT = 64 * 1024; -var TEXT_LIMIT = 8e3; -function isRecord3(value) { - return typeof value === "object" && value !== null && !Array.isArray(value); -} -function stringProperty(value, name) { - if (!isRecord3(value)) return void 0; - const property = value[name]; - return typeof property === "string" ? property : void 0; +function parseSemver(stdout) { + const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); + return match?.[1] ?? null; } -function unavailableReport(ctx, reason, resolvedExecutable = null) { +function unavailableCapabilityReport(ctx, producerId, structuredOutput, reason, resolvedExecutable = null) { return { - producerId: "agy", + producerId, available: false, reason, os: ctx.os, @@ -36250,14 +36244,71 @@ function unavailableReport(ctx, reason, resolvedExecutable = null) { version: null, authState: "unknown", executionModes: ["edit"], - structuredOutput: true, + structuredOutput, writeConfinementBackend: null, laneEligibility: { edit: false } }; } -function parseVersion(stdout) { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? null; +async function runVersionProbe(ctx, executable, args) { + return supervise(ctx.ps, { + executable, + args, + cwd: process.cwd(), + env: {}, + timeoutMs: VERSION_TIMEOUT_MS, + maxOutputBytes: VERSION_OUTPUT_LIMIT + }, {}); +} +async function probeOsConfinedCli(ctx, probe) { + const unavailable = (reason, executable2 = null) => unavailableCapabilityReport(ctx, probe.producerId, probe.structuredOutput, reason, executable2); + if (ctx.os === "win32") return unavailable("unsupported-platform"); + let executable; + try { + executable = await normalizeNodeShim( + await ctx.ps.resolveExecutable({ name: probe.executableName }) + ); + } catch { + return unavailable("missing-executable"); + } + try { + const result = await runVersionProbe(ctx, executable, ["--version"]); + const version2 = result.spawnError === void 0 && result.exitCode === 0 ? (probe.parseVersion ?? parseSemver)(result.stdout) : null; + if (version2 === null) return unavailable("probe-failed", executable); + if (probe.inspectSurface !== void 0) { + const reason = await probe.inspectSurface(ctx, executable); + if (reason !== null) return unavailable(reason, executable); + } + const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); + return { + producerId: probe.producerId, + available: true, + reason: null, + os: ctx.os, + arch: ctx.arch, + environmentType: ctx.environmentType, + resolvedExecutable: executable, + version: version2, + authState: probe.isAuthenticated() ? "authenticated" : "unauthenticated", + executionModes: ["edit"], + structuredOutput: probe.structuredOutput, + writeConfinementBackend, + laneEligibility: { edit: writeConfinementBackend !== null } + }; + } catch { + return unavailable("probe-failed", executable); + } +} + +// src/producers/agy-adapter.ts +var AGY_REQUIRED_ENV = ["GEMINI_API_KEY"]; +var TEXT_LIMIT = 8e3; +function isRecord3(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function stringProperty(value, name) { + if (!isRecord3(value)) return void 0; + const property = value[name]; + return typeof property === "string" ? property : void 0; } function formatPrintTimeout(timeoutMs) { return `${Math.ceil(timeoutMs / 1e3)}s`; @@ -36277,47 +36328,16 @@ var AgyAdapter = class { return (this.deps.hasAuthStore ?? ((store) => existsSync2(join(store, "settings.json"))))(directory); } async probe(ctx) { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); - let executable; - try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "agy" }) - ); - } catch { - return unavailableReport(ctx, "missing-executable"); - } - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT - }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 ? parseVersion(result.stdout) : null; - if (version2 === null) return unavailableReport(ctx, "probe-failed", executable); - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = join(this.deps.homeDirectory, ".gemini", "antigravity-cli"); - const authState = this.hasAuthStore(authStore) ? "authenticated" : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version: version2, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null } - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); - } + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "agy", + structuredOutput: this.structuredOutput, + isAuthenticated: () => this.hasAuthStore(this.configDirectory()) + }); + } + /** agy's settings/auth store; the only host state an attempt must write. */ + configDirectory() { + return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".gemini", "antigravity-cli"); } buildInvocation(spec, ctx) { const args = [ @@ -36342,6 +36362,7 @@ var AgyAdapter = class { executable: ctx.executable, args, requiredEnv: [...AGY_REQUIRED_ENV], + inheritedStateWritablePaths: [this.configDirectory()], // Model sessions must reach the provider API; write-protection remains the confinement goal. network: "allowed" }; @@ -36450,7 +36471,7 @@ function stringProperty2(value, name) { const property = value[name]; return typeof property === "string" ? property : void 0; } -function unavailableReport2(ctx, reason, resolvedExecutable = null) { +function unavailableReport(ctx, reason, resolvedExecutable = null) { return { producerId: "codex", available: false, @@ -36467,7 +36488,7 @@ function unavailableReport2(ctx, reason, resolvedExecutable = null) { laneEligibility: { edit: false } }; } -function parseVersion2(stdout) { +function parseVersion(stdout) { const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); return match?.[1] ?? null; } @@ -36560,14 +36581,14 @@ var CodexAdapter = class { return (this.deps.hasAuthStore ?? ((store) => existsSync3(join2(store, "auth.json"))))(directory); } async probe(ctx) { - if (ctx.os === "win32") return unavailableReport2(ctx, "unsupported-platform"); + if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); let executable; try { executable = await normalizeCodexExecutable( await ctx.ps.resolveExecutable({ name: "codex" }) ); } catch { - return unavailableReport2(ctx, "missing-executable"); + return unavailableReport(ctx, "missing-executable"); } try { const result = await supervise(ctx.ps, { @@ -36578,8 +36599,8 @@ var CodexAdapter = class { timeoutMs: VERSION_TIMEOUT_MS2, maxOutputBytes: VERSION_OUTPUT_LIMIT2 }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 && result.signal === null && result.timedOut === false && result.cancelled === false ? parseVersion2(result.stdout) : null; - if (version2 === null) return unavailableReport2(ctx, "probe-failed", executable); + const version2 = result.spawnError === void 0 && result.exitCode === 0 && result.signal === null && result.timedOut === false && result.cancelled === false ? parseVersion(result.stdout) : null; + if (version2 === null) return unavailableReport(ctx, "probe-failed", executable); const writeConfinementBackend = selectCodexWriteConfinementBackend(ctx); const authState = this.hasAuthStore(resolveCodexStore(this.deps)) ? "authenticated" : "unauthenticated"; return { @@ -36598,7 +36619,7 @@ var CodexAdapter = class { laneEligibility: { edit: writeConfinementBackend !== null } }; } catch { - return unavailableReport2(ctx, "probe-failed", executable); + return unavailableReport(ctx, "probe-failed", executable); } } buildInvocation(spec, ctx) { @@ -36768,29 +36789,6 @@ import { existsSync as existsSync4 } from "node:fs"; import { homedir as homedir3 } from "node:os"; import { join as join3 } from "node:path"; var OPENCODE_REQUIRED_ENV = ["OPENCODE_CONFIG_DIR", "XDG_DATA_HOME"]; -var VERSION_TIMEOUT_MS3 = 1e4; -var VERSION_OUTPUT_LIMIT3 = 64 * 1024; -function unavailableReport3(ctx, reason, resolvedExecutable = null) { - return { - producerId: "opencode", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: false, - writeConfinementBackend: null, - laneEligibility: { edit: false } - }; -} -function parseVersion3(stdout) { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? null; -} function defaultOpenCodeEnv(deps) { if (deps.env.XDG_DATA_HOME !== void 0) return {}; const dataHome = join3(deps.homeDirectory, ".local", "share"); @@ -36811,47 +36809,18 @@ var OpenCodeAdapter = class { return (this.deps.hasAuthStore ?? ((store) => existsSync4(join3(store, "auth.json"))))(directory); } async probe(ctx) { - if (ctx.os === "win32") return unavailableReport3(ctx, "unsupported-platform"); - let executable; - try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "opencode" }) - ); - } catch { - return unavailableReport3(ctx, "missing-executable"); - } - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS3, - maxOutputBytes: VERSION_OUTPUT_LIMIT3 - }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 ? parseVersion3(result.stdout) : null; - if (version2 === null) return unavailableReport3(ctx, "probe-failed", executable); - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = join3(this.deps.homeDirectory, ".local", "share", "opencode"); - const authState = this.hasAuthStore(authStore) ? "authenticated" : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version: version2, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null } - }; - } catch { - return unavailableReport3(ctx, "probe-failed", executable); - } + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "opencode", + structuredOutput: this.structuredOutput, + isAuthenticated: () => this.hasAuthStore(join3(this.deps.homeDirectory, ".local", "share", "opencode")) + }); + } + /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ + stateDirectories() { + const dataHome = this.deps.env.XDG_DATA_HOME ?? join3(this.deps.homeDirectory, ".local", "share"); + const stateHome = this.deps.env.XDG_STATE_HOME ?? join3(this.deps.homeDirectory, ".local", "state"); + return [join3(dataHome, "opencode"), join3(stateHome, "opencode")]; } buildInvocation(spec, ctx) { const args = [ @@ -36872,6 +36841,7 @@ var OpenCodeAdapter = class { args, stdin: renderProducerPrompt(spec, ctx.readOnly === true), requiredEnv: [...OPENCODE_REQUIRED_ENV], + inheritedStateWritablePaths: this.stateDirectories(), env: defaultOpenCodeEnv({ env: this.deps.env, homeDirectory: this.deps.homeDirectory, @@ -36901,29 +36871,6 @@ import { existsSync as existsSync5 } from "node:fs"; import { homedir as homedir4 } from "node:os"; import { join as join4 } from "node:path"; var PI_REQUIRED_ENV = ["PI_API_KEY"]; -var VERSION_TIMEOUT_MS4 = 1e4; -var VERSION_OUTPUT_LIMIT4 = 64 * 1024; -function unavailableReport4(ctx, reason, resolvedExecutable = null) { - return { - producerId: "pi", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: false, - writeConfinementBackend: null, - laneEligibility: { edit: false } - }; -} -function parseVersion4(stdout) { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? null; -} function defaultPiEnv(deps) { if (deps.env.HOME !== void 0) return {}; return deps.hasConfigDir(join4(deps.homeDirectory, ".pi")) ? { HOME: deps.homeDirectory } : {}; @@ -36946,47 +36893,16 @@ var PiAdapter = class { return existsSync5(directory); } async probe(ctx) { - if (ctx.os === "win32") return unavailableReport4(ctx, "unsupported-platform"); - let executable; - try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "pi" }) - ); - } catch { - return unavailableReport4(ctx, "missing-executable"); - } - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS4, - maxOutputBytes: VERSION_OUTPUT_LIMIT4 - }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 ? parseVersion4(result.stdout) : null; - if (version2 === null) return unavailableReport4(ctx, "probe-failed", executable); - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = join4(this.deps.homeDirectory, ".pi", "agent"); - const authState = this.hasAuthStore(authStore) ? "authenticated" : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version: version2, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null } - }; - } catch { - return unavailableReport4(ctx, "probe-failed", executable); - } + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "pi", + structuredOutput: this.structuredOutput, + isAuthenticated: () => this.hasAuthStore(this.agentStateDirectory()) + }); + } + /** Pi's auth + settings store; the only host state an attempt must write. */ + agentStateDirectory() { + return join4(this.deps.env.HOME ?? this.deps.homeDirectory, ".pi", "agent"); } buildInvocation(spec, ctx) { if (spec.producerOverrides?.model !== void 0) { @@ -37009,6 +36925,7 @@ var PiAdapter = class { args, stdin: renderProducerPrompt(spec, ctx.readOnly === true), requiredEnv: [...PI_REQUIRED_ENV], + inheritedStateWritablePaths: [this.agentStateDirectory()], env: defaultPiEnv({ env: this.deps.env, homeDirectory: this.deps.homeDirectory, @@ -37037,30 +36954,7 @@ var PiAdapter = class { import { existsSync as existsSync6 } from "node:fs"; import { homedir as homedir5 } from "node:os"; import { join as join5 } from "node:path"; -var VERSION_TIMEOUT_MS5 = 1e4; -var VERSION_OUTPUT_LIMIT5 = 64 * 1024; var REQUIRED_LONG_OPTIONS = ["--prompt", "--model"]; -function unavailableReport5(ctx, reason, resolvedExecutable = null) { - return { - producerId: "pythinker", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: false, - writeConfinementBackend: null, - laneEligibility: { edit: false } - }; -} -function parseVersion5(stdout) { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? /\d+\.\d+\.\d+(?:[-+][^\s]+)?/u.exec(stdout)?.[0] ?? null; -} function parseLongOptionTokens(helpText) { const options = /* @__PURE__ */ new Set(); for (const line of helpText.split(/\r?\n/u)) { @@ -37105,67 +36999,29 @@ var PythinkerAdapter = class { return existsSync6(directory); } async probe(ctx) { - if (ctx.os === "win32") return unavailableReport5(ctx, "unsupported-platform"); - let executable; + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "pythinker", + structuredOutput: this.structuredOutput, + parseVersion: (stdout) => parseSemver(stdout) ?? /\d+\.\d+\.\d+(?:[-+][^\s]+)?/u.exec(stdout)?.[0] ?? null, + inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), + isAuthenticated: () => this.hasAuthStore(resolvePythinkerHome(this.deps)) + }); + } + /** The installed CLI must expose every long option this adapter emits. */ + async inspectCliSurface(ctx, executable) { + let helpResult; try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "pythinker" }) - ); + helpResult = await runVersionProbe(ctx, executable, ["--help"]); } catch { - return unavailableReport5(ctx, "missing-executable"); + return "unsupported-cli-surface"; } - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS5, - maxOutputBytes: VERSION_OUTPUT_LIMIT5 - }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 ? parseVersion5(result.stdout) : null; - if (version2 === null) return unavailableReport5(ctx, "probe-failed", executable); - let helpResult; - try { - helpResult = await supervise(ctx.ps, { - executable, - args: ["--help"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS5, - maxOutputBytes: VERSION_OUTPUT_LIMIT5 - }, {}); - } catch { - return unavailableReport5(ctx, "unsupported-cli-surface", executable); - } - const options = parseLongOptionTokens( - `${helpResult.stdout} -${helpResult.stderr}` - ); - if (helpResult.spawnError !== void 0 || helpResult.exitCode !== 0 || REQUIRED_LONG_OPTIONS.some((option) => !options.has(option))) { - return unavailableReport5(ctx, "unsupported-cli-surface", executable); - } - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = resolvePythinkerHome(this.deps); - const authState = this.hasAuthStore(authStore) ? "authenticated" : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version: version2, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null } - }; - } catch { - return unavailableReport5(ctx, "probe-failed", executable); + const options = parseLongOptionTokens(`${helpResult.stdout} +${helpResult.stderr}`); + if (helpResult.spawnError !== void 0 || helpResult.exitCode !== 0 || REQUIRED_LONG_OPTIONS.some((option) => !options.has(option))) { + return "unsupported-cli-surface"; } + return null; } buildInvocation(spec, ctx) { if (spec.producerOverrides?.reasoningEffort !== void 0) { @@ -37184,6 +37040,7 @@ ${helpResult.stderr}` executable: ctx.executable, args, requiredEnv: [...PYTHINKER_REQUIRED_ENV], + inheritedStateWritablePaths: [resolvePythinkerHome(this.deps)], env: defaultPythinkerEnv({ env: this.deps.env, homeDirectory: this.deps.homeDirectory, @@ -44076,8 +43933,6 @@ import { rm as rm6 } from "node:fs/promises"; // src/platform/sandbox/seatbelt.ts import { realpathSync as realpathSync2 } from "node:fs"; -import { homedir as homedir6 } from "node:os"; -import { basename, join as join6 } from "node:path/posix"; function buildReadOnlySeatbeltPolicy(args) { return { worktreePath: "", @@ -44106,35 +43961,9 @@ function sbPath(path32) { } return `"${path32.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; } -function openCodeWritablePaths(invocation, policy) { - if (policy.tempHome !== null || !invocation.requiredEnv.includes("OPENCODE_CONFIG_DIR")) return []; - const home = homedir6(); - const dataHome = invocation.env?.XDG_DATA_HOME ?? process.env.XDG_DATA_HOME ?? join6(home, ".local", "share"); - const stateHome = invocation.env?.XDG_STATE_HOME ?? process.env.XDG_STATE_HOME ?? join6(home, ".local", "state"); - return [join6(dataHome, "opencode"), join6(stateHome, "opencode")]; -} -function piWritablePaths(invocation, policy) { - if (policy.tempHome !== null || !invocation.requiredEnv.includes("PI_API_KEY")) return []; - const home = invocation.env?.HOME ?? process.env.HOME ?? homedir6(); - return [join6(home, ".pi", "agent")]; -} -function isPythinkerInvocation(invocation) { - return [invocation.executable.command, ...invocation.executable.prefixArgs].some((part) => basename(part) === "pythinker"); -} -function isAgyInvocation(invocation) { - return [invocation.executable.command, ...invocation.executable.prefixArgs].some((part) => basename(part) === "agy"); -} -function agyWritablePaths(invocation, policy) { - if (policy.tempHome !== null || !isAgyInvocation(invocation)) return []; - const home = invocation.env?.HOME ?? process.env.HOME ?? homedir6(); - return [join6(home, ".gemini", "antigravity-cli")]; -} -function pythinkerWritablePaths(invocation, policy) { - if (policy.tempHome !== null || !isPythinkerInvocation(invocation)) return []; - const configuredHome = invocation.env?.PYTHINKER_SHARE_DIR ?? process.env.PYTHINKER_SHARE_DIR; - if (configuredHome !== void 0 && configuredHome.length > 0) return [configuredHome]; - const home = invocation.env?.HOME ?? process.env.HOME ?? homedir6(); - return [join6(home, ".pythinker")]; +function inheritedStateWritablePaths(invocation, policy) { + if (policy.tempHome !== null) return []; + return [...invocation.inheritedStateWritablePaths ?? []]; } function buildProfile(policy, additionalWritable) { const writable = [...new Set([ @@ -44163,12 +43992,7 @@ function buildProfile(policy, additionalWritable) { return lines.join("\n"); } function wrapInvocationWithSeatbelt(invocation, policy) { - const profile = buildProfile(policy, [ - ...openCodeWritablePaths(invocation, policy), - ...piWritablePaths(invocation, policy), - ...pythinkerWritablePaths(invocation, policy), - ...agyWritablePaths(invocation, policy) - ]); + const profile = buildProfile(policy, inheritedStateWritablePaths(invocation, policy)); const inner = [ invocation.executable.command, ...invocation.executable.prefixArgs, @@ -49335,14 +49159,14 @@ async function freezeCandidate(args) { // src/verify/baseline-verifier.ts import { randomUUID as randomUUID9 } from "node:crypto"; import { readFile as readFile5 } from "node:fs/promises"; -import { basename as basename2 } from "node:path"; +import { basename } from "node:path"; import path24 from "node:path"; function throwIfAborted(signal) { if (!signal?.aborted) return; throw new DOMException("Baseline verification was cancelled", "AbortError"); } function executableName(value) { - return basename2(value).toLowerCase().replace(/\.(?:cmd|exe|mjs|cjs|js)$/u, ""); + return basename(value).toLowerCase().replace(/\.(?:cmd|exe|mjs|cjs|js)$/u, ""); } function firstPositional(args) { const optionsWithValues = /* @__PURE__ */ new Set([ @@ -53155,7 +52979,7 @@ function createHostingCommandRunner(platformServices = getPlatformServices()) { return toCommandResult(exit); }; } -function parseVersion6(output) { +function parseVersion2(output) { const firstLine = output.split(/\r?\n/u, 1)[0] ?? ""; const match = /^gh version (\d+)\.(\d+)\.(\d+)(?:\s|$)/u.exec(firstLine); if (match === null) return null; @@ -53376,7 +53200,7 @@ var GitHubCliAdapter = class { failCommand(error51, "preflight-gh-unavailable"); } requireCleanExit(version2, "preflight-gh-unavailable"); - const parsedVersion = parseVersion6(version2.stdout); + const parsedVersion = parseVersion2(version2.stdout); if (parsedVersion === null) fail3("preflight-gh-version-invalid"); if (!versionAtLeast(parsedVersion, MINIMUM_GH_VERSION)) { fail3("preflight-gh-version-unsupported"); diff --git a/src/platform/sandbox/seatbelt.ts b/src/platform/sandbox/seatbelt.ts index 951717f..bc5964c 100644 --- a/src/platform/sandbox/seatbelt.ts +++ b/src/platform/sandbox/seatbelt.ts @@ -1,6 +1,4 @@ import { realpathSync } from "node:fs"; -import { homedir } from "node:os"; -import { basename, join } from "node:path/posix"; import type { ProducerInvocation } from "../../producers/producer-adapter.js"; export interface SeatbeltPolicy { @@ -51,72 +49,16 @@ function sbPath(path: string): string { return `"${path.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; } -function openCodeWritablePaths( - invocation: ProducerInvocation, - policy: SeatbeltPolicy, -): string[] { - if ( - policy.tempHome !== null - || !invocation.requiredEnv.includes("OPENCODE_CONFIG_DIR") - ) return []; - - const home = homedir(); - const dataHome = invocation.env?.XDG_DATA_HOME - ?? process.env.XDG_DATA_HOME - ?? join(home, ".local", "share"); - const stateHome = invocation.env?.XDG_STATE_HOME - ?? process.env.XDG_STATE_HOME - ?? join(home, ".local", "state"); - return [join(dataHome, "opencode"), join(stateHome, "opencode")]; -} - -function piWritablePaths( - invocation: ProducerInvocation, - policy: SeatbeltPolicy, -): string[] { - if ( - policy.tempHome !== null - || !invocation.requiredEnv.includes("PI_API_KEY") - ) return []; - - const home = invocation.env?.HOME ?? process.env.HOME ?? homedir(); - return [join(home, ".pi", "agent")]; -} - -function isPythinkerInvocation(invocation: ProducerInvocation): boolean { - return [invocation.executable.command, ...invocation.executable.prefixArgs] - .some(part => basename(part) === "pythinker"); -} - -function isAgyInvocation(invocation: ProducerInvocation): boolean { - return [invocation.executable.command, ...invocation.executable.prefixArgs] - .some(part => basename(part) === "agy"); -} - -function agyWritablePaths( - invocation: ProducerInvocation, - policy: SeatbeltPolicy, -): string[] { - if (policy.tempHome !== null || !isAgyInvocation(invocation)) return []; - - const home = invocation.env?.HOME ?? process.env.HOME ?? homedir(); - return [join(home, ".gemini", "antigravity-cli")]; -} - -function pythinkerWritablePaths( +/** + * State the Producer declared it must write while running with the real HOME. + * A temporary home replaces that state wholesale, so the declaration is moot. + */ +function inheritedStateWritablePaths( invocation: ProducerInvocation, policy: SeatbeltPolicy, ): string[] { - if (policy.tempHome !== null || !isPythinkerInvocation(invocation)) return []; - - // Pythinker's real default data directory is `~/.pythinker`, overridable with - // `PYTHINKER_SHARE_DIR` — see the matching rationale in pythinker-adapter.ts. - const configuredHome = invocation.env?.PYTHINKER_SHARE_DIR - ?? process.env.PYTHINKER_SHARE_DIR; - if (configuredHome !== undefined && configuredHome.length > 0) return [configuredHome]; - - const home = invocation.env?.HOME ?? process.env.HOME ?? homedir(); - return [join(home, ".pythinker")]; + if (policy.tempHome !== null) return []; + return [...(invocation.inheritedStateWritablePaths ?? [])]; } function buildProfile(policy: SeatbeltPolicy, additionalWritable: string[]): string { @@ -156,12 +98,7 @@ export function wrapInvocationWithSeatbelt( invocation: ProducerInvocation, policy: SeatbeltPolicy, ): ProducerInvocation { - const profile = buildProfile(policy, [ - ...openCodeWritablePaths(invocation, policy), - ...piWritablePaths(invocation, policy), - ...pythinkerWritablePaths(invocation, policy), - ...agyWritablePaths(invocation, policy), - ]); + const profile = buildProfile(policy, inheritedStateWritablePaths(invocation, policy)); const inner = [ invocation.executable.command, ...invocation.executable.prefixArgs, diff --git a/src/producers/agy-adapter.ts b/src/producers/agy-adapter.ts index fb7fe03..47b1a7b 100644 --- a/src/producers/agy-adapter.ts +++ b/src/producers/agy-adapter.ts @@ -1,14 +1,9 @@ import { existsSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; -import { supervise } from "../platform/process-supervisor.js"; -import type { ResolvedExecutable } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; -import { - normalizeNodeShim, - renderProducerPrompt, - selectOsWriteConfinementBackend, -} from "./plain-text.js"; +import { probeOsConfinedCli } from "./cli-probe.js"; +import { renderProducerPrompt } from "./plain-text.js"; import type { AdapterEvent, CapabilityReport, @@ -20,8 +15,6 @@ import type { } from "./producer-adapter.js"; const AGY_REQUIRED_ENV = ["GEMINI_API_KEY"] as const; -const VERSION_TIMEOUT_MS = 10_000; -const VERSION_OUTPUT_LIMIT = 64 * 1024; const TEXT_LIMIT = 8_000; function isRecord(value: unknown): value is Record { @@ -34,33 +27,6 @@ function stringProperty(value: unknown, name: string): string | undefined { return typeof property === "string" ? property : undefined; } -function unavailableReport( - ctx: ProbeContext, - reason: string, - resolvedExecutable: ResolvedExecutable | null = null, -): CapabilityReport { - return { - producerId: "agy", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: true, - writeConfinementBackend: null, - laneEligibility: { edit: false }, - }; -} - -function parseVersion(stdout: string): string | null { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? null; -} - /** Go time.ParseDuration accepts a bare seconds-magnitude unit; keep it simple. */ function formatPrintTimeout(timeoutMs: number): string { return `${Math.ceil(timeoutMs / 1000)}s`; @@ -87,54 +53,17 @@ export class AgyAdapter implements ProducerAdapter { } async probe(ctx: ProbeContext): Promise { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); - - let executable: ResolvedExecutable; - try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "agy" }), - ); - } catch { - return unavailableReport(ctx, "missing-executable"); - } + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "agy", + structuredOutput: this.structuredOutput, + isAuthenticated: () => this.hasAuthStore(this.configDirectory()), + }); + } - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT, - }, {}); - const version = result.spawnError === undefined && result.exitCode === 0 - ? parseVersion(result.stdout) - : null; - if (version === null) return unavailableReport(ctx, "probe-failed", executable); - - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = join(this.deps.homeDirectory, ".gemini", "antigravity-cli"); - const authState = this.hasAuthStore(authStore) - ? "authenticated" - : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null }, - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); - } + /** agy's settings/auth store; the only host state an attempt must write. */ + private configDirectory(): string { + return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".gemini", "antigravity-cli"); } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { @@ -161,6 +90,7 @@ export class AgyAdapter implements ProducerAdapter { executable: ctx.executable, args, requiredEnv: [...AGY_REQUIRED_ENV], + inheritedStateWritablePaths: [this.configDirectory()], // Model sessions must reach the provider API; write-protection remains the confinement goal. network: "allowed", }; diff --git a/src/producers/cli-probe.ts b/src/producers/cli-probe.ts new file mode 100644 index 0000000..fbae93f --- /dev/null +++ b/src/producers/cli-probe.ts @@ -0,0 +1,123 @@ +import { supervise } from "../platform/process-supervisor.js"; +import type { ResolvedExecutable } from "../platform/platform-services.js"; +import { normalizeNodeShim, selectOsWriteConfinementBackend } from "./plain-text.js"; +import type { CapabilityReport, ProbeContext } from "./producer-adapter.js"; + +const VERSION_TIMEOUT_MS = 10_000; +const VERSION_OUTPUT_LIMIT = 64 * 1024; + +/** + * Probe contract for a CLI Producer whose write confinement is supplied by the + * host OS backend (macOS Seatbelt) rather than by the CLI itself. + */ +export interface OsConfinedCliProbe { + producerId: string; + executableName: string; + structuredOutput: boolean; + parseVersion?: (stdout: string) => string | null; + /** + * Extra surface checks after the version succeeds; return an unavailability + * reason to fail the probe, or null to continue. + */ + inspectSurface?: (ctx: ProbeContext, executable: ResolvedExecutable) => Promise; + isAuthenticated: () => boolean; +} + +export function parseSemver(stdout: string): string | null { + const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); + return match?.[1] ?? null; +} + +export function unavailableCapabilityReport( + ctx: ProbeContext, + producerId: string, + structuredOutput: boolean, + reason: string, + resolvedExecutable: ResolvedExecutable | null = null, +): CapabilityReport { + return { + producerId, + available: false, + reason, + os: ctx.os, + arch: ctx.arch, + environmentType: ctx.environmentType, + resolvedExecutable, + version: null, + authState: "unknown", + executionModes: ["edit"], + structuredOutput, + writeConfinementBackend: null, + laneEligibility: { edit: false }, + }; +} + +export async function runVersionProbe( + ctx: ProbeContext, + executable: ResolvedExecutable, + args: string[], +): Promise<{ stdout: string; stderr: string; exitCode: number | null; spawnError?: unknown }> { + return supervise(ctx.ps, { + executable, + args, + cwd: process.cwd(), + env: {}, + timeoutMs: VERSION_TIMEOUT_MS, + maxOutputBytes: VERSION_OUTPUT_LIMIT, + }, {}); +} + +/** + * Shared probe: unsupported on win32; resolve the executable; require a + * parseable `--version`; optionally inspect the CLI surface; then report edit + * eligibility honestly from the host confinement backend and auth state. + */ +export async function probeOsConfinedCli( + ctx: ProbeContext, + probe: OsConfinedCliProbe, +): Promise { + const unavailable = (reason: string, executable: ResolvedExecutable | null = null) => + unavailableCapabilityReport(ctx, probe.producerId, probe.structuredOutput, reason, executable); + if (ctx.os === "win32") return unavailable("unsupported-platform"); + + let executable: ResolvedExecutable; + try { + executable = await normalizeNodeShim( + await ctx.ps.resolveExecutable({ name: probe.executableName }), + ); + } catch { + return unavailable("missing-executable"); + } + + try { + const result = await runVersionProbe(ctx, executable, ["--version"]); + const version = result.spawnError === undefined && result.exitCode === 0 + ? (probe.parseVersion ?? parseSemver)(result.stdout) + : null; + if (version === null) return unavailable("probe-failed", executable); + + if (probe.inspectSurface !== undefined) { + const reason = await probe.inspectSurface(ctx, executable); + if (reason !== null) return unavailable(reason, executable); + } + + const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); + return { + producerId: probe.producerId, + available: true, + reason: null, + os: ctx.os, + arch: ctx.arch, + environmentType: ctx.environmentType, + resolvedExecutable: executable, + version, + authState: probe.isAuthenticated() ? "authenticated" : "unauthenticated", + executionModes: ["edit"], + structuredOutput: probe.structuredOutput, + writeConfinementBackend, + laneEligibility: { edit: writeConfinementBackend !== null }, + }; + } catch { + return unavailable("probe-failed", executable); + } +} diff --git a/src/producers/opencode-adapter.ts b/src/producers/opencode-adapter.ts index ded2b55..a594429 100644 --- a/src/producers/opencode-adapter.ts +++ b/src/producers/opencode-adapter.ts @@ -1,15 +1,9 @@ import { existsSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; -import { supervise } from "../platform/process-supervisor.js"; -import type { ResolvedExecutable } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; -import { - normalizeNodeShim, - normalizePlainText, - renderProducerPrompt, - selectOsWriteConfinementBackend, -} from "./plain-text.js"; +import { probeOsConfinedCli } from "./cli-probe.js"; +import { normalizePlainText, renderProducerPrompt } from "./plain-text.js"; import type { CapabilityReport, InvocationContext, @@ -20,35 +14,6 @@ import type { } from "./producer-adapter.js"; const OPENCODE_REQUIRED_ENV = ["OPENCODE_CONFIG_DIR", "XDG_DATA_HOME"] as const; -const VERSION_TIMEOUT_MS = 10_000; -const VERSION_OUTPUT_LIMIT = 64 * 1024; - -function unavailableReport( - ctx: ProbeContext, - reason: string, - resolvedExecutable: ResolvedExecutable | null = null, -): CapabilityReport { - return { - producerId: "opencode", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: false, - writeConfinementBackend: null, - laneEligibility: { edit: false }, - }; -} - -function parseVersion(stdout: string): string | null { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? null; -} export interface OpenCodeAdapterDeps { env: Record; @@ -81,54 +46,22 @@ export class OpenCodeAdapter implements ProducerAdapter { } async probe(ctx: ProbeContext): Promise { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); - - let executable: ResolvedExecutable; - try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "opencode" }), - ); - } catch { - return unavailableReport(ctx, "missing-executable"); - } - - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT, - }, {}); - const version = result.spawnError === undefined && result.exitCode === 0 - ? parseVersion(result.stdout) - : null; - if (version === null) return unavailableReport(ctx, "probe-failed", executable); + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "opencode", + structuredOutput: this.structuredOutput, + isAuthenticated: () => + this.hasAuthStore(join(this.deps.homeDirectory, ".local", "share", "opencode")), + }); + } - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = join(this.deps.homeDirectory, ".local", "share", "opencode"); - const authState = this.hasAuthStore(authStore) - ? "authenticated" - : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null }, - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); - } + /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ + private stateDirectories(): string[] { + const dataHome = this.deps.env.XDG_DATA_HOME + ?? join(this.deps.homeDirectory, ".local", "share"); + const stateHome = this.deps.env.XDG_STATE_HOME + ?? join(this.deps.homeDirectory, ".local", "state"); + return [join(dataHome, "opencode"), join(stateHome, "opencode")]; } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { @@ -151,6 +84,7 @@ export class OpenCodeAdapter implements ProducerAdapter { args, stdin: renderProducerPrompt(spec, ctx.readOnly === true), requiredEnv: [...OPENCODE_REQUIRED_ENV], + inheritedStateWritablePaths: this.stateDirectories(), env: defaultOpenCodeEnv({ env: this.deps.env, homeDirectory: this.deps.homeDirectory, diff --git a/src/producers/pi-adapter.ts b/src/producers/pi-adapter.ts index 43b71b0..9af3fc1 100644 --- a/src/producers/pi-adapter.ts +++ b/src/producers/pi-adapter.ts @@ -1,15 +1,9 @@ import { existsSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; -import { supervise } from "../platform/process-supervisor.js"; -import type { ResolvedExecutable } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; -import { - normalizeNodeShim, - normalizePlainText, - renderProducerPrompt, - selectOsWriteConfinementBackend, -} from "./plain-text.js"; +import { probeOsConfinedCli } from "./cli-probe.js"; +import { normalizePlainText, renderProducerPrompt } from "./plain-text.js"; import type { CapabilityReport, InvocationContext, @@ -20,35 +14,6 @@ import type { } from "./producer-adapter.js"; const PI_REQUIRED_ENV = ["PI_API_KEY"] as const; -const VERSION_TIMEOUT_MS = 10_000; -const VERSION_OUTPUT_LIMIT = 64 * 1024; - -function unavailableReport( - ctx: ProbeContext, - reason: string, - resolvedExecutable: ResolvedExecutable | null = null, -): CapabilityReport { - return { - producerId: "pi", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: false, - writeConfinementBackend: null, - laneEligibility: { edit: false }, - }; -} - -function parseVersion(stdout: string): string | null { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? null; -} export interface PiAdapterDeps { env: Record; @@ -86,54 +51,17 @@ export class PiAdapter implements ProducerAdapter { } async probe(ctx: ProbeContext): Promise { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); - - let executable: ResolvedExecutable; - try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "pi" }), - ); - } catch { - return unavailableReport(ctx, "missing-executable"); - } - - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT, - }, {}); - const version = result.spawnError === undefined && result.exitCode === 0 - ? parseVersion(result.stdout) - : null; - if (version === null) return unavailableReport(ctx, "probe-failed", executable); + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "pi", + structuredOutput: this.structuredOutput, + isAuthenticated: () => this.hasAuthStore(this.agentStateDirectory()), + }); + } - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = join(this.deps.homeDirectory, ".pi", "agent"); - const authState = this.hasAuthStore(authStore) - ? "authenticated" - : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null }, - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); - } + /** Pi's auth + settings store; the only host state an attempt must write. */ + private agentStateDirectory(): string { + return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".pi", "agent"); } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { @@ -162,6 +90,7 @@ export class PiAdapter implements ProducerAdapter { args, stdin: renderProducerPrompt(spec, ctx.readOnly === true), requiredEnv: [...PI_REQUIRED_ENV], + inheritedStateWritablePaths: [this.agentStateDirectory()], env: defaultPiEnv({ env: this.deps.env, homeDirectory: this.deps.homeDirectory, diff --git a/src/producers/producer-adapter.ts b/src/producers/producer-adapter.ts index 9057393..6d28918 100644 --- a/src/producers/producer-adapter.ts +++ b/src/producers/producer-adapter.ts @@ -38,6 +38,14 @@ export interface ProducerInvocation { requiredEnv: string[]; /** Adapter-supplied defaults; never override a host-provided allowlisted value. */ env?: Record; + /** + * Absolute paths the Producer must be able to write when it runs with the + * host's real HOME (no temporary home): its own auth/config/state store. + * The OS write-confinement backend grants exactly these on top of the + * worktree; it never derives them from executable identity or env names. + * Ignored whenever a temporary home is in effect. + */ + inheritedStateWritablePaths?: string[]; network: "denied" | "allowed"; } diff --git a/src/producers/pythinker-adapter.ts b/src/producers/pythinker-adapter.ts index 51b79c0..7110fe9 100644 --- a/src/producers/pythinker-adapter.ts +++ b/src/producers/pythinker-adapter.ts @@ -1,15 +1,10 @@ import { existsSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; -import { supervise } from "../platform/process-supervisor.js"; import type { ResolvedExecutable } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; -import { - normalizeNodeShim, - normalizePlainText, - renderProducerPrompt, - selectOsWriteConfinementBackend, -} from "./plain-text.js"; +import { parseSemver, probeOsConfinedCli, runVersionProbe } from "./cli-probe.js"; +import { normalizePlainText, renderProducerPrompt } from "./plain-text.js"; import type { CapabilityReport, InvocationContext, @@ -19,37 +14,8 @@ import type { ProducerInvocation, } from "./producer-adapter.js"; -const VERSION_TIMEOUT_MS = 10_000; -const VERSION_OUTPUT_LIMIT = 64 * 1024; const REQUIRED_LONG_OPTIONS = ["--prompt", "--model"] as const; -function unavailableReport( - ctx: ProbeContext, - reason: string, - resolvedExecutable: ResolvedExecutable | null = null, -): CapabilityReport { - return { - producerId: "pythinker", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: false, - writeConfinementBackend: null, - laneEligibility: { edit: false }, - }; -} - -function parseVersion(stdout: string): string | null { - const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); - return match?.[1] ?? /\d+\.\d+\.\d+(?:[-+][^\s]+)?/u.exec(stdout)?.[0] ?? null; -} - function parseLongOptionTokens(helpText: string): Set { const options = new Set(); for (const line of helpText.split(/\r?\n/u)) { @@ -132,78 +98,37 @@ export class PythinkerAdapter implements ProducerAdapter { } async probe(ctx: ProbeContext): Promise { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "pythinker", + structuredOutput: this.structuredOutput, + parseVersion: stdout => + parseSemver(stdout) ?? /\d+\.\d+\.\d+(?:[-+][^\s]+)?/u.exec(stdout)?.[0] ?? null, + inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), + isAuthenticated: () => this.hasAuthStore(resolvePythinkerHome(this.deps)), + }); + } - let executable: ResolvedExecutable; + /** The installed CLI must expose every long option this adapter emits. */ + private async inspectCliSurface( + ctx: ProbeContext, + executable: ResolvedExecutable, + ): Promise { + let helpResult; try { - executable = await normalizeNodeShim( - await ctx.ps.resolveExecutable({ name: "pythinker" }), - ); + helpResult = await runVersionProbe(ctx, executable, ["--help"]); } catch { - return unavailableReport(ctx, "missing-executable"); + return "unsupported-cli-surface"; } - - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT, - }, {}); - const version = result.spawnError === undefined && result.exitCode === 0 - ? parseVersion(result.stdout) - : null; - if (version === null) return unavailableReport(ctx, "probe-failed", executable); - - let helpResult; - try { - helpResult = await supervise(ctx.ps, { - executable, - args: ["--help"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT, - }, {}); - } catch { - return unavailableReport(ctx, "unsupported-cli-surface", executable); - } - const options = parseLongOptionTokens( - `${helpResult.stdout}\n${helpResult.stderr}`, - ); - if ( - helpResult.spawnError !== undefined - || helpResult.exitCode !== 0 - || REQUIRED_LONG_OPTIONS.some(option => !options.has(option)) - ) { - return unavailableReport(ctx, "unsupported-cli-surface", executable); - } - - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); - const authStore = resolvePythinkerHome(this.deps); - const authState = this.hasAuthStore(authStore) - ? "authenticated" - : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version, - authState, - executionModes: [...this.executionModes], - structuredOutput: this.structuredOutput, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null }, - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); + const options = parseLongOptionTokens(`${helpResult.stdout}\n${helpResult.stderr}`); + if ( + helpResult.spawnError !== undefined + || helpResult.exitCode !== 0 + || REQUIRED_LONG_OPTIONS.some(option => !options.has(option)) + ) { + return "unsupported-cli-surface"; } + return null; } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { @@ -224,6 +149,7 @@ export class PythinkerAdapter implements ProducerAdapter { executable: ctx.executable, args, requiredEnv: [...PYTHINKER_REQUIRED_ENV], + inheritedStateWritablePaths: [resolvePythinkerHome(this.deps)], env: defaultPythinkerEnv({ env: this.deps.env, homeDirectory: this.deps.homeDirectory, diff --git a/tests/runtime/agy-adapter.test.ts b/tests/runtime/agy-adapter.test.ts index f734fe0..e72ebbc 100644 --- a/tests/runtime/agy-adapter.test.ts +++ b/tests/runtime/agy-adapter.test.ts @@ -379,6 +379,12 @@ describe("AgyAdapter", () => { expect(new AgyAdapter().buildInvocation(spec, context).args).toContain("1800s"); }); + it("declares only ~/.gemini/antigravity-cli as inherited writable state", () => { + const adapter = new AgyAdapter({ env: {}, homeDirectory: "/Users/test" }); + const invocation = adapter.buildInvocation(sampleSpec(), invocationContext()); + expect(invocation.inheritedStateWritablePaths).toEqual(["/Users/test/.gemini/antigravity-cli"]); + }); + it("declares the agy configuration isolation profile", () => { expect(new AgyAdapter().configurationProfile()).toEqual({ isolationState: "inherited-config-only", diff --git a/tests/runtime/opencode-adapter.test.ts b/tests/runtime/opencode-adapter.test.ts index 2c516a1..a87b257 100644 --- a/tests/runtime/opencode-adapter.test.ts +++ b/tests/runtime/opencode-adapter.test.ts @@ -465,6 +465,19 @@ describe("OpenCodeAdapter", () => { }); }); + it("declares OpenCode's XDG data and state directories as inherited writable state", () => { + const adapter = new OpenCodeAdapter({ + env: { XDG_STATE_HOME: "/Users/test/.local/state" }, + homeDirectory: "/Users/test", + hasAuthStore: () => false, + }); + const invocation = adapter.buildInvocation(sampleSpec(), invocationContext()); + expect(invocation.inheritedStateWritablePaths).toEqual([ + "/Users/test/.local/share/opencode", + "/Users/test/.local/state/opencode", + ]); + }); + it("declares the OpenCode configuration isolation profile", () => { expect(new OpenCodeAdapter().configurationProfile()).toEqual({ isolationState: "controlled-config-with-copied-credentials", diff --git a/tests/runtime/pi-adapter.test.ts b/tests/runtime/pi-adapter.test.ts index 80daea9..977e665 100644 --- a/tests/runtime/pi-adapter.test.ts +++ b/tests/runtime/pi-adapter.test.ts @@ -442,6 +442,12 @@ describe("PiAdapter", () => { } }); + it("declares only ~/.pi/agent as inherited writable state, following HOME", () => { + const adapter = new PiAdapter({ env: { HOME: "/Users/test" }, homeDirectory: "/Users/other" }); + const invocation = adapter.buildInvocation(sampleSpec(), invocationContext()); + expect(invocation.inheritedStateWritablePaths).toEqual(["/Users/test/.pi/agent"]); + }); + it("declares the Pi configuration isolation profile", () => { expect(new PiAdapter().configurationProfile()).toEqual({ isolationState: "inherited-config-only", diff --git a/tests/runtime/pythinker-adapter.test.ts b/tests/runtime/pythinker-adapter.test.ts index cde5036..1b1fd3a 100644 --- a/tests/runtime/pythinker-adapter.test.ts +++ b/tests/runtime/pythinker-adapter.test.ts @@ -544,6 +544,18 @@ describe("PythinkerAdapter", () => { } }); + it("declares PYTHINKER_SHARE_DIR, else ~/.pythinker, as inherited writable state", () => { + const withOverride = new PythinkerAdapter({ + env: { PYTHINKER_SHARE_DIR: "/Users/test/custom-pythinker-home" }, + homeDirectory: "/Users/test", + }); + expect(withOverride.buildInvocation(sampleSpec(), invocationContext()).inheritedStateWritablePaths) + .toEqual(["/Users/test/custom-pythinker-home"]); + const withDefault = new PythinkerAdapter({ env: {}, homeDirectory: "/Users/test" }); + expect(withDefault.buildInvocation(sampleSpec(), invocationContext()).inheritedStateWritablePaths) + .toEqual(["/Users/test/.pythinker"]); + }); + it("declares the Pythinker configuration isolation profile", () => { expect(new PythinkerAdapter().configurationProfile()).toEqual({ isolationState: "inherited-config-only", diff --git a/tests/runtime/seatbelt.test.ts b/tests/runtime/seatbelt.test.ts index 9a5e9aa..f03ca6f 100644 --- a/tests/runtime/seatbelt.test.ts +++ b/tests/runtime/seatbelt.test.ts @@ -76,38 +76,10 @@ describe("seatbelt profile", () => { } }); - it("allowlists only OpenCode's XDG state directories without a temp home", () => { - const previousStateHome = process.env.XDG_STATE_HOME; - process.env.XDG_STATE_HOME = "/Users/test/.local/state"; - - try { - const wrapped = wrapInvocationWithSeatbelt({ - ...invocation, - requiredEnv: ["OPENCODE_CONFIG_DIR", "XDG_DATA_HOME"], - env: { XDG_DATA_HOME: "/Users/test/.local/share" }, - }, { - worktreePath: "/tmp/wt", - tempHome: null, - allowNetwork: false, - }); - const profile = wrapped.args[1] ?? ""; - - expect(profile).toContain('(subpath "/Users/test/.local/share/opencode")'); - expect(profile).toContain('(subpath "/Users/test/.local/state/opencode")'); - expect(profile).not.toContain('(subpath "/Users/test/.local/share")'); - expect(profile).not.toContain('(subpath "/Users/test/.local/state")'); - expect(profile).not.toContain('(subpath "/Users/test")'); - } finally { - if (previousStateHome === undefined) delete process.env.XDG_STATE_HOME; - else process.env.XDG_STATE_HOME = previousStateHome; - } - }); - - it("allowlists only Pi's agent state directory without a temp home", () => { + it("grants exactly the Producer's declared inherited-state paths without a temp home", () => { const wrapped = wrapInvocationWithSeatbelt({ ...invocation, - requiredEnv: ["PI_API_KEY"], - env: { HOME: "/Users/test" }, + inheritedStateWritablePaths: ["/Users/test/.pi/agent", "/Users/test/.local/state/opencode"], }, { worktreePath: "/tmp/wt", tempHome: null, @@ -116,80 +88,31 @@ describe("seatbelt profile", () => { const profile = wrapped.args[1] ?? ""; expect(profile).toContain('(subpath "/Users/test/.pi/agent")'); + expect(profile).toContain('(subpath "/Users/test/.local/state/opencode")'); expect(profile).not.toContain('(subpath "/Users/test/.pi")'); + expect(profile).not.toContain('(subpath "/Users/test/.local/state")'); expect(profile).not.toContain('(subpath "/Users/test")'); }); - it("detects Pythinker by resolved executable identity, not a --work-dir flag the installed CLI does not have", () => { - // PythinkerAdapter.buildInvocation() only ever sends ["--prompt", ...] (and - // optionally "--model"); it never sends "--work-dir". Detection keyed off - // that flag never fired, so real pythinker attempts always ran with zero - // writable paths and crashed with EPERM on their own session directory. - const wrapped = wrapInvocationWithSeatbelt({ - ...invocation, - executable: { - kind: "native", - command: "/usr/local/bin/pythinker", - prefixArgs: [], - resolvedFrom: "path:/usr/local/bin/pythinker", - }, - args: ["--prompt", "test"], - env: { HOME: "/Users/test" }, - }, { - worktreePath: "/tmp/wt", - tempHome: null, - allowNetwork: false, - }); - const profile = wrapped.args[1] ?? ""; - - expect(profile).toContain('(subpath "/Users/test/.pythinker")'); - }); - - it("allowlists only Pythinker's state directory (.pythinker) without a temp home", () => { - const wrapped = wrapInvocationWithSeatbelt({ - ...invocation, - executable: { - kind: "native", - command: "/usr/local/bin/pythinker", - prefixArgs: [], - resolvedFrom: "path:/usr/local/bin/pythinker", - }, - args: ["--prompt", "test"], - env: { HOME: "/Users/test" }, - }, { - worktreePath: "/tmp/wt", - tempHome: null, - allowNetwork: false, - }); - const profile = wrapped.args[1] ?? ""; - - expect(profile).toContain('(subpath "/Users/test/.pythinker")'); - expect(profile).not.toContain('(subpath "/Users/test")'); - }); - - it("grants Pythinker's PYTHINKER_SHARE_DIR override instead of the default when set", () => { + it("ignores declared inherited-state paths when a temp home replaces the real one", () => { const wrapped = wrapInvocationWithSeatbelt({ ...invocation, - executable: { - kind: "native", - command: "/usr/local/bin/pythinker", - prefixArgs: [], - resolvedFrom: "path:/usr/local/bin/pythinker", - }, - args: ["--prompt", "test"], - env: { HOME: "/Users/test", PYTHINKER_SHARE_DIR: "/Users/test/custom-pythinker-home" }, + inheritedStateWritablePaths: ["/Users/test/.pi/agent"], }, { worktreePath: "/tmp/wt", - tempHome: null, + tempHome: "/tmp/home", allowNetwork: false, }); const profile = wrapped.args[1] ?? ""; - expect(profile).toContain('(subpath "/Users/test/custom-pythinker-home")'); - expect(profile).not.toContain('(subpath "/Users/test/.pythinker")'); + expect(profile).toContain('(subpath "/tmp/home")'); + expect(profile).not.toContain('(subpath "/Users/test/.pi/agent")'); }); - it("allowlists only agy's config/state directory (~/.gemini/antigravity-cli), detected by executable identity", () => { + it("never derives writable state from executable identity or required env names", () => { + // Earlier revisions sniffed `basename(command)` and `requiredEnv` to guess a + // Producer's config directory; an adapter that forgot to be recognized ran + // with zero host-state access. Only the explicit declaration counts now. const wrapped = wrapInvocationWithSeatbelt({ ...invocation, executable: { @@ -198,24 +121,7 @@ describe("seatbelt profile", () => { prefixArgs: [], resolvedFrom: "path:/usr/local/bin/agy", }, - args: ["-p", "test"], - env: { HOME: "/Users/test" }, - }, { - worktreePath: "/tmp/wt", - tempHome: null, - allowNetwork: false, - }); - const profile = wrapped.args[1] ?? ""; - - expect(profile).toContain('(subpath "/Users/test/.gemini/antigravity-cli")'); - expect(profile).not.toContain('(subpath "/Users/test/.gemini")'); - expect(profile).not.toContain('(subpath "/Users/test")'); - }); - - it("does not allowlist agy's directory for an unrelated executable requiring GEMINI_API_KEY", () => { - const wrapped = wrapInvocationWithSeatbelt({ - ...invocation, - requiredEnv: ["GEMINI_API_KEY"], + requiredEnv: ["PI_API_KEY", "OPENCODE_CONFIG_DIR", "GEMINI_API_KEY"], env: { HOME: "/Users/test" }, }, { worktreePath: "/tmp/wt", @@ -224,29 +130,7 @@ describe("seatbelt profile", () => { }); const profile = wrapped.args[1] ?? ""; - expect(profile).not.toContain('(subpath "/Users/test/.gemini/antigravity-cli")'); - }); - - it("keeps joined subpaths POSIX even when HOME contains win32-style separators", () => { - const wrapped = wrapInvocationWithSeatbelt({ - ...invocation, - executable: { - kind: "native", - command: "/usr/local/bin/pythinker", - prefixArgs: [], - resolvedFrom: "path:/usr/local/bin/pythinker", - }, - args: ["--prompt", "test"], - env: { HOME: "C:\\Users\\test" }, - }, { - worktreePath: "/tmp/wt", - tempHome: null, - allowNetwork: false, - }); - const profile = wrapped.args[1] ?? ""; - - expect(profile).toContain('(subpath "C:\\\\Users\\\\test/.pythinker")'); - expect(profile).not.toContain('(subpath "C:\\\\Users\\\\test")'); + expect(profile).not.toContain("/Users/test"); }); it("escapes quotes and rejects control characters in paths", () => { From 64a5ada3c28f3407aa8a3710f5abb3ca7a846bde Mon Sep 17 00:00:00 2001 From: elkaix Date: Thu, 27 Aug 2026 21:25:13 -0400 Subject: [PATCH 02/12] feat: add headless Claude Code as a sixth delegation-lane Producer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit claude-implementer runs `claude -p --output-format json` as an untrusted Producer, so the architect can delegate implementation to Opus or Sonnet (producerOverrides.model) with an optional --effort override, under the same invariants as every other lane: fresh context, isolated worktree, frozen candidate, independent verification. Isolation is enforced by argv, each flag confirmed live against claude 2.1.250: --strict-mcp-config (no MCP servers, so no nested delegate tool), --tools without Agent (no nested subagents, no web), --setting-sources "" (no user/project/local settings, hooks, or CLAUDE.md discovery — the Producer sees only the rendered spec), --no-session-persistence, and --disable-slash-commands. Auth needs USER plus the real HOME (a temp HOME reports "Not logged in"), so the lane is inherited-config-only and declares ~/.claude and ~/.claude.json as its writable state. The result envelope can report is_error with exit 0, so normalizeEvents keys on both. darwin/arm64 only via the macos-seatbelt backend; a confined smoke run created a worktree file and got EPERM outside it. Opt-in real-CLI smoke test behind CLAUDE_ARCHITECT_CLAUDE_SMOKE=1. Design: docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md --- .claude-plugin/marketplace.json | 2 +- CHANGELOG.md | 12 + README.md | 6 +- docs/ARCHITECTURE.md | 2 +- docs/MARKETPLACE_REVIEW.md | 2 +- docs/PRIVACY.md | 2 +- ...26-08-27-claude-producer-adapter-design.md | 133 +++ runtime/server.mjs | 946 ++++++++++-------- skills/delegate/SKILL.md | 2 + src/producers/claude-adapter.ts | 203 ++++ src/producers/producer-registry.ts | 3 +- tests/delegate-routing.test.mjs | 4 +- tests/lane-launchers.test.sh | 2 +- tests/runtime/capability-probe.test.ts | 1 + tests/runtime/claude-adapter.test.ts | 598 +++++++++++ tests/runtime/plugin-wiring.test.mjs | 2 +- tests/runtime/tools.test.ts | 2 +- 17 files changed, 1517 insertions(+), 405 deletions(-) create mode 100644 docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md create mode 100644 src/producers/claude-adapter.ts create mode 100644 tests/runtime/claude-adapter.test.ts diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index 766ccb6..16f8911 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -1,6 +1,6 @@ { "name": "claude-architect", - "description": "CLI coding-agent orchestration for Claude through Codex, OpenCode, Pi, and Pythinker Code, with a commitment-boundary advisor.", + "description": "CLI coding-agent orchestration for Claude through Codex, OpenCode, Pi, Pythinker Code, Antigravity CLI, and headless Claude Code, with a commitment-boundary advisor.", "owner": { "name": "elkaix" }, diff --git a/CHANGELOG.md b/CHANGELOG.md index ef45298..b460cd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,18 @@ All notable changes to Claude Architect are recorded here. The format follows ## [Unreleased] +### Added + +- `claude-implementer`: a sixth delegation-lane Producer that runs a headless + Claude Code session (`claude -p --output-format json`) as an untrusted + Producer, so the architect can delegate implementation to Opus or Sonnet + (`producerOverrides.model`) with an optional `--effort` override. The attempt + runs with `--strict-mcp-config`, `--setting-sources ""`, + `--disable-slash-commands`, `--no-session-persistence`, and a built-in tool + allowlist without `Agent`, so it sees only the Delegation Spec, cannot load + this plugin's own MCP tools, and cannot nest subagents. darwin/arm64 only, + confined by the same host Seatbelt backend as the Pi, OpenCode, Pythinker, + and agy lanes. ### Changed - Producers declare their own host state directories through diff --git a/README.md b/README.md index de29537..9180c71 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ license

-**Verified coding-agent delegation for Claude Code.** Claude stays the architect and reviewer — it writes the spec, judges the evidence, and reports what landed. Implementation is delegated to fresh-context subagent implementers running on the coding CLI you choose — **Codex, OpenCode, Pi, Pythinker, or Antigravity CLI** — each invocation starting clean with no inherited conversation state, inside an isolated Git worktree. The work comes back as a frozen, hash-anchored candidate that Claude reviews against independent verification evidence before a single byte can reach your checkout. +**Verified coding-agent delegation for Claude Code.** Claude stays the architect and reviewer — it writes the spec, judges the evidence, and reports what landed. Implementation is delegated to fresh-context subagent implementers running on the coding CLI you choose — **Codex, OpenCode, Pi, Pythinker, Antigravity CLI, or a headless Claude Code session (Opus/Sonnet)** — each invocation starting clean with no inherited conversation state, inside an isolated Git worktree. The work comes back as a frozen, hash-anchored candidate that Claude reviews against independent verification evidence before a single byte can reach your checkout. In practice that means three guarantees the plugin enforces in host code, not in prompts: @@ -57,7 +57,7 @@ claude plugin install claude-architect@claude-architect claude plugin list --json ``` -Restart Claude Code after installing or updating. Install and authenticate at least one supported Producer CLI (`codex`, `opencode`, `pi`, or `pythinker`); Claude Architect reports unavailable lanes rather than silently substituting another agent. +Restart Claude Code after installing or updating. Install and authenticate at least one supported Producer CLI (`codex`, `opencode`, `pi`, `pythinker`, `agy`, or `claude`); Claude Architect reports unavailable lanes rather than silently substituting another agent. ## Quick start @@ -67,7 +67,7 @@ Open Claude Code in a Git repository and name the Producer you want: /claude-architect:delegate Use Codex to add rate limiting to the public API, run the tests, and show me the independently reviewed candidate before integration. ``` -If no Producer is named, the skill asks you to choose Codex, OpenCode, Pi, Pythinker, or Antigravity CLI. OpenCode, Pythinker, and Antigravity CLI are harnesses that accept optional model and thinking/variant/effort overrides; model selection within a harness lane is optional and otherwise defers to that CLI's configured default. The Pi lane has no model override: it always runs the model configured in Pi, and a requested override fails the lane rather than silently substituting another model. For non-trivial work it uses the fresh-context review pipeline. Read the exact patch, findings, and verification output before deciding whether to accept. +If no Producer is named, the skill asks you to choose Codex, OpenCode, Pi, Pythinker, Antigravity CLI, or Claude Code. OpenCode, Pythinker, Antigravity CLI, and Claude Code are harnesses that accept optional model and thinking/variant/effort overrides; model selection within a harness lane is optional and otherwise defers to that CLI's configured default. The Pi lane has no model override: it always runs the model configured in Pi, and a requested override fails the lane rather than silently substituting another model. For non-trivial work it uses the fresh-context review pipeline. Read the exact patch, findings, and verification output before deciding whether to accept. ### Direct Codex CLI diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 0180892..68b9093 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -25,7 +25,7 @@ The normal MCP flow is: The Codex adapter uses Codex's native sandbox, requests `workspace-write`, disables network, constrains shell environment inclusion, disables multi-agent delegation, and uses ephemeral configuration. The backend table in `src/platform/sandbox/backends.ts` marks native macOS arm64 Codex as certified, native Linux as tested, and native Windows as unsupported for the edit lane. The macOS Seatbelt backend is used by other MCP adapters where eligible. Linux confinement fails closed when the required backend is unavailable. Windows process supervision uses the packaged watchdog/helper, but this is not a certified Windows Codex edit sandbox. -OpenCode, Pi, Pythinker, and Antigravity CLI (`agy`) use the same validated MCP attempt lifecycle and remain subject to adapter and platform eligibility checks. A requested Producer with no eligible confinement backend is unavailable: the runtime fails closed instead of selecting an unconfined path or substituting a different Producer. Certification claims remain specific to the Producer, platform, and backend reported by the capability registry. +OpenCode, Pi, Pythinker, Antigravity CLI (`agy`), and headless Claude Code (`claude -p`) use the same validated MCP attempt lifecycle and remain subject to adapter and platform eligibility checks. A requested Producer with no eligible confinement backend is unavailable: the runtime fails closed instead of selecting an unconfined path or substituting a different Producer. Certification claims remain specific to the Producer, platform, and backend reported by the capability registry. ## State and recovery diff --git a/docs/MARKETPLACE_REVIEW.md b/docs/MARKETPLACE_REVIEW.md index ac8bce4..0d2e7a7 100644 --- a/docs/MARKETPLACE_REVIEW.md +++ b/docs/MARKETPLACE_REVIEW.md @@ -27,7 +27,7 @@ The plugin is designed for macOS, Linux, and Windows process/runtime operation. ## Network destinations -There is no plugin-maintained fixed destination list. A cloud Producer CLI contacts the provider configured by that CLI: Codex normally uses its configured OpenAI service; OpenCode, Pi, and Pythinker can use various cloud or local endpoints. Claude Code separately contacts its configured Anthropic/model service. Verification commands may contact destinations only when their spec allows network, subject to effective platform enforcement. Codex's coding sandbox is configured with network disabled. Provider authentication, telemetry, transport, and retention are governed by the selected CLI/provider. +There is no plugin-maintained fixed destination list. A cloud Producer CLI contacts the provider configured by that CLI: Codex normally uses its configured OpenAI service; OpenCode, Pi, Pythinker, Antigravity CLI, and headless Claude Code can use various cloud or local endpoints. Claude Code separately contacts its configured Anthropic/model service. Verification commands may contact destinations only when their spec allows network, subject to effective platform enforcement. Codex's coding sandbox is configured with network disabled. Provider authentication, telemetry, transport, and retention are governed by the selected CLI/provider. ## Persistent state locations diff --git a/docs/PRIVACY.md b/docs/PRIVACY.md index b7e671e..d483d92 100644 --- a/docs/PRIVACY.md +++ b/docs/PRIVACY.md @@ -19,7 +19,7 @@ Archives use restrictive creation modes, reject symlink/path escapes, bound indi The initial Producer receives the objective, relevant context, success criteria, authorized/forbidden paths, and verification instructions. Because it can read files exposed within its sandbox, a CLI may include source code or other repository content in requests to its configured model. Pipeline reviewers receive at least the delegation spec, baseline and candidate identifiers, the candidate diff, and test evidence. Fixers additionally receive consolidated findings. The Claude architect session itself is governed by the privacy terms of the Claude Code/model configuration. -Codex normally contacts the OpenAI service configured by the Codex CLI. OpenCode, Pi, Pythinker, and Antigravity CLI (`agy`) are model harnesses and may contact whichever cloud or local provider the user's configuration selects; possible providers are not a fixed plugin-controlled list. A local provider may keep traffic on the machine, but that depends on its endpoint and configuration. Claude Architect does not inspect TLS, pin destinations, or override provider telemetry/retention. +Codex normally contacts the OpenAI service configured by the Codex CLI. OpenCode, Pi, Pythinker, Antigravity CLI (`agy`), and headless Claude Code (`claude`) are model harnesses and may contact whichever cloud or local provider the user's configuration selects; possible providers are not a fixed plugin-controlled list. A local provider may keep traffic on the machine, but that depends on its endpoint and configuration. Claude Architect does not inspect TLS, pin destinations, or override provider telemetry/retention. Verification commands run locally in a clean worktree. A command whose spec allows network may transmit repository or test data to destinations chosen by that command. Network-denied commands are only as private as the effective platform enforcement reported in verification evidence. diff --git a/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md b/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md new file mode 100644 index 0000000..2de7c63 --- /dev/null +++ b/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md @@ -0,0 +1,133 @@ +# Claude Code (`claude`) Producer adapter — design + +Date: 2026-08-27 +Status: implemented in the same change + +## Goal + +Add a headless Claude Code session as a sixth delegation-lane Producer so the +architect (any model, including Fable) can delegate implementation to Opus or +Sonnet under the same trust invariants as every other lane: fresh context, +isolated worktree, frozen candidate, independent verification. `claude-implementer` +is a selectable lane in `skills/delegate/SKILL.md`; no protocol bump; no +changes to `src/pipeline/`, `src/verify/`, or `src/integrate/`. + +This change also deepens the Producer seam so the adapter is self-contained +(see "Seam change" below). Adding this lane touched `src/producers/` and the +registry only — the sandbox was not edited. + +## Evidence base + +Every claim below is grounded in the installed binary (`claude` 2.1.250) — +`--help` output plus live `claude -p --output-format json` invocations run from +a scratch directory during this session. Nothing is taken from secondary docs. + +### 1. Auth needs `USER` and the real HOME — not HOME-redirectable + +| Environment | Result | +| --- | --- | +| `env -i HOME PATH` | `is_error:true`, `"Not logged in · Please run /login"` (exit 1) | +| `env -i HOME PATH USER` | `OK` | +| `env -i HOME= PATH USER` | `Not logged in`; the CLI created `/.claude/` and `/.claude.json` | + +The OAuth credential is resolved through the login keychain (keyed by user +name) together with the `oauthAccount` record in `~/.claude.json`. So the lane +is `inherited-config-only` (same class as Pi, Pythinker, agy): real HOME, with +`USER`, `CLAUDE_CONFIG_DIR`, and `ANTHROPIC_API_KEY` forwarded by declared +policy, and `~/.claude` + `~/.claude.json` granted as writable state because +the CLI rewrites both on every run. + +### 2. Nested-delegation and hidden-instruction surface — closed by argv + +The obvious hazard of a Claude Producer inside a Claude session: the child +loads the user's MCP servers (including this plugin's runtime, i.e. a nested +`delegate` tool), user/project hooks, plugins, and can spawn `Agent` +subagents. Live checks: + +- `--strict-mcp-config` with no `--mcp-config`: zero MCP servers. +- `--tools "Read,Edit,Write,Bash,Grep,Glob"`: the model reports exactly + `Bash, Edit, Glob, Grep, Read, Write` — no `Agent`, no web, no artifacts. +- `--setting-sources ""`: a project `UserPromptSubmit` hook that touches a + marker file did **not** run (it did run with `--setting-sources project` and + with no flag); the user-level hooks did not run either (they did with + `--setting-sources user`). It also disables `CLAUDE.md`/`AGENTS.md` + discovery: a project `CLAUDE.md` declaring a "secret fruit" was not seen. + The Producer therefore sees only the rendered Delegation Spec — + `repositoryInstructionSources: []`. +- `--bare` and `CLAUDE_CODE_SIMPLE=1` would give the same isolation but force + API-key auth (`Not logged in` under OAuth), so they are not used. +- `--no-session-persistence`: nothing resumable; `--continue`/`--resume` are + never passed. +- The host runtime's environment policy already forwards only allowlisted + variables, so `CLAUDECODE`, `CLAUDE_CODE_SESSION_ID`, and the messaging + socket/token of the parent session never reach the child. + +### 3. Structured output, confirmed live + +`--output-format json` prints one envelope: `{"type":"result","subtype": +"success"|…, "is_error":bool, "result":string, …}`. Observed: an API-level +failure exits **1** but some paths report `is_error:true` with a `result` +message — `normalizeEvents` therefore keys on `exitCode === 0 && !is_error && +subtype === "success" && typeof result === "string"`, and surfaces the +`result` text on failure. Warning lines can precede the envelope on the +combined stream, so the parser starts at the first `{`. + +### 4. Seatbelt confinement, confirmed live + +Under `sandbox-exec` with the worktree, `~/.claude`, `~/.claude.json`, and +TMPDIR writable, a `haiku` run created `made.txt` in the worktree and got +`EPERM` writing `$HOME/escape-probe.txt`. Platform ceiling: darwin/arm64 via +`macos-seatbelt`, same as Pi/OpenCode/Pythinker/agy; win32 unsupported. + +### 5. Prompt on stdin + +`echo | claude -p …` works; the prompt travels on stdin like Pi and +OpenCode, keeping argv free of spec text. + +## Overrides + +- `producerOverrides.model` → `--model ` (`opus`, `sonnet`, + `fable`, `haiku`). Absent: the CLI's configured default. +- `producerOverrides.reasoningEffort` → `--effort low|medium|high|xhigh|max`; + any other value throws before spawn (the CLI would reject it after burning + the attempt window). + +## Seam change (producers module) + +Before this change the Seatbelt backend decided which host directories a +Producer could write by sniffing `basename(executable)` and `requiredEnv` +names — four producer-specific functions inside `src/platform/sandbox/`. An +adapter the sandbox did not recognize silently ran with no state access, and +every new lane had to edit the sandbox. + +Now `ProducerInvocation.inheritedStateWritablePaths` is the declaration: each +adapter states its own auth/config/state paths, and the sandbox grants exactly +those when no temporary home is in effect. Depth moved to the right side of the +seam — the sandbox knows nothing about Producers, and the adapter is the single +place that knows where its CLI keeps state. The four OS-confined CLI probes +also collapsed into `probeOsConfinedCli` (resolve → `--version` → optional +surface check → confinement backend → auth), with Pythinker's `--help` +inspection supplied as a hook. + +## Architect-side Claude subagents (not Producers) + +Separately, the delegate skill now states which roles a Claude subagent +dispatched through the host `Agent` tool (Opus or Sonnet) may take: scout, +spec drafter, candidate reviewer (`agents/candidate-reviewer.md`, read-only + +`reviewCandidate`), and advisor. None of them edit the checkout or call +`decideCandidate`/`integrateCandidate`; an Opus/Sonnet *implementer* is the +`claude-implementer` lane, never a bare subagent. + +## Verification + +- `tests/runtime/claude-adapter.test.ts`: probe, auth resolution (OAuth file, + `CLAUDE_CONFIG_DIR`, API key), exact argv, tool allowlist, read-only tools, + overrides, writable-state declaration, Seatbelt wrap, envelope parsing + (success, `is_error` with exit 0, non-success subtype, non-zero exit, + truncation, non-envelope JSON), configuration profile. +- Opt-in real smoke (`CLAUDE_ARCHITECT_CLAUDE_SMOKE=1`, darwin/arm64): a + confined headless attempt on `haiku` creates `smoke.txt` in an isolated + worktree. +- Seatbelt tests now prove the declaration seam (grants exactly the declared + paths; ignores them under a temp home; never derives paths from executable + identity or env names); each adapter test asserts its own declaration. diff --git a/runtime/server.mjs b/runtime/server.mjs index a99c384..6588cf5 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -34,9 +34,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge mod )); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/code.js +// node_modules/ajv/dist/compile/codegen/code.js var require_code = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/code.js"(exports) { + "node_modules/ajv/dist/compile/codegen/code.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.regexpCode = exports.getEsmExportName = exports.getProperty = exports.safeStringify = exports.stringify = exports.strConcat = exports.addCodeArg = exports.str = exports._ = exports.nil = exports._Code = exports.Name = exports.IDENTIFIER = exports._CodeOrName = void 0; @@ -188,9 +188,9 @@ var require_code = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/scope.js +// node_modules/ajv/dist/compile/codegen/scope.js var require_scope = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/scope.js"(exports) { + "node_modules/ajv/dist/compile/codegen/scope.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.ValueScope = exports.ValueScopeName = exports.Scope = exports.varKinds = exports.UsedValueState = void 0; @@ -333,9 +333,9 @@ var require_scope = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/index.js +// node_modules/ajv/dist/compile/codegen/index.js var require_codegen = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/codegen/index.js"(exports) { + "node_modules/ajv/dist/compile/codegen/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.or = exports.and = exports.not = exports.CodeGen = exports.operators = exports.varKinds = exports.ValueScopeName = exports.ValueScope = exports.Scope = exports.Name = exports.regexpCode = exports.stringify = exports.getProperty = exports.nil = exports.strConcat = exports.str = exports._ = void 0; @@ -1053,9 +1053,9 @@ var require_codegen = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/util.js +// node_modules/ajv/dist/compile/util.js var require_util = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/util.js"(exports) { + "node_modules/ajv/dist/compile/util.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.checkStrictMode = exports.getErrorPath = exports.Type = exports.useFunc = exports.setEvaluated = exports.evaluatedPropsToName = exports.mergeEvaluated = exports.eachItem = exports.unescapeJsonPointer = exports.escapeJsonPointer = exports.escapeFragment = exports.unescapeFragment = exports.schemaRefOrVal = exports.schemaHasRulesButRef = exports.schemaHasRules = exports.checkUnknownRules = exports.alwaysValidSchema = exports.toHash = void 0; @@ -1220,9 +1220,9 @@ var require_util = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/names.js +// node_modules/ajv/dist/compile/names.js var require_names = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/names.js"(exports) { + "node_modules/ajv/dist/compile/names.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -1259,9 +1259,9 @@ var require_names = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/errors.js +// node_modules/ajv/dist/compile/errors.js var require_errors = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/errors.js"(exports) { + "node_modules/ajv/dist/compile/errors.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.extendErrors = exports.resetErrorsCount = exports.reportExtraError = exports.reportError = exports.keyword$DataError = exports.keywordError = void 0; @@ -1381,9 +1381,9 @@ var require_errors = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/boolSchema.js +// node_modules/ajv/dist/compile/validate/boolSchema.js var require_boolSchema = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/boolSchema.js"(exports) { + "node_modules/ajv/dist/compile/validate/boolSchema.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.boolOrEmptySchema = exports.topBoolOrEmptySchema = void 0; @@ -1432,9 +1432,9 @@ var require_boolSchema = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/rules.js +// node_modules/ajv/dist/compile/rules.js var require_rules = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/rules.js"(exports) { + "node_modules/ajv/dist/compile/rules.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getRules = exports.isJSONType = void 0; @@ -1463,9 +1463,9 @@ var require_rules = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/applicability.js +// node_modules/ajv/dist/compile/validate/applicability.js var require_applicability = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/applicability.js"(exports) { + "node_modules/ajv/dist/compile/validate/applicability.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.shouldUseRule = exports.shouldUseGroup = exports.schemaHasRulesForType = void 0; @@ -1486,9 +1486,9 @@ var require_applicability = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/dataType.js +// node_modules/ajv/dist/compile/validate/dataType.js var require_dataType = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/dataType.js"(exports) { + "node_modules/ajv/dist/compile/validate/dataType.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.reportTypeError = exports.checkDataTypes = exports.checkDataType = exports.coerceAndCheckDataType = exports.getJSONTypes = exports.getSchemaTypes = exports.DataType = void 0; @@ -1670,9 +1670,9 @@ var require_dataType = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/defaults.js +// node_modules/ajv/dist/compile/validate/defaults.js var require_defaults = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/defaults.js"(exports) { + "node_modules/ajv/dist/compile/validate/defaults.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.assignDefaults = void 0; @@ -1707,9 +1707,9 @@ var require_defaults = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/code.js +// node_modules/ajv/dist/vocabularies/code.js var require_code2 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/code.js"(exports) { + "node_modules/ajv/dist/vocabularies/code.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateUnion = exports.validateArray = exports.usePattern = exports.callValidateCode = exports.schemaProperties = exports.allSchemaProperties = exports.noPropertyInData = exports.propertyInData = exports.isOwnProperty = exports.hasPropFunc = exports.reportMissingProp = exports.checkMissingProp = exports.checkReportMissingProp = void 0; @@ -1840,9 +1840,9 @@ var require_code2 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/keyword.js +// node_modules/ajv/dist/compile/validate/keyword.js var require_keyword = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/keyword.js"(exports) { + "node_modules/ajv/dist/compile/validate/keyword.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateKeywordUsage = exports.validSchemaType = exports.funcKeywordCode = exports.macroKeywordCode = void 0; @@ -1958,9 +1958,9 @@ var require_keyword = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/subschema.js +// node_modules/ajv/dist/compile/validate/subschema.js var require_subschema = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/subschema.js"(exports) { + "node_modules/ajv/dist/compile/validate/subschema.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.extendSubschemaMode = exports.extendSubschemaData = exports.getSubschema = void 0; @@ -2041,9 +2041,9 @@ var require_subschema = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-deep-equal/index.js +// node_modules/fast-deep-equal/index.js var require_fast_deep_equal = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-deep-equal/index.js"(exports, module) { + "node_modules/fast-deep-equal/index.js"(exports, module) { "use strict"; module.exports = function equal(a, b) { if (a === b) return true; @@ -2076,9 +2076,9 @@ var require_fast_deep_equal = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/json-schema-traverse/index.js +// node_modules/json-schema-traverse/index.js var require_json_schema_traverse = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/json-schema-traverse/index.js"(exports, module) { + "node_modules/json-schema-traverse/index.js"(exports, module) { "use strict"; var traverse = module.exports = function(schema, opts, cb) { if (typeof opts == "function") { @@ -2164,9 +2164,9 @@ var require_json_schema_traverse = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/resolve.js +// node_modules/ajv/dist/compile/resolve.js var require_resolve = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/resolve.js"(exports) { + "node_modules/ajv/dist/compile/resolve.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getSchemaRefs = exports.resolveUrl = exports.normalizeId = exports._getFullPath = exports.getFullPath = exports.inlineRef = void 0; @@ -2320,9 +2320,9 @@ var require_resolve = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/index.js +// node_modules/ajv/dist/compile/validate/index.js var require_validate = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/validate/index.js"(exports) { + "node_modules/ajv/dist/compile/validate/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getData = exports.KeywordCxt = exports.validateFunctionCode = void 0; @@ -2828,9 +2828,9 @@ var require_validate = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/validation_error.js +// node_modules/ajv/dist/runtime/validation_error.js var require_validation_error = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/validation_error.js"(exports) { + "node_modules/ajv/dist/runtime/validation_error.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var ValidationError = class extends Error { @@ -2844,9 +2844,9 @@ var require_validation_error = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/ref_error.js +// node_modules/ajv/dist/compile/ref_error.js var require_ref_error = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/ref_error.js"(exports) { + "node_modules/ajv/dist/compile/ref_error.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var resolve_1 = require_resolve(); @@ -2861,9 +2861,9 @@ var require_ref_error = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/index.js +// node_modules/ajv/dist/compile/index.js var require_compile = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/compile/index.js"(exports) { + "node_modules/ajv/dist/compile/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.resolveSchema = exports.getCompilingSchema = exports.resolveRef = exports.compileSchema = exports.SchemaEnv = void 0; @@ -3085,9 +3085,9 @@ var require_compile = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/data.json +// node_modules/ajv/dist/refs/data.json var require_data = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/data.json"(exports, module) { + "node_modules/ajv/dist/refs/data.json"(exports, module) { module.exports = { $id: "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#", description: "Meta-schema for $data reference (JSON AnySchema extension proposal)", @@ -3104,9 +3104,9 @@ var require_data = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/utils.js +// node_modules/fast-uri/lib/utils.js var require_utils = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/utils.js"(exports, module) { + "node_modules/fast-uri/lib/utils.js"(exports, module) { "use strict"; var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu); var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u); @@ -3417,9 +3417,9 @@ var require_utils = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/schemes.js +// node_modules/fast-uri/lib/schemes.js var require_schemes = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/lib/schemes.js"(exports, module) { + "node_modules/fast-uri/lib/schemes.js"(exports, module) { "use strict"; var { isUUID } = require_utils(); var URN_REG = /([\da-z][\d\-a-z]{0,31}):((?:[\w!$'()*+,\-.:;=@]|%[\da-f]{2})+)/iu; @@ -3627,9 +3627,9 @@ var require_schemes = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/index.js +// node_modules/fast-uri/index.js var require_fast_uri = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/fast-uri/index.js"(exports, module) { + "node_modules/fast-uri/index.js"(exports, module) { "use strict"; var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils(); var { SCHEMES, getSchemeHandler } = require_schemes(); @@ -3919,9 +3919,9 @@ var require_fast_uri = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/uri.js +// node_modules/ajv/dist/runtime/uri.js var require_uri = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/uri.js"(exports) { + "node_modules/ajv/dist/runtime/uri.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var uri = require_fast_uri(); @@ -3930,9 +3930,9 @@ var require_uri = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/core.js +// node_modules/ajv/dist/core.js var require_core = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/core.js"(exports) { + "node_modules/ajv/dist/core.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = void 0; @@ -4541,9 +4541,9 @@ var require_core = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/id.js +// node_modules/ajv/dist/vocabularies/core/id.js var require_id = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/id.js"(exports) { + "node_modules/ajv/dist/vocabularies/core/id.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var def = { @@ -4556,9 +4556,9 @@ var require_id = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/ref.js +// node_modules/ajv/dist/vocabularies/core/ref.js var require_ref = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/ref.js"(exports) { + "node_modules/ajv/dist/vocabularies/core/ref.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.callRef = exports.getValidate = void 0; @@ -4678,9 +4678,9 @@ var require_ref = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/index.js +// node_modules/ajv/dist/vocabularies/core/index.js var require_core2 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/core/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/core/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var id_1 = require_id(); @@ -4699,9 +4699,9 @@ var require_core2 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitNumber.js +// node_modules/ajv/dist/vocabularies/validation/limitNumber.js var require_limitNumber = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitNumber.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/limitNumber.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4731,9 +4731,9 @@ var require_limitNumber = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/multipleOf.js +// node_modules/ajv/dist/vocabularies/validation/multipleOf.js var require_multipleOf = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/multipleOf.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/multipleOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4759,9 +4759,9 @@ var require_multipleOf = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/ucs2length.js +// node_modules/ajv/dist/runtime/ucs2length.js var require_ucs2length = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/ucs2length.js"(exports) { + "node_modules/ajv/dist/runtime/ucs2length.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); function ucs2length(str) { @@ -4785,9 +4785,9 @@ var require_ucs2length = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitLength.js +// node_modules/ajv/dist/vocabularies/validation/limitLength.js var require_limitLength = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitLength.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/limitLength.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4817,9 +4817,9 @@ var require_limitLength = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/pattern.js +// node_modules/ajv/dist/vocabularies/validation/pattern.js var require_pattern = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/pattern.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/pattern.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -4854,9 +4854,9 @@ var require_pattern = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitProperties.js +// node_modules/ajv/dist/vocabularies/validation/limitProperties.js var require_limitProperties = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitProperties.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/limitProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4883,9 +4883,9 @@ var require_limitProperties = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/required.js +// node_modules/ajv/dist/vocabularies/validation/required.js var require_required = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/required.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/required.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -4965,9 +4965,9 @@ var require_required = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitItems.js +// node_modules/ajv/dist/vocabularies/validation/limitItems.js var require_limitItems = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitItems.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/limitItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -4994,9 +4994,9 @@ var require_limitItems = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/equal.js +// node_modules/ajv/dist/runtime/equal.js var require_equal = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/runtime/equal.js"(exports) { + "node_modules/ajv/dist/runtime/equal.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var equal = require_fast_deep_equal(); @@ -5005,9 +5005,9 @@ var require_equal = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/uniqueItems.js +// node_modules/ajv/dist/vocabularies/validation/uniqueItems.js var require_uniqueItems = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/uniqueItems.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/uniqueItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dataType_1 = require_dataType(); @@ -5072,9 +5072,9 @@ var require_uniqueItems = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/const.js +// node_modules/ajv/dist/vocabularies/validation/const.js var require_const = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/const.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/const.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5101,9 +5101,9 @@ var require_const = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/enum.js +// node_modules/ajv/dist/vocabularies/validation/enum.js var require_enum = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/enum.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/enum.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5150,9 +5150,9 @@ var require_enum = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/index.js +// node_modules/ajv/dist/vocabularies/validation/index.js var require_validation = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var limitNumber_1 = require_limitNumber(); @@ -5188,9 +5188,9 @@ var require_validation = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalItems.js +// node_modules/ajv/dist/vocabularies/applicator/additionalItems.js var require_additionalItems = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalItems.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/additionalItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateAdditionalItems = void 0; @@ -5241,9 +5241,9 @@ var require_additionalItems = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items.js +// node_modules/ajv/dist/vocabularies/applicator/items.js var require_items = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/items.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateTuple = void 0; @@ -5298,9 +5298,9 @@ var require_items = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/prefixItems.js +// node_modules/ajv/dist/vocabularies/applicator/prefixItems.js var require_prefixItems = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/prefixItems.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/prefixItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var items_1 = require_items(); @@ -5315,9 +5315,9 @@ var require_prefixItems = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items2020.js +// node_modules/ajv/dist/vocabularies/applicator/items2020.js var require_items2020 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/items2020.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/items2020.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5350,9 +5350,9 @@ var require_items2020 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/contains.js +// node_modules/ajv/dist/vocabularies/applicator/contains.js var require_contains = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/contains.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/contains.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5444,9 +5444,9 @@ var require_contains = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependencies.js +// node_modules/ajv/dist/vocabularies/applicator/dependencies.js var require_dependencies = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependencies.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/dependencies.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.validateSchemaDeps = exports.validatePropertyDeps = exports.error = void 0; @@ -5538,9 +5538,9 @@ var require_dependencies = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/propertyNames.js +// node_modules/ajv/dist/vocabularies/applicator/propertyNames.js var require_propertyNames = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/propertyNames.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/propertyNames.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5581,9 +5581,9 @@ var require_propertyNames = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js +// node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js var require_additionalProperties = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/additionalProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -5687,9 +5687,9 @@ var require_additionalProperties = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/properties.js +// node_modules/ajv/dist/vocabularies/applicator/properties.js var require_properties = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/properties.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/properties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var validate_1 = require_validate(); @@ -5745,9 +5745,9 @@ var require_properties = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/patternProperties.js +// node_modules/ajv/dist/vocabularies/applicator/patternProperties.js var require_patternProperties = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/patternProperties.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/patternProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -5819,9 +5819,9 @@ var require_patternProperties = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/not.js +// node_modules/ajv/dist/vocabularies/applicator/not.js var require_not = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/not.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/not.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -5850,9 +5850,9 @@ var require_not = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/anyOf.js +// node_modules/ajv/dist/vocabularies/applicator/anyOf.js var require_anyOf = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/anyOf.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/anyOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var code_1 = require_code2(); @@ -5867,9 +5867,9 @@ var require_anyOf = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/oneOf.js +// node_modules/ajv/dist/vocabularies/applicator/oneOf.js var require_oneOf = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/oneOf.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/oneOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -5925,9 +5925,9 @@ var require_oneOf = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/allOf.js +// node_modules/ajv/dist/vocabularies/applicator/allOf.js var require_allOf = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/allOf.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/allOf.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -5952,9 +5952,9 @@ var require_allOf = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/if.js +// node_modules/ajv/dist/vocabularies/applicator/if.js var require_if = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/if.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/if.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -6021,9 +6021,9 @@ var require_if = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/thenElse.js +// node_modules/ajv/dist/vocabularies/applicator/thenElse.js var require_thenElse = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/thenElse.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/thenElse.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -6039,9 +6039,9 @@ var require_thenElse = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/index.js +// node_modules/ajv/dist/vocabularies/applicator/index.js var require_applicator = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var additionalItems_1 = require_additionalItems(); @@ -6087,9 +6087,9 @@ var require_applicator = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/format.js +// node_modules/ajv/dist/vocabularies/format/format.js var require_format = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/format.js"(exports) { + "node_modules/ajv/dist/vocabularies/format/format.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -6177,9 +6177,9 @@ var require_format = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/index.js +// node_modules/ajv/dist/vocabularies/format/index.js var require_format2 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/format/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/format/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var format_1 = require_format(); @@ -6188,9 +6188,9 @@ var require_format2 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/metadata.js +// node_modules/ajv/dist/vocabularies/metadata.js var require_metadata = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/metadata.js"(exports) { + "node_modules/ajv/dist/vocabularies/metadata.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.contentVocabulary = exports.metadataVocabulary = void 0; @@ -6211,9 +6211,9 @@ var require_metadata = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft7.js +// node_modules/ajv/dist/vocabularies/draft7.js var require_draft7 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft7.js"(exports) { + "node_modules/ajv/dist/vocabularies/draft7.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var core_1 = require_core2(); @@ -6233,9 +6233,9 @@ var require_draft7 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/types.js +// node_modules/ajv/dist/vocabularies/discriminator/types.js var require_types = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/types.js"(exports) { + "node_modules/ajv/dist/vocabularies/discriminator/types.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.DiscrError = void 0; @@ -6247,9 +6247,9 @@ var require_types = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/index.js +// node_modules/ajv/dist/vocabularies/discriminator/index.js var require_discriminator = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/discriminator/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/discriminator/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -6352,9 +6352,9 @@ var require_discriminator = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-draft-07.json +// node_modules/ajv/dist/refs/json-schema-draft-07.json var require_json_schema_draft_07 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-draft-07.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-draft-07.json"(exports, module) { module.exports = { $schema: "http://json-schema.org/draft-07/schema#", $id: "http://json-schema.org/draft-07/schema#", @@ -6509,9 +6509,9 @@ var require_json_schema_draft_07 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/ajv.js +// node_modules/ajv/dist/ajv.js var require_ajv = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/ajv.js"(exports, module) { + "node_modules/ajv/dist/ajv.js"(exports, module) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MissingRefError = exports.ValidationError = exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = exports.Ajv = void 0; @@ -6579,9 +6579,9 @@ var require_ajv = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/formats.js +// node_modules/ajv-formats/dist/formats.js var require_formats = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/formats.js"(exports) { + "node_modules/ajv-formats/dist/formats.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.formatNames = exports.fastFormats = exports.fullFormats = void 0; @@ -6782,9 +6782,9 @@ var require_formats = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/limit.js +// node_modules/ajv-formats/dist/limit.js var require_limit = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/limit.js"(exports) { + "node_modules/ajv-formats/dist/limit.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.formatLimitDefinition = void 0; @@ -6854,9 +6854,9 @@ var require_limit = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/index.js +// node_modules/ajv-formats/dist/index.js var require_dist = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv-formats/dist/index.js"(exports, module) { + "node_modules/ajv-formats/dist/index.js"(exports, module) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var formats_1 = require_formats(); @@ -6896,9 +6896,9 @@ var require_dist = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js +// node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js var require_dynamicAnchor = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js"(exports) { + "node_modules/ajv/dist/vocabularies/dynamic/dynamicAnchor.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.dynamicAnchor = void 0; @@ -6931,9 +6931,9 @@ var require_dynamicAnchor = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js +// node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js var require_dynamicRef = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js"(exports) { + "node_modules/ajv/dist/vocabularies/dynamic/dynamicRef.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.dynamicRef = void 0; @@ -6977,9 +6977,9 @@ var require_dynamicRef = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js +// node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js var require_recursiveAnchor = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js"(exports) { + "node_modules/ajv/dist/vocabularies/dynamic/recursiveAnchor.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dynamicAnchor_1 = require_dynamicAnchor(); @@ -6998,9 +6998,9 @@ var require_recursiveAnchor = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js +// node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js var require_recursiveRef = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js"(exports) { + "node_modules/ajv/dist/vocabularies/dynamic/recursiveRef.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dynamicRef_1 = require_dynamicRef(); @@ -7013,9 +7013,9 @@ var require_recursiveRef = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/index.js +// node_modules/ajv/dist/vocabularies/dynamic/index.js var require_dynamic = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/dynamic/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/dynamic/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dynamicAnchor_1 = require_dynamicAnchor(); @@ -7027,9 +7027,9 @@ var require_dynamic = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/dependentRequired.js +// node_modules/ajv/dist/vocabularies/validation/dependentRequired.js var require_dependentRequired = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/dependentRequired.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/dependentRequired.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dependencies_1 = require_dependencies(); @@ -7044,9 +7044,9 @@ var require_dependentRequired = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js +// node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js var require_dependentSchemas = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js"(exports) { + "node_modules/ajv/dist/vocabularies/applicator/dependentSchemas.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dependencies_1 = require_dependencies(); @@ -7060,9 +7060,9 @@ var require_dependentSchemas = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitContains.js +// node_modules/ajv/dist/vocabularies/validation/limitContains.js var require_limitContains = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/validation/limitContains.js"(exports) { + "node_modules/ajv/dist/vocabularies/validation/limitContains.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var util_1 = require_util(); @@ -7080,9 +7080,9 @@ var require_limitContains = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/next.js +// node_modules/ajv/dist/vocabularies/next.js var require_next = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/next.js"(exports) { + "node_modules/ajv/dist/vocabularies/next.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var dependentRequired_1 = require_dependentRequired(); @@ -7093,9 +7093,9 @@ var require_next = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js +// node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js var require_unevaluatedProperties = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js"(exports) { + "node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedProperties.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -7159,9 +7159,9 @@ var require_unevaluatedProperties = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js +// node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js var require_unevaluatedItems = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js"(exports) { + "node_modules/ajv/dist/vocabularies/unevaluated/unevaluatedItems.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var codegen_1 = require_codegen(); @@ -7203,9 +7203,9 @@ var require_unevaluatedItems = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/index.js +// node_modules/ajv/dist/vocabularies/unevaluated/index.js var require_unevaluated = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/unevaluated/index.js"(exports) { + "node_modules/ajv/dist/vocabularies/unevaluated/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var unevaluatedProperties_1 = require_unevaluatedProperties(); @@ -7215,9 +7215,9 @@ var require_unevaluated = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft2020.js +// node_modules/ajv/dist/vocabularies/draft2020.js var require_draft2020 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/vocabularies/draft2020.js"(exports) { + "node_modules/ajv/dist/vocabularies/draft2020.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var core_1 = require_core2(); @@ -7243,9 +7243,9 @@ var require_draft2020 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/schema.json +// node_modules/ajv/dist/refs/json-schema-2020-12/schema.json var require_schema = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/schema.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/schema.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/schema", @@ -7303,9 +7303,9 @@ var require_schema = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json var require_applicator2 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/applicator.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/applicator", @@ -7356,9 +7356,9 @@ var require_applicator2 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json var require_unevaluated2 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/unevaluated.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/unevaluated", @@ -7376,9 +7376,9 @@ var require_unevaluated2 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json var require_content = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/content.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/content", @@ -7397,9 +7397,9 @@ var require_content = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json var require_core3 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/core.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/core", @@ -7453,9 +7453,9 @@ var require_core3 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json var require_format_annotation = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/format-annotation.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/format-annotation", @@ -7472,9 +7472,9 @@ var require_format_annotation = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json var require_meta_data = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/meta-data.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/meta-data", @@ -7513,9 +7513,9 @@ var require_meta_data = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json +// node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json var require_validation2 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json"(exports, module) { + "node_modules/ajv/dist/refs/json-schema-2020-12/meta/validation.json"(exports, module) { module.exports = { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "https://json-schema.org/draft/2020-12/meta/validation", @@ -7608,9 +7608,9 @@ var require_validation2 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/index.js +// node_modules/ajv/dist/refs/json-schema-2020-12/index.js var require_json_schema_2020_12 = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/refs/json-schema-2020-12/index.js"(exports) { + "node_modules/ajv/dist/refs/json-schema-2020-12/index.js"(exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var metaSchema = require_schema(); @@ -7643,9 +7643,9 @@ var require_json_schema_2020_12 = __commonJS({ } }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/2020.js +// node_modules/ajv/dist/2020.js var require__ = __commonJS({ - "../../../Users/panda/Projects/active/claude-architect/node_modules/ajv/dist/2020.js"(exports, module) { + "node_modules/ajv/dist/2020.js"(exports, module) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MissingRefError = exports.ValidationError = exports.CodeGen = exports.Name = exports.nil = exports.stringify = exports.str = exports._ = exports.KeywordCxt = exports.Ajv2020 = void 0; @@ -7723,7 +7723,7 @@ var require__ = __commonJS({ // src/index.ts import { pathToFileURL } from "node:url"; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/helpers/util.js +// node_modules/zod/v3/helpers/util.js var util; (function(util2) { util2.assertEqual = (_) => { @@ -7857,7 +7857,7 @@ var getParsedType = (data) => { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/ZodError.js +// node_modules/zod/v3/ZodError.js var ZodIssueCode = util.arrayToEnum([ "invalid_type", "invalid_literal", @@ -7971,7 +7971,7 @@ ZodError.create = (issues) => { return error51; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/locales/en.js +// node_modules/zod/v3/locales/en.js var errorMap = (issue2, _ctx) => { let message; switch (issue2.code) { @@ -8074,13 +8074,13 @@ var errorMap = (issue2, _ctx) => { }; var en_default = errorMap; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/errors.js +// node_modules/zod/v3/errors.js var overrideErrorMap = en_default; function getErrorMap() { return overrideErrorMap; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/helpers/parseUtil.js +// node_modules/zod/v3/helpers/parseUtil.js var makeIssue = (params) => { const { data, path: path32, errorMaps, issueData } = params; const fullPath = [...path32, ...issueData.path || []]; @@ -8189,14 +8189,14 @@ var isDirty = (x) => x.status === "dirty"; var isValid = (x) => x.status === "valid"; var isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/helpers/errorUtil.js +// node_modules/zod/v3/helpers/errorUtil.js var errorUtil; (function(errorUtil2) { errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {}; errorUtil2.toString = (message) => typeof message === "string" ? message : message?.message; })(errorUtil || (errorUtil = {})); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v3/types.js +// node_modules/zod/v3/types.js var ParseInputLazyPath = class { constructor(parent, value, path32, key) { this._cachedPath = []; @@ -11599,7 +11599,7 @@ var nullableType = ZodNullable.create; var preprocessType = ZodEffects.createWithPreprocess; var pipelineType = ZodPipeline.create; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/index.js +// node_modules/zod/v4/core/index.js var core_exports2 = {}; __export(core_exports2, { $ZodAny: () => $ZodAny, @@ -11878,7 +11878,7 @@ __export(core_exports2, { version: () => version }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/core.js +// node_modules/zod/v4/core/core.js var _a; var NEVER = /* @__PURE__ */ Object.freeze({ status: "aborted" @@ -11955,7 +11955,7 @@ function config(newConfig) { return globalConfig; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/util.js +// node_modules/zod/v4/core/util.js var util_exports = {}; __export(util_exports, { BIGINT_FORMAT_RANGES: () => BIGINT_FORMAT_RANGES, @@ -12651,7 +12651,7 @@ var Class = class { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/errors.js +// node_modules/zod/v4/core/errors.js var initializer = (inst, def) => { inst.name = "$ZodError"; Object.defineProperty(inst, "_zod", { @@ -12790,7 +12790,7 @@ function prettifyError(error51) { return lines.join("\n"); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/parse.js +// node_modules/zod/v4/core/parse.js var _parse = (_Err) => (schema, value, _ctx, _params) => { const ctx = _ctx ? { ..._ctx, async: false } : { async: false }; const result = schema._zod.run({ value, issues: [] }, ctx); @@ -12878,7 +12878,7 @@ var _safeDecodeAsync = (_Err) => async (schema, value, _ctx) => { }; var safeDecodeAsync = /* @__PURE__ */ _safeDecodeAsync($ZodRealError); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/regexes.js +// node_modules/zod/v4/core/regexes.js var regexes_exports = {}; __export(regexes_exports, { base64: () => base64, @@ -13037,7 +13037,7 @@ var sha512_hex = /^[0-9a-fA-F]{128}$/; var sha512_base64 = /* @__PURE__ */ fixedBase64(86, "=="); var sha512_base64url = /* @__PURE__ */ fixedBase64url(86); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/checks.js +// node_modules/zod/v4/core/checks.js var $ZodCheck = /* @__PURE__ */ $constructor("$ZodCheck", (inst, def) => { var _a3; inst._zod ?? (inst._zod = {}); @@ -13585,7 +13585,7 @@ var $ZodCheckOverwrite = /* @__PURE__ */ $constructor("$ZodCheckOverwrite", (ins }; }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/doc.js +// node_modules/zod/v4/core/doc.js var Doc = class { constructor(args = []) { this.content = []; @@ -13621,14 +13621,14 @@ var Doc = class { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/versions.js +// node_modules/zod/v4/core/versions.js var version = { major: 4, minor: 4, patch: 3 }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/schemas.js +// node_modules/zod/v4/core/schemas.js var $ZodType = /* @__PURE__ */ $constructor("$ZodType", (inst, def) => { var _a3; inst ?? (inst = {}); @@ -15721,7 +15721,7 @@ function handleRefineResult(result, payload, input, inst) { } } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/index.js +// node_modules/zod/v4/locales/index.js var locales_exports = {}; __export(locales_exports, { ar: () => ar_default, @@ -15778,7 +15778,7 @@ __export(locales_exports, { zhTW: () => zh_TW_default }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ar.js +// node_modules/zod/v4/locales/ar.js var error = () => { const Sizable = { string: { unit: "\u062D\u0631\u0641", verb: "\u0623\u0646 \u064A\u062D\u0648\u064A" }, @@ -15885,7 +15885,7 @@ function ar_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/az.js +// node_modules/zod/v4/locales/az.js var error2 = () => { const Sizable = { string: { unit: "simvol", verb: "olmal\u0131d\u0131r" }, @@ -15991,7 +15991,7 @@ function az_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/be.js +// node_modules/zod/v4/locales/be.js function getBelarusianPlural(count, one, few, many) { const absCount = Math.abs(count); const lastDigit = absCount % 10; @@ -16148,7 +16148,7 @@ function be_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/bg.js +// node_modules/zod/v4/locales/bg.js var error4 = () => { const Sizable = { string: { unit: "\u0441\u0438\u043C\u0432\u043E\u043B\u0430", verb: "\u0434\u0430 \u0441\u044A\u0434\u044A\u0440\u0436\u0430" }, @@ -16269,7 +16269,7 @@ function bg_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ca.js +// node_modules/zod/v4/locales/ca.js var error5 = () => { const Sizable = { string: { unit: "car\xE0cters", verb: "contenir" }, @@ -16378,7 +16378,7 @@ function ca_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/cs.js +// node_modules/zod/v4/locales/cs.js var error6 = () => { const Sizable = { string: { unit: "znak\u016F", verb: "m\xEDt" }, @@ -16490,7 +16490,7 @@ function cs_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/da.js +// node_modules/zod/v4/locales/da.js var error7 = () => { const Sizable = { string: { unit: "tegn", verb: "havde" }, @@ -16606,7 +16606,7 @@ function da_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/de.js +// node_modules/zod/v4/locales/de.js var error8 = () => { const Sizable = { string: { unit: "Zeichen", verb: "zu haben" }, @@ -16715,7 +16715,7 @@ function de_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/el.js +// node_modules/zod/v4/locales/el.js var error9 = () => { const Sizable = { string: { unit: "\u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03AE\u03C1\u03B5\u03C2", verb: "\u03BD\u03B1 \u03AD\u03C7\u03B5\u03B9" }, @@ -16825,7 +16825,7 @@ function el_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/en.js +// node_modules/zod/v4/locales/en.js var error10 = () => { const Sizable = { string: { unit: "characters", verb: "to have" }, @@ -16938,7 +16938,7 @@ function en_default2() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/eo.js +// node_modules/zod/v4/locales/eo.js var error11 = () => { const Sizable = { string: { unit: "karaktrojn", verb: "havi" }, @@ -17048,7 +17048,7 @@ function eo_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/es.js +// node_modules/zod/v4/locales/es.js var error12 = () => { const Sizable = { string: { unit: "caracteres", verb: "tener" }, @@ -17181,7 +17181,7 @@ function es_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fa.js +// node_modules/zod/v4/locales/fa.js var error13 = () => { const Sizable = { string: { unit: "\u06A9\u0627\u0631\u0627\u06A9\u062A\u0631", verb: "\u062F\u0627\u0634\u062A\u0647 \u0628\u0627\u0634\u062F" }, @@ -17296,7 +17296,7 @@ function fa_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fi.js +// node_modules/zod/v4/locales/fi.js var error14 = () => { const Sizable = { string: { unit: "merkki\xE4", subject: "merkkijonon" }, @@ -17409,7 +17409,7 @@ function fi_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fr.js +// node_modules/zod/v4/locales/fr.js var error15 = () => { const Sizable = { string: { unit: "caract\xE8res", verb: "avoir" }, @@ -17535,7 +17535,7 @@ function fr_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/fr-CA.js +// node_modules/zod/v4/locales/fr-CA.js var error16 = () => { const Sizable = { string: { unit: "caract\xE8res", verb: "avoir" }, @@ -17643,7 +17643,7 @@ function fr_CA_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/he.js +// node_modules/zod/v4/locales/he.js var error17 = () => { const TypeNames = { string: { label: "\u05DE\u05D7\u05E8\u05D5\u05D6\u05EA", gender: "f" }, @@ -17838,7 +17838,7 @@ function he_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/hr.js +// node_modules/zod/v4/locales/hr.js var error18 = () => { const Sizable = { string: { unit: "znakova", verb: "imati" }, @@ -17961,7 +17961,7 @@ function hr_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/hu.js +// node_modules/zod/v4/locales/hu.js var error19 = () => { const Sizable = { string: { unit: "karakter", verb: "legyen" }, @@ -18070,7 +18070,7 @@ function hu_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/hy.js +// node_modules/zod/v4/locales/hy.js function getArmenianPlural(count, one, many) { return Math.abs(count) === 1 ? one : many; } @@ -18218,7 +18218,7 @@ function hy_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/id.js +// node_modules/zod/v4/locales/id.js var error21 = () => { const Sizable = { string: { unit: "karakter", verb: "memiliki" }, @@ -18325,7 +18325,7 @@ function id_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/is.js +// node_modules/zod/v4/locales/is.js var error22 = () => { const Sizable = { string: { unit: "stafi", verb: "a\xF0 hafa" }, @@ -18435,7 +18435,7 @@ function is_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/it.js +// node_modules/zod/v4/locales/it.js var error23 = () => { const Sizable = { string: { unit: "caratteri", verb: "avere" }, @@ -18544,7 +18544,7 @@ function it_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ja.js +// node_modules/zod/v4/locales/ja.js var error24 = () => { const Sizable = { string: { unit: "\u6587\u5B57", verb: "\u3067\u3042\u308B" }, @@ -18652,7 +18652,7 @@ function ja_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ka.js +// node_modules/zod/v4/locales/ka.js var error25 = () => { const Sizable = { string: { unit: "\u10E1\u10D8\u10DB\u10D1\u10DD\u10DA\u10DD", verb: "\u10E3\u10DC\u10D3\u10D0 \u10E8\u10D4\u10D8\u10EA\u10D0\u10D5\u10D3\u10D4\u10E1" }, @@ -18765,7 +18765,7 @@ function ka_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/km.js +// node_modules/zod/v4/locales/km.js var error26 = () => { const Sizable = { string: { unit: "\u178F\u17BD\u17A2\u1780\u17D2\u179F\u179A", verb: "\u1782\u17BD\u179A\u1798\u17B6\u1793" }, @@ -18876,12 +18876,12 @@ function km_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/kh.js +// node_modules/zod/v4/locales/kh.js function kh_default() { return km_default(); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ko.js +// node_modules/zod/v4/locales/ko.js var error27 = () => { const Sizable = { string: { unit: "\uBB38\uC790", verb: "to have" }, @@ -18993,7 +18993,7 @@ function ko_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/lt.js +// node_modules/zod/v4/locales/lt.js var capitalizeFirstCharacter = (text) => { return text.charAt(0).toUpperCase() + text.slice(1); }; @@ -19197,7 +19197,7 @@ function lt_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/mk.js +// node_modules/zod/v4/locales/mk.js var error29 = () => { const Sizable = { string: { unit: "\u0437\u043D\u0430\u0446\u0438", verb: "\u0434\u0430 \u0438\u043C\u0430\u0430\u0442" }, @@ -19307,7 +19307,7 @@ function mk_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ms.js +// node_modules/zod/v4/locales/ms.js var error30 = () => { const Sizable = { string: { unit: "aksara", verb: "mempunyai" }, @@ -19415,7 +19415,7 @@ function ms_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/nl.js +// node_modules/zod/v4/locales/nl.js var error31 = () => { const Sizable = { string: { unit: "tekens", verb: "heeft" }, @@ -19526,7 +19526,7 @@ function nl_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/no.js +// node_modules/zod/v4/locales/no.js var error32 = () => { const Sizable = { string: { unit: "tegn", verb: "\xE5 ha" }, @@ -19635,7 +19635,7 @@ function no_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ota.js +// node_modules/zod/v4/locales/ota.js var error33 = () => { const Sizable = { string: { unit: "harf", verb: "olmal\u0131d\u0131r" }, @@ -19745,7 +19745,7 @@ function ota_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ps.js +// node_modules/zod/v4/locales/ps.js var error34 = () => { const Sizable = { string: { unit: "\u062A\u0648\u06A9\u064A", verb: "\u0648\u0644\u0631\u064A" }, @@ -19860,7 +19860,7 @@ function ps_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/pl.js +// node_modules/zod/v4/locales/pl.js var error35 = () => { const Sizable = { string: { unit: "znak\xF3w", verb: "mie\u0107" }, @@ -19970,7 +19970,7 @@ function pl_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/pt.js +// node_modules/zod/v4/locales/pt.js var error36 = () => { const Sizable = { string: { unit: "caracteres", verb: "ter" }, @@ -20079,7 +20079,7 @@ function pt_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ro.js +// node_modules/zod/v4/locales/ro.js var error37 = () => { const Sizable = { string: { unit: "caractere", verb: "s\u0103 aib\u0103" }, @@ -20199,7 +20199,7 @@ function ro_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ru.js +// node_modules/zod/v4/locales/ru.js function getRussianPlural(count, one, few, many) { const absCount = Math.abs(count); const lastDigit = absCount % 10; @@ -20356,7 +20356,7 @@ function ru_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/sl.js +// node_modules/zod/v4/locales/sl.js var error39 = () => { const Sizable = { string: { unit: "znakov", verb: "imeti" }, @@ -20466,7 +20466,7 @@ function sl_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/sv.js +// node_modules/zod/v4/locales/sv.js var error40 = () => { const Sizable = { string: { unit: "tecken", verb: "att ha" }, @@ -20577,7 +20577,7 @@ function sv_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ta.js +// node_modules/zod/v4/locales/ta.js var error41 = () => { const Sizable = { string: { unit: "\u0B8E\u0BB4\u0BC1\u0BA4\u0BCD\u0BA4\u0BC1\u0B95\u0BCD\u0B95\u0BB3\u0BCD", verb: "\u0B95\u0BCA\u0BA3\u0BCD\u0B9F\u0BBF\u0BB0\u0BC1\u0B95\u0BCD\u0B95 \u0BB5\u0BC7\u0BA3\u0BCD\u0B9F\u0BC1\u0BAE\u0BCD" }, @@ -20688,7 +20688,7 @@ function ta_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/th.js +// node_modules/zod/v4/locales/th.js var error42 = () => { const Sizable = { string: { unit: "\u0E15\u0E31\u0E27\u0E2D\u0E31\u0E01\u0E29\u0E23", verb: "\u0E04\u0E27\u0E23\u0E21\u0E35" }, @@ -20799,7 +20799,7 @@ function th_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/tr.js +// node_modules/zod/v4/locales/tr.js var error43 = () => { const Sizable = { string: { unit: "karakter", verb: "olmal\u0131" }, @@ -20905,7 +20905,7 @@ function tr_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/uk.js +// node_modules/zod/v4/locales/uk.js var error44 = () => { const Sizable = { string: { unit: "\u0441\u0438\u043C\u0432\u043E\u043B\u0456\u0432", verb: "\u043C\u0430\u0442\u0438\u043C\u0435" }, @@ -21014,12 +21014,12 @@ function uk_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ua.js +// node_modules/zod/v4/locales/ua.js function ua_default() { return uk_default(); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/ur.js +// node_modules/zod/v4/locales/ur.js var error45 = () => { const Sizable = { string: { unit: "\u062D\u0631\u0648\u0641", verb: "\u06C1\u0648\u0646\u0627" }, @@ -21130,7 +21130,7 @@ function ur_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/uz.js +// node_modules/zod/v4/locales/uz.js var error46 = () => { const Sizable = { string: { unit: "belgi", verb: "bo\u2018lishi kerak" }, @@ -21241,7 +21241,7 @@ function uz_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/vi.js +// node_modules/zod/v4/locales/vi.js var error47 = () => { const Sizable = { string: { unit: "k\xFD t\u1EF1", verb: "c\xF3" }, @@ -21350,7 +21350,7 @@ function vi_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/zh-CN.js +// node_modules/zod/v4/locales/zh-CN.js var error48 = () => { const Sizable = { string: { unit: "\u5B57\u7B26", verb: "\u5305\u542B" }, @@ -21460,7 +21460,7 @@ function zh_CN_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/zh-TW.js +// node_modules/zod/v4/locales/zh-TW.js var error49 = () => { const Sizable = { string: { unit: "\u5B57\u5143", verb: "\u64C1\u6709" }, @@ -21568,7 +21568,7 @@ function zh_TW_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/locales/yo.js +// node_modules/zod/v4/locales/yo.js var error50 = () => { const Sizable = { string: { unit: "\xE0mi", verb: "n\xED" }, @@ -21676,7 +21676,7 @@ function yo_default() { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/registries.js +// node_modules/zod/v4/core/registries.js var _a2; var $output = /* @__PURE__ */ Symbol("ZodOutput"); var $input = /* @__PURE__ */ Symbol("ZodInput"); @@ -21726,7 +21726,7 @@ function registry() { (_a2 = globalThis).__zod_globalRegistry ?? (_a2.__zod_globalRegistry = registry()); var globalRegistry = globalThis.__zod_globalRegistry; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/api.js +// node_modules/zod/v4/core/api.js // @__NO_SIDE_EFFECTS__ function _string(Class2, params) { return new Class2({ @@ -22765,7 +22765,7 @@ function _stringFormat(Class2, format, fnOrRegex, _params = {}) { return inst; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/to-json-schema.js +// node_modules/zod/v4/core/to-json-schema.js function initializeContext(params) { let target = params?.target ?? "draft-2020-12"; if (target === "draft-4") @@ -23124,7 +23124,7 @@ var createStandardJSONSchemaMethod = (schema, io, processors = {}) => (params) = return finalize(ctx, schema); }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/json-schema-processors.js +// node_modules/zod/v4/core/json-schema-processors.js var formatMap = { guid: "uuid", url: "uri", @@ -23668,7 +23668,7 @@ function toJSONSchema(input, params) { return finalize(ctx, input); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/json-schema-generator.js +// node_modules/zod/v4/core/json-schema-generator.js var JSONSchemaGenerator = class { /** @deprecated Access via ctx instead */ get metadataRegistry() { @@ -23743,10 +23743,10 @@ var JSONSchemaGenerator = class { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/core/json-schema.js +// node_modules/zod/v4/core/json-schema.js var json_schema_exports = {}; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/mini/schemas.js +// node_modules/zod/v4/mini/schemas.js var ZodMiniType = /* @__PURE__ */ $constructor("ZodMiniType", (inst, def) => { if (!inst._zod) throw new Error("Uninitialized schema in ZodMiniType."); @@ -23792,7 +23792,7 @@ function object(shape, params) { return new ZodMiniObject(def); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js function isZ4Schema(s) { const schema = s; return !!schema._zod; @@ -23952,7 +23952,7 @@ function getLiteralValue(schema) { return void 0; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/external.js +// node_modules/zod/v4/classic/external.js var external_exports = {}; __export(external_exports, { $brand: () => $brand, @@ -24195,7 +24195,7 @@ __export(external_exports, { xor: () => xor }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/schemas.js +// node_modules/zod/v4/classic/schemas.js var schemas_exports2 = {}; __export(schemas_exports2, { ZodAny: () => ZodAny2, @@ -24366,7 +24366,7 @@ __export(schemas_exports2, { xor: () => xor }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/checks.js +// node_modules/zod/v4/classic/checks.js var checks_exports2 = {}; __export(checks_exports2, { endsWith: () => _endsWith, @@ -24400,7 +24400,7 @@ __export(checks_exports2, { uppercase: () => _uppercase }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/iso.js +// node_modules/zod/v4/classic/iso.js var iso_exports2 = {}; __export(iso_exports2, { ZodISODate: () => ZodISODate, @@ -24441,7 +24441,7 @@ function duration2(params) { return _isoDuration(ZodISODuration, params); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/errors.js +// node_modules/zod/v4/classic/errors.js var initializer2 = (inst, issues) => { $ZodError.init(inst, issues); inst.name = "ZodError"; @@ -24481,7 +24481,7 @@ var ZodRealError = /* @__PURE__ */ $constructor("ZodError", initializer2, { Parent: Error }); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/parse.js +// node_modules/zod/v4/classic/parse.js var parse2 = /* @__PURE__ */ _parse(ZodRealError); var parseAsync2 = /* @__PURE__ */ _parseAsync(ZodRealError); var safeParse3 = /* @__PURE__ */ _safeParse(ZodRealError); @@ -24495,7 +24495,7 @@ var safeDecode2 = /* @__PURE__ */ _safeDecode(ZodRealError); var safeEncodeAsync2 = /* @__PURE__ */ _safeEncodeAsync(ZodRealError); var safeDecodeAsync2 = /* @__PURE__ */ _safeDecodeAsync(ZodRealError); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/schemas.js +// node_modules/zod/v4/classic/schemas.js var _installedGroups = /* @__PURE__ */ new WeakMap(); function _installLazyMethods(inst, group, methods) { const proto = Object.getPrototypeOf(inst); @@ -25785,7 +25785,7 @@ function preprocess(fn, schema) { }); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/compat.js +// node_modules/zod/v4/classic/compat.js var ZodIssueCode2 = { invalid_type: "invalid_type", too_big: "too_big", @@ -25811,7 +25811,7 @@ var ZodFirstPartyTypeKind2; /* @__PURE__ */ (function(ZodFirstPartyTypeKind3) { })(ZodFirstPartyTypeKind2 || (ZodFirstPartyTypeKind2 = {})); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/from-json-schema.js +// node_modules/zod/v4/classic/from-json-schema.js var z = { ...schemas_exports2, ...checks_exports2, @@ -26291,7 +26291,7 @@ function fromJSONSchema(schema, params) { return convertSchema(normalized, ctx); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/coerce.js +// node_modules/zod/v4/classic/coerce.js var coerce_exports2 = {}; __export(coerce_exports2, { bigint: () => bigint3, @@ -26316,10 +26316,10 @@ function date4(params) { return _coercedDate(ZodDate2, params); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod/v4/classic/external.js +// node_modules/zod/v4/classic/external.js config(en_default2()); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/types.js var LATEST_PROTOCOL_VERSION = "2025-11-25"; var SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION, "2025-06-18", "2025-03-26", "2024-11-05", "2024-10-07"]; var RELATED_TASK_META_KEY = "io.modelcontextprotocol/related-task"; @@ -27850,12 +27850,12 @@ var UrlElicitationRequiredError = class extends McpError { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js function isTerminal(status) { return status === "completed" || status === "failed" || status === "cancelled"; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/Options.js +// node_modules/zod-to-json-schema/dist/esm/Options.js var ignoreOverride = /* @__PURE__ */ Symbol("Let zodToJsonSchema decide on which parser to use"); var defaultOptions = { name: void 0, @@ -27889,7 +27889,7 @@ var getDefaultOptions = (options) => typeof options === "string" ? { ...options }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/Refs.js +// node_modules/zod-to-json-schema/dist/esm/Refs.js var getRefs = (options) => { const _options = getDefaultOptions(options); const currentPath = _options.name !== void 0 ? [..._options.basePath, _options.definitionPath, _options.name] : _options.basePath; @@ -27910,7 +27910,7 @@ var getRefs = (options) => { }; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/errorMessages.js +// node_modules/zod-to-json-schema/dist/esm/errorMessages.js function addErrorMessage(res, key, errorMessage2, refs) { if (!refs?.errorMessages) return; @@ -27926,7 +27926,7 @@ function setResponseValueAndErrors(res, key, value, errorMessage2, refs) { addErrorMessage(res, key, errorMessage2, refs); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/getRelativePath.js +// node_modules/zod-to-json-schema/dist/esm/getRelativePath.js var getRelativePath = (pathA, pathB) => { let i = 0; for (; i < pathA.length && i < pathB.length; i++) { @@ -27936,7 +27936,7 @@ var getRelativePath = (pathA, pathB) => { return [(pathA.length - i).toString(), ...pathB.slice(i)].join("/"); }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/any.js +// node_modules/zod-to-json-schema/dist/esm/parsers/any.js function parseAnyDef(refs) { if (refs.target !== "openAi") { return {}; @@ -27952,7 +27952,7 @@ function parseAnyDef(refs) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/array.js +// node_modules/zod-to-json-schema/dist/esm/parsers/array.js function parseArrayDef(def, refs) { const res = { type: "array" @@ -27976,7 +27976,7 @@ function parseArrayDef(def, refs) { return res; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/bigint.js +// node_modules/zod-to-json-schema/dist/esm/parsers/bigint.js function parseBigintDef(def, refs) { const res = { type: "integer", @@ -28022,24 +28022,24 @@ function parseBigintDef(def, refs) { return res; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/boolean.js +// node_modules/zod-to-json-schema/dist/esm/parsers/boolean.js function parseBooleanDef() { return { type: "boolean" }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/branded.js +// node_modules/zod-to-json-schema/dist/esm/parsers/branded.js function parseBrandedDef(_def, refs) { return parseDef(_def.type._def, refs); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/catch.js +// node_modules/zod-to-json-schema/dist/esm/parsers/catch.js var parseCatchDef = (def, refs) => { return parseDef(def.innerType._def, refs); }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/date.js +// node_modules/zod-to-json-schema/dist/esm/parsers/date.js function parseDateDef(def, refs, overrideDateStrategy) { const strategy = overrideDateStrategy ?? refs.dateStrategy; if (Array.isArray(strategy)) { @@ -28098,7 +28098,7 @@ var integerDateParser = (def, refs) => { return res; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/default.js +// node_modules/zod-to-json-schema/dist/esm/parsers/default.js function parseDefaultDef(_def, refs) { return { ...parseDef(_def.innerType._def, refs), @@ -28106,12 +28106,12 @@ function parseDefaultDef(_def, refs) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/effects.js +// node_modules/zod-to-json-schema/dist/esm/parsers/effects.js function parseEffectsDef(_def, refs) { return refs.effectStrategy === "input" ? parseDef(_def.schema._def, refs) : parseAnyDef(refs); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/enum.js +// node_modules/zod-to-json-schema/dist/esm/parsers/enum.js function parseEnumDef(def) { return { type: "string", @@ -28119,7 +28119,7 @@ function parseEnumDef(def) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/intersection.js +// node_modules/zod-to-json-schema/dist/esm/parsers/intersection.js var isJsonSchema7AllOfType = (type) => { if ("type" in type && type.type === "string") return false; @@ -28161,7 +28161,7 @@ function parseIntersectionDef(def, refs) { } : void 0; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/literal.js +// node_modules/zod-to-json-schema/dist/esm/parsers/literal.js function parseLiteralDef(def, refs) { const parsedType2 = typeof def.value; if (parsedType2 !== "bigint" && parsedType2 !== "number" && parsedType2 !== "boolean" && parsedType2 !== "string") { @@ -28181,7 +28181,7 @@ function parseLiteralDef(def, refs) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/string.js +// node_modules/zod-to-json-schema/dist/esm/parsers/string.js var emojiRegex2 = void 0; var zodPatterns = { /** @@ -28506,7 +28506,7 @@ function stringifyRegExpWithFlags(regex, refs) { return pattern; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/record.js +// node_modules/zod-to-json-schema/dist/esm/parsers/record.js function parseRecordDef(def, refs) { if (refs.target === "openAi") { console.warn("Warning: OpenAI may not support records in schemas! Try an array of key-value pairs instead."); @@ -28558,7 +28558,7 @@ function parseRecordDef(def, refs) { return schema; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/map.js +// node_modules/zod-to-json-schema/dist/esm/parsers/map.js function parseMapDef(def, refs) { if (refs.mapStrategy === "record") { return parseRecordDef(def, refs); @@ -28583,7 +28583,7 @@ function parseMapDef(def, refs) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/nativeEnum.js +// node_modules/zod-to-json-schema/dist/esm/parsers/nativeEnum.js function parseNativeEnumDef(def) { const object3 = def.values; const actualKeys = Object.keys(def.values).filter((key) => { @@ -28597,7 +28597,7 @@ function parseNativeEnumDef(def) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/never.js +// node_modules/zod-to-json-schema/dist/esm/parsers/never.js function parseNeverDef(refs) { return refs.target === "openAi" ? void 0 : { not: parseAnyDef({ @@ -28607,7 +28607,7 @@ function parseNeverDef(refs) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/null.js +// node_modules/zod-to-json-schema/dist/esm/parsers/null.js function parseNullDef(refs) { return refs.target === "openApi3" ? { enum: ["null"], @@ -28617,7 +28617,7 @@ function parseNullDef(refs) { }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/union.js +// node_modules/zod-to-json-schema/dist/esm/parsers/union.js var primitiveMappings = { ZodString: "string", ZodNumber: "number", @@ -28685,7 +28685,7 @@ var asAnyOf = (def, refs) => { return anyOf.length ? { anyOf } : void 0; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/nullable.js +// node_modules/zod-to-json-schema/dist/esm/parsers/nullable.js function parseNullableDef(def, refs) { if (["ZodString", "ZodNumber", "ZodBigInt", "ZodBoolean", "ZodNull"].includes(def.innerType._def.typeName) && (!def.innerType._def.checks || !def.innerType._def.checks.length)) { if (refs.target === "openApi3") { @@ -28717,7 +28717,7 @@ function parseNullableDef(def, refs) { return base && { anyOf: [base, { type: "null" }] }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/number.js +// node_modules/zod-to-json-schema/dist/esm/parsers/number.js function parseNumberDef(def, refs) { const res = { type: "number" @@ -28766,7 +28766,7 @@ function parseNumberDef(def, refs) { return res; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/object.js +// node_modules/zod-to-json-schema/dist/esm/parsers/object.js function parseObjectDef(def, refs) { const forceOptionalIntoNullable = refs.target === "openAi"; const result = { @@ -28836,7 +28836,7 @@ function safeIsOptional(schema) { } } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/optional.js +// node_modules/zod-to-json-schema/dist/esm/parsers/optional.js var parseOptionalDef = (def, refs) => { if (refs.currentPath.toString() === refs.propertyPath?.toString()) { return parseDef(def.innerType._def, refs); @@ -28855,7 +28855,7 @@ var parseOptionalDef = (def, refs) => { } : parseAnyDef(refs); }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/pipeline.js +// node_modules/zod-to-json-schema/dist/esm/parsers/pipeline.js var parsePipelineDef = (def, refs) => { if (refs.pipeStrategy === "input") { return parseDef(def.in._def, refs); @@ -28875,12 +28875,12 @@ var parsePipelineDef = (def, refs) => { }; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/promise.js +// node_modules/zod-to-json-schema/dist/esm/parsers/promise.js function parsePromiseDef(def, refs) { return parseDef(def.type._def, refs); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/set.js +// node_modules/zod-to-json-schema/dist/esm/parsers/set.js function parseSetDef(def, refs) { const items = parseDef(def.valueType._def, { ...refs, @@ -28900,7 +28900,7 @@ function parseSetDef(def, refs) { return schema; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/tuple.js +// node_modules/zod-to-json-schema/dist/esm/parsers/tuple.js function parseTupleDef(def, refs) { if (def.rest) { return { @@ -28928,24 +28928,24 @@ function parseTupleDef(def, refs) { } } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/undefined.js +// node_modules/zod-to-json-schema/dist/esm/parsers/undefined.js function parseUndefinedDef(refs) { return { not: parseAnyDef(refs) }; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/unknown.js +// node_modules/zod-to-json-schema/dist/esm/parsers/unknown.js function parseUnknownDef(refs) { return parseAnyDef(refs); } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parsers/readonly.js +// node_modules/zod-to-json-schema/dist/esm/parsers/readonly.js var parseReadonlyDef = (def, refs) => { return parseDef(def.innerType._def, refs); }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/selectParser.js +// node_modules/zod-to-json-schema/dist/esm/selectParser.js var selectParser = (def, typeName, refs) => { switch (typeName) { case ZodFirstPartyTypeKind.ZodString: @@ -29021,7 +29021,7 @@ var selectParser = (def, typeName, refs) => { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/parseDef.js +// node_modules/zod-to-json-schema/dist/esm/parseDef.js function parseDef(def, refs, forceResolution = false) { const seenItem = refs.seen.get(def); if (refs.override) { @@ -29077,7 +29077,7 @@ var addMeta = (def, refs, jsonSchema) => { return jsonSchema; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/zod-to-json-schema/dist/esm/zodToJsonSchema.js +// node_modules/zod-to-json-schema/dist/esm/zodToJsonSchema.js var zodToJsonSchema = (schema, options) => { const refs = getRefs(options); let definitions = typeof options === "object" && options.definitions ? Object.entries(options.definitions).reduce((acc, [name2, schema2]) => ({ @@ -29139,7 +29139,7 @@ var zodToJsonSchema = (schema, options) => { return combined; }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js function mapMiniTarget(t) { if (!t) return "draft-7"; @@ -29181,7 +29181,7 @@ function parseWithCompat(schema, data) { return result.data; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js var DEFAULT_REQUEST_TIMEOUT_MSEC = 6e4; var Protocol = class { constructor(_options) { @@ -30135,7 +30135,7 @@ function mergeCapabilities(base, additional) { return result; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js var import_ajv = __toESM(require_ajv(), 1); var import_ajv_formats = __toESM(require_dist(), 1); function createDefaultAjvInstance() { @@ -30203,7 +30203,7 @@ var AjvJsonSchemaValidator = class { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js var ExperimentalServerTasks = class { constructor(_server) { this._server = _server; @@ -30416,7 +30416,7 @@ var ExperimentalServerTasks = class { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js function assertToolsCallTaskCapability(requests, method, entityName) { if (!requests) { throw new Error(`${entityName} does not support task creation (required for ${method})`); @@ -30451,7 +30451,7 @@ function assertClientRequestTaskCapability(requests, method, entityName) { } } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js var Server = class extends Protocol { /** * Initializes this server with the given name and version information. @@ -30822,7 +30822,7 @@ var Server = class extends Protocol { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/completable.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/completable.js var COMPLETABLE_SYMBOL = /* @__PURE__ */ Symbol.for("mcp.completable"); function isCompletable(schema) { return !!schema && typeof schema === "object" && COMPLETABLE_SYMBOL in schema; @@ -30836,7 +30836,7 @@ var McpZodTypeKind; McpZodTypeKind2["Completable"] = "McpCompletable"; })(McpZodTypeKind || (McpZodTypeKind = {})); -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js var TOOL_NAME_REGEX = /^[A-Za-z0-9._-]{1,128}$/; function validateToolName(name) { const warnings = []; @@ -30894,7 +30894,7 @@ function validateAndWarnToolName(name) { return result.isValid; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/mcp-server.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/mcp-server.js var ExperimentalMcpServerTasks = class { constructor(_mcpServer) { this._mcpServer = _mcpServer; @@ -30909,7 +30909,7 @@ var ExperimentalMcpServerTasks = class { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js var McpServer = class { constructor(serverInfo, options) { this._registeredResources = {}; @@ -31701,10 +31701,10 @@ var EMPTY_COMPLETION_RESULT = { } }; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js import process3 from "node:process"; -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js var STDIO_DEFAULT_MAX_BUFFER_SIZE = 10 * 1024 * 1024; var ReadBuffer = class { constructor(options) { @@ -31741,7 +31741,7 @@ function serializeMessage(message) { return JSON.stringify(message) + "\n"; } -// ../../../Users/panda/Projects/active/claude-architect/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js var StdioServerTransport = class { constructor(_stdin = process3.stdin, _stdout = process3.stdout, options) { this._stdin = _stdin; @@ -36416,12 +36416,172 @@ var AgyAdapter = class { } }; +// src/producers/claude-adapter.ts +import { existsSync as existsSync3, readFileSync } from "node:fs"; +import { homedir as homedir2 } from "node:os"; +import { join as join2 } from "node:path"; +var CLAUDE_REQUIRED_ENV = ["USER", "CLAUDE_CONFIG_DIR", "ANTHROPIC_API_KEY"]; +var EDIT_TOOLS = "Read,Edit,Write,Bash,Grep,Glob"; +var READ_ONLY_TOOLS = "Read,Grep,Glob"; +var EFFORT_LEVELS = /* @__PURE__ */ new Set(["low", "medium", "high", "xhigh", "max"]); +var TEXT_LIMIT2 = 8e3; +function isRecord4(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function parseVersion(stdout) { + return /^(\d+\.\d+\.\d+(?:[-+][^\s]+)?)\b/u.exec(stdout.trim())?.[1] ?? null; +} +function parseEnvelope(stdout) { + const trimmed = stdout.trim(); + const start2 = trimmed.indexOf("{"); + if (start2 < 0) return null; + try { + const parsed = JSON.parse(trimmed.slice(start2)); + return isRecord4(parsed) && parsed.type === "result" ? parsed : null; + } catch { + return null; + } +} +function defaultHasOauthAccount(accountFile) { + if (!existsSync3(accountFile)) return false; + try { + const parsed = JSON.parse(readFileSync(accountFile, "utf8")); + return isRecord4(parsed) && isRecord4(parsed.oauthAccount); + } catch { + return false; + } +} +var ClaudeAdapter = class { + constructor(deps = { + env: process.env, + homeDirectory: homedir2() + }) { + this.deps = deps; + } + deps; + producerId = "claude"; + structuredOutput = true; + executionModes = ["edit"]; + /** `~/.claude` (or CLAUDE_CONFIG_DIR): settings, sessions, and local state. */ + configDirectory() { + const configured = this.deps.env.CLAUDE_CONFIG_DIR; + if (configured !== void 0 && configured.length > 0) return configured; + return join2(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude"); + } + /** `~/.claude.json`: the account record the CLI rewrites on every run. */ + accountFile() { + const configured = this.deps.env.CLAUDE_CONFIG_DIR; + if (configured !== void 0 && configured.length > 0) return join2(configured, ".claude.json"); + return join2(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude.json"); + } + isAuthenticated() { + const apiKey = this.deps.env.ANTHROPIC_API_KEY; + if (apiKey !== void 0 && apiKey.length > 0) return true; + return (this.deps.hasOauthAccount ?? defaultHasOauthAccount)(this.accountFile()); + } + async probe(ctx) { + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "claude", + structuredOutput: this.structuredOutput, + parseVersion, + isAuthenticated: () => this.isAuthenticated() + }); + } + buildInvocation(spec, ctx) { + const effort = spec.producerOverrides?.reasoningEffort; + if (effort !== void 0 && !EFFORT_LEVELS.has(effort)) { + throw new Error( + `Claude effort override ${JSON.stringify(effort)} is unsupported; use one of ${[...EFFORT_LEVELS].join("|")}.` + ); + } + const readOnly = ctx.readOnly === true; + const args = [ + "-p", + "--output-format", + "json", + // Fresh context per attempt is a trust invariant: nothing is resumable. + "--no-session-persistence", + // No MCP servers at all — in particular not this plugin's own runtime, + // which would otherwise hand the Producer a nested `delegate` tool. + "--strict-mcp-config", + // Skip user, project, and local settings: their hooks and permission + // grants are host-side behavior that must not run inside an attempt. + "--setting-sources", + "", + "--disable-slash-commands", + // Write confinement is the host Seatbelt profile, not the permission prompt. + "--dangerously-skip-permissions", + // Built-ins only: no Agent (no nested subagents), no web, no artifacts. + "--tools", + readOnly ? READ_ONLY_TOOLS : EDIT_TOOLS + ]; + if (spec.producerOverrides?.model !== void 0) { + args.push("--model", spec.producerOverrides.model); + } + if (effort !== void 0) { + args.push("--effort", effort); + } + return { + executable: ctx.executable, + args, + stdin: renderProducerPrompt(spec, readOnly), + requiredEnv: [...CLAUDE_REQUIRED_ENV], + inheritedStateWritablePaths: [this.configDirectory(), this.accountFile()], + // Model sessions must reach the provider API; write-protection remains the confinement goal. + network: "allowed" + }; + } + normalizeEvents(raw) { + if (raw.exit.truncated.stdout) { + return { events: [], producerSummary: null, ok: false }; + } + const envelope = parseEnvelope(raw.stdout); + if (envelope === null) { + return { + events: [{ kind: "error", text: raw.stderr.slice(-TEXT_LIMIT2) }], + producerSummary: null, + ok: false + }; + } + const result = typeof envelope.result === "string" ? envelope.result : void 0; + const ok = raw.exit.exitCode === 0 && envelope.is_error === false && envelope.subtype === "success" && result !== void 0; + if (ok) { + const events2 = [{ kind: "final", text: result, raw: envelope }]; + return { events: events2, producerSummary: result, ok: true }; + } + const events = [{ + kind: "error", + ...result === void 0 ? {} : { text: result.slice(-TEXT_LIMIT2) }, + raw: envelope + }]; + return { events, producerSummary: null, ok: false }; + } + configurationProfile() { + return { + isolationState: "inherited-config-only", + credentialSources: [ + '~/.claude.json oauthAccount + macOS login keychain ("Claude Code-credentials")', + "ANTHROPIC_API_KEY (optional)" + ], + behavioralConfigSources: [ + "explicit invocation argv (user/project/local settings, hooks, MCP servers, and skills are all disabled)" + ], + // `--setting-sources ""` also turns off CLAUDE.md/AGENTS.md discovery + // (confirmed live): the Producer sees only the rendered spec. + repositoryInstructionSources: [], + environmentDependencies: [...CLAUDE_REQUIRED_ENV], + temporaryHomeStrategy: "real HOME inherited by declared policy (OAuth state in ~/.claude.json is not HOME-redirectable); reduced reproducibility recorded in the Run Manifest" + }; + } +}; + // src/producers/codex-adapter.ts import { execFileSync } from "node:child_process"; -import { existsSync as existsSync3, realpathSync } from "node:fs"; +import { existsSync as existsSync4, realpathSync } from "node:fs"; import { open as open4 } from "node:fs/promises"; -import { homedir as homedir2, tmpdir as tmpdir4 } from "node:os"; -import { join as join2 } from "node:path"; +import { homedir as homedir3, tmpdir as tmpdir4 } from "node:os"; +import { join as join3 } from "node:path"; var CODEX_REQUIRED_ENV = [ "CODEX_HOME", "CODEX_API_KEY", @@ -36463,11 +36623,11 @@ function sandboxSupportWritableRoots(platform) { } var VERSION_TIMEOUT_MS2 = 1e4; var VERSION_OUTPUT_LIMIT2 = 64 * 1024; -function isRecord4(value) { +function isRecord5(value) { return typeof value === "object" && value !== null && !Array.isArray(value); } function stringProperty2(value, name) { - if (!isRecord4(value)) return void 0; + if (!isRecord5(value)) return void 0; const property = value[name]; return typeof property === "string" ? property : void 0; } @@ -36488,7 +36648,7 @@ function unavailableReport(ctx, reason, resolvedExecutable = null) { laneEligibility: { edit: false } }; } -function parseVersion(stdout) { +function parseVersion2(stdout) { const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); return match?.[1] ?? null; } @@ -36561,7 +36721,7 @@ ${renderSkillBootstrap()} ${prompt}`; } function resolveCodexStore(deps) { - return deps.env.CODEX_HOME ?? join2(deps.homeDirectory, ".codex"); + return deps.env.CODEX_HOME ?? join3(deps.homeDirectory, ".codex"); } function defaultCodexEnv(deps) { if (deps.env.CODEX_HOME !== void 0) return {}; @@ -36571,14 +36731,14 @@ function defaultCodexEnv(deps) { var CodexAdapter = class { constructor(deps = { env: process.env, - homeDirectory: homedir2() + homeDirectory: homedir3() }) { this.deps = deps; } deps; producerId = "codex"; hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync3(join2(store, "auth.json"))))(directory); + return (this.deps.hasAuthStore ?? ((store) => existsSync4(join3(store, "auth.json"))))(directory); } async probe(ctx) { if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); @@ -36599,7 +36759,7 @@ var CodexAdapter = class { timeoutMs: VERSION_TIMEOUT_MS2, maxOutputBytes: VERSION_OUTPUT_LIMIT2 }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 && result.signal === null && result.timedOut === false && result.cancelled === false ? parseVersion(result.stdout) : null; + const version2 = result.spawnError === void 0 && result.exitCode === 0 && result.signal === null && result.timedOut === false && result.cancelled === false ? parseVersion2(result.stdout) : null; if (version2 === null) return unavailableReport(ctx, "probe-failed", executable); const writeConfinementBackend = selectCodexWriteConfinementBackend(ctx); const authState = this.hasAuthStore(resolveCodexStore(this.deps)) ? "authenticated" : "unauthenticated"; @@ -36729,7 +36889,7 @@ var CodexAdapter = class { try { for (const line of lines) { const parsed = JSON.parse(line); - if (!isRecord4(parsed) || typeof parsed.type !== "string") { + if (!isRecord5(parsed) || typeof parsed.type !== "string") { return { events: [], producerSummary: null, ok: false }; } if (parsed.type === "turn.completed") { @@ -36785,19 +36945,19 @@ var CodexAdapter = class { }; // src/producers/opencode-adapter.ts -import { existsSync as existsSync4 } from "node:fs"; -import { homedir as homedir3 } from "node:os"; -import { join as join3 } from "node:path"; +import { existsSync as existsSync5 } from "node:fs"; +import { homedir as homedir4 } from "node:os"; +import { join as join4 } from "node:path"; var OPENCODE_REQUIRED_ENV = ["OPENCODE_CONFIG_DIR", "XDG_DATA_HOME"]; function defaultOpenCodeEnv(deps) { if (deps.env.XDG_DATA_HOME !== void 0) return {}; - const dataHome = join3(deps.homeDirectory, ".local", "share"); - return deps.hasAuthStore(join3(dataHome, "opencode")) ? { XDG_DATA_HOME: dataHome } : {}; + const dataHome = join4(deps.homeDirectory, ".local", "share"); + return deps.hasAuthStore(join4(dataHome, "opencode")) ? { XDG_DATA_HOME: dataHome } : {}; } var OpenCodeAdapter = class { constructor(deps = { env: process.env, - homeDirectory: homedir3() + homeDirectory: homedir4() }) { this.deps = deps; } @@ -36806,21 +36966,21 @@ var OpenCodeAdapter = class { structuredOutput = false; executionModes = ["edit"]; hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync4(join3(store, "auth.json"))))(directory); + return (this.deps.hasAuthStore ?? ((store) => existsSync5(join4(store, "auth.json"))))(directory); } async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "opencode", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(join3(this.deps.homeDirectory, ".local", "share", "opencode")) + isAuthenticated: () => this.hasAuthStore(join4(this.deps.homeDirectory, ".local", "share", "opencode")) }); } /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ stateDirectories() { - const dataHome = this.deps.env.XDG_DATA_HOME ?? join3(this.deps.homeDirectory, ".local", "share"); - const stateHome = this.deps.env.XDG_STATE_HOME ?? join3(this.deps.homeDirectory, ".local", "state"); - return [join3(dataHome, "opencode"), join3(stateHome, "opencode")]; + const dataHome = this.deps.env.XDG_DATA_HOME ?? join4(this.deps.homeDirectory, ".local", "share"); + const stateHome = this.deps.env.XDG_STATE_HOME ?? join4(this.deps.homeDirectory, ".local", "state"); + return [join4(dataHome, "opencode"), join4(stateHome, "opencode")]; } buildInvocation(spec, ctx) { const args = [ @@ -36867,18 +37027,18 @@ var OpenCodeAdapter = class { }; // src/producers/pi-adapter.ts -import { existsSync as existsSync5 } from "node:fs"; -import { homedir as homedir4 } from "node:os"; -import { join as join4 } from "node:path"; +import { existsSync as existsSync6 } from "node:fs"; +import { homedir as homedir5 } from "node:os"; +import { join as join5 } from "node:path"; var PI_REQUIRED_ENV = ["PI_API_KEY"]; function defaultPiEnv(deps) { if (deps.env.HOME !== void 0) return {}; - return deps.hasConfigDir(join4(deps.homeDirectory, ".pi")) ? { HOME: deps.homeDirectory } : {}; + return deps.hasConfigDir(join5(deps.homeDirectory, ".pi")) ? { HOME: deps.homeDirectory } : {}; } var PiAdapter = class { constructor(deps = { env: process.env, - homeDirectory: homedir4() + homeDirectory: homedir5() }) { this.deps = deps; } @@ -36887,10 +37047,10 @@ var PiAdapter = class { structuredOutput = false; executionModes = ["edit"]; hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync5(join4(store, "auth.json"))))(directory); + return (this.deps.hasAuthStore ?? ((store) => existsSync6(join5(store, "auth.json"))))(directory); } hasConfigDir(directory) { - return existsSync5(directory); + return existsSync6(directory); } async probe(ctx) { return probeOsConfinedCli(ctx, { @@ -36902,7 +37062,7 @@ var PiAdapter = class { } /** Pi's auth + settings store; the only host state an attempt must write. */ agentStateDirectory() { - return join4(this.deps.env.HOME ?? this.deps.homeDirectory, ".pi", "agent"); + return join5(this.deps.env.HOME ?? this.deps.homeDirectory, ".pi", "agent"); } buildInvocation(spec, ctx) { if (spec.producerOverrides?.model !== void 0) { @@ -36951,9 +37111,9 @@ var PiAdapter = class { }; // src/producers/pythinker-adapter.ts -import { existsSync as existsSync6 } from "node:fs"; -import { homedir as homedir5 } from "node:os"; -import { join as join5 } from "node:path"; +import { existsSync as existsSync7 } from "node:fs"; +import { homedir as homedir6 } from "node:os"; +import { join as join6 } from "node:path"; var REQUIRED_LONG_OPTIONS = ["--prompt", "--model"]; function parseLongOptionTokens(helpText) { const options = /* @__PURE__ */ new Set(); @@ -36967,7 +37127,7 @@ var PYTHINKER_NO_AUTO_UPDATE_ENV = "PYTHINKER_CLI_NO_AUTO_UPDATE"; var PYTHINKER_REQUIRED_ENV = ["PYTHINKER_SHARE_DIR", PYTHINKER_NO_AUTO_UPDATE_ENV]; function resolvePythinkerHome(deps) { const configuredHome = deps.env.PYTHINKER_SHARE_DIR; - return configuredHome !== void 0 && configuredHome.length > 0 ? configuredHome : join5(deps.homeDirectory, ".pythinker"); + return configuredHome !== void 0 && configuredHome.length > 0 ? configuredHome : join6(deps.homeDirectory, ".pythinker"); } function defaultPythinkerEnv(deps) { const env = {}; @@ -36982,7 +37142,7 @@ function defaultPythinkerEnv(deps) { var PythinkerAdapter = class { constructor(deps = { env: process.env, - homeDirectory: homedir5() + homeDirectory: homedir6() }) { this.deps = deps; } @@ -36991,12 +37151,12 @@ var PythinkerAdapter = class { structuredOutput = false; executionModes = ["edit"]; hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync6( - join5(store, "credentials", "pythinker-code.json") + return (this.deps.hasAuthStore ?? ((store) => existsSync7( + join6(store, "credentials", "pythinker-code.json") )))(directory); } hasConfigDir(directory) { - return existsSync6(directory); + return existsSync7(directory); } async probe(ctx) { return probeOsConfinedCli(ctx, { @@ -37082,7 +37242,7 @@ var ProducerRegistry = class { return [...this.adapters]; } }; -var registry2 = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), new PiAdapter(), new PythinkerAdapter(), new AgyAdapter()]); +var registry2 = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), new PiAdapter(), new PythinkerAdapter(), new AgyAdapter(), new ClaudeAdapter()]); // src/producers/capability-probe.ts async function probeAll(ctx, producerRegistry = registry2) { @@ -37090,8 +37250,8 @@ async function probeAll(ctx, producerRegistry = registry2) { } // src/producers/producer-adapter.ts -import { readFileSync } from "node:fs"; -function detectEnvironmentType(readProcVersion = () => readFileSync("/proc/version", "utf8")) { +import { readFileSync as readFileSync2 } from "node:fs"; +function detectEnvironmentType(readProcVersion = () => readFileSync2("/proc/version", "utf8")) { if (process.platform !== "linux") return "native"; try { const version2 = readProcVersion().trim().toLowerCase(); @@ -38152,7 +38312,7 @@ function validateSpec(input) { }); return { ok: false, errors: validationErrors }; } -function isRecord5(value) { +function isRecord6(value) { return typeof value === "object" && value !== null && !Array.isArray(value); } function escapeJsonPointerSegment(value) { @@ -38179,9 +38339,9 @@ function isSafeCommitMessage(message) { } function taskIdForDelegationPath(input, instancePath) { const match = /^\/tasks\/(\d+)\/delegation(?:\/|$)/u.exec(instancePath); - if (match === null || !isRecord5(input) || !Array.isArray(input.tasks)) return void 0; + if (match === null || !isRecord6(input) || !Array.isArray(input.tasks)) return void 0; const task = input.tasks[Number(match[1])]; - if (!isRecord5(task) || typeof task.id !== "string") return void 0; + if (!isRecord6(task) || typeof task.id !== "string") return void 0; const idLength = [...task.id].length; return idLength >= 1 && idLength <= 128 ? task.id : void 0; } @@ -38192,9 +38352,9 @@ function validateAutopilotSpec(input) { message: error51.message ?? "invalid" })); const ids = /* @__PURE__ */ new Set(); - const tasks = isRecord5(input) && Array.isArray(input.tasks) ? input.tasks : []; + const tasks = isRecord6(input) && Array.isArray(input.tasks) ? input.tasks : []; for (const task of tasks) { - if (!isRecord5(task) || typeof task.id !== "string") continue; + if (!isRecord6(task) || typeof task.id !== "string") continue; const taskId = task.id; if (ids.has(taskId)) { errors.push({ path: "#/tasks", message: `duplicate task id: ${taskId}` }); @@ -38344,7 +38504,7 @@ var IGNORED_PATHS_LIMIT = 50; function reviewError(message, toolError) { return new RuntimeError(message, { toolError }); } -function isRecord6(value) { +function isRecord7(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } function hasExactKeys(value, expected) { @@ -38372,14 +38532,14 @@ function canonicalJsonValue(value) { if (Array.isArray(value)) { return `[${value.map((item) => canonicalJsonValue(item)).join(",")}]`; } - if (!isRecord6(value)) throw new RuntimeError("review snapshot contains a non-JSON value"); + if (!isRecord7(value)) throw new RuntimeError("review snapshot contains a non-JSON value"); return `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${canonicalJsonValue(value[key])}`).join(",")}}`; } function validateChangedPath(value) { - return isRecord6(value) && hasExactKeys(value, ["path", "changeType", "mode", "contentHash"]) && typeof value.path === "string" && ["added", "modified", "deleted"].includes(value.changeType) && typeof value.mode === "string" && (value.contentHash === null || typeof value.contentHash === "string"); + return isRecord7(value) && hasExactKeys(value, ["path", "changeType", "mode", "contentHash"]) && typeof value.path === "string" && ["added", "modified", "deleted"].includes(value.changeType) && typeof value.mode === "string" && (value.contentHash === null || typeof value.contentHash === "string"); } function validateCommandOutcome(value) { - return isRecord6(value) && hasExactKeys(value, [ + return isRecord7(value) && hasExactKeys(value, [ "id", "executable", "args", @@ -38391,7 +38551,7 @@ function validateCommandOutcome(value) { ]) && typeof value.id === "string" && typeof value.executable === "string" && Array.isArray(value.args) && value.args.every((arg) => typeof arg === "string") && (value.exitCode === null || typeof value.exitCode === "number" && Number.isInteger(value.exitCode)) && typeof value.timedOut === "boolean" && typeof value.durationMs === "number" && Number.isFinite(value.durationMs) && value.durationMs >= 0 && typeof value.stdoutRef === "string" && typeof value.stderrRef === "string"; } function validateReviewSnapshot(value, expectedRunId) { - if (!isRecord6(value) || !hasExactKeys(value, [ + if (!isRecord7(value) || !hasExactKeys(value, [ "runId", "baseCommitOid", "candidateCommitOid", @@ -38401,7 +38561,7 @@ function validateReviewSnapshot(value, expectedRunId) { "changedPaths", "evidence", "executedVerification" - ]) || typeof value.runId !== "string" || expectedRunId !== void 0 && value.runId !== expectedRunId || typeof value.baseCommitOid !== "string" || !GIT_OID.test(value.baseCommitOid) || typeof value.candidateCommitOid !== "string" || !GIT_OID.test(value.candidateCommitOid) || typeof value.candidateTreeOid !== "string" || !GIT_OID.test(value.candidateTreeOid) || typeof value.manifestHash !== "string" || !SHA256.test(value.manifestHash) || typeof value.patch !== "string" || !Array.isArray(value.changedPaths) || !value.changedPaths.every(validateChangedPath) || !isRecord6(value.evidence) || !Array.isArray(value.executedVerification) || !value.executedVerification.every(validateCommandOutcome)) { + ]) || typeof value.runId !== "string" || expectedRunId !== void 0 && value.runId !== expectedRunId || typeof value.baseCommitOid !== "string" || !GIT_OID.test(value.baseCommitOid) || typeof value.candidateCommitOid !== "string" || !GIT_OID.test(value.candidateCommitOid) || typeof value.candidateTreeOid !== "string" || !GIT_OID.test(value.candidateTreeOid) || typeof value.manifestHash !== "string" || !SHA256.test(value.manifestHash) || typeof value.patch !== "string" || !Array.isArray(value.changedPaths) || !value.changedPaths.every(validateChangedPath) || !isRecord7(value.evidence) || !Array.isArray(value.executedVerification) || !value.executedVerification.every(validateCommandOutcome)) { throw new RuntimeError("archived review snapshot is malformed"); } const snapshot = value; @@ -42291,11 +42451,11 @@ function withManifestHash(body) { manifestHash: sha2562(stableJson(sanitized)) }; } -function isRecord7(value) { +function isRecord8(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } function hasExactKeys2(value, expected) { - if (!isRecord7(value)) return false; + if (!isRecord8(value)) return false; const actual = Object.keys(value); return actual.length === expected.length && expected.every((key) => actual.includes(key)); } @@ -42332,7 +42492,7 @@ function assertManifestShape(value) { "schemaVersions", "packagedVerifier", "manifestHash" - ]) || value.manifestVersion !== "1" || typeof value.runId !== "string" || typeof value.repoRoot !== "string" || !isObjectId(value.baseCommitOid) || value.candidateManifestHash !== null && !isSha256(value.candidateManifestHash) || !hasExactKeys2(value.producer, ["id", "version", "model"]) || !isNullableString(value.producer.id) || !isNullableString(value.producer.version) || !isNullableString(value.producer.model) || !isRecord7(value.effectivePolicy) || !Array.isArray(value.repositoryInstructions) || !value.repositoryInstructions.every((instruction) => hasExactKeys2(instruction, ["path", "hash"]) && typeof instruction.path === "string" && isSha256(instruction.hash)) || !isSha256(value.promptHash) || !isRecord7(value.executionPolicy) || !Array.isArray(value.environment) || !value.environment.every((entry) => hasExactKeys2(entry, ["name", "source"]) && typeof entry.name === "string" && typeof entry.source === "string") || typeof value.runtimeVersion !== "string" || typeof value.protocolVersion !== "string" || !hasExactKeys2(value.schemaVersions, ["delegationSpec", "attemptResult"]) || typeof value.schemaVersions.delegationSpec !== "string" || typeof value.schemaVersions.attemptResult !== "string" || !hasExactKeys2(value.packagedVerifier, ["version", "hash"]) || typeof value.packagedVerifier.version !== "string" || !isSha256(value.packagedVerifier.hash) || !isSha256(value.manifestHash)) { + ]) || value.manifestVersion !== "1" || typeof value.runId !== "string" || typeof value.repoRoot !== "string" || !isObjectId(value.baseCommitOid) || value.candidateManifestHash !== null && !isSha256(value.candidateManifestHash) || !hasExactKeys2(value.producer, ["id", "version", "model"]) || !isNullableString(value.producer.id) || !isNullableString(value.producer.version) || !isNullableString(value.producer.model) || !isRecord8(value.effectivePolicy) || !Array.isArray(value.repositoryInstructions) || !value.repositoryInstructions.every((instruction) => hasExactKeys2(instruction, ["path", "hash"]) && typeof instruction.path === "string" && isSha256(instruction.hash)) || !isSha256(value.promptHash) || !isRecord8(value.executionPolicy) || !Array.isArray(value.environment) || !value.environment.every((entry) => hasExactKeys2(entry, ["name", "source"]) && typeof entry.name === "string" && typeof entry.source === "string") || typeof value.runtimeVersion !== "string" || typeof value.protocolVersion !== "string" || !hasExactKeys2(value.schemaVersions, ["delegationSpec", "attemptResult"]) || typeof value.schemaVersions.delegationSpec !== "string" || typeof value.schemaVersions.attemptResult !== "string" || !hasExactKeys2(value.packagedVerifier, ["version", "hash"]) || typeof value.packagedVerifier.version !== "string" || !isSha256(value.packagedVerifier.hash) || !isSha256(value.manifestHash)) { throw new RuntimeError("archived run manifest is malformed"); } } @@ -44212,7 +44372,7 @@ function withRunStartPidRecording(ps, context) { } // src/pipeline/role-prompts.ts -import { readFileSync as readFileSync2 } from "node:fs"; +import { readFileSync as readFileSync3 } from "node:fs"; function readSchemaText(name) { const candidates = [ new URL(`../../runtime/schemas/${name}`, import.meta.url), @@ -44221,7 +44381,7 @@ function readSchemaText(name) { let lastError; for (const candidate of candidates) { try { - return readFileSync2(candidate, "utf8"); + return readFileSync3(candidate, "utf8"); } catch (error51) { lastError = error51; } @@ -52979,7 +53139,7 @@ function createHostingCommandRunner(platformServices = getPlatformServices()) { return toCommandResult(exit); }; } -function parseVersion2(output) { +function parseVersion3(output) { const firstLine = output.split(/\r?\n/u, 1)[0] ?? ""; const match = /^gh version (\d+)\.(\d+)\.(\d+)(?:\s|$)/u.exec(firstLine); if (match === null) return null; @@ -53200,7 +53360,7 @@ var GitHubCliAdapter = class { failCommand(error51, "preflight-gh-unavailable"); } requireCleanExit(version2, "preflight-gh-unavailable"); - const parsedVersion = parseVersion2(version2.stdout); + const parsedVersion = parseVersion3(version2.stdout); if (parsedVersion === null) fail3("preflight-gh-version-invalid"); if (!versionAtLeast(parsedVersion, MINIMUM_GH_VERSION)) { fail3("preflight-gh-version-unsupported"); @@ -53937,7 +54097,7 @@ async function handleAutopilotResume(checkoutPath, workflowId, deps = {}) { return autopilotErrorResult(error51); } } -function isRecord8(value) { +function isRecord9(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } async function loadArchivedRun(runId, deps) { @@ -54040,7 +54200,7 @@ function unknownProducerErrors(preferences) { }]); } function schemaCompatibility(input) { - if (isRecord8(input) && input.specVersion !== void 0 && input.specVersion !== DELEGATION_SPEC_VERSION) { + if (isRecord9(input) && input.specVersion !== void 0 && input.specVersion !== DELEGATION_SPEC_VERSION) { return { ok: false, diagnostic: `delegation spec version mismatch: request declares ${String(input.specVersion)}, runtime expects ${DELEGATION_SPEC_VERSION}` @@ -54311,12 +54471,12 @@ function decisionAdvisoryForRun(run) { const incomplete = run.result.evidence.pipelineReviewIncomplete; const cleared = run.result.evidence.pipelineGateCleared; const warnings = []; - if (isRecord8(refused) && Array.isArray(refused.reasons)) { + if (isRecord9(refused) && Array.isArray(refused.reasons)) { warnings.push( `the pipeline gate did NOT clear this candidate: ${refused.reasons.filter((r) => typeof r === "string").join("; ")}` ); } - if (isRecord8(incomplete) && typeof incomplete.reason === "string") { + if (isRecord9(incomplete) && typeof incomplete.reason === "string") { warnings.push(`the pipeline could not complete its own review: ${incomplete.reason}`); } const plainDelegate = run.result.evidence.plainDelegate === true && refused === void 0 && incomplete === void 0 && cleared === void 0; @@ -54327,7 +54487,7 @@ function decisionAdvisoryForRun(run) { if (warnings.length === 0) { warnings.push("the pipeline gate clearance record is missing"); } - } else if (!isRecord8(cleared) || typeof cleared.candidateCommitOid !== "string" || typeof cleared.requiresHumanDecision !== "boolean") { + } else if (!isRecord9(cleared) || typeof cleared.candidateCommitOid !== "string" || typeof cleared.requiresHumanDecision !== "boolean") { warnings.push("the pipeline gate clearance record is malformed"); } else if (cleared.requiresHumanDecision === true) { warnings.push("the pipeline gate clearance record requires a human decision"); diff --git a/skills/delegate/SKILL.md b/skills/delegate/SKILL.md index ecf27b9..92dd5e9 100644 --- a/skills/delegate/SKILL.md +++ b/skills/delegate/SKILL.md @@ -38,6 +38,7 @@ The delegated CLIs are the architect's **implementation agents** — the same su | `pi-implementer` | Pi configured model | optional `--thinking` | | `pythinker-implementer` | Pythinker provider/model | the installed pythinker-code CLI exposes no reasoning override; the configured default always applies | | `agy-implementer` | Antigravity CLI (`agy`) configured model | optional `--effort low\|medium\|high` | +| `claude-implementer` | Claude Code headless (`claude -p`) — Opus, Sonnet, or the configured default | optional `--model opus\|sonnet\|fable\|haiku`, optional `--effort low\|medium\|high\|xhigh\|max` | If the user invokes `/claude-architect:delegate` without naming a CLI, implementer, or agent, use the host's structured question tool when available, ask this question, and wait for the answer. Include the producer and reasoning control in each option so the user knows what the lane will run: @@ -50,6 +51,7 @@ Offer exactly these choices: - **Pi** - `pi-implementer`; always uses the model configured in Pi — a spec naming a model override fails the lane rather than substituting one — with optional `--thinking off|minimal|low|medium|high|xhigh|max`. - **Pythinker** - `pythinker-implementer`; configured provider/model unless overridden; the installed pythinker-code CLI exposes no reasoning override, so the Pythinker configured default always applies. - **Antigravity CLI** - `agy-implementer`; configured model unless overridden, with optional `--effort low|medium|high`; darwin/arm64 only until a Linux/Windows write-confinement backend exists. +- **Claude Code** - `claude-implementer`; a second Claude session run headless as an untrusted Producer — the configured default model unless overridden with `--model opus|sonnet|fable|haiku`, with optional `--effort low|medium|high|xhigh|max`; darwin/arm64 only, same Seatbelt backend. The attempt runs with settings, hooks, MCP servers, skills, and CLAUDE.md discovery disabled, so it sees only the Delegation Spec and cannot reach this plugin's own tools. There is no implicit lane default. If the answer names a supported model or reasoning override, include it in the delegation spec; otherwise let the selected Producer use its configured default. The Pi lane accepts no model override: it always runs the model configured in Pi. diff --git a/src/producers/claude-adapter.ts b/src/producers/claude-adapter.ts new file mode 100644 index 0000000..30f16d6 --- /dev/null +++ b/src/producers/claude-adapter.ts @@ -0,0 +1,203 @@ +import { existsSync, readFileSync } from "node:fs"; +import { homedir } from "node:os"; +import { join } from "node:path"; +import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import { probeOsConfinedCli } from "./cli-probe.js"; +import { renderProducerPrompt } from "./plain-text.js"; +import type { + AdapterEvent, + CapabilityReport, + InvocationContext, + ProbeContext, + ProducerAdapter, + ProducerConfigurationProfile, + ProducerInvocation, +} from "./producer-adapter.js"; + +// USER: the CLI resolves its OAuth credential through the login keychain, which +// it looks up by user name — without it a logged-in host reports "Not logged in". +// CLAUDE_CONFIG_DIR: relocated config/auth store must reach the process, or the +// adapter would report auth state from one directory while the CLI read another. +// ANTHROPIC_API_KEY: the API-key auth path, forwarded by declared policy exactly +// as the Pi and agy lanes forward theirs. +const CLAUDE_REQUIRED_ENV = ["USER", "CLAUDE_CONFIG_DIR", "ANTHROPIC_API_KEY"] as const; +const EDIT_TOOLS = "Read,Edit,Write,Bash,Grep,Glob"; +const READ_ONLY_TOOLS = "Read,Grep,Glob"; +const EFFORT_LEVELS = new Set(["low", "medium", "high", "xhigh", "max"]); +const TEXT_LIMIT = 8_000; + +function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +/** Claude Code emits `--version` as ` (Claude Code)`. */ +function parseVersion(stdout: string): string | null { + return /^(\d+\.\d+\.\d+(?:[-+][^\s]+)?)\b/u.exec(stdout.trim())?.[1] ?? null; +} + +/** stderr warnings can precede the envelope when both land on one stream. */ +function parseEnvelope(stdout: string): Record | null { + const trimmed = stdout.trim(); + const start = trimmed.indexOf("{"); + if (start < 0) return null; + try { + const parsed: unknown = JSON.parse(trimmed.slice(start)); + return isRecord(parsed) && parsed.type === "result" ? parsed : null; + } catch { + return null; + } +} + +export interface ClaudeAdapterDeps { + env: Record; + homeDirectory: string; + /** Whether the account file at the given path records a logged-in OAuth account. */ + hasOauthAccount?: (accountFile: string) => boolean; +} + +function defaultHasOauthAccount(accountFile: string): boolean { + if (!existsSync(accountFile)) return false; + try { + const parsed: unknown = JSON.parse(readFileSync(accountFile, "utf8")); + return isRecord(parsed) && isRecord(parsed.oauthAccount); + } catch { + return false; + } +} + +export class ClaudeAdapter implements ProducerAdapter { + readonly producerId = "claude"; + readonly structuredOutput = true; + readonly executionModes = ["edit"]; + + constructor(private readonly deps: ClaudeAdapterDeps = { + env: process.env, + homeDirectory: homedir(), + }) {} + + /** `~/.claude` (or CLAUDE_CONFIG_DIR): settings, sessions, and local state. */ + private configDirectory(): string { + const configured = this.deps.env.CLAUDE_CONFIG_DIR; + if (configured !== undefined && configured.length > 0) return configured; + return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude"); + } + + /** `~/.claude.json`: the account record the CLI rewrites on every run. */ + private accountFile(): string { + const configured = this.deps.env.CLAUDE_CONFIG_DIR; + if (configured !== undefined && configured.length > 0) return join(configured, ".claude.json"); + return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude.json"); + } + + private isAuthenticated(): boolean { + const apiKey = this.deps.env.ANTHROPIC_API_KEY; + if (apiKey !== undefined && apiKey.length > 0) return true; + return (this.deps.hasOauthAccount ?? defaultHasOauthAccount)(this.accountFile()); + } + + async probe(ctx: ProbeContext): Promise { + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "claude", + structuredOutput: this.structuredOutput, + parseVersion, + isAuthenticated: () => this.isAuthenticated(), + }); + } + + buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { + const effort = spec.producerOverrides?.reasoningEffort; + if (effort !== undefined && !EFFORT_LEVELS.has(effort)) { + throw new Error( + `Claude effort override ${JSON.stringify(effort)} is unsupported; use one of ${[...EFFORT_LEVELS].join("|")}.`, + ); + } + const readOnly = ctx.readOnly === true; + const args = [ + "-p", + "--output-format", + "json", + // Fresh context per attempt is a trust invariant: nothing is resumable. + "--no-session-persistence", + // No MCP servers at all — in particular not this plugin's own runtime, + // which would otherwise hand the Producer a nested `delegate` tool. + "--strict-mcp-config", + // Skip user, project, and local settings: their hooks and permission + // grants are host-side behavior that must not run inside an attempt. + "--setting-sources", + "", + "--disable-slash-commands", + // Write confinement is the host Seatbelt profile, not the permission prompt. + "--dangerously-skip-permissions", + // Built-ins only: no Agent (no nested subagents), no web, no artifacts. + "--tools", + readOnly ? READ_ONLY_TOOLS : EDIT_TOOLS, + ]; + if (spec.producerOverrides?.model !== undefined) { + args.push("--model", spec.producerOverrides.model); + } + if (effort !== undefined) { + args.push("--effort", effort); + } + + return { + executable: ctx.executable, + args, + stdin: renderProducerPrompt(spec, readOnly), + requiredEnv: [...CLAUDE_REQUIRED_ENV], + inheritedStateWritablePaths: [this.configDirectory(), this.accountFile()], + // Model sessions must reach the provider API; write-protection remains the confinement goal. + network: "allowed", + }; + } + + normalizeEvents( + raw: Parameters[0], + ): ReturnType { + if (raw.exit.truncated.stdout) { + return { events: [], producerSummary: null, ok: false }; + } + const envelope = parseEnvelope(raw.stdout); + if (envelope === null) { + return { + events: [{ kind: "error", text: raw.stderr.slice(-TEXT_LIMIT) }], + producerSummary: null, + ok: false, + }; + } + const result = typeof envelope.result === "string" ? envelope.result : undefined; + const ok = raw.exit.exitCode === 0 + && envelope.is_error === false + && envelope.subtype === "success" + && result !== undefined; + if (ok) { + const events: AdapterEvent[] = [{ kind: "final", text: result, raw: envelope }]; + return { events, producerSummary: result, ok: true }; + } + const events: AdapterEvent[] = [{ + kind: "error", + ...(result === undefined ? {} : { text: result.slice(-TEXT_LIMIT) }), + raw: envelope, + }]; + return { events, producerSummary: null, ok: false }; + } + + configurationProfile(): ProducerConfigurationProfile { + return { + isolationState: "inherited-config-only", + credentialSources: [ + "~/.claude.json oauthAccount + macOS login keychain (\"Claude Code-credentials\")", + "ANTHROPIC_API_KEY (optional)", + ], + behavioralConfigSources: [ + "explicit invocation argv (user/project/local settings, hooks, MCP servers, and skills are all disabled)", + ], + // `--setting-sources ""` also turns off CLAUDE.md/AGENTS.md discovery + // (confirmed live): the Producer sees only the rendered spec. + repositoryInstructionSources: [], + environmentDependencies: [...CLAUDE_REQUIRED_ENV], + temporaryHomeStrategy: + "real HOME inherited by declared policy (OAuth state in ~/.claude.json is not HOME-redirectable); reduced reproducibility recorded in the Run Manifest", + }; + } +} diff --git a/src/producers/producer-registry.ts b/src/producers/producer-registry.ts index 98f21c4..a042c1b 100644 --- a/src/producers/producer-registry.ts +++ b/src/producers/producer-registry.ts @@ -1,4 +1,5 @@ import { AgyAdapter } from "./agy-adapter.js"; +import { ClaudeAdapter } from "./claude-adapter.js"; import { CodexAdapter } from "./codex-adapter.js"; import { OpenCodeAdapter } from "./opencode-adapter.js"; import { PiAdapter } from "./pi-adapter.js"; @@ -21,4 +22,4 @@ export class ProducerRegistry { } } -export const registry = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), new PiAdapter(), new PythinkerAdapter(), new AgyAdapter()]); +export const registry = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), new PiAdapter(), new PythinkerAdapter(), new AgyAdapter(), new ClaudeAdapter()]); diff --git a/tests/delegate-routing.test.mjs b/tests/delegate-routing.test.mjs index 5d3a796..afd573a 100644 --- a/tests/delegate-routing.test.mjs +++ b/tests/delegate-routing.test.mjs @@ -6,7 +6,7 @@ const skill = fs.readFileSync(new URL("../skills/delegate/SKILL.md", import.meta assert.match(skill, /If the user invokes `\/claude-architect:delegate` without naming a CLI, implementer, or agent, use the host's structured question tool when available, ask this question, and wait for the answer\./); assert.match(skill, /Which CLI should handle this delegation\?.*Use a custom answer to name a different supported reasoning level\./); -for (const lane of ["codex-implementer", "opencode-implementer", "pi-implementer", "pythinker-implementer", "agy-implementer"]) { +for (const lane of ["codex-implementer", "opencode-implementer", "pi-implementer", "pythinker-implementer", "agy-implementer", "claude-implementer"]) { assert.ok(skill.includes(`\`${lane}\``), `delegate question must offer ${lane}`); } @@ -18,6 +18,8 @@ assert.match(skill, /The Pi lane accepts no model override: it always runs the m assert.doesNotMatch(skill, /--thinking-effort/); assert.match(skill, /the installed pythinker-code CLI exposes no reasoning override, so the Pythinker configured default always applies/); assert.match(skill, /`--effort low\|medium\|high`/); +assert.match(skill, /`--model opus\|sonnet\|fable\|haiku`/); +assert.match(skill, /`--effort low\|medium\|high\|xhigh\|max`/); assert.match(skill, /include it in the delegation spec/); assert.doesNotMatch(skill, /Use Codex by default|default implementation lane/); diff --git a/tests/lane-launchers.test.sh b/tests/lane-launchers.test.sh index ac1afef..fbc1989 100644 --- a/tests/lane-launchers.test.sh +++ b/tests/lane-launchers.test.sh @@ -39,7 +39,7 @@ fi [[ -f "$ROOT/runtime/server.mjs" ]] || fail 'missing packaged MCP server runtime' [[ -f "$ROOT/src/mcp/server.ts" ]] || fail 'missing MCP server source' -for producer in codex opencode pi pythinker; do +for producer in codex opencode pi pythinker agy claude; do [[ -f "$ROOT/src/producers/$producer-adapter.ts" ]] || fail "missing MCP Producer adapter: src/producers/$producer-adapter.ts" done diff --git a/tests/runtime/capability-probe.test.ts b/tests/runtime/capability-probe.test.ts index 78e4cb6..5e00b7d 100644 --- a/tests/runtime/capability-probe.test.ts +++ b/tests/runtime/capability-probe.test.ts @@ -73,6 +73,7 @@ describe("ProducerRegistry", () => { "pi", "pythinker", "agy", + "claude", ]); }); }); diff --git a/tests/runtime/claude-adapter.test.ts b/tests/runtime/claude-adapter.test.ts new file mode 100644 index 0000000..29b0786 --- /dev/null +++ b/tests/runtime/claude-adapter.test.ts @@ -0,0 +1,598 @@ +import { execFile } from "node:child_process"; +import { mkdir, mkdtemp, readFile, rm } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { Readable } from "node:stream"; +import { promisify } from "node:util"; +import { describe, expect, it } from "vitest"; +import type { + PlatformServices, + ResolvedExecutable, + SupervisedExit, +} from "../../src/platform/platform-services.js"; +import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; +import { supervise } from "../../src/platform/process-supervisor.js"; +import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; +import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; +import { ClaudeAdapter } from "../../src/producers/claude-adapter.js"; +import { renderProducerPrompt } from "../../src/producers/plain-text.js"; +import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; +import type { + CapabilityReport, + InvocationContext, + ProbeContext, +} from "../../src/producers/producer-adapter.js"; +import { buildEnvironment } from "../../src/runtime/environment-policy.js"; + +const execFileAsync = promisify(execFile); +const executable: ResolvedExecutable = { + kind: "native", + command: "/usr/local/bin/claude", + prefixArgs: [], + resolvedFrom: "test", +}; + +function exit(overrides: Partial = {}): SupervisedExit { + return { + exitCode: 0, + signal: null, + timedOut: false, + cancelled: false, + stdout: "", + stderr: "", + truncated: { stdout: false, stderr: false }, + ...overrides, + }; +} + +function unavailablePlatformServices(): PlatformServices { + return { + os: "darwin", + async resolveExecutable() { + throw new Error("not installed"); + }, + async spawnSupervised() { + throw new Error("unexpected spawn"); + }, + async requestCooperativeCancellation() {}, + async terminateProcessTree() {}, + async getProcessStartToken() { + return null; + }, + async terminateProcessTreeByPid() {}, + async acquireCheckoutLock() { + throw new Error("unexpected lock"); + }, + async acquireCleanupJournalLock() { + throw new Error("unexpected cleanup journal lock"); + }, + async createSecureTempDirectory() { + throw new Error("unexpected temp directory"); + }, + async canonicalizePath() { + throw new Error("unexpected canonicalization"); + }, + }; +} + +function versionPlatformServices( + resolvedExecutable: ResolvedExecutable, + spawned: ResolvedExecutable[] = [], + stdout = "2.1.250 (Claude Code)\n", +): PlatformServices { + return { + os: "darwin", + async resolveExecutable() { + return resolvedExecutable; + }, + async spawnSupervised(request) { + spawned.push(request.executable); + return { + pid: 42, + stdout: Readable.from([]), + stderr: Readable.from([]), + done: Promise.resolve(exit({ stdout })), + }; + }, + async requestCooperativeCancellation() {}, + async terminateProcessTree() {}, + async getProcessStartToken() { + return null; + }, + async terminateProcessTreeByPid() {}, + async acquireCheckoutLock() { + throw new Error("unexpected lock"); + }, + async acquireCleanupJournalLock() { + throw new Error("unexpected cleanup journal lock"); + }, + async createSecureTempDirectory() { + throw new Error("unexpected temp directory"); + }, + async canonicalizePath() { + throw new Error("unexpected canonicalization"); + }, + }; +} + +function capabilityReport(): CapabilityReport { + return { + producerId: "claude", + available: true, + reason: null, + os: "darwin", + arch: "arm64", + environmentType: "native", + resolvedExecutable: executable, + version: "2.1.250", + authState: "unknown", + executionModes: ["edit"], + structuredOutput: true, + writeConfinementBackend: null, + laneEligibility: { edit: false }, + }; +} + +function sampleSpec(): DelegationSpec { + return { + specVersion: "1", + objective: "Update the greeting without changing any other behavior.", + context: "The greeting is rendered from src/greeting.ts.", + writeAllowlist: ["src/greeting.ts"], + forbiddenScope: ["secrets/**"], + successCriteria: ["The greeting says hello."], + verification: [{ + id: "check", + executable: "node", + args: ["-e", "process.exit(0)"], + cwd: ".", + timeoutMs: 60_000, + network: "denied", + expectedExitCodes: [0], + }], + executionMode: "edit", + timeoutMs: 60_000, + producerPreferences: ["claude"], + expectedOutput: "candidate-patch", + }; +} + +function invocationContext(worktreePath = "/tmp/attempt-worktree"): InvocationContext { + return { + worktreePath, + runId: "run-claude", + tempHome: "/tmp/attempt-home", + capabilityReport: capabilityReport(), + executable, + }; +} + +function probeContext(ps: PlatformServices): ProbeContext { + return { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; +} + +const ISOLATION_ARGS = [ + "-p", + "--output-format", + "json", + "--no-session-persistence", + "--strict-mcp-config", + "--setting-sources", + "", + "--disable-slash-commands", + "--dangerously-skip-permissions", +]; + +function envelope(overrides: Record = {}): string { + return JSON.stringify({ + type: "result", + subtype: "success", + is_error: false, + result: "done", + num_turns: 3, + session_id: "s", + ...overrides, + }); +} + +function testAdapter(overrides: Partial[0]> = {}): ClaudeAdapter { + return new ClaudeAdapter({ + env: {}, + homeDirectory: "/Users/test", + hasOauthAccount: () => false, + ...overrides, + }); +} + +describe("ClaudeAdapter", () => { + it("reports a missing executable without spawning or guessing auth state", async () => { + const report = await testAdapter().probe(probeContext(unavailablePlatformServices())); + + expect(report).toMatchObject({ + producerId: "claude", + available: false, + reason: "missing-executable", + resolvedExecutable: null, + version: null, + authState: "unknown", + structuredOutput: true, + writeConfinementBackend: null, + laneEligibility: { edit: false }, + }); + }); + + it("reports win32 as unsupported without resolving an executable", async () => { + const report = await testAdapter().probe({ + ...probeContext(unavailablePlatformServices()), + os: "win32", + }); + + expect(report.available).toBe(false); + expect(report.reason).toBe("unsupported-platform"); + expect(report.resolvedExecutable).toBeNull(); + }); + + it("parses the Claude Code version banner and honestly gates edit eligibility", async () => { + const report = await testAdapter().probe(probeContext(versionPlatformServices(executable))); + + expect(report.available).toBe(true); + expect(report.version).toBe("2.1.250"); + expect(report.structuredOutput).toBe(true); + expect(report.writeConfinementBackend).toBe( + process.platform === "darwin" && process.arch === "arm64" ? "macos-seatbelt" : null, + ); + expect(report.laneEligibility).toEqual({ edit: report.writeConfinementBackend !== null }); + }); + + it("reports probe-failed when version output cannot be parsed", async () => { + const report = await testAdapter().probe( + probeContext(versionPlatformServices(executable, [], "Claude Code\n")), + ); + + expect(report.available).toBe(false); + expect(report.reason).toBe("probe-failed"); + expect(report.resolvedExecutable).toEqual(executable); + }); + + it("reports authenticated when ~/.claude.json records an OAuth account", async () => { + const checked: string[] = []; + const adapter = testAdapter({ + hasOauthAccount: file => { + checked.push(file); + return true; + }, + }); + const report = await adapter.probe(probeContext(versionPlatformServices(executable))); + + expect(report.authState).toBe("authenticated"); + expect(checked).toEqual(["/Users/test/.claude.json"]); + }); + + it("reads the account record from CLAUDE_CONFIG_DIR when the host relocated it", async () => { + const checked: string[] = []; + const adapter = testAdapter({ + env: { CLAUDE_CONFIG_DIR: "/Users/test/relocated" }, + hasOauthAccount: file => { + checked.push(file); + return false; + }, + }); + const report = await adapter.probe(probeContext(versionPlatformServices(executable))); + + expect(report.authState).toBe("unauthenticated"); + expect(checked).toEqual(["/Users/test/relocated/.claude.json"]); + }); + + it("reports authenticated from ANTHROPIC_API_KEY without reading the account file", async () => { + const adapter = testAdapter({ + env: { ANTHROPIC_API_KEY: "sk-test" }, + hasOauthAccount: () => { + throw new Error("must not read the account file"); + }, + }); + const report = await adapter.probe(probeContext(versionPlatformServices(executable))); + + expect(report.authState).toBe("authenticated"); + }); + + it("builds an isolated headless invocation and sends the prompt on stdin", () => { + const spec = sampleSpec(); + const invocation = testAdapter().buildInvocation(spec, invocationContext()); + + expect(invocation.args).toEqual([...ISOLATION_ARGS, "--tools", "Read,Edit,Write,Bash,Grep,Glob"]); + expect(invocation.stdin).toBe(renderProducerPrompt(spec)); + expect(invocation.requiredEnv).toEqual(["USER", "CLAUDE_CONFIG_DIR", "ANTHROPIC_API_KEY"]); + expect(invocation.network).toBe("allowed"); + expect(invocation.env).toBeUndefined(); + }); + + it("never exposes Agent, MCP, or web tools to the Producer", () => { + const invocation = testAdapter().buildInvocation(sampleSpec(), invocationContext()); + const tools = invocation.args[invocation.args.indexOf("--tools") + 1] ?? ""; + + expect(tools.split(",")).not.toContain("Agent"); + expect(tools.split(",")).not.toContain("WebFetch"); + expect(invocation.args).toContain("--strict-mcp-config"); + expect(invocation.args).not.toContain("--mcp-config"); + expect(invocation.args).not.toContain("--continue"); + expect(invocation.args).not.toContain("--resume"); + }); + + it("restricts read-only roles to non-mutating built-in tools", () => { + const invocation = testAdapter().buildInvocation(sampleSpec(), { + ...invocationContext(), + readOnly: true, + }); + + expect(invocation.args).toEqual([...ISOLATION_ARGS, "--tools", "Read,Grep,Glob"]); + expect(invocation.stdin).toBe(renderProducerPrompt(sampleSpec(), true)); + }); + + it("omits the delegated skill bootstrap from read-only prompts", () => { + const invocation = testAdapter().buildInvocation(sampleSpec(), { + ...invocationContext(), + readOnly: true, + }); + + expect(invocation.stdin).not.toContain(renderSkillBootstrap()); + }); + + it("includes the delegated skill bootstrap in edit prompts", () => { + const invocation = testAdapter().buildInvocation(sampleSpec(), invocationContext()); + + expect(invocation.stdin).toContain(renderSkillBootstrap()); + }); + + it("appends a model override so the lane can run Opus or Sonnet", () => { + const spec = { ...sampleSpec(), producerOverrides: { model: "opus" } }; + const invocation = testAdapter().buildInvocation(spec, invocationContext()); + + expect(invocation.args.slice(-2)).toEqual(["--model", "opus"]); + expect(invocation.args).not.toContain("--effort"); + }); + + it("appends model then effort overrides to the invocation argv", () => { + const spec = { + ...sampleSpec(), + producerOverrides: { model: "sonnet", reasoningEffort: "high" }, + }; + const invocation = testAdapter().buildInvocation(spec, invocationContext()); + + expect(invocation.args.slice(-4)).toEqual(["--model", "sonnet", "--effort", "high"]); + }); + + it("rejects an effort level the CLI does not accept before spawning", () => { + const spec = { ...sampleSpec(), producerOverrides: { reasoningEffort: "ultra" } }; + + expect(() => testAdapter().buildInvocation(spec, invocationContext())) + .toThrow(/effort override "ultra" is unsupported/u); + }); + + it("declares ~/.claude and ~/.claude.json as inherited writable state, following HOME", () => { + const invocation = testAdapter({ env: { HOME: "/Users/real" } }) + .buildInvocation(sampleSpec(), invocationContext()); + + expect(invocation.inheritedStateWritablePaths).toEqual([ + "/Users/real/.claude", + "/Users/real/.claude.json", + ]); + }); + + it("declares the relocated CLAUDE_CONFIG_DIR instead of ~/.claude when set", () => { + const invocation = testAdapter({ env: { CLAUDE_CONFIG_DIR: "/Users/test/relocated" } }) + .buildInvocation(sampleSpec(), invocationContext()); + + expect(invocation.inheritedStateWritablePaths).toEqual([ + "/Users/test/relocated", + "/Users/test/relocated/.claude.json", + ]); + }); + + it("wraps a Claude edit invocation with provider network and write confinement", () => { + const invocation = testAdapter().buildInvocation(sampleSpec(), invocationContext()); + const wrapped = wrapInvocationWithSeatbelt(invocation, { + worktreePath: "/tmp/attempt-worktree", + tempHome: null, + allowNetwork: true, + }); + const profile = wrapped.args[1] ?? ""; + + expect(wrapped.executable.command).toBe("/usr/bin/sandbox-exec"); + expect(profile).toContain('(allow file-write* (subpath "/tmp/attempt-worktree"))'); + expect(profile).toContain('(subpath "/Users/test/.claude")'); + expect(profile).toContain('(subpath "/Users/test/.claude.json")'); + expect(profile).not.toContain('(subpath "/Users/test")'); + expect(profile).not.toContain("(deny network*)"); + expect(wrapped.args.slice(2)).toEqual([executable.command, ...invocation.args]); + }); + + it("declares the Claude Code configuration isolation profile", () => { + const profile = testAdapter().configurationProfile(); + + expect(profile.isolationState).toBe("inherited-config-only"); + expect(profile.environmentDependencies).toEqual(["USER", "CLAUDE_CONFIG_DIR", "ANTHROPIC_API_KEY"]); + expect(profile.repositoryInstructionSources).toEqual([]); + expect(profile.temporaryHomeStrategy).toMatch(/real HOME inherited/u); + }); + + it("normalizes a successful result envelope", () => { + const stdout = envelope({ result: "Updated the greeting." }); + const normalized = testAdapter().normalizeEvents({ stdout, stderr: "", exit: exit({ stdout }) }); + + expect(normalized.ok).toBe(true); + expect(normalized.producerSummary).toBe("Updated the greeting."); + expect(normalized.events).toEqual([ + { kind: "final", text: "Updated the greeting.", raw: JSON.parse(stdout) }, + ]); + }); + + it("tolerates a warning line printed before the envelope", () => { + const stdout = `Warning: Advisor disabled\n${envelope()}`; + const normalized = testAdapter().normalizeEvents({ stdout, stderr: "", exit: exit({ stdout }) }); + + expect(normalized.ok).toBe(true); + expect(normalized.producerSummary).toBe("done"); + }); + + it("reports failure for an is_error envelope even on exit code 0 and surfaces its text", () => { + // Observed live: `claude -p` exits 0 for some API-level failures and + // reports them only inside the envelope. + const stdout = envelope({ is_error: true, result: "Not logged in · Please run /login" }); + const normalized = testAdapter().normalizeEvents({ stdout, stderr: "", exit: exit({ stdout }) }); + + expect(normalized.ok).toBe(false); + expect(normalized.producerSummary).toBeNull(); + expect(normalized.events).toEqual([ + { kind: "error", text: "Not logged in · Please run /login", raw: JSON.parse(stdout) }, + ]); + }); + + it("reports failure for a non-success subtype", () => { + const stdout = envelope({ subtype: "error_max_turns" }); + const normalized = testAdapter().normalizeEvents({ stdout, stderr: "", exit: exit({ stdout }) }); + + expect(normalized.ok).toBe(false); + }); + + it("reports failure for a non-zero exit even when the envelope claims success", () => { + const stdout = envelope(); + const normalized = testAdapter().normalizeEvents({ + stdout, + stderr: "", + exit: exit({ stdout, exitCode: 1 }), + }); + + expect(normalized.ok).toBe(false); + expect(normalized.producerSummary).toBeNull(); + }); + + it("reports failure from stderr when no envelope is present", () => { + const normalized = testAdapter().normalizeEvents({ + stdout: "", + stderr: "error: unknown option", + exit: exit({ exitCode: 1 }), + }); + + expect(normalized).toEqual({ + events: [{ kind: "error", text: "error: unknown option" }], + producerSummary: null, + ok: false, + }); + }); + + it("reports failure when stdout is truncated", () => { + const normalized = testAdapter().normalizeEvents({ + stdout: "{\"type\":\"result\"", + stderr: "", + exit: exit({ truncated: { stdout: true, stderr: false } }), + }); + + expect(normalized).toEqual({ events: [], producerSummary: null, ok: false }); + }); + + it("ignores JSON that is not a result envelope", () => { + const stdout = JSON.stringify({ type: "assistant", message: {} }); + const normalized = testAdapter().normalizeEvents({ stdout, stderr: "", exit: exit({ stdout }) }); + + expect(normalized.ok).toBe(false); + }); + + it("reports failure when a success envelope carries no result string", () => { + const stdout = envelope({ result: undefined }); + const normalized = testAdapter().normalizeEvents({ stdout, stderr: "", exit: exit({ stdout }) }); + + expect(normalized.ok).toBe(false); + expect(normalized.producerSummary).toBeNull(); + }); +}); + +describe("ClaudeAdapter macOS smoke", () => { + const enabled = process.platform === "darwin" + && process.arch === "arm64" + && process.env.CLAUDE_ARCHITECT_CLAUDE_SMOKE === "1"; + + it.runIf(enabled)( + "runs a real confined headless Claude Code attempt in an isolated worktree", + async () => { + const root = await mkdtemp(join(tmpdir(), "claude-smoke-")); + const worktreePath = join(root, "worktree"); + const smokePath = join(worktreePath, "smoke.txt"); + let builtEnvironment: ReturnType | undefined; + + try { + await mkdir(worktreePath); + await execFileAsync("git", ["init", "-q"], { cwd: worktreePath }); + const ps = new PosixPlatformServices(); + const adapter = new ClaudeAdapter(); + const report = await adapter.probe({ + ps, + os: "darwin", + arch: process.arch, + environmentType: "native", + }); + if (!report.available) { + expect(typeof report.reason).toBe("string"); + expect(report.reason).not.toBe(""); + return; + } + expect(report.resolvedExecutable).not.toBeNull(); + expect(typeof report.version).toBe("string"); + if (report.resolvedExecutable === null) return; + console.info(`claude smoke probe version: ${report.version}`); + + const spec = sampleSpec(); + spec.objective = "Create a file named smoke.txt containing ok."; + spec.context = "This is an opt-in macOS arm64 adapter smoke test."; + spec.writeAllowlist = ["smoke.txt"]; + spec.forbiddenScope = []; + spec.successCriteria = ["smoke.txt exists and contains ok."]; + spec.timeoutMs = 300_000; + spec.producerOverrides = { model: "haiku" }; + const invocation = wrapInvocationWithSeatbelt(adapter.buildInvocation(spec, { + worktreePath, + runId: "run-claude-smoke", + capabilityReport: report, + executable: report.resolvedExecutable, + }), { + worktreePath, + tempHome: null, + allowNetwork: true, + }); + builtEnvironment = buildEnvironment({ + os: "darwin", + adapterAllowlist: invocation.requiredEnv, + ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), + }); + const supervisedExit = await supervise(ps, { + executable: invocation.executable, + args: invocation.args, + cwd: worktreePath, + env: builtEnvironment.env, + timeoutMs: 300_000, + ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), + maxOutputBytes: 1_000_000, + }, {}); + const normalized = adapter.normalizeEvents({ + stdout: supervisedExit.stdout, + stderr: supervisedExit.stderr, + exit: supervisedExit, + }); + + expect( + normalized.ok, + `stdout:\n${supervisedExit.stdout}\nstderr:\n${supervisedExit.stderr}`, + ).toBe(true); + expect((await readFile(smokePath, "utf8")).trim()).toBe("ok"); + } finally { + builtEnvironment?.secretRegistration.dispose(); + await rm(root, { recursive: true, force: true }); + } + }, + 330_000, + ); +}); diff --git a/tests/runtime/plugin-wiring.test.mjs b/tests/runtime/plugin-wiring.test.mjs index 4e629f8..18e0630 100644 --- a/tests/runtime/plugin-wiring.test.mjs +++ b/tests/runtime/plugin-wiring.test.mjs @@ -138,7 +138,7 @@ describe("P0-A plugin wiring", () => { /hash you computed/u, "review correlation must retain the runtime digest rather than reintroducing caller hashing", ); - for (const rosterName of ["codex-implementer", "opencode-implementer", "pi-implementer", "pythinker-implementer"]) { + for (const rosterName of ["codex-implementer", "opencode-implementer", "pi-implementer", "pythinker-implementer", "agy-implementer", "claude-implementer"]) { assert.ok(skill.includes(`\`${rosterName}\``), `delegate skill must retain ${rosterName} in its selection roster`); } const trustedLifecycleHeading = skill.indexOf("## Trusted MCP lifecycle"); diff --git a/tests/runtime/tools.test.ts b/tests/runtime/tools.test.ts index 2ed81d7..73661d2 100644 --- a/tests/runtime/tools.test.ts +++ b/tests/runtime/tools.test.ts @@ -661,7 +661,7 @@ describe("MCP tool handlers", () => { const output = await handleDelegate( "/repo", - { ...validSpec, producerPreferences: ["codex", "opencode", "pi", "pythinker", "agy"] }, + { ...validSpec, producerPreferences: ["codex", "opencode", "pi", "pythinker", "agy", "claude"] }, deps, ); From de4784c6d10fb94914ff970136c3f7e5c4ef1fa7 Mon Sep 17 00:00:00 2001 From: elkaix Date: Thu, 27 Aug 2026 21:25:13 -0400 Subject: [PATCH 03/12] docs(delegate): name the architect-side roles a Claude subagent may take MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The delegate skill now states that the architect session — whatever model it runs, Fable included — may dispatch Opus or Sonnet subagents through the host Agent tool for non-writing roles: scout, spec drafter, candidate reviewer, and advisor. A new read-only candidate-reviewer agent (opus; Read/Grep/Glob + reviewCandidate) reviews one frozen candidate without Producer context and returns two verdicts plus a recommendation; it never decides or integrates. An Opus/Sonnet implementer is the claude-implementer lane, never a bare subagent: the skill says so explicitly so the roster and the subagent roles cannot be confused. --- CHANGELOG.md | 5 +++++ README.md | 1 + agents/candidate-reviewer.md | 17 +++++++++++++++++ skills/delegate/SKILL.md | 11 +++++++++++ skills/subagent-driven-delegation/SKILL.md | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 agents/candidate-reviewer.md diff --git a/CHANGELOG.md b/CHANGELOG.md index b460cd5..d57f609 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,11 @@ All notable changes to Claude Architect are recorded here. The format follows this plugin's own MCP tools, and cannot nest subagents. darwin/arm64 only, confined by the same host Seatbelt backend as the Pi, OpenCode, Pythinker, and agy lanes. +- The delegate skill now names the architect-side roles a Claude subagent + (Opus or Sonnet) may take — scouting, spec drafting, and independent candidate + review through the new read-only `candidate-reviewer` agent — and the one it + never takes: editing the checkout. + ### Changed - Producers declare their own host state directories through diff --git a/README.md b/README.md index 9180c71..6786269 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ What this does not relax: independent verification still decides what may be acc | Skill | `/claude-architect:codex` | Runs Codex CLI directly against the current checkout without the verified delegation lifecycle. | | Skill | `/claude-architect:subagent-driven-delegation` | Executes a multi-task plan with the Superpowers subagent-driven-development loop, using a verified Producer as the implementer for every task. | | Agent | `advisor` | Current strictly read-only commitment-boundary advisor. | +| Agent | `candidate-reviewer` | Read-only Opus reviewer for one frozen candidate: reads the exact bytes through `reviewCandidate`, returns two verdicts and a recommendation, never decides or integrates. | | MCP | `validateDelegationSpec` | Validates a spec without starting a Producer and returns its canonical correlation digest. | | MCP | `delegate` | Runs one validated, isolated, independently verified attempt. | | MCP | `delegatePipeline` | Runs the fresh-context implement/review/repair pipeline. | diff --git a/agents/candidate-reviewer.md b/agents/candidate-reviewer.md new file mode 100644 index 0000000..ffdd280 --- /dev/null +++ b/agents/candidate-reviewer.md @@ -0,0 +1,17 @@ +--- +name: candidate-reviewer +description: Independent read-only reviewer for ONE frozen Candidate Artifact. Input is a checkoutPath, runId, protocolVersion, and the review brief (spec, success criteria, findings to re-check); output is a structured verdict. Reads the exact anchored bytes through reviewCandidate and never edits, decides, or integrates. +tools: Read, Grep, Glob, mcp__plugin_claude-architect_runtime__reviewCandidate +model: opus +--- + +You review exactly one frozen candidate. You share no context with the Producer that made it: your only inputs are the fields in your prompt and the runtime's own evidence. Ignore repository lore, CLAUDE.md content, and git status injected into your context. + +Your prompt provides: `checkoutPath`, `runId`, `protocolVersion`, the Delegation Spec's objective, success criteria, and `review.focus`, and — on a re-review — the numbered findings list from the previous round. + +1. Call `reviewCandidate` with `checkoutPath`, `runId`, and `protocolVersion` exactly as given. Read the unredacted patch, the changed-path manifest, and the verification evidence it returns. That is the entire candidate; the Producer's summary is a correlation aid, never evidence. +2. Use `Read`/`Grep`/`Glob` only to understand code the patch touches or depends on. Never modify anything. +3. Give two verdicts, each with the evidence that decides it: **spec compliance** (every success criterion met, scope honored, nothing outside the allowlist) and **quality** (Critical / Important / Minor findings with file and line). On a re-review, mark each prior finding ADDRESSED or NOT ADDRESSED, then list new breakage in this candidate only. +4. End with a single line: `RECOMMEND accept` or `RECOMMEND revision-requested`. It is a recommendation: only the architect calls `decideCandidate`, and only the configured decision authority records the decision. + +Never call `decideCandidate` or `integrateCandidate`, never re-run the Producer, never propose patching the candidate yourself. diff --git a/skills/delegate/SKILL.md b/skills/delegate/SKILL.md index 92dd5e9..b2e3c05 100644 --- a/skills/delegate/SKILL.md +++ b/skills/delegate/SKILL.md @@ -57,6 +57,17 @@ There is no implicit lane default. If the answer names a supported model or reas P0-A certifies the MCP implementation path only for Codex on macOS arm64 when its capability report names `codex-native-sandbox` and marks the edit Lane eligible. +### Architect-side Claude subagents + +The architect session — whatever model it runs, including Fable — may dispatch Claude subagents through the host's `Agent` tool with a `model` of `opus` or `sonnet` for **non-writing** roles, and it may do so in parallel with a running lane: + +- **Scout** (`sonnet`, or `Explore`): read-only reconnaissance before a spec is frozen — call sites, nearby patterns, which files an allowlist must cover. +- **Spec drafter** (`sonnet`): turn an agreed design into candidate `successCriteria` and verification commands for the architect to review; the architect still owns and freezes the spec. +- **Candidate reviewer** (`candidate-reviewer`, `opus`): an independent review of the frozen bytes through `reviewCandidate`, with no Producer context. Use it for the per-task review and for the whole-branch final review, then let the architect weigh the verdict and call `decideCandidate`. +- **Advisor** (`claude-advisor`, `fable`): commitment-boundary second opinion. + +A Claude subagent is never an implementer. It edits nothing in the checkout, calls neither `decideCandidate` nor `integrateCandidate`, and never dispatches a lane on its own; only the `delegation-lane` courier calls `delegate`/`delegatePipeline`. When the work is implementation and the model you want is Opus or Sonnet, that is the `claude-implementer` lane above: the same model, but run as an untrusted Producer inside an isolated worktree, frozen, and independently verified. + ## Build the Delegation Spec Construct a candidate spec with every required field: diff --git a/skills/subagent-driven-delegation/SKILL.md b/skills/subagent-driven-delegation/SKILL.md index 78b35cc..266354f 100644 --- a/skills/subagent-driven-delegation/SKILL.md +++ b/skills/subagent-driven-delegation/SKILL.md @@ -118,7 +118,7 @@ Then append `Task : complete (run , manifest , review clean)` ## Final review -After the last task, review the **whole candidate branch and the cumulative attempts**, not just the final diff — a defect introduced in Task 2 and papered over in Task 6 is only visible across the range. Dispatch the final review on the most capable available model, point it at the ledger's deferred-minor and parked lines, and give it the branch range from the merge base. +After the last task, review the **whole candidate branch and the cumulative attempts**, not just the final diff — a defect introduced in Task 2 and papered over in Task 6 is only visible across the range. Dispatch the final review on the most capable available model — the `candidate-reviewer` agent on `opus`, or `claude-advisor` on `fable` — point it at the ledger's deferred-minor and parked lines, and give it the branch range from the merge base. If it returns findings, handle them as one fix wave — a single revised delegation carrying the complete findings list, not one delegation per finding — then exactly one scoped re-review. Residual findings are adjudicated as at the breaker. From 29dd202df267819f6302eaaa0086291c6d76bd51 Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 14:59:52 -0400 Subject: [PATCH 04/12] docs: org move to PyModel and README compaction --- .claude-plugin/marketplace.json | 4 +- .claude-plugin/plugin.json | 4 +- CHANGELOG.md | 62 ++++++---- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 112 +++++++----------- SECURITY.md | 2 +- SUPPORT.md | 2 +- assets/banner.svg | 21 ++-- assets/social-card.svg | 4 +- docs/MARKETPLACE_REVIEW.md | 2 +- docs/operations.md | 12 ++ ...026-07-13-codex-runner-stdin-forwarding.md | 2 +- tests/plugin-manifest.test.mjs | 2 +- 14 files changed, 117 insertions(+), 116 deletions(-) diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index 16f8911..ef885b7 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -18,8 +18,8 @@ "name": "elkaix", "url": "https://github.com/elkaix" }, - "homepage": "https://github.com/Pythoughts-labs/claude-architect", - "repository": "https://github.com/Pythoughts-labs/claude-architect", + "homepage": "https://github.com/PyModel/claude-architect", + "repository": "https://github.com/PyModel/claude-architect", "license": "MIT", "category": "workflow", "strict": true, diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json index ab8c9e6..0b25ebb 100644 --- a/.claude-plugin/plugin.json +++ b/.claude-plugin/plugin.json @@ -7,8 +7,8 @@ "name": "Mohamed Elkholy", "url": "https://github.com/elkaix" }, - "homepage": "https://github.com/Pythoughts-labs/claude-architect", - "repository": "https://github.com/Pythoughts-labs/claude-architect", + "homepage": "https://github.com/PyModel/claude-architect", + "repository": "https://github.com/PyModel/claude-architect", "license": "MIT", "keywords": [ "claude-architect", diff --git a/CHANGELOG.md b/CHANGELOG.md index d57f609..118fbdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,18 @@ All notable changes to Claude Architect are recorded here. The format follows ## [Unreleased] +### Changed + +- The repository moved to the `PyModel` GitHub organization. Every homepage, + repository, issue, advisory, and release link now points at + `PyModel/claude-architect`, and the install command is + `claude plugin marketplace add PyModel/claude-architect`. +- README trimmed: the lead paragraph absorbs "Why it exists", lane overrides + are a per-lane table (Claude Code takes model and reasoning effort only; Pi + takes a thinking level and refuses a model override), and the filesystem + and cleanup guarantees moved to `docs/operations.md`. The banner names all + six lanes and no longer carries a stale version. + ### Added - `claude-implementer`: a sixth delegation-lane Producer that runs a headless @@ -1198,7 +1210,7 @@ implemented through `delegatePipeline`. ### Added -- Added a 3-OS GitHub Actions CI matrix covering macOS 14, Ubuntu, and Windows, with the Windows leg compiling the native helper with MSVC. Evidence: [first fully green run](https://github.com/Pythoughts-labs/claude-architect/actions/runs/29451055892). +- Added a 3-OS GitHub Actions CI matrix covering macOS 14, Ubuntu, and Windows, with the Windows leg compiling the native helper with MSVC. Evidence: [first fully green run](https://github.com/PyModel/claude-architect/actions/runs/29451055892). - Committed `native/bin/win32-job-kill-x64.exe` (SHA-256 `a96636f4d9e564b978172662e005e2a521205dd3b2eaea271b511854a05ccd10`), including its new `token ` creation-FILETIME mode for process-identity tokens without PowerShell. - Enabled Windows worktrees with removal retries for transient Windows file locking. @@ -1322,27 +1334,27 @@ Initial public release. - Native OpenCode assets under `.opencode/` and `opencode.json`, so the same lanes and skill work outside Claude Code. - SVG banner and shields badges for the README. -[Unreleased]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.43.0...HEAD -[0.43.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.42.0...v0.43.0 -[0.42.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.41.0...v0.42.0 -[0.16.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.15.0...v0.16.0 -[0.15.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.14.0...v0.15.0 -[0.14.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.13.0...v0.14.0 -[0.13.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.12.1...v0.13.0 -[0.12.1]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.12.0...v0.12.1 -[0.12.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.11.1...v0.12.0 -[0.11.1]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.11.0...v0.11.1 -[0.11.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.10.0...v0.11.0 -[0.10.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.9.3...v0.10.0 -[0.9.3]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.9.2...v0.9.3 -[0.9.2]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.9.1...v0.9.2 -[0.9.1]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.9.0...v0.9.1 -[0.9.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.8.0...v0.9.0 -[0.8.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.7.0...v0.8.0 -[0.7.0]: https://github.com/Pythoughts-labs/claude-architect/compare/v0.6.0...v0.7.0 -[0.6.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.6.0 -[0.5.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.5.0 -[0.4.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.4.0 -[0.3.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.3.0 -[0.2.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.2.0 -[0.1.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.1.0 +[Unreleased]: https://github.com/PyModel/claude-architect/compare/v0.43.0...HEAD +[0.43.0]: https://github.com/PyModel/claude-architect/compare/v0.42.0...v0.43.0 +[0.42.0]: https://github.com/PyModel/claude-architect/compare/v0.41.0...v0.42.0 +[0.16.0]: https://github.com/PyModel/claude-architect/compare/v0.15.0...v0.16.0 +[0.15.0]: https://github.com/PyModel/claude-architect/compare/v0.14.0...v0.15.0 +[0.14.0]: https://github.com/PyModel/claude-architect/compare/v0.13.0...v0.14.0 +[0.13.0]: https://github.com/PyModel/claude-architect/compare/v0.12.1...v0.13.0 +[0.12.1]: https://github.com/PyModel/claude-architect/compare/v0.12.0...v0.12.1 +[0.12.0]: https://github.com/PyModel/claude-architect/compare/v0.11.1...v0.12.0 +[0.11.1]: https://github.com/PyModel/claude-architect/compare/v0.11.0...v0.11.1 +[0.11.0]: https://github.com/PyModel/claude-architect/compare/v0.10.0...v0.11.0 +[0.10.0]: https://github.com/PyModel/claude-architect/compare/v0.9.3...v0.10.0 +[0.9.3]: https://github.com/PyModel/claude-architect/compare/v0.9.2...v0.9.3 +[0.9.2]: https://github.com/PyModel/claude-architect/compare/v0.9.1...v0.9.2 +[0.9.1]: https://github.com/PyModel/claude-architect/compare/v0.9.0...v0.9.1 +[0.9.0]: https://github.com/PyModel/claude-architect/compare/v0.8.0...v0.9.0 +[0.8.0]: https://github.com/PyModel/claude-architect/compare/v0.7.0...v0.8.0 +[0.7.0]: https://github.com/PyModel/claude-architect/compare/v0.6.0...v0.7.0 +[0.6.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.6.0 +[0.5.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.5.0 +[0.4.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.4.0 +[0.3.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.3.0 +[0.2.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.2.0 +[0.1.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.1.0 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 843c619..1cc89e0 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,7 @@ representative at an online or offline event. Report abusive, harassing, or otherwise unacceptable behavior only through a private channel: use GitHub's private **Report content** feature where it is available, submit a report through the repository's -[private advisory form](https://github.com/Pythoughts-labs/claude-architect/security/advisories/new), +[private advisory form](https://github.com/PyModel/claude-architect/security/advisories/new), or contact maintainer Mohamed Elkholy (`elkaix`) privately through GitHub. Never submit a conduct report as a public issue, discussion, pull request, or comment. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2abf3e..fa8773b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ as described in [SECURITY.md](SECURITY.md). Use Node.js 22 or newer (the current package engine requirement) and npm. ```bash -git clone https://github.com/Pythoughts-labs/claude-architect.git +git clone https://github.com/PyModel/claude-architect.git cd claude-architect npm install git config core.hooksPath .githooks diff --git a/README.md b/README.md index 6786269..229d67d 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,24 @@

- Claude Architect: CLI coding-agent orchestration for Claude + Claude Architect: CLI coding-agent orchestration for Claude

delegate skill codex skill -

- -

Claude Code - OpenCode version license

-**Verified coding-agent delegation for Claude Code.** Claude stays the architect and reviewer — it writes the spec, judges the evidence, and reports what landed. Implementation is delegated to fresh-context subagent implementers running on the coding CLI you choose — **Codex, OpenCode, Pi, Pythinker, Antigravity CLI, or a headless Claude Code session (Opus/Sonnet)** — each invocation starting clean with no inherited conversation state, inside an isolated Git worktree. The work comes back as a frozen, hash-anchored candidate that Claude reviews against independent verification evidence before a single byte can reach your checkout. - -In practice that means three guarantees the plugin enforces in host code, not in prompts: - -- **Isolation** — every Producer runs in a detached worktree with a sanitized environment, an explicit write allowlist, and OS sandboxing where certified. Out-of-scope changes are rejected at freeze time. -- **Evidence over claims** — a Producer saying "tests pass" is never accepted; the runtime reruns your authorized verification commands in a clean worktree and records the real output. -- **Separated authority** — implementers cannot approve their own work. Review, decision, and hash-gated integration are separate steps, and integration stages the reviewed tree without committing it. By default, only a reviewed pipeline candidate carrying durable, commit-bound gate clearance is accepted without prompting; anything less still requires a human ([decision authority](#decision-authority)). +**Verified coding-agent delegation for Claude Code.** Claude stays the architect and reviewer: it writes the spec, judges the evidence, and reports what landed. Implementation goes to a fresh-context implementer on the coding CLI you choose (**Codex, OpenCode, Pi, Pythinker, Antigravity CLI, or a headless Claude Code session**), each invocation starting clean inside an isolated Git worktree. The work comes back as a frozen, hash-anchored candidate that Claude reviews against independent verification evidence before a single byte can reach your checkout. -## Status +Three guarantees are enforced in host code, not in prompts: -> **Public beta:** Do not use Claude Architect unattended for production, destructive, or security-sensitive work. Review the complete candidate and verification evidence before integration. +- **Isolation.** Every Producer runs in a detached worktree with a sanitized environment, an explicit write allowlist, and OS sandboxing where certified. Out-of-scope changes are rejected at freeze time. +- **Evidence over claims.** A Producer saying "tests pass" is never accepted; the runtime reruns your authorized verification commands in a clean worktree and records the real output. +- **Separated authority.** Implementers cannot approve their own work. Review, decision, and hash-gated integration are separate steps, and integration stages the reviewed tree without committing it. Only a reviewed candidate carrying commit-bound gate clearance is accepted without prompting; anything less requires a human ([decision authority](#decision-authority)). -The runtime and cross-platform lifecycle are evolving. Producer availability depends on the host OS, CLI version, authentication, requested lane, and proven execution capabilities. - -## Why it exists - -Delegating code generation is easy; establishing which exact bytes were produced, whether they stayed in scope, and whether anyone independent verified them is harder. Claude Architect keeps Claude focused on specification and judgment while treating external coding agents as untrusted Producers. It records a reproducible run, freezes a content-addressed candidate, verifies authorized checks in a clean materialization, and makes every decision's provenance explicit. +> **Public beta.** Do not use Claude Architect unattended for production, destructive, or security-sensitive work. Review the complete candidate and verification evidence before integration. Producer availability depends on host OS, CLI version, authentication, requested lane, and proven execution capabilities. ## Core workflow @@ -45,14 +33,14 @@ flowchart LR F -->|reject or revise| H[Discard or fresh attempt] ``` -All agent output is an untrusted candidate, and implementers cannot approve their own work. A candidate that fails independent verification, or whose review gate refused it, can only be accepted by a human. +All agent output is an untrusted candidate. A candidate that fails independent verification, or whose review gate refused it, can only be accepted by a human. ## Installation -Claude Code requires Node.js 22 or newer. Add the marketplace and install the plugin: +Claude Code requires Node.js 22 or newer. ```bash -claude plugin marketplace add Pythoughts-labs/claude-architect +claude plugin marketplace add PyModel/claude-architect claude plugin install claude-architect@claude-architect claude plugin list --json ``` @@ -67,7 +55,17 @@ Open Claude Code in a Git repository and name the Producer you want: /claude-architect:delegate Use Codex to add rate limiting to the public API, run the tests, and show me the independently reviewed candidate before integration. ``` -If no Producer is named, the skill asks you to choose Codex, OpenCode, Pi, Pythinker, Antigravity CLI, or Claude Code. OpenCode, Pythinker, Antigravity CLI, and Claude Code are harnesses that accept optional model and thinking/variant/effort overrides; model selection within a harness lane is optional and otherwise defers to that CLI's configured default. The Pi lane has no model override: it always runs the model configured in Pi, and a requested override fails the lane rather than silently substituting another model. For non-trivial work it uses the fresh-context review pipeline. Read the exact patch, findings, and verification output before deciding whether to accept. +If no Producer is named, the skill asks you to choose one. Model selection inside a lane is optional and defers to that CLI's configured default: + +| Lane | Overrides | +|---|---| +| OpenCode, Antigravity CLI | model, thinking / variant / effort | +| Pythinker | provider and model; no reasoning override | +| Claude Code | model (Opus or Sonnet), reasoning effort | +| Codex | model, reasoning effort | +| Pi | thinking level only; a model override fails the lane instead of substituting one | + +Non-trivial work runs through the fresh-context review pipeline. Read the exact patch, findings, and verification output before deciding whether to accept. ### Direct Codex CLI @@ -79,43 +77,33 @@ The direct, unverified Codex CLI lane runs `codex exec` against your current che Use it for direct Codex assistance when those controls are not required. Use `/claude-architect:delegate` when changes need the verified lane and its isolated worktree, frozen Candidate Artifact, independent verification, and guarded integration. -### Superpowers skill boundary - -Claude Architect can use host-side Superpowers skills such as brainstorming, writing plans, and executing plans to shape and coordinate a delegation. Producers do not inherit that host skill set. Each edit attempt is offered only the three task-scoped procedures compatible with the trust model: +### Superpowers inside an attempt -- `test-driven-development` for behavior changes and bug fixes; -- `systematic-debugging` for unexpected test, build, or behavior failures; -- `verification-before-completion` before a Producer claims success. - -This filtered subset is vendored from [obra/superpowers](https://github.com/obra/superpowers) version 6.2.0 under the MIT license so it remains available inside an isolated attempt. Skills that assume nested delegation, self-review, branch acceptance, or an interactive human remain unavailable to Producers; the architect, the runtime's configured decision authority, and the human where required retain those authorities. +Producers do not inherit host-side Superpowers skills. Each edit attempt is offered only three task-scoped procedures compatible with the trust model: `test-driven-development`, `systematic-debugging`, and `verification-before-completion`, vendored from [obra/superpowers](https://github.com/obra/superpowers) 6.2.0 under MIT. Skills that assume nested delegation, self-review, branch acceptance, or an interactive human stay with the architect, the configured decision authority, and the human. ### Lanes as native subagents -Dispatch a delegation through the `delegation-lane` agent to watch it as a native Claude Code subagent row instead of a long-running MCP call: - -- The lane agent is a courier: its only tools are `delegate` and `delegatePipeline`. It cannot read the repository, run commands, review, decide, or integrate. -- Lanes against independent repositories run genuinely in parallel. Lanes against the same repository are serialized by the runtime's repository lock — they surface as subagents for visibility, but execute one at a time. -- The runtime-issued `specSha256` is supplied back to lane dispatch so a valid-but-different spec fails before work starts. The lane's JSON report is used only to correlate (`laneId`, `specSha256`, `runId`); all reviewable evidence comes from `reviewCandidate`, and every acceptance is gated on independent verification with its provenance recorded. At most one accepted candidate per clean checkout. -- Known limitation: the host injects project context (CLAUDE.md, git status) into custom subagents. The lane agent is instructed to ignore it; the enforced boundary is its tool allowlist, and the Producer itself only ever sees the spec through the trusted runtime. +Dispatch a delegation through the `delegation-lane` agent to watch it as a native Claude Code subagent row instead of a long-running MCP call. The lane agent is a courier whose only tools are `delegate` and `delegatePipeline`; it cannot read the repository, run commands, review, decide, or integrate. Lanes against different repositories run in parallel; lanes against the same repository are serialized by the runtime's repository lock. All reviewable evidence comes from `reviewCandidate`, and every acceptance is gated on independent verification with its provenance recorded. Details live in the delegate skill. ## Decision authority -By default, `decideCandidate` records `accepted` without prompting for any independently verified candidate that produces no advisory warnings from a readable archive: either a `delegatePipeline` candidate carrying a durable `pipelineGateCleared` record that names the archived candidate commit and does not require a human, or a plain `delegate` result, which carries no pipeline evidence at all and is judged on its independent verification result alone. Gate-refused, review-incomplete, malformed, commit-mismatched, human-required, unverified, or unreadable cases still require a human, as does every non-accept verdict. Set `CLAUDE_ARCHITECT_DECISION_AUTHORITY=human` to require confirmation for every decision; an unrecognized value fails closed to `human` with a warning. +By default, `decideCandidate` records `accepted` without prompting for an independently verified candidate that produces no advisory warnings from a readable archive: either a `delegatePipeline` candidate carrying a durable `pipelineGateCleared` record that names the archived candidate commit and does not require a human, or a plain `delegate` result judged on its independent verification alone. Gate-refused, review-incomplete, malformed, commit-mismatched, human-required, unverified, or unreadable cases still require a human, as does every non-accept verdict. Set `CLAUDE_ARCHITECT_DECISION_AUTHORITY=human` to require confirmation for every decision; an unrecognized value fails closed to `human` with a warning. -What this does not relax: independent verification still decides what may be accepted at all, integration refuses any acceptance whose provenance is unknown, and it still aborts on a moved `HEAD`, a dirty tree, or a hash that does not match the reviewed artifact. Every decision records its provenance, so auditing which candidates went in without a person never requires inferring it. +This never relaxes the gates themselves: independent verification decides what may be accepted at all, integration refuses any acceptance whose provenance is unknown, and it aborts on a moved `HEAD`, a dirty tree, or a hash that does not match the reviewed artifact. Every decision records its provenance. -## Available skills, agents, and MCP tools +## Skills, agents, and MCP tools | Kind | Name | Purpose | |---|---|---| | Skill | `/claude-architect:delegate` | Builds a versioned spec and drives delegation, review, decision, and guarded integration. | | Skill | `/claude-architect:codex` | Runs Codex CLI directly against the current checkout without the verified delegation lifecycle. | | Skill | `/claude-architect:subagent-driven-delegation` | Executes a multi-task plan with the Superpowers subagent-driven-development loop, using a verified Producer as the implementer for every task. | -| Agent | `advisor` | Current strictly read-only commitment-boundary advisor. | +| Agent | `advisor` | Strictly read-only commitment-boundary advisor. | | Agent | `candidate-reviewer` | Read-only Opus reviewer for one frozen candidate: reads the exact bytes through `reviewCandidate`, returns two verdicts and a recommendation, never decides or integrates. | +| Agent | `delegation-lane` | Courier that dispatches one delegation as a native subagent row. | | MCP | `validateDelegationSpec` | Validates a spec without starting a Producer and returns its canonical correlation digest. | | MCP | `delegate` | Runs one validated, isolated, independently verified attempt. | -| MCP | `delegatePipeline` | Runs the fresh-context implement/review/repair pipeline. | +| MCP | `delegatePipeline` | Runs the fresh-context implement / review / repair pipeline. | | MCP | `reviewCandidate` | Returns the exact frozen patch and verification evidence. | | MCP | `decideCandidate` | Records accepted, rejected, or revision-requested. | | MCP | `integrateCandidate` | Applies an accepted hash-matched candidate under safety guards. | @@ -124,34 +112,32 @@ What this does not relax: independent verification still decides what may be acc ## Security and trust model -Claude Architect separates authority across roles and artifacts. Producers receive bounded write scope in isolated worktrees. Candidate bytes are frozen and identified by hashes before independent verification. Reviewers operate in fresh context, and read-only roles lack mutation tools. The runtime rejects nested delegation, scope escapes, changed bases, mismatched anchors or trees, and unaccepted candidates. Integration stages reviewed bytes; it does not commit them. +Authority is separated across roles and artifacts. Producers receive bounded write scope in isolated worktrees. Candidate bytes are frozen and identified by hashes before independent verification. Reviewers operate in fresh context, and read-only roles lack mutation tools. The runtime rejects nested delegation, scope escapes, changed bases, mismatched anchors or trees, and unaccepted candidates. Integration stages reviewed bytes; it does not commit them. -The central rule is deliberately simple: **all agent output is an untrusted candidate; implementers cannot approve their own work; and only an independently verified pipeline candidate with commit-bound gate clearance can be accepted without a human.** Verification reduces risk but does not establish that a change is safe for your particular deployment. +The central rule: **all agent output is an untrusted candidate; implementers cannot approve their own work; and only an independently verified pipeline candidate with commit-bound gate clearance can be accepted without a human.** Verification reduces risk but does not establish that a change is safe for your particular deployment. See [docs/SECURITY_MODEL.md](docs/SECURITY_MODEL.md), [docs/THREAT_MODEL.md](docs/THREAT_MODEL.md), and [docs/TRUST_BOUNDARIES.md](docs/TRUST_BOUNDARIES.md). ## Permissions and external commands -The plugin starts its MCP server with `${CLAUDE_PLUGIN_ROOT}/runtime/bootstrap.mjs`. It may invoke Git, Node.js, configured verification executables, and a selected Producer CLI. Producer processes can edit only through an eligible isolated lane; verification commands are Host-authorized and their confinement/network enforcement is reported honestly. The runtime uses executable-plus-argv invocation, sanitized environments, bounded timeouts, process-tree termination, executable policy, and path validation. Never authorize secrets, deployment commands, destructive commands, or broader write globs than the task requires. +The plugin starts its MCP server with `${CLAUDE_PLUGIN_ROOT}/runtime/bootstrap.mjs`. It may invoke Git, Node.js, configured verification executables, and a selected Producer CLI. Producer processes can edit only through an eligible isolated lane; verification commands are Host-authorized and their confinement and network enforcement is reported honestly. The runtime uses executable-plus-argv invocation, sanitized environments, bounded timeouts, process-tree termination, executable policy, and path validation. Never authorize secrets, deployment commands, destructive commands, or broader write globs than the task requires. Codex edit confinement uses `codex-native-sandbox`: native macOS arm64 is certified, Linux is tested where unprivileged user namespaces permit the native sandbox, and native Windows editing is unsupported. Unsupported or failed confinement is diagnostics-only and fails closed. The Codex adapter enforces `--disable multi_agent` together with `features.multi_agent_v2={enabled=false,max_concurrent_threads_per_session=1}`. Installed marketplace copies must update and reload Claude Code before a new runtime or adapter controls take effect. ## Data storage and privacy -Durable run state, manifests, frozen artifacts, decisions, and recovery metadata are stored beneath the Claude Code-provided `${CLAUDE_PLUGIN_DATA}` directory. Temporary isolated worktrees and process files use OS temporary storage and are recovered or pruned by the runtime. Production runs do not fall back to an implicit state directory when `${CLAUDE_PLUGIN_DATA}` is unavailable. +Durable run state, manifests, frozen artifacts, decisions, and recovery metadata live beneath the Claude Code-provided `${CLAUDE_PLUGIN_DATA}` directory. Temporary isolated worktrees and process files use OS temporary storage and are recovered or pruned by the runtime. Production runs do not fall back to an implicit state directory when `${CLAUDE_PLUGIN_DATA}` is unavailable. -Logs and MCP evidence are bounded and redacted; prompt/argument values are not intentionally logged. Producer CLIs and any configured model providers have their own telemetry, retention, and privacy policies. Do not place credentials or sensitive data in delegation specs, prompts, test fixtures, or command arguments. +Logs and MCP evidence are bounded and redacted; prompt and argument values are not intentionally logged. Producer CLIs and configured model providers have their own telemetry, retention, and privacy policies. Do not place credentials or sensitive data in delegation specs, prompts, test fixtures, or command arguments. See [docs/PRIVACY.md](docs/PRIVACY.md). ## Limitations and non-goals -- This is a public beta, not an autonomous merge or deployment system. -- It does not prove business correctness, eliminate supply-chain risk, or replace human security review. -- Native Codex edit confinement is currently certified on macOS arm64; other platform/Producer combinations may be tested, diagnostics-only, or unavailable. -- Managed-worktree mutation requires filesystem directory identities with a nonzero birth timestamp and same-directory hard-link support for durable manifest publication. Linux mounts/filesystems without stable birth time, plus exFAT or network mounts that reject hard links, are diagnostics-only: delegation and cleanup fail closed rather than risk inode reuse or an unowned transaction. -- POSIX `unlink`/`rmdir` remove directory entries by name; they cannot atomically delete an already-opened inode. Cleanup therefore runs only after the supervised Producer tree has settled, moves the worktree outside Producer write scope, binds traversal to its opened inode, and rechecks the named identity at each removal boundary. A malicious process already running as the same OS account—or a sandbox/kernel escape that can mutate plugin state concurrently—is outside this guarantee. Windows cleanup uses packaged x64/arm64 native helpers for ACL validation, directory flushing, and deletion by validated handle; it does not depend on PowerShell. Emptying a disposable worktree's contents is bounded by a timeout (default 120s, override with `CLAUDE_ARCHITECT_EMPTY_DIRECTORY_TIMEOUT_MS` for repositories with an unusually large checkout, e.g. a big `node_modules` tree); exceeding it no longer discards the attempt's own result — a baseline or attempt outcome that was already produced is archived with the teardown failure recorded alongside it, not in place of it, and the interrupted removal is retried by startup recovery. -- Every Producer must pass the runtime's capability and confinement checks. An unavailable requested Producer is reported and fails closed; the runtime does not substitute another Producer or bypass a denied edit lane. +- Public beta, not an autonomous merge or deployment system. It does not prove business correctness, eliminate supply-chain risk, or replace human security review. +- Native Codex edit confinement is certified on macOS arm64; other platform and Producer combinations may be tested, diagnostics-only, or unavailable. +- Managed worktrees need filesystems with stable birth timestamps and same-directory hard links; other mounts are diagnostics-only. Cleanup guarantees, Windows helpers, and the `CLAUDE_ARCHITECT_EMPTY_DIRECTORY_TIMEOUT_MS` override are documented in [docs/operations.md](docs/operations.md). +- An unavailable requested Producer is reported and fails closed; the runtime never substitutes another Producer or bypasses a denied edit lane. - Verification commands are evidence, not automatically sandboxed build infrastructure. - Integration stages an accepted candidate but never commits, pushes, opens a pull request, or deploys it. -## Development and testing +## Development ```bash npm install @@ -161,22 +147,10 @@ bash scripts/validate-release.sh claude plugin validate . ``` -Enable local push gates once per clone: - -```bash -git config core.hooksPath .githooks -``` - -See [AGENTS.md](AGENTS.md) for architecture boundaries, trust invariants, testing requirements, packaging rules, and the minor-version-only release policy. - -## Support and security reporting - -Use [GitHub Issues](https://github.com/Pythoughts-labs/claude-architect/issues) for reproducible bugs and support questions. For a suspected vulnerability, use the repository's private GitHub security reporting channel rather than a public issue. Include the plugin version, host OS/architecture, Claude Code version, Producer CLI/version, redacted diagnostics, and reproduction steps. - -## Contributing +Enable the local push gate once per clone with `git config core.hooksPath .githooks`. [AGENTS.md](AGENTS.md) holds the architecture boundaries, trust invariants, testing requirements, packaging rules, and the minor-version-only release policy. Contributions are welcome: keep changes narrowly scoped, add tests that prove the relevant trust property, run all repository checks, and explain platform or security implications. -Contributions are welcome. Keep changes narrowly scoped, add tests that prove the relevant trust property, run all repository checks, and explain platform or security implications. Read [AGENTS.md](AGENTS.md) before working on the runtime. +## Support and license -## License +Use [GitHub Issues](https://github.com/PyModel/claude-architect/issues) for reproducible bugs and questions, including the plugin version, host OS and architecture, Claude Code version, Producer CLI and version, redacted diagnostics, and reproduction steps. Report suspected vulnerabilities through the repository's [private security advisory form](https://github.com/PyModel/claude-architect/security/advisories/new), never a public issue. Claude Architect is licensed under the [MIT License](LICENSE). diff --git a/SECURITY.md b/SECURITY.md index f4c0821..7d6a3cc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -17,7 +17,7 @@ versions are unsupported; upgrade before reporting or reproducing an issue. ## Report a vulnerability privately Do **not** open a public issue for a suspected vulnerability. Use GitHub's -[private vulnerability reporting form](https://github.com/Pythoughts-labs/claude-architect/security/advisories/new). +[private vulnerability reporting form](https://github.com/PyModel/claude-architect/security/advisories/new). If the form is unavailable, contact maintainer Mohamed Elkholy (`elkaix`) privately through GitHub before sharing details publicly. diff --git a/SUPPORT.md b/SUPPORT.md index a5d1a21..23ca413 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -2,7 +2,7 @@ ## Ask a question -Use [GitHub Issues](https://github.com/Pythoughts-labs/claude-architect/issues) +Use [GitHub Issues](https://github.com/PyModel/claude-architect/issues) for reproducible bugs and support questions. If GitHub Discussions is enabled for the repository, use it for open-ended usage and design questions. Search existing issues and discussions before opening a new one. diff --git a/assets/banner.svg b/assets/banner.svg index 8ccaca5..85f62e2 100644 --- a/assets/banner.svg +++ b/assets/banner.svg @@ -23,8 +23,8 @@ - Pythoughts-labs/claude-architect · architect session - v0.6.0 + PyModel/claude-architect · architect session + github.com/PyModel/claude-architect @@ -63,15 +63,18 @@ opencode - - pi · $0 + + pi - - pythinker + + pythinker - - fable + + agy + + + claude - -> architect reviews every diff + -> architect reviews every diff diff --git a/assets/social-card.svg b/assets/social-card.svg index 8328c84..4f05b5c 100644 --- a/assets/social-card.svg +++ b/assets/social-card.svg @@ -17,7 +17,7 @@ - Pythoughts-labs/claude-architect · architect session + PyModel/claude-architect · architect session v0.6.0 @@ -65,6 +65,6 @@ -> architect reviews every diff - Claude Code plugin · OpenCode native · MIT · github.com/Pythoughts-labs/claude-architect + Claude Code plugin · OpenCode native · MIT · github.com/PyModel/claude-architect diff --git a/docs/MARKETPLACE_REVIEW.md b/docs/MARKETPLACE_REVIEW.md index 0d2e7a7..f2a5e6e 100644 --- a/docs/MARKETPLACE_REVIEW.md +++ b/docs/MARKETPLACE_REVIEW.md @@ -1,6 +1,6 @@ # Marketplace Review Summary -Claude Architect is maintained by Mohamed Elkholy (`elkaix`) and published from `Pythoughts-labs/claude-architect` under the MIT license. It is a Claude Code plugin for delegating bounded implementation tasks to external coding CLIs while keeping review, acceptance, and integration under the trusted Host runtime, Claude architect, and human operator. +Claude Architect is maintained by Mohamed Elkholy (`elkaix`) and published from `PyModel/claude-architect` under the MIT license. It is a Claude Code plugin for delegating bounded implementation tasks to external coding CLIs while keeping review, acceptance, and integration under the trusted Host runtime, Claude architect, and human operator. ## What the plugin does diff --git a/docs/operations.md b/docs/operations.md index 5c8824d..97cd5a9 100644 --- a/docs/operations.md +++ b/docs/operations.md @@ -1,5 +1,17 @@ # Operations +## Filesystem requirements for managed worktrees + +Managed-worktree mutation requires filesystem directory identities with a nonzero birth timestamp and same-directory hard-link support for durable manifest publication. Linux mounts or filesystems without stable birth time, plus exFAT or network mounts that reject hard links, are diagnostics-only: delegation and cleanup fail closed rather than risk inode reuse or an unowned transaction. + +## Worktree cleanup guarantees + +POSIX `unlink` and `rmdir` remove directory entries by name; they cannot atomically delete an already-opened inode. Cleanup therefore runs only after the supervised Producer tree has settled, moves the worktree outside Producer write scope, binds traversal to its opened inode, and rechecks the named identity at each removal boundary. A malicious process already running as the same OS account, or a sandbox or kernel escape that can mutate plugin state concurrently, is outside this guarantee. + +Windows cleanup uses packaged x64/arm64 native helpers for ACL validation, directory flushing, and deletion by validated handle; it does not depend on PowerShell. + +Emptying a disposable worktree's contents is bounded by a timeout (default 120s; override with `CLAUDE_ARCHITECT_EMPTY_DIRECTORY_TIMEOUT_MS` for repositories with an unusually large checkout such as a big `node_modules` tree). Exceeding it does not discard the attempt's own result: a baseline or attempt outcome that was already produced is archived with the teardown failure recorded alongside it, and the interrupted removal is retried by startup recovery. + ## Update during an active attempt The previously installed `${CLAUDE_PLUGIN_ROOT}` remains live for a running MCP server until `/reload-plugins`. After an update and reload, startup recovery on the next server start owns and cancels any unfinished run left by the old plugin root. Runtime state is stored under `${CLAUDE_PLUGIN_DATA}`, which remains stable across plugin versions. diff --git a/docs/superpowers/plans/2026-07-13-codex-runner-stdin-forwarding.md b/docs/superpowers/plans/2026-07-13-codex-runner-stdin-forwarding.md index bc66dfa..1a50cb7 100644 --- a/docs/superpowers/plans/2026-07-13-codex-runner-stdin-forwarding.md +++ b/docs/superpowers/plans/2026-07-13-codex-runner-stdin-forwarding.md @@ -281,7 +281,7 @@ Insert above `0.3.0` in `CHANGELOG.md`: Add this link before the existing `0.3.0` link: ```markdown -[0.4.0]: https://github.com/Pythoughts-labs/claude-architect/releases/tag/v0.4.0 +[0.4.0]: https://github.com/PyModel/claude-architect/releases/tag/v0.4.0 ``` - [ ] **Step 3: Run the manifest test** diff --git a/tests/plugin-manifest.test.mjs b/tests/plugin-manifest.test.mjs index 5fadb8f..dec5d29 100644 --- a/tests/plugin-manifest.test.mjs +++ b/tests/plugin-manifest.test.mjs @@ -18,7 +18,7 @@ assert.equal(marketplace.plugins[0].strict, true, "plugin manifest must remain a assert.equal(marketplace.renames["claude-master"], manifest.name, "former plugin name must migrate"); assert.equal( manifest.repository, - "https://github.com/Pythoughts-labs/claude-architect", + "https://github.com/PyModel/claude-architect", "plugin repository must use the Claude Architect slug", ); assert.equal(marketplace.plugins[0].repository, manifest.repository, "marketplace repository must match"); From dd76fc3a4d852e38ea9b6a837075f63523c4186c Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 15:05:12 -0400 Subject: [PATCH 05/12] fix: unblock cross-platform adapter tests and seatbelt isolation --- CHANGELOG.md | 5 + docs/MARKETPLACE_REVIEW.md | 2 +- docs/PRIVACY.md | 2 +- ...26-08-27-claude-producer-adapter-design.md | 8 +- runtime/server.mjs | 295 ++++++++++++------ skills/delegate/SKILL.md | 2 +- src/platform/sandbox/seatbelt.ts | 89 +++++- src/producers/agy-adapter.ts | 3 +- src/producers/claude-adapter.ts | 38 ++- src/producers/opencode-adapter.ts | 14 +- src/producers/pi-adapter.ts | 3 +- src/producers/pythinker-adapter.ts | 2 +- tests/runtime/agy-adapter.test.ts | 2 +- tests/runtime/claude-adapter.test.ts | 59 +++- tests/runtime/e2e-vertical-slice.test.ts | 2 +- tests/runtime/opencode-adapter.test.ts | 23 +- tests/runtime/pi-adapter.test.ts | 2 +- tests/runtime/pythinker-adapter.test.ts | 2 +- tests/runtime/seatbelt.test.ts | 42 +++ 19 files changed, 461 insertions(+), 134 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 118fbdd..0e7e376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,11 @@ All notable changes to Claude Architect are recorded here. The format follows takes a thinking level and refuses a model override), and the filesystem and cleanup guarantees moved to `docs/operations.md`. The banner names all six lanes and no longer carries a stale version. +- Cross-platform isolation and adapter test hardening: + - macOS Seatbelt strictly validates declared `inheritedStateWritablePaths` against filesystem root `/`, relative paths, and traversal escapes, failing closed without grants on invalid paths. + - Claude probe confirms required CLI flags `--no-session-persistence`, `--strict-mcp-config`, and `--setting-sources` via `inspectSurface`, failing closed if unsupported. + - OpenCode adapter uses a unified helper for `XDG_DATA_HOME` data directory resolution across probing and invocation. + - Adapter tests and resolvers support `USERPROFILE` and platform path separators cleanly across macOS, Linux, and Windows. ### Added diff --git a/docs/MARKETPLACE_REVIEW.md b/docs/MARKETPLACE_REVIEW.md index f2a5e6e..7ef84ee 100644 --- a/docs/MARKETPLACE_REVIEW.md +++ b/docs/MARKETPLACE_REVIEW.md @@ -27,7 +27,7 @@ The plugin is designed for macOS, Linux, and Windows process/runtime operation. ## Network destinations -There is no plugin-maintained fixed destination list. A cloud Producer CLI contacts the provider configured by that CLI: Codex normally uses its configured OpenAI service; OpenCode, Pi, Pythinker, Antigravity CLI, and headless Claude Code can use various cloud or local endpoints. Claude Code separately contacts its configured Anthropic/model service. Verification commands may contact destinations only when their spec allows network, subject to effective platform enforcement. Codex's coding sandbox is configured with network disabled. Provider authentication, telemetry, transport, and retention are governed by the selected CLI/provider. +There is no plugin-maintained fixed destination list. A cloud Producer CLI contacts the provider configured by that CLI: Codex normally uses its configured OpenAI service; OpenCode, Pi, Pythinker, and Antigravity CLI can use various cloud or local endpoints; headless Claude Code uses the default Anthropic endpoint (`api.anthropic.com`). Verification commands may contact destinations only when their spec allows network, subject to effective platform enforcement. Codex's coding sandbox is configured with network disabled. Provider authentication, telemetry, transport, and retention are governed by the selected CLI/provider. ## Persistent state locations diff --git a/docs/PRIVACY.md b/docs/PRIVACY.md index d483d92..cc45f1d 100644 --- a/docs/PRIVACY.md +++ b/docs/PRIVACY.md @@ -19,7 +19,7 @@ Archives use restrictive creation modes, reject symlink/path escapes, bound indi The initial Producer receives the objective, relevant context, success criteria, authorized/forbidden paths, and verification instructions. Because it can read files exposed within its sandbox, a CLI may include source code or other repository content in requests to its configured model. Pipeline reviewers receive at least the delegation spec, baseline and candidate identifiers, the candidate diff, and test evidence. Fixers additionally receive consolidated findings. The Claude architect session itself is governed by the privacy terms of the Claude Code/model configuration. -Codex normally contacts the OpenAI service configured by the Codex CLI. OpenCode, Pi, Pythinker, Antigravity CLI (`agy`), and headless Claude Code (`claude`) are model harnesses and may contact whichever cloud or local provider the user's configuration selects; possible providers are not a fixed plugin-controlled list. A local provider may keep traffic on the machine, but that depends on its endpoint and configuration. Claude Architect does not inspect TLS, pin destinations, or override provider telemetry/retention. +Codex normally contacts the OpenAI service configured by the Codex CLI. OpenCode, Pi, Pythinker, and Antigravity CLI (`agy`) are model harnesses and may contact whichever cloud or local provider the user's configuration selects; headless Claude Code (`claude`) uses the default Anthropic endpoint (`api.anthropic.com`). A local provider may keep traffic on the machine, but that depends on its endpoint and configuration. Claude Architect does not inspect TLS, pin destinations, or override provider telemetry/retention. Verification commands run locally in a clean worktree. A command whose spec allows network may transmit repository or test data to destinations chosen by that command. Network-denied commands are only as private as the effective platform enforcement reported in verification evidence. diff --git a/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md b/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md index 2de7c63..9acf04e 100644 --- a/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md +++ b/docs/superpowers/specs/2026-08-27-claude-producer-adapter-design.md @@ -14,7 +14,8 @@ changes to `src/pipeline/`, `src/verify/`, or `src/integrate/`. This change also deepens the Producer seam so the adapter is self-contained (see "Seam change" below). Adding this lane touched `src/producers/` and the -registry only — the sandbox was not edited. +registry; the Seatbelt sandbox was edited only to add generic fail-closed validation +for declared writable paths (rejecting root, relative, and non-home/state-root entries). ## Evidence base @@ -101,8 +102,9 @@ adapter the sandbox did not recognize silently ran with no state access, and every new lane had to edit the sandbox. Now `ProducerInvocation.inheritedStateWritablePaths` is the declaration: each -adapter states its own auth/config/state paths, and the sandbox grants exactly -those when no temporary home is in effect. Depth moved to the right side of the +adapter states its own auth/config/state paths, and the sandbox validates each +entry (requiring absolute paths under home or a declared state root, never `/`) +and grants exactly those when no temporary home is in effect. Depth moved to the right side of the seam — the sandbox knows nothing about Producers, and the adapter is the single place that knows where its CLI keeps state. The four OS-confined CLI probes also collapsed into `probeOsConfinedCli` (resolve → `--version` → optional diff --git a/runtime/server.mjs b/runtime/server.mjs index 6588cf5..519df0f 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -2236,8 +2236,8 @@ var require_resolve = __commonJS({ } return count; } - function getFullPath(resolver, id = "", normalize2) { - if (normalize2 !== false) + function getFullPath(resolver, id = "", normalize3) { + if (normalize3 !== false) id = normalizeId(id); const p = resolver.parse(id); return _getFullPath(resolver, p); @@ -2985,7 +2985,7 @@ var require_compile = __commonJS({ const schOrFunc = root.refs[ref]; if (schOrFunc) return schOrFunc; - let _sch = resolve.call(this, root, ref); + let _sch = resolve2.call(this, root, ref); if (_sch === void 0) { const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref]; const { schemaId } = this.opts; @@ -3012,7 +3012,7 @@ var require_compile = __commonJS({ function sameSchemaEnv(s1, s2) { return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId; } - function resolve(root, ref) { + function resolve2(root, ref) { let sch; while (typeof (sch = this.refs[ref]) == "string") ref = sch; @@ -3633,65 +3633,65 @@ var require_fast_uri = __commonJS({ "use strict"; var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils(); var { SCHEMES, getSchemeHandler } = require_schemes(); - function normalize2(uri, options) { + function normalize3(uri, options) { if (typeof uri === "string") { uri = /** @type {T} */ normalizeString(uri, options); } else if (typeof uri === "object") { uri = /** @type {T} */ - parse3(serialize(uri, options), options); + parse4(serialize(uri, options), options); } return uri; } - function resolve(baseURI, relativeURI, options) { + function resolve2(baseURI, relativeURI, options) { const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" }; - const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true); + const resolved = resolveComponent(parse4(baseURI, schemelessOptions), parse4(relativeURI, schemelessOptions), schemelessOptions, true); schemelessOptions.skipEscape = true; return serialize(resolved, schemelessOptions); } - function resolveComponent(base, relative, options, skipNormalization) { + function resolveComponent(base, relative2, options, skipNormalization) { const target = {}; if (!skipNormalization) { - base = parse3(serialize(base, options), options); - relative = parse3(serialize(relative, options), options); + base = parse4(serialize(base, options), options); + relative2 = parse4(serialize(relative2, options), options); } options = options || {}; - if (!options.tolerant && relative.scheme) { - target.scheme = relative.scheme; - target.userinfo = relative.userinfo; - target.host = relative.host; - target.port = relative.port; - target.path = removeDotSegments(relative.path || ""); - target.query = relative.query; + if (!options.tolerant && relative2.scheme) { + target.scheme = relative2.scheme; + target.userinfo = relative2.userinfo; + target.host = relative2.host; + target.port = relative2.port; + target.path = removeDotSegments(relative2.path || ""); + target.query = relative2.query; } else { - if (relative.userinfo !== void 0 || relative.host !== void 0 || relative.port !== void 0) { - target.userinfo = relative.userinfo; - target.host = relative.host; - target.port = relative.port; - target.path = removeDotSegments(relative.path || ""); - target.query = relative.query; + if (relative2.userinfo !== void 0 || relative2.host !== void 0 || relative2.port !== void 0) { + target.userinfo = relative2.userinfo; + target.host = relative2.host; + target.port = relative2.port; + target.path = removeDotSegments(relative2.path || ""); + target.query = relative2.query; } else { - if (!relative.path) { + if (!relative2.path) { target.path = base.path; - if (relative.query !== void 0) { - target.query = relative.query; + if (relative2.query !== void 0) { + target.query = relative2.query; } else { target.query = base.query; } } else { - if (relative.path[0] === "/") { - target.path = removeDotSegments(relative.path); + if (relative2.path[0] === "/") { + target.path = removeDotSegments(relative2.path); } else { if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) { - target.path = "/" + relative.path; + target.path = "/" + relative2.path; } else if (!base.path) { - target.path = relative.path; + target.path = relative2.path; } else { - target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative.path; + target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative2.path; } target.path = removeDotSegments(target.path); } - target.query = relative.query; + target.query = relative2.query; } target.userinfo = base.userinfo; target.host = base.host; @@ -3699,7 +3699,7 @@ var require_fast_uri = __commonJS({ } target.scheme = base.scheme; } - target.fragment = relative.fragment; + target.fragment = relative2.fragment; return target; } function equal(uriA, uriB, options) { @@ -3882,7 +3882,7 @@ var require_fast_uri = __commonJS({ } return { parsed, malformedAuthorityOrPort }; } - function parse3(uri, opts) { + function parse4(uri, opts) { return parseWithStatus(uri, opts).parsed; } function normalizeString(uri, opts) { @@ -3906,12 +3906,12 @@ var require_fast_uri = __commonJS({ } var fastUri = { SCHEMES, - normalize: normalize2, - resolve, + normalize: normalize3, + resolve: resolve2, resolveComponent, equal, serialize, - parse: parse3 + parse: parse4 }; module.exports = fastUri; module.exports.default = fastUri; @@ -29681,7 +29681,7 @@ var Protocol = class { return; } const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3; - await new Promise((resolve) => setTimeout(resolve, pollInterval)); + await new Promise((resolve2) => setTimeout(resolve2, pollInterval)); options?.signal?.throwIfAborted(); } } catch (error51) { @@ -29698,7 +29698,7 @@ var Protocol = class { */ request(request, resultSchema, options) { const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {}; - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const earlyReject = (error51) => { reject(error51); }; @@ -29776,7 +29776,7 @@ var Protocol = class { if (!parseResult.success) { reject(parseResult.error); } else { - resolve(parseResult.data); + resolve2(parseResult.data); } } catch (error51) { reject(error51); @@ -30037,12 +30037,12 @@ var Protocol = class { } } catch { } - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { if (signal.aborted) { reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled")); return; } - const timeoutId = setTimeout(resolve, interval); + const timeoutId = setTimeout(resolve2, interval); signal.addEventListener("abort", () => { clearTimeout(timeoutId); reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled")); @@ -31133,7 +31133,7 @@ var McpServer = class { let task = createTaskResult.task; const pollInterval = task.pollInterval ?? 5e3; while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") { - await new Promise((resolve) => setTimeout(resolve, pollInterval)); + await new Promise((resolve2) => setTimeout(resolve2, pollInterval)); const updatedTask = await extra.taskStore.getTask(taskId); if (!updatedTask) { throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`); @@ -31797,12 +31797,12 @@ var StdioServerTransport = class { this.onclose?.(); } send(message) { - return new Promise((resolve) => { + return new Promise((resolve2) => { const json2 = serializeMessage(message); if (this._stdout.write(json2)) { - resolve(); + resolve2(); } else { - this._stdout.once("drain", resolve); + this._stdout.once("drain", resolve2); } }); } @@ -31992,7 +31992,7 @@ function errorCode(error51) { return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; } function delay(ms) { - return new Promise((resolve) => setTimeout(resolve, ms)); + return new Promise((resolve2) => setTimeout(resolve2, ms)); } function lockFilePath(key) { return path.join(resolveStateDir(), "locks", `${key}.lock`); @@ -32099,16 +32099,16 @@ async function describeLockContention(key, getProcessStartToken) { return `it is held by live pid ${owner.pid}${self}${extras}`; } function withTimeout(work, ms, fallback) { - return new Promise((resolve) => { - const timer = setTimeout(() => resolve(fallback), ms); + return new Promise((resolve2) => { + const timer = setTimeout(() => resolve2(fallback), ms); void work.then( (value) => { clearTimeout(timer); - resolve(value); + resolve2(value); }, () => { clearTimeout(timer); - resolve(fallback); + resolve2(fallback); } ); }); @@ -32125,12 +32125,12 @@ async function withLockContentionDetail(error51, key, getProcessStartToken) { return new RuntimeError(`${error51.message} \u2014 ${description}`, { ...error51.detail, key }); } async function gitCommonDir(cwd) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { execFile("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd }, (error51, stdout) => { if (error51) reject(error51); else { try { - resolve(gitPathOutput(stdout, "Git common directory")); + resolve2(gitPathOutput(stdout, "Git common directory")); } catch (parseError) { reject(parseError); } @@ -32192,11 +32192,11 @@ var PosixPlatformServices = class { child.stdin?.end(); } let settled = false; - const done = new Promise((resolve) => { + const done = new Promise((resolve2) => { const finish = (e) => { if (!settled) { settled = true; - resolve(e); + resolve2(e); } }; child.on("error", (err) => finish({ @@ -32239,14 +32239,14 @@ var PosixPlatformServices = class { return null; } } - return new Promise((resolve) => { + return new Promise((resolve2) => { try { execFile("ps", ["-o", "lstart=", "-p", String(pid)], (error51, stdout) => { const line = stdout.trim(); - resolve(error51 || line.length === 0 ? null : `darwin:${line}`); + resolve2(error51 || line.length === 0 ? null : `darwin:${line}`); }); } catch { - resolve(null); + resolve2(null); } }); } @@ -32497,7 +32497,7 @@ async function assertWindowsDirectoryAcl(command, directory, expectedIdentity, p return; } if (result.exitCode === 3 && attempt < 50) { - await new Promise((resolve) => setTimeout(resolve, 200)); + await new Promise((resolve2) => setTimeout(resolve2, 200)); continue; } throw new RuntimeError( @@ -32860,12 +32860,12 @@ async function resolveWindowsExecutable(request, deps) { throw new RuntimeError("executable was not found", { name: request.name }); } async function gitCommonDir2(cwd) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { execFile2("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd }, (error51, stdout) => { if (error51) reject(error51); else { try { - resolve(gitPathOutput(stdout, "Git common directory")); + resolve2(gitPathOutput(stdout, "Git common directory")); } catch (parseError) { reject(parseError); } @@ -32907,13 +32907,13 @@ var WindowsPlatformServices = class { } async runJobKillHelper(pid) { const helper = await this.jobKillHelper(); - await new Promise((resolve, reject) => { + await new Promise((resolve2, reject) => { this.tokenExecFile(helper.path, [String(pid)], { windowsHide: true, shell: false, env: windowsEssentialEnvironment() }, (error51) => { - if (error51 === null || error51.code === 2) resolve(); + if (error51 === null || error51.code === 2) resolve2(); else reject(new RuntimeError("windows process-tree termination failed", { path: helper.path, pid, @@ -32962,11 +32962,11 @@ var WindowsPlatformServices = class { child.stdin?.end(); } let settled = false; - const done = new Promise((resolve) => { + const done = new Promise((resolve2) => { const finish = (e) => { if (!settled) { settled = true; - resolve(e); + resolve2(e); } }; child.on("error", (err) => finish({ @@ -33012,7 +33012,7 @@ var WindowsPlatformServices = class { try { const helper = await this.jobKillHelper(); if (await helper.checkAvailable()) { - const nativeToken = await new Promise((resolve) => { + const nativeToken = await new Promise((resolve2) => { try { this.tokenExecFile( helper.path, @@ -33024,13 +33024,13 @@ var WindowsPlatformServices = class { }, (error51, stdout) => { const token = stdout.trim(); - if (error51 === null && token.length > 0) resolve(`win32:${token}`); - else if (error51?.code === 2) resolve(null); - else resolve(void 0); + if (error51 === null && token.length > 0) resolve2(`win32:${token}`); + else if (error51?.code === 2) resolve2(null); + else resolve2(void 0); } ); } catch { - resolve(void 0); + resolve2(void 0); } }); if (nativeToken !== void 0) { @@ -36337,7 +36337,8 @@ var AgyAdapter = class { } /** agy's settings/auth store; the only host state an attempt must write. */ configDirectory() { - return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".gemini", "antigravity-cli"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join(home, ".gemini", "antigravity-cli"); } buildInvocation(spec, ctx) { const args = [ @@ -36451,6 +36452,11 @@ function defaultHasOauthAccount(accountFile) { return false; } } +var REQUIRED_CLAUDE_FLAGS = [ + "--no-session-persistence", + "--strict-mcp-config", + "--setting-sources" +]; var ClaudeAdapter = class { constructor(deps = { env: process.env, @@ -36466,25 +36472,47 @@ var ClaudeAdapter = class { configDirectory() { const configured = this.deps.env.CLAUDE_CONFIG_DIR; if (configured !== void 0 && configured.length > 0) return configured; - return join2(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join2(home, ".claude"); } /** `~/.claude.json`: the account record the CLI rewrites on every run. */ accountFile() { const configured = this.deps.env.CLAUDE_CONFIG_DIR; if (configured !== void 0 && configured.length > 0) return join2(configured, ".claude.json"); - return join2(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude.json"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join2(home, ".claude.json"); } isAuthenticated() { const apiKey = this.deps.env.ANTHROPIC_API_KEY; if (apiKey !== void 0 && apiKey.length > 0) return true; return (this.deps.hasOauthAccount ?? defaultHasOauthAccount)(this.accountFile()); } + async inspectCliSurface(ctx, executable) { + let helpResult; + try { + helpResult = await runVersionProbe(ctx, executable, ["--help"]); + } catch { + return "unsupported-cli-surface"; + } + if (helpResult.spawnError !== void 0 || helpResult.exitCode !== 0) { + return "unsupported-cli-surface"; + } + const helpOutput = `${helpResult.stdout} +${helpResult.stderr}`; + for (const flag of REQUIRED_CLAUDE_FLAGS) { + if (!helpOutput.includes(flag)) { + return "unsupported-cli-surface"; + } + } + return null; + } async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "claude", structuredOutput: this.structuredOutput, parseVersion, + inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), isAuthenticated: () => this.isAuthenticated() }); } @@ -36968,19 +36996,23 @@ var OpenCodeAdapter = class { hasAuthStore(directory) { return (this.deps.hasAuthStore ?? ((store) => existsSync5(join4(store, "auth.json"))))(directory); } + /** OpenCode's XDG data directory (where auth.json lives), honoring XDG_DATA_HOME. */ + dataDirectory() { + const dataHome = this.deps.env.XDG_DATA_HOME ?? join4(this.deps.homeDirectory, ".local", "share"); + return join4(dataHome, "opencode"); + } async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "opencode", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(join4(this.deps.homeDirectory, ".local", "share", "opencode")) + isAuthenticated: () => this.hasAuthStore(this.dataDirectory()) }); } /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ stateDirectories() { - const dataHome = this.deps.env.XDG_DATA_HOME ?? join4(this.deps.homeDirectory, ".local", "share"); const stateHome = this.deps.env.XDG_STATE_HOME ?? join4(this.deps.homeDirectory, ".local", "state"); - return [join4(dataHome, "opencode"), join4(stateHome, "opencode")]; + return [this.dataDirectory(), join4(stateHome, "opencode")]; } buildInvocation(spec, ctx) { const args = [ @@ -37062,7 +37094,8 @@ var PiAdapter = class { } /** Pi's auth + settings store; the only host state an attempt must write. */ agentStateDirectory() { - return join5(this.deps.env.HOME ?? this.deps.homeDirectory, ".pi", "agent"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join5(home, ".pi", "agent"); } buildInvocation(spec, ctx) { if (spec.producerOverrides?.model !== void 0) { @@ -37127,7 +37160,7 @@ var PYTHINKER_NO_AUTO_UPDATE_ENV = "PYTHINKER_CLI_NO_AUTO_UPDATE"; var PYTHINKER_REQUIRED_ENV = ["PYTHINKER_SHARE_DIR", PYTHINKER_NO_AUTO_UPDATE_ENV]; function resolvePythinkerHome(deps) { const configuredHome = deps.env.PYTHINKER_SHARE_DIR; - return configuredHome !== void 0 && configuredHome.length > 0 ? configuredHome : join6(deps.homeDirectory, ".pythinker"); + return configuredHome !== void 0 && configuredHome.length > 0 ? configuredHome : join6(deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory, ".pythinker"); } function defaultPythinkerEnv(deps) { const env = {}; @@ -39212,7 +39245,7 @@ async function removeWindowsBoundEmptyDirectory(directory, expectedIdentity, pla return; } if ((result.exitCode === 3 || result.exitCode === 5) && attempt < 50) { - await new Promise((resolve) => setTimeout(resolve, 200)); + await new Promise((resolve2) => setTimeout(resolve2, 200)); continue; } throw new RuntimeError( @@ -40187,7 +40220,7 @@ var SAFE_MANAGED_ID = /^[a-z0-9][a-z0-9._-]*$/; var SAFE_QUARANTINE_TOKEN = /^[a-z0-9][a-z0-9-]{0,127}$/i; var WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY = "claude-architect-quarantine"; function delay2(milliseconds) { - return new Promise((resolve) => setTimeout(resolve, milliseconds)); + return new Promise((resolve2) => setTimeout(resolve2, milliseconds)); } function errorCode6(error51) { return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; @@ -41819,8 +41852,8 @@ function commandEnvironment(command, os) { } function isWithinScope(root, candidate, os) { if (os === "win32") return canonicalizeForScope(candidate, root); - const relative = path16.posix.relative(root, candidate); - return relative === "" || !path16.posix.isAbsolute(relative) && relative !== ".." && !relative.startsWith("../"); + const relative2 = path16.posix.relative(root, candidate); + return relative2 === "" || !path16.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); } async function resolveCommandCwd(worktreePath, commandCwd, os) { if (path16.isAbsolute(commandCwd)) return null; @@ -42609,8 +42642,8 @@ function compareEntries(left, right) { return left.runId < right.runId ? -1 : left.runId > right.runId ? 1 : 0; } function isWithin(root, candidate) { - const relative = path17.relative(root, candidate); - return relative === "" || !path17.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path17.sep}`); + const relative2 = path17.relative(root, candidate); + return relative2 === "" || !path17.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path17.sep}`); } async function ensurePlainDirectory(directory) { let created = false; @@ -44093,6 +44126,8 @@ import { rm as rm6 } from "node:fs/promises"; // src/platform/sandbox/seatbelt.ts import { realpathSync as realpathSync2 } from "node:fs"; +import { homedir as homedir7 } from "node:os"; +import { isAbsolute, normalize, parse as parse3, relative, resolve } from "node:path"; function buildReadOnlySeatbeltPolicy(args) { return { worktreePath: "", @@ -44121,9 +44156,75 @@ function sbPath(path32) { } return `"${path32.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; } +function isDeclaredStateRoot(normalized, invocation, policy) { + const roots = []; + const homeCandidates = [ + invocation.env?.HOME, + invocation.env?.USERPROFILE, + process.env.HOME, + process.env.USERPROFILE + ]; + try { + homeCandidates.push(homedir7()); + } catch { + } + for (const candidate of homeCandidates) { + if (typeof candidate === "string" && candidate.length > 0 && candidate !== "/") { + roots.push(resolve(candidate)); + } + } + const stateEnvs = [ + "CLAUDE_CONFIG_DIR", + "OPENCODE_CONFIG_DIR", + "XDG_DATA_HOME", + "XDG_STATE_HOME", + "XDG_CONFIG_HOME", + "PI_CONFIG_DIR", + "PYTHINKER_SHARE_DIR", + "GEMINI_CLI_HOME" + ]; + for (const envKey of stateEnvs) { + const val = invocation.env?.[envKey] ?? process.env[envKey]; + if (typeof val === "string" && val.length > 0 && val !== "/") { + roots.push(resolve(val)); + } + } + if (policy.extraWritableRoots) { + for (const root of policy.extraWritableRoots) { + if (typeof root === "string" && root.length > 0 && root !== "/") { + roots.push(resolve(root)); + } + } + } + for (const root of roots) { + if (normalized === root) return true; + const rel = relative(root, normalized); + if (!rel.startsWith("..") && !isAbsolute(rel)) return true; + } + const userHomePattern = /^(\/Users\/[^/]+|\/home\/[^/]+|\/root)(?:\/.*)?$/u; + const winUserHomePattern = /^[a-zA-Z]:\\Users\\[^\\]+(?:\\.*)?$/u; + return userHomePattern.test(normalized) || winUserHomePattern.test(normalized); +} +function isValidInheritedStatePath(path32, invocation, policy) { + if (typeof path32 !== "string" || path32.trim().length === 0) return false; + if (!isAbsolute(path32)) return false; + const parsed = parse3(path32); + if (path32 === "/" || path32 === parsed.root) return false; + const normalized = normalize(path32); + if (normalized === "/" || normalized === parsed.root) return false; + if (resolve(path32) === "/" || resolve(path32) === parsed.root) return false; + return isDeclaredStateRoot(normalized, invocation, policy); +} function inheritedStateWritablePaths(invocation, policy) { if (policy.tempHome !== null) return []; - return [...invocation.inheritedStateWritablePaths ?? []]; + const declared = invocation.inheritedStateWritablePaths; + if (!declared || declared.length === 0) return []; + for (const entry of declared) { + if (!isValidInheritedStatePath(entry, invocation, policy)) { + return []; + } + } + return [...declared]; } function buildProfile(policy, additionalWritable) { const writable = [...new Set([ @@ -44623,8 +44724,8 @@ async function requirePlainDirectory(directory, label) { } } function isContainedBy(parent, candidate) { - const relative = path19.relative(parent, candidate); - return relative !== "" && relative !== ".." && !relative.startsWith(`..${path19.sep}`) && !path19.isAbsolute(relative); + const relative2 = path19.relative(parent, candidate); + return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path19.sep}`) && !path19.isAbsolute(relative2); } function sameFileIdentity(before, after) { return before.dev === after.dev && before.ino === after.ino; @@ -44996,7 +45097,7 @@ async function checkInProgressOperation(checkoutPath, runGit = git) { if (!succeeded(gitDirectoryResult)) return "scan-failed"; try { const gitDirectory = gitPathOutput(gitDirectoryResult.stdout, "Git directory"); - return (await Promise.all(IN_PROGRESS_PATHS.map((relative) => exists2(path20.join(gitDirectory, relative))))).some(Boolean) ? "in-progress" : "clear"; + return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path20.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; } catch { return "scan-failed"; } @@ -45036,8 +45137,8 @@ function pathIsWithin(root, candidate) { if (getPlatformServices().os === "win32") { return canonicalizeForScope(candidate, root); } - const relative = path20.relative(root, candidate); - return relative === "" || relative !== ".." && !relative.startsWith(`..${path20.sep}`) && !path20.isAbsolute(relative); + const relative2 = path20.relative(root, candidate); + return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path20.sep}`) && !path20.isAbsolute(relative2); } function pathsIdentifySameLocation(left, right) { if (getPlatformServices().os === "win32") { @@ -47433,7 +47534,7 @@ var AutopilotController = class { Math.max(MIN_REQUIRED_CHECKS_POLL_INTERVAL_MS, Math.trunc(configuredInterval)) ) : DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS; this.sleep = dependencies.sleep ?? (async (milliseconds) => { - await new Promise((resolve) => setTimeout(resolve, milliseconds)); + await new Promise((resolve2) => setTimeout(resolve2, milliseconds)); }); } dependencies; @@ -50550,11 +50651,11 @@ async function runAttempt(checkoutPath, spec, deps) { // src/pipeline/consolidator.ts var SEVERITY_ORDER = { blocker: 0, major: 1, minor: 2, nit: 3 }; -function normalize(text) { +function normalize2(text) { return text.toLowerCase().replace(/\s+/g, " ").trim(); } function dedupeKey(f) { - return `${f.location} ${normalize(f.claim)}`; + return `${f.location} ${normalize2(f.claim)}`; } function consolidate(reports) { const byKey = /* @__PURE__ */ new Map(); @@ -50574,7 +50675,7 @@ function consolidate(reports) { existing.finding.confidence = Math.max(existing.finding.confidence, raw.confidence); } } - const merged = [...byKey.values()].sort((a, b) => SEVERITY_ORDER[a.finding.severity] - SEVERITY_ORDER[b.finding.severity] || a.finding.location.localeCompare(b.finding.location) || normalize(a.finding.claim).localeCompare(normalize(b.finding.claim))); + const merged = [...byKey.values()].sort((a, b) => SEVERITY_ORDER[a.finding.severity] - SEVERITY_ORDER[b.finding.severity] || a.finding.location.localeCompare(b.finding.location) || normalize2(a.finding.claim).localeCompare(normalize2(b.finding.claim))); const findings = merged.map((entry, index) => ({ ...entry.finding, id: `F-${String(index + 1).padStart(3, "0")}`, @@ -53880,8 +53981,8 @@ async function withRepoLock(key, fn) { } const previous = mutex.tail; let release; - mutex.tail = new Promise((resolve) => { - release = resolve; + mutex.tail = new Promise((resolve2) => { + release = resolve2; }); mutex.pending += 1; await previous; diff --git a/skills/delegate/SKILL.md b/skills/delegate/SKILL.md index b2e3c05..cf4d90e 100644 --- a/skills/delegate/SKILL.md +++ b/skills/delegate/SKILL.md @@ -59,7 +59,7 @@ P0-A certifies the MCP implementation path only for Codex on macOS arm64 when it ### Architect-side Claude subagents -The architect session — whatever model it runs, including Fable — may dispatch Claude subagents through the host's `Agent` tool with a `model` of `opus` or `sonnet` for **non-writing** roles, and it may do so in parallel with a running lane: +The architect session — whatever model it runs, including Fable — may dispatch Claude subagents through the host's `Agent` tool with a `model` of `opus`, `sonnet`, or `fable` for **non-writing** roles, and it may do so in parallel with a running lane: - **Scout** (`sonnet`, or `Explore`): read-only reconnaissance before a spec is frozen — call sites, nearby patterns, which files an allowlist must cover. - **Spec drafter** (`sonnet`): turn an agreed design into candidate `successCriteria` and verification commands for the architect to review; the architect still owns and freezes the spec. diff --git a/src/platform/sandbox/seatbelt.ts b/src/platform/sandbox/seatbelt.ts index bc5964c..3a0ac66 100644 --- a/src/platform/sandbox/seatbelt.ts +++ b/src/platform/sandbox/seatbelt.ts @@ -1,4 +1,6 @@ import { realpathSync } from "node:fs"; +import { homedir } from "node:os"; +import { isAbsolute, normalize, parse, relative, resolve } from "node:path"; import type { ProducerInvocation } from "../../producers/producer-adapter.js"; export interface SeatbeltPolicy { @@ -49,16 +51,101 @@ function sbPath(path: string): string { return `"${path.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; } +function isDeclaredStateRoot( + normalized: string, + invocation: ProducerInvocation, + policy: SeatbeltPolicy, +): boolean { + const roots: string[] = []; + + const homeCandidates = [ + invocation.env?.HOME, + invocation.env?.USERPROFILE, + process.env.HOME, + process.env.USERPROFILE, + ]; + try { + homeCandidates.push(homedir()); + } catch {} + + for (const candidate of homeCandidates) { + if (typeof candidate === "string" && candidate.length > 0 && candidate !== "/") { + roots.push(resolve(candidate)); + } + } + + const stateEnvs = [ + "CLAUDE_CONFIG_DIR", + "OPENCODE_CONFIG_DIR", + "XDG_DATA_HOME", + "XDG_STATE_HOME", + "XDG_CONFIG_HOME", + "PI_CONFIG_DIR", + "PYTHINKER_SHARE_DIR", + "GEMINI_CLI_HOME", + ]; + for (const envKey of stateEnvs) { + const val = invocation.env?.[envKey] ?? process.env[envKey]; + if (typeof val === "string" && val.length > 0 && val !== "/") { + roots.push(resolve(val)); + } + } + + if (policy.extraWritableRoots) { + for (const root of policy.extraWritableRoots) { + if (typeof root === "string" && root.length > 0 && root !== "/") { + roots.push(resolve(root)); + } + } + } + + for (const root of roots) { + if (normalized === root) return true; + const rel = relative(root, normalized); + if (!rel.startsWith("..") && !isAbsolute(rel)) return true; + } + + const userHomePattern = /^(\/Users\/[^/]+|\/home\/[^/]+|\/root)(?:\/.*)?$/u; + const winUserHomePattern = /^[a-zA-Z]:\\Users\\[^\\]+(?:\\.*)?$/u; + return userHomePattern.test(normalized) || winUserHomePattern.test(normalized); +} + +function isValidInheritedStatePath( + path: string, + invocation: ProducerInvocation, + policy: SeatbeltPolicy, +): boolean { + if (typeof path !== "string" || path.trim().length === 0) return false; + if (!isAbsolute(path)) return false; + const parsed = parse(path); + if (path === "/" || path === parsed.root) return false; + const normalized = normalize(path); + if (normalized === "/" || normalized === parsed.root) return false; + if (resolve(path) === "/" || resolve(path) === parsed.root) return false; + return isDeclaredStateRoot(normalized, invocation, policy); +} + /** * State the Producer declared it must write while running with the real HOME. * A temporary home replaces that state wholesale, so the declaration is moot. + * Every entry must be absolute, under home or a declared state root, and never root (`/`). + * Any invalid entry fails closed: no grants are emitted. */ function inheritedStateWritablePaths( invocation: ProducerInvocation, policy: SeatbeltPolicy, ): string[] { if (policy.tempHome !== null) return []; - return [...(invocation.inheritedStateWritablePaths ?? [])]; + const declared = invocation.inheritedStateWritablePaths; + if (!declared || declared.length === 0) return []; + + for (const entry of declared) { + if (!isValidInheritedStatePath(entry, invocation, policy)) { + return []; + } + } + + return [...declared]; } function buildProfile(policy: SeatbeltPolicy, additionalWritable: string[]): string { diff --git a/src/producers/agy-adapter.ts b/src/producers/agy-adapter.ts index 47b1a7b..223d74f 100644 --- a/src/producers/agy-adapter.ts +++ b/src/producers/agy-adapter.ts @@ -63,7 +63,8 @@ export class AgyAdapter implements ProducerAdapter { /** agy's settings/auth store; the only host state an attempt must write. */ private configDirectory(): string { - return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".gemini", "antigravity-cli"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join(home, ".gemini", "antigravity-cli"); } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { diff --git a/src/producers/claude-adapter.ts b/src/producers/claude-adapter.ts index 30f16d6..b1de70e 100644 --- a/src/producers/claude-adapter.ts +++ b/src/producers/claude-adapter.ts @@ -2,7 +2,8 @@ import { existsSync, readFileSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; -import { probeOsConfinedCli } from "./cli-probe.js"; +import type { ResolvedExecutable } from "../platform/platform-services.js"; +import { parseSemver, probeOsConfinedCli, runVersionProbe } from "./cli-probe.js"; import { renderProducerPrompt } from "./plain-text.js"; import type { AdapterEvent, @@ -65,6 +66,12 @@ function defaultHasOauthAccount(accountFile: string): boolean { } } +const REQUIRED_CLAUDE_FLAGS = [ + "--no-session-persistence", + "--strict-mcp-config", + "--setting-sources", +] as const; + export class ClaudeAdapter implements ProducerAdapter { readonly producerId = "claude"; readonly structuredOutput = true; @@ -79,14 +86,16 @@ export class ClaudeAdapter implements ProducerAdapter { private configDirectory(): string { const configured = this.deps.env.CLAUDE_CONFIG_DIR; if (configured !== undefined && configured.length > 0) return configured; - return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join(home, ".claude"); } /** `~/.claude.json`: the account record the CLI rewrites on every run. */ private accountFile(): string { const configured = this.deps.env.CLAUDE_CONFIG_DIR; if (configured !== undefined && configured.length > 0) return join(configured, ".claude.json"); - return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".claude.json"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join(home, ".claude.json"); } private isAuthenticated(): boolean { @@ -95,12 +104,35 @@ export class ClaudeAdapter implements ProducerAdapter { return (this.deps.hasOauthAccount ?? defaultHasOauthAccount)(this.accountFile()); } + private async inspectCliSurface( + ctx: ProbeContext, + executable: ResolvedExecutable, + ): Promise { + let helpResult; + try { + helpResult = await runVersionProbe(ctx, executable, ["--help"]); + } catch { + return "unsupported-cli-surface"; + } + if (helpResult.spawnError !== undefined || helpResult.exitCode !== 0) { + return "unsupported-cli-surface"; + } + const helpOutput = `${helpResult.stdout}\n${helpResult.stderr}`; + for (const flag of REQUIRED_CLAUDE_FLAGS) { + if (!helpOutput.includes(flag)) { + return "unsupported-cli-surface"; + } + } + return null; + } + async probe(ctx: ProbeContext): Promise { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "claude", structuredOutput: this.structuredOutput, parseVersion, + inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), isAuthenticated: () => this.isAuthenticated(), }); } diff --git a/src/producers/opencode-adapter.ts b/src/producers/opencode-adapter.ts index a594429..651d4a3 100644 --- a/src/producers/opencode-adapter.ts +++ b/src/producers/opencode-adapter.ts @@ -45,23 +45,27 @@ export class OpenCodeAdapter implements ProducerAdapter { return (this.deps.hasAuthStore ?? (store => existsSync(join(store, "auth.json"))))(directory); } + /** OpenCode's XDG data directory (where auth.json lives), honoring XDG_DATA_HOME. */ + private dataDirectory(): string { + const dataHome = this.deps.env.XDG_DATA_HOME + ?? join(this.deps.homeDirectory, ".local", "share"); + return join(dataHome, "opencode"); + } + async probe(ctx: ProbeContext): Promise { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "opencode", structuredOutput: this.structuredOutput, - isAuthenticated: () => - this.hasAuthStore(join(this.deps.homeDirectory, ".local", "share", "opencode")), + isAuthenticated: () => this.hasAuthStore(this.dataDirectory()), }); } /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ private stateDirectories(): string[] { - const dataHome = this.deps.env.XDG_DATA_HOME - ?? join(this.deps.homeDirectory, ".local", "share"); const stateHome = this.deps.env.XDG_STATE_HOME ?? join(this.deps.homeDirectory, ".local", "state"); - return [join(dataHome, "opencode"), join(stateHome, "opencode")]; + return [this.dataDirectory(), join(stateHome, "opencode")]; } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { diff --git a/src/producers/pi-adapter.ts b/src/producers/pi-adapter.ts index 9af3fc1..07b02bb 100644 --- a/src/producers/pi-adapter.ts +++ b/src/producers/pi-adapter.ts @@ -61,7 +61,8 @@ export class PiAdapter implements ProducerAdapter { /** Pi's auth + settings store; the only host state an attempt must write. */ private agentStateDirectory(): string { - return join(this.deps.env.HOME ?? this.deps.homeDirectory, ".pi", "agent"); + const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; + return join(home, ".pi", "agent"); } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { diff --git a/src/producers/pythinker-adapter.ts b/src/producers/pythinker-adapter.ts index 7110fe9..85a4827 100644 --- a/src/producers/pythinker-adapter.ts +++ b/src/producers/pythinker-adapter.ts @@ -58,7 +58,7 @@ function resolvePythinkerHome( const configuredHome = deps.env.PYTHINKER_SHARE_DIR; return configuredHome !== undefined && configuredHome.length > 0 ? configuredHome - : join(deps.homeDirectory, ".pythinker"); + : join(deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory, ".pythinker"); } function defaultPythinkerEnv( diff --git a/tests/runtime/agy-adapter.test.ts b/tests/runtime/agy-adapter.test.ts index e72ebbc..3c038e6 100644 --- a/tests/runtime/agy-adapter.test.ts +++ b/tests/runtime/agy-adapter.test.ts @@ -382,7 +382,7 @@ describe("AgyAdapter", () => { it("declares only ~/.gemini/antigravity-cli as inherited writable state", () => { const adapter = new AgyAdapter({ env: {}, homeDirectory: "/Users/test" }); const invocation = adapter.buildInvocation(sampleSpec(), invocationContext()); - expect(invocation.inheritedStateWritablePaths).toEqual(["/Users/test/.gemini/antigravity-cli"]); + expect(invocation.inheritedStateWritablePaths).toEqual([join("/Users/test", ".gemini", "antigravity-cli")]); }); it("declares the agy configuration isolation profile", () => { diff --git a/tests/runtime/claude-adapter.test.ts b/tests/runtime/claude-adapter.test.ts index 29b0786..6f60616 100644 --- a/tests/runtime/claude-adapter.test.ts +++ b/tests/runtime/claude-adapter.test.ts @@ -15,7 +15,7 @@ import { supervise } from "../../src/platform/process-supervisor.js"; import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { ClaudeAdapter } from "../../src/producers/claude-adapter.js"; -import { renderProducerPrompt } from "../../src/producers/plain-text.js"; +import { renderProducerPrompt, selectOsWriteConfinementBackend } from "../../src/producers/plain-text.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; import type { CapabilityReport, @@ -32,6 +32,15 @@ const executable: ResolvedExecutable = { resolvedFrom: "test", }; +const supportedHelp = ` +Usage: claude [options] [prompt] + +Options: + --no-session-persistence Do not save session history + --strict-mcp-config Strict MCP configuration + --setting-sources Comma-separated list of setting sources +`; + function exit(overrides: Partial = {}): SupervisedExit { return { exitCode: 0, @@ -79,6 +88,7 @@ function versionPlatformServices( resolvedExecutable: ResolvedExecutable, spawned: ResolvedExecutable[] = [], stdout = "2.1.250 (Claude Code)\n", + helpResult: SupervisedExit = exit({ stdout: supportedHelp }), ): PlatformServices { return { os: "darwin", @@ -91,7 +101,9 @@ function versionPlatformServices( pid: 42, stdout: Readable.from([]), stderr: Readable.from([]), - done: Promise.resolve(exit({ stdout })), + done: Promise.resolve( + request.args.includes("--help") ? helpResult : exit({ stdout }), + ), }; }, async requestCooperativeCancellation() {}, @@ -238,17 +250,36 @@ describe("ClaudeAdapter", () => { }); it("parses the Claude Code version banner and honestly gates edit eligibility", async () => { - const report = await testAdapter().probe(probeContext(versionPlatformServices(executable))); + const ctx = probeContext(versionPlatformServices(executable)); + const report = await testAdapter().probe(ctx); expect(report.available).toBe(true); expect(report.version).toBe("2.1.250"); expect(report.structuredOutput).toBe(true); - expect(report.writeConfinementBackend).toBe( - process.platform === "darwin" && process.arch === "arm64" ? "macos-seatbelt" : null, - ); + expect(report.writeConfinementBackend).toBe(selectOsWriteConfinementBackend(ctx)); expect(report.laneEligibility).toEqual({ edit: report.writeConfinementBackend !== null }); }); + it("reports unsupported-cli-surface when --help lacks a required flag", async () => { + const fakeHelp = ` +Usage: claude [options] +Options: + --no-session-persistence + --setting-sources +`; // Missing --strict-mcp-config + const ps = versionPlatformServices( + executable, + [], + "2.1.250 (Claude Code)\n", + exit({ stdout: fakeHelp }), + ); + const report = await testAdapter().probe(probeContext(ps)); + + expect(report.available).toBe(false); + expect(report.reason).toBe("unsupported-cli-surface"); + expect(report.resolvedExecutable).toEqual(executable); + }); + it("reports probe-failed when version output cannot be parsed", async () => { const report = await testAdapter().probe( probeContext(versionPlatformServices(executable, [], "Claude Code\n")), @@ -270,7 +301,7 @@ describe("ClaudeAdapter", () => { const report = await adapter.probe(probeContext(versionPlatformServices(executable))); expect(report.authState).toBe("authenticated"); - expect(checked).toEqual(["/Users/test/.claude.json"]); + expect(checked).toEqual([join("/Users/test", ".claude.json")]); }); it("reads the account record from CLAUDE_CONFIG_DIR when the host relocated it", async () => { @@ -285,7 +316,7 @@ describe("ClaudeAdapter", () => { const report = await adapter.probe(probeContext(versionPlatformServices(executable))); expect(report.authState).toBe("unauthenticated"); - expect(checked).toEqual(["/Users/test/relocated/.claude.json"]); + expect(checked).toEqual([join("/Users/test/relocated", ".claude.json")]); }); it("reports authenticated from ANTHROPIC_API_KEY without reading the account file", async () => { @@ -378,8 +409,8 @@ describe("ClaudeAdapter", () => { .buildInvocation(sampleSpec(), invocationContext()); expect(invocation.inheritedStateWritablePaths).toEqual([ - "/Users/real/.claude", - "/Users/real/.claude.json", + join("/Users/real", ".claude"), + join("/Users/real", ".claude.json"), ]); }); @@ -389,7 +420,7 @@ describe("ClaudeAdapter", () => { expect(invocation.inheritedStateWritablePaths).toEqual([ "/Users/test/relocated", - "/Users/test/relocated/.claude.json", + join("/Users/test/relocated", ".claude.json"), ]); }); @@ -401,11 +432,13 @@ describe("ClaudeAdapter", () => { allowNetwork: true, }); const profile = wrapped.args[1] ?? ""; + const configDir = join("/Users/test", ".claude"); + const accountFile = join("/Users/test", ".claude.json"); expect(wrapped.executable.command).toBe("/usr/bin/sandbox-exec"); expect(profile).toContain('(allow file-write* (subpath "/tmp/attempt-worktree"))'); - expect(profile).toContain('(subpath "/Users/test/.claude")'); - expect(profile).toContain('(subpath "/Users/test/.claude.json")'); + expect(profile).toContain(`(subpath "${configDir.replace(/\\/gu, "\\\\")}")`); + expect(profile).toContain(`(subpath "${accountFile.replace(/\\/gu, "\\\\")}")`); expect(profile).not.toContain('(subpath "/Users/test")'); expect(profile).not.toContain("(deny network*)"); expect(wrapped.args.slice(2)).toEqual([executable.command, ...invocation.args]); diff --git a/tests/runtime/e2e-vertical-slice.test.ts b/tests/runtime/e2e-vertical-slice.test.ts index 9a4b9a8..5939b8c 100644 --- a/tests/runtime/e2e-vertical-slice.test.ts +++ b/tests/runtime/e2e-vertical-slice.test.ts @@ -409,7 +409,7 @@ describe("P0-A end-to-end vertical slice", () => { } expect(observed).toEqual(expectedFailurePrecedence); - }, 90_000); + }, process.platform === "win32" ? 360_000 : 90_000); it("structures the nested-delegation guard as a handler error", async () => { const repoRoot = await initRepo(); diff --git a/tests/runtime/opencode-adapter.test.ts b/tests/runtime/opencode-adapter.test.ts index a87b257..eb06e29 100644 --- a/tests/runtime/opencode-adapter.test.ts +++ b/tests/runtime/opencode-adapter.test.ts @@ -269,6 +269,25 @@ describe("OpenCodeAdapter", () => { } }); + it("reports authenticated when auth.json exists in the store overridden by XDG_DATA_HOME", async () => { + const root = await mkdtemp(join(tmpdir(), "claude-architect-opencode-auth-")); + const customDataHome = join(root, "custom-data"); + const store = join(customDataHome, "opencode"); + await mkdir(store, { recursive: true }); + await writeFile(join(store, "auth.json"), "fixture contents must not be read"); + + try { + const report = await new OpenCodeAdapter({ + env: { XDG_DATA_HOME: customDataHome }, + homeDirectory: root, + }).probe(probeContext(versionPlatformServices(executable))); + + expect(report.authState).toBe("authenticated"); + } finally { + await rm(root, { recursive: true, force: true }); + } + }); + it("invokes a Node OpenCode entrypoint with the runtime Node executable", async () => { const root = await mkdtemp(join(tmpdir(), "claude-architect-opencode-entrypoint-")); const entrypoint = join(root, "opencode"); @@ -473,8 +492,8 @@ describe("OpenCodeAdapter", () => { }); const invocation = adapter.buildInvocation(sampleSpec(), invocationContext()); expect(invocation.inheritedStateWritablePaths).toEqual([ - "/Users/test/.local/share/opencode", - "/Users/test/.local/state/opencode", + join("/Users/test", ".local", "share", "opencode"), + join("/Users/test", ".local", "state", "opencode"), ]); }); diff --git a/tests/runtime/pi-adapter.test.ts b/tests/runtime/pi-adapter.test.ts index 977e665..121112f 100644 --- a/tests/runtime/pi-adapter.test.ts +++ b/tests/runtime/pi-adapter.test.ts @@ -445,7 +445,7 @@ describe("PiAdapter", () => { it("declares only ~/.pi/agent as inherited writable state, following HOME", () => { const adapter = new PiAdapter({ env: { HOME: "/Users/test" }, homeDirectory: "/Users/other" }); const invocation = adapter.buildInvocation(sampleSpec(), invocationContext()); - expect(invocation.inheritedStateWritablePaths).toEqual(["/Users/test/.pi/agent"]); + expect(invocation.inheritedStateWritablePaths).toEqual([join("/Users/test", ".pi", "agent")]); }); it("declares the Pi configuration isolation profile", () => { diff --git a/tests/runtime/pythinker-adapter.test.ts b/tests/runtime/pythinker-adapter.test.ts index 1b1fd3a..396958f 100644 --- a/tests/runtime/pythinker-adapter.test.ts +++ b/tests/runtime/pythinker-adapter.test.ts @@ -553,7 +553,7 @@ describe("PythinkerAdapter", () => { .toEqual(["/Users/test/custom-pythinker-home"]); const withDefault = new PythinkerAdapter({ env: {}, homeDirectory: "/Users/test" }); expect(withDefault.buildInvocation(sampleSpec(), invocationContext()).inheritedStateWritablePaths) - .toEqual(["/Users/test/.pythinker"]); + .toEqual([join("/Users/test", ".pythinker")]); }); it("declares the Pythinker configuration isolation profile", () => { diff --git a/tests/runtime/seatbelt.test.ts b/tests/runtime/seatbelt.test.ts index f03ca6f..f078432 100644 --- a/tests/runtime/seatbelt.test.ts +++ b/tests/runtime/seatbelt.test.ts @@ -94,6 +94,48 @@ describe("seatbelt profile", () => { expect(profile).not.toContain('(subpath "/Users/test")'); }); + it("rejects invalid declared paths (root, relative, or not under home/state root) and emits no grants", () => { + const rootWrapped = wrapInvocationWithSeatbelt({ + ...invocation, + inheritedStateWritablePaths: ["/"], + }, { + worktreePath: "/tmp/wt", + tempHome: null, + allowNetwork: false, + }); + expect(rootWrapped.args[1]).not.toContain('(subpath "/")'); + + const relWrapped = wrapInvocationWithSeatbelt({ + ...invocation, + inheritedStateWritablePaths: ["relative/path"], + }, { + worktreePath: "/tmp/wt", + tempHome: null, + allowNetwork: false, + }); + expect(relWrapped.args[1]).not.toContain("relative/path"); + + const mixedWrapped = wrapInvocationWithSeatbelt({ + ...invocation, + inheritedStateWritablePaths: ["/Users/test/.pi/agent", "/"], + }, { + worktreePath: "/tmp/wt", + tempHome: null, + allowNetwork: false, + }); + expect(mixedWrapped.args[1]).not.toContain('(subpath "/Users/test/.pi/agent")'); + + const escapeWrapped = wrapInvocationWithSeatbelt({ + ...invocation, + inheritedStateWritablePaths: ["/etc/passwd"], + }, { + worktreePath: "/tmp/wt", + tempHome: null, + allowNetwork: false, + }); + expect(escapeWrapped.args[1]).not.toContain("/etc/passwd"); + }); + it("ignores declared inherited-state paths when a temp home replaces the real one", () => { const wrapped = wrapInvocationWithSeatbelt({ ...invocation, From 240b30176703edd1f7eff8d834720e019dc13a22 Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 15:06:00 -0400 Subject: [PATCH 06/12] release: 0.50.0 --- .claude-plugin/marketplace.json | 2 +- .claude-plugin/plugin.json | 2 +- CHANGELOG.md | 2 ++ README.md | 2 +- runtime/server.mjs | 2 +- src/protocol/versions.ts | 2 +- tests/runtime/plugin-wiring.test.mjs | 4 ++-- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index ef885b7..05089ea 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -12,7 +12,7 @@ "name": "claude-architect", "displayName": "Claude Architect", "source": "./", - "version": "0.49.0", + "version": "0.50.0", "description": "Verified P0-A MCP delegation with macOS arm64 certified; eligible Linux Codex editing is tested; native Windows Codex editing is unsupported. Codex edit eligibility requires its proven native sandbox.", "author": { "name": "elkaix", diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json index 0b25ebb..e2d7fdb 100644 --- a/.claude-plugin/plugin.json +++ b/.claude-plugin/plugin.json @@ -1,7 +1,7 @@ { "name": "claude-architect", "displayName": "Claude Architect", - "version": "0.49.0", + "version": "0.50.0", "description": "Verified coding-agent delegation for Claude Code with isolated Producers, frozen candidate artifacts, independent review, and human-controlled integration.", "author": { "name": "Mohamed Elkholy", diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e7e376..d55dc2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to Claude Architect are recorded here. The format follows ## [Unreleased] +## [0.50.0] - 2026-09-02 + ### Changed - The repository moved to the `PyModel` GitHub organization. Every homepage, diff --git a/README.md b/README.md index 229d67d..de80725 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ delegate skill codex skill Claude Code - version + version license

diff --git a/runtime/server.mjs b/runtime/server.mjs index 519df0f..bf27e4c 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -31815,7 +31815,7 @@ import path31 from "node:path"; var PROTOCOL_VERSION = "2.0.0"; var DELEGATION_SPEC_VERSION = "1"; var ATTEMPT_RESULT_VERSION = "1"; -var RUNTIME_VERSION = "0.49.0"; +var RUNTIME_VERSION = "0.50.0"; // src/protocol/attempt-result.ts var FAILURE_PRECEDENCE = [ diff --git a/src/protocol/versions.ts b/src/protocol/versions.ts index 37b0e17..0b6afbc 100644 --- a/src/protocol/versions.ts +++ b/src/protocol/versions.ts @@ -2,4 +2,4 @@ export const PROTOCOL_VERSION = "2.0.0" as const; // MCP tool contract vers export const DELEGATION_SPEC_VERSION = "1" as const; // wire schema major export const AUTOPILOT_SPEC_VERSION = "1" as const; export const ATTEMPT_RESULT_VERSION = "1" as const; -export const RUNTIME_VERSION = "0.49.0" as const; // mirrors plugin.json at release +export const RUNTIME_VERSION = "0.50.0" as const; // mirrors plugin.json at release diff --git a/tests/runtime/plugin-wiring.test.mjs b/tests/runtime/plugin-wiring.test.mjs index 18e0630..84880cb 100644 --- a/tests/runtime/plugin-wiring.test.mjs +++ b/tests/runtime/plugin-wiring.test.mjs @@ -233,8 +233,8 @@ describe("P0-A plugin wiring", () => { const marketplace = JSON.parse(read(".claude-plugin/marketplace.json")); const readme = read("README.md"); const changelog = read("CHANGELOG.md"); - assert.equal(plugin.version, "0.49.0"); - assert.equal(marketplace.plugins[0].version, "0.49.0"); + assert.equal(plugin.version, "0.50.0"); + assert.equal(marketplace.plugins[0].version, "0.50.0"); // Derived from plugin.json, not written out: a literal here is a seventh // place to edit on every bump, and it is the one that keeps being missed. assert.match(readme, new RegExp(`badge/version-${plugin.version.replace(/\./gu, "\\.")}-`, "u")); From 12d9814c822941584c902779567e82f4e65e167c Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 17:09:55 -0400 Subject: [PATCH 07/12] feat: implement Phase 2 ProducerRuntime with unified descriptors, prompt rendering, probing, launch, and cache --- .nvmrc | 1 + CHANGELOG.md | 8 + CONTEXT.md | 24 +- runtime/server.mjs | 3590 +++++++++-------- src/mcp/doctor.ts | 2 +- src/pipeline/role-runner.ts | 95 +- src/producers/agy-adapter.ts | 74 +- src/producers/capability-probe.ts | 4 +- src/producers/claude-adapter.ts | 119 +- src/producers/cli-probe.ts | 40 +- src/producers/codex-adapter.ts | 258 +- src/producers/host-store.ts | 124 + src/producers/opencode-adapter.ts | 92 +- src/producers/pi-adapter.ts | 89 +- src/producers/plain-text.ts | 37 +- src/producers/producer-adapter.ts | 119 + src/producers/producer-runtime.ts | 350 ++ src/producers/prompt-renderer.ts | 91 + src/producers/pythinker-adapter.ts | 110 +- src/runtime/attempt-runtime.ts | 89 +- src/runtime/producer-preflight.ts | 75 +- tests/runtime/agy-adapter.test.ts | 58 +- tests/runtime/autopilot/autopilot-e2e.test.ts | 4 +- tests/runtime/claude-adapter.test.ts | 58 +- tests/runtime/codex-adapter.test.ts | 119 +- tests/runtime/cross-lane-launch.test.ts | 193 + tests/runtime/cross-lane-probe.test.ts | 179 + tests/runtime/cross-lane-prompt.test.ts | 290 ++ tests/runtime/opencode-adapter.test.ts | 88 +- tests/runtime/pi-adapter.test.ts | 57 +- tests/runtime/pipeline-runtime.test.ts | 2 +- tests/runtime/probe-cache.test.ts | 237 ++ tests/runtime/producer-adapter.test.ts | 102 + tests/runtime/pythinker-adapter.test.ts | 32 +- 34 files changed, 4178 insertions(+), 2632 deletions(-) create mode 100644 .nvmrc create mode 100644 src/producers/host-store.ts create mode 100644 src/producers/producer-runtime.ts create mode 100644 src/producers/prompt-renderer.ts create mode 100644 tests/runtime/cross-lane-launch.test.ts create mode 100644 tests/runtime/cross-lane-probe.test.ts create mode 100644 tests/runtime/cross-lane-prompt.test.ts create mode 100644 tests/runtime/probe-cache.test.ts diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..a45fd52 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +24 diff --git a/CHANGELOG.md b/CHANGELOG.md index d55dc2c..5dda585 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ All notable changes to Claude Architect are recorded here. The format follows ## [Unreleased] +### Changed + +- Unified prompt assembly across all Producer lanes into `src/producers/prompt-renderer.ts` with `actionPreamble` and `bootstrapPlacement` parameterized from `ProducerDescriptor`. Every edit-lane prompt now carries the action-first preamble (`EDIT_ACTION_PREAMBLE`) and lint-before-typecheck instruction (`LINT_BEFORE_TYPECHECK_INSTRUCTION`). Codex's private `renderPrompt` and duplicate `renderList` have been removed. Prompt hashes change for five lanes (Agy, Claude, OpenCode, Pi, Pythinker) because they now include the action-first preamble and lint-before-typecheck ordering previously unique to Codex. +- Unified capability probing across all six Producer lanes through `src/producers/cli-probe.ts`. Codex's probe now routes through the shared probe, eliminating duplicated executable normalization and sandbox detection. The shared probe enforces an abnormal-termination guard ensuring any signal-terminated, timed-out, or cancelled `--version` probe yields `version: null` and fail-closed unavailability across all six lanes. +- Unified process launch across all Producer lanes into `src/producers/producer-runtime.ts` (`ProducerRuntime.planLaunch` and `ProducerRuntime.launch`). Temporary HOME directories are now created only when the descriptor's isolation profile requires them (`controlled-config-supported` or `controlled-config-with-copied-credentials`), and declared-writable-state combined with temporary HOME is strictly refused. Attempt runtime, role runner, and producer preflight now coordinate through `ProducerRuntime`. All six adapter test files stop importing `wrapInvocationWithSeatbelt`, `buildEnvironment`, or `supervise`. +- Added within-process capability probe caching scoped to each run in `src/producers/producer-runtime.ts`. Capability probe results are keyed by `(producerId, resolvedExecutablePath, hostStoreRoot, configRevision)`. In multi-role pipelines, all subsequent role dispatches reuse the cached probe results (yielding 6 probes per run instead of 6·(N+1)), swapped executables between roles are immediately detected as cache misses, and diagnostic checks (`doctor`) always probe fresh (`{ fresh: true }`). +- Minimized Producer startup cost in `src/producers/producer-runtime.ts` and `src/runtime/attempt-runtime.ts` by resolving configuration once, computing writable roots once, and building the sandbox policy once per attempt. Temporary HOME directories are bypassed completely for `inherited-config` lanes (`agy`, `claude`, `pi`, `pythinker`). Measured end-to-end execution on a fixed spec against a fixture repository via `hyperfine` (15.061 s ± 0.869 s across 5 runs, eliminating duplicate sandbox generation and unnecessary temp-HOME allocation). + ## [0.50.0] - 2026-09-02 ### Changed diff --git a/CONTEXT.md b/CONTEXT.md index 41069d5..574178e 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -20,7 +20,7 @@ The kind of work being delegated, such as implementation, review, investigation, ### Producer -An external CLI runtime that performs delegated work. Codex, OpenCode, Pi, and Pythinker are Producers. +An external CLI runtime that performs delegated work. Agy, Claude, Codex, OpenCode, Pi, and Pythinker are Producers. ### Delegation Spec @@ -34,6 +34,14 @@ One execution of a valid Delegation Spec by a selected Producer under an explici The Producer-neutral module that executes a Delegation Attempt. It owns worktree allocation, environment construction, process supervision, timeout and cancellation, artifact collection, failure classification, and result verification orchestration. +### Producer Descriptor + +A declarative specification defining a Producer's identification, executable resolution, CLI argument layout, prompt framing, isolation model, host state requirements, and capabilities. Descriptors parameterize common behavior across adapters, eliminating bespoke duplication. + +### Producer Runtime + +The unified execution layer for Producers. It coordinates capability probing, probe caching within a run, shared prompt rendering, launch planning (computing sandbox policy, environment, and secure temporary HOME only when isolation profiles mandate it), and process supervision with watchdog protection. + ### Producer Adapter An adapter at the Producer seam. It owns Producer discovery, capability observations, invocation construction, and normalization of native events and errors. It does not choose the canonical Failure Classification. @@ -188,7 +196,12 @@ Claude Code |-- SpecValidator |-- ProducerRegistry |-- RoutingPolicy - |-- CapabilityProbe + |-- ProducerRuntime + | |-- ProducerDescriptors (agy, claude, codex, opencode, pi, pythinker) + | |-- HostStoreResolver + | |-- SharedPromptRenderer + | |-- CliProbe (with abnormal-termination guard & run-scoped cache) + | `-- LaunchPlanner & Supervisor |-- AttemptRuntime | |-- WorktreeManager | |-- EnvironmentPolicy @@ -198,11 +211,6 @@ Claude Code | |-- ProcessSupervisor | |-- ArtifactStore | `-- RecoveryManager - |-- ProducerAdapters - | |-- CodexAdapter - | |-- OpenCodeAdapter - | |-- PiAdapter - | `-- PythinkerAdapter |-- AcceptanceVerifier |-- ControlledIntegrator `-- Doctor @@ -214,7 +222,7 @@ Claude Code - A Delegation Spec must identify its objective, relevant context, positive write allowlist, forbidden scope, success criteria, verification commands, execution mode, timeout, Producer preferences, and expected output. - Repository-wide write scope must be explicit rather than implied by an absent allowlist. - The Host supplies an ordered Producer preference list. The Attempt Runtime filters it by required capabilities and selects the first available Producer; learned quality, speed, and cost scoring are deferred. -- Local availability and version probing runs before each P0 attempt, has no intentional side effects, and is not cached across attempts. +- Local availability and version probing runs before each P0 attempt, has no intentional side effects, and is cached within the process for the duration of a run keyed by (producer id, resolved executable path, host-store root, configuration revision). Probes are never cached across process restarts, and diagnostic checks (such as `doctor`) always probe fresh. - Authentication, model availability, and remote capabilities are reported as `unknown` unless the Producer offers a documented local, non-mutating probe. P0 does not contact a remote service merely to complete a Capability Report. - Capability Reports identify the operating system, architecture, environment type such as native Windows or WSL, resolved executable form, and Lane-specific eligibility. Unsupported platforms are reported as `available: false` with a machine-readable reason such as `unsupported-platform`. - Native Windows and WSL capabilities are probed and certified separately. A Producer's WSL support is not evidence of native Windows support. diff --git a/runtime/server.mjs b/runtime/server.mjs index bf27e4c..b083d1e 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -6,6 +6,14 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor; var __getOwnPropNames = Object.getOwnPropertyNames; var __getProtoOf = Object.getPrototypeOf; var __hasOwnProp = Object.prototype.hasOwnProperty; +var __esm = (fn, res, err) => function __init() { + if (err) throw err[0]; + try { + return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res; + } catch (e) { + throw err = [e], e; + } +}; var __commonJS = (cb, mod) => function __require() { try { return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports; @@ -3230,8 +3238,8 @@ var require_utils = __commonJS({ } return ind; } - function removeDotSegments(path32) { - let input = path32; + function removeDotSegments(path33) { + let input = path33; const output = []; let nextSlash = -1; let len = 0; @@ -3483,8 +3491,8 @@ var require_schemes = __commonJS({ wsComponent.secure = void 0; } if (wsComponent.resourceName) { - const [path32, query] = wsComponent.resourceName.split("?"); - wsComponent.path = path32 && path32 !== "/" ? path32 : void 0; + const [path33, query] = wsComponent.resourceName.split("?"); + wsComponent.path = path33 && path33 !== "/" ? path33 : void 0; wsComponent.query = query; wsComponent.resourceName = void 0; } @@ -7720,6 +7728,92 @@ var require__ = __commonJS({ } }); +// src/producers/host-store.ts +import { existsSync as existsSync2, readFileSync, statSync } from "node:fs"; +import { join } from "node:path"; +function isRecord3(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function stringProperty(value, name) { + if (!isRecord3(value)) return void 0; + const property = value[name]; + return typeof property === "string" ? property : void 0; +} +function defaultHasOauthAccount(accountFile) { + if (!existsSync2(accountFile)) return false; + try { + const parsed = JSON.parse(readFileSync(accountFile, "utf8")); + return isRecord3(parsed) && isRecord3(parsed.oauthAccount); + } catch { + return false; + } +} +function resolveHostStoreRoot(descriptor, ctx) { + return descriptor.hostState ? descriptor.hostState.resolveStore(ctx) : null; +} +function isProducerAuthenticated(descriptor, ctx) { + const hostState = descriptor.hostState; + if (!hostState) return false; + if (hostState.apiKeyEnv !== void 0) { + for (const key of hostState.apiKeyEnv) { + const val = ctx.env[key]; + if (val !== void 0 && val.length > 0) return true; + } + } + const store = hostState.resolveStore(ctx); + if (typeof hostState.authMarker === "function") { + return hostState.authMarker(store, ctx); + } + if (typeof hostState.authMarker === "string") { + const checker = ctx.hasAuthStore ?? ((dir) => existsSync2(join(dir, hostState.authMarker))); + return checker(store); + } + return false; +} +function resolveInheritedWritablePaths(descriptor, ctx) { + const hostState = descriptor.hostState; + if (!hostState?.inheritedWritablePaths) return []; + const store = hostState.resolveStore(ctx); + return hostState.inheritedWritablePaths(store, ctx); +} +function resolveDefaultEnv(descriptor, ctx) { + const hostState = descriptor.hostState; + if (!hostState?.defaultEnv) return {}; + const store = hostState.resolveStore(ctx); + return hostState.defaultEnv(store, ctx); +} +function resolveConfigRevision(descriptor, ctx) { + const hostState = descriptor.hostState; + if (!hostState) return ""; + try { + const store = hostState.resolveStore(ctx); + const parts = []; + if (existsSync2(store)) { + parts.push(`store:${statSync(store).mtimeMs}`); + } + if (typeof hostState.authMarker === "string") { + const markerPath = join(store, hostState.authMarker); + if (existsSync2(markerPath)) { + parts.push(`marker:${statSync(markerPath).mtimeMs}`); + } + } + if (hostState.apiKeyEnv) { + for (const envKey of hostState.apiKeyEnv) { + const val = ctx.env[envKey]; + if (val !== void 0 && val.length > 0) parts.push(`${envKey}:${val}`); + } + } + return parts.join(";"); + } catch { + return ""; + } +} +var init_host_store = __esm({ + "src/producers/host-store.ts"() { + "use strict"; + } +}); + // src/index.ts import { pathToFileURL } from "node:url"; @@ -8082,8 +8176,8 @@ function getErrorMap() { // node_modules/zod/v3/helpers/parseUtil.js var makeIssue = (params) => { - const { data, path: path32, errorMaps, issueData } = params; - const fullPath = [...path32, ...issueData.path || []]; + const { data, path: path33, errorMaps, issueData } = params; + const fullPath = [...path33, ...issueData.path || []]; const fullIssue = { ...issueData, path: fullPath @@ -8198,11 +8292,11 @@ var errorUtil; // node_modules/zod/v3/types.js var ParseInputLazyPath = class { - constructor(parent, value, path32, key) { + constructor(parent, value, path33, key) { this._cachedPath = []; this.parent = parent; this.data = value; - this._path = path32; + this._path = path33; this._key = key; } get path() { @@ -12122,10 +12216,10 @@ function mergeDefs(...defs) { function cloneDef(schema) { return mergeDefs(schema._zod.def); } -function getElementAtPath(obj, path32) { - if (!path32) +function getElementAtPath(obj, path33) { + if (!path33) return obj; - return path32.reduce((acc, key) => acc?.[key], obj); + return path33.reduce((acc, key) => acc?.[key], obj); } function promiseAllObject(promisesObj) { const keys = Object.keys(promisesObj); @@ -12534,11 +12628,11 @@ function explicitlyAborted(x, startIndex = 0) { } return false; } -function prefixIssues(path32, issues) { +function prefixIssues(path33, issues) { return issues.map((iss) => { var _a3; (_a3 = iss).path ?? (_a3.path = []); - iss.path.unshift(path32); + iss.path.unshift(path33); return iss; }); } @@ -12685,16 +12779,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) { } function formatError(error51, mapper = (issue2) => issue2.message) { const fieldErrors = { _errors: [] }; - const processError = (error52, path32 = []) => { + const processError = (error52, path33 = []) => { for (const issue2 of error52.issues) { if (issue2.code === "invalid_union" && issue2.errors.length) { - issue2.errors.map((issues) => processError({ issues }, [...path32, ...issue2.path])); + issue2.errors.map((issues) => processError({ issues }, [...path33, ...issue2.path])); } else if (issue2.code === "invalid_key") { - processError({ issues: issue2.issues }, [...path32, ...issue2.path]); + processError({ issues: issue2.issues }, [...path33, ...issue2.path]); } else if (issue2.code === "invalid_element") { - processError({ issues: issue2.issues }, [...path32, ...issue2.path]); + processError({ issues: issue2.issues }, [...path33, ...issue2.path]); } else { - const fullpath = [...path32, ...issue2.path]; + const fullpath = [...path33, ...issue2.path]; if (fullpath.length === 0) { fieldErrors._errors.push(mapper(issue2)); } else { @@ -12721,17 +12815,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) { } function treeifyError(error51, mapper = (issue2) => issue2.message) { const result = { errors: [] }; - const processError = (error52, path32 = []) => { + const processError = (error52, path33 = []) => { var _a3, _b; for (const issue2 of error52.issues) { if (issue2.code === "invalid_union" && issue2.errors.length) { - issue2.errors.map((issues) => processError({ issues }, [...path32, ...issue2.path])); + issue2.errors.map((issues) => processError({ issues }, [...path33, ...issue2.path])); } else if (issue2.code === "invalid_key") { - processError({ issues: issue2.issues }, [...path32, ...issue2.path]); + processError({ issues: issue2.issues }, [...path33, ...issue2.path]); } else if (issue2.code === "invalid_element") { - processError({ issues: issue2.issues }, [...path32, ...issue2.path]); + processError({ issues: issue2.issues }, [...path33, ...issue2.path]); } else { - const fullpath = [...path32, ...issue2.path]; + const fullpath = [...path33, ...issue2.path]; if (fullpath.length === 0) { result.errors.push(mapper(issue2)); continue; @@ -12763,8 +12857,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) { } function toDotPath(_path) { const segs = []; - const path32 = _path.map((seg) => typeof seg === "object" ? seg.key : seg); - for (const seg of path32) { + const path33 = _path.map((seg) => typeof seg === "object" ? seg.key : seg); + for (const seg of path33) { if (typeof seg === "number") segs.push(`[${seg}]`); else if (typeof seg === "symbol") @@ -23876,11 +23970,11 @@ function normalizeObjectSchema(schema) { } return void 0; } -function getDotPath(path32) { - if (path32.length === 0) { +function getDotPath(path33) { + if (path33.length === 0) { return "object root"; } - return path32.reduce((acc, seg, index) => { + return path33.reduce((acc, seg, index) => { if (index === 0) { return String(seg); } @@ -25905,13 +25999,13 @@ function resolveRef(ref, ctx) { if (!ref.startsWith("#")) { throw new Error("External $ref is not supported, only local refs (#/...) are allowed"); } - const path32 = ref.slice(1).split("/").filter(Boolean); - if (path32.length === 0) { + const path33 = ref.slice(1).split("/").filter(Boolean); + if (path33.length === 0) { return ctx.rootSchema; } const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions"; - if (path32[0] === defsKey) { - const key = path32[1]; + if (path33[0] === defsKey) { + const key = path33[1]; if (!key || !ctx.defs[key]) { throw new Error(`Reference not found: ${ref}`); } @@ -31809,7 +31903,7 @@ var StdioServerTransport = class { }; // src/mcp/server.ts -import path31 from "node:path"; +import path32 from "node:path"; // src/protocol/versions.ts var PROTOCOL_VERSION = "2.0.0"; @@ -31842,9 +31936,9 @@ function classifyFailure(s) { // src/mcp/doctor.ts import { createHash as createHash5 } from "node:crypto"; -import { constants as constants4 } from "node:fs"; -import { lstat as lstat4, open as open5, readdir as readdir3, realpath as realpath4 } from "node:fs/promises"; -import path10 from "node:path"; +import { constants as constants5 } from "node:fs"; +import { lstat as lstat5, open as open5, readdir as readdir3, realpath as realpath5 } from "node:fs/promises"; +import path13 from "node:path"; import nodeProcess4 from "node:process"; // src/autopilot/workflow-store.ts @@ -36060,9 +36154,8 @@ function selectSandboxBackend(report) { } // src/producers/agy-adapter.ts -import { existsSync as existsSync2 } from "node:fs"; import { homedir } from "node:os"; -import { join } from "node:path"; +import { join as join2 } from "node:path"; // src/producers/plain-text.ts import { open as open3 } from "node:fs/promises"; @@ -36146,16 +36239,37 @@ function renderSkillBootstrap() { ); } -// src/producers/plain-text.ts -var PLAIN_TEXT_LIMIT = 8e3; +// src/producers/prompt-renderer.ts +var EDIT_ACTION_PREAMBLE = [ + "This is an action-first edit run.", + "Constraints are fully pre-digested in this spec.", + "Do not read repository AGENTS.md, CLAUDE.md, SKILL.md, lessons files, or any repository agent-rule/skill documents; the delegated skill files named below are permitted.", + "Begin by opening the implementation files authorized in the spec.", + "A plan-only final message with zero edits is a failed run." +].join("\n"); +var LINT_BEFORE_TYPECHECK_INSTRUCTION = "If you run linting, formatting, or type checking, complete all linting and formatting first, then run a final type-check covering every typed file you changed, including new or modified tests."; function renderList(values) { return values.length === 0 ? "- (none)" : values.map((value) => `- ${value}`).join("\n"); } -function renderProducerPrompt(spec, readOnly = false) { - return [ +function renderProducerPrompt(spec, options = false) { + let opts; + if (typeof options === "boolean") { + opts = { readOnly: options }; + } else if ("prompt" in options && options.prompt !== void 0) { + opts = { + ...options.prompt, + ...options.readOnly !== void 0 ? { readOnly: options.readOnly } : {} + }; + } else { + opts = options; + } + const readOnly = opts.readOnly === true; + const includeActionPreamble = opts.actionPreamble ?? !readOnly; + const placement = opts.bootstrapPlacement ?? "before"; + const promptBody = [ "You are an untrusted implementation Producer operating inside an isolated worktree.", "Do not delegate to other agents or expand the authorized scope.", - ...readOnly ? [] : ["", renderSkillBootstrap()], + ...readOnly || placement !== "after" ? [] : ["", renderSkillBootstrap()], "", "Objective:", spec.objective, @@ -36172,9 +36286,30 @@ function renderProducerPrompt(spec, readOnly = false) { "Success criteria:", renderList(spec.successCriteria), "", + LINT_BEFORE_TYPECHECK_INSTRUCTION, + "", "Make only the requested edits. Return a concise final summary of the work performed." ].join("\n"); + if (readOnly) { + return promptBody; + } + const prefixParts = []; + if (includeActionPreamble) { + prefixParts.push(EDIT_ACTION_PREAMBLE); + } + if (placement === "before") { + prefixParts.push(renderSkillBootstrap()); + } + if (prefixParts.length === 0) { + return promptBody; + } + return `${prefixParts.join("\n\n")} + +${promptBody}`; } + +// src/producers/plain-text.ts +var PLAIN_TEXT_LIMIT = 8e3; function normalizePlainText(raw) { if (raw.exit.truncated.stdout) { return { @@ -36232,6 +36367,10 @@ function parseSemver(stdout) { const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); return match?.[1] ?? null; } +function selectConfinementBackend(ctx, backendId) { + const backend = SANDBOX_BACKENDS.find((candidate) => candidate.id === backendId && candidate.platforms.some((platform) => platform.os === ctx.os && platform.environmentType === ctx.environmentType && (platform.arch === void 0 || platform.arch === ctx.arch) && (platform.state === "certified" || platform.state === "tested"))); + return backend?.id ?? null; +} function unavailableCapabilityReport(ctx, producerId, structuredOutput, reason, resolvedExecutable = null) { return { producerId, @@ -36272,13 +36411,14 @@ async function probeOsConfinedCli(ctx, probe) { } try { const result = await runVersionProbe(ctx, executable, ["--version"]); - const version2 = result.spawnError === void 0 && result.exitCode === 0 ? (probe.parseVersion ?? parseSemver)(result.stdout) : null; + const isCleanExit = result.spawnError === void 0 && result.exitCode === 0 && result.signal === null && result.timedOut === false && result.cancelled === false; + const version2 = isCleanExit ? (probe.parseVersion ?? parseSemver)(result.stdout) : null; if (version2 === null) return unavailable("probe-failed", executable); if (probe.inspectSurface !== void 0) { const reason = await probe.inspectSurface(ctx, executable); if (reason !== null) return unavailable(reason, executable); } - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); + const writeConfinementBackend = typeof probe.writeConfinementBackend === "function" ? probe.writeConfinementBackend(ctx) : typeof probe.writeConfinementBackend === "string" ? selectConfinementBackend(ctx, probe.writeConfinementBackend) : selectOsWriteConfinementBackend(ctx); return { producerId: probe.producerId, available: true, @@ -36300,19 +36440,32 @@ async function probeOsConfinedCli(ctx, probe) { } // src/producers/agy-adapter.ts +init_host_store(); var AGY_REQUIRED_ENV = ["GEMINI_API_KEY"]; var TEXT_LIMIT = 8e3; -function isRecord3(value) { - return typeof value === "object" && value !== null && !Array.isArray(value); -} -function stringProperty(value, name) { - if (!isRecord3(value)) return void 0; - const property = value[name]; - return typeof property === "string" ? property : void 0; -} function formatPrintTimeout(timeoutMs) { return `${Math.ceil(timeoutMs / 1e3)}s`; } +var agyDescriptor = { + id: "agy", + executable: { name: "agy" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: (deps) => { + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join2(home, ".gemini", "antigravity-cli"); + }, + authMarker: "settings.json", + inheritedWritablePaths: (store) => [store], + apiKeyEnv: ["GEMINI_API_KEY"] + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before" + }, + structuredOutput: true, + executionModes: ["edit"] +}; var AgyAdapter = class { constructor(deps = { env: process.env, @@ -36321,29 +36474,25 @@ var AgyAdapter = class { this.deps = deps; } deps; - producerId = "agy"; - structuredOutput = true; - executionModes = ["edit"]; - hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync2(join(store, "settings.json"))))(directory); - } + producerId = agyDescriptor.id; + structuredOutput = agyDescriptor.structuredOutput; + executionModes = agyDescriptor.executionModes; + descriptor = agyDescriptor; async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "agy", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(this.configDirectory()) + isAuthenticated: () => isProducerAuthenticated(agyDescriptor, this.deps) }); } - /** agy's settings/auth store; the only host state an attempt must write. */ - configDirectory() { - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join(home, ".gemini", "antigravity-cli"); - } buildInvocation(spec, ctx) { const args = [ "-p", - renderProducerPrompt(spec, ctx.readOnly === true), + renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...agyDescriptor.prompt + }), "--add-dir", ctx.worktreePath, "--new-project", @@ -36363,8 +36512,7 @@ var AgyAdapter = class { executable: ctx.executable, args, requiredEnv: [...AGY_REQUIRED_ENV], - inheritedStateWritablePaths: [this.configDirectory()], - // Model sessions must reach the provider API; write-protection remains the confinement goal. + inheritedStateWritablePaths: resolveInheritedWritablePaths(agyDescriptor, this.deps), network: "allowed" }; } @@ -36418,17 +36566,14 @@ var AgyAdapter = class { }; // src/producers/claude-adapter.ts -import { existsSync as existsSync3, readFileSync } from "node:fs"; import { homedir as homedir2 } from "node:os"; -import { join as join2 } from "node:path"; +import { join as join3 } from "node:path"; +init_host_store(); var CLAUDE_REQUIRED_ENV = ["USER", "CLAUDE_CONFIG_DIR", "ANTHROPIC_API_KEY"]; var EDIT_TOOLS = "Read,Edit,Write,Bash,Grep,Glob"; var READ_ONLY_TOOLS = "Read,Grep,Glob"; var EFFORT_LEVELS = /* @__PURE__ */ new Set(["low", "medium", "high", "xhigh", "max"]); var TEXT_LIMIT2 = 8e3; -function isRecord4(value) { - return typeof value === "object" && value !== null && !Array.isArray(value); -} function parseVersion(stdout) { return /^(\d+\.\d+\.\d+(?:[-+][^\s]+)?)\b/u.exec(stdout.trim())?.[1] ?? null; } @@ -36438,20 +36583,46 @@ function parseEnvelope(stdout) { if (start2 < 0) return null; try { const parsed = JSON.parse(trimmed.slice(start2)); - return isRecord4(parsed) && parsed.type === "result" ? parsed : null; + return isRecord3(parsed) && parsed.type === "result" ? parsed : null; } catch { return null; } } -function defaultHasOauthAccount(accountFile) { - if (!existsSync3(accountFile)) return false; - try { - const parsed = JSON.parse(readFileSync(accountFile, "utf8")); - return isRecord4(parsed) && isRecord4(parsed.oauthAccount); - } catch { - return false; - } -} +function resolveClaudeAccountFile(deps) { + const configured = deps.env.CLAUDE_CONFIG_DIR; + if (configured !== void 0 && configured.length > 0) { + return join3(configured, ".claude.json"); + } + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join3(home, ".claude.json"); +} +var claudeDescriptor = { + id: "claude", + executable: { name: "claude" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: (deps) => { + const configured = deps.env.CLAUDE_CONFIG_DIR; + if (configured !== void 0 && configured.length > 0) return configured; + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join3(home, ".claude"); + }, + authMarker: (_store, deps) => { + const apiKey = deps.env.ANTHROPIC_API_KEY; + if (apiKey !== void 0 && apiKey.length > 0) return true; + const accountFile = resolveClaudeAccountFile(deps); + return (deps.hasOauthAccount ?? defaultHasOauthAccount)(accountFile); + }, + inheritedWritablePaths: (store, deps) => [store, resolveClaudeAccountFile(deps)], + apiKeyEnv: ["ANTHROPIC_API_KEY"] + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before" + }, + structuredOutput: true, + executionModes: ["edit"] +}; var REQUIRED_CLAUDE_FLAGS = [ "--no-session-persistence", "--strict-mcp-config", @@ -36465,28 +36636,10 @@ var ClaudeAdapter = class { this.deps = deps; } deps; - producerId = "claude"; - structuredOutput = true; - executionModes = ["edit"]; - /** `~/.claude` (or CLAUDE_CONFIG_DIR): settings, sessions, and local state. */ - configDirectory() { - const configured = this.deps.env.CLAUDE_CONFIG_DIR; - if (configured !== void 0 && configured.length > 0) return configured; - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join2(home, ".claude"); - } - /** `~/.claude.json`: the account record the CLI rewrites on every run. */ - accountFile() { - const configured = this.deps.env.CLAUDE_CONFIG_DIR; - if (configured !== void 0 && configured.length > 0) return join2(configured, ".claude.json"); - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join2(home, ".claude.json"); - } - isAuthenticated() { - const apiKey = this.deps.env.ANTHROPIC_API_KEY; - if (apiKey !== void 0 && apiKey.length > 0) return true; - return (this.deps.hasOauthAccount ?? defaultHasOauthAccount)(this.accountFile()); - } + producerId = claudeDescriptor.id; + structuredOutput = claudeDescriptor.structuredOutput; + executionModes = claudeDescriptor.executionModes; + descriptor = claudeDescriptor; async inspectCliSurface(ctx, executable) { let helpResult; try { @@ -36513,7 +36666,7 @@ ${helpResult.stderr}`; structuredOutput: this.structuredOutput, parseVersion, inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), - isAuthenticated: () => this.isAuthenticated() + isAuthenticated: () => isProducerAuthenticated(claudeDescriptor, this.deps) }); } buildInvocation(spec, ctx) { @@ -36528,19 +36681,12 @@ ${helpResult.stderr}`; "-p", "--output-format", "json", - // Fresh context per attempt is a trust invariant: nothing is resumable. "--no-session-persistence", - // No MCP servers at all — in particular not this plugin's own runtime, - // which would otherwise hand the Producer a nested `delegate` tool. "--strict-mcp-config", - // Skip user, project, and local settings: their hooks and permission - // grants are host-side behavior that must not run inside an attempt. "--setting-sources", "", "--disable-slash-commands", - // Write confinement is the host Seatbelt profile, not the permission prompt. "--dangerously-skip-permissions", - // Built-ins only: no Agent (no nested subagents), no web, no artifacts. "--tools", readOnly ? READ_ONLY_TOOLS : EDIT_TOOLS ]; @@ -36553,10 +36699,12 @@ ${helpResult.stderr}`; return { executable: ctx.executable, args, - stdin: renderProducerPrompt(spec, readOnly), + stdin: renderProducerPrompt(spec, { + readOnly, + ...claudeDescriptor.prompt + }), requiredEnv: [...CLAUDE_REQUIRED_ENV], - inheritedStateWritablePaths: [this.configDirectory(), this.accountFile()], - // Model sessions must reach the provider API; write-protection remains the confinement goal. + inheritedStateWritablePaths: resolveInheritedWritablePaths(claudeDescriptor, this.deps), network: "allowed" }; } @@ -36595,8 +36743,6 @@ ${helpResult.stderr}`; behavioralConfigSources: [ "explicit invocation argv (user/project/local settings, hooks, MCP servers, and skills are all disabled)" ], - // `--setting-sources ""` also turns off CLAUDE.md/AGENTS.md discovery - // (confirmed live): the Producer sees only the rendered spec. repositoryInstructionSources: [], environmentDependencies: [...CLAUDE_REQUIRED_ENV], temporaryHomeStrategy: "real HOME inherited by declared policy (OAuth state in ~/.claude.json is not HOME-redirectable); reduced reproducibility recorded in the Run Manifest" @@ -36606,10 +36752,10 @@ ${helpResult.stderr}`; // src/producers/codex-adapter.ts import { execFileSync } from "node:child_process"; -import { existsSync as existsSync4, realpathSync } from "node:fs"; -import { open as open4 } from "node:fs/promises"; +import { existsSync as existsSync3, realpathSync } from "node:fs"; import { homedir as homedir3, tmpdir as tmpdir4 } from "node:os"; -import { join as join3 } from "node:path"; +import { join as join4 } from "node:path"; +init_host_store(); var CODEX_REQUIRED_ENV = [ "CODEX_HOME", "CODEX_API_KEY", @@ -36632,7 +36778,7 @@ function resolveDarwinUserTempDirectory() { try { const raw = execFileSync("/usr/bin/getconf", ["DARWIN_USER_TEMP_DIR"], { encoding: "utf8", - timeout: VERSION_TIMEOUT_MS2 + timeout: 1e4 }).trim(); darwinUserTempDirectory = raw.length === 0 ? realpathSync(tmpdir4()) : realpathSync(raw); } catch { @@ -36649,113 +36795,33 @@ function sandboxSupportWritableRoots(platform) { const temporaryDirectory = resolveDarwinUserTempDirectory(); return temporaryDirectory === null ? [] : [temporaryDirectory]; } -var VERSION_TIMEOUT_MS2 = 1e4; -var VERSION_OUTPUT_LIMIT2 = 64 * 1024; -function isRecord5(value) { - return typeof value === "object" && value !== null && !Array.isArray(value); -} -function stringProperty2(value, name) { - if (!isRecord5(value)) return void 0; - const property = value[name]; - return typeof property === "string" ? property : void 0; -} -function unavailableReport(ctx, reason, resolvedExecutable = null) { - return { - producerId: "codex", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: true, - writeConfinementBackend: null, - laneEligibility: { edit: false } - }; -} function parseVersion2(stdout) { const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); return match?.[1] ?? null; } -function selectCodexWriteConfinementBackend(ctx) { - const backend = SANDBOX_BACKENDS.find((candidate) => candidate.id === "codex-native-sandbox" && candidate.platforms.some((platform) => platform.os === ctx.os && platform.environmentType === ctx.environmentType && (platform.arch === void 0 || platform.arch === ctx.arch) && (platform.state === "certified" || platform.state === "tested"))); - return backend?.id ?? null; -} -async function normalizeCodexExecutable(executable) { - if (executable.kind !== "native") return executable; - let handle; - try { - handle = await open4(executable.command, "r"); - const buffer = Buffer.alloc(256); - const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0); - const firstLine = buffer.subarray(0, bytesRead).toString("utf8").split(/\r?\n/u, 1)[0] ?? ""; - if (!/^#![^\r\n]*\bnode(?:\s|$)/u.test(firstLine)) return executable; - return { - kind: "node-entrypoint", - command: process.execPath, - prefixArgs: [executable.command, ...executable.prefixArgs], - resolvedFrom: `${executable.resolvedFrom};node:${process.execPath}` - }; - } catch { - return executable; - } finally { - await handle?.close(); - } -} function quoteTomlString(value) { return JSON.stringify(value); } -function renderList2(values) { - return values.length === 0 ? "- (none)" : values.map((value) => `- ${value}`).join("\n"); -} -var CODEX_EDIT_ACTION_PREAMBLE = [ - "This is an action-first edit run.", - "Constraints are fully pre-digested in this spec.", - "Do not read repository AGENTS.md, CLAUDE.md, SKILL.md, lessons files, or any repository agent-rule/skill documents; the delegated skill files named below are permitted.", - "Begin by opening the implementation files authorized in the spec.", - "A plan-only final message with zero edits is a failed run." -].join("\n"); -function renderPrompt(spec, readOnly) { - const prompt = [ - "You are an untrusted implementation Producer operating inside an isolated worktree.", - "Do not delegate to other agents or expand the authorized scope.", - "", - "Objective:", - spec.objective, - "", - "Context:", - spec.context, - "", - "Authorized write allowlist:", - renderList2(spec.writeAllowlist), - "", - "Forbidden scope:", - renderList2(spec.forbiddenScope), - "", - "Success criteria:", - renderList2(spec.successCriteria), - "", - "If you run linting, formatting, or type checking, complete all linting and formatting first, then run a final type-check covering every typed file you changed, including new or modified tests.", - "", - "Make only the requested edits. Return a concise final summary of the work performed." - ].join("\n"); - return readOnly ? prompt : `${CODEX_EDIT_ACTION_PREAMBLE} - -${renderSkillBootstrap()} - -${prompt}`; -} -function resolveCodexStore(deps) { - return deps.env.CODEX_HOME ?? join3(deps.homeDirectory, ".codex"); -} -function defaultCodexEnv(deps) { - if (deps.env.CODEX_HOME !== void 0) return {}; - const store = resolveCodexStore(deps); - return deps.hasAuthStore(store) ? { CODEX_HOME: store } : {}; -} +var codexDescriptor = { + id: "codex", + executable: { name: "codex" }, + isolation: "controlled-config-with-copied-credentials", + hostState: { + resolveStore: (deps) => deps.env.CODEX_HOME ?? join4(deps.homeDirectory, ".codex"), + authMarker: "auth.json", + defaultEnv: (store, deps) => { + if (deps.env.CODEX_HOME !== void 0) return {}; + const hasAuth = (deps.hasAuthStore ?? ((dir) => existsSync3(join4(dir, "auth.json"))))(store); + return hasAuth ? { CODEX_HOME: store } : {}; + } + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before" + }, + structuredOutput: true, + executionModes: ["edit"] +}; var CodexAdapter = class { constructor(deps = { env: process.env, @@ -36764,51 +36830,19 @@ var CodexAdapter = class { this.deps = deps; } deps; - producerId = "codex"; - hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync4(join3(store, "auth.json"))))(directory); - } + producerId = codexDescriptor.id; + structuredOutput = codexDescriptor.structuredOutput; + executionModes = codexDescriptor.executionModes; + descriptor = codexDescriptor; async probe(ctx) { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); - let executable; - try { - executable = await normalizeCodexExecutable( - await ctx.ps.resolveExecutable({ name: "codex" }) - ); - } catch { - return unavailableReport(ctx, "missing-executable"); - } - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS2, - maxOutputBytes: VERSION_OUTPUT_LIMIT2 - }, {}); - const version2 = result.spawnError === void 0 && result.exitCode === 0 && result.signal === null && result.timedOut === false && result.cancelled === false ? parseVersion2(result.stdout) : null; - if (version2 === null) return unavailableReport(ctx, "probe-failed", executable); - const writeConfinementBackend = selectCodexWriteConfinementBackend(ctx); - const authState = this.hasAuthStore(resolveCodexStore(this.deps)) ? "authenticated" : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version: version2, - authState, - executionModes: ["edit"], - structuredOutput: true, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null } - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); - } + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "codex", + structuredOutput: this.structuredOutput, + writeConfinementBackend: "codex-native-sandbox", + parseVersion: parseVersion2, + isAuthenticated: () => isProducerAuthenticated(codexDescriptor, this.deps) + }); } buildInvocation(spec, ctx) { const redirectedGitObjects = ctx.gitObjectDirectory !== void 0 && ctx.gitAlternateObjectDirectories !== void 0; @@ -36884,15 +36918,14 @@ var CodexAdapter = class { ); } args.push("-"); - const defaultEnv = defaultCodexEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - hasAuthStore: (directory) => this.hasAuthStore(directory) - }); + const defaultEnv = resolveDefaultEnv(codexDescriptor, this.deps); return { executable: ctx.executable, args, - stdin: renderPrompt(spec, ctx.readOnly === true), + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...codexDescriptor.prompt + }), requiredEnv: [...CODEX_REQUIRED_ENV], env: { ...defaultEnv, @@ -36917,7 +36950,7 @@ var CodexAdapter = class { try { for (const line of lines) { const parsed = JSON.parse(line); - if (!isRecord5(parsed) || typeof parsed.type !== "string") { + if (!isRecord3(parsed) || typeof parsed.type !== "string") { return { events: [], producerSummary: null, ok: false }; } if (parsed.type === "turn.completed") { @@ -36926,7 +36959,7 @@ var CodexAdapter = class { } if (parsed.type === "error" || parsed.type === "turn.failed") { failed = true; - const text = stringProperty2(parsed, "message") ?? stringProperty2(parsed.error, "message"); + const text = stringProperty(parsed, "message") ?? stringProperty(parsed.error, "message"); events.push({ kind: "error", ...text === void 0 ? {} : { text }, @@ -36936,9 +36969,9 @@ var CodexAdapter = class { } if (parsed.type !== "item.completed") continue; const item = parsed.item; - const itemType = stringProperty2(item, "type"); + const itemType = stringProperty(item, "type"); if (itemType === "agent_message") { - const text = stringProperty2(item, "text"); + const text = stringProperty(item, "text"); if (text === void 0) return { events: [], producerSummary: null, ok: false }; producerSummary = text; events.push({ kind: "final", text, raw: parsed }); @@ -36973,15 +37006,40 @@ var CodexAdapter = class { }; // src/producers/opencode-adapter.ts -import { existsSync as existsSync5 } from "node:fs"; +import { existsSync as existsSync4 } from "node:fs"; import { homedir as homedir4 } from "node:os"; -import { join as join4 } from "node:path"; +import { join as join5 } from "node:path"; +init_host_store(); var OPENCODE_REQUIRED_ENV = ["OPENCODE_CONFIG_DIR", "XDG_DATA_HOME"]; -function defaultOpenCodeEnv(deps) { - if (deps.env.XDG_DATA_HOME !== void 0) return {}; - const dataHome = join4(deps.homeDirectory, ".local", "share"); - return deps.hasAuthStore(join4(dataHome, "opencode")) ? { XDG_DATA_HOME: dataHome } : {}; -} +var openCodeDescriptor = { + id: "opencode", + executable: { name: "opencode" }, + isolation: "controlled-config-with-copied-credentials", + hostState: { + resolveStore: (deps) => { + const dataHome = deps.env.XDG_DATA_HOME ?? join5(deps.homeDirectory, ".local", "share"); + return join5(dataHome, "opencode"); + }, + authMarker: "auth.json", + inheritedWritablePaths: (store, deps) => { + const stateHome = deps.env.XDG_STATE_HOME ?? join5(deps.homeDirectory, ".local", "state"); + return [store, join5(stateHome, "opencode")]; + }, + defaultEnv: (_store, deps) => { + if (deps.env.XDG_DATA_HOME !== void 0) return {}; + const dataHome = join5(deps.homeDirectory, ".local", "share"); + const dataDir = join5(dataHome, "opencode"); + const hasAuth = (deps.hasAuthStore ?? ((dir) => existsSync4(join5(dir, "auth.json"))))(dataDir); + return hasAuth ? { XDG_DATA_HOME: dataHome } : {}; + } + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before" + }, + structuredOutput: false, + executionModes: ["edit"] +}; var OpenCodeAdapter = class { constructor(deps = { env: process.env, @@ -36990,30 +37048,18 @@ var OpenCodeAdapter = class { this.deps = deps; } deps; - producerId = "opencode"; - structuredOutput = false; - executionModes = ["edit"]; - hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync5(join4(store, "auth.json"))))(directory); - } - /** OpenCode's XDG data directory (where auth.json lives), honoring XDG_DATA_HOME. */ - dataDirectory() { - const dataHome = this.deps.env.XDG_DATA_HOME ?? join4(this.deps.homeDirectory, ".local", "share"); - return join4(dataHome, "opencode"); - } + producerId = openCodeDescriptor.id; + structuredOutput = openCodeDescriptor.structuredOutput; + executionModes = openCodeDescriptor.executionModes; + descriptor = openCodeDescriptor; async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "opencode", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(this.dataDirectory()) + isAuthenticated: () => isProducerAuthenticated(openCodeDescriptor, this.deps) }); } - /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ - stateDirectories() { - const stateHome = this.deps.env.XDG_STATE_HOME ?? join4(this.deps.homeDirectory, ".local", "state"); - return [this.dataDirectory(), join4(stateHome, "opencode")]; - } buildInvocation(spec, ctx) { const args = [ "run", @@ -37031,15 +37077,13 @@ var OpenCodeAdapter = class { return { executable: ctx.executable, args, - stdin: renderProducerPrompt(spec, ctx.readOnly === true), - requiredEnv: [...OPENCODE_REQUIRED_ENV], - inheritedStateWritablePaths: this.stateDirectories(), - env: defaultOpenCodeEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - hasAuthStore: (directory) => this.hasAuthStore(directory) + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...openCodeDescriptor.prompt }), - // Model sessions must reach the provider API; write-protection remains the confinement goal. + requiredEnv: [...OPENCODE_REQUIRED_ENV], + inheritedStateWritablePaths: resolveInheritedWritablePaths(openCodeDescriptor, this.deps), + env: resolveDefaultEnv(openCodeDescriptor, this.deps), network: "allowed" }; } @@ -37059,14 +37103,36 @@ var OpenCodeAdapter = class { }; // src/producers/pi-adapter.ts -import { existsSync as existsSync6 } from "node:fs"; +import { existsSync as existsSync5 } from "node:fs"; import { homedir as homedir5 } from "node:os"; -import { join as join5 } from "node:path"; +import { join as join6 } from "node:path"; +init_host_store(); var PI_REQUIRED_ENV = ["PI_API_KEY"]; -function defaultPiEnv(deps) { - if (deps.env.HOME !== void 0) return {}; - return deps.hasConfigDir(join5(deps.homeDirectory, ".pi")) ? { HOME: deps.homeDirectory } : {}; -} +var piDescriptor = { + id: "pi", + executable: { name: "pi" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: (deps) => { + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join6(home, ".pi", "agent"); + }, + authMarker: "auth.json", + inheritedWritablePaths: (store) => [store], + defaultEnv: (_store, deps) => { + if (deps.env.HOME !== void 0) return {}; + const configDir = join6(deps.homeDirectory, ".pi"); + const hasConfig = (deps.hasConfigDir ?? existsSync5)(configDir); + return hasConfig ? { HOME: deps.homeDirectory } : {}; + } + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before" + }, + structuredOutput: false, + executionModes: ["edit"] +}; var PiAdapter = class { constructor(deps = { env: process.env, @@ -37075,28 +37141,18 @@ var PiAdapter = class { this.deps = deps; } deps; - producerId = "pi"; - structuredOutput = false; - executionModes = ["edit"]; - hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync6(join5(store, "auth.json"))))(directory); - } - hasConfigDir(directory) { - return existsSync6(directory); - } + producerId = piDescriptor.id; + structuredOutput = piDescriptor.structuredOutput; + executionModes = piDescriptor.executionModes; + descriptor = piDescriptor; async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "pi", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(this.agentStateDirectory()) + isAuthenticated: () => isProducerAuthenticated(piDescriptor, this.deps) }); } - /** Pi's auth + settings store; the only host state an attempt must write. */ - agentStateDirectory() { - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join5(home, ".pi", "agent"); - } buildInvocation(spec, ctx) { if (spec.producerOverrides?.model !== void 0) { throw new Error( @@ -37116,15 +37172,13 @@ var PiAdapter = class { return { executable: ctx.executable, args, - stdin: renderProducerPrompt(spec, ctx.readOnly === true), - requiredEnv: [...PI_REQUIRED_ENV], - inheritedStateWritablePaths: [this.agentStateDirectory()], - env: defaultPiEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - hasConfigDir: (directory) => this.hasConfigDir(directory) + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...piDescriptor.prompt }), - // Model sessions must reach the provider API; write-protection remains the confinement goal. + requiredEnv: [...PI_REQUIRED_ENV], + inheritedStateWritablePaths: resolveInheritedWritablePaths(piDescriptor, this.deps), + env: resolveDefaultEnv(piDescriptor, this.deps), network: "allowed" }; } @@ -37144,9 +37198,10 @@ var PiAdapter = class { }; // src/producers/pythinker-adapter.ts -import { existsSync as existsSync7 } from "node:fs"; +import { existsSync as existsSync6 } from "node:fs"; import { homedir as homedir6 } from "node:os"; -import { join as join6 } from "node:path"; +import { join as join7 } from "node:path"; +init_host_store(); var REQUIRED_LONG_OPTIONS = ["--prompt", "--model"]; function parseLongOptionTokens(helpText) { const options = /* @__PURE__ */ new Set(); @@ -37160,18 +37215,35 @@ var PYTHINKER_NO_AUTO_UPDATE_ENV = "PYTHINKER_CLI_NO_AUTO_UPDATE"; var PYTHINKER_REQUIRED_ENV = ["PYTHINKER_SHARE_DIR", PYTHINKER_NO_AUTO_UPDATE_ENV]; function resolvePythinkerHome(deps) { const configuredHome = deps.env.PYTHINKER_SHARE_DIR; - return configuredHome !== void 0 && configuredHome.length > 0 ? configuredHome : join6(deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory, ".pythinker"); -} -function defaultPythinkerEnv(deps) { - const env = {}; - if (deps.env.HOME === void 0 && deps.hasConfigDir(deps.pythinkerHome)) { - env.HOME = deps.homeDirectory; - } - if (deps.env[PYTHINKER_NO_AUTO_UPDATE_ENV] === void 0) { - env[PYTHINKER_NO_AUTO_UPDATE_ENV] = "1"; - } - return env; -} + return configuredHome !== void 0 && configuredHome.length > 0 ? configuredHome : join7(deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory, ".pythinker"); +} +var pythinkerDescriptor = { + id: "pythinker", + executable: { name: "pythinker" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: (deps) => resolvePythinkerHome(deps), + authMarker: join7("credentials", "pythinker-code.json"), + inheritedWritablePaths: (store) => [store], + defaultEnv: (store, deps) => { + const env = {}; + if (deps.env.HOME === void 0) { + const hasConfig = (deps.hasConfigDir ?? existsSync6)(store); + if (hasConfig) env.HOME = deps.homeDirectory; + } + if (deps.env[PYTHINKER_NO_AUTO_UPDATE_ENV] === void 0) { + env[PYTHINKER_NO_AUTO_UPDATE_ENV] = "1"; + } + return env; + } + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before" + }, + structuredOutput: false, + executionModes: ["edit"] +}; var PythinkerAdapter = class { constructor(deps = { env: process.env, @@ -37180,17 +37252,10 @@ var PythinkerAdapter = class { this.deps = deps; } deps; - producerId = "pythinker"; - structuredOutput = false; - executionModes = ["edit"]; - hasAuthStore(directory) { - return (this.deps.hasAuthStore ?? ((store) => existsSync7( - join6(store, "credentials", "pythinker-code.json") - )))(directory); - } - hasConfigDir(directory) { - return existsSync7(directory); - } + producerId = pythinkerDescriptor.id; + structuredOutput = pythinkerDescriptor.structuredOutput; + executionModes = pythinkerDescriptor.executionModes; + descriptor = pythinkerDescriptor; async probe(ctx) { return probeOsConfinedCli(ctx, { producerId: this.producerId, @@ -37198,10 +37263,9 @@ var PythinkerAdapter = class { structuredOutput: this.structuredOutput, parseVersion: (stdout) => parseSemver(stdout) ?? /\d+\.\d+\.\d+(?:[-+][^\s]+)?/u.exec(stdout)?.[0] ?? null, inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), - isAuthenticated: () => this.hasAuthStore(resolvePythinkerHome(this.deps)) + isAuthenticated: () => isProducerAuthenticated(pythinkerDescriptor, this.deps) }); } - /** The installed CLI must expose every long option this adapter emits. */ async inspectCliSurface(ctx, executable) { let helpResult; try { @@ -37224,7 +37288,10 @@ ${helpResult.stderr}`); } const args = [ "--prompt", - renderProducerPrompt(spec, ctx.readOnly === true) + renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...pythinkerDescriptor.prompt + }) ]; if (spec.producerOverrides?.model !== void 0) { args.push("--model", spec.producerOverrides.model); @@ -37233,14 +37300,8 @@ ${helpResult.stderr}`); executable: ctx.executable, args, requiredEnv: [...PYTHINKER_REQUIRED_ENV], - inheritedStateWritablePaths: [resolvePythinkerHome(this.deps)], - env: defaultPythinkerEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - pythinkerHome: resolvePythinkerHome(this.deps), - hasConfigDir: (directory) => this.hasConfigDir(directory) - }), - // Model sessions must reach the provider API; write-protection remains the confinement goal. + inheritedStateWritablePaths: resolveInheritedWritablePaths(pythinkerDescriptor, this.deps), + env: resolveDefaultEnv(pythinkerDescriptor, this.deps), network: "allowed" }; } @@ -37277,23 +37338,13 @@ var ProducerRegistry = class { }; var registry2 = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), new PiAdapter(), new PythinkerAdapter(), new AgyAdapter(), new ClaudeAdapter()]); -// src/producers/capability-probe.ts -async function probeAll(ctx, producerRegistry = registry2) { - return Promise.all(producerRegistry.all().map((adapter) => adapter.probe(ctx))); -} +// src/producers/producer-runtime.ts +import { existsSync as existsSync7, statSync as statSync2 } from "node:fs"; +import { homedir as homedir8 } from "node:os"; +import path10 from "node:path"; -// src/producers/producer-adapter.ts -import { readFileSync as readFileSync2 } from "node:fs"; -function detectEnvironmentType(readProcVersion = () => readFileSync2("/proc/version", "utf8")) { - if (process.platform !== "linux") return "native"; - try { - const version2 = readProcVersion().trim().toLowerCase(); - if (version2.includes("microsoft")) return "wsl"; - return /^linux version(?:\s|$)/.test(version2) ? "native" : "wsl"; - } catch { - return "wsl"; - } -} +// src/runtime/environment-policy.ts +import path8 from "node:path"; // src/runtime/redaction.ts var registeredSecrets = /* @__PURE__ */ new Map(); @@ -37425,11 +37476,719 @@ function redactValues(obj) { return redactValue(obj, false); } +// src/runtime/environment-policy.ts +var POSIX_ESSENTIAL_ENV = [ + "HOME", + "PATH", + "TMPDIR", + "LANG", + "LC_ALL", + "XDG_CONFIG_HOME", + "XDG_CACHE_HOME", + "XDG_DATA_HOME", + "XDG_STATE_HOME", + "XDG_RUNTIME_DIR" +]; +var WIN32_ESSENTIAL_ENV = [ + "SystemRoot", + "ComSpec", + "TEMP", + "TMP", + "USERPROFILE", + "APPDATA", + "LOCALAPPDATA", + "Path" +]; +var SENSITIVE_ENV_NAME = /^(?:[A-Za-z][A-Za-z0-9]*_)*(?:TOKEN|SECRET|PASSWORD|KEY|CREDENTIAL|PAT|COOKIE|DSN)(?:_[A-Za-z0-9]+)*$/i; +var COMMON_SENSITIVE_ENV_NAMES = /* @__PURE__ */ new Set([ + "DATABASE_URL", + "GOOGLE_APPLICATION_CREDENTIALS", + "MYSQL_PWD", + "PGPASSWORD", + "REDISCLI_AUTH" +]); +function normalizeEnvironmentName(name) { + return name.replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z0-9])([A-Z])/g, "$1_$2").toUpperCase(); +} +function isSensitiveEnvironmentName(name) { + const normalized = normalizeEnvironmentName(name); + return SENSITIVE_ENV_NAME.test(normalized) || COMMON_SENSITIVE_ENV_NAMES.has(normalized); +} +function validateEnvironmentName(name) { + if (name.length === 0 || name.includes("=") || name.includes("\0")) { + throw new RuntimeError(`invalid environment variable name: ${JSON.stringify(name)}`); + } +} +function validateEnvironmentValue(name, value) { + if (value.includes("\0")) { + throw new RuntimeError(`invalid environment variable value for ${JSON.stringify(name)}`); + } +} +function combineSecretRegistrations(registrations) { + let active = true; + return { + dispose() { + if (!active) return; + active = false; + for (const registration of registrations) registration.dispose(); + } + }; +} +function registerSensitiveValues(environment, validateEntries) { + const registrations = []; + try { + for (const [name, value] of Object.entries(environment)) { + if (value === void 0) continue; + if (validateEntries) { + validateEnvironmentName(name); + validateEnvironmentValue(name, value); + } + if (isSensitiveEnvironmentName(name)) { + registrations.push(registerSecretValue(value)); + } + } + return combineSecretRegistrations(registrations); + } catch (error51) { + combineSecretRegistrations(registrations).dispose(); + throw error51; + } +} +function registerSensitiveEnvironment(environment) { + return registerSensitiveValues(environment, true); +} +function setEnvironmentValue(environment, provenance, name, value, source) { + validateEnvironmentName(name); + validateEnvironmentValue(name, value); + Object.defineProperty(environment, name, { + value, + writable: true, + enumerable: true, + configurable: true + }); + provenance.set(name, source); +} +function compareNames(left, right) { + return left < right ? -1 : left > right ? 1 : 0; +} +function buildEnvironment(args) { + const env = {}; + const provenance = /* @__PURE__ */ new Map(); + const hostSecretRegistration = registerSensitiveValues(process.env, false); + try { + const platformEnvironment = args.os === "win32" ? normalizeWindowsEnv(process.env) : process.env; + const platformNames = args.os === "win32" ? WIN32_ESSENTIAL_ENV : POSIX_ESSENTIAL_ENV; + for (const name of platformNames) { + if (args.tempHome !== void 0 && name.startsWith("XDG_")) continue; + const value = platformEnvironment[name]; + if (value !== void 0) { + setEnvironmentValue(env, provenance, name, value, "platform"); + } + } + if (args.tempHome !== void 0) { + if (args.os === "win32") { + setEnvironmentValue(env, provenance, "USERPROFILE", args.tempHome, "platform"); + setEnvironmentValue( + env, + provenance, + "APPDATA", + path8.win32.join(args.tempHome, "AppData", "Roaming"), + "platform" + ); + setEnvironmentValue( + env, + provenance, + "LOCALAPPDATA", + path8.win32.join(args.tempHome, "AppData", "Local"), + "platform" + ); + } else { + setEnvironmentValue(env, provenance, "HOME", args.tempHome, "platform"); + } + } + for (const name of args.adapterAllowlist) { + validateEnvironmentName(name); + if (args.os !== "win32" && args.tempHome !== void 0 && name.startsWith("XDG_")) continue; + if (!Object.prototype.hasOwnProperty.call(process.env, name)) continue; + const value = process.env[name]; + if (value !== void 0) { + setEnvironmentValue(env, provenance, name, value, "adapter"); + } + } + for (const [name, value] of Object.entries(args.adapterValues ?? {})) { + validateEnvironmentName(name); + if (args.os !== "win32" && args.tempHome !== void 0 && name.startsWith("XDG_")) continue; + if (Object.prototype.hasOwnProperty.call(env, name)) continue; + setEnvironmentValue(env, provenance, name, value, "adapter"); + } + for (const [name, value] of Object.entries(args.specAdditions ?? {})) { + setEnvironmentValue(env, provenance, name, value, "spec"); + } + setEnvironmentValue( + env, + provenance, + "CLAUDE_ARCHITECT_DELEGATED", + "1", + "platform" + ); + const environmentSecretRegistration = registerSensitiveEnvironment(env); + return { + env, + provenance: [...provenance.entries()].map(([name, source]) => ({ name, source })).sort((left, right) => compareNames(left.name, right.name)), + secretRegistration: combineSecretRegistrations([ + hostSecretRegistration, + environmentSecretRegistration + ]) + }; + } catch (error51) { + hostSecretRegistration.dispose(); + throw error51; + } +} + +// src/platform/sandbox/seatbelt.ts +import { realpathSync as realpathSync2 } from "node:fs"; +import { homedir as homedir7 } from "node:os"; +import { isAbsolute, normalize, parse as parse3, relative, resolve } from "node:path"; +function buildReadOnlySeatbeltPolicy(args) { + return { + worktreePath: "", + tempHome: args.tempHome, + // Read-only roles ARE model sessions: they must reach the provider API. + // The confinement goal here is write-protection, not offline isolation — + // matching the edit lane, where Codex's native sandbox permits its own + // API traffic while denying out-of-worktree writes. + allowNetwork: true + }; +} +function buildWriteSeatbeltPolicy(args) { + return { + worktreePath: args.worktreePath, + tempHome: args.tempHome, + allowNetwork: true, + extraWritableRoots: [...args.extraWritableRoots] + }; +} +function sbPath(path33) { + for (const character of path33) { + const codePoint = character.codePointAt(0); + if (codePoint !== void 0 && (codePoint < 32 || codePoint === 127)) { + throw new Error(`seatbelt: control character in path: ${JSON.stringify(path33)}`); + } + } + return `"${path33.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; +} +function isDeclaredStateRoot(normalized, invocation, policy) { + const roots = []; + const homeCandidates = [ + invocation.env?.HOME, + invocation.env?.USERPROFILE, + process.env.HOME, + process.env.USERPROFILE + ]; + try { + homeCandidates.push(homedir7()); + } catch { + } + for (const candidate of homeCandidates) { + if (typeof candidate === "string" && candidate.length > 0 && candidate !== "/") { + roots.push(resolve(candidate)); + } + } + const stateEnvs = [ + "CLAUDE_CONFIG_DIR", + "OPENCODE_CONFIG_DIR", + "XDG_DATA_HOME", + "XDG_STATE_HOME", + "XDG_CONFIG_HOME", + "PI_CONFIG_DIR", + "PYTHINKER_SHARE_DIR", + "GEMINI_CLI_HOME" + ]; + for (const envKey of stateEnvs) { + const val = invocation.env?.[envKey] ?? process.env[envKey]; + if (typeof val === "string" && val.length > 0 && val !== "/") { + roots.push(resolve(val)); + } + } + if (policy.extraWritableRoots) { + for (const root of policy.extraWritableRoots) { + if (typeof root === "string" && root.length > 0 && root !== "/") { + roots.push(resolve(root)); + } + } + } + for (const root of roots) { + if (normalized === root) return true; + const rel = relative(root, normalized); + if (!rel.startsWith("..") && !isAbsolute(rel)) return true; + } + const userHomePattern = /^(\/Users\/[^/]+|\/home\/[^/]+|\/root)(?:\/.*)?$/u; + const winUserHomePattern = /^[a-zA-Z]:\\Users\\[^\\]+(?:\\.*)?$/u; + return userHomePattern.test(normalized) || winUserHomePattern.test(normalized); +} +function isValidInheritedStatePath(path33, invocation, policy) { + if (typeof path33 !== "string" || path33.trim().length === 0) return false; + if (!isAbsolute(path33)) return false; + const parsed = parse3(path33); + if (path33 === "/" || path33 === parsed.root) return false; + const normalized = normalize(path33); + if (normalized === "/" || normalized === parsed.root) return false; + if (resolve(path33) === "/" || resolve(path33) === parsed.root) return false; + return isDeclaredStateRoot(normalized, invocation, policy); +} +function inheritedStateWritablePaths(invocation, policy) { + if (policy.tempHome !== null) return []; + const declared = invocation.inheritedStateWritablePaths; + if (!declared || declared.length === 0) return []; + for (const entry of declared) { + if (!isValidInheritedStatePath(entry, invocation, policy)) { + return []; + } + } + return [...declared]; +} +function buildProfile(policy, additionalWritable) { + const writable = [...new Set([ + policy.worktreePath, + policy.tempHome, + process.env.TMPDIR ?? "/private/tmp", + "/private/tmp", + "/dev", + ...policy.extraWritableRoots ?? [], + ...additionalWritable + ].filter((path33) => typeof path33 === "string" && path33.length > 0).flatMap((path33) => { + try { + return [path33, realpathSync2(path33)]; + } catch { + return [path33]; + } + }))]; + const lines = [ + "(version 1)", + "(allow default)", + "(deny file-write*)", + ...writable.map((path33) => `(allow file-write* (subpath ${sbPath(path33)}))`), + '(allow file-write* (literal "/dev/null") (literal "/dev/tty"))' + ]; + if (!policy.allowNetwork) lines.push("(deny network*)"); + return lines.join("\n"); +} +function wrapInvocationWithSeatbelt(invocation, policy) { + const profile = buildProfile(policy, inheritedStateWritablePaths(invocation, policy)); + const inner = [ + invocation.executable.command, + ...invocation.executable.prefixArgs, + ...invocation.args + ]; + return { + ...invocation, + executable: { + kind: "native", + command: "/usr/bin/sandbox-exec", + prefixArgs: [], + resolvedFrom: `seatbelt:${invocation.executable.resolvedFrom}` + }, + args: ["-p", profile, ...inner] + }; +} + +// src/runtime/run-start.ts +import { randomUUID as randomUUID2 } from "node:crypto"; +import { constants as constants4 } from "node:fs"; +import { + access as access2, + lstat as lstat4, + open as open4, + realpath as realpath4, + rename as rename2, + rm as rm2 +} from "node:fs/promises"; +import path9 from "node:path"; +import { fileURLToPath as fileURLToPath4 } from "node:url"; +var NO_FOLLOW2 = constants4.O_NOFOLLOW ?? 0; +function errorCode4(error51) { + return error51.code; +} +async function resolveWatchdogPath() { + const candidates = [ + new URL("../../runtime/watchdog.mjs", import.meta.url), + new URL("./watchdog.mjs", import.meta.url) + ]; + let lastError; + for (const candidate of candidates) { + try { + await access2(candidate); + return fileURLToPath4(candidate); + } catch (error51) { + lastError = error51; + } + } + throw lastError; +} +async function parentDeathWatchdogInvocation(executable, args) { + return { + executable: { + kind: "native", + command: process.execPath, + prefixArgs: [], + resolvedFrom: "runtime-watchdog" + }, + args: [ + await resolveWatchdogPath(), + String(process.pid), + "--", + executable.command, + ...executable.prefixArgs, + ...args + ] + }; +} +function assertDirectoryIdentity2(target) { + return Promise.all([ + lstat4(target.publicDirectory), + realpath4(target.publicDirectory) + ]).then(([metadata, canonical]) => { + if (!metadata.isDirectory() || metadata.isSymbolicLink() || metadata.dev !== target.identity.dev || metadata.ino !== target.identity.ino || canonical !== target.canonicalDirectory) { + throw new RuntimeError("run archive directory identity changed"); + } + }); +} +async function syncDirectory2(directory) { + let handle; + try { + handle = await open4(directory, constants4.O_RDONLY | NO_FOLLOW2); + await handle.sync(); + } catch (error51) { + const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode4(error51) ?? ""); + if (!unsupportedOnWindows) throw error51; + } finally { + await handle?.close(); + } +} +async function writeRunStart(target, record2, create) { + await assertDirectoryIdentity2(target); + const destination = path9.join(target.canonicalDirectory, "run-start.json"); + const serialized = `${JSON.stringify(record2, null, 2)} +`; + if (create) { + const handle2 = await open4( + destination, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + 384 + ); + try { + await handle2.writeFile(serialized, "utf8"); + await handle2.sync(); + } finally { + await handle2.close(); + } + await syncDirectory2(target.canonicalDirectory); + await assertDirectoryIdentity2(target); + return; + } + const temporaryPath = path9.join( + target.canonicalDirectory, + `.run-start.${randomUUID2()}.tmp` + ); + let created = false; + let handle; + try { + handle = await open4( + temporaryPath, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + 384 + ); + created = true; + await handle.writeFile(serialized, "utf8"); + await handle.sync(); + await handle.close(); + handle = void 0; + await assertDirectoryIdentity2(target); + await rename2(temporaryPath, destination); + created = false; + await syncDirectory2(target.canonicalDirectory); + await assertDirectoryIdentity2(target); + } finally { + await handle?.close(); + if (created) await rm2(temporaryPath, { force: true }); + } +} +async function initializeRunStart(store, record2) { + await store.writeLog("lifecycle", "attempt lock acquired\n"); + const canonicalDirectory = await realpath4(store.runDirectory); + const metadata = await lstat4(store.runDirectory); + if (!metadata.isDirectory() || metadata.isSymbolicLink()) { + throw new RuntimeError("run archive directory is not a plain directory"); + } + const target = { + publicDirectory: store.runDirectory, + canonicalDirectory, + identity: { dev: metadata.dev, ino: metadata.ino } + }; + await writeRunStart(target, record2, true); + return { target, record: record2 }; +} +function withRunStartPidRecording(ps, context) { + return { + os: ps.os, + resolveExecutable: (request) => ps.resolveExecutable(request), + async spawnSupervised(request) { + const process4 = await ps.spawnSupervised(request); + if (process4.pid > 1) { + try { + const processToken = await ps.getProcessStartToken(process4.pid).catch(() => null); + await writeRunStart( + context.target, + { ...context.record, pid: process4.pid, processToken }, + false + ); + } catch (error51) { + await ps.terminateProcessTree(process4).catch(() => { + }); + throw error51; + } + } + return process4; + }, + requestCooperativeCancellation: (process4) => ps.requestCooperativeCancellation(process4), + terminateProcessTree: (process4) => ps.terminateProcessTree(process4), + getProcessStartToken: (pid) => ps.getProcessStartToken(pid), + terminateProcessTreeByPid: (pid, expectedToken) => ps.terminateProcessTreeByPid(pid, expectedToken), + acquireCheckoutLock: (checkout) => ps.acquireCheckoutLock(checkout), + acquireCleanupJournalLock: () => ps.acquireCleanupJournalLock(), + createSecureTempDirectory: () => ps.createSecureTempDirectory(), + canonicalizePath: (input) => ps.canonicalizePath(input), + assertDirectoryWriteIntegrity: (directory, identity) => ps.assertDirectoryWriteIntegrity(directory, identity) + }; +} + +// src/producers/producer-adapter.ts +import { readFileSync as readFileSync2 } from "node:fs"; +function detectEnvironmentType(readProcVersion = () => readFileSync2("/proc/version", "utf8")) { + if (process.platform !== "linux") return "native"; + try { + const version2 = readProcVersion().trim().toLowerCase(); + if (version2.includes("microsoft")) return "wsl"; + return /^linux version(?:\s|$)/.test(version2) ? "native" : "wsl"; + } catch { + return "wsl"; + } +} + +// src/producers/producer-runtime.ts +init_host_store(); +var MAX_PRODUCER_OUTPUT_BYTES = 1e6; +function preCancelledExit() { + return { + exitCode: null, + signal: null, + timedOut: false, + cancelled: true, + stdout: "", + stderr: "", + truncated: { stdout: false, stderr: false } + }; +} +var ProducerRuntime = class { + constructor(registry3 = registry2) { + this.registry = registry3; + } + registry; + probeCache = /* @__PURE__ */ new Map(); + cacheHits = 0; + get probeCacheHits() { + return this.cacheHits; + } + clearProbeCache() { + this.probeCache.clear(); + this.cacheHits = 0; + } + async computeProbeCacheKey(producerId, adapter, ctx) { + const descriptor = adapter.descriptor; + let execKey = ""; + try { + const query = descriptor?.executable ?? { name: producerId }; + const resolved = await normalizeNodeShim(await ctx.ps.resolveExecutable(query)); + let mtime = ""; + try { + if (existsSync7(resolved.command)) { + mtime = String(statSync2(resolved.command).mtimeMs); + } + } catch { + } + execKey = `${resolved.command}:${resolved.prefixArgs.join(",")}:${mtime}`; + } catch { + return null; + } + const hostStoreContext = { + env: process.env, + homeDirectory: homedir8() + }; + const hostStoreRoot = descriptor ? resolveHostStoreRoot(descriptor, hostStoreContext) ?? "" : ""; + const configRevision = descriptor ? resolveConfigRevision(descriptor, hostStoreContext) : ""; + return `${producerId}|${execKey}|${hostStoreRoot}|${configRevision}`; + } + async probe(producerId, ctx, options, customRegistry) { + const reg = customRegistry ?? this.registry; + const adapter = reg.get(producerId); + if (adapter === void 0) { + throw new RuntimeError(`Unknown producer '${producerId}'`); + } + if (options?.fresh !== true) { + const key = await this.computeProbeCacheKey(producerId, adapter, ctx); + if (key !== null) { + const cached2 = this.probeCache.get(key); + if (cached2 !== void 0) { + this.cacheHits++; + return cached2; + } + } + } + const report = await adapter.probe(ctx); + if (options?.fresh !== true) { + const key = await this.computeProbeCacheKey(producerId, adapter, ctx); + if (key !== null) { + this.probeCache.set(key, report); + } + } + return report; + } + async probeAll(ctx, options, customRegistry) { + const reg = customRegistry ?? this.registry; + return Promise.all(reg.all().map((adapter) => this.probe(adapter.producerId, ctx, options, reg))); + } + async planLaunch(request) { + const adapter = request.adapter ?? (request.producerId !== void 0 ? this.registry.get(request.producerId) : void 0); + if (adapter === void 0) { + throw new RuntimeError(`Unknown producer '${request.producerId ?? "unknown"}'`); + } + const producerId = request.producerId ?? adapter.producerId ?? "unknown"; + const descriptor = adapter.descriptor; + const report = request.capabilityReport ?? await adapter.probe({ + ps: request.ps, + os: request.ps.os, + arch: process.arch, + environmentType: detectEnvironmentType() + }); + if (report.resolvedExecutable === null) { + throw new RuntimeError(`Cannot launch producer '${producerId}': executable not resolved`); + } + const profile = typeof adapter.configurationProfile === "function" ? adapter.configurationProfile() : void 0; + const isolation = descriptor?.isolation ?? profile?.isolationState ?? "controlled-config-supported"; + const requiresTempHome = isolation === "controlled-config-supported" || isolation === "controlled-config-with-copied-credentials"; + if (request.tempHome !== void 0 && request.tempHome !== null && !requiresTempHome) { + throw new RuntimeError( + `Declared writable state cannot be combined with temporary HOME isolation for producer '${producerId}'` + ); + } + let tempHome; + if (request.tempHome !== void 0) { + tempHome = request.tempHome; + } else if (requiresTempHome) { + tempHome = await request.ps.createSecureTempDirectory(); + } else { + tempHome = null; + } + const selection = selectSandboxBackend(report); + const confinementBackend = selection.backend?.id ?? null; + const isSeatbelt = selection.backend?.kind === "os" && selection.backend.id === "macos-seatbelt"; + const readOnly = request.intent === "read-only"; + const nativeReadOnly = readOnly && selection.backend?.kind === "producer-native"; + const invocationContext = { + worktreePath: request.worktreePath, + runId: request.runId ?? "anonymous-run", + ...tempHome === null ? {} : { tempHome }, + capabilityReport: report, + executable: report.resolvedExecutable, + readOnly: nativeReadOnly, + ...request.extraWritableRoots && request.extraWritableRoots.length > 0 ? { extraWritableRoots: request.extraWritableRoots } : {}, + ...request.gitObjectAccess ? { + gitObjectDirectory: request.gitObjectAccess.privateObjectsDir, + gitAlternateObjectDirectories: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path10.delimiter) : request.gitObjectAccess.sharedObjectsDir + } : {} + }; + let invocation = adapter.buildInvocation(request.spec, invocationContext); + if (readOnly && !nativeReadOnly) { + if (isSeatbelt) { + invocation = wrapInvocationWithSeatbelt( + invocation, + buildReadOnlySeatbeltPolicy({ tempHome }) + ); + } + } else if (isSeatbelt) { + invocation = wrapInvocationWithSeatbelt( + invocation, + buildWriteSeatbeltPolicy({ + worktreePath: request.worktreePath, + tempHome, + extraWritableRoots: request.extraWritableRoots ?? [] + }) + ); + } + const builtEnvironment = buildEnvironment({ + os: request.ps.os, + adapterAllowlist: invocation.requiredEnv ?? [], + ...invocation.env === void 0 ? {} : { adapterValues: invocation.env }, + specAdditions: { + ...request.envAdditions ?? {}, + ...request.gitObjectAccess ? { + GIT_OBJECT_DIRECTORY: request.gitObjectAccess.privateObjectsDir, + GIT_ALTERNATE_OBJECT_DIRECTORIES: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path10.delimiter) : request.gitObjectAccess.sharedObjectsDir + } : {} + }, + ...tempHome === null ? {} : { tempHome } + }); + const isWriter = request.intent !== "read-only"; + const supervisedInvocation = isWriter ? await parentDeathWatchdogInvocation(invocation.executable, invocation.args) : { executable: invocation.executable, args: invocation.args }; + return { + descriptor, + adapter, + capabilityReport: report, + tempHome, + invocation, + supervisedInvocation, + builtEnvironment, + confinementBackend + }; + } + async launch(request) { + const plan = request.plan ?? await this.planLaunch(request); + const processServices = request.runStartContext !== void 0 ? withRunStartPidRecording(request.ps, request.runStartContext) : request.ps; + const exit = request.abortSignal?.aborted === true ? preCancelledExit() : await supervise(processServices, { + executable: plan.supervisedInvocation.executable, + args: plan.supervisedInvocation.args, + cwd: request.worktreePath, + env: plan.builtEnvironment.env, + timeoutMs: request.timeoutMs ?? request.spec.timeoutMs, + ...plan.invocation.stdin === void 0 ? {} : { stdin: plan.invocation.stdin }, + maxOutputBytes: request.maxOutputBytes ?? MAX_PRODUCER_OUTPUT_BYTES + }, request.abortSignal === void 0 ? {} : { onCancel: request.abortSignal }); + const normalized = typeof plan.adapter.normalizeEvents === "function" ? plan.adapter.normalizeEvents({ + stdout: exit.stdout, + stderr: exit.stderr, + exit + }) : { events: [], producerSummary: exit.stdout, ok: exit.exitCode === 0 }; + return { + ...plan, + exit, + events: normalized.events, + producerSummary: normalized.producerSummary, + ok: normalized.ok + }; + } +}; +var producerRuntime = new ProducerRuntime(); + +// src/producers/capability-probe.ts +async function probeAll(ctx, producerRegistry = registry2, options) { + return producerRuntime.probeAll(ctx, options, producerRegistry); +} + // src/verify/dependency-link.ts import { execFile as execFile3 } from "node:child_process"; -import { access as access2, mkdir as mkdir3, mkdtemp, readFile, rm as rm2, writeFile } from "node:fs/promises"; +import { access as access3, mkdir as mkdir3, mkdtemp, readFile, rm as rm3, writeFile } from "node:fs/promises"; import { tmpdir as tmpdir5 } from "node:os"; -import path8 from "node:path"; +import path11 from "node:path"; import { promisify } from "node:util"; var execFileAsync = promisify(execFile3); var LOCKFILES = ["package-lock.json", "bun.lockb", "pnpm-lock.yaml", "yarn.lock"]; @@ -37445,7 +38204,7 @@ function cowClone(platform, source, target) { } async function exists(candidate) { try { - await access2(candidate); + await access3(candidate); return true; } catch { return false; @@ -37456,14 +38215,14 @@ async function probeCowSupport(dependencies = {}) { if (platform !== "darwin" && platform !== "linux") { return { cowSupported: false, strategy: "unsupported" }; } - const probeRoot = await mkdtemp(path8.join(tmpdir5(), "ca-cow-probe-")); + const probeRoot = await mkdtemp(path11.join(tmpdir5(), "ca-cow-probe-")); try { - const source = path8.join(probeRoot, "source"); - const target = path8.join(probeRoot, "target"); + const source = path11.join(probeRoot, "source"); + const target = path11.join(probeRoot, "target"); const clone2 = cowClone(platform, source, target); if (clone2 === null) return { cowSupported: false, strategy: "unsupported" }; await mkdir3(source); - await writeFile(path8.join(source, "sentinel"), "probe\n"); + await writeFile(path11.join(source, "sentinel"), "probe\n"); try { await (dependencies.execFile ?? execFileAsync)("cp", clone2.args, { timeout: COPY_TIMEOUT_MS }); return { cowSupported: true, strategy: clone2.strategy }; @@ -37471,15 +38230,15 @@ async function probeCowSupport(dependencies = {}) { return { cowSupported: false, strategy: clone2.strategy }; } } finally { - await rm2(probeRoot, { recursive: true, force: true }); + await rm3(probeRoot, { recursive: true, force: true }); } } async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = {}) { - const primaryModules = path8.join(primaryRepo, "node_modules"); + const primaryModules = path11.join(primaryRepo, "node_modules"); if (!await exists(primaryModules)) return "none"; const [primaryLockfiles, worktreeLockfiles] = await Promise.all([ - Promise.all(LOCKFILES.map((lockfile) => exists(path8.join(primaryRepo, lockfile)))), - Promise.all(LOCKFILES.map((lockfile) => exists(path8.join(worktreePath, lockfile)))) + Promise.all(LOCKFILES.map((lockfile) => exists(path11.join(primaryRepo, lockfile)))), + Promise.all(LOCKFILES.map((lockfile) => exists(path11.join(worktreePath, lockfile)))) ]); if (!primaryLockfiles.some(Boolean)) return "none"; if (primaryLockfiles.some((present, index) => present !== worktreeLockfiles[index])) { @@ -37489,8 +38248,8 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = const comparisons = await Promise.all(LOCKFILES.map(async (lockfile, index) => { if (!primaryLockfiles[index]) return true; const [primaryLock, worktreeLock] = await Promise.all([ - readFile(path8.join(primaryRepo, lockfile)), - readFile(path8.join(worktreePath, lockfile)) + readFile(path11.join(primaryRepo, lockfile)), + readFile(path11.join(worktreePath, lockfile)) ]); return primaryLock.equals(worktreeLock); })); @@ -37498,7 +38257,7 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = } catch { return "skipped-lockfile-mismatch"; } - const targetModules = path8.join(worktreePath, "node_modules"); + const targetModules = path11.join(worktreePath, "node_modules"); const platform = dependencies.platform ?? process.platform; const clone2 = cowClone(platform, primaryModules, targetModules); if (clone2 === null) return "skipped-cow-unsupported"; @@ -37506,7 +38265,7 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = await (dependencies.execFile ?? execFileAsync)("cp", clone2.args, { timeout: COPY_TIMEOUT_MS }); return "inherited"; } catch { - await rm2(targetModules, { recursive: true, force: true }); + await rm3(targetModules, { recursive: true, force: true }); return "skipped-cow-unsupported"; } } @@ -37514,7 +38273,7 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = // src/mcp/live-bundle.ts import { createHash as createHash4 } from "node:crypto"; import { readFile as readFile2 } from "node:fs/promises"; -import path9 from "node:path"; +import path12 from "node:path"; var NOT_SELF_HOSTED = { selfHosted: false, runningVersion: RUNTIME_VERSION, @@ -37544,16 +38303,16 @@ function declaredName(manifest) { async function checkLiveBundle(checkoutPath, deps = {}) { const read = deps.readFile ?? ((target) => readFile2(target)); const runningVersion = deps.runningVersion ?? RUNTIME_VERSION; - const manifest = await readOrNull(read, path9.join(checkoutPath, ".claude-plugin", "plugin.json")); + const manifest = await readOrNull(read, path12.join(checkoutPath, ".claude-plugin", "plugin.json")); if (manifest === null) return { ...NOT_SELF_HOSTED, runningVersion }; const declared = declaredName(manifest); if (declared === null || declared.name !== "claude-architect") { return { ...NOT_SELF_HOSTED, runningVersion }; } const repositoryVersion = typeof declared.version === "string" ? declared.version : null; - const repositoryBundle = await readOrNull(read, path9.join(checkoutPath, "runtime", "server.mjs")); + const repositoryBundle = await readOrNull(read, path12.join(checkoutPath, "runtime", "server.mjs")); const runningBundlePath = deps.runningBundlePath ?? process.argv[1]; - const runningBundle = runningBundlePath === void 0 || path9.basename(runningBundlePath) !== "server.mjs" ? null : await readOrNull(read, runningBundlePath); + const runningBundle = runningBundlePath === void 0 || path12.basename(runningBundlePath) !== "server.mjs" ? null : await readOrNull(read, runningBundlePath); const bundleMatches = repositoryBundle === null || runningBundle === null ? null : sha256(repositoryBundle) === sha256(runningBundle); return { selfHosted: true, @@ -37577,7 +38336,7 @@ var MAX_CHECKOUT_LOCK_BYTES = 4096; var MAX_AUTOPILOT_OWNER_BYTES = 1024; var MAX_AUTOPILOT_REGISTRATION_BYTES = 32768; var MAX_AUTOPILOT_SCAN_ENTRIES = 1024; -var NO_FOLLOW2 = constants4.O_NOFOLLOW ?? 0; +var NO_FOLLOW3 = constants5.O_NOFOLLOW ?? 0; var WORKFLOW_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u; var OID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u; var AUTOPILOT_ISSUE_ORDER = [ @@ -37614,7 +38373,7 @@ function nodeIsSupported(version2) { function gitVersion(stdout) { return /^git version ([^\s]+)(?:\s|$)/u.exec(stdout.trim())?.[1] ?? null; } -function errorCode4(error51) { +function errorCode5(error51) { return error51.code; } function defaultIsProcessAlive(pid) { @@ -37622,8 +38381,8 @@ function defaultIsProcessAlive(pid) { nodeProcess4.kill(pid, 0); return true; } catch (error51) { - if (errorCode4(error51) === "EPERM") return true; - if (errorCode4(error51) === "ESRCH") return false; + if (errorCode5(error51) === "EPERM") return true; + if (errorCode5(error51) === "ESRCH") return false; throw error51; } } @@ -37659,12 +38418,12 @@ async function readCheckoutLock(handle) { } async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { if (stateDir === void 0) return []; - const locksRoot = path10.join(stateDir, "locks"); + const locksRoot = path13.join(stateDir, "locks"); let entries; try { entries = await readdir3(locksRoot, { withFileTypes: true }); } catch (error51) { - return errorCode4(error51) === "ENOENT" ? [] : ["checkout-lock-scan-failed"]; + return errorCode5(error51) === "ENOENT" ? [] : ["checkout-lock-scan-failed"]; } const issues = /* @__PURE__ */ new Set(); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { @@ -37676,7 +38435,7 @@ async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { } let handle; try { - handle = await open5(path10.join(locksRoot, entry.name), constants4.O_RDONLY | NO_FOLLOW2); + handle = await open5(path13.join(locksRoot, entry.name), constants5.O_RDONLY | NO_FOLLOW3); const metadataBeforeRead = await handle.stat(); if (!metadataBeforeRead.isFile() || metadataBeforeRead.size > MAX_CHECKOUT_LOCK_BYTES) { issues.add("checkout-lock-malformed"); @@ -37700,7 +38459,7 @@ async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { const liveToken = owner.processToken === null ? null : await ps.getProcessStartToken(owner.pid); issues.add(owner.processToken !== null && liveToken !== null && liveToken !== owner.processToken ? "checkout-lock-leaked" : "checkout-lock-held"); } catch (error51) { - if (errorCode4(error51) !== "ENOENT") issues.add("checkout-lock-malformed"); + if (errorCode5(error51) !== "ENOENT") issues.add("checkout-lock-malformed"); } finally { try { await handle?.close(); @@ -37720,9 +38479,9 @@ async function readBoundedRegularFile(filename, maxBytes) { let handle; let outcome = { status: "malformed" }; try { - handle = await open5(filename, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open5(filename, constants5.O_RDONLY | NO_FOLLOW3); const before = await handle.stat(); - const named = await lstat4(filename); + const named = await lstat5(filename); if (!before.isFile() || before.nlink !== 1 || before.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== before.dev || named.ino !== before.ino || named.size !== before.size) return outcome; const bytes = Buffer.alloc(before.size); let offset = 0; @@ -37732,11 +38491,11 @@ async function readBoundedRegularFile(filename, maxBytes) { offset += bytesRead; } const after = await handle.stat(); - const settledNamed = await lstat4(filename); + const settledNamed = await lstat5(filename); if (offset !== before.size || after.dev !== before.dev || after.ino !== before.ino || after.nlink !== 1 || after.size !== before.size || after.mtimeMs !== before.mtimeMs || after.ctimeMs !== before.ctimeMs || settledNamed.dev !== before.dev || settledNamed.ino !== before.ino || settledNamed.nlink !== 1 || settledNamed.size !== before.size) return outcome; outcome = { status: "ok", text: bytes.toString("utf8") }; } catch (error51) { - if (errorCode4(error51) === "ENOENT") outcome = { status: "missing" }; + if (errorCode5(error51) === "ENOENT") outcome = { status: "missing" }; } finally { try { await handle?.close(); @@ -37772,7 +38531,7 @@ function parseRegistration(text) { } if (typeof value !== "object" || value === null || Array.isArray(value)) return null; const record2 = value; - if (record2.ownershipVersion !== "1" || typeof record2.workflowId !== "string" || !WORKFLOW_ID.test(record2.workflowId) || typeof record2.checkoutPath !== "string" || !path10.isAbsolute(record2.checkoutPath) || typeof record2.gitCommonDir !== "string" || !path10.isAbsolute(record2.gitCommonDir) || typeof record2.repositoryIdentity !== "string" || typeof record2.worktreePath !== "string" || !path10.isAbsolute(record2.worktreePath) || typeof record2.worktreeGitDir !== "string" || !path10.isAbsolute(record2.worktreeGitDir) || typeof record2.branch !== "string" || record2.branchRef !== `refs/heads/${record2.branch}` || record2.baseRef !== `refs/claude-architect/autopilot/${record2.workflowId}/base` || typeof record2.baseBranch !== "string" || typeof record2.baseCommitOid !== "string" || !OID.test(record2.baseCommitOid) || record2.remote !== "origin" || typeof record2.remoteUrl !== "string" || typeof record2.ownerRepo !== "string" || !isBootstrapOwner(record2.bootstrapOwner, record2.workflowId)) return null; + if (record2.ownershipVersion !== "1" || typeof record2.workflowId !== "string" || !WORKFLOW_ID.test(record2.workflowId) || typeof record2.checkoutPath !== "string" || !path13.isAbsolute(record2.checkoutPath) || typeof record2.gitCommonDir !== "string" || !path13.isAbsolute(record2.gitCommonDir) || typeof record2.repositoryIdentity !== "string" || typeof record2.worktreePath !== "string" || !path13.isAbsolute(record2.worktreePath) || typeof record2.worktreeGitDir !== "string" || !path13.isAbsolute(record2.worktreeGitDir) || typeof record2.branch !== "string" || record2.branchRef !== `refs/heads/${record2.branch}` || record2.baseRef !== `refs/claude-architect/autopilot/${record2.workflowId}/base` || typeof record2.baseBranch !== "string" || typeof record2.baseCommitOid !== "string" || !OID.test(record2.baseCommitOid) || record2.remote !== "origin" || typeof record2.remoteUrl !== "string" || typeof record2.ownerRepo !== "string" || !isBootstrapOwner(record2.bootstrapOwner, record2.workflowId)) return null; return record2; } async function ownerStatus(owner, ps, isProcessAlive2) { @@ -37796,7 +38555,7 @@ function registrationFilename(workflowId) { } async function safeDirectoryEntries(directory, issues) { try { - const metadata = await lstat4(directory); + const metadata = await lstat5(directory); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { issues.add("autopilot-state-malformed"); return []; @@ -37807,12 +38566,12 @@ async function safeDirectoryEntries(directory, issues) { } return entries.sort((left, right) => left.name.localeCompare(right.name)).slice(0, MAX_AUTOPILOT_SCAN_ENTRIES); } catch (error51) { - if (errorCode4(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); + if (errorCode5(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); return []; } } async function scanRegistrations(stateRoot2, issues) { - const root = path10.join(stateRoot2, "autopilot-branches"); + const root = path13.join(stateRoot2, "autopilot-branches"); const entries = await safeDirectoryEntries(root, issues); const registrations = /* @__PURE__ */ new Map(); const filenames = /* @__PURE__ */ new Set(); @@ -37823,7 +38582,7 @@ async function scanRegistrations(stateRoot2, issues) { continue; } const read = await readBoundedRegularFile( - path10.join(root, entry.name), + path13.join(root, entry.name), MAX_AUTOPILOT_REGISTRATION_BYTES ); if (read.status !== "ok") { @@ -37850,14 +38609,14 @@ function expectedHead(state, registration) { async function observedBranchMatches(registration, state, git2) { try { const [checkoutMetadata, worktreeMetadata] = await Promise.all([ - lstat4(registration.checkoutPath), - lstat4(registration.worktreePath) + lstat5(registration.checkoutPath), + lstat5(registration.worktreePath) ]); if (!checkoutMetadata.isDirectory() || checkoutMetadata.isSymbolicLink() || !worktreeMetadata.isDirectory() || worktreeMetadata.isSymbolicLink()) return false; const [checkout, worktree, common] = await Promise.all([ - realpath4(registration.checkoutPath), - realpath4(registration.worktreePath), - realpath4(registration.gitCommonDir) + realpath5(registration.checkoutPath), + realpath5(registration.worktreePath), + realpath5(registration.gitCommonDir) ]); if (checkout !== registration.checkoutPath || worktree !== registration.worktreePath || common !== registration.gitCommonDir) return false; const [observedCommon, worktrees, symbolic, head, branchRef, baseRef] = await Promise.all([ @@ -37869,7 +38628,7 @@ async function observedBranchMatches(registration, state, git2) { git2(registration.checkoutPath, ["rev-parse", "--verify", registration.baseRef]) ]); if ([observedCommon, worktrees, symbolic, head, branchRef, baseRef].some((result) => result.exitCode !== 0 || result.truncated?.stdout === true || result.truncated?.stderr === true)) return false; - if (await realpath4(gitPathOutput( + if (await realpath5(gitPathOutput( observedCommon.stdout, "workflow common directory" )) !== registration.gitCommonDir || symbolic.stdout.trim() !== registration.branch || head.stdout.trim() !== branchRef.stdout.trim() || baseRef.stdout.trim() !== registration.baseCommitOid) return false; @@ -37887,11 +38646,11 @@ async function observedBranchMatches(registration, state, git2) { } async function autopilotIssues(stateDir, ps, isProcessAlive2, git2) { if (stateDir === void 0) return []; - const stateRoot2 = path10.resolve(stateDir); + const stateRoot2 = path13.resolve(stateDir); const issues = /* @__PURE__ */ new Set(); let probes = 0; const registrationScan = await scanRegistrations(stateRoot2, issues); - const workflowsRoot = path10.join(stateRoot2, "workflows"); + const workflowsRoot = path13.join(stateRoot2, "workflows"); const workflowEntries = await safeDirectoryEntries(workflowsRoot, issues); const states = /* @__PURE__ */ new Map(); for (const entry of workflowEntries) { @@ -37952,11 +38711,11 @@ async function autopilotIssues(stateDir, ps, isProcessAlive2, git2) { } let worktreeExists = false; try { - const metadata = await lstat4(state.worktreePath); + const metadata = await lstat5(state.worktreePath); worktreeExists = metadata.isDirectory() && !metadata.isSymbolicLink(); if (!worktreeExists) issues.add("autopilot-state-malformed"); } catch (error51) { - if (errorCode4(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); + if (errorCode5(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); } if (worktreeExists && registrationMissing) { issues.add("autopilot-worktree-orphaned"); @@ -38028,12 +38787,12 @@ async function doctor(deps = {}) { try { const result = await gitRunner(process.cwd(), ["--version"]); const version2 = result.exitCode === 0 && result.truncated?.stdout !== true ? gitVersion(result.stdout) : null; - let path32 = null; + let path33 = null; try { - path32 = (await ps.resolveExecutable({ name: "git" })).command; + path33 = (await ps.resolveExecutable({ name: "git" })).command; } catch { } - git2 = { version: version2, ok: version2 !== null, path: path32 }; + git2 = { version: version2, ok: version2 !== null, path: path33 }; } catch { } if (!git2.ok) issues.push("git-unavailable"); @@ -38067,7 +38826,7 @@ async function doctor(deps = {}) { os: ps.os, arch, environmentType - })); + }, void 0, { fresh: true })); for (const producer of producers) { if (!producer.available && producer.reason !== null) { issues.push(redact(`producer:${producer.producerId}:${producer.reason}`)); @@ -38187,7 +38946,7 @@ import { createHash as createHash15 } from "node:crypto"; import { randomUUID as randomUUID8 } from "node:crypto"; // src/protocol/spec-validator.ts -import path11 from "node:path"; +import path14 from "node:path"; var schemas = loadSchemas(); function allowlistCovers(top, glob) { return top.some((pattern) => { @@ -38198,7 +38957,7 @@ function allowlistCovers(top, glob) { }); } function isSafeRepositoryGlob(glob) { - return glob.length > 0 && !path11.posix.isAbsolute(glob) && !path11.win32.isAbsolute(glob) && !glob.split(/[\\/]/).includes(".."); + return glob.length > 0 && !path14.posix.isAbsolute(glob) && !path14.win32.isAbsolute(glob) && !glob.split(/[\\/]/).includes(".."); } function sliceDependencyError(sliceIndex, dependencyIndex, message) { return { @@ -38280,8 +39039,8 @@ function validateSpec(input) { ); if (topLevelDeletionError !== null) return topLevelDeletionError; for (const [index, command] of spec.verification.entries()) { - const normalizedCwd = path11.posix.normalize(command.cwd); - if (path11.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { + const normalizedCwd = path14.posix.normalize(command.cwd); + if (path14.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { return { ok: false, errors: [{ @@ -38309,8 +39068,8 @@ function validateSpec(input) { } } for (const [commandIndex, command] of slice.verification.entries()) { - const normalizedCwd = path11.posix.normalize(command.cwd); - if (path11.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { + const normalizedCwd = path14.posix.normalize(command.cwd); + if (path14.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { return { ok: false, errors: [{ @@ -38345,7 +39104,7 @@ function validateSpec(input) { }); return { ok: false, errors: validationErrors }; } -function isRecord6(value) { +function isRecord4(value) { return typeof value === "object" && value !== null && !Array.isArray(value); } function escapeJsonPointerSegment(value) { @@ -38372,9 +39131,9 @@ function isSafeCommitMessage(message) { } function taskIdForDelegationPath(input, instancePath) { const match = /^\/tasks\/(\d+)\/delegation(?:\/|$)/u.exec(instancePath); - if (match === null || !isRecord6(input) || !Array.isArray(input.tasks)) return void 0; + if (match === null || !isRecord4(input) || !Array.isArray(input.tasks)) return void 0; const task = input.tasks[Number(match[1])]; - if (!isRecord6(task) || typeof task.id !== "string") return void 0; + if (!isRecord4(task) || typeof task.id !== "string") return void 0; const idLength = [...task.id].length; return idLength >= 1 && idLength <= 128 ? task.id : void 0; } @@ -38385,9 +39144,9 @@ function validateAutopilotSpec(input) { message: error51.message ?? "invalid" })); const ids = /* @__PURE__ */ new Set(); - const tasks = isRecord6(input) && Array.isArray(input.tasks) ? input.tasks : []; + const tasks = isRecord4(input) && Array.isArray(input.tasks) ? input.tasks : []; for (const task of tasks) { - if (!isRecord6(task) || typeof task.id !== "string") continue; + if (!isRecord4(task) || typeof task.id !== "string") continue; const taskId = task.id; if (ids.has(taskId)) { errors.push({ path: "#/tasks", message: `duplicate task id: ${taskId}` }); @@ -38472,9 +39231,9 @@ function sortChangedPaths(changedPaths) { function deriveChangedPaths(inputs) { const rawEntries = new Map(inputs.rawDiff.map((entry) => [entry.path, entry])); const treeEntries = parseTree(inputs.treeOutput); - return sortChangedPaths(parseNameStatus(inputs.nameStatusOutput).map(({ path: path32, status }) => { - const treeEntry = treeEntries.get(path32); - const rawEntry = rawEntries.get(path32); + return sortChangedPaths(parseNameStatus(inputs.nameStatusOutput).map(({ path: path33, status }) => { + const treeEntry = treeEntries.get(path33); + const rawEntry = rawEntries.get(path33); if (treeEntry === void 0 && status !== "D") { throw new RuntimeError("candidate tree is missing a changed path"); } @@ -38482,7 +39241,7 @@ function deriveChangedPaths(inputs) { throw new RuntimeError("git diff-tree outputs disagree"); } return { - path: path32, + path: path33, changeType: changeType(status), mode: treeEntry?.mode ?? rawEntry.oldMode, contentHash: treeEntry?.oid ?? null @@ -38509,7 +39268,7 @@ function validateChangedPaths(changedPaths) { } function manifestHashOf(changedPaths) { validateChangedPaths(changedPaths); - const canonical = changedPaths.map(({ path: path32, changeType: changeType2, mode, contentHash }) => ({ path: path32, changeType: changeType2, mode, contentHash })); + const canonical = changedPaths.map(({ path: path33, changeType: changeType2, mode, contentHash }) => ({ path: path33, changeType: changeType2, mode, contentHash })); return createHash6("sha256").update(JSON.stringify(canonical)).digest("hex"); } function inspectChangedPathManifest(inputs) { @@ -38537,7 +39296,7 @@ var IGNORED_PATHS_LIMIT = 50; function reviewError(message, toolError) { return new RuntimeError(message, { toolError }); } -function isRecord7(value) { +function isRecord5(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } function hasExactKeys(value, expected) { @@ -38565,14 +39324,14 @@ function canonicalJsonValue(value) { if (Array.isArray(value)) { return `[${value.map((item) => canonicalJsonValue(item)).join(",")}]`; } - if (!isRecord7(value)) throw new RuntimeError("review snapshot contains a non-JSON value"); + if (!isRecord5(value)) throw new RuntimeError("review snapshot contains a non-JSON value"); return `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${canonicalJsonValue(value[key])}`).join(",")}}`; } function validateChangedPath(value) { - return isRecord7(value) && hasExactKeys(value, ["path", "changeType", "mode", "contentHash"]) && typeof value.path === "string" && ["added", "modified", "deleted"].includes(value.changeType) && typeof value.mode === "string" && (value.contentHash === null || typeof value.contentHash === "string"); + return isRecord5(value) && hasExactKeys(value, ["path", "changeType", "mode", "contentHash"]) && typeof value.path === "string" && ["added", "modified", "deleted"].includes(value.changeType) && typeof value.mode === "string" && (value.contentHash === null || typeof value.contentHash === "string"); } function validateCommandOutcome(value) { - return isRecord7(value) && hasExactKeys(value, [ + return isRecord5(value) && hasExactKeys(value, [ "id", "executable", "args", @@ -38584,7 +39343,7 @@ function validateCommandOutcome(value) { ]) && typeof value.id === "string" && typeof value.executable === "string" && Array.isArray(value.args) && value.args.every((arg) => typeof arg === "string") && (value.exitCode === null || typeof value.exitCode === "number" && Number.isInteger(value.exitCode)) && typeof value.timedOut === "boolean" && typeof value.durationMs === "number" && Number.isFinite(value.durationMs) && value.durationMs >= 0 && typeof value.stdoutRef === "string" && typeof value.stderrRef === "string"; } function validateReviewSnapshot(value, expectedRunId) { - if (!isRecord7(value) || !hasExactKeys(value, [ + if (!isRecord5(value) || !hasExactKeys(value, [ "runId", "baseCommitOid", "candidateCommitOid", @@ -38594,7 +39353,7 @@ function validateReviewSnapshot(value, expectedRunId) { "changedPaths", "evidence", "executedVerification" - ]) || typeof value.runId !== "string" || expectedRunId !== void 0 && value.runId !== expectedRunId || typeof value.baseCommitOid !== "string" || !GIT_OID.test(value.baseCommitOid) || typeof value.candidateCommitOid !== "string" || !GIT_OID.test(value.candidateCommitOid) || typeof value.candidateTreeOid !== "string" || !GIT_OID.test(value.candidateTreeOid) || typeof value.manifestHash !== "string" || !SHA256.test(value.manifestHash) || typeof value.patch !== "string" || !Array.isArray(value.changedPaths) || !value.changedPaths.every(validateChangedPath) || !isRecord7(value.evidence) || !Array.isArray(value.executedVerification) || !value.executedVerification.every(validateCommandOutcome)) { + ]) || typeof value.runId !== "string" || expectedRunId !== void 0 && value.runId !== expectedRunId || typeof value.baseCommitOid !== "string" || !GIT_OID.test(value.baseCommitOid) || typeof value.candidateCommitOid !== "string" || !GIT_OID.test(value.candidateCommitOid) || typeof value.candidateTreeOid !== "string" || !GIT_OID.test(value.candidateTreeOid) || typeof value.manifestHash !== "string" || !SHA256.test(value.manifestHash) || typeof value.patch !== "string" || !Array.isArray(value.changedPaths) || !value.changedPaths.every(validateChangedPath) || !isRecord5(value.evidence) || !Array.isArray(value.executedVerification) || !value.executedVerification.every(validateCommandOutcome)) { throw new RuntimeError("archived review snapshot is malformed"); } const snapshot = value; @@ -38925,8 +39684,8 @@ function evaluateAutopilotEligibility(input) { // src/autopilot/final-branch-reviewer.ts import { createHash as createHash11, randomUUID as randomUUID7 } from "node:crypto"; import { constants as constants11 } from "node:fs"; -import { link as link5, lstat as lstat14, open as open12, readFile as readFile4, rm as rm8 } from "node:fs/promises"; -import path22 from "node:path"; +import { link as link5, lstat as lstat14, open as open11, readFile as readFile4, rm as rm8 } from "node:fs/promises"; +import path23 from "node:path"; // src/util/glob.ts function escapeRegex2(character) { @@ -38957,14 +39716,14 @@ function globMatches(pattern, candidate, caseInsensitive = false) { } // src/runtime/worktree-manager.ts -import { randomUUID as randomUUID3 } from "node:crypto"; -import { lstat as lstat8, mkdir as mkdir4, readdir as readdir5, realpath as realpath6, rename as rename3 } from "node:fs/promises"; -import path14 from "node:path"; +import { randomUUID as randomUUID4 } from "node:crypto"; +import { lstat as lstat9, mkdir as mkdir4, readdir as readdir5, realpath as realpath7, rename as rename4 } from "node:fs/promises"; +import path17 from "node:path"; // src/platform/bound-directory-cleanup.ts -import { constants as constants5 } from "node:fs"; -import { access as access3, lstat as lstat5, open as open6, rmdir } from "node:fs/promises"; -import path12 from "node:path"; +import { constants as constants6 } from "node:fs"; +import { access as access4, lstat as lstat6, open as open6, rmdir } from "node:fs/promises"; +import path15 from "node:path"; var DEFAULT_EMPTY_DIRECTORY_TIMEOUT_MS = 12e4; var EMPTY_DIRECTORY_TIMEOUT_ENV = "CLAUDE_ARCHITECT_EMPTY_DIRECTORY_TIMEOUT_MS"; function resolveEmptyDirectoryTimeoutMs(env = process.env, warn = (message) => console.error(message)) { @@ -39212,7 +39971,7 @@ async function darwinHandlePath(directory, handle, platformServices) { handle.fd.toString(), "-F0pn" ], - cwd: path12.dirname(directory), + cwd: path15.dirname(directory), env: {}, timeoutMs: 5e3, maxOutputBytes: 16384 @@ -39230,13 +39989,13 @@ async function removeWindowsBoundEmptyDirectory(directory, expectedIdentity, pla executable: helper, args: [ "remove", - path12.toNamespacedPath(directory), + path15.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString(), "true" ], - cwd: path12.dirname(directory), + cwd: path15.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: 3e4, maxOutputBytes: 16384 @@ -39257,15 +40016,15 @@ async function verifyBoundDirectoryCleanupSupport(platformServices) { try { if (platformServices.os === "linux") { await Promise.all([ - access3("/proc/self/mountinfo", constants5.R_OK), - access3("/proc/self/fd", constants5.R_OK) + access4("/proc/self/mountinfo", constants6.R_OK), + access4("/proc/self/fd", constants6.R_OK) ]); return; } if (platformServices.os === "darwin") { await Promise.all([ - access3("/usr/sbin/lsof", constants5.X_OK), - access3("/bin/df", constants5.X_OK) + access4("/usr/sbin/lsof", constants6.X_OK), + access4("/bin/df", constants6.X_OK) ]); return; } @@ -39297,21 +40056,21 @@ async function removeBoundEmptyDirectory(directory, expectedIdentity, platformSe let handle; let primaryError; try { - const named = await lstat5(directory, { bigint: true }); + const named = await lstat6(directory, { bigint: true }); if (!named.isDirectory() || named.isSymbolicLink() || !sameBoundIdentity(named, expectedIdentity)) { throw new RuntimeError("directory identity changed before bound removal"); } - handle = await open6(directory, constants5.O_RDONLY | (constants5.O_NOFOLLOW ?? 0)); + handle = await open6(directory, constants6.O_RDONLY | (constants6.O_NOFOLLOW ?? 0)); const opened = await handle.stat({ bigint: true }); if (!opened.isDirectory() || !sameBoundIdentity(opened, expectedIdentity)) { throw new RuntimeError("opened directory identity changed before bound removal"); } - const settledNamed = await lstat5(directory, { bigint: true }); + const settledNamed = await lstat6(directory, { bigint: true }); if (!settledNamed.isDirectory() || settledNamed.isSymbolicLink() || !sameBoundIdentity(settledNamed, expectedIdentity)) { throw new RuntimeError("directory identity changed before final bound removal"); } const darwinPath = platformServices.os === "darwin" ? await darwinHandlePath(directory, handle, platformServices) : void 0; - const removalTarget = await lstat5(directory, { bigint: true }); + const removalTarget = await lstat6(directory, { bigint: true }); if (!removalTarget.isDirectory() || removalTarget.isSymbolicLink() || !sameBoundIdentity(removalTarget, expectedIdentity)) { throw new RuntimeError("directory identity changed at the final removal boundary"); } @@ -39373,31 +40132,31 @@ async function emptyBoundDirectory(directory, expectedIdentity, platformServices } // src/runtime/worktree-removal-manifest.ts -import { randomUUID as randomUUID2 } from "node:crypto"; -import { constants as constants7 } from "node:fs"; +import { randomUUID as randomUUID3 } from "node:crypto"; +import { constants as constants8 } from "node:fs"; import { link as link2, - lstat as lstat7, + lstat as lstat8, open as open8, readdir as readdir4, - realpath as realpath5, - rename as rename2, - rm as rm3 + realpath as realpath6, + rename as rename3, + rm as rm4 } from "node:fs/promises"; -import path13 from "node:path"; +import path16 from "node:path"; // src/util/stable-file.ts -import { constants as constants6 } from "node:fs"; -import { lstat as lstat6, open as open7 } from "node:fs/promises"; +import { constants as constants7 } from "node:fs"; +import { lstat as lstat7, open as open7 } from "node:fs/promises"; async function readStableRegularFile(filename, maxBytes, dependencies = {}) { const handle = await (dependencies.open ?? open7)( filename, - constants6.O_RDONLY | (constants6.O_NOFOLLOW ?? 0) | (constants6.O_NONBLOCK ?? 0) + constants7.O_RDONLY | (constants7.O_NOFOLLOW ?? 0) | (constants7.O_NONBLOCK ?? 0) ); let primaryError; try { const metadata = await handle.stat({ bigint: true }); - const named = await (dependencies.lstat ?? lstat6)(filename, { bigint: true }); + const named = await (dependencies.lstat ?? lstat7)(filename, { bigint: true }); if (!metadata.isFile() || metadata.nlink !== 1n || metadata.birthtimeNs <= 0n || metadata.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.birthtimeNs <= 0n || named.nlink !== 1n || named.dev !== metadata.dev || named.ino !== metadata.ino || named.birthtimeNs !== metadata.birthtimeNs || named.size !== metadata.size) return null; if (maxBytes < 0n || maxBytes >= BigInt(Number.MAX_SAFE_INTEGER)) return null; const limit = Math.min(Number(maxBytes) + 1, Number(metadata.size) + 1); @@ -39411,7 +40170,7 @@ async function readStableRegularFile(filename, maxBytes, dependencies = {}) { if (bytesRead > Number(maxBytes)) return null; const contents = buffer.subarray(0, bytesRead); const settled = await handle.stat({ bigint: true }); - const settledNamed = await (dependencies.lstat ?? lstat6)(filename, { bigint: true }); + const settledNamed = await (dependencies.lstat ?? lstat7)(filename, { bigint: true }); if (!settled.isFile() || settled.nlink !== 1n || settled.birthtimeNs <= 0n || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.size !== metadata.size || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.birthtimeNs <= 0n || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size || settledNamed.mtimeNs !== settled.mtimeNs || settledNamed.ctimeNs !== settled.ctimeNs || BigInt(contents.byteLength) !== metadata.size) return null; return contents; } catch (error51) { @@ -39441,34 +40200,34 @@ var MAX_MANIFEST_BYTES = 32768n; function sameIdentity2(metadata, expected) { return metadata.dev === expected.dev && metadata.ino === expected.ino && metadata.birthtimeNs > 0n && metadata.birthtimeNs === expected.birthtimeNs; } -function errorCode5(error51) { +function errorCode6(error51) { return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; } function manifestRoot() { - return path13.join(resolveStateDir(), MANIFEST_DIRECTORY); + return path16.join(resolveStateDir(), MANIFEST_DIRECTORY); } async function ensurePrivateDirectory2(directory) { return await ensurePrivateDirectory(directory, { description: "worktree removal manifest directory" }); } -async function assertDirectoryIdentity2(directory, expected) { - const metadata = await lstat7(directory, { bigint: true }); +async function assertDirectoryIdentity3(directory, expected) { + const metadata = await lstat8(directory, { bigint: true }); if (!metadata.isDirectory() || metadata.isSymbolicLink() || !sameIdentity2(metadata, expected)) { throw new RuntimeError("worktree removal manifest directory identity changed"); } } async function assertMissing(filename, description) { try { - await lstat7(filename); + await lstat8(filename); } catch (error51) { - if (errorCode5(error51) === "ENOENT") return; + if (errorCode6(error51) === "ENOENT") return; throw error51; } throw new RuntimeError(`${description} unexpectedly remains`); } async function assertManifestIdentity(manifestPath, expected, expectedLinks) { - const metadata = await lstat7(manifestPath, { bigint: true }); + const metadata = await lstat8(manifestPath, { bigint: true }); if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== expectedLinks || !sameIdentity2(metadata, expected)) { throw new RuntimeError("worktree removal manifest publication identity changed"); } @@ -39510,8 +40269,8 @@ async function writeSyncedManifest(handle, manifest) { } function validateManifestPath(manifestPath, transactionId) { const root = manifestRoot(); - const expected = path13.join(root, `${transactionId}.json`); - if (!MANIFEST_NAME.test(path13.basename(manifestPath)) || manifestPath !== expected) { + const expected = path16.join(root, `${transactionId}.json`); + if (!MANIFEST_NAME.test(path16.basename(manifestPath)) || manifestPath !== expected) { throw new RuntimeError("worktree removal manifest path is invalid"); } return root; @@ -39575,7 +40334,7 @@ function parseManifest(contents, transactionId) { record2.registrationPath, record2.quarantineRoot, record2.quarantinePath - ].every((value2) => typeof value2 === "string" && path13.isAbsolute(value2)) || record2.physicalPresent === false && (record2.physicalDev !== "0" || record2.physicalIno !== "0" || record2.physicalBirthtimeNs !== "0")) { + ].every((value2) => typeof value2 === "string" && path16.isAbsolute(value2)) || record2.physicalPresent === false && (record2.physicalDev !== "0" || record2.physicalIno !== "0" || record2.physicalBirthtimeNs !== "0")) { throw new RuntimeError("worktree removal manifest is malformed"); } return record2; @@ -39583,16 +40342,16 @@ function parseManifest(contents, transactionId) { async function verifyWorktreeRemovalManifestStorage() { const root = manifestRoot(); const rootIdentity = await ensurePrivateDirectory2(root); - const token = randomUUID2(); - const sourcePath = path13.join(root, `.hardlink-probe-${token}.source`); - const linkedPath = path13.join(root, `.hardlink-probe-${token}.linked`); + const token = randomUUID3(); + const sourcePath = path16.join(root, `.hardlink-probe-${token}.source`); + const linkedPath = path16.join(root, `.hardlink-probe-${token}.linked`); let sourceExists = false; let linkedExists = false; let primaryError; try { const handle = await open8( sourcePath, - constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL | (constants7.O_NOFOLLOW ?? 0), + constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | (constants8.O_NOFOLLOW ?? 0), 384 ); sourceExists = true; @@ -39612,7 +40371,7 @@ async function verifyWorktreeRemovalManifestStorage() { } finally { await handle.close(); } - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await link2(sourcePath, linkedPath); linkedExists = true; await Promise.all([ @@ -39624,11 +40383,11 @@ async function verifyWorktreeRemovalManifestStorage() { } const cleanupErrors = []; try { - await assertDirectoryIdentity2(root, rootIdentity); - if (linkedExists) await rm3(linkedPath, { force: false }); - if (sourceExists) await rm3(sourcePath, { force: false }); + await assertDirectoryIdentity3(root, rootIdentity); + if (linkedExists) await rm4(linkedPath, { force: false }); + if (sourceExists) await rm4(sourcePath, { force: false }); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { cleanupErrors.push(error51); } @@ -39654,42 +40413,42 @@ async function persistWorktreeRemovalManifest(manifest) { validateManifestForWrite(manifest); const root = manifestRoot(); const rootIdentity = await ensurePrivateDirectory2(root); - const manifestPath = path13.join(root, `${manifest.transactionId}.json`); - const temporaryPath = path13.join( + const manifestPath = path16.join(root, `${manifest.transactionId}.json`); + const temporaryPath = path16.join( root, - `.${manifest.transactionId}.${randomUUID2()}.tmp` + `.${manifest.transactionId}.${randomUUID3()}.tmp` ); let temporaryExists = false; let manifestExists = false; try { const handle = await open8( temporaryPath, - constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL | (constants7.O_NOFOLLOW ?? 0), + constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | (constants8.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; const temporaryIdentity = await writeSyncedManifest(handle, manifest); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(temporaryPath, temporaryIdentity, 1n); await link2(temporaryPath, manifestPath); manifestExists = true; - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await Promise.all([ assertManifestIdentity(temporaryPath, temporaryIdentity, 2n), assertManifestIdentity(manifestPath, temporaryIdentity, 2n) ]); - await rm3(temporaryPath); + await rm4(temporaryPath); temporaryExists = false; - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); return manifestPath; } catch (error51) { const cleanupErrors = []; try { - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } catch (identityError) { cleanupErrors.push(identityError); temporaryExists = false; @@ -39697,14 +40456,14 @@ async function persistWorktreeRemovalManifest(manifest) { } if (temporaryExists) { try { - await rm3(temporaryPath, { force: true }); + await rm4(temporaryPath, { force: true }); } catch (cleanupError) { cleanupErrors.push(cleanupError); } } if (manifestExists) { try { - await rm3(manifestPath, { force: true }); + await rm4(manifestPath, { force: true }); } catch (cleanupError) { cleanupErrors.push(cleanupError); } @@ -39722,28 +40481,28 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { validateManifestForWrite(manifest); const root = validateManifestPath(manifestPath, manifest.transactionId); const rootIdentity = await ensurePrivateDirectory2(root); - const temporaryPath = path13.join( + const temporaryPath = path16.join( root, - `.${manifest.transactionId}.${randomUUID2()}.tmp` + `.${manifest.transactionId}.${randomUUID3()}.tmp` ); let temporaryExists = false; let primaryError; try { const handle = await open8( temporaryPath, - constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL | (constants7.O_NOFOLLOW ?? 0), + constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | (constants8.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; const temporaryIdentity = await writeSyncedManifest(handle, manifest); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(temporaryPath, temporaryIdentity, 1n); - await rename2(temporaryPath, manifestPath); + await rename3(temporaryPath, manifestPath); temporaryExists = false; - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); } catch (error51) { primaryError = error51; @@ -39751,8 +40510,8 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { } finally { if (temporaryExists) { try { - await assertDirectoryIdentity2(root, rootIdentity); - await rm3(temporaryPath, { force: true }); + await assertDirectoryIdentity3(root, rootIdentity); + await rm4(temporaryPath, { force: true }); } catch (cleanupError) { if (primaryError === void 0) throw cleanupError; throw new AggregateError( @@ -39766,7 +40525,7 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { async function removeWorktreeRemovalManifest(manifestPath, transactionId) { const root = validateManifestPath(manifestPath, transactionId); const rootIdentity = await ensurePrivateDirectory2(root); - const manifestMetadata = await lstat7(manifestPath, { bigint: true }); + const manifestMetadata = await lstat8(manifestPath, { bigint: true }); if (!manifestMetadata.isFile() || manifestMetadata.isSymbolicLink() || manifestMetadata.nlink !== 1n || manifestMetadata.birthtimeNs <= 0n) { throw new RuntimeError("worktree removal manifest identity is ambiguous before removal"); } @@ -39775,23 +40534,23 @@ async function removeWorktreeRemovalManifest(manifestPath, transactionId) { ino: manifestMetadata.ino, birthtimeNs: manifestMetadata.birthtimeNs }; - const guardPath = path13.join( + const guardPath = path16.join( root, - `.remove-manifest-${transactionId}.${randomUUID2()}.guard` + `.remove-manifest-${transactionId}.${randomUUID3()}.guard` ); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await link2(manifestPath, guardPath); await Promise.all([ assertManifestIdentity(manifestPath, identity, 2n), assertManifestIdentity(guardPath, identity, 2n) ]); - await rm3(manifestPath, { force: false }); - await assertDirectoryIdentity2(root, rootIdentity); + await rm4(manifestPath, { force: false }); + await assertDirectoryIdentity3(root, rootIdentity); await assertMissing(manifestPath, "worktree removal manifest"); await assertManifestIdentity(guardPath, identity, 1n); - await rm3(guardPath, { force: false }); + await rm4(guardPath, { force: false }); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await Promise.all([ assertMissing(manifestPath, "worktree removal manifest"), assertMissing(guardPath, "worktree removal manifest guard") @@ -39800,14 +40559,14 @@ async function removeWorktreeRemovalManifest(manifestPath, transactionId) { async function readLinkedManifest(temporaryPath, manifestPath) { const handle = await open8( manifestPath, - constants7.O_RDONLY | (constants7.O_NOFOLLOW ?? 0) + constants8.O_RDONLY | (constants8.O_NOFOLLOW ?? 0) ); let primaryError; try { const [opened, temporary, published] = await Promise.all([ handle.stat({ bigint: true }), - lstat7(temporaryPath, { bigint: true }), - lstat7(manifestPath, { bigint: true }) + lstat8(temporaryPath, { bigint: true }), + lstat8(manifestPath, { bigint: true }) ]); if (!opened.isFile() || opened.nlink !== 2n || opened.size > MAX_MANIFEST_BYTES || !temporary.isFile() || temporary.isSymbolicLink() || temporary.nlink !== 2n || !published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity2(temporary, opened) || !sameIdentity2(published, opened) || temporary.size !== opened.size || published.size !== opened.size) { throw new RuntimeError("linked worktree removal manifest residue is ambiguous"); @@ -39822,8 +40581,8 @@ async function readLinkedManifest(temporaryPath, manifestPath) { } const [settled, settledTemporary, settledPublished] = await Promise.all([ handle.stat({ bigint: true }), - lstat7(temporaryPath, { bigint: true }), - lstat7(manifestPath, { bigint: true }) + lstat8(temporaryPath, { bigint: true }), + lstat8(manifestPath, { bigint: true }) ]); if (offset !== size || !sameIdentity2(settled, opened) || settled.nlink !== 2n || settled.size !== opened.size || settled.mtimeNs !== opened.mtimeNs || settled.ctimeNs !== opened.ctimeNs || !sameIdentity2(settledTemporary, opened) || settledTemporary.nlink !== 2n || !sameIdentity2(settledPublished, opened) || settledPublished.nlink !== 2n) { throw new RuntimeError("linked worktree removal manifest residue changed while reading"); @@ -39846,8 +40605,8 @@ async function readLinkedManifest(temporaryPath, manifestPath) { } async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, transactionId) { const root = validateManifestPath(manifestPath, transactionId); - const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(path13.basename(temporaryPath)); - if (temporaryMatch?.[1] !== transactionId || path13.dirname(temporaryPath) !== root) { + const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(path16.basename(temporaryPath)); + if (temporaryMatch?.[1] !== transactionId || path16.dirname(temporaryPath) !== root) { throw new RuntimeError("temporary worktree removal manifest path is invalid"); } const rootIdentity = await ensurePrivateDirectory2(root); @@ -39855,12 +40614,12 @@ async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, let published; try { [temporary, published] = await Promise.all([ - lstat7(temporaryPath, { bigint: true }), - lstat7(manifestPath, { bigint: true }) + lstat8(temporaryPath, { bigint: true }), + lstat8(manifestPath, { bigint: true }) ]); } catch (error51) { - if (errorCode5(error51) === "ENOENT") { - const remaining = await lstat7(manifestPath, { bigint: true }).catch(() => null); + if (errorCode6(error51) === "ENOENT") { + const remaining = await lstat8(manifestPath, { bigint: true }).catch(() => null); if (remaining !== null && remaining.isFile() && remaining.nlink === 1n) return; } throw error51; @@ -39873,12 +40632,12 @@ async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, ino: published.ino, birthtimeNs: published.birthtimeNs }; - await assertDirectoryIdentity2(root, rootIdentity); - await rm3(temporaryPath, { force: false }); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); + await rm4(temporaryPath, { force: false }); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, publishedIdentity, 1n); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, publishedIdentity, 1n); } async function readWorktreeRemovalManifest(manifestPath, transactionId) { @@ -39888,10 +40647,10 @@ async function readWorktreeRemovalManifest(manifestPath, transactionId) { try { contents = await readStableRegularFile(manifestPath, MAX_MANIFEST_BYTES); } catch (error51) { - if (errorCode5(error51) === "ENOENT") return null; + if (errorCode6(error51) === "ENOENT") return null; throw error51; } - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); if (contents === null) { throw new RuntimeError("worktree removal manifest is not stable"); } @@ -39908,7 +40667,7 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { }); entries = await readdir4(root, { withFileTypes: true }); } catch (error51) { - if (errorCode5(error51) === "ENOENT") return; + if (errorCode6(error51) === "ENOENT") return; throw error51; } for (const entry of entries) { @@ -39919,14 +40678,14 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { if (match === null || !entry.isFile() || entry.isSymbolicLink()) { throw new RuntimeError("worktree removal manifest root contains ambiguous residue"); } - const manifestPath = path13.join(root, entry.name); + const manifestPath = path16.join(root, entry.name); const manifest = await readWorktreeRemovalManifest(manifestPath, match[1]); if (manifest === null) { throw new RuntimeError("worktree removal manifest changed during lease validation"); } let canonicalCommonDir; try { - canonicalCommonDir = await realpath5(manifest.commonDir); + canonicalCommonDir = await realpath6(manifest.commonDir); } catch (error51) { throw new RuntimeError("worktree removal repository identity is unavailable", { cause: error51 @@ -39936,15 +40695,15 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { throw new RuntimeError("repository has a pending worktree removal transaction"); } } - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } async function readPendingWorktreeRemovalManifests() { const root = manifestRoot(); let initialMetadata; try { - initialMetadata = await lstat7(root, { bigint: true }); + initialMetadata = await lstat8(root, { bigint: true }); } catch (error51) { - if (errorCode5(error51) === "ENOENT") return { pending: [], issues: [] }; + if (errorCode6(error51) === "ENOENT") return { pending: [], issues: [] }; return { pending: [], issues: [{ manifestPath: root, error: error51 }] }; } if (!initialMetadata.isDirectory() || initialMetadata.isSymbolicLink()) { @@ -39961,7 +40720,7 @@ async function readPendingWorktreeRemovalManifests() { try { rootIdentity = await ensurePrivateDirectory2(root); entries = await readdir4(root, { withFileTypes: true }); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { return { pending: [], issues: [{ manifestPath: root, error: error51 }] }; } @@ -39972,25 +40731,25 @@ async function readPendingWorktreeRemovalManifests() { for (const entry of sortedEntries) { const guardMatch = MANIFEST_REMOVAL_GUARD.exec(entry.name); if (guardMatch === null) continue; - const guardPath = path13.join(root, entry.name); - const publishedPath = path13.join(root, `${guardMatch[1]}.json`); + const guardPath = path16.join(root, entry.name); + const publishedPath = path16.join(root, `${guardMatch[1]}.json`); try { - await assertDirectoryIdentity2(root, rootIdentity); - const guard = await lstat7(guardPath, { bigint: true }); + await assertDirectoryIdentity3(root, rootIdentity); + const guard = await lstat8(guardPath, { bigint: true }); if (!guard.isFile() || guard.isSymbolicLink() || guard.birthtimeNs <= 0n || guard.nlink !== 1n && guard.nlink !== 2n) { throw new RuntimeError("worktree removal manifest guard is malformed"); } if (guard.nlink === 2n) { - const published = await lstat7(publishedPath, { bigint: true }); + const published = await lstat8(publishedPath, { bigint: true }); if (!published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity2(published, guard)) { throw new RuntimeError("worktree removal manifest guard pair is inconsistent"); } } else { await assertMissing(publishedPath, "removed worktree manifest"); } - await rm3(guardPath, { force: false }); + await rm4(guardPath, { force: false }); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { issues.push({ manifestPath: guardPath, error: error51 }); } @@ -40000,16 +40759,16 @@ async function readPendingWorktreeRemovalManifests() { const match = HARDLINK_PROBE_NAME.exec(entry.name); if (match === null) continue; const pair = probeEntries.get(match[1]) ?? {}; - pair[match[2]] = path13.join(root, entry.name); + pair[match[2]] = path16.join(root, entry.name); probeEntries.set(match[1], pair); } for (const pair of probeEntries.values()) { const paths = [pair.source, pair.linked].filter((value) => value !== void 0); try { - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); const metadata = await Promise.all(paths.map(async (probePath) => ({ path: probePath, - metadata: await lstat7(probePath, { bigint: true }) + metadata: await lstat8(probePath, { bigint: true }) }))); if (metadata.some(({ metadata: value }) => !value.isFile() || value.isSymbolicLink() || value.birthtimeNs <= 0n)) { throw new RuntimeError("manifest hard-link probe residue is malformed"); @@ -40022,10 +40781,10 @@ async function readPendingWorktreeRemovalManifests() { throw new RuntimeError("manifest hard-link probe pair is inconsistent"); } for (const { path: probePath } of metadata.reverse()) { - await rm3(probePath, { force: false }); + await rm4(probePath, { force: false }); } await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { issues.push({ manifestPath: paths[0] ?? root, error: error51 }); } @@ -40033,7 +40792,7 @@ async function readPendingWorktreeRemovalManifests() { for (const entry of sortedEntries) { const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(entry.name); if (temporaryMatch === null) continue; - const temporaryPath = path13.join(root, entry.name); + const temporaryPath = path16.join(root, entry.name); if (!entry.isFile() || entry.isSymbolicLink()) { issues.push({ manifestPath: temporaryPath, @@ -40042,18 +40801,18 @@ async function readPendingWorktreeRemovalManifests() { continue; } const transactionId = temporaryMatch[1]; - const publishedPath = path13.join(root, `${transactionId}.json`); + const publishedPath = path16.join(root, `${transactionId}.json`); try { - await assertDirectoryIdentity2(root, rootIdentity); - const temporaryMetadata = await lstat7(temporaryPath, { bigint: true }); + await assertDirectoryIdentity3(root, rootIdentity); + const temporaryMetadata = await lstat8(temporaryPath, { bigint: true }); if (temporaryMetadata.nlink === 1n) { const contents = await readStableRegularFile(temporaryPath, MAX_MANIFEST_BYTES); if (contents === null) { throw new RuntimeError("unpublished worktree removal manifest is not stable"); } - await rm3(temporaryPath, { force: false }); + await rm4(temporaryPath, { force: false }); await syncDirectoryMetadata(root); - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } else { const contents = await readLinkedManifest(temporaryPath, publishedPath); pending.push({ @@ -40070,7 +40829,7 @@ async function readPendingWorktreeRemovalManifests() { } for (const entry of sortedEntries) { if (TEMPORARY_MANIFEST_NAME.test(entry.name) || HARDLINK_PROBE_NAME.test(entry.name) || MANIFEST_REMOVAL_GUARD.test(entry.name)) continue; - const manifestPath = path13.join(root, entry.name); + const manifestPath = path16.join(root, entry.name); const match = MANIFEST_NAME.exec(entry.name); if (match === null || !entry.isFile() || entry.isSymbolicLink()) { issues.push({ @@ -40081,7 +40840,7 @@ async function readPendingWorktreeRemovalManifests() { } if (linkedPublishedPaths.has(manifestPath)) continue; try { - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); const contents = await readStableRegularFile(manifestPath, MAX_MANIFEST_BYTES); if (contents === null) throw new RuntimeError("worktree removal manifest is not stable"); pending.push({ manifestPath, manifest: parseManifest(contents, match[1]) }); @@ -40090,7 +40849,7 @@ async function readPendingWorktreeRemovalManifests() { } } try { - await assertDirectoryIdentity2(root, rootIdentity); + await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { return { pending: [], issues: [...issues, { manifestPath: root, error: error51 }] }; } @@ -40222,12 +40981,12 @@ var WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY = "claude-architect-quarantine"; function delay2(milliseconds) { return new Promise((resolve2) => setTimeout(resolve2, milliseconds)); } -function errorCode6(error51) { +function errorCode7(error51) { return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; } async function syncChangedDirectories(dependencies, ...directories) { const syncDirectory4 = dependencies.syncDirectory ?? syncDirectoryMetadata; - for (const directory of new Set(directories.map((value) => path14.resolve(value)))) { + for (const directory of new Set(directories.map((value) => path17.resolve(value)))) { await syncDirectory4(directory); } } @@ -40243,14 +41002,14 @@ async function quarantinedIdentityRemainsNamed(quarantineRoot, expectedIdentity) const entries = await readdir5(quarantineRoot, { withFileTypes: true }); for (const entry of entries) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const observed = await managedWorktreeDirectoryIdentity(path14.join(quarantineRoot, entry.name)); + const observed = await managedWorktreeDirectoryIdentity(path17.join(quarantineRoot, entry.name)); if (observed !== null && sameDirectoryIdentity(observed, expectedIdentity)) return true; } return false; } async function managedWorktreeDirectoryIdentity(directory) { try { - const metadata = await lstat8(directory, { bigint: true }); + const metadata = await lstat9(directory, { bigint: true }); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { throw new RuntimeError("managed worktree must be a plain directory"); } @@ -40263,7 +41022,7 @@ async function managedWorktreeDirectoryIdentity(directory) { birthtimeNs: metadata.birthtimeNs }; } catch (error51) { - if (errorCode6(error51) === "ENOENT") return null; + if (errorCode7(error51) === "ENOENT") return null; throw error51; } } @@ -40272,7 +41031,7 @@ async function requiredDirectoryIdentity(directory, description) { if (identity === null) throw new RuntimeError(`${description} disappeared`); return identity; } -async function assertDirectoryIdentity3(directory, expected, description) { +async function assertDirectoryIdentity4(directory, expected, description) { const observed = await managedWorktreeDirectoryIdentity(directory); if (observed === null || !sameDirectoryIdentity(observed, expected)) { throw new RuntimeError(`${description} identity changed`); @@ -40308,28 +41067,28 @@ async function removeQuarantinedDirectory(quarantineRoot, quarantinePath, expect } } async function managedPath(worktreePath) { - const root = path14.resolve(resolveStateDir(), "worktrees"); - const target = path14.resolve(worktreePath); + const root = path17.resolve(resolveStateDir(), "worktrees"); + const target = path17.resolve(worktreePath); let canonicalRoot; try { - canonicalRoot = await realpath6(root); + canonicalRoot = await realpath7(root); } catch (error51) { - if (errorCode6(error51) !== "ENOENT") throw error51; - canonicalRoot = path14.join(await realpath6(path14.dirname(root)), path14.basename(root)); + if (errorCode7(error51) !== "ENOENT") throw error51; + canonicalRoot = path17.join(await realpath7(path17.dirname(root)), path17.basename(root)); } let canonicalTarget; try { canonicalTarget = await canonicalizeWorktreePath(target, true); } catch (error51) { - if (errorCode6(error51) !== "ENOENT") throw error51; - const targetParent = path14.dirname(target); - canonicalTarget = path14.join( - await realpath6(path14.dirname(targetParent)), - path14.basename(targetParent), - path14.basename(target) + if (errorCode7(error51) !== "ENOENT") throw error51; + const targetParent = path17.dirname(target); + canonicalTarget = path17.join( + await realpath7(path17.dirname(targetParent)), + path17.basename(targetParent), + path17.basename(target) ); } - if (platformPathsEqual(canonicalTarget, canonicalRoot) || !platformPathsEqual(path14.dirname(canonicalTarget), canonicalRoot)) { + if (platformPathsEqual(canonicalTarget, canonicalRoot) || !platformPathsEqual(path17.dirname(canonicalTarget), canonicalRoot)) { throw new RuntimeError("refusing to remove unmanaged worktree path"); } return { root: canonicalRoot, target: canonicalTarget }; @@ -40348,18 +41107,18 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option if (!sameDirectoryIdentity(observedIdentity, expectedIdentity)) { throw new RuntimeError("managed worktree directory identity changed before quarantine"); } - const quarantineToken = (options.uuid ?? randomUUID3)(); + const quarantineToken = (options.uuid ?? randomUUID4)(); if (!SAFE_QUARANTINE_TOKEN.test(quarantineToken)) { throw new RuntimeError("invalid managed worktree quarantine token"); } - const quarantinePath = path14.join( + const quarantinePath = path17.join( quarantineRoot, `.remove-${quarantineLabel}-${quarantineToken}` ); - if (path14.dirname(quarantinePath) !== quarantineRoot) { + if (path17.dirname(quarantinePath) !== quarantineRoot) { throw new RuntimeError("managed worktree quarantine path escaped its root"); } - const move = options.rename ?? rename3; + const move = options.rename ?? rename4; const wait = options.delay ?? delay2; let moveError; let moved = false; @@ -40449,7 +41208,7 @@ async function removeManagedWorktreeDirectory(worktreePath, options = {}) { return await removeDirectoryByQuarantine( root, target, - path14.basename(target), + path17.basename(target), options ); } @@ -40465,19 +41224,19 @@ async function isRegisteredWorktree(repoRoot, worktreePath, runGit, allowMissing ) !== -1; } async function boundPlainChildDirectory(root, candidate, description) { - const resolvedCandidate = path14.resolve(candidate); - if (!path14.isAbsolute(candidate) || !platformPathsEqual(path14.dirname(resolvedCandidate), root)) { + const resolvedCandidate = path17.resolve(candidate); + if (!path17.isAbsolute(candidate) || !platformPathsEqual(path17.dirname(resolvedCandidate), root)) { throw new RuntimeError(`${description} escaped its root`); } - const before = await lstat8(resolvedCandidate, { bigint: true }); + const before = await lstat9(resolvedCandidate, { bigint: true }); if (!before.isDirectory() || before.isSymbolicLink() || before.birthtimeNs <= 0n) { throw new RuntimeError(`${description} is not a stable plain directory`); } - const canonical = await realpath6(resolvedCandidate); - if (!platformPathsEqual(canonical, resolvedCandidate) || !platformPathsEqual(path14.dirname(canonical), root)) { + const canonical = await realpath7(resolvedCandidate); + if (!platformPathsEqual(canonical, resolvedCandidate) || !platformPathsEqual(path17.dirname(canonical), root)) { throw new RuntimeError(`${description} changed identity during canonicalization`); } - const after = await lstat8(resolvedCandidate, { bigint: true }); + const after = await lstat9(resolvedCandidate, { bigint: true }); if (!after.isDirectory() || after.isSymbolicLink() || after.dev !== before.dev || after.ino !== before.ino || after.birthtimeNs <= 0n || after.birthtimeNs !== before.birthtimeNs) { throw new RuntimeError(`${description} changed identity during validation`); } @@ -40493,9 +41252,9 @@ async function boundPlainChildDirectory(root, candidate, description) { async function worktreeMarkerRegistrationPath(worktreePath) { let contents; try { - contents = await readStableRegularFile(path14.join(worktreePath, ".git"), 32768n); + contents = await readStableRegularFile(path17.join(worktreePath, ".git"), 32768n); } catch (error51) { - if (errorCode6(error51) === "ENOENT") return null; + if (errorCode7(error51) === "ENOENT") return null; throw error51; } if (contents === null) return null; @@ -40504,10 +41263,10 @@ async function worktreeMarkerRegistrationPath(worktreePath) { throw new RuntimeError("managed worktree marker is malformed"); } const registrationPath = marker.slice("gitdir: ".length); - if (!path14.isAbsolute(registrationPath)) { + if (!path17.isAbsolute(registrationPath)) { throw new RuntimeError("managed worktree marker registration is not absolute"); } - return path14.resolve(registrationPath); + return path17.resolve(registrationPath); } async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { const markerRegistrationPath = await worktreeMarkerRegistrationPath(worktreePath); @@ -40548,16 +41307,16 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { gitDirResult.stdout, "worktree administrative directory" ); - if (!path14.isAbsolute(reportedCommonDir) || !path14.isAbsolute(reportedAdministrativePath)) { + if (!path17.isAbsolute(reportedCommonDir) || !path17.isAbsolute(reportedAdministrativePath)) { throw new RuntimeError("worktree registration lookup returned a non-absolute path"); } - const commonDir = await realpath6(reportedCommonDir); - const expectedAdministrativeRoot = path14.join(commonDir, "worktrees"); - const administrativeRoot = await realpath6(expectedAdministrativeRoot); + const commonDir = await realpath7(reportedCommonDir); + const expectedAdministrativeRoot = path17.join(commonDir, "worktrees"); + const administrativeRoot = await realpath7(expectedAdministrativeRoot); if (!platformPathsEqual(administrativeRoot, expectedAdministrativeRoot)) { throw new RuntimeError("worktree administrative root escaped its repository"); } - if (markerRegistrationPath === null || !platformPathsEqual(path14.resolve(reportedAdministrativePath), markerRegistrationPath)) { + if (markerRegistrationPath === null || !platformPathsEqual(path17.resolve(reportedAdministrativePath), markerRegistrationPath)) { throw new RuntimeError("worktree marker names a different administrative directory"); } const administrative = await boundPlainChildDirectory( @@ -40566,7 +41325,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { "worktree administrative directory" ); const contents = await readStableRegularFile( - path14.join(administrative.path, "gitdir"), + path17.join(administrative.path, "gitdir"), 32768n ); if (contents === null) { @@ -40576,7 +41335,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { contents.toString("utf8"), "worktree registration backlink" ); - if (!path14.isAbsolute(backlink) || await realpath6(backlink) !== await realpath6(path14.join(worktreePath, ".git"))) { + if (!path17.isAbsolute(backlink) || await realpath7(backlink) !== await realpath7(path17.join(worktreePath, ".git"))) { throw new RuntimeError("worktree registration backlink does not match the managed path"); } return { @@ -40587,7 +41346,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { }; } async function registrationQuarantineRoot(commonDir, dependencies) { - const quarantineRoot = path14.join(commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY); + const quarantineRoot = path17.join(commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY); await ensurePrivateDirectory(quarantineRoot, { description: "worktree registration quarantine", migratePermissions: true, @@ -40604,7 +41363,7 @@ async function restoreStagedRegistration(registrationRoot, registrationPath, qua if (registrationRootIdentity === null || !sameDirectoryIdentity(registrationRootIdentity, expectedRegistrationRootIdentity) || quarantineRootIdentity === null || !sameDirectoryIdentity(quarantineRootIdentity, expectedQuarantineRootIdentity) || sourceIdentity === null || !sameDirectoryIdentity(sourceIdentity, expectedIdentity) || destinationIdentity !== null) { throw new RuntimeError("staged worktree registration rollback is unsafe"); } - const move = dependencies.rename ?? rename3; + const move = dependencies.rename ?? rename4; const wait = dependencies.delay ?? delay2; let moveError; let restored = false; @@ -40632,7 +41391,7 @@ async function restoreStagedRegistration(registrationRoot, registrationPath, qua } } async function stageRegistrationDirectory(repoRoot, registration, worktreePath, quarantineRoot, quarantinePath, transactionId, runGit, dependencies, allowMissingWorktree = false) { - const quarantineLabel = `registration-${path14.basename(registration.path)}`; + const quarantineLabel = `registration-${path17.basename(registration.path)}`; const [registrationRootIdentity, quarantineRootIdentity] = await Promise.all([ requiredDirectoryIdentity(registration.root, "Git registration root"), requiredDirectoryIdentity(quarantineRoot, "Git registration quarantine root") @@ -40688,12 +41447,12 @@ async function stageRegistrationDirectory(repoRoot, registration, worktreePath, return { async commit() { await Promise.all([ - assertDirectoryIdentity3( + assertDirectoryIdentity4( registration.root, registrationRootIdentity, "Git registration root" ), - assertDirectoryIdentity3( + assertDirectoryIdentity4( quarantineRoot, quarantineRootIdentity, "Git registration quarantine root" @@ -40711,7 +41470,7 @@ async function stageRegistrationDirectory(repoRoot, registration, worktreePath, if (await managedWorktreeDirectoryIdentity(registration.path) !== null) { throw new RuntimeError("staged worktree registration pathname reappeared during commit"); } - await assertDirectoryIdentity3( + await assertDirectoryIdentity4( registration.root, registrationRootIdentity, "Git registration root" @@ -40744,12 +41503,12 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr commonResult.stdout, "stale worktree common directory" ); - if (!path14.isAbsolute(reportedCommonDir) || !path14.isAbsolute(worktreeGitDir)) { + if (!path17.isAbsolute(reportedCommonDir) || !path17.isAbsolute(worktreeGitDir)) { throw new RuntimeError("stale worktree registration paths must be absolute"); } - const commonDir = await realpath6(reportedCommonDir); - const expectedRegistrationRoot = path14.join(commonDir, "worktrees"); - const registrationRoot = await realpath6(expectedRegistrationRoot); + const commonDir = await realpath7(reportedCommonDir); + const expectedRegistrationRoot = path17.join(commonDir, "worktrees"); + const registrationRoot = await realpath7(expectedRegistrationRoot); if (!platformPathsEqual(registrationRoot, expectedRegistrationRoot)) { throw new RuntimeError("stale worktree administrative root escaped its repository"); } @@ -40759,8 +41518,8 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr "stale worktree administrative directory" ); const [gitdirContents, headContents] = await Promise.all([ - readStableRegularFile(path14.join(registration.path, "gitdir"), 32768n), - readStableRegularFile(path14.join(registration.path, "HEAD"), 32768n) + readStableRegularFile(path17.join(registration.path, "gitdir"), 32768n), + readStableRegularFile(path17.join(registration.path, "HEAD"), 32768n) ]); if (gitdirContents === null || headContents === null) { throw new RuntimeError("stale worktree registration files are not stable"); @@ -40770,12 +41529,12 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr "stale worktree registration backlink" ); const head = gitPathOutput(headContents.toString("utf8"), "stale worktree HEAD"); - if (!path14.isAbsolute(backlink) || path14.basename(backlink) !== ".git" || (expectedBranchRef === null ? !(/^ref: refs\//u.test(head) || /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u.test(head)) : head !== `ref: ${expectedBranchRef}`)) { + if (!path17.isAbsolute(backlink) || path17.basename(backlink) !== ".git" || (expectedBranchRef === null ? !(/^ref: refs\//u.test(head) || /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u.test(head)) : head !== `ref: ${expectedBranchRef}`)) { throw new RuntimeError("stale worktree registration identity is inconsistent"); } const { target } = await managedPath(worktreePath); const canonicalBacklinkWorktree = await canonicalizeWorktreePath( - path14.dirname(path14.resolve(backlink)), + path17.dirname(path17.resolve(backlink)), true ); const canonicalExpectedWorktree = await canonicalizeWorktreePath(target, true); @@ -40803,12 +41562,12 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, commonResult.stdout, "missing worktree common directory" ); - if (!path14.isAbsolute(reportedCommonDir)) { + if (!path17.isAbsolute(reportedCommonDir)) { throw new RuntimeError("missing worktree common directory is not absolute"); } - const commonDir = await realpath6(reportedCommonDir); - const expectedRegistrationRoot = path14.join(commonDir, "worktrees"); - const registrationRoot = await realpath6(expectedRegistrationRoot); + const commonDir = await realpath7(reportedCommonDir); + const expectedRegistrationRoot = path17.join(commonDir, "worktrees"); + const registrationRoot = await realpath7(expectedRegistrationRoot); if (!platformPathsEqual(registrationRoot, expectedRegistrationRoot)) { throw new RuntimeError("worktree administrative root escaped its repository"); } @@ -40816,12 +41575,12 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, const matches = []; for (const entry of await readdir5(registrationRoot, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path14.join(registrationRoot, entry.name); + const registrationPath = path17.join(registrationRoot, entry.name); if (expectedRegistrationPath !== null && !platformPathsEqual(registrationPath, expectedRegistrationPath)) { continue; } const contents = await readStableRegularFile( - path14.join(registrationPath, "gitdir"), + path17.join(registrationPath, "gitdir"), 32768n ); if (contents === null) continue; @@ -40831,15 +41590,15 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, } catch { continue; } - if (!path14.isAbsolute(backlink) || path14.basename(backlink) !== ".git") continue; + if (!path17.isAbsolute(backlink) || path17.basename(backlink) !== ".git") continue; let candidateWorktree; try { - candidateWorktree = await canonicalizeWorktreePath(path14.dirname(backlink), true); + candidateWorktree = await canonicalizeWorktreePath(path17.dirname(backlink), true); } catch { continue; } if (platformPathsEqual(candidateWorktree, expectedWorktree)) { - matches.push(await realpath6(registrationPath)); + matches.push(await realpath7(registrationPath)); } } if (matches.length !== 1) { @@ -40878,21 +41637,21 @@ async function removeStaleWorktreeRegistration(repoRoot, worktreePath, worktreeG expectedBranchRef, runGit ); - const transactionId = (dependencies.uuid ?? randomUUID3)(); + const transactionId = (dependencies.uuid ?? randomUUID4)(); if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid stale worktree quarantine token"); } - const physicalQuarantinePath = path14.join( + const physicalQuarantinePath = path17.join( root, - `.remove-${path14.basename(target)}-${transactionId}` + `.remove-${path17.basename(target)}-${transactionId}` ); const quarantineRoot = await registrationQuarantineRoot( registration.commonDir, dependencies ); - const quarantinePath = path14.join( + const quarantinePath = path17.join( quarantineRoot, - `.remove-registration-${path14.basename(registration.path)}-${transactionId}` + `.remove-registration-${path17.basename(registration.path)}-${transactionId}` ); const [ commonDirIdentity, @@ -40906,10 +41665,10 @@ async function removeStaleWorktreeRegistration(repoRoot, worktreePath, worktreeG requiredDirectoryIdentity(quarantineRoot, "Git registration quarantine root") ]); const assertRemovalRoots = async () => await Promise.all([ - assertDirectoryIdentity3(registration.commonDir, commonDirIdentity, "Git common directory"), - assertDirectoryIdentity3(root, physicalRootIdentity, "managed worktree root"), - assertDirectoryIdentity3(registration.root, registrationRootIdentity, "Git registration root"), - assertDirectoryIdentity3( + assertDirectoryIdentity4(registration.commonDir, commonDirIdentity, "Git common directory"), + assertDirectoryIdentity4(root, physicalRootIdentity, "managed worktree root"), + assertDirectoryIdentity4(registration.root, registrationRootIdentity, "Git registration root"), + assertDirectoryIdentity4( quarantineRoot, quarantineRootIdentity, "Git registration quarantine root" @@ -41005,21 +41764,21 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { throw new RuntimeError("managed worktree identity changed before removal transaction"); } const { root, target } = await managedPath(worktreePath); - const transactionId = (dependencies.uuid ?? randomUUID3)(); + const transactionId = (dependencies.uuid ?? randomUUID4)(); if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid physical worktree quarantine token"); } - const physicalQuarantinePath = path14.join( + const physicalQuarantinePath = path17.join( root, - `.remove-${path14.basename(target)}-${transactionId}` + `.remove-${path17.basename(target)}-${transactionId}` ); const quarantineRoot = await registrationQuarantineRoot( registration.commonDir, dependencies ); - const quarantinePath = path14.join( + const quarantinePath = path17.join( quarantineRoot, - `.remove-registration-${path14.basename(registration.path)}-${transactionId}` + `.remove-registration-${path17.basename(registration.path)}-${transactionId}` ); const [ commonDirIdentity, @@ -41033,10 +41792,10 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { requiredDirectoryIdentity(quarantineRoot, "Git registration quarantine root") ]); const assertRemovalRoots = async () => await Promise.all([ - assertDirectoryIdentity3(registration.commonDir, commonDirIdentity, "Git common directory"), - assertDirectoryIdentity3(root, physicalRootIdentity, "managed worktree root"), - assertDirectoryIdentity3(registration.root, registrationRootIdentity, "Git registration root"), - assertDirectoryIdentity3( + assertDirectoryIdentity4(registration.commonDir, commonDirIdentity, "Git common directory"), + assertDirectoryIdentity4(root, physicalRootIdentity, "managed worktree root"), + assertDirectoryIdentity4(registration.root, registrationRootIdentity, "Git registration root"), + assertDirectoryIdentity4( quarantineRoot, quarantineRootIdentity, "Git registration quarantine root" @@ -41096,7 +41855,7 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { const removed = await removeDirectoryByQuarantine( root, target, - path14.basename(target), + path17.basename(target), { ...dependencies, uuid: () => transactionId, @@ -41174,20 +41933,20 @@ var WorktreeManager = class { if (primaryError !== void 0) throw primaryError; return result; } - managedWorktreePath(stateRoot2 = path14.resolve(resolveStateDir())) { + managedWorktreePath(stateRoot2 = path17.resolve(resolveStateDir())) { if (!SAFE_MANAGED_ID.test(this.runId)) { throw new RuntimeError("invalid worktree run id"); } - const worktreesRoot = path14.resolve(stateRoot2, "worktrees"); - const worktreePath = path14.resolve(worktreesRoot, this.runId); - if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path14.sep}`)) { + const worktreesRoot = path17.resolve(stateRoot2, "worktrees"); + const worktreePath = path17.resolve(worktreesRoot, this.runId); + if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path17.sep}`)) { throw new RuntimeError("invalid worktree run id"); } return { worktreesRoot, worktreePath }; } async prepareManagedWorktreeRoot() { await verifyBoundDirectoryCleanupSupport(this.lockingPlatformServices()); - const configuredStateRoot = path14.resolve(resolveStateDir()); + const configuredStateRoot = path17.resolve(resolveStateDir()); const syncDirectory4 = this.dependencies.syncDirectory ?? syncDirectoryMetadata; const stateRootIdentity = await ensurePrivateDirectory(configuredStateRoot, { description: "runtime state root", @@ -41195,8 +41954,8 @@ var WorktreeManager = class { syncDirectory: syncDirectory4, ...this.dependencies.processSupervisor === void 0 ? {} : { platformServices: this.dependencies.processSupervisor } }); - const stateRoot2 = await realpath6(configuredStateRoot); - await assertDirectoryIdentity3(stateRoot2, stateRootIdentity, "runtime state root"); + const stateRoot2 = await realpath7(configuredStateRoot); + await assertDirectoryIdentity4(stateRoot2, stateRootIdentity, "runtime state root"); const { worktreesRoot, worktreePath } = this.managedWorktreePath(stateRoot2); const worktreesRootIdentity = await ensurePrivateDirectory(worktreesRoot, { description: "managed worktree root", @@ -41206,8 +41965,8 @@ var WorktreeManager = class { }); await (this.dependencies.verifyRemovalStorage ?? verifyWorktreeRemovalManifestStorage)(); await Promise.all([ - assertDirectoryIdentity3(stateRoot2, stateRootIdentity, "runtime state root"), - assertDirectoryIdentity3(worktreesRoot, worktreesRootIdentity, "managed worktree root") + assertDirectoryIdentity4(stateRoot2, stateRootIdentity, "runtime state root"), + assertDirectoryIdentity4(worktreesRoot, worktreesRootIdentity, "managed worktree root") ]); return { worktreesRoot, @@ -41228,22 +41987,22 @@ var WorktreeManager = class { commonResult.stdout, "worktree creation common directory" ); - if (!path14.isAbsolute(reportedCommonDir)) { + if (!path17.isAbsolute(reportedCommonDir)) { throw new RuntimeError("worktree creation common directory is not absolute"); } - const commonDir = await realpath6(reportedCommonDir); - const registrationRoot = path14.join(commonDir, "worktrees"); + const commonDir = await realpath7(reportedCommonDir); + const registrationRoot = path17.join(commonDir, "worktrees"); let registrationRootCreated = false; try { await mkdir4(registrationRoot, { mode: 448 }); registrationRootCreated = true; } catch (error51) { - if (errorCode6(error51) !== "EEXIST") throw error51; + if (errorCode7(error51) !== "EEXIST") throw error51; } if (registrationRootCreated) { await (this.dependencies.syncDirectory ?? syncDirectoryMetadata)(commonDir); } - const registrationMetadata = await lstat8(registrationRoot, { bigint: true }); + const registrationMetadata = await lstat9(registrationRoot, { bigint: true }); if (!registrationMetadata.isDirectory() || registrationMetadata.isSymbolicLink() || registrationMetadata.birthtimeNs <= 0n) { throw new RuntimeError("Git worktree registration root lacks stable identity"); } @@ -41263,21 +42022,21 @@ var WorktreeManager = class { registrationRoot, registrationRootIdentity ); - const transactionId = (this.dependencies.uuid ?? randomUUID3)(); + const transactionId = (this.dependencies.uuid ?? randomUUID4)(); if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid worktree creation transaction token"); } - const registrationPath = path14.join( + const registrationPath = path17.join( registrationRoot, `.creation-${transactionId}` ); - const quarantinePath = path14.join( + const quarantinePath = path17.join( quarantineRoot, `.remove-registration-creation-${transactionId}` ); - const stagingPath = path14.join( + const stagingPath = path17.join( worktreesRoot, - `.create-${path14.basename(worktreePath)}-${transactionId}` + `.create-${path17.basename(worktreePath)}-${transactionId}` ); let manifest = { manifestVersion: "1", @@ -41311,14 +42070,14 @@ var WorktreeManager = class { registrationBirthtimeNs: "0" }; const manifestPath = await persistWorktreeRemovalManifest(manifest); - await assertDirectoryIdentity3(worktreesRoot, rootIdentity, "managed worktree root"); + await assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"); await mkdir4(stagingPath, { mode: 448 }); await syncChangedDirectories(this.dependencies, worktreesRoot); const physicalIdentity = await requiredDirectoryIdentity( stagingPath, "worktree creation placeholder" ); - await assertDirectoryIdentity3(worktreesRoot, rootIdentity, "managed worktree root"); + await assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"); manifest = { ...manifest, physicalPresent: true, @@ -41327,12 +42086,12 @@ var WorktreeManager = class { physicalBirthtimeNs: physicalIdentity.birthtimeNs.toString() }; await replaceWorktreeRemovalManifest(manifestPath, manifest); - await assertDirectoryIdentity3(worktreesRoot, rootIdentity, "managed worktree root"); - await (this.dependencies.rename ?? rename3)(stagingPath, worktreePath); + await assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"); + await (this.dependencies.rename ?? rename4)(stagingPath, worktreePath); await syncChangedDirectories(this.dependencies, worktreesRoot); await Promise.all([ - assertDirectoryIdentity3(worktreesRoot, rootIdentity, "managed worktree root"), - assertDirectoryIdentity3(worktreePath, physicalIdentity, "worktree creation placeholder") + assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"), + assertDirectoryIdentity4(worktreePath, physicalIdentity, "worktree creation placeholder") ]); return { manifestPath, transactionId, physicalIdentity }; } @@ -41404,14 +42163,14 @@ var WorktreeManager = class { commonResult.stdout, "worktree registration filesystem" ); - if (!path14.isAbsolute(reported)) { + if (!path17.isAbsolute(reported)) { throw new RuntimeError("worktree registration filesystem path is not absolute"); } - const commonDir = await realpath6(reported); + const commonDir = await realpath7(reported); if (await managedWorktreeDirectoryIdentity(commonDir) === null) { throw new RuntimeError("worktree registration filesystem identity is unavailable"); } - const registrationRoot = path14.join(commonDir, "worktrees"); + const registrationRoot = path17.join(commonDir, "worktrees"); const existingRegistrationRoot = await managedWorktreeDirectoryIdentity(registrationRoot); if (existingRegistrationRoot !== null && existingRegistrationRoot.birthtimeNs <= 0n) { throw new RuntimeError("worktree registration root lacks stable identity"); @@ -41433,9 +42192,9 @@ var WorktreeManager = class { registration.commonDir ); await Promise.all([ - assertDirectoryIdentity3(worktreesRoot, rootIdentity, "managed worktree root"), - assertDirectoryIdentity3(worktreePath, identity, "created worktree"), - assertDirectoryIdentity3( + assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"), + assertDirectoryIdentity4(worktreePath, identity, "created worktree"), + assertDirectoryIdentity4( registration.path, registration.identity, "created Git registration" @@ -41600,11 +42359,11 @@ var WorktreeManager = class { try { canonicalExpectedPath = await canonicalizeWorktreePath(expectedWorktreePath, true); } catch (error51) { - if (errorCode6(error51) !== "ENOENT") throw error51; - canonicalExpectedPath = path14.join( - await realpath6(path14.resolve(resolveStateDir())), + if (errorCode7(error51) !== "ENOENT") throw error51; + canonicalExpectedPath = path17.join( + await realpath7(path17.resolve(resolveStateDir())), "worktrees", - path14.basename(expectedWorktreePath) + path17.basename(expectedWorktreePath) ); } if (!platformPathsEqual(canonicalWorktreePath, canonicalExpectedPath)) { @@ -41631,180 +42390,8 @@ var WorktreeManager = class { }; // src/verify/project-verifier.ts -import { realpath as realpath7 } from "node:fs/promises"; -import path16 from "node:path"; - -// src/runtime/environment-policy.ts -import path15 from "node:path"; -var POSIX_ESSENTIAL_ENV = [ - "HOME", - "PATH", - "TMPDIR", - "LANG", - "LC_ALL", - "XDG_CONFIG_HOME", - "XDG_CACHE_HOME", - "XDG_DATA_HOME", - "XDG_STATE_HOME", - "XDG_RUNTIME_DIR" -]; -var WIN32_ESSENTIAL_ENV = [ - "SystemRoot", - "ComSpec", - "TEMP", - "TMP", - "USERPROFILE", - "APPDATA", - "LOCALAPPDATA", - "Path" -]; -var SENSITIVE_ENV_NAME = /^(?:[A-Za-z][A-Za-z0-9]*_)*(?:TOKEN|SECRET|PASSWORD|KEY|CREDENTIAL|PAT|COOKIE|DSN)(?:_[A-Za-z0-9]+)*$/i; -var COMMON_SENSITIVE_ENV_NAMES = /* @__PURE__ */ new Set([ - "DATABASE_URL", - "GOOGLE_APPLICATION_CREDENTIALS", - "MYSQL_PWD", - "PGPASSWORD", - "REDISCLI_AUTH" -]); -function normalizeEnvironmentName(name) { - return name.replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z0-9])([A-Z])/g, "$1_$2").toUpperCase(); -} -function isSensitiveEnvironmentName(name) { - const normalized = normalizeEnvironmentName(name); - return SENSITIVE_ENV_NAME.test(normalized) || COMMON_SENSITIVE_ENV_NAMES.has(normalized); -} -function validateEnvironmentName(name) { - if (name.length === 0 || name.includes("=") || name.includes("\0")) { - throw new RuntimeError(`invalid environment variable name: ${JSON.stringify(name)}`); - } -} -function validateEnvironmentValue(name, value) { - if (value.includes("\0")) { - throw new RuntimeError(`invalid environment variable value for ${JSON.stringify(name)}`); - } -} -function combineSecretRegistrations(registrations) { - let active = true; - return { - dispose() { - if (!active) return; - active = false; - for (const registration of registrations) registration.dispose(); - } - }; -} -function registerSensitiveValues(environment, validateEntries) { - const registrations = []; - try { - for (const [name, value] of Object.entries(environment)) { - if (value === void 0) continue; - if (validateEntries) { - validateEnvironmentName(name); - validateEnvironmentValue(name, value); - } - if (isSensitiveEnvironmentName(name)) { - registrations.push(registerSecretValue(value)); - } - } - return combineSecretRegistrations(registrations); - } catch (error51) { - combineSecretRegistrations(registrations).dispose(); - throw error51; - } -} -function registerSensitiveEnvironment(environment) { - return registerSensitiveValues(environment, true); -} -function setEnvironmentValue(environment, provenance, name, value, source) { - validateEnvironmentName(name); - validateEnvironmentValue(name, value); - Object.defineProperty(environment, name, { - value, - writable: true, - enumerable: true, - configurable: true - }); - provenance.set(name, source); -} -function compareNames(left, right) { - return left < right ? -1 : left > right ? 1 : 0; -} -function buildEnvironment(args) { - const env = {}; - const provenance = /* @__PURE__ */ new Map(); - const hostSecretRegistration = registerSensitiveValues(process.env, false); - try { - const platformEnvironment = args.os === "win32" ? normalizeWindowsEnv(process.env) : process.env; - const platformNames = args.os === "win32" ? WIN32_ESSENTIAL_ENV : POSIX_ESSENTIAL_ENV; - for (const name of platformNames) { - if (args.tempHome !== void 0 && name.startsWith("XDG_")) continue; - const value = platformEnvironment[name]; - if (value !== void 0) { - setEnvironmentValue(env, provenance, name, value, "platform"); - } - } - if (args.tempHome !== void 0) { - if (args.os === "win32") { - setEnvironmentValue(env, provenance, "USERPROFILE", args.tempHome, "platform"); - setEnvironmentValue( - env, - provenance, - "APPDATA", - path15.win32.join(args.tempHome, "AppData", "Roaming"), - "platform" - ); - setEnvironmentValue( - env, - provenance, - "LOCALAPPDATA", - path15.win32.join(args.tempHome, "AppData", "Local"), - "platform" - ); - } else { - setEnvironmentValue(env, provenance, "HOME", args.tempHome, "platform"); - } - } - for (const name of args.adapterAllowlist) { - validateEnvironmentName(name); - if (args.os !== "win32" && args.tempHome !== void 0 && name.startsWith("XDG_")) continue; - if (!Object.prototype.hasOwnProperty.call(process.env, name)) continue; - const value = process.env[name]; - if (value !== void 0) { - setEnvironmentValue(env, provenance, name, value, "adapter"); - } - } - for (const [name, value] of Object.entries(args.adapterValues ?? {})) { - validateEnvironmentName(name); - if (args.os !== "win32" && args.tempHome !== void 0 && name.startsWith("XDG_")) continue; - if (Object.prototype.hasOwnProperty.call(env, name)) continue; - setEnvironmentValue(env, provenance, name, value, "adapter"); - } - for (const [name, value] of Object.entries(args.specAdditions ?? {})) { - setEnvironmentValue(env, provenance, name, value, "spec"); - } - setEnvironmentValue( - env, - provenance, - "CLAUDE_ARCHITECT_DELEGATED", - "1", - "platform" - ); - const environmentSecretRegistration = registerSensitiveEnvironment(env); - return { - env, - provenance: [...provenance.entries()].map(([name, source]) => ({ name, source })).sort((left, right) => compareNames(left.name, right.name)), - secretRegistration: combineSecretRegistrations([ - hostSecretRegistration, - environmentSecretRegistration - ]) - }; - } catch (error51) { - hostSecretRegistration.dispose(); - throw error51; - } -} - -// src/verify/project-verifier.ts +import { realpath as realpath8 } from "node:fs/promises"; +import path18 from "node:path"; var MAX_COMMAND_OUTPUT_BYTES = 1e6; var MAX_DIAGNOSTIC_LENGTH3 = 2e3; var POSIX_ESSENTIAL_ENV2 = [ @@ -41852,17 +42439,17 @@ function commandEnvironment(command, os) { } function isWithinScope(root, candidate, os) { if (os === "win32") return canonicalizeForScope(candidate, root); - const relative2 = path16.posix.relative(root, candidate); - return relative2 === "" || !path16.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); + const relative2 = path18.posix.relative(root, candidate); + return relative2 === "" || !path18.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); } async function resolveCommandCwd(worktreePath, commandCwd, os) { - if (path16.isAbsolute(commandCwd)) return null; - const lexical = path16.resolve(worktreePath, commandCwd); + if (path18.isAbsolute(commandCwd)) return null; + const lexical = path18.resolve(worktreePath, commandCwd); if (!isWithinScope(worktreePath, lexical, os)) return null; try { const [canonicalRoot, canonicalCwd] = await Promise.all([ - realpath7(worktreePath), - realpath7(lexical) + realpath8(worktreePath), + realpath8(lexical) ]); return isWithinScope(canonicalRoot, canonicalCwd, os) ? canonicalCwd : null; } catch { @@ -41907,7 +42494,7 @@ async function executeCommand(args) { const environment = commandEnvironment(command, ps.os); executable = await ps.resolveExecutable({ name: command.executable, - ...path16.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}, + ...path18.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}, searchPath: environment.PATH ?? environment.Path ?? "" }); exit = await supervise(ps, { @@ -42394,20 +42981,20 @@ var AcceptanceVerifier = class { }; // src/runtime/artifact-store.ts -import { randomUUID as randomUUID4 } from "node:crypto"; -import { constants as constants8 } from "node:fs"; +import { randomUUID as randomUUID5 } from "node:crypto"; +import { constants as constants9 } from "node:fs"; import { link as link3, - lstat as lstat9, + lstat as lstat10, mkdir as mkdir5, open as open9, opendir, readdir as readdir6, - realpath as realpath8, - rename as rename4, - rm as rm4 + realpath as realpath9, + rename as rename5, + rm as rm5 } from "node:fs/promises"; -import path17 from "node:path"; +import path19 from "node:path"; // src/runtime/run-manifest.ts import { createHash as createHash9 } from "node:crypto"; @@ -42484,11 +43071,11 @@ function withManifestHash(body) { manifestHash: sha2562(stableJson(sanitized)) }; } -function isRecord8(value) { +function isRecord6(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } function hasExactKeys2(value, expected) { - if (!isRecord8(value)) return false; + if (!isRecord6(value)) return false; const actual = Object.keys(value); return actual.length === expected.length && expected.every((key) => actual.includes(key)); } @@ -42525,7 +43112,7 @@ function assertManifestShape(value) { "schemaVersions", "packagedVerifier", "manifestHash" - ]) || value.manifestVersion !== "1" || typeof value.runId !== "string" || typeof value.repoRoot !== "string" || !isObjectId(value.baseCommitOid) || value.candidateManifestHash !== null && !isSha256(value.candidateManifestHash) || !hasExactKeys2(value.producer, ["id", "version", "model"]) || !isNullableString(value.producer.id) || !isNullableString(value.producer.version) || !isNullableString(value.producer.model) || !isRecord8(value.effectivePolicy) || !Array.isArray(value.repositoryInstructions) || !value.repositoryInstructions.every((instruction) => hasExactKeys2(instruction, ["path", "hash"]) && typeof instruction.path === "string" && isSha256(instruction.hash)) || !isSha256(value.promptHash) || !isRecord8(value.executionPolicy) || !Array.isArray(value.environment) || !value.environment.every((entry) => hasExactKeys2(entry, ["name", "source"]) && typeof entry.name === "string" && typeof entry.source === "string") || typeof value.runtimeVersion !== "string" || typeof value.protocolVersion !== "string" || !hasExactKeys2(value.schemaVersions, ["delegationSpec", "attemptResult"]) || typeof value.schemaVersions.delegationSpec !== "string" || typeof value.schemaVersions.attemptResult !== "string" || !hasExactKeys2(value.packagedVerifier, ["version", "hash"]) || typeof value.packagedVerifier.version !== "string" || !isSha256(value.packagedVerifier.hash) || !isSha256(value.manifestHash)) { + ]) || value.manifestVersion !== "1" || typeof value.runId !== "string" || typeof value.repoRoot !== "string" || !isObjectId(value.baseCommitOid) || value.candidateManifestHash !== null && !isSha256(value.candidateManifestHash) || !hasExactKeys2(value.producer, ["id", "version", "model"]) || !isNullableString(value.producer.id) || !isNullableString(value.producer.version) || !isNullableString(value.producer.model) || !isRecord6(value.effectivePolicy) || !Array.isArray(value.repositoryInstructions) || !value.repositoryInstructions.every((instruction) => hasExactKeys2(instruction, ["path", "hash"]) && typeof instruction.path === "string" && isSha256(instruction.hash)) || !isSha256(value.promptHash) || !isRecord6(value.executionPolicy) || !Array.isArray(value.environment) || !value.environment.every((entry) => hasExactKeys2(entry, ["name", "source"]) && typeof entry.name === "string" && typeof entry.source === "string") || typeof value.runtimeVersion !== "string" || typeof value.protocolVersion !== "string" || !hasExactKeys2(value.schemaVersions, ["delegationSpec", "attemptResult"]) || typeof value.schemaVersions.delegationSpec !== "string" || typeof value.schemaVersions.attemptResult !== "string" || !hasExactKeys2(value.packagedVerifier, ["version", "hash"]) || typeof value.packagedVerifier.version !== "string" || !isSha256(value.packagedVerifier.hash) || !isSha256(value.manifestHash)) { throw new RuntimeError("archived run manifest is malformed"); } } @@ -42591,7 +43178,7 @@ var WINDOWS_RESERVED_COMPONENT = /^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i; var CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; var PRUNE_BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; var CLEANUP_JOURNAL = "cleanup.ndjson"; -var NO_FOLLOW3 = constants8.O_NOFOLLOW ?? 0; +var NO_FOLLOW4 = constants9.O_NOFOLLOW ?? 0; var MAX_ARCHIVE_FILE_BYTES = 8e6; var MAX_EVIDENCE_REFERENCES = 4096; var MAX_EVIDENCE_DEPTH = 16; @@ -42612,18 +43199,18 @@ function validateComponent(value, kind) { throw new RuntimeError(`invalid ${kind}: ${JSON.stringify(value)}`); } } -function errorCode7(error51) { +function errorCode8(error51) { return error51.code; } function isMissing2(error51) { - return errorCode7(error51) === "ENOENT"; + return errorCode8(error51) === "ENOENT"; } function isAlreadyPresent(error51) { - return errorCode7(error51) === "EEXIST"; + return errorCode8(error51) === "EEXIST"; } async function pathExists(filename) { try { - await lstat9(filename); + await lstat10(filename); return true; } catch (error51) { if (isMissing2(error51)) return false; @@ -42642,8 +43229,8 @@ function compareEntries(left, right) { return left.runId < right.runId ? -1 : left.runId > right.runId ? 1 : 0; } function isWithin(root, candidate) { - const relative2 = path17.relative(root, candidate); - return relative2 === "" || !path17.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path17.sep}`); + const relative2 = path19.relative(root, candidate); + return relative2 === "" || !path19.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path19.sep}`); } async function ensurePlainDirectory(directory) { let created = false; @@ -42653,11 +43240,11 @@ async function ensurePlainDirectory(directory) { } catch (error51) { if (!isAlreadyPresent(error51)) throw error51; } - const metadata = await lstat9(directory); + const metadata = await lstat10(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(directory)}`); } - if (created) await syncDirectory2(path17.dirname(directory)); + if (created) await syncDirectory3(path19.dirname(directory)); return { dev: metadata.dev, ino: metadata.ino }; } async function ensurePlainDirectoryTree(directory) { @@ -42665,39 +43252,39 @@ async function ensurePlainDirectoryTree(directory) { return await ensurePlainDirectory(directory); } catch (error51) { if (!isMissing2(error51)) throw error51; - const parent = path17.dirname(directory); + const parent = path19.dirname(directory); if (parent === directory) throw error51; await ensurePlainDirectoryTree(parent); return ensurePlainDirectory(directory); } } -async function assertDirectoryIdentity4(directory, expected) { - const metadata = await lstat9(directory); +async function assertDirectoryIdentity5(directory, expected) { + const metadata = await lstat10(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory() || metadata.dev !== expected.dev || metadata.ino !== expected.ino) { throw new RuntimeError("archive directory identity changed during operation"); } } -async function syncDirectory2(directory) { +async function syncDirectory3(directory) { let handle; try { - handle = await open9(directory, constants8.O_RDONLY | NO_FOLLOW3); + handle = await open9(directory, constants9.O_RDONLY | NO_FOLLOW4); await handle.sync(); } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode7(error51) ?? ""); + const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode8(error51) ?? ""); if (!unsupportedOnWindows) throw error51; } finally { await handle?.close(); } } async function readRegularFile(filename, parentIdentity) { - const linkMetadata = await lstat9(filename); + const linkMetadata = await lstat10(filename); if (linkMetadata.isSymbolicLink()) { throw new RuntimeError(`archive entry must not be a symbolic link: ${redact(filename)}`); } - const handle = await open9(filename, constants8.O_RDONLY | NO_FOLLOW3); + const handle = await open9(filename, constants9.O_RDONLY | NO_FOLLOW4); try { if (parentIdentity !== void 0) { - await assertDirectoryIdentity4(path17.dirname(filename), parentIdentity); + await assertDirectoryIdentity5(path19.dirname(filename), parentIdentity); } const metadata = await handle.stat(); if (!metadata.isFile()) { @@ -42724,7 +43311,7 @@ async function readRegularFile(filename, parentIdentity) { throw new RuntimeError(`archive entry changed while being read: ${redact(filename)}`); } if (parentIdentity !== void 0) { - await assertDirectoryIdentity4(path17.dirname(filename), parentIdentity); + await assertDirectoryIdentity5(path19.dirname(filename), parentIdentity); } return contents.subarray(0, offset).toString("utf8"); } finally { @@ -42732,7 +43319,7 @@ async function readRegularFile(filename, parentIdentity) { } } async function directoryBytes(directory, expectedIdentity) { - const metadata = await lstat9(directory); + const metadata = await lstat10(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError("archive size accounting requires a plain directory"); } @@ -42749,26 +43336,26 @@ async function directoryBytes(directory, expectedIdentity) { throw error51; } try { - await assertDirectoryIdentity4(directory, identity); + await assertDirectoryIdentity5(directory, identity); for await (const entry of entries) { - await assertDirectoryIdentity4(directory, identity); - const entryPath = path17.join(directory, entry.name); + await assertDirectoryIdentity5(directory, identity); + const entryPath = path19.join(directory, entry.name); try { - const entryMetadata = await lstat9(entryPath); + const entryMetadata = await lstat10(entryPath); if (entryMetadata.isSymbolicLink()) { throw new RuntimeError("archive size accounting encountered a symbolic link"); } if (entryMetadata.isDirectory()) total += await directoryBytes(entryPath); else if (entryMetadata.isFile()) total += entryMetadata.size; - await assertDirectoryIdentity4(directory, identity); + await assertDirectoryIdentity5(directory, identity); } catch (error51) { if (!isMissing2(error51)) throw error51; } } - await assertDirectoryIdentity4(directory, identity); + await assertDirectoryIdentity5(directory, identity); } finally { await entries.close().catch((error51) => { - if (errorCode7(error51) !== "ERR_DIR_CLOSED") throw error51; + if (errorCode8(error51) !== "ERR_DIR_CLOSED") throw error51; }); } return total; @@ -42837,7 +43424,7 @@ function preserveNullableIdentity2(value, label) { function preserveCandidatePath(value) { const candidatePath = preserveIdentity2(value, "candidate path"); const segments = candidatePath.split("/"); - if (candidatePath === "" || candidatePath.includes("\\") || candidatePath.includes("\0") || path17.posix.isAbsolute(candidatePath) || path17.win32.isAbsolute(candidatePath) || /^[A-Za-z]:/.test(candidatePath) || segments.some((segment) => segment === "" || segment === "." || segment === "..")) { + if (candidatePath === "" || candidatePath.includes("\\") || candidatePath.includes("\0") || path19.posix.isAbsolute(candidatePath) || path19.win32.isAbsolute(candidatePath) || /^[A-Za-z]:/.test(candidatePath) || segments.some((segment) => segment === "" || segment === "." || segment === "..")) { throw new RuntimeError("candidate path must be a normalized relative Git path"); } return candidatePath; @@ -43042,13 +43629,13 @@ var ArtifactStore = class _ArtifactStore { constructor(runId) { validateComponent(runId, "run id"); this.runId = runId; - this.runsRoot = path17.join(resolveStateDir(), "runs"); - this.runDirectory = path17.join(this.runsRoot, runId); + this.runsRoot = path19.join(resolveStateDir(), "runs"); + this.runDirectory = path19.join(this.runsRoot, runId); } async ensureRunsRoot() { - await ensurePlainDirectoryTree(path17.dirname(this.runsRoot)); + await ensurePlainDirectoryTree(path19.dirname(this.runsRoot)); await ensurePlainDirectory(this.runsRoot); - return realpath8(this.runsRoot); + return realpath9(this.runsRoot); } async ensureRunDirectory(create) { const canonicalRunsRoot = await this.ensureRunsRoot(); @@ -43056,7 +43643,7 @@ var ArtifactStore = class _ArtifactStore { await ensurePlainDirectory(this.runDirectory); } else { try { - const metadata = await lstat9(this.runDirectory); + const metadata = await lstat10(this.runDirectory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(this.runDirectory)}`); } @@ -43065,28 +43652,28 @@ var ArtifactStore = class _ArtifactStore { throw error51; } } - const canonicalRunDirectory = await realpath8(this.runDirectory); + const canonicalRunDirectory = await realpath9(this.runDirectory); if (!isWithin(canonicalRunsRoot, canonicalRunDirectory)) { throw new RuntimeError("archive directory escapes plugin data"); } return canonicalRunDirectory; } async ensureArchiveDirectory(relativePath) { - if (path17.isAbsolute(relativePath)) throw new RuntimeError("archive path must be relative"); - const normalized = path17.normalize(relativePath); - if (normalized === ".." || normalized.startsWith(`..${path17.sep}`)) { + if (path19.isAbsolute(relativePath)) throw new RuntimeError("archive path must be relative"); + const normalized = path19.normalize(relativePath); + if (normalized === ".." || normalized.startsWith(`..${path19.sep}`)) { throw new RuntimeError("archive path escapes run directory"); } const canonicalRunDirectory = await this.ensureRunDirectory(true); if (canonicalRunDirectory === null) throw new RuntimeError("failed to create archive directory"); - const relativeDirectory = path17.dirname(normalized); + const relativeDirectory = path19.dirname(normalized); if (relativeDirectory === ".") return canonicalRunDirectory; let current = canonicalRunDirectory; - for (const component of relativeDirectory.split(path17.sep)) { + for (const component of relativeDirectory.split(path19.sep)) { validateComponent(component, "log name"); - current = path17.join(current, component); + current = path19.join(current, component); await ensurePlainDirectory(current); - const canonicalCurrent = await realpath8(current); + const canonicalCurrent = await realpath9(current); if (!isWithin(canonicalRunDirectory, canonicalCurrent)) { throw new RuntimeError("archive directory escapes run directory"); } @@ -43097,30 +43684,30 @@ var ArtifactStore = class _ArtifactStore { async writeArchiveFile(relativePath, text) { const directory = await this.ensureArchiveDirectory(relativePath); const directoryIdentity = await ensurePlainDirectory(directory); - const destination = path17.join(directory, path17.basename(relativePath)); - const temporaryPath = path17.join(directory, `.${path17.basename(destination)}.${randomUUID4()}.tmp`); + const destination = path19.join(directory, path19.basename(relativePath)); + const temporaryPath = path19.join(directory, `.${path19.basename(destination)}.${randomUUID5()}.tmp`); let handle; let temporaryCreated = false; try { - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); handle = await open9( temporaryPath, - constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | NO_FOLLOW3, + constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | NO_FOLLOW4, 384 ); temporaryCreated = true; - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); await handle.writeFile(text, { encoding: "utf8" }); await handle.sync(); await handle.close(); handle = void 0; try { - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); await link3(temporaryPath, destination); - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); } catch (error51) { if (!isAlreadyPresent(error51)) throw error51; - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); const existing = await readRegularFile(destination, directoryIdentity); if (existing !== text) { throw new RuntimeError(`archive entry already exists with different content: ${relativePath}`); @@ -43129,10 +43716,10 @@ var ArtifactStore = class _ArtifactStore { } finally { await handle?.close(); if (temporaryCreated) { - await assertDirectoryIdentity4(directory, directoryIdentity); - await rm4(temporaryPath, { force: true }); - await syncDirectory2(directory); - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); + await rm5(temporaryPath, { force: true }); + await syncDirectory3(directory); + await assertDirectoryIdentity5(directory, directoryIdentity); } } } @@ -43142,23 +43729,23 @@ var ArtifactStore = class _ArtifactStore { await this.writeArchiveFile(relativePath, serialized); } async replaceJson(relativePath, value) { - if (path17.isAbsolute(relativePath) || path17.dirname(relativePath) !== "." || path17.basename(relativePath) !== relativePath || !isSafeComponent(relativePath)) { + if (path19.isAbsolute(relativePath) || path19.dirname(relativePath) !== "." || path19.basename(relativePath) !== relativePath || !isSafeComponent(relativePath)) { throw new RuntimeError("replacement archive path must be a safe relative leaf"); } const directory = await this.ensureRunDirectory(false); if (directory === null) throw new RuntimeError("run archive does not exist"); const directoryIdentity = await ensurePlainDirectory(directory); - const destination = path17.join(directory, relativePath); - const temporaryPath = path17.join(directory, `.${relativePath}.${randomUUID4()}.tmp`); + const destination = path19.join(directory, relativePath); + const temporaryPath = path19.join(directory, `.${relativePath}.${randomUUID5()}.tmp`); const serialized = `${serializeJson(value, 2)} `; let handle; let temporaryCreated = false; try { - await assertDirectoryIdentity4(directory, directoryIdentity); + await assertDirectoryIdentity5(directory, directoryIdentity); handle = await open9( temporaryPath, - constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | NO_FOLLOW3, + constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | NO_FOLLOW4, 384 ); temporaryCreated = true; @@ -43166,14 +43753,14 @@ var ArtifactStore = class _ArtifactStore { await handle.sync(); await handle.close(); handle = void 0; - await assertDirectoryIdentity4(directory, directoryIdentity); - await rename4(temporaryPath, destination); + await assertDirectoryIdentity5(directory, directoryIdentity); + await rename5(temporaryPath, destination); temporaryCreated = false; - await syncDirectory2(directory); - await assertDirectoryIdentity4(directory, directoryIdentity); + await syncDirectory3(directory); + await assertDirectoryIdentity5(directory, directoryIdentity); } finally { await handle?.close(); - if (temporaryCreated) await rm4(temporaryPath, { force: true }); + if (temporaryCreated) await rm5(temporaryPath, { force: true }); } } async writeRunStatus(status) { @@ -43193,12 +43780,12 @@ var ArtifactStore = class _ArtifactStore { } async readRunStatus(runId) { validateComponent(runId, "run id"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const value = JSON.parse(await readRegularFile( - path17.join(validated.path, "status.json"), + path19.join(validated.path, "status.json"), validated.identity )); if (!runStatusSchema(value)) throw new RuntimeError("archived run status is malformed"); @@ -43210,35 +43797,35 @@ var ArtifactStore = class _ArtifactStore { } async writeLog(name, text) { validateComponent(name, "log name"); - const ref = path17.posix.join("logs", `${name}.log`); + const ref = path19.posix.join("logs", `${name}.log`); await this.writeArchiveFile(ref, redact(text)); return ref; } async writePipelineArtifact(name, value) { validateComponent(name, "log name"); await this.writeJson( - path17.posix.join("pipeline", `${name}.json`), + path19.posix.join("pipeline", `${name}.json`), redactRecord(value) ); } async readPipelineArtifact(runId, name) { validateComponent(runId, "run id"); validateComponent(name, "log name"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validatedRun = await this.ensureExistingRunDirectory(runDirectory); if (validatedRun === null) return null; - const validated = await this.ensureExistingRunDirectory(path17.join(runDirectory, "pipeline")); + const validated = await this.ensureExistingRunDirectory(path19.join(runDirectory, "pipeline")); if (validated === null) return null; if (!isWithin(validatedRun.path, validated.path)) { throw new RuntimeError("pipeline archive directory escapes run directory"); } - await assertDirectoryIdentity4(validatedRun.path, validatedRun.identity); + await assertDirectoryIdentity5(validatedRun.path, validatedRun.identity); try { const value = JSON.parse(await readRegularFile( - path17.join(validated.path, `${name}.json`), + path19.join(validated.path, `${name}.json`), validated.identity )); - await assertDirectoryIdentity4(validatedRun.path, validatedRun.identity); + await assertDirectoryIdentity5(validatedRun.path, validatedRun.identity); return value; } catch (error51) { if (isMissing2(error51)) return null; @@ -43252,7 +43839,7 @@ var ArtifactStore = class _ArtifactStore { * caller-supplied reference. */ async readEvidence(reference) { - if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path17.posix.isAbsolute(reference) || reference.includes("\\") || /[\0\r\n]/u.test(reference)) { + if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path19.posix.isAbsolute(reference) || reference.includes("\\") || /[\0\r\n]/u.test(reference)) { throw new RuntimeError("invalid archived evidence reference"); } const components = reference.split("/"); @@ -43265,13 +43852,13 @@ var ArtifactStore = class _ArtifactStore { let directory = run; try { for (const component of components.slice(0, -1)) { - await assertDirectoryIdentity4(directory.path, directory.identity); - const child = path17.join(directory.path, component); - const metadata = await lstat9(child); + await assertDirectoryIdentity5(directory.path, directory.identity); + const child = path19.join(directory.path, component); + const metadata = await lstat10(child); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError("archived evidence directory is not a plain directory"); } - const canonical = await realpath8(child); + const canonical = await realpath9(child); if (!isWithin(run.path, canonical)) { throw new RuntimeError("archived evidence reference escapes run directory"); } @@ -43279,13 +43866,13 @@ var ArtifactStore = class _ArtifactStore { path: canonical, identity: { dev: metadata.dev, ino: metadata.ino } }; - await assertDirectoryIdentity4(directory.path, directory.identity); + await assertDirectoryIdentity5(directory.path, directory.identity); } const content = await readRegularFile( - path17.join(directory.path, components.at(-1)), + path19.join(directory.path, components.at(-1)), directory.identity ); - await assertDirectoryIdentity4(run.path, run.identity); + await assertDirectoryIdentity5(run.path, run.identity); return content; } catch (error51) { if (isMissing2(error51)) return null; @@ -43305,13 +43892,13 @@ var ArtifactStore = class _ArtifactStore { if (components.length > MAX_EVIDENCE_DEPTH) { throw new RuntimeError("archived evidence nesting exceeds the supported limit"); } - await assertDirectoryIdentity4(directory.path, directory.identity); + await assertDirectoryIdentity5(directory.path, directory.identity); const names = (await readdir6(directory.path)).sort(); for (const name of names) { if (STORE_TEMPORARY_RESIDUE.test(name)) continue; validateComponent(name, "log name"); - const child = path17.join(directory.path, name); - const metadata = await lstat9(child); + const child = path19.join(directory.path, name); + const metadata = await lstat10(child); if (metadata.isSymbolicLink()) { throw new RuntimeError("archived evidence must not contain symbolic links"); } @@ -43320,7 +43907,7 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived evidence reference is too long"); } if (metadata.isDirectory()) { - const canonical = await realpath8(child); + const canonical = await realpath9(child); if (!isWithin(run.path, canonical)) { throw new RuntimeError("archived evidence directory escapes run directory"); } @@ -43328,7 +43915,7 @@ var ArtifactStore = class _ArtifactStore { path: canonical, identity: { dev: metadata.dev, ino: metadata.ino } }; - await assertDirectoryIdentity4(nested.path, nested.identity); + await assertDirectoryIdentity5(nested.path, nested.identity); await walk(nested, [...components, name]); continue; } @@ -43340,10 +43927,10 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived evidence exceeds the supported file limit"); } } - await assertDirectoryIdentity4(directory.path, directory.identity); + await assertDirectoryIdentity5(directory.path, directory.identity); }; await walk(run, []); - await assertDirectoryIdentity4(run.path, run.identity); + await assertDirectoryIdentity5(run.path, run.identity); return references.sort(); } async writeResult(result) { @@ -43381,13 +43968,13 @@ var ArtifactStore = class _ArtifactStore { } async readResult(runId) { validateComponent(runId, "run id"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { return verifyAttemptResult( JSON.parse(await readRegularFile( - path17.join(validated.path, "result.json"), + path19.join(validated.path, "result.json"), validated.identity )), runId @@ -43400,16 +43987,16 @@ var ArtifactStore = class _ArtifactStore { async ensureExistingRunDirectory(directory) { const canonicalRunsRoot = await this.ensureRunsRoot(); try { - const metadata = await lstat9(directory); + const metadata = await lstat10(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(directory)}`); } - const canonicalDirectory = await realpath8(directory); + const canonicalDirectory = await realpath9(directory); if (!isWithin(canonicalRunsRoot, canonicalDirectory)) { throw new RuntimeError("archive directory escapes plugin data"); } const identity = { dev: metadata.dev, ino: metadata.ino }; - await assertDirectoryIdentity4(directory, identity); + await assertDirectoryIdentity5(directory, identity); return { path: canonicalDirectory, identity }; } catch (error51) { if (isMissing2(error51)) return null; @@ -43418,13 +44005,13 @@ var ArtifactStore = class _ArtifactStore { } async readManifest(runId) { validateComponent(runId, "run id"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { return verifyRunManifest( JSON.parse(await readRegularFile( - path17.join(validated.path, "manifest.json"), + path19.join(validated.path, "manifest.json"), validated.identity )), runId @@ -43441,11 +44028,11 @@ var ArtifactStore = class _ArtifactStore { */ async readRunStartSpecSha256(runId) { validateComponent(runId, "run id"); - const validated = await this.ensureExistingRunDirectory(path17.join(this.runsRoot, runId)); + const validated = await this.ensureExistingRunDirectory(path19.join(this.runsRoot, runId)); if (validated === null) return null; try { const record2 = JSON.parse(await readRegularFile( - path17.join(validated.path, "run-start.json"), + path19.join(validated.path, "run-start.json"), validated.identity )); if (typeof record2 !== "object" || record2 === null) return null; @@ -43474,13 +44061,13 @@ var ArtifactStore = class _ArtifactStore { } async readReviewSnapshot(runId) { validateComponent(runId, "run id"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const snapshot = validateReviewSnapshot( JSON.parse(await readRegularFile( - path17.join(validated.path, "review-snapshot.json"), + path19.join(validated.path, "review-snapshot.json"), validated.identity )), runId @@ -43561,7 +44148,7 @@ var ArtifactStore = class _ArtifactStore { eligibilityRecordHash }; await this.writeJson( - path17.posix.join("pipeline", "post-pipeline-autopilot.json"), + path19.posix.join("pipeline", "post-pipeline-autopilot.json"), artifacts ); return { advisorReportHash: persistedAdvisorHash, eligibilityRecordHash }; @@ -43626,12 +44213,12 @@ var ArtifactStore = class _ArtifactStore { } async readCandidateDecision(runId) { validateComponent(runId, "run id"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const value = JSON.parse(await readRegularFile( - path17.join(validated.path, "decision.json"), + path19.join(validated.path, "decision.json"), validated.identity )); return parsePersistedDecision(value); @@ -43651,12 +44238,12 @@ var ArtifactStore = class _ArtifactStore { } async readPipelineActiveMarker(runId) { validateComponent(runId, "run id"); - const runDirectory = path17.join(this.runsRoot, runId); + const runDirectory = path19.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const value = JSON.parse(await readRegularFile( - path17.join(validated.path, "pipeline-active.json"), + path19.join(validated.path, "pipeline-active.json"), validated.identity )); if (typeof value !== "object" || value === null || typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 1 || value.processToken !== null && typeof value.processToken !== "string" || typeof value.startedAt !== "string" || !Number.isFinite(Date.parse(value.startedAt)) || typeof value.sliced !== "boolean") { @@ -43671,7 +44258,7 @@ var ArtifactStore = class _ArtifactStore { async clearPipelineActiveMarker() { const directory = await this.ensureRunDirectory(false); if (directory === null) return; - await rm4(path17.join(directory, "pipeline-active.json"), { force: true }); + await rm5(path19.join(directory, "pipeline-active.json"), { force: true }); } async list() { await this.ensureRunsRoot(); @@ -43680,9 +44267,9 @@ var ArtifactStore = class _ArtifactStore { } async entries() { const entries = await Promise.all((await this.list()).map(async (runId) => { - const directory = path17.join(this.runsRoot, runId); + const directory = path19.join(this.runsRoot, runId); try { - const metadata = await lstat9(directory); + const metadata = await lstat10(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) return null; return { runId, @@ -43720,7 +44307,7 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived candidate does not match its run manifest"); } const repositoryTopLevel = await git(canonicalRepoRoot, ["rev-parse", "--show-toplevel"]); - if (repositoryTopLevel.exitCode !== 0 || await realpath8(gitPathOutput( + if (repositoryTopLevel.exitCode !== 0 || await realpath9(gitPathOutput( repositoryTopLevel.stdout, "candidate repository root" )) !== canonicalRepoRoot) { @@ -43842,27 +44429,27 @@ var ArtifactStore = class _ArtifactStore { try { await this.ensureRunsRoot(); const runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - const filename = path17.join(this.runsRoot, CLEANUP_JOURNAL); + const filename = path19.join(this.runsRoot, CLEANUP_JOURNAL); const handle = await open9( filename, - constants8.O_WRONLY | constants8.O_CREAT | constants8.O_APPEND | NO_FOLLOW3, + constants9.O_WRONLY | constants9.O_CREAT | constants9.O_APPEND | NO_FOLLOW4, 384 ); try { - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); const metadata = await handle.stat(); if (!metadata.isFile()) throw new RuntimeError("cleanup journal is not a regular file"); const line = `${serializeJson(record2)} `; await handle.writeFile(line, { encoding: "utf8" }); await handle.sync(); - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); } finally { await handle.close(); } - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); - await syncDirectory2(this.runsRoot); - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await syncDirectory3(this.runsRoot); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); } finally { await journalLock.release(); } @@ -43888,14 +44475,14 @@ var ArtifactStore = class _ArtifactStore { recordedAt: (/* @__PURE__ */ new Date()).toISOString() }); const runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - await assertDirectoryIdentity4(entry.directory, entry.identity); - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); - await rename4(entry.directory, quarantinePath); - await syncDirectory2(this.runsRoot); - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); - await assertDirectoryIdentity4(quarantinePath, entry.identity); - await rm4(quarantinePath, { recursive: true, force: false }); - await syncDirectory2(this.runsRoot); + await assertDirectoryIdentity5(entry.directory, entry.identity); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await rename5(entry.directory, quarantinePath); + await syncDirectory3(this.runsRoot); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity5(quarantinePath, entry.identity); + await rm5(quarantinePath, { recursive: true, force: false }); + await syncDirectory3(this.runsRoot); await this.appendCleanupRecord({ event: "prune-cleanup-complete", runId: entry.runId, @@ -43921,8 +44508,8 @@ var ArtifactStore = class _ArtifactStore { const removeEntry = async (entry, reason) => { if (attempted.has(entry.runId)) return; attempted.add(entry.runId); - const quarantineName = `.prune-${entry.runId}-${randomUUID4()}`; - const quarantinePath = path17.join(this.runsRoot, quarantineName); + const quarantineName = `.prune-${entry.runId}-${randomUUID5()}`; + const quarantinePath = path19.join(this.runsRoot, quarantineName); let prepared = null; let transaction = null; let runsRootIdentity = null; @@ -43950,7 +44537,7 @@ var ArtifactStore = class _ArtifactStore { try { canonical = await platformServices.canonicalizePath(initialManifest.repoRoot); } catch (error51) { - if (errorCode7(error51) !== "ENOENT") throw error51; + if (errorCode8(error51) !== "ENOENT") throw error51; await this.reclaimRepoAbsentArchive( entry, reason, @@ -43970,7 +44557,7 @@ var ArtifactStore = class _ArtifactStore { if (lease.repositoryIdentity !== repositoryIdentity) { throw new RuntimeError("checkout lease repository identity changed before pruning"); } - await assertDirectoryIdentity4(entry.directory, entry.identity); + await assertDirectoryIdentity5(entry.directory, entry.identity); const currentManifest = await this.readManifest(entry.runId); if (currentManifest === null || serializeJson(currentManifest) !== serializeJson(initialManifest)) { retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); @@ -44010,15 +44597,15 @@ var ArtifactStore = class _ArtifactStore { }); transaction = await this.beginCandidateAnchorCleanup(prepared, entry.runId); runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - await assertDirectoryIdentity4(entry.directory, entry.identity); - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); - await rename4(entry.directory, quarantinePath); - await syncDirectory2(this.runsRoot); - await assertDirectoryIdentity4(this.runsRoot, runsRootIdentity); - await assertDirectoryIdentity4(quarantinePath, entry.identity); + await assertDirectoryIdentity5(entry.directory, entry.identity); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await rename5(entry.directory, quarantinePath); + await syncDirectory3(this.runsRoot); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity5(quarantinePath, entry.identity); archiveRemovalCommitted = true; - await rm4(quarantinePath, { recursive: true, force: false }); - await syncDirectory2(this.runsRoot); + await rm5(quarantinePath, { recursive: true, force: false }); + await syncDirectory3(this.runsRoot); await transaction.commit(); await this.appendCleanupRecord({ event: "prune-cleanup-complete", @@ -44046,14 +44633,14 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archive run directory was replaced during rollback"); } const expectedRunsRoot = runsRootIdentity ?? await ensurePlainDirectory(this.runsRoot); - await assertDirectoryIdentity4(this.runsRoot, expectedRunsRoot); - await assertDirectoryIdentity4(quarantinePath, entry.identity); - await rename4(quarantinePath, entry.directory); - await syncDirectory2(this.runsRoot); - await assertDirectoryIdentity4(this.runsRoot, expectedRunsRoot); - await assertDirectoryIdentity4(entry.directory, entry.identity); + await assertDirectoryIdentity5(this.runsRoot, expectedRunsRoot); + await assertDirectoryIdentity5(quarantinePath, entry.identity); + await rename5(quarantinePath, entry.directory); + await syncDirectory3(this.runsRoot); + await assertDirectoryIdentity5(this.runsRoot, expectedRunsRoot); + await assertDirectoryIdentity5(entry.directory, entry.identity); } else if (runDirectoryExists) { - await assertDirectoryIdentity4(entry.directory, entry.identity); + await assertDirectoryIdentity5(entry.directory, entry.identity); } else { throw new RuntimeError("archive run directory disappeared during rollback"); } @@ -44124,153 +44711,6 @@ async function pruneRuns(policy = DEFAULT_PRUNE_POLICY, dependencies = {}) { // src/pipeline/role-runner.ts import { rm as rm6 } from "node:fs/promises"; -// src/platform/sandbox/seatbelt.ts -import { realpathSync as realpathSync2 } from "node:fs"; -import { homedir as homedir7 } from "node:os"; -import { isAbsolute, normalize, parse as parse3, relative, resolve } from "node:path"; -function buildReadOnlySeatbeltPolicy(args) { - return { - worktreePath: "", - tempHome: args.tempHome, - // Read-only roles ARE model sessions: they must reach the provider API. - // The confinement goal here is write-protection, not offline isolation — - // matching the edit lane, where Codex's native sandbox permits its own - // API traffic while denying out-of-worktree writes. - allowNetwork: true - }; -} -function buildWriteSeatbeltPolicy(args) { - return { - worktreePath: args.worktreePath, - tempHome: args.tempHome, - allowNetwork: true, - extraWritableRoots: [...args.extraWritableRoots] - }; -} -function sbPath(path32) { - for (const character of path32) { - const codePoint = character.codePointAt(0); - if (codePoint !== void 0 && (codePoint < 32 || codePoint === 127)) { - throw new Error(`seatbelt: control character in path: ${JSON.stringify(path32)}`); - } - } - return `"${path32.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; -} -function isDeclaredStateRoot(normalized, invocation, policy) { - const roots = []; - const homeCandidates = [ - invocation.env?.HOME, - invocation.env?.USERPROFILE, - process.env.HOME, - process.env.USERPROFILE - ]; - try { - homeCandidates.push(homedir7()); - } catch { - } - for (const candidate of homeCandidates) { - if (typeof candidate === "string" && candidate.length > 0 && candidate !== "/") { - roots.push(resolve(candidate)); - } - } - const stateEnvs = [ - "CLAUDE_CONFIG_DIR", - "OPENCODE_CONFIG_DIR", - "XDG_DATA_HOME", - "XDG_STATE_HOME", - "XDG_CONFIG_HOME", - "PI_CONFIG_DIR", - "PYTHINKER_SHARE_DIR", - "GEMINI_CLI_HOME" - ]; - for (const envKey of stateEnvs) { - const val = invocation.env?.[envKey] ?? process.env[envKey]; - if (typeof val === "string" && val.length > 0 && val !== "/") { - roots.push(resolve(val)); - } - } - if (policy.extraWritableRoots) { - for (const root of policy.extraWritableRoots) { - if (typeof root === "string" && root.length > 0 && root !== "/") { - roots.push(resolve(root)); - } - } - } - for (const root of roots) { - if (normalized === root) return true; - const rel = relative(root, normalized); - if (!rel.startsWith("..") && !isAbsolute(rel)) return true; - } - const userHomePattern = /^(\/Users\/[^/]+|\/home\/[^/]+|\/root)(?:\/.*)?$/u; - const winUserHomePattern = /^[a-zA-Z]:\\Users\\[^\\]+(?:\\.*)?$/u; - return userHomePattern.test(normalized) || winUserHomePattern.test(normalized); -} -function isValidInheritedStatePath(path32, invocation, policy) { - if (typeof path32 !== "string" || path32.trim().length === 0) return false; - if (!isAbsolute(path32)) return false; - const parsed = parse3(path32); - if (path32 === "/" || path32 === parsed.root) return false; - const normalized = normalize(path32); - if (normalized === "/" || normalized === parsed.root) return false; - if (resolve(path32) === "/" || resolve(path32) === parsed.root) return false; - return isDeclaredStateRoot(normalized, invocation, policy); -} -function inheritedStateWritablePaths(invocation, policy) { - if (policy.tempHome !== null) return []; - const declared = invocation.inheritedStateWritablePaths; - if (!declared || declared.length === 0) return []; - for (const entry of declared) { - if (!isValidInheritedStatePath(entry, invocation, policy)) { - return []; - } - } - return [...declared]; -} -function buildProfile(policy, additionalWritable) { - const writable = [...new Set([ - policy.worktreePath, - policy.tempHome, - process.env.TMPDIR ?? "/private/tmp", - "/private/tmp", - "/dev", - ...policy.extraWritableRoots ?? [], - ...additionalWritable - ].filter((path32) => typeof path32 === "string" && path32.length > 0).flatMap((path32) => { - try { - return [path32, realpathSync2(path32)]; - } catch { - return [path32]; - } - }))]; - const lines = [ - "(version 1)", - "(allow default)", - "(deny file-write*)", - ...writable.map((path32) => `(allow file-write* (subpath ${sbPath(path32)}))`), - '(allow file-write* (literal "/dev/null") (literal "/dev/tty"))' - ]; - if (!policy.allowNetwork) lines.push("(deny network*)"); - return lines.join("\n"); -} -function wrapInvocationWithSeatbelt(invocation, policy) { - const profile = buildProfile(policy, inheritedStateWritablePaths(invocation, policy)); - const inner = [ - invocation.executable.command, - ...invocation.executable.prefixArgs, - ...invocation.args - ]; - return { - ...invocation, - executable: { - kind: "native", - command: "/usr/bin/sandbox-exec", - prefixArgs: [], - resolvedFrom: `seatbelt:${invocation.executable.resolvedFrom}` - }, - args: ["-p", profile, ...inner] - }; -} - // src/producers/routing-policy.ts function route(preferences, reports) { const considered = []; @@ -44302,176 +44742,6 @@ function route(preferences, reports) { return { producerId: null, reason: "no-eligible-producer", considered }; } -// src/runtime/run-start.ts -import { randomUUID as randomUUID5 } from "node:crypto"; -import { constants as constants9 } from "node:fs"; -import { - access as access4, - lstat as lstat10, - open as open10, - realpath as realpath9, - rename as rename5, - rm as rm5 -} from "node:fs/promises"; -import path18 from "node:path"; -import { fileURLToPath as fileURLToPath4 } from "node:url"; -var NO_FOLLOW4 = constants9.O_NOFOLLOW ?? 0; -function errorCode8(error51) { - return error51.code; -} -async function resolveWatchdogPath() { - const candidates = [ - new URL("../../runtime/watchdog.mjs", import.meta.url), - new URL("./watchdog.mjs", import.meta.url) - ]; - let lastError; - for (const candidate of candidates) { - try { - await access4(candidate); - return fileURLToPath4(candidate); - } catch (error51) { - lastError = error51; - } - } - throw lastError; -} -async function parentDeathWatchdogInvocation(executable, args) { - return { - executable: { - kind: "native", - command: process.execPath, - prefixArgs: [], - resolvedFrom: "runtime-watchdog" - }, - args: [ - await resolveWatchdogPath(), - String(process.pid), - "--", - executable.command, - ...executable.prefixArgs, - ...args - ] - }; -} -function assertDirectoryIdentity5(target) { - return Promise.all([ - lstat10(target.publicDirectory), - realpath9(target.publicDirectory) - ]).then(([metadata, canonical]) => { - if (!metadata.isDirectory() || metadata.isSymbolicLink() || metadata.dev !== target.identity.dev || metadata.ino !== target.identity.ino || canonical !== target.canonicalDirectory) { - throw new RuntimeError("run archive directory identity changed"); - } - }); -} -async function syncDirectory3(directory) { - let handle; - try { - handle = await open10(directory, constants9.O_RDONLY | NO_FOLLOW4); - await handle.sync(); - } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode8(error51) ?? ""); - if (!unsupportedOnWindows) throw error51; - } finally { - await handle?.close(); - } -} -async function writeRunStart(target, record2, create) { - await assertDirectoryIdentity5(target); - const destination = path18.join(target.canonicalDirectory, "run-start.json"); - const serialized = `${JSON.stringify(record2, null, 2)} -`; - if (create) { - const handle2 = await open10( - destination, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | NO_FOLLOW4, - 384 - ); - try { - await handle2.writeFile(serialized, "utf8"); - await handle2.sync(); - } finally { - await handle2.close(); - } - await syncDirectory3(target.canonicalDirectory); - await assertDirectoryIdentity5(target); - return; - } - const temporaryPath = path18.join( - target.canonicalDirectory, - `.run-start.${randomUUID5()}.tmp` - ); - let created = false; - let handle; - try { - handle = await open10( - temporaryPath, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | NO_FOLLOW4, - 384 - ); - created = true; - await handle.writeFile(serialized, "utf8"); - await handle.sync(); - await handle.close(); - handle = void 0; - await assertDirectoryIdentity5(target); - await rename5(temporaryPath, destination); - created = false; - await syncDirectory3(target.canonicalDirectory); - await assertDirectoryIdentity5(target); - } finally { - await handle?.close(); - if (created) await rm5(temporaryPath, { force: true }); - } -} -async function initializeRunStart(store, record2) { - await store.writeLog("lifecycle", "attempt lock acquired\n"); - const canonicalDirectory = await realpath9(store.runDirectory); - const metadata = await lstat10(store.runDirectory); - if (!metadata.isDirectory() || metadata.isSymbolicLink()) { - throw new RuntimeError("run archive directory is not a plain directory"); - } - const target = { - publicDirectory: store.runDirectory, - canonicalDirectory, - identity: { dev: metadata.dev, ino: metadata.ino } - }; - await writeRunStart(target, record2, true); - return { target, record: record2 }; -} -function withRunStartPidRecording(ps, context) { - return { - os: ps.os, - resolveExecutable: (request) => ps.resolveExecutable(request), - async spawnSupervised(request) { - const process4 = await ps.spawnSupervised(request); - if (process4.pid > 1) { - try { - const processToken = await ps.getProcessStartToken(process4.pid).catch(() => null); - await writeRunStart( - context.target, - { ...context.record, pid: process4.pid, processToken }, - false - ); - } catch (error51) { - await ps.terminateProcessTree(process4).catch(() => { - }); - throw error51; - } - } - return process4; - }, - requestCooperativeCancellation: (process4) => ps.requestCooperativeCancellation(process4), - terminateProcessTree: (process4) => ps.terminateProcessTree(process4), - getProcessStartToken: (pid) => ps.getProcessStartToken(pid), - terminateProcessTreeByPid: (pid, expectedToken) => ps.terminateProcessTreeByPid(pid, expectedToken), - acquireCheckoutLock: (checkout) => ps.acquireCheckoutLock(checkout), - acquireCleanupJournalLock: () => ps.acquireCleanupJournalLock(), - createSecureTempDirectory: () => ps.createSecureTempDirectory(), - canonicalizePath: (input) => ps.canonicalizePath(input), - assertDirectoryWriteIntegrity: (directory, identity) => ps.assertDirectoryWriteIntegrity(directory, identity) - }; -} - // src/pipeline/role-prompts.ts import { readFileSync as readFileSync3 } from "node:fs"; function readSchemaText(name) { @@ -44703,7 +44973,7 @@ function buildRoleSpec(role, base, pkg) { // src/pipeline/git-writable-roots.ts import { lstat as lstat11, mkdir as mkdir6, readFile as readFile3, realpath as realpath10 } from "node:fs/promises"; -import path19 from "node:path"; +import path20 from "node:path"; function invalidWritableRoots(message, cause) { return new RuntimeError(message, { classification: "sandbox-violation", @@ -44724,8 +44994,8 @@ async function requirePlainDirectory(directory, label) { } } function isContainedBy(parent, candidate) { - const relative2 = path19.relative(parent, candidate); - return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path19.sep}`) && !path19.isAbsolute(relative2); + const relative2 = path20.relative(parent, candidate); + return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path20.sep}`) && !path20.isAbsolute(relative2); } function sameFileIdentity(before, after) { return before.dev === after.dev && before.ino === after.ino; @@ -44740,16 +45010,16 @@ async function readStablePlainFile(filename, label) { return value; } async function resolveLinkedWorktreeWritableRoots(worktreePath) { - const dotGit = path19.join(worktreePath, ".git"); + const dotGit = path20.join(worktreePath, ".git"); try { const pointer = await readStablePlainFile(dotGit, "linked worktree .git entry"); const match = /^gitdir: (.+)\r?\n?$/.exec(pointer); if (match === null) { throw invalidWritableRoots("linked worktree .git pointer is malformed"); } - const gitDir = await realpath10(path19.resolve(worktreePath, match[1])); + const gitDir = await realpath10(path20.resolve(worktreePath, match[1])); await requirePlainDirectory(gitDir, "linked worktree private git directory"); - const commonDirPointer = path19.join(gitDir, "commondir"); + const commonDirPointer = path20.join(gitDir, "commondir"); const commonDirValue = (await readStablePlainFile( commonDirPointer, "linked worktree commondir entry" @@ -44757,16 +45027,16 @@ async function resolveLinkedWorktreeWritableRoots(worktreePath) { if (commonDirValue === "" || commonDirValue.includes("\0")) { throw invalidWritableRoots("linked worktree commondir pointer is malformed"); } - const commonDir = await realpath10(path19.resolve(gitDir, commonDirValue)); + const commonDir = await realpath10(path20.resolve(gitDir, commonDirValue)); await requirePlainDirectory(commonDir, "common git directory"); - const worktreesDir = await realpath10(path19.join(commonDir, "worktrees")); + const worktreesDir = await realpath10(path20.join(commonDir, "worktrees")); await requirePlainDirectory(worktreesDir, "common git worktrees directory"); if (!isContainedBy(worktreesDir, gitDir)) { throw invalidWritableRoots("linked worktree private git directory escapes common git worktrees"); } - const sharedObjectsDir = await realpath10(path19.join(commonDir, "objects")); + const sharedObjectsDir = await realpath10(path20.join(commonDir, "objects")); await requirePlainDirectory(sharedObjectsDir, "common git objects directory"); - const privateObjectsPath = path19.join(gitDir, "private-objects"); + const privateObjectsPath = path20.join(gitDir, "private-objects"); await mkdir6(privateObjectsPath, { recursive: true, mode: 448 }); await requirePlainDirectory(privateObjectsPath, "private git objects directory"); const privateObjectsDir = await realpath10(privateObjectsPath); @@ -44792,18 +45062,6 @@ var READ_ONLY_ROLES = /* @__PURE__ */ new Set([ "verifier", "advisor" ]); -var MAX_PRODUCER_OUTPUT_BYTES = 1e6; -function preCancelledExit() { - return { - exitCode: null, - signal: null, - timedOut: false, - cancelled: true, - stdout: "", - stderr: "", - truncated: { stdout: false, stderr: false } - }; -} function definedEnvironment(environment) { const additions = {}; for (const [name, value] of Object.entries(environment ?? {})) { @@ -44929,59 +45187,25 @@ async function runRole(args) { let builtEnvironment = null; let primaryError; try { - tempHome = await args.ps.createSecureTempDirectory(); - let invocation = adapter.buildInvocation(roleSpec, { + const runtime = args.registry !== void 0 ? new ProducerRuntime(args.registry) : producerRuntime; + const launchResult = await runtime.launch({ + producerId, + spec: roleSpec, worktreePath: args.worktreePath, - ...extraWritableRoots.length === 0 ? {} : { extraWritableRoots }, - ...gitObjectAccess === void 0 ? {} : { - gitObjectDirectory: gitObjectAccess.privateObjectsDir, - gitAlternateObjectDirectories: gitObjectAccess.sharedObjectsDir - }, + intent: readOnly ? "read-only" : "edit", + ps: args.ps, runId: args.runId, - tempHome, - capabilityReport: report, - executable: report.resolvedExecutable, - readOnly: nativeReadOnly - }); - if (readOnly && !nativeReadOnly) { - invocation = wrapInvocationWithSeatbelt( - invocation, - buildReadOnlySeatbeltPolicy({ tempHome }) - ); - } else if (seatbeltWriter) { - invocation = wrapInvocationWithSeatbelt( - invocation, - buildWriteSeatbeltPolicy({ - worktreePath: args.worktreePath, - tempHome, - extraWritableRoots - }) - ); - } - builtEnvironment = buildEnvironment({ - os: args.ps.os, - adapterAllowlist: invocation.requiredEnv, - ...invocation.env === void 0 ? {} : { adapterValues: invocation.env }, - specAdditions: { - ...definedEnvironment(args.env), - ...gitObjectAccess === void 0 ? {} : { - GIT_OBJECT_DIRECTORY: gitObjectAccess.privateObjectsDir, - GIT_ALTERNATE_OBJECT_DIRECTORIES: gitObjectAccess.sharedObjectsDir - } - }, - tempHome - }); - const supervisedInvocation = writer ? await parentDeathWatchdogInvocation(invocation.executable, invocation.args) : { executable: invocation.executable, args: invocation.args }; - const processServices = writer && runStart !== void 0 ? withRunStartPidRecording(args.ps, runStart) : args.ps; - const exit = args.abortSignal?.aborted === true ? preCancelledExit() : await supervise(processServices, { - executable: supervisedInvocation.executable, - args: supervisedInvocation.args, - cwd: args.worktreePath, - env: builtEnvironment.env, + abortSignal: args.abortSignal, timeoutMs: roleSpec.timeoutMs, - ...invocation.stdin === void 0 ? {} : { stdin: invocation.stdin }, - maxOutputBytes: MAX_PRODUCER_OUTPUT_BYTES - }, args.abortSignal === void 0 ? {} : { onCancel: args.abortSignal }); + extraWritableRoots: extraWritableRoots.length > 0 ? extraWritableRoots : void 0, + gitObjectAccess, + envAdditions: args.env !== void 0 ? definedEnvironment(args.env) : void 0, + runStartContext: writer && runStart !== void 0 ? runStart : void 0, + capabilityReport: report + }); + tempHome = launchResult.tempHome; + builtEnvironment = launchResult.builtEnvironment; + const exit = launchResult.exit; const signals = failureSignals(exit); let rawOutput = exit.stdout; if (!hasFailureSignal(signals)) { @@ -45053,12 +45277,12 @@ async function parseStructuredReport(raw, validate, repair) { // src/autopilot/branch-manager.ts import { createHash as createHash10, randomUUID as randomUUID6 } from "node:crypto"; import { constants as constants10 } from "node:fs"; -import { chmod, link as link4, lstat as lstat13, mkdir as mkdir7, mkdtemp as mkdtemp2, open as open11, realpath as realpath12, rm as rm7 } from "node:fs/promises"; -import path21 from "node:path"; +import { chmod, link as link4, lstat as lstat13, mkdir as mkdir7, mkdtemp as mkdtemp2, open as open10, realpath as realpath12, rm as rm7 } from "node:fs/promises"; +import path22 from "node:path"; // src/git/repo-preconditions.ts import { access as access5, lstat as lstat12, opendir as opendir2, readlink, realpath as realpath11 } from "node:fs/promises"; -import path20 from "node:path"; +import path21 from "node:path"; var MAX_DETAIL_ENTRIES = 20; function boundedDetail(lines) { if (lines.length <= MAX_DETAIL_ENTRIES) return lines; @@ -45097,7 +45321,7 @@ async function checkInProgressOperation(checkoutPath, runGit = git) { if (!succeeded(gitDirectoryResult)) return "scan-failed"; try { const gitDirectory = gitPathOutput(gitDirectoryResult.stdout, "Git directory"); - return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path20.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; + return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path21.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; } catch { return "scan-failed"; } @@ -45129,7 +45353,7 @@ function indexPathsWithMode(output, mode) { for (const record2 of output.split("\0")) { if (!record2.startsWith(`${mode} `)) continue; const separator = record2.indexOf(" "); - if (separator !== -1) paths.add(record2.slice(separator + 1).split(path20.sep).join("/")); + if (separator !== -1) paths.add(record2.slice(separator + 1).split(path21.sep).join("/")); } return paths; } @@ -45137,8 +45361,8 @@ function pathIsWithin(root, candidate) { if (getPlatformServices().os === "win32") { return canonicalizeForScope(candidate, root); } - const relative2 = path20.relative(root, candidate); - return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path20.sep}`) && !path20.isAbsolute(relative2); + const relative2 = path21.relative(root, candidate); + return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path21.sep}`) && !path21.isAbsolute(relative2); } function pathsIdentifySameLocation(left, right) { if (getPlatformServices().os === "win32") { @@ -45158,10 +45382,10 @@ async function isSafeTrackedFileSymlink(repositoryRoot, symlinkPath, relativePat if (hasCode(error51, ["ENOENT", "ENOTDIR", "ELOOP"])) return false; throw error51; } - if (path20.isAbsolute(linkTarget)) return false; - const lexicalTarget = path20.resolve(path20.dirname(symlinkPath), linkTarget); + if (path21.isAbsolute(linkTarget)) return false; + const lexicalTarget = path21.resolve(path21.dirname(symlinkPath), linkTarget); if (!pathIsWithin(repositoryRoot, lexicalTarget)) return false; - if (pathIsWithin(path20.join(repositoryRoot, ".git"), lexicalTarget)) return false; + if (pathIsWithin(path21.join(repositoryRoot, ".git"), lexicalTarget)) return false; let target; try { target = await realpath11(symlinkPath); @@ -45171,7 +45395,7 @@ async function isSafeTrackedFileSymlink(repositoryRoot, symlinkPath, relativePat } if (!pathsIdentifySameLocation(lexicalTarget, target)) return false; if (!pathIsWithin(repositoryRoot, target)) return false; - if (pathIsWithin(path20.join(repositoryRoot, ".git"), target)) return false; + if (pathIsWithin(path21.join(repositoryRoot, ".git"), target)) return false; return (await lstat12(target)).isFile(); } async function findNestedRepositories(repositoryRoot, registeredSubmodules, trackedSymlinks, writeAllowlist) { @@ -45182,7 +45406,7 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac const directory = pendingDirectories.pop(); if (directory.relativePath !== "") { try { - await lstat12(path20.join(directory.path, ".git")); + await lstat12(path21.join(directory.path, ".git")); nested.push(directory.relativePath); continue; } catch (error51) { @@ -45197,8 +45421,8 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac throw new Error("nested repository scan entry budget exceeded"); } if (entry.name === ".git") continue; - const child = path20.join(directory.path, entry.name); - const relativeChild = path20.relative(repositoryRoot, child).split(path20.sep).join("/"); + const child = path21.join(directory.path, entry.name); + const relativeChild = path21.relative(repositoryRoot, child).split(path21.sep).join("/"); if (registeredSubmodules.has(relativeChild)) continue; if (!writeAllowlist.some((pattern) => patternOverlapsRepository(pattern, relativeChild))) continue; if (entry.isSymbolicLink()) { @@ -45343,10 +45567,10 @@ function createIsolatedRemoteTransport(runGit = git) { }); }; const createRepository = async () => { - const root = path21.join(resolveStateDir(), "autopilot-remote"); + const root = path22.join(resolveStateDir(), "autopilot-remote"); await mkdir7(root, { recursive: true, mode: 448 }); await chmod(root, 448); - const repository = await mkdtemp2(path21.join(root, "operation-")); + const repository = await mkdtemp2(path22.join(root, "operation-")); await chmod(repository, 448); const initialized = await runIsolatedGit(repository, ["init", "--bare", "--quiet", "."]); if (!succeeded2(initialized)) { @@ -45394,7 +45618,7 @@ function createIsolatedRemoteTransport(runGit = git) { result = succeeded2(resolved) ? transportFailure("git resolve fetched base") : resolved; } else { fetchedOid = resolved.stdout.trim(); - const bundlePath = path21.join(repository, "base.bundle"); + const bundlePath = path22.join(repository, "base.bundle"); const bundled = await runIsolatedGit( repository, ["bundle", "create", bundlePath, quarantineRef] @@ -45496,7 +45720,7 @@ async function parseWorktreeRegistrations(output, allowMissing = false) { const separator = field.indexOf(" "); const key = separator === -1 ? field : field.slice(0, separator); const value = separator === -1 ? "" : field.slice(separator + 1); - if (key === "worktree") registration.worktree = path21.resolve(value); + if (key === "worktree") registration.worktree = path22.resolve(value); else if (key === "HEAD") registration.head = value; else if (key === "branch") registration.branch = value; } @@ -45539,7 +45763,7 @@ function parseRegistration2(value, workflowId) { "remoteUrl", "ownerRepo", "bootstrapOwner" - ]) || parsed.ownershipVersion !== OWNERSHIP_VERSION || parsed.workflowId !== workflowId || typeof parsed.checkoutPath !== "string" || !path21.isAbsolute(parsed.checkoutPath) || path21.resolve(parsed.checkoutPath) !== parsed.checkoutPath || typeof parsed.gitCommonDir !== "string" || !path21.isAbsolute(parsed.gitCommonDir) || path21.resolve(parsed.gitCommonDir) !== parsed.gitCommonDir || typeof parsed.repositoryIdentity !== "string" || parsed.repositoryIdentity !== parsed.gitCommonDir || typeof parsed.worktreePath !== "string" || !path21.isAbsolute(parsed.worktreePath) || path21.resolve(parsed.worktreePath) !== parsed.worktreePath || typeof parsed.worktreeGitDir !== "string" || !path21.isAbsolute(parsed.worktreeGitDir) || path21.resolve(parsed.worktreeGitDir) !== parsed.worktreeGitDir || typeof parsed.branch !== "string" || parsed.branchRef !== `refs/heads/${parsed.branch}` || parsed.baseRef !== `refs/claude-architect/autopilot/${workflowId}/base` || typeof parsed.baseBranch !== "string" || !isOid(parsed.baseCommitOid ?? "") || parsed.remote !== "origin" || typeof parsed.remoteUrl !== "string" || typeof parsed.ownerRepo !== "string" || !isBootstrapOwnerRecord(parsed.bootstrapOwner, workflowId)) return null; + ]) || parsed.ownershipVersion !== OWNERSHIP_VERSION || parsed.workflowId !== workflowId || typeof parsed.checkoutPath !== "string" || !path22.isAbsolute(parsed.checkoutPath) || path22.resolve(parsed.checkoutPath) !== parsed.checkoutPath || typeof parsed.gitCommonDir !== "string" || !path22.isAbsolute(parsed.gitCommonDir) || path22.resolve(parsed.gitCommonDir) !== parsed.gitCommonDir || typeof parsed.repositoryIdentity !== "string" || parsed.repositoryIdentity !== parsed.gitCommonDir || typeof parsed.worktreePath !== "string" || !path22.isAbsolute(parsed.worktreePath) || path22.resolve(parsed.worktreePath) !== parsed.worktreePath || typeof parsed.worktreeGitDir !== "string" || !path22.isAbsolute(parsed.worktreeGitDir) || path22.resolve(parsed.worktreeGitDir) !== parsed.worktreeGitDir || typeof parsed.branch !== "string" || parsed.branchRef !== `refs/heads/${parsed.branch}` || parsed.baseRef !== `refs/claude-architect/autopilot/${workflowId}/base` || typeof parsed.baseBranch !== "string" || !isOid(parsed.baseCommitOid ?? "") || parsed.remote !== "origin" || typeof parsed.remoteUrl !== "string" || typeof parsed.ownerRepo !== "string" || !isBootstrapOwnerRecord(parsed.bootstrapOwner, workflowId)) return null; return parsed; } async function readRegistrationFile(ownershipPath, expectedWorkflowId) { @@ -45568,12 +45792,12 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { throw new RuntimeError("workflow ownership record is malformed"); } const ownershipHash = createHash10("sha256").update(registration.workflowId).digest("hex"); - const expectedOwnershipPath = path21.join( + const expectedOwnershipPath = path22.join( resolveStateDir(), "autopilot-branches", `${ownershipHash}.json` ); - if (path21.resolve(ownershipPath) !== path21.resolve(expectedOwnershipPath)) { + if (path22.resolve(ownershipPath) !== path22.resolve(expectedOwnershipPath)) { throw new RuntimeError("workflow ownership filename does not match its workflow id"); } const [canonicalOwnershipPath, canonicalExpectedOwnershipPath, canonicalWorktreePath] = await Promise.all([ @@ -45592,10 +45816,10 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { throw new RuntimeError("workflow ownership record changed during validation"); } const managedName = `workflow-${ownershipHash.slice(0, 32)}`; - const candidateName = path21.basename(canonicalWorktreePath); + const candidateName = path22.basename(canonicalWorktreePath); const ownsPrimary = candidateName === managedName && canonicalRegisteredWorktreePath === canonicalWorktreePath; const legacyFinalName = `final-${createHash10("sha256").update(JSON.stringify(registration.workflowId)).digest("hex").slice(0, 24)}`; - const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path21.basename(canonicalRegisteredWorktreePath) === managedName && path21.dirname(canonicalRegisteredWorktreePath) === path21.dirname(canonicalWorktreePath); + const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path22.basename(canonicalRegisteredWorktreePath) === managedName && path22.dirname(canonicalRegisteredWorktreePath) === path22.dirname(canonicalWorktreePath); if (canonicalOwnershipPath !== canonicalExpectedOwnershipPath || !ownsPrimary && !ownsFinalMaterialization) { throw new RuntimeError("workflow ownership record names a different worktree"); } @@ -45632,7 +45856,7 @@ var WorkflowBranchManager = class { } ownershipPath(workflowId) { const name = createHash10("sha256").update(workflowId).digest("hex"); - return path21.join(resolveStateDir(), "autopilot-branches", `${name}.json`); + return path22.join(resolveStateDir(), "autopilot-branches", `${name}.json`); } async readRegistration(workflowId) { try { @@ -45673,15 +45897,15 @@ var WorkflowBranchManager = class { } async persistOwnership(identity, bootstrapOwner) { const ownershipPath = this.ownershipPath(identity.workflowId); - const directory = path21.dirname(ownershipPath); + const directory = path22.dirname(ownershipPath); await mkdir7(directory, { recursive: true }); - const temporaryPath = path21.join(directory, `.${path21.basename(ownershipPath)}.${randomUUID6()}.tmp`); + const temporaryPath = path22.join(directory, `.${path22.basename(ownershipPath)}.${randomUUID6()}.tmp`); const bytes = Buffer.from(`${JSON.stringify({ ...identity, bootstrapOwner })} `); let temporaryExists = false; let ownershipLinked = false; try { - const handle = await open11( + const handle = await open10( temporaryPath, constants10.O_WRONLY | constants10.O_CREAT | constants10.O_EXCL | (constants10.O_NOFOLLOW ?? 0), 384 @@ -46318,7 +46542,7 @@ function normalizedEvidenceRefs(references, allowEmpty = false, maximum = 128) { } const unique = /* @__PURE__ */ new Set(); for (const reference of references) { - if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path22.posix.isAbsolute(reference) || reference.includes("\\") || reference.split("/").some((component) => component === "" || component === "." || component === "..") || /[\0\r\n]/u.test(reference)) { + if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path23.posix.isAbsolute(reference) || reference.includes("\\") || reference.split("/").some((component) => component === "" || component === "." || component === "..") || /[\0\r\n]/u.test(reference)) { fail2("missing-task-evidence", "task evidence reference is invalid"); } unique.add(reference); @@ -46772,14 +46996,14 @@ function freezePackage(value) { return value; } async function persistImmutableJson(workflowDirectory, reference, value) { - const destination = path22.join(workflowDirectory, reference); - const temporary = path22.join(workflowDirectory, `.${reference}.${randomUUID7()}.tmp`); + const destination = path23.join(workflowDirectory, reference); + const temporary = path23.join(workflowDirectory, `.${reference}.${randomUUID7()}.tmp`); const serialized = `${JSON.stringify(value, null, 2)} `; let handle; let temporaryExists = false; try { - handle = await open12( + handle = await open11( temporary, constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | NO_FOLLOW5, 384 @@ -46813,8 +47037,8 @@ async function persistImmutableJson(workflowDirectory, reference, value) { } } async function persistFrozenArtifact(workflowDirectory, artifact) { - const destination = path22.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - const temporary = path22.join( + const destination = path23.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); + const temporary = path23.join( workflowDirectory, `.${FINAL_BRANCH_ARTIFACT_REF}.${randomUUID7()}.tmp` ); @@ -46823,7 +47047,7 @@ async function persistFrozenArtifact(workflowDirectory, artifact) { let handle; let temporaryExists = false; try { - handle = await open12( + handle = await open11( temporary, constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | NO_FOLLOW5, 384 @@ -46861,8 +47085,8 @@ async function persistFrozenArtifact(workflowDirectory, artifact) { async function assertPersistedArtifact(workflowDirectory, artifact) { let handle; try { - const destination = path22.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - handle = await open12(destination, constants11.O_RDONLY | NO_FOLLOW5); + const destination = path23.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); + handle = await open11(destination, constants11.O_RDONLY | NO_FOLLOW5); const metadata = await handle.stat(); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > MAX_FINAL_BRANCH_ARTIFACT_BYTES) { fail2("artifact-persistence-failed", "final branch artifact is not a safe regular file"); @@ -49197,7 +49421,7 @@ var CandidatePromoter = class { }; // src/pipeline/pipeline-runtime.ts -import path27 from "node:path"; +import path28 from "node:path"; // src/protocol/spec-hash.ts import { createHash as createHash13 } from "node:crypto"; @@ -49220,7 +49444,7 @@ import { rm as rm10 } from "node:fs/promises"; // src/git/candidate-tree.ts import { lstat as lstat15, mkdtemp as mkdtemp3, rm as rm9 } from "node:fs/promises"; import { tmpdir as tmpdir6 } from "node:os"; -import path23 from "node:path"; +import path24 from "node:path"; var MAX_DIAGNOSTIC_LENGTH5 = 2e3; var MAX_REJECT_PATHS = 25; var BINARY_PATCH_PAYLOAD_MARKER = "[[BINARY_PATCH_PAYLOAD_OMITTED]]"; @@ -49285,7 +49509,7 @@ function isAllowed2(pathname, writeAllowlist, forbiddenScope, opaqueDirectory = async function advisoryLstatScan(worktreePath, changedPaths) { const symlinkResults = await Promise.all(changedPaths.map(async (changedPath) => { try { - return (await lstat15(path23.resolve(worktreePath, changedPath))).isSymbolicLink(); + return (await lstat15(path24.resolve(worktreePath, changedPath))).isSymbolicLink(); } catch (error51) { if (error51.code === "ENOENT") return false; throw error51; @@ -49319,8 +49543,8 @@ async function freezeCandidate(args) { if (await advisoryLstatScan(args.worktreePath, inventory.changedPaths)) { return { ok: false, reason: "modified-symlink" }; } - const indexDirectory = await mkdtemp3(path23.join(tmpdir6(), "claude-architect-index-")); - const indexFile = path23.join(indexDirectory, "index"); + const indexDirectory = await mkdtemp3(path24.join(tmpdir6(), "claude-architect-index-")); + const indexFile = path24.join(indexDirectory, "index"); try { await checkedGit4(args.worktreePath, ["read-tree", args.baseCommitOid], indexFile); if (inventory.changedPaths.length > 0) { @@ -49421,7 +49645,7 @@ async function freezeCandidate(args) { import { randomUUID as randomUUID9 } from "node:crypto"; import { readFile as readFile5 } from "node:fs/promises"; import { basename } from "node:path"; -import path24 from "node:path"; +import path25 from "node:path"; function throwIfAborted(signal) { if (!signal?.aborted) return; throw new DOMException("Baseline verification was cancelled", "AbortError"); @@ -49504,7 +49728,7 @@ function shellCommandInvokesVitest(command, scripts, visitedScripts) { } async function packageScriptInvokesVitest(cwd, scriptName) { try { - const parsed = JSON.parse(await readFile5(path24.join(cwd, "package.json"), "utf8")); + const parsed = JSON.parse(await readFile5(path25.join(cwd, "package.json"), "utf8")); if (parsed === null || typeof parsed !== "object" || !("scripts" in parsed)) return false; const scripts = parsed.scripts; if (scripts === null || typeof scripts !== "object") return false; @@ -49678,7 +49902,7 @@ async function verifyBaseline(args) { } // src/runtime/producer-preflight.ts -import path25 from "node:path"; +import path26 from "node:path"; var PREFLIGHT_PROBE_FILE = "claude-architect-preflight.txt"; var PREFLIGHT_TIMEOUT_MS = 18e4; var PREFLIGHT_OUTPUT_LIMIT = 256 * 1024; @@ -49744,59 +49968,49 @@ async function runProducerPreflight(args) { }; try { await linkPrimaryDependencies(args.repoRoot, worktree.path); - const invocationCtx = { - worktreePath: worktree.path, - runId: args.runId, - ...args.tempHome === null ? {} : { tempHome: args.tempHome }, - capabilityReport: args.capabilityReport, - executable: args.capabilityReport.resolvedExecutable - }; - let invocation; + let launchResult; try { - invocation = args.adapter.buildInvocation( - probeSpec(args.spec, executables), - invocationCtx - ); + launchResult = await producerRuntime.launch({ + adapter: args.adapter, + producerId: args.capabilityReport.producerId, + spec: probeSpec(args.spec, executables), + worktreePath: worktree.path, + intent: "edit", + ps: args.ps, + runId: args.runId, + tempHome: args.tempHome, + timeoutMs: PREFLIGHT_TIMEOUT_MS, + maxOutputBytes: PREFLIGHT_OUTPUT_LIMIT, + capabilityReport: args.capabilityReport, + ...args.abortSignal === void 0 ? {} : { abortSignal: args.abortSignal } + }); } catch { - invocation = args.adapter.buildInvocation( - probeSpec(args.spec, executables, { forceLowReasoning: false }), - invocationCtx - ); - } - const selection = selectSandboxBackend(args.capabilityReport); - if (selection.backend?.kind === "os" && selection.backend.id === "macos-seatbelt") { - invocation = wrapInvocationWithSeatbelt(invocation, { + launchResult = await producerRuntime.launch({ + adapter: args.adapter, + producerId: args.capabilityReport.producerId, + spec: probeSpec(args.spec, executables, { forceLowReasoning: false }), worktreePath: worktree.path, + intent: "edit", + ps: args.ps, + runId: args.runId, tempHome: args.tempHome, - allowNetwork: invocation.network === "allowed" + timeoutMs: PREFLIGHT_TIMEOUT_MS, + maxOutputBytes: PREFLIGHT_OUTPUT_LIMIT, + capabilityReport: args.capabilityReport, + ...args.abortSignal === void 0 ? {} : { abortSignal: args.abortSignal } }); } - const built = buildEnvironment({ - os: args.ps.os, - adapterAllowlist: invocation.requiredEnv, - ...invocation.env === void 0 ? {} : { adapterValues: invocation.env }, - ...args.tempHome === null ? {} : { tempHome: args.tempHome } - }); try { - const exit = await supervise(args.ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktree.path, - env: built.env, - timeoutMs: PREFLIGHT_TIMEOUT_MS, - ...invocation.stdin === void 0 ? {} : { stdin: invocation.stdin }, - maxOutputBytes: PREFLIGHT_OUTPUT_LIMIT - }, args.abortSignal === void 0 ? {} : { onCancel: args.abortSignal }); - if (exit.cancelled) { + if (launchResult.exit.cancelled) { return complete({ status: "inconclusive", reason: "cancelled", missing: [], probe: null }); } } finally { - built.secretRegistration.dispose(); + launchResult.builtEnvironment.secretRegistration.dispose(); } let contents; try { const probeBytes = await readStableRegularFile( - path25.join(worktree.path, PREFLIGHT_PROBE_FILE), + path26.join(worktree.path, PREFLIGHT_PROBE_FILE), BigInt(PROBE_FILE_LIMIT) ); if (probeBytes === null) throw new RuntimeError("the Producer probe file is not stable"); @@ -49971,7 +50185,6 @@ async function transitionRunStatusSafely(store, runId, phase, fields = {}) { } // src/runtime/attempt-runtime.ts -var MAX_PRODUCER_OUTPUT_BYTES2 = 1e6; var MAX_SNAPSHOT_DIFF_BYTES = 1e5; async function captureWorktreeSnapshot(worktreePath) { await git(worktreePath, ["add", "-A", "-N"]); @@ -50044,20 +50257,6 @@ function producerLog(exit) { "" ].join("\n"); } -function preCancelledExit2() { - return { - exitCode: null, - signal: null, - timedOut: false, - cancelled: true, - stdout: "", - stderr: "", - truncated: { stdout: false, stderr: false } - }; -} -function shouldUseTemporaryHome(profile) { - return profile.isolationState === "controlled-config-supported" || profile.isolationState === "controlled-config-with-copied-credentials"; -} async function archiveTerminal(context) { const verificationSecretRegistrations = []; try { @@ -50113,7 +50312,8 @@ ${context.spec.context}`, timeoutMs: context.spec.timeoutMs, network: context.invocation?.network ?? "not-started", writeAllowlist: context.spec.writeAllowlist, - forbiddenScope: context.spec.forbiddenScope + forbiddenScope: context.spec.forbiddenScope, + probeCacheHits: context.probeCacheHits ?? 0 }, environment: context.environment, packagedVerifier: context.packagedVerifier @@ -50187,8 +50387,13 @@ async function runAttempt(checkoutPath, spec, deps) { detail: fields.detail ?? null }); }; + const runtime = deps.producerRegistry !== void 0 ? new ProducerRuntime(deps.producerRegistry) : producerRuntime; const archiveWithStatus = async (context) => { - const result = await archiveTerminal(statusContext.pipelineManaged ? context : { ...context, evidence: { ...context.evidence, plainDelegate: true } }); + const effectiveContext = { + ...context, + probeCacheHits: context.probeCacheHits ?? runtime.probeCacheHits + }; + const result = await archiveTerminal(statusContext.pipelineManaged ? effectiveContext : { ...effectiveContext, evidence: { ...context.evidence, plainDelegate: true } }); if (!statusContext.pipelineManaged) { await emitStatus(result.status === "verified-candidate" ? "done" : "failed", { producerId: result.producerId, @@ -50386,15 +50591,20 @@ async function runAttempt(checkoutPath, spec, deps) { borrowedCheckoutLease: lock }).create(preconditions.baseCommitOid); const profile = adapter.configurationProfile(); - if (shouldUseTemporaryHome(profile)) tempHome = await ps.createSecureTempDirectory(); - let invocation = adapter.buildInvocation(spec, { + const launchPlan = await runtime.planLaunch({ + producerId: report.producerId, + adapter, + spec, worktreePath: worktree.path, + intent: spec.executionMode === "edit" ? "edit" : "read-only", + ps, runId, - ...tempHome === null ? {} : { tempHome }, - capabilityReport: report, - executable: report.resolvedExecutable + capabilityReport: report }); - let confinement = null; + tempHome = launchPlan.tempHome; + builtEnvironment = launchPlan.builtEnvironment; + let invocation = launchPlan.invocation; + let confinement = launchPlan.confinementBackend; if (spec.executionMode === "edit") { const selection = selectSandboxBackend(report); if (selection.backend === null) { @@ -50422,14 +50632,6 @@ async function runAttempt(checkoutPath, spec, deps) { packagedVerifier }); } - confinement = selection.backend.id; - if (selection.backend.kind === "os" && selection.backend.id === "macos-seatbelt") { - invocation = wrapInvocationWithSeatbelt(invocation, { - worktreePath: worktree.path, - tempHome, - allowNetwork: invocation.network === "allowed" - }); - } } if (spec.executionMode === "edit" && deps.producerPreflight !== false) { if (!statusContext.pipelineManaged) { @@ -50478,30 +50680,29 @@ async function runAttempt(checkoutPath, spec, deps) { }); } } - builtEnvironment = buildEnvironment({ - os: ps.os, - adapterAllowlist: invocation.requiredEnv, - ...invocation.env === void 0 ? {} : { adapterValues: invocation.env }, - ...tempHome === null ? {} : { tempHome } - }); - const recordingServices = withRunStartPidRecording(ps, runStartContext); - const watchdog = await parentDeathWatchdogInvocation( - invocation.executable, - invocation.args - ); if (!statusContext.pipelineManaged) { await emitStatus("implementing", { producerId: report.producerId }); } await reportPhase(deps, "producer running"); - const exit = deps.abortSignal?.aborted === true ? preCancelledExit2() : await supervise(recordingServices, { - executable: watchdog.executable, - args: watchdog.args, - cwd: worktree.path, - env: builtEnvironment.env, + const launchResult = await runtime.launch({ + producerId: report.producerId, + adapter, + spec, + worktreePath: worktree.path, + intent: spec.executionMode === "edit" ? "edit" : "read-only", + ps, + runId, + tempHome, + abortSignal: deps.abortSignal, timeoutMs: spec.timeoutMs, - ...invocation.stdin === void 0 ? {} : { stdin: invocation.stdin }, - maxOutputBytes: MAX_PRODUCER_OUTPUT_BYTES2 - }, deps.abortSignal === void 0 ? {} : { onCancel: deps.abortSignal }); + runStartContext, + capabilityReport: report, + plan: launchPlan + }); + invocation = launchResult.invocation; + builtEnvironment = launchResult.builtEnvironment; + const exit = launchResult.exit; + confinement = launchResult.confinementBackend; const signals = {}; let producerSummary = null; let candidate = null; @@ -50512,9 +50713,8 @@ async function runAttempt(checkoutPath, spec, deps) { if (exit.cancelled) signals.cancelled = true; if (exit.timedOut) signals.timeout = true; if (!hasFailureSignal2(signals)) { - const normalized = adapter.normalizeEvents({ stdout: exit.stdout, stderr: exit.stderr, exit }); - producerSummary = normalized.producerSummary; - if (!normalized.ok) signals["invalid-output"] = true; + producerSummary = launchResult.producerSummary; + if (!launchResult.ok) signals["invalid-output"] = true; if (exit.exitCode !== 0) signals["producer-failure"] = true; } if (!hasFailureSignal2(signals)) { @@ -50769,7 +50969,7 @@ function evaluateGates(input) { // src/pipeline/slice-composer.ts import { mkdtemp as mkdtemp4, rm as rm11 } from "node:fs/promises"; import { tmpdir as tmpdir7 } from "node:os"; -import path26 from "node:path"; +import path27 from "node:path"; var NULL_OID = "0000000000000000000000000000000000000000"; function parseRawDiffEntries(raw) { const fields = raw.split("\0"); @@ -50823,8 +51023,8 @@ async function composeSliceOntoHead(args) { `slice ${args.sliceIndex} changed paths already written by its wave: ${collisions.join(", ")}` ); } - const indexRoot = await mkdtemp4(path26.join(tmpdir7(), "ca-compose-")); - const indexFile = path26.join(indexRoot, "index"); + const indexRoot = await mkdtemp4(path27.join(tmpdir7(), "ca-compose-")); + const indexFile = path27.join(indexRoot, "index"); try { const options = { ...args.objectReadOptions, indexFile }; await checked(args.checkoutPath, ["read-tree", args.head], options, runGit); @@ -51278,7 +51478,7 @@ function privateObjectReadOptions(access6) { } async function importPromotedObjects(args) { const privateObjects = privateObjectReadOptions(args.access); - const packPrefix = path27.join(args.access.sharedObjectsDir, "pack", "pack"); + const packPrefix = path28.join(args.access.sharedObjectsDir, "pack", "pack"); await checkedGit5( args.checkoutPath, ["pack-objects", "--revs", packPrefix], @@ -53126,7 +53326,7 @@ var INTEGRABLE_DECISION_AUTHORITIES = [ // src/ship/github-cli-adapter.ts import { chmod as chmod2, rm as rm12 } from "node:fs/promises"; -import path28 from "node:path"; +import path29 from "node:path"; var MINIMUM_GH_VERSION = [2, 96, 0]; var OID2 = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; var REPOSITORY_COMPONENT = /^[A-Za-z0-9_.-]+$/u; @@ -53192,11 +53392,11 @@ function githubCredentialEnvironment() { if (process.env.GH_CONFIG_DIR !== void 0) { environment.GH_CONFIG_DIR = process.env.GH_CONFIG_DIR; } else if (process.platform === "win32" && process.env.APPDATA !== void 0) { - environment.GH_CONFIG_DIR = path28.join(process.env.APPDATA, "GitHub CLI"); + environment.GH_CONFIG_DIR = path29.join(process.env.APPDATA, "GitHub CLI"); } else if (process.env.XDG_CONFIG_HOME !== void 0) { - environment.GH_CONFIG_DIR = path28.join(process.env.XDG_CONFIG_HOME, "gh"); + environment.GH_CONFIG_DIR = path29.join(process.env.XDG_CONFIG_HOME, "gh"); } else if (process.env.HOME !== void 0) { - environment.GH_CONFIG_DIR = path28.join(process.env.HOME, ".config", "gh"); + environment.GH_CONFIG_DIR = path29.join(process.env.HOME, ".config", "gh"); } return environment; } @@ -53545,7 +53745,7 @@ var GitHubCliAdapter = class { const environment = isolatedGitEnvironment(quarantine); const remoteEnvironment = isolatedGitEnvironment(quarantine, true); const branchRef = `refs/heads/${request.branch}`; - const bundlePath = path28.join(quarantine, "branch.bundle"); + const bundlePath = path29.join(quarantine, "branch.bundle"); let outcome; let failure3; try { @@ -53896,21 +54096,21 @@ var GitHubCliAdapter = class { // src/mcp/allowlist-sufficiency.ts import { readFile as readFile7 } from "node:fs/promises"; -import path29 from "node:path"; +import path30 from "node:path"; var SOURCE_EXTENSIONS = /* @__PURE__ */ new Set([".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"]); var MAX_GAPS = 25; var MAX_FILE_BYTES = 512 * 1024; var IMPORT_SPECIFIER = /(?:\bfrom\s*|\bimport\s*\(\s*|\brequire\s*\(\s*)["']([^"']+)["']/gu; function toPosix(candidate) { - return candidate.split(path29.sep).join("/"); + return candidate.split(path30.sep).join("/"); } function isTestPath(candidate) { return /(?:^|\/)tests?\//u.test(candidate) || /\.(?:test|spec)\.[cm]?[jt]sx?$/u.test(candidate); } function resolveImport(fromPath, specifier, tracked) { if (!specifier.startsWith(".")) return null; - const base = toPosix(path29.posix.normalize( - path29.posix.join(path29.posix.dirname(toPosix(fromPath)), specifier) + const base = toPosix(path30.posix.normalize( + path30.posix.join(path30.posix.dirname(toPosix(fromPath)), specifier) )); if (base.startsWith("..")) return null; const rewrites = [ @@ -53940,10 +54140,10 @@ async function checkAllowlistSufficiency(repoRoot, spec, deps = {}) { const gaps = []; for (const candidate of tracked) { if (allowlisted.has(candidate)) continue; - if (!SOURCE_EXTENSIONS.has(path29.posix.extname(candidate))) continue; + if (!SOURCE_EXTENSIONS.has(path30.posix.extname(candidate))) continue; let contents; try { - contents = (await read(path29.join(repoRoot, candidate))).slice(0, MAX_FILE_BYTES); + contents = (await read(path30.join(repoRoot, candidate))).slice(0, MAX_FILE_BYTES); } catch { continue; } @@ -54198,7 +54398,7 @@ async function handleAutopilotResume(checkoutPath, workflowId, deps = {}) { return autopilotErrorResult(error51); } } -function isRecord9(value) { +function isRecord7(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } async function loadArchivedRun(runId, deps) { @@ -54301,7 +54501,7 @@ function unknownProducerErrors(preferences) { }]); } function schemaCompatibility(input) { - if (isRecord9(input) && input.specVersion !== void 0 && input.specVersion !== DELEGATION_SPEC_VERSION) { + if (isRecord7(input) && input.specVersion !== void 0 && input.specVersion !== DELEGATION_SPEC_VERSION) { return { ok: false, diagnostic: `delegation spec version mismatch: request declares ${String(input.specVersion)}, runtime expects ${DELEGATION_SPEC_VERSION}` @@ -54572,12 +54772,12 @@ function decisionAdvisoryForRun(run) { const incomplete = run.result.evidence.pipelineReviewIncomplete; const cleared = run.result.evidence.pipelineGateCleared; const warnings = []; - if (isRecord9(refused) && Array.isArray(refused.reasons)) { + if (isRecord7(refused) && Array.isArray(refused.reasons)) { warnings.push( `the pipeline gate did NOT clear this candidate: ${refused.reasons.filter((r) => typeof r === "string").join("; ")}` ); } - if (isRecord9(incomplete) && typeof incomplete.reason === "string") { + if (isRecord7(incomplete) && typeof incomplete.reason === "string") { warnings.push(`the pipeline could not complete its own review: ${incomplete.reason}`); } const plainDelegate = run.result.evidence.plainDelegate === true && refused === void 0 && incomplete === void 0 && cleared === void 0; @@ -54588,7 +54788,7 @@ function decisionAdvisoryForRun(run) { if (warnings.length === 0) { warnings.push("the pipeline gate clearance record is missing"); } - } else if (!isRecord9(cleared) || typeof cleared.candidateCommitOid !== "string" || typeof cleared.requiresHumanDecision !== "boolean") { + } else if (!isRecord7(cleared) || typeof cleared.candidateCommitOid !== "string" || typeof cleared.requiresHumanDecision !== "boolean") { warnings.push("the pipeline gate clearance record is malformed"); } else if (cleared.requiresHumanDecision === true) { warnings.push("the pipeline gate clearance record requires a human decision"); @@ -54729,13 +54929,13 @@ import { lstat as lstat16, link as link6, mkdir as mkdir8, - open as open13, + open as open12, readdir as readdir7, realpath as realpath13, rename as rename6, rm as rm13 } from "node:fs/promises"; -import path30 from "node:path"; +import path31 from "node:path"; import nodeProcess5 from "node:process"; var NO_FOLLOW6 = constants12.O_NOFOLLOW ?? 0; var MAX_STATE_FILE_BYTES = 8e6; @@ -54775,7 +54975,7 @@ function validateRunId(runId) { async function stateRoot() { const configured = nodeProcess5.env.CLAUDE_PLUGIN_DATA ?? (nodeProcess5.env.NODE_ENV === "test" ? nodeProcess5.env.CLAUDE_ARCHITECT_STATE_DIR : void 0); if (configured === void 0) return null; - const root = path30.resolve(resolveStateDir()); + const root = path31.resolve(resolveStateDir()); try { const metadata = await lstat16(root, { bigint: true }); if (!isPlainDirectory2(metadata) || metadata.birthtimeNs <= 0n) { @@ -54815,7 +55015,7 @@ async function readBoundedRegularFile2(filename) { async function readCleanupJournal(filename) { let handle; try { - handle = await open13(filename, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); } catch (error51) { if (isMissing3(error51)) return { text: null, tornTail: false }; throw error51; @@ -54899,7 +55099,7 @@ function parseRunStart(text, expectedRunId) { } const record2 = value; validateRunId(record2.runId); - if (record2.runId !== expectedRunId || typeof record2.lockKey !== "string" || !/^[0-9a-f]{64}$/.test(record2.lockKey) || typeof record2.canonicalCommonDir !== "string" || !path30.isAbsolute(record2.canonicalCommonDir) || record2.pid !== null && (record2.pid === void 0 || !Number.isSafeInteger(record2.pid) || record2.pid <= 1) || record2.processToken !== void 0 && record2.processToken !== null && typeof record2.processToken !== "string" || typeof record2.startedAt !== "string" || !Number.isFinite(Date.parse(record2.startedAt))) { + if (record2.runId !== expectedRunId || typeof record2.lockKey !== "string" || !/^[0-9a-f]{64}$/.test(record2.lockKey) || typeof record2.canonicalCommonDir !== "string" || !path31.isAbsolute(record2.canonicalCommonDir) || record2.pid !== null && (record2.pid === void 0 || !Number.isSafeInteger(record2.pid) || record2.pid <= 1) || record2.processToken !== void 0 && record2.processToken !== null && typeof record2.processToken !== "string" || typeof record2.startedAt !== "string" || !Number.isFinite(Date.parse(record2.startedAt))) { throw new RuntimeError("run-start recovery record is malformed"); } const expectedLockKey = createHash16("sha256").update(record2.canonicalCommonDir).digest("hex"); @@ -54942,7 +55142,7 @@ async function validateGitCommonDir(commonDir) { return canonical; } async function validateRepositoryRoot(repoRoot) { - if (!path30.isAbsolute(repoRoot)) { + if (!path31.isAbsolute(repoRoot)) { throw new RuntimeError("cleanup journal repository root is not absolute"); } const canonical = await realpath13(repoRoot); @@ -55126,7 +55326,7 @@ async function readRecoveryQuarantineJournal(runsRoot) { if (rootIdentity === null) { throw new RuntimeError("recovery quarantine journal root disappeared"); } - const filename = path30.join(runsRoot, "recovery-quarantine.ndjson"); + const filename = path31.join(runsRoot, "recovery-quarantine.ndjson"); let expectedMetadata; try { expectedMetadata = await lstat16(filename, { bigint: true }); @@ -55148,7 +55348,7 @@ async function readRecoveryQuarantineJournal(runsRoot) { } let handle; try { - handle = await open13(filename, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); } catch (error51) { if (!isMissing3(error51)) throw error51; try { @@ -55219,7 +55419,7 @@ async function syncRecoveryDirectory(directory) { await syncDirectoryMetadata(directory); } async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes) { - const temporaryPath = path30.join( + const temporaryPath = path31.join( runsRoot, `.recovery-quarantine-journal-${randomUUID11()}.tmp` ); @@ -55230,7 +55430,7 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne let temporaryIdentity; let primaryError; try { - handle = await open13( + handle = await open12( temporaryPath, constants12.O_RDWR | constants12.O_CREAT | constants12.O_EXCL | NO_FOLLOW6, 384 @@ -55364,7 +55564,7 @@ async function appendRecoveryQuarantineRecord(runsRoot, record2) { if (lineBytes > MAX_QUARANTINE_RECORD_BYTES) { throw new RuntimeError("recovery quarantine record exceeds its size limit"); } - const filename = path30.join(runsRoot, "recovery-quarantine.ndjson"); + const filename = path31.join(runsRoot, "recovery-quarantine.ndjson"); const snapshot = await readRecoveryQuarantineJournal(runsRoot); if (snapshot.runIds.has(record2.runId)) { await syncRecoveryDirectory(runsRoot); @@ -55381,8 +55581,8 @@ async function appendRecoveryQuarantineRecord(runsRoot, record2) { await publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes); } async function quarantineRun(runsRoot, runId, error51) { - const runDirectory = path30.join(runsRoot, runId); - const quarantinePath = path30.join(runsRoot, `.poisoned-${runId}`); + const runDirectory = path31.join(runsRoot, runId); + const quarantinePath = path31.join(runsRoot, `.poisoned-${runId}`); const runsIdentity = await plainDirectoryIdentity(runsRoot); if (runsIdentity === null) throw new RuntimeError("recovery runs root disappeared"); let runIdentity = null; @@ -55464,8 +55664,8 @@ async function appendCleanupRecord(runsRoot, record2) { try { const identity = await plainDirectoryIdentity(runsRoot); if (identity === null) throw new RuntimeError("cleanup journal root disappeared"); - const filename = path30.join(runsRoot, "cleanup.ndjson"); - const handle = await open13( + const filename = path31.join(runsRoot, "cleanup.ndjson"); + const handle = await open12( filename, constants12.O_WRONLY | constants12.O_CREAT | constants12.O_APPEND | NO_FOLLOW6, 384 @@ -55543,7 +55743,7 @@ async function commitCleanupRefs(record2) { await deleteExactRef(repoRoot, record2.backupRef, backupOid); } async function readPendingCleanupRecords(runsRoot) { - const { text, tornTail } = await readCleanupJournal(path30.join(runsRoot, "cleanup.ndjson")); + const { text, tornTail } = await readCleanupJournal(path31.join(runsRoot, "cleanup.ndjson")); const pending = /* @__PURE__ */ new Map(); if (text === null || text === "") return { pending, tornTail }; const completeText = text.endsWith("\n") ? text.slice(0, -1) : text; @@ -55558,7 +55758,7 @@ async function readPendingCleanupRecords(runsRoot) { async function truncateCleanupTornTail(filename) { let handle; try { - handle = await open13(filename, constants12.O_RDWR | NO_FOLLOW6); + handle = await open12(filename, constants12.O_RDWR | NO_FOLLOW6); } catch (error51) { if (isMissing3(error51)) return; throw error51; @@ -55586,7 +55786,7 @@ async function truncateCleanupTornTail(filename) { } } async function repositoryRootExists(repoRoot) { - if (!path30.isAbsolute(repoRoot)) return true; + if (!path31.isAbsolute(repoRoot)) return true; try { await realpath13(repoRoot); return true; @@ -55596,8 +55796,8 @@ async function repositoryRootExists(repoRoot) { } } async function reconcileRepoAbsentPrune(runsRoot, record2, platformServices) { - const runDirectory = path30.join(runsRoot, record2.runId); - const quarantinePath = path30.join(runsRoot, record2.quarantineName); + const runDirectory = path31.join(runsRoot, record2.runId); + const quarantinePath = path31.join(runsRoot, record2.quarantineName); const runIdentity = await plainDirectoryIdentity(runDirectory); const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); if (runIdentity !== null && quarantineIdentity !== null) { @@ -55619,7 +55819,7 @@ async function replayInterruptedPrunes(runsRoot, ps) { const journalLock = await getPlatformServices().acquireCleanupJournalLock(); try { const read = await readPendingCleanupRecords(runsRoot); - if (read.tornTail) await truncateCleanupTornTail(path30.join(runsRoot, "cleanup.ndjson")); + if (read.tornTail) await truncateCleanupTornTail(path31.join(runsRoot, "cleanup.ndjson")); pending = read.pending; } finally { await journalLock.release(); @@ -55649,8 +55849,8 @@ async function replayInterruptedPrunes(runsRoot, ps) { if (lease.repositoryIdentity !== repositoryIdentity) { throw new RuntimeError("checkout lease repository identity changed during prune recovery"); } - const runDirectory = path30.join(runsRoot, record2.runId); - const quarantinePath = path30.join(runsRoot, record2.quarantineName); + const runDirectory = path31.join(runsRoot, record2.runId); + const quarantinePath = path31.join(runsRoot, record2.quarantineName); const runIdentity = await plainDirectoryIdentity(runDirectory); const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); if (runIdentity !== null && quarantineIdentity !== null) { @@ -55691,7 +55891,7 @@ async function replayInterruptedPrunes(runsRoot, ps) { async function managedWorktreeMarkerIsPresent(worktreePath) { let marker; try { - marker = await lstat16(path30.join(worktreePath, ".git"), { bigint: true }); + marker = await lstat16(path31.join(worktreePath, ".git"), { bigint: true }); } catch (error51) { if (isMissing3(error51)) return false; throw error51; @@ -55723,7 +55923,7 @@ async function removeManagedWorktreeUnderLease(commonDir, worktreePath, expected resolved.stdout, "managed worktree common directory" ); - if (!path30.isAbsolute(reportedCommonDir) || await realpath13(reportedCommonDir) !== commonDir) { + if (!path31.isAbsolute(reportedCommonDir) || await realpath13(reportedCommonDir) !== commonDir) { throw new RuntimeError("managed worktree belongs to a different repository"); } } @@ -55753,13 +55953,13 @@ function mostSpecificKnownRunClaim(knownRunIds, managedId) { return owner; } async function cleanupRunWorktreesUnderLease(root, commonDir, runId, runGit, knownRunIds) { - const worktreesRoot = path30.join(root, "worktrees"); + const worktreesRoot = path31.join(root, "worktrees"); const worktreesIdentity = await plainDirectoryIdentity(worktreesRoot); if (worktreesIdentity !== null) { const entries = await readdir7(worktreesRoot, { withFileTypes: true }); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { if (!entry.isDirectory() || entry.isSymbolicLink() || !runClaimsWorktree(runId, entry.name) || mostSpecificKnownRunClaim(knownRunIds, entry.name) !== runId) continue; - const worktreePath = path30.join(worktreesRoot, entry.name); + const worktreePath = path31.join(worktreesRoot, entry.name); const identity = await managedWorktreeDirectoryIdentity(worktreePath); if (identity !== null) { await removeManagedWorktreeUnderLease(commonDir, worktreePath, identity, runGit); @@ -55770,23 +55970,23 @@ async function cleanupRunWorktreesUnderLease(root, commonDir, runId, runGit, kno if (listed.exitCode !== 0 || listed.truncated?.stdout === true || listed.truncated?.stderr === true) { throw runGitError("enumerate missing run worktree registrations", listed); } - const canonicalWorktreesRoot = worktreesIdentity === null ? path30.join(await realpath13(root), "worktrees") : await realpath13(worktreesRoot); + const canonicalWorktreesRoot = worktreesIdentity === null ? path31.join(await realpath13(root), "worktrees") : await realpath13(worktreesRoot); for (const field of gitNulRecords(listed.stdout, "missing-run Git worktree list")) { if (!field.startsWith("worktree ")) continue; - const reportedWorktreePath = path30.resolve(field.slice("worktree ".length)); + const reportedWorktreePath = path31.resolve(field.slice("worktree ".length)); let worktreePath; try { worktreePath = await canonicalizeWorktreePath(reportedWorktreePath, true); } catch (error51) { if (!isMissing3(error51) || worktreesIdentity !== null) throw error51; - const reportedRoot = path30.dirname(reportedWorktreePath); - worktreePath = path30.join( - await realpath13(path30.dirname(reportedRoot)), - path30.basename(reportedRoot), - path30.basename(reportedWorktreePath) + const reportedRoot = path31.dirname(reportedWorktreePath); + worktreePath = path31.join( + await realpath13(path31.dirname(reportedRoot)), + path31.basename(reportedRoot), + path31.basename(reportedWorktreePath) ); } - if (!platformPathsEqual(path30.dirname(worktreePath), canonicalWorktreesRoot) || !runClaimsWorktree(runId, path30.basename(worktreePath)) || mostSpecificKnownRunClaim(knownRunIds, path30.basename(worktreePath)) !== runId || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; + if (!platformPathsEqual(path31.dirname(worktreePath), canonicalWorktreesRoot) || !runClaimsWorktree(runId, path31.basename(worktreePath)) || mostSpecificKnownRunClaim(knownRunIds, path31.basename(worktreePath)) !== runId || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; await removeMissingRegisteredWorktree(commonDir, worktreePath, { git: runGit }); } } @@ -55912,7 +56112,7 @@ async function removeLockIfUnchanged(lockPath, handle, expectedIdentity, expecte async function reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) { let handle; try { - handle = await open13(lockPath, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open12(lockPath, constants12.O_RDONLY | NO_FOLLOW6); } catch (error51) { if (isMissing3(error51)) return "contended"; throw error51; @@ -55928,7 +56128,7 @@ async function reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) if (owner === null) { logger.warn("startup recovery preserved malformed lock", { event: "recovery-malformed-lock", - lockName: path30.basename(lockPath), + lockName: path31.basename(lockPath), reason: "invalid-owner-record" }); return "malformed"; @@ -55942,7 +56142,7 @@ async function reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) if (ownerStatus2 === "unverifiable") { logger.warn("startup recovery preserved unverifiable lock", { event: "recovery-unverifiable-lock", - lockName: path30.basename(lockPath), + lockName: path31.basename(lockPath), reason: "process-token-unavailable" }); return "unverifiable"; @@ -55999,7 +56199,7 @@ async function validateOwnedLockState(handle, namedPaths, expectedIdentity, expe async function removeExpectedLockPath(filename, expectedIdentity, expectedContents, expectedLinks) { let handle; try { - handle = await open13(filename, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); } catch (error51) { if (isMissing3(error51)) return "absent"; throw error51; @@ -56041,7 +56241,7 @@ async function pathNamesLockIdentity(filename, expectedIdentity) { } } async function validatePublishedLock(lockPath, expectedIdentity, expectedContents, parentPath, parentIdentity, expectedLinks = 1, namedPaths = [lockPath]) { - const handle = await open13(lockPath, constants12.O_RDONLY | NO_FOLLOW6); + const handle = await open12(lockPath, constants12.O_RDONLY | NO_FOLLOW6); let primaryError; try { await validateOwnedLockState( @@ -56120,12 +56320,12 @@ async function createOwnedLock(lockPath, contents) { if (contents.byteLength > MAX_STATE_FILE_BYTES) { throw new RuntimeError("new recovery lock exceeds its size limit"); } - const parentPath = path30.dirname(lockPath); + const parentPath = path31.dirname(lockPath); const parentIdentity = await plainDirectoryIdentity(parentPath); if (parentIdentity === null) { throw new RuntimeError("recovery lock parent must remain a plain directory"); } - const temporaryPath = path30.join(parentPath, `.recovery-lock-${randomUUID11()}.tmp`); + const temporaryPath = path31.join(parentPath, `.recovery-lock-${randomUUID11()}.tmp`); let handle; let temporaryIdentity; let temporaryCreated = false; @@ -56133,7 +56333,7 @@ async function createOwnedLock(lockPath, contents) { let contended = false; const errors = []; try { - handle = await open13( + handle = await open12( temporaryPath, constants12.O_RDWR | constants12.O_CREAT | constants12.O_EXCL | NO_FOLLOW6, 384 @@ -56263,7 +56463,7 @@ async function acquireOwnedLock(lockPath, contents, isProcessAlive2, getProcessS async function releaseOwnedLock(lock) { let handle; try { - handle = await open13(lock.lockPath, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open12(lock.lockPath, constants12.O_RDONLY | NO_FOLLOW6); } catch (error51) { if (isMissing3(error51)) return; throw error51; @@ -56298,7 +56498,7 @@ async function reclaimLocks(locksRoot, isProcessAlive2, getProcessStartToken) { for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { const match = LOCK_NAME.exec(entry.name); if (match === null) continue; - const lockPath = path30.join(locksRoot, entry.name); + const lockPath = path31.join(locksRoot, entry.name); if (!entry.isFile() || entry.isSymbolicLink()) { throw new RuntimeError("checkout lock must be a regular file during recovery"); } @@ -56306,14 +56506,14 @@ async function reclaimLocks(locksRoot, isProcessAlive2, getProcessStartToken) { } } async function lockIsOwnedByLiveProcess(locksRoot, lockKey, isProcessAlive2, getProcessStartToken) { - const contents = await readBoundedRegularFile2(path30.join(locksRoot, `${lockKey}.lock`)); + const contents = await readBoundedRegularFile2(path31.join(locksRoot, `${lockKey}.lock`)); if (contents === null) return false; const owner = parseLockOwner(contents); if (owner === null) return true; return await lockOwnerStatus(owner, isProcessAlive2, getProcessStartToken) !== "dead"; } async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath) { - const backlink = await readStableRegularFile(path30.join(registrationPath, "gitdir"), 32768n); + const backlink = await readStableRegularFile(path31.join(registrationPath, "gitdir"), 32768n); if (backlink === null) { throw new RuntimeError("worktree registration backlink is absent or unstable"); } @@ -56321,11 +56521,11 @@ async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath backlink.toString("utf8"), "worktree registration backlink" ); - if (!path30.isAbsolute(reportedDotGit) || path30.basename(reportedDotGit) !== ".git") { + if (!path31.isAbsolute(reportedDotGit) || path31.basename(reportedDotGit) !== ".git") { throw new RuntimeError("worktree registration backlink is malformed"); } const [reportedPhysicalPath, canonicalExpectedPhysicalPath] = await Promise.all([ - canonicalizeWorktreePath(path30.dirname(reportedDotGit), true), + canonicalizeWorktreePath(path31.dirname(reportedDotGit), true), canonicalizeWorktreePath(expectedPhysicalPath, true) ]); if (!platformPathsEqual(reportedPhysicalPath, canonicalExpectedPhysicalPath)) { @@ -56336,9 +56536,9 @@ async function findCreationRegistration(registrationRoot, physicalPath) { const matches = []; for (const entry of await readdir7(registrationRoot, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path30.join(registrationRoot, entry.name); + const registrationPath = path31.join(registrationRoot, entry.name); const contents = await readStableRegularFile( - path30.join(registrationPath, "gitdir"), + path31.join(registrationPath, "gitdir"), 32768n ); if (contents === null) continue; @@ -56348,7 +56548,7 @@ async function findCreationRegistration(registrationRoot, physicalPath) { } catch { continue; } - if (path30.isAbsolute(backlink) && path30.basename(backlink) === ".git" && platformPathsEqual(path30.resolve(path30.dirname(backlink)), physicalPath)) { + if (path31.isAbsolute(backlink) && path31.basename(backlink) === ".git" && platformPathsEqual(path31.resolve(path31.dirname(backlink)), physicalPath)) { matches.push(registrationPath); } } @@ -56361,7 +56561,7 @@ async function findCreationPhysicalRoot(stateDirectory, expected) { const matches = []; for (const entry of await readdir7(stateDirectory, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path30.join(stateDirectory, entry.name); + const candidate = path31.join(stateDirectory, entry.name); const identity = await managedWorktreeDirectoryIdentity(candidate); if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); } @@ -56374,7 +56574,7 @@ async function findManagedChildByIdentity(root, expected) { const matches = []; for (const entry of await readdir7(root, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path30.join(root, entry.name); + const candidate = path31.join(root, entry.name); const identity = await managedWorktreeDirectoryIdentity(candidate); if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); } @@ -56386,14 +56586,14 @@ async function findManagedChildByIdentity(root, expected) { async function recoverWorktreeCreationIntent(manifestPath, manifest, platformServices, syncDirectory4, temporaryPath, temporaryKind) { const root = await stateRoot(); if (root === null) throw new RuntimeError("runtime state root is unavailable"); - const expectedPhysicalRootPath = path30.join(root, "worktrees"); - if (!path30.isAbsolute(manifest.physicalPath) || path30.resolve(manifest.physicalPath) !== manifest.physicalPath || !platformPathsEqual(path30.dirname(manifest.physicalPath), expectedPhysicalRootPath) || path30.basename(manifest.physicalPath) === "" || !path30.isAbsolute(manifest.physicalQuarantinePath) || path30.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath || !platformPathsEqual( - path30.dirname(manifest.physicalQuarantinePath), + const expectedPhysicalRootPath = path31.join(root, "worktrees"); + if (!path31.isAbsolute(manifest.physicalPath) || path31.resolve(manifest.physicalPath) !== manifest.physicalPath || !platformPathsEqual(path31.dirname(manifest.physicalPath), expectedPhysicalRootPath) || path31.basename(manifest.physicalPath) === "" || !path31.isAbsolute(manifest.physicalQuarantinePath) || path31.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath || !platformPathsEqual( + path31.dirname(manifest.physicalQuarantinePath), expectedPhysicalRootPath - ) || path30.basename(manifest.physicalQuarantinePath) !== `.create-${path30.basename(manifest.physicalPath)}-${manifest.transactionId}` || !path30.isAbsolute(manifest.commonDir) || !path30.isAbsolute(manifest.registrationRoot) || !path30.isAbsolute(manifest.quarantineRoot) || !path30.isAbsolute(manifest.quarantinePath) || !platformPathsEqual( + ) || path31.basename(manifest.physicalQuarantinePath) !== `.create-${path31.basename(manifest.physicalPath)}-${manifest.transactionId}` || !path31.isAbsolute(manifest.commonDir) || !path31.isAbsolute(manifest.registrationRoot) || !path31.isAbsolute(manifest.quarantineRoot) || !path31.isAbsolute(manifest.quarantinePath) || !platformPathsEqual( manifest.registrationRoot, - path30.join(manifest.commonDir, "worktrees") - ) || !platformPathsEqual(path30.dirname(manifest.quarantinePath), manifest.quarantineRoot) || path30.basename(manifest.quarantinePath) !== `.remove-registration-creation-${manifest.transactionId}`) { + path31.join(manifest.commonDir, "worktrees") + ) || !platformPathsEqual(path31.dirname(manifest.quarantinePath), manifest.quarantineRoot) || path31.basename(manifest.quarantinePath) !== `.remove-registration-creation-${manifest.transactionId}`) { throw new RuntimeError("worktree creation intent paths are inconsistent"); } const expectedCommonDir = { @@ -56456,8 +56656,8 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer ino: BigInt(manifest.physicalIno), birthtimeNs: BigInt(manifest.physicalBirthtimeNs) } : null; - const finalPhysicalPath = physicalRoot === null ? null : path30.join(physicalRoot, path30.basename(manifest.physicalPath)); - const stagedPhysicalPath = physicalRoot === null ? null : path30.join(physicalRoot, path30.basename(manifest.physicalQuarantinePath)); + const finalPhysicalPath = physicalRoot === null ? null : path31.join(physicalRoot, path31.basename(manifest.physicalPath)); + const stagedPhysicalPath = physicalRoot === null ? null : path31.join(physicalRoot, path31.basename(manifest.physicalQuarantinePath)); const [finalPhysicalIdentity, stagedPhysicalIdentity] = await Promise.all([ finalPhysicalPath === null ? null : managedWorktreeDirectoryIdentity(finalPhysicalPath), stagedPhysicalPath === null ? null : managedWorktreeDirectoryIdentity(stagedPhysicalPath) @@ -56562,15 +56762,15 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ } const commonDir = await realpath13(manifest.commonDir); repositoryIdentity = commonDir; - const expectedRegistrationRoot = path30.join(commonDir, "worktrees"); + const expectedRegistrationRoot = path31.join(commonDir, "worktrees"); const registrationRoot = await realpath13(expectedRegistrationRoot); - const expectedQuarantineRoot = path30.join( + const expectedQuarantineRoot = path31.join( commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY ); const quarantineRoot = await realpath13(expectedQuarantineRoot); const quarantineMetadata = await lstat16(quarantineRoot, { bigint: true }); - const physicalRoot = await realpath13(path30.resolve(resolveStateDir(), "worktrees")); + const physicalRoot = await realpath13(path31.resolve(resolveStateDir(), "worktrees")); const commonDirIdentity = await managedWorktreeDirectoryIdentity(commonDir); const registrationRootIdentity = await managedWorktreeDirectoryIdentity(registrationRoot); const quarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); @@ -56612,9 +56812,9 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ) ]); } - const manifestPhysicalRoot = await realpath13(path30.dirname(manifest.physicalPath)); + const manifestPhysicalRoot = await realpath13(path31.dirname(manifest.physicalPath)); const manifestPhysicalQuarantineRoot = await realpath13( - path30.dirname(manifest.physicalQuarantinePath) + path31.dirname(manifest.physicalQuarantinePath) ); const assertRemovalRootsUnchanged = async () => { const currentCommonDir = await managedWorktreeDirectoryIdentity(commonDir); @@ -56745,13 +56945,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "registrationPath is not absolute", - path30.isAbsolute(manifest.registrationPath), + path31.isAbsolute(manifest.registrationPath), manifest.registrationPath ); checkManifestConsistency( "registrationPath is not normalized", - path30.resolve(manifest.registrationPath) === manifest.registrationPath, - path30.resolve(manifest.registrationPath), + path31.resolve(manifest.registrationPath) === manifest.registrationPath, + path31.resolve(manifest.registrationPath), manifest.registrationPath ); checkManifestConsistency( @@ -56762,13 +56962,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "quarantinePath is not absolute", - path30.isAbsolute(manifest.quarantinePath), + path31.isAbsolute(manifest.quarantinePath), manifest.quarantinePath ); checkManifestConsistency( "quarantinePath is not normalized", - path30.resolve(manifest.quarantinePath) === manifest.quarantinePath, - path30.resolve(manifest.quarantinePath), + path31.resolve(manifest.quarantinePath) === manifest.quarantinePath, + path31.resolve(manifest.quarantinePath), manifest.quarantinePath ); checkManifestConsistency( @@ -56779,13 +56979,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalPath is not absolute", - path30.isAbsolute(manifest.physicalPath), + path31.isAbsolute(manifest.physicalPath), manifest.physicalPath ); checkManifestConsistency( "physicalPath is not normalized", - path30.resolve(manifest.physicalPath) === manifest.physicalPath, - path30.resolve(manifest.physicalPath), + path31.resolve(manifest.physicalPath) === manifest.physicalPath, + path31.resolve(manifest.physicalPath), manifest.physicalPath ); checkManifestConsistency( @@ -56796,13 +56996,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalQuarantinePath is not absolute", - path30.isAbsolute(manifest.physicalQuarantinePath), + path31.isAbsolute(manifest.physicalQuarantinePath), manifest.physicalQuarantinePath ); checkManifestConsistency( "physicalQuarantinePath is not normalized", - path30.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, - path30.resolve(manifest.physicalQuarantinePath), + path31.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, + path31.resolve(manifest.physicalQuarantinePath), manifest.physicalQuarantinePath ); checkManifestConsistency( @@ -56813,21 +57013,21 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "registrationPath parent mismatch", - platformPathsEqual(path30.dirname(manifest.registrationPath), registrationRoot), - path30.dirname(manifest.registrationPath), + platformPathsEqual(path31.dirname(manifest.registrationPath), registrationRoot), + path31.dirname(manifest.registrationPath), registrationRoot ); checkManifestConsistency( "quarantinePath parent mismatch", - platformPathsEqual(path30.dirname(manifest.quarantinePath), quarantineRoot), - path30.dirname(manifest.quarantinePath), + platformPathsEqual(path31.dirname(manifest.quarantinePath), quarantineRoot), + path31.dirname(manifest.quarantinePath), quarantineRoot ); checkManifestConsistency( "quarantinePath name mismatch", - path30.basename(manifest.quarantinePath) === `.remove-registration-${path30.basename(manifest.registrationPath)}-${manifest.transactionId}`, - path30.basename(manifest.quarantinePath), - `.remove-registration-${path30.basename(manifest.registrationPath)}-${manifest.transactionId}` + path31.basename(manifest.quarantinePath) === `.remove-registration-${path31.basename(manifest.registrationPath)}-${manifest.transactionId}`, + path31.basename(manifest.quarantinePath), + `.remove-registration-${path31.basename(manifest.registrationPath)}-${manifest.transactionId}` ); checkManifestConsistency( "physicalPath parent mismatch", @@ -56843,9 +57043,9 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalQuarantinePath name mismatch", - path30.basename(manifest.physicalQuarantinePath) === `.remove-${path30.basename(manifest.physicalPath)}-${manifest.transactionId}`, - path30.basename(manifest.physicalQuarantinePath), - `.remove-${path30.basename(manifest.physicalPath)}-${manifest.transactionId}` + path31.basename(manifest.physicalQuarantinePath) === `.remove-${path31.basename(manifest.physicalPath)}-${manifest.transactionId}`, + path31.basename(manifest.physicalQuarantinePath), + `.remove-${path31.basename(manifest.physicalPath)}-${manifest.transactionId}` ); if (manifest.phase === "creation-root-changed") { throw new RuntimeError("worktree creation root changed and requires manual resolution"); @@ -57062,7 +57262,7 @@ function runClaimsWorktree(runId, managedId) { } var MALFORMED_WORKFLOW_OWNERSHIP = ""; async function workflowOwnershipRecords(root) { - const ownershipRoot = path30.join(root, "autopilot-branches"); + const ownershipRoot = path31.join(root, "autopilot-branches"); if (await plainDirectoryIdentity(ownershipRoot) === null) return /* @__PURE__ */ new Map(); const records = /* @__PURE__ */ new Map(); for (const entry of await readdir7(ownershipRoot, { withFileTypes: true })) { @@ -57070,7 +57270,7 @@ async function workflowOwnershipRecords(root) { if (match === null || !entry.isFile() || entry.isSymbolicLink()) { throw new RuntimeError("workflow ownership directory contains a malformed entry"); } - const ownershipPath = path30.join(ownershipRoot, entry.name); + const ownershipPath = path31.join(ownershipRoot, entry.name); const filenamePrefix = match[1].slice(0, 32); records.set(filenamePrefix, [...records.get(filenamePrefix) ?? [], ownershipPath]); let workflowId; @@ -57138,7 +57338,7 @@ async function finalMaterializationMustBePreserved(root, claim, isProcessAlive2, } async function sweepOrphanWorktrees(args) { const issues = []; - const worktreesRoot = path30.join(args.root, "worktrees"); + const worktreesRoot = path31.join(args.root, "worktrees"); let entries; let stateRootIdentity; let worktreesRootIdentity; @@ -57167,7 +57367,7 @@ async function sweepOrphanWorktrees(args) { ownershipLookupError = error51; } for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const worktreePath = path30.join(worktreesRoot, entry.name); + const worktreePath = path31.join(worktreesRoot, entry.name); if (!entry.isDirectory() || entry.isSymbolicLink()) { issues.push(worktreeSweepIssue( worktreePath, @@ -57257,7 +57457,7 @@ async function sweepOrphanWorktrees(args) { resolved.stdout, "startup worktree common directory" ); - if (!path30.isAbsolute(reportedCommonDir)) { + if (!path31.isAbsolute(reportedCommonDir)) { throw new RuntimeError("worktree repository lookup returned a non-absolute path"); } commonDir = await realpath13(reportedCommonDir); @@ -57270,18 +57470,18 @@ async function sweepOrphanWorktrees(args) { let contention; try { lease = await createOwnedLock( - path30.join(args.locksRoot, `${lockKey}.lock`), + path31.join(args.locksRoot, `${lockKey}.lock`), args.ownerContents ); if (lease === null) { contention = await reclaimDeadLock( - path30.join(args.locksRoot, `${lockKey}.lock`), + path31.join(args.locksRoot, `${lockKey}.lock`), args.isProcessAlive, args.getProcessStartToken ); if (contention === "reclaimed") { lease = await createOwnedLock( - path30.join(args.locksRoot, `${lockKey}.lock`), + path31.join(args.locksRoot, `${lockKey}.lock`), args.ownerContents ); } @@ -57401,7 +57601,7 @@ async function observeWorkflowLease(store, isProcessAlive2, getProcessStartToken } function branchOwnershipPath(root, workflowId) { const name = createHash16("sha256").update(workflowId).digest("hex"); - return path30.join(root, "autopilot-branches", `${name}.json`); + return path31.join(root, "autopilot-branches", `${name}.json`); } async function observeWorkflowBranch(root, workflowId, manager, isProcessAlive2, getProcessStartToken) { const registration = await readBoundedRegularFile2(branchOwnershipPath(root, workflowId)).catch(() => void 0); @@ -57570,7 +57770,7 @@ async function activeBranchIsDirectlyObserved(branch, expectedHead2, runGit) { } async function workflowIds(root, issues) { const ids = /* @__PURE__ */ new Set(); - const workflowsRoot = path30.join(root, "workflows"); + const workflowsRoot = path31.join(root, "workflows"); let workflowEntries = []; try { const workflowsIdentity = await plainDirectoryIdentity(workflowsRoot); @@ -57583,7 +57783,7 @@ async function workflowIds(root, issues) { ids.add(entry.name); } } - const branchesRoot = path30.join(root, "autopilot-branches"); + const branchesRoot = path31.join(root, "autopilot-branches"); let branchEntries = []; try { const branchesIdentity = await plainDirectoryIdentity(branchesRoot); @@ -57595,7 +57795,7 @@ async function workflowIds(root, issues) { if (!entry.isFile() || entry.isSymbolicLink() || !/^[0-9a-f]{64}\.json$/u.test(entry.name)) { continue; } - const ownershipPath = path30.join(branchesRoot, entry.name); + const ownershipPath = path31.join(branchesRoot, entry.name); let text; let value; try { @@ -57610,7 +57810,7 @@ async function workflowIds(root, issues) { } if (typeof value !== "object" || value === null || Array.isArray(value)) continue; const workflowId = value.workflowId; - if (typeof workflowId === "string" && SAFE_WORKFLOW_ID.test(workflowId) && entry.name === path30.basename(branchOwnershipPath(root, workflowId))) { + if (typeof workflowId === "string" && SAFE_WORKFLOW_ID.test(workflowId) && entry.name === path31.basename(branchOwnershipPath(root, workflowId))) { ids.add(workflowId); } } @@ -57775,7 +57975,7 @@ async function reclaimPendingRemovalLocks(locksRoot, isProcessAlive2, getProcess if (seen.has(key)) continue; seen.add(key); await reclaimDeadLock( - path30.join(locksRoot, `${key}.lock`), + path31.join(locksRoot, `${key}.lock`), isProcessAlive2, getProcessStartToken ); @@ -57801,7 +58001,7 @@ async function recoverStaleRuns(dependencies = {}) { const isProcessAlive2 = dependencies.isProcessAlive ?? defaultIsProcessAlive2; const runGit = dependencies.git ?? git; if (root === null) return { recovered: [], quarantined: [] }; - const locksRoot = path30.join(root, "locks"); + const locksRoot = path31.join(root, "locks"); await mkdir8(locksRoot, { recursive: true }); if (await plainDirectoryIdentity(locksRoot) === null) { throw new RuntimeError("recovery locks directory disappeared"); @@ -57810,7 +58010,7 @@ async function recoverStaleRuns(dependencies = {}) { pid: nodeProcess5.pid, processToken: await ps.getProcessStartToken(nodeProcess5.pid) })); - const recoveryLockPath = path30.join(locksRoot, "recovery.lock"); + const recoveryLockPath = path31.join(locksRoot, "recovery.lock"); const recoveryLock = await acquireOwnedLock( recoveryLockPath, ownerContents, @@ -57829,11 +58029,11 @@ async function recoverStaleRuns(dependencies = {}) { } let primaryError; try { - const runsRoot = path30.join(root, "runs"); + const runsRoot = path31.join(root, "runs"); const runsIdentity = await plainDirectoryIdentity(runsRoot); if (runsIdentity !== null) { await reclaimDeadLock( - path30.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), + path31.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), isProcessAlive2, (pid) => ps.getProcessStartToken(pid) ); @@ -57873,8 +58073,8 @@ async function recoverStaleRuns(dependencies = {}) { } if (!entry.isDirectory() || entry.isSymbolicLink() || !SAFE_RUN_ID2.test(entry.name)) continue; try { - const runDirectory = path30.join(runsRoot, entry.name); - const runStartText = await readBoundedRegularFile2(path30.join(runDirectory, "run-start.json")); + const runDirectory = path31.join(runsRoot, entry.name); + const runStartText = await readBoundedRegularFile2(path31.join(runDirectory, "run-start.json")); if (runStartText === null) { claimedRunIds.add(entry.name); continue; @@ -57901,7 +58101,7 @@ async function recoverStaleRuns(dependencies = {}) { continue; } const checkoutLock = await acquireOwnedLock( - path30.join(locksRoot, `${record2.lockKey}.lock`), + path31.join(locksRoot, `${record2.lockKey}.lock`), ownerContents, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -57915,7 +58115,7 @@ async function recoverStaleRuns(dependencies = {}) { let cleanupDeferred = false; try { const lockedRunStartText = await readBoundedRegularFile2( - path30.join(runDirectory, "run-start.json") + path31.join(runDirectory, "run-start.json") ); if (lockedRunStartText === null) { throw new RuntimeError("run-start recovery record disappeared during recovery"); @@ -58022,7 +58222,7 @@ async function recoverStaleRuns(dependencies = {}) { } for (const { record: record2, runStartText } of stale) { const checkoutLock = await acquireOwnedLock( - path30.join(locksRoot, `${record2.lockKey}.lock`), + path31.join(locksRoot, `${record2.lockKey}.lock`), ownerContents, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -58037,7 +58237,7 @@ async function recoverStaleRuns(dependencies = {}) { let becameLive = false; try { const lockedRunStartText = await readBoundedRegularFile2( - path30.join(runsRoot, record2.runId, "run-start.json") + path31.join(runsRoot, record2.runId, "run-start.json") ); if (lockedRunStartText === null) { throw new RuntimeError("run-start recovery record disappeared before stale recovery"); @@ -58102,7 +58302,7 @@ async function recoverStaleRuns(dependencies = {}) { }, workflowRecoveryIssues); const claimedWorkflowPrefixes = /* @__PURE__ */ new Set(); for (const { workflowId } of workflows) { - if (SAFE_WORKFLOW_ID.test(workflowId) && await plainDirectoryIdentity(path30.join(root, "workflows", workflowId)) !== null) { + if (SAFE_WORKFLOW_ID.test(workflowId) && await plainDirectoryIdentity(path31.join(root, "workflows", workflowId)) !== null) { claimedWorkflowPrefixes.add( createHash16("sha256").update(workflowId).digest("hex").slice(0, 32) ); @@ -58127,7 +58327,7 @@ async function recoverStaleRuns(dependencies = {}) { ...terminalCleanupIssues, ...workflowRecoveryIssues, ...orphanWorktreeIssues - ], path30.join(root, "worktrees")); + ], path31.join(root, "worktrees")); const result = workflows.length === 0 ? { recovered, quarantined } : { recovered, quarantined, workflows }; return worktreeSweepIssues.length === 0 ? result : { ...result, worktreeSweepIssues }; } catch (error51) { @@ -58468,7 +58668,7 @@ async function createServer(dependencies = {}) { (issue2) => issue2.repositoryIdentity !== void 0 ); const unattributedWorktrees = unresolvedSweepIssues.filter( - (issue2) => issue2.repositoryIdentity === void 0 && path31.basename(path31.dirname(issue2.worktreePath)) === "worktrees" + (issue2) => issue2.repositoryIdentity === void 0 && path32.basename(path32.dirname(issue2.worktreePath)) === "worktrees" ); if (attributed.length === 0 && unattributedWorktrees.length === 0) return; const canonical = await (dependencies.ps ?? getPlatformServices()).canonicalizePath(checkoutPath); diff --git a/src/mcp/doctor.ts b/src/mcp/doctor.ts index 332d6d1..f920e98 100644 --- a/src/mcp/doctor.ts +++ b/src/mcp/doctor.ts @@ -778,7 +778,7 @@ export async function doctor(deps: DoctorDependencies = {}): Promise | null, + builtEnvironment: BuiltEnvironment | null, ): Promise { const failures: unknown[] = []; try { @@ -218,72 +209,30 @@ export async function runRole(args: RoleRunArgs): Promise { for (let attempt = 1; attempt <= 2; attempt += 1) { let tempHome: string | null = null; - let builtEnvironment: ReturnType | null = null; + let builtEnvironment: BuiltEnvironment | null = null; let primaryError: unknown; try { - tempHome = await args.ps.createSecureTempDirectory(); - let invocation = adapter.buildInvocation(roleSpec, { + const runtime = args.registry !== undefined + ? new ProducerRuntime(args.registry) + : producerRuntime; + const launchResult = await runtime.launch({ + producerId, + spec: roleSpec, worktreePath: args.worktreePath, - ...(extraWritableRoots.length === 0 ? {} : { extraWritableRoots }), - ...(gitObjectAccess === undefined - ? {} - : { - gitObjectDirectory: gitObjectAccess.privateObjectsDir, - gitAlternateObjectDirectories: gitObjectAccess.sharedObjectsDir, - }), + intent: readOnly ? "read-only" : "edit", + ps: args.ps, runId: args.runId, - tempHome, + abortSignal: args.abortSignal, + timeoutMs: roleSpec.timeoutMs, + extraWritableRoots: extraWritableRoots.length > 0 ? extraWritableRoots : undefined, + gitObjectAccess, + envAdditions: args.env !== undefined ? definedEnvironment(args.env) : undefined, + runStartContext: writer && runStart !== undefined ? runStart : undefined, capabilityReport: report, - executable: report.resolvedExecutable, - readOnly: nativeReadOnly, - }); - if (readOnly && !nativeReadOnly) { - invocation = wrapInvocationWithSeatbelt( - invocation, - buildReadOnlySeatbeltPolicy({ tempHome }), - ); - } else if (seatbeltWriter) { - invocation = wrapInvocationWithSeatbelt( - invocation, - buildWriteSeatbeltPolicy({ - worktreePath: args.worktreePath, - tempHome, - extraWritableRoots, - }), - ); - } - builtEnvironment = buildEnvironment({ - os: args.ps.os, - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), - specAdditions: { - ...definedEnvironment(args.env), - ...(gitObjectAccess === undefined - ? {} - : { - GIT_OBJECT_DIRECTORY: gitObjectAccess.privateObjectsDir, - GIT_ALTERNATE_OBJECT_DIRECTORIES: gitObjectAccess.sharedObjectsDir, - }), - }, - tempHome, }); - const supervisedInvocation = writer - ? await parentDeathWatchdogInvocation(invocation.executable, invocation.args) - : { executable: invocation.executable, args: invocation.args }; - const processServices = writer && runStart !== undefined - ? withRunStartPidRecording(args.ps, runStart) - : args.ps; - const exit = args.abortSignal?.aborted === true - ? preCancelledExit() - : await supervise(processServices, { - executable: supervisedInvocation.executable, - args: supervisedInvocation.args, - cwd: args.worktreePath, - env: builtEnvironment.env, - timeoutMs: roleSpec.timeoutMs, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: MAX_PRODUCER_OUTPUT_BYTES, - }, args.abortSignal === undefined ? {} : { onCancel: args.abortSignal }); + tempHome = launchResult.tempHome; + builtEnvironment = launchResult.builtEnvironment; + const exit = launchResult.exit; const signals = failureSignals(exit); let rawOutput = exit.stdout; diff --git a/src/producers/agy-adapter.ts b/src/producers/agy-adapter.ts index 223d74f..42fdfba 100644 --- a/src/producers/agy-adapter.ts +++ b/src/producers/agy-adapter.ts @@ -1,8 +1,14 @@ -import { existsSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { probeOsConfinedCli } from "./cli-probe.js"; +import { + isProducerAuthenticated, + isRecord, + resolveInheritedWritablePaths, + stringProperty, + type HostStoreContext, +} from "./host-store.js"; import { renderProducerPrompt } from "./plain-text.js"; import type { AdapterEvent, @@ -11,66 +17,67 @@ import type { ProbeContext, ProducerAdapter, ProducerConfigurationProfile, + ProducerDescriptor, ProducerInvocation, } from "./producer-adapter.js"; const AGY_REQUIRED_ENV = ["GEMINI_API_KEY"] as const; const TEXT_LIMIT = 8_000; -function isRecord(value: unknown): value is Record { - return typeof value === "object" && value !== null && !Array.isArray(value); -} - -function stringProperty(value: unknown, name: string): string | undefined { - if (!isRecord(value)) return undefined; - const property = value[name]; - return typeof property === "string" ? property : undefined; -} - -/** Go time.ParseDuration accepts a bare seconds-magnitude unit; keep it simple. */ function formatPrintTimeout(timeoutMs: number): string { return `${Math.ceil(timeoutMs / 1000)}s`; } -export interface AgyAdapterDeps { - env: Record; - homeDirectory: string; - hasAuthStore?: (directory: string) => boolean; -} +export const agyDescriptor: ProducerDescriptor = { + id: "agy", + executable: { name: "agy" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: deps => { + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join(home, ".gemini", "antigravity-cli"); + }, + authMarker: "settings.json", + inheritedWritablePaths: store => [store], + apiKeyEnv: ["GEMINI_API_KEY"], + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: true, + executionModes: ["edit"], +}; + +export interface AgyAdapterDeps extends HostStoreContext {} export class AgyAdapter implements ProducerAdapter { - readonly producerId = "agy"; - readonly structuredOutput = true; - readonly executionModes = ["edit"]; + readonly producerId = agyDescriptor.id; + readonly structuredOutput = agyDescriptor.structuredOutput!; + readonly executionModes = agyDescriptor.executionModes!; + readonly descriptor = agyDescriptor; constructor(private readonly deps: AgyAdapterDeps = { env: process.env, homeDirectory: homedir(), }) {} - private hasAuthStore(directory: string): boolean { - return (this.deps.hasAuthStore ?? (store => existsSync(join(store, "settings.json"))))(directory); - } - async probe(ctx: ProbeContext): Promise { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "agy", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(this.configDirectory()), + isAuthenticated: () => isProducerAuthenticated(agyDescriptor, this.deps), }); } - /** agy's settings/auth store; the only host state an attempt must write. */ - private configDirectory(): string { - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join(home, ".gemini", "antigravity-cli"); - } - buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { const args = [ "-p", - renderProducerPrompt(spec, ctx.readOnly === true), + renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...agyDescriptor.prompt, + }), "--add-dir", ctx.worktreePath, "--new-project", @@ -91,8 +98,7 @@ export class AgyAdapter implements ProducerAdapter { executable: ctx.executable, args, requiredEnv: [...AGY_REQUIRED_ENV], - inheritedStateWritablePaths: [this.configDirectory()], - // Model sessions must reach the provider API; write-protection remains the confinement goal. + inheritedStateWritablePaths: resolveInheritedWritablePaths(agyDescriptor, this.deps), network: "allowed", }; } diff --git a/src/producers/capability-probe.ts b/src/producers/capability-probe.ts index e38112b..5594ea4 100644 --- a/src/producers/capability-probe.ts +++ b/src/producers/capability-probe.ts @@ -6,10 +6,12 @@ import { ProducerRegistry, registry, } from "./producer-registry.js"; +import { producerRuntime, type ProbeOptions } from "./producer-runtime.js"; export async function probeAll( ctx: ProbeContext, producerRegistry: ProducerRegistry = registry, + options?: ProbeOptions, ): Promise { - return Promise.all(producerRegistry.all().map(adapter => adapter.probe(ctx))); + return producerRuntime.probeAll(ctx, options, producerRegistry); } diff --git a/src/producers/claude-adapter.ts b/src/producers/claude-adapter.ts index b1de70e..086ccf5 100644 --- a/src/producers/claude-adapter.ts +++ b/src/producers/claude-adapter.ts @@ -1,9 +1,15 @@ -import { existsSync, readFileSync } from "node:fs"; import { homedir } from "node:os"; import { join } from "node:path"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import type { ResolvedExecutable } from "../platform/platform-services.js"; import { parseSemver, probeOsConfinedCli, runVersionProbe } from "./cli-probe.js"; +import { + defaultHasOauthAccount, + isProducerAuthenticated, + isRecord, + resolveInheritedWritablePaths, + type HostStoreContext, +} from "./host-store.js"; import { renderProducerPrompt } from "./plain-text.js"; import type { AdapterEvent, @@ -12,31 +18,20 @@ import type { ProbeContext, ProducerAdapter, ProducerConfigurationProfile, + ProducerDescriptor, ProducerInvocation, } from "./producer-adapter.js"; -// USER: the CLI resolves its OAuth credential through the login keychain, which -// it looks up by user name — without it a logged-in host reports "Not logged in". -// CLAUDE_CONFIG_DIR: relocated config/auth store must reach the process, or the -// adapter would report auth state from one directory while the CLI read another. -// ANTHROPIC_API_KEY: the API-key auth path, forwarded by declared policy exactly -// as the Pi and agy lanes forward theirs. const CLAUDE_REQUIRED_ENV = ["USER", "CLAUDE_CONFIG_DIR", "ANTHROPIC_API_KEY"] as const; const EDIT_TOOLS = "Read,Edit,Write,Bash,Grep,Glob"; const READ_ONLY_TOOLS = "Read,Grep,Glob"; const EFFORT_LEVELS = new Set(["low", "medium", "high", "xhigh", "max"]); const TEXT_LIMIT = 8_000; -function isRecord(value: unknown): value is Record { - return typeof value === "object" && value !== null && !Array.isArray(value); -} - -/** Claude Code emits `--version` as ` (Claude Code)`. */ function parseVersion(stdout: string): string | null { return /^(\d+\.\d+\.\d+(?:[-+][^\s]+)?)\b/u.exec(stdout.trim())?.[1] ?? null; } -/** stderr warnings can precede the envelope when both land on one stream. */ function parseEnvelope(stdout: string): Record | null { const trimmed = stdout.trim(); const start = trimmed.indexOf("{"); @@ -49,23 +44,45 @@ function parseEnvelope(stdout: string): Record | null { } } -export interface ClaudeAdapterDeps { - env: Record; - homeDirectory: string; - /** Whether the account file at the given path records a logged-in OAuth account. */ - hasOauthAccount?: (accountFile: string) => boolean; -} - -function defaultHasOauthAccount(accountFile: string): boolean { - if (!existsSync(accountFile)) return false; - try { - const parsed: unknown = JSON.parse(readFileSync(accountFile, "utf8")); - return isRecord(parsed) && isRecord(parsed.oauthAccount); - } catch { - return false; +function resolveClaudeAccountFile(deps: HostStoreContext): string { + const configured = deps.env.CLAUDE_CONFIG_DIR; + if (configured !== undefined && configured.length > 0) { + return join(configured, ".claude.json"); } + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join(home, ".claude.json"); } +export const claudeDescriptor: ProducerDescriptor = { + id: "claude", + executable: { name: "claude" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: deps => { + const configured = deps.env.CLAUDE_CONFIG_DIR; + if (configured !== undefined && configured.length > 0) return configured; + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join(home, ".claude"); + }, + authMarker: (_store, deps) => { + const apiKey = deps.env.ANTHROPIC_API_KEY; + if (apiKey !== undefined && apiKey.length > 0) return true; + const accountFile = resolveClaudeAccountFile(deps); + return (deps.hasOauthAccount ?? defaultHasOauthAccount)(accountFile); + }, + inheritedWritablePaths: (store, deps) => [store, resolveClaudeAccountFile(deps)], + apiKeyEnv: ["ANTHROPIC_API_KEY"], + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: true, + executionModes: ["edit"], +}; + +export interface ClaudeAdapterDeps extends HostStoreContext {} + const REQUIRED_CLAUDE_FLAGS = [ "--no-session-persistence", "--strict-mcp-config", @@ -73,37 +90,16 @@ const REQUIRED_CLAUDE_FLAGS = [ ] as const; export class ClaudeAdapter implements ProducerAdapter { - readonly producerId = "claude"; - readonly structuredOutput = true; - readonly executionModes = ["edit"]; + readonly producerId = claudeDescriptor.id; + readonly structuredOutput = claudeDescriptor.structuredOutput!; + readonly executionModes = claudeDescriptor.executionModes!; + readonly descriptor = claudeDescriptor; constructor(private readonly deps: ClaudeAdapterDeps = { env: process.env, homeDirectory: homedir(), }) {} - /** `~/.claude` (or CLAUDE_CONFIG_DIR): settings, sessions, and local state. */ - private configDirectory(): string { - const configured = this.deps.env.CLAUDE_CONFIG_DIR; - if (configured !== undefined && configured.length > 0) return configured; - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join(home, ".claude"); - } - - /** `~/.claude.json`: the account record the CLI rewrites on every run. */ - private accountFile(): string { - const configured = this.deps.env.CLAUDE_CONFIG_DIR; - if (configured !== undefined && configured.length > 0) return join(configured, ".claude.json"); - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join(home, ".claude.json"); - } - - private isAuthenticated(): boolean { - const apiKey = this.deps.env.ANTHROPIC_API_KEY; - if (apiKey !== undefined && apiKey.length > 0) return true; - return (this.deps.hasOauthAccount ?? defaultHasOauthAccount)(this.accountFile()); - } - private async inspectCliSurface( ctx: ProbeContext, executable: ResolvedExecutable, @@ -133,7 +129,7 @@ export class ClaudeAdapter implements ProducerAdapter { structuredOutput: this.structuredOutput, parseVersion, inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), - isAuthenticated: () => this.isAuthenticated(), + isAuthenticated: () => isProducerAuthenticated(claudeDescriptor, this.deps), }); } @@ -149,19 +145,12 @@ export class ClaudeAdapter implements ProducerAdapter { "-p", "--output-format", "json", - // Fresh context per attempt is a trust invariant: nothing is resumable. "--no-session-persistence", - // No MCP servers at all — in particular not this plugin's own runtime, - // which would otherwise hand the Producer a nested `delegate` tool. "--strict-mcp-config", - // Skip user, project, and local settings: their hooks and permission - // grants are host-side behavior that must not run inside an attempt. "--setting-sources", "", "--disable-slash-commands", - // Write confinement is the host Seatbelt profile, not the permission prompt. "--dangerously-skip-permissions", - // Built-ins only: no Agent (no nested subagents), no web, no artifacts. "--tools", readOnly ? READ_ONLY_TOOLS : EDIT_TOOLS, ]; @@ -175,10 +164,12 @@ export class ClaudeAdapter implements ProducerAdapter { return { executable: ctx.executable, args, - stdin: renderProducerPrompt(spec, readOnly), + stdin: renderProducerPrompt(spec, { + readOnly, + ...claudeDescriptor.prompt, + }), requiredEnv: [...CLAUDE_REQUIRED_ENV], - inheritedStateWritablePaths: [this.configDirectory(), this.accountFile()], - // Model sessions must reach the provider API; write-protection remains the confinement goal. + inheritedStateWritablePaths: resolveInheritedWritablePaths(claudeDescriptor, this.deps), network: "allowed", }; } @@ -224,8 +215,6 @@ export class ClaudeAdapter implements ProducerAdapter { behavioralConfigSources: [ "explicit invocation argv (user/project/local settings, hooks, MCP servers, and skills are all disabled)", ], - // `--setting-sources ""` also turns off CLAUDE.md/AGENTS.md discovery - // (confirmed live): the Producer sees only the rendered spec. repositoryInstructionSources: [], environmentDependencies: [...CLAUDE_REQUIRED_ENV], temporaryHomeStrategy: diff --git a/src/producers/cli-probe.ts b/src/producers/cli-probe.ts index fbae93f..8e9f2b4 100644 --- a/src/producers/cli-probe.ts +++ b/src/producers/cli-probe.ts @@ -1,5 +1,6 @@ import { supervise } from "../platform/process-supervisor.js"; -import type { ResolvedExecutable } from "../platform/platform-services.js"; +import type { ResolvedExecutable, SupervisedExit } from "../platform/platform-services.js"; +import { SANDBOX_BACKENDS } from "../platform/sandbox/backends.js"; import { normalizeNodeShim, selectOsWriteConfinementBackend } from "./plain-text.js"; import type { CapabilityReport, ProbeContext } from "./producer-adapter.js"; @@ -8,12 +9,13 @@ const VERSION_OUTPUT_LIMIT = 64 * 1024; /** * Probe contract for a CLI Producer whose write confinement is supplied by the - * host OS backend (macOS Seatbelt) rather than by the CLI itself. + * host OS backend (macOS Seatbelt) or a dedicated backend (Codex sandbox). */ export interface OsConfinedCliProbe { producerId: string; executableName: string; structuredOutput: boolean; + writeConfinementBackend?: string | ((ctx: ProbeContext) => string | null); parseVersion?: (stdout: string) => string | null; /** * Extra surface checks after the version succeeds; return an unavailability @@ -28,6 +30,17 @@ export function parseSemver(stdout: string): string | null { return match?.[1] ?? null; } +export function selectConfinementBackend(ctx: ProbeContext, backendId: string): string | null { + const backend = SANDBOX_BACKENDS.find(candidate => + candidate.id === backendId + && candidate.platforms.some(platform => + platform.os === ctx.os + && platform.environmentType === ctx.environmentType + && (platform.arch === undefined || platform.arch === ctx.arch) + && (platform.state === "certified" || platform.state === "tested"))); + return backend?.id ?? null; +} + export function unavailableCapabilityReport( ctx: ProbeContext, producerId: string, @@ -56,7 +69,7 @@ export async function runVersionProbe( ctx: ProbeContext, executable: ResolvedExecutable, args: string[], -): Promise<{ stdout: string; stderr: string; exitCode: number | null; spawnError?: unknown }> { +): Promise { return supervise(ctx.ps, { executable, args, @@ -69,8 +82,9 @@ export async function runVersionProbe( /** * Shared probe: unsupported on win32; resolve the executable; require a - * parseable `--version`; optionally inspect the CLI surface; then report edit - * eligibility honestly from the host confinement backend and auth state. + * parseable `--version` with abnormal-termination guards (signal, timeout, + * cancelled); optionally inspect the CLI surface; then report edit + * eligibility honestly from the confinement backend and auth state. */ export async function probeOsConfinedCli( ctx: ProbeContext, @@ -91,7 +105,12 @@ export async function probeOsConfinedCli( try { const result = await runVersionProbe(ctx, executable, ["--version"]); - const version = result.spawnError === undefined && result.exitCode === 0 + const isCleanExit = result.spawnError === undefined + && result.exitCode === 0 + && result.signal === null + && result.timedOut === false + && result.cancelled === false; + const version = isCleanExit ? (probe.parseVersion ?? parseSemver)(result.stdout) : null; if (version === null) return unavailable("probe-failed", executable); @@ -101,7 +120,11 @@ export async function probeOsConfinedCli( if (reason !== null) return unavailable(reason, executable); } - const writeConfinementBackend = selectOsWriteConfinementBackend(ctx); + const writeConfinementBackend = typeof probe.writeConfinementBackend === "function" + ? probe.writeConfinementBackend(ctx) + : typeof probe.writeConfinementBackend === "string" + ? selectConfinementBackend(ctx, probe.writeConfinementBackend) + : selectOsWriteConfinementBackend(ctx); return { producerId: probe.producerId, available: true, @@ -121,3 +144,6 @@ export async function probeOsConfinedCli( return unavailable("probe-failed", executable); } } + +export { probeOsConfinedCli as probeCli }; + diff --git a/src/producers/codex-adapter.ts b/src/producers/codex-adapter.ts index 8bd9eeb..985fe62 100644 --- a/src/producers/codex-adapter.ts +++ b/src/producers/codex-adapter.ts @@ -1,12 +1,10 @@ import { execFileSync } from "node:child_process"; import { existsSync, realpathSync } from "node:fs"; -import { open } from "node:fs/promises"; import { homedir, tmpdir } from "node:os"; import { join } from "node:path"; -import { supervise } from "../platform/process-supervisor.js"; import type { ResolvedExecutable } from "../platform/platform-services.js"; -import { SANDBOX_BACKENDS } from "../platform/sandbox/backends.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import { probeOsConfinedCli } from "./cli-probe.js"; import type { AdapterEvent, CapabilityReport, @@ -14,9 +12,20 @@ import type { ProbeContext, ProducerAdapter, ProducerConfigurationProfile, + ProducerDescriptor, ProducerInvocation, } from "./producer-adapter.js"; -import { renderSkillBootstrap } from "./skill-bootstrap.js"; +import { + isProducerAuthenticated, + isRecord, + resolveDefaultEnv, + stringProperty, + type HostStoreContext, +} from "./host-store.js"; +import { + EDIT_ACTION_PREAMBLE, + renderProducerPrompt, +} from "./prompt-renderer.js"; export const CODEX_REQUIRED_ENV = [ "CODEX_HOME", @@ -50,7 +59,7 @@ function resolveDarwinUserTempDirectory(): string | null { try { const raw = execFileSync("/usr/bin/getconf", ["DARWIN_USER_TEMP_DIR"], { encoding: "utf8", - timeout: VERSION_TIMEOUT_MS, + timeout: 10_000, }).trim(); darwinUserTempDirectory = raw.length === 0 ? realpathSync(tmpdir()) : realpathSync(raw); } catch { @@ -90,219 +99,60 @@ export function sandboxSupportWritableRoots(platform: NodeJS.Platform): string[] const temporaryDirectory = resolveDarwinUserTempDirectory(); return temporaryDirectory === null ? [] : [temporaryDirectory]; } -const VERSION_TIMEOUT_MS = 10_000; -const VERSION_OUTPUT_LIMIT = 64 * 1024; - -function isRecord(value: unknown): value is Record { - return typeof value === "object" && value !== null && !Array.isArray(value); -} - -function stringProperty(value: unknown, name: string): string | undefined { - if (!isRecord(value)) return undefined; - const property = value[name]; - return typeof property === "string" ? property : undefined; -} - -function unavailableReport( - ctx: ProbeContext, - reason: string, - resolvedExecutable: ResolvedExecutable | null = null, -): CapabilityReport { - return { - producerId: "codex", - available: false, - reason, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable, - version: null, - authState: "unknown", - executionModes: ["edit"], - structuredOutput: true, - writeConfinementBackend: null, - laneEligibility: { edit: false }, - }; -} - function parseVersion(stdout: string): string | null { const match = /(?:^|\s)(\d+\.\d+\.\d+(?:[-+][^\s]+)?)(?:\s|$)/u.exec(stdout.trim()); return match?.[1] ?? null; } -function selectCodexWriteConfinementBackend(ctx: ProbeContext): string | null { - const backend = SANDBOX_BACKENDS.find(candidate => - candidate.id === "codex-native-sandbox" - && candidate.platforms.some(platform => - platform.os === ctx.os - && platform.environmentType === ctx.environmentType - && (platform.arch === undefined || platform.arch === ctx.arch) - && (platform.state === "certified" || platform.state === "tested"))); - return backend?.id ?? null; -} - -async function normalizeCodexExecutable( - executable: ResolvedExecutable, -): Promise { - if (executable.kind !== "native") return executable; - let handle; - try { - handle = await open(executable.command, "r"); - const buffer = Buffer.alloc(256); - const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0); - const firstLine = buffer.subarray(0, bytesRead).toString("utf8").split(/\r?\n/u, 1)[0] ?? ""; - if (!/^#![^\r\n]*\bnode(?:\s|$)/u.test(firstLine)) return executable; - return { - kind: "node-entrypoint", - command: process.execPath, - prefixArgs: [executable.command, ...executable.prefixArgs], - resolvedFrom: `${executable.resolvedFrom};node:${process.execPath}`, - }; - } catch { - return executable; - } finally { - await handle?.close(); - } -} - function quoteTomlString(value: string): string { return JSON.stringify(value); } -function renderList(values: string[]): string { - return values.length === 0 ? "- (none)" : values.map(value => `- ${value}`).join("\n"); -} +export const CODEX_EDIT_ACTION_PREAMBLE = EDIT_ACTION_PREAMBLE; -export const CODEX_EDIT_ACTION_PREAMBLE = [ - "This is an action-first edit run.", - "Constraints are fully pre-digested in this spec.", - "Do not read repository AGENTS.md, CLAUDE.md, SKILL.md, lessons files, or any repository agent-rule/skill documents; the delegated skill files named below are permitted.", - "Begin by opening the implementation files authorized in the spec.", - "A plan-only final message with zero edits is a failed run.", -].join("\n"); +export const codexDescriptor: ProducerDescriptor = { + id: "codex", + executable: { name: "codex" }, + isolation: "controlled-config-with-copied-credentials", + hostState: { + resolveStore: deps => deps.env.CODEX_HOME ?? join(deps.homeDirectory, ".codex"), + authMarker: "auth.json", + defaultEnv: (store, deps) => { + if (deps.env.CODEX_HOME !== undefined) return {}; + const hasAuth = (deps.hasAuthStore ?? (dir => existsSync(join(dir, "auth.json"))))(store); + return hasAuth ? { CODEX_HOME: store } : {}; + }, + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: true, + executionModes: ["edit"], +}; -function renderPrompt(spec: DelegationSpec, readOnly: boolean): string { - const prompt = [ - "You are an untrusted implementation Producer operating inside an isolated worktree.", - "Do not delegate to other agents or expand the authorized scope.", - "", - "Objective:", - spec.objective, - "", - "Context:", - spec.context, - "", - "Authorized write allowlist:", - renderList(spec.writeAllowlist), - "", - "Forbidden scope:", - renderList(spec.forbiddenScope), - "", - "Success criteria:", - renderList(spec.successCriteria), - "", - "If you run linting, formatting, or type checking, complete all linting and formatting first, then run a final type-check covering every typed file you changed, including new or modified tests.", - "", - "Make only the requested edits. Return a concise final summary of the work performed.", - ].join("\n"); - return readOnly - ? prompt - : `${CODEX_EDIT_ACTION_PREAMBLE}\n\n${renderSkillBootstrap()}\n\n${prompt}`; -} - -export interface DefaultCodexEnvDeps { - env: Record; - homeDirectory: string; - hasAuthStore: (directory: string) => boolean; -} - -export interface CodexAdapterDeps { - env: Record; - homeDirectory: string; - hasAuthStore?: (directory: string) => boolean; -} - -function resolveCodexStore( - deps: Pick, -): string { - return deps.env.CODEX_HOME ?? join(deps.homeDirectory, ".codex"); -} - -/** - * The isolated per-attempt HOME hides the host `~/.codex` auth store. When the - * Host has not set CODEX_HOME explicitly, default it to the real auth store so - * Codex authentication survives HOME isolation. - */ -export function defaultCodexEnv(deps: DefaultCodexEnvDeps): Record { - if (deps.env.CODEX_HOME !== undefined) return {}; - const store = resolveCodexStore(deps); - return deps.hasAuthStore(store) ? { CODEX_HOME: store } : {}; -} +export interface CodexAdapterDeps extends HostStoreContext {} export class CodexAdapter implements ProducerAdapter { - readonly producerId = "codex"; + readonly producerId = codexDescriptor.id; + readonly structuredOutput = codexDescriptor.structuredOutput!; + readonly executionModes = codexDescriptor.executionModes!; + readonly descriptor = codexDescriptor; constructor(private readonly deps: CodexAdapterDeps = { env: process.env, homeDirectory: homedir(), }) {} - private hasAuthStore(directory: string): boolean { - return (this.deps.hasAuthStore ?? (store => existsSync(join(store, "auth.json"))))(directory); - } - async probe(ctx: ProbeContext): Promise { - if (ctx.os === "win32") return unavailableReport(ctx, "unsupported-platform"); - - let executable: ResolvedExecutable; - try { - executable = await normalizeCodexExecutable( - await ctx.ps.resolveExecutable({ name: "codex" }), - ); - } catch { - return unavailableReport(ctx, "missing-executable"); - } - - try { - const result = await supervise(ctx.ps, { - executable, - args: ["--version"], - cwd: process.cwd(), - env: {}, - timeoutMs: VERSION_TIMEOUT_MS, - maxOutputBytes: VERSION_OUTPUT_LIMIT, - }, {}); - const version = result.spawnError === undefined - && result.exitCode === 0 - && result.signal === null - && result.timedOut === false - && result.cancelled === false - ? parseVersion(result.stdout) - : null; - if (version === null) return unavailableReport(ctx, "probe-failed", executable); - - const writeConfinementBackend = selectCodexWriteConfinementBackend(ctx); - const authState = this.hasAuthStore(resolveCodexStore(this.deps)) - ? "authenticated" - : "unauthenticated"; - return { - producerId: this.producerId, - available: true, - reason: null, - os: ctx.os, - arch: ctx.arch, - environmentType: ctx.environmentType, - resolvedExecutable: executable, - version, - authState, - executionModes: ["edit"], - structuredOutput: true, - writeConfinementBackend, - laneEligibility: { edit: writeConfinementBackend !== null }, - }; - } catch { - return unavailableReport(ctx, "probe-failed", executable); - } + return probeOsConfinedCli(ctx, { + producerId: this.producerId, + executableName: "codex", + structuredOutput: this.structuredOutput, + writeConfinementBackend: "codex-native-sandbox", + parseVersion, + isAuthenticated: () => isProducerAuthenticated(codexDescriptor, this.deps), + }); } buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { @@ -402,16 +252,14 @@ export class CodexAdapter implements ProducerAdapter { ); } args.push("-"); - - const defaultEnv = defaultCodexEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - hasAuthStore: directory => this.hasAuthStore(directory), - }); + const defaultEnv = resolveDefaultEnv(codexDescriptor, this.deps); return { executable: ctx.executable, args, - stdin: renderPrompt(spec, ctx.readOnly === true), + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...codexDescriptor.prompt, + }), requiredEnv: [...CODEX_REQUIRED_ENV], env: { ...defaultEnv, diff --git a/src/producers/host-store.ts b/src/producers/host-store.ts new file mode 100644 index 0000000..f4f7ee9 --- /dev/null +++ b/src/producers/host-store.ts @@ -0,0 +1,124 @@ +import { existsSync, readFileSync, statSync } from "node:fs"; +import { join } from "node:path"; +import type { ProducerDescriptor } from "./producer-adapter.js"; + +export function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +export function stringProperty(value: unknown, name: string): string | undefined { + if (!isRecord(value)) return undefined; + const property = value[name]; + return typeof property === "string" ? property : undefined; +} + +export interface HostStoreContext { + env: Record; + homeDirectory: string; + hasAuthStore?: (directory: string) => boolean; + hasOauthAccount?: (accountFile: string) => boolean; + hasConfigDir?: (directory: string) => boolean; +} + +export interface HostStateDescriptor { + resolveStore: (ctx: HostStoreContext) => string; + authMarker?: string | ((store: string, ctx: HostStoreContext) => boolean); + inheritedWritablePaths?: (store: string, ctx: HostStoreContext) => string[]; + defaultEnv?: (store: string, ctx: HostStoreContext) => Record; + apiKeyEnv?: string[]; +} + +export function defaultHasOauthAccount(accountFile: string): boolean { + if (!existsSync(accountFile)) return false; + try { + const parsed: unknown = JSON.parse(readFileSync(accountFile, "utf8")); + return isRecord(parsed) && isRecord(parsed.oauthAccount); + } catch { + return false; + } +} + +export function resolveHostStoreRoot( + descriptor: ProducerDescriptor, + ctx: HostStoreContext, +): string | null { + return descriptor.hostState ? descriptor.hostState.resolveStore(ctx) : null; +} + +export function isProducerAuthenticated( + descriptor: ProducerDescriptor, + ctx: HostStoreContext, +): boolean { + const hostState = descriptor.hostState; + if (!hostState) return false; + + if (hostState.apiKeyEnv !== undefined) { + for (const key of hostState.apiKeyEnv) { + const val = ctx.env[key]; + if (val !== undefined && val.length > 0) return true; + } + } + + const store = hostState.resolveStore(ctx); + + if (typeof hostState.authMarker === "function") { + return hostState.authMarker(store, ctx); + } + + if (typeof hostState.authMarker === "string") { + const checker = ctx.hasAuthStore ?? (dir => existsSync(join(dir, hostState.authMarker as string))); + return checker(store); + } + + return false; +} + +export function resolveInheritedWritablePaths( + descriptor: ProducerDescriptor, + ctx: HostStoreContext, +): string[] { + const hostState = descriptor.hostState; + if (!hostState?.inheritedWritablePaths) return []; + const store = hostState.resolveStore(ctx); + return hostState.inheritedWritablePaths(store, ctx); +} + +export function resolveDefaultEnv( + descriptor: ProducerDescriptor, + ctx: HostStoreContext, +): Record { + const hostState = descriptor.hostState; + if (!hostState?.defaultEnv) return {}; + const store = hostState.resolveStore(ctx); + return hostState.defaultEnv(store, ctx); +} + +export function resolveConfigRevision( + descriptor: ProducerDescriptor, + ctx: HostStoreContext, +): string { + const hostState = descriptor.hostState; + if (!hostState) return ""; + try { + const store = hostState.resolveStore(ctx); + const parts: string[] = []; + if (existsSync(store)) { + parts.push(`store:${statSync(store).mtimeMs}`); + } + if (typeof hostState.authMarker === "string") { + const markerPath = join(store, hostState.authMarker); + if (existsSync(markerPath)) { + parts.push(`marker:${statSync(markerPath).mtimeMs}`); + } + } + if (hostState.apiKeyEnv) { + for (const envKey of hostState.apiKeyEnv) { + const val = ctx.env[envKey]; + if (val !== undefined && val.length > 0) parts.push(`${envKey}:${val}`); + } + } + return parts.join(";"); + } catch { + return ""; + } +} diff --git a/src/producers/opencode-adapter.ts b/src/producers/opencode-adapter.ts index 651d4a3..60af196 100644 --- a/src/producers/opencode-adapter.ts +++ b/src/producers/opencode-adapter.ts @@ -3,6 +3,12 @@ import { homedir } from "node:os"; import { join } from "node:path"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { probeOsConfinedCli } from "./cli-probe.js"; +import { + isProducerAuthenticated, + resolveDefaultEnv, + resolveInheritedWritablePaths, + type HostStoreContext, +} from "./host-store.js"; import { normalizePlainText, renderProducerPrompt } from "./plain-text.js"; import type { CapabilityReport, @@ -10,64 +16,64 @@ import type { ProbeContext, ProducerAdapter, ProducerConfigurationProfile, + ProducerDescriptor, ProducerInvocation, } from "./producer-adapter.js"; const OPENCODE_REQUIRED_ENV = ["OPENCODE_CONFIG_DIR", "XDG_DATA_HOME"] as const; -export interface OpenCodeAdapterDeps { - env: Record; - homeDirectory: string; - hasAuthStore?: (directory: string) => boolean; -} +export const openCodeDescriptor: ProducerDescriptor = { + id: "opencode", + executable: { name: "opencode" }, + isolation: "controlled-config-with-copied-credentials", + hostState: { + resolveStore: deps => { + const dataHome = deps.env.XDG_DATA_HOME ?? join(deps.homeDirectory, ".local", "share"); + return join(dataHome, "opencode"); + }, + authMarker: "auth.json", + inheritedWritablePaths: (store, deps) => { + const stateHome = deps.env.XDG_STATE_HOME ?? join(deps.homeDirectory, ".local", "state"); + return [store, join(stateHome, "opencode")]; + }, + defaultEnv: (_store, deps) => { + if (deps.env.XDG_DATA_HOME !== undefined) return {}; + const dataHome = join(deps.homeDirectory, ".local", "share"); + const dataDir = join(dataHome, "opencode"); + const hasAuth = (deps.hasAuthStore ?? (dir => existsSync(join(dir, "auth.json"))))(dataDir); + return hasAuth ? { XDG_DATA_HOME: dataHome } : {}; + }, + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: false, + executionModes: ["edit"], +}; -function defaultOpenCodeEnv( - deps: Required>, -): Record { - if (deps.env.XDG_DATA_HOME !== undefined) return {}; - const dataHome = join(deps.homeDirectory, ".local", "share"); - return deps.hasAuthStore(join(dataHome, "opencode")) - ? { XDG_DATA_HOME: dataHome } - : {}; -} +export interface OpenCodeAdapterDeps extends HostStoreContext {} export class OpenCodeAdapter implements ProducerAdapter { - readonly producerId = "opencode"; - readonly structuredOutput = false; - readonly executionModes = ["edit"]; + readonly producerId = openCodeDescriptor.id; + readonly structuredOutput = openCodeDescriptor.structuredOutput!; + readonly executionModes = openCodeDescriptor.executionModes!; + readonly descriptor = openCodeDescriptor; constructor(private readonly deps: OpenCodeAdapterDeps = { env: process.env, homeDirectory: homedir(), }) {} - private hasAuthStore(directory: string): boolean { - return (this.deps.hasAuthStore ?? (store => existsSync(join(store, "auth.json"))))(directory); - } - - /** OpenCode's XDG data directory (where auth.json lives), honoring XDG_DATA_HOME. */ - private dataDirectory(): string { - const dataHome = this.deps.env.XDG_DATA_HOME - ?? join(this.deps.homeDirectory, ".local", "share"); - return join(dataHome, "opencode"); - } - async probe(ctx: ProbeContext): Promise { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "opencode", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(this.dataDirectory()), + isAuthenticated: () => isProducerAuthenticated(openCodeDescriptor, this.deps), }); } - /** OpenCode's XDG data (auth) and state directories, honoring host overrides. */ - private stateDirectories(): string[] { - const stateHome = this.deps.env.XDG_STATE_HOME - ?? join(this.deps.homeDirectory, ".local", "state"); - return [this.dataDirectory(), join(stateHome, "opencode")]; - } - buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { const args = [ "run", @@ -86,15 +92,13 @@ export class OpenCodeAdapter implements ProducerAdapter { return { executable: ctx.executable, args, - stdin: renderProducerPrompt(spec, ctx.readOnly === true), - requiredEnv: [...OPENCODE_REQUIRED_ENV], - inheritedStateWritablePaths: this.stateDirectories(), - env: defaultOpenCodeEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - hasAuthStore: directory => this.hasAuthStore(directory), + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...openCodeDescriptor.prompt, }), - // Model sessions must reach the provider API; write-protection remains the confinement goal. + requiredEnv: [...OPENCODE_REQUIRED_ENV], + inheritedStateWritablePaths: resolveInheritedWritablePaths(openCodeDescriptor, this.deps), + env: resolveDefaultEnv(openCodeDescriptor, this.deps), network: "allowed", }; } diff --git a/src/producers/pi-adapter.ts b/src/producers/pi-adapter.ts index 07b02bb..61722dd 100644 --- a/src/producers/pi-adapter.ts +++ b/src/producers/pi-adapter.ts @@ -3,6 +3,12 @@ import { homedir } from "node:os"; import { join } from "node:path"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { probeOsConfinedCli } from "./cli-probe.js"; +import { + isProducerAuthenticated, + resolveDefaultEnv, + resolveInheritedWritablePaths, + type HostStoreContext, +} from "./host-store.js"; import { normalizePlainText, renderProducerPrompt } from "./plain-text.js"; import type { CapabilityReport, @@ -10,66 +16,61 @@ import type { ProbeContext, ProducerAdapter, ProducerConfigurationProfile, + ProducerDescriptor, ProducerInvocation, } from "./producer-adapter.js"; const PI_REQUIRED_ENV = ["PI_API_KEY"] as const; -export interface PiAdapterDeps { - env: Record; - homeDirectory: string; - hasAuthStore?: (directory: string) => boolean; -} - -function defaultPiEnv( - deps: Required> & { - hasConfigDir: (directory: string) => boolean; +export const piDescriptor: ProducerDescriptor = { + id: "pi", + executable: { name: "pi" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: deps => { + const home = deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory; + return join(home, ".pi", "agent"); + }, + authMarker: "auth.json", + inheritedWritablePaths: store => [store], + defaultEnv: (_store, deps) => { + if (deps.env.HOME !== undefined) return {}; + const configDir = join(deps.homeDirectory, ".pi"); + const hasConfig = (deps.hasConfigDir ?? existsSync)(configDir); + return hasConfig ? { HOME: deps.homeDirectory } : {}; + }, }, -): Record { - if (deps.env.HOME !== undefined) return {}; - return deps.hasConfigDir(join(deps.homeDirectory, ".pi")) - ? { HOME: deps.homeDirectory } - : {}; -} + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: false, + executionModes: ["edit"], +}; + +export interface PiAdapterDeps extends HostStoreContext {} export class PiAdapter implements ProducerAdapter { - readonly producerId = "pi"; - readonly structuredOutput = false; - readonly executionModes = ["edit"]; + readonly producerId = piDescriptor.id; + readonly structuredOutput = piDescriptor.structuredOutput!; + readonly executionModes = piDescriptor.executionModes!; + readonly descriptor = piDescriptor; constructor(private readonly deps: PiAdapterDeps = { env: process.env, homeDirectory: homedir(), }) {} - private hasAuthStore(directory: string): boolean { - return (this.deps.hasAuthStore ?? (store => existsSync(join(store, "auth.json"))))(directory); - } - - private hasConfigDir(directory: string): boolean { - return existsSync(directory); - } - async probe(ctx: ProbeContext): Promise { return probeOsConfinedCli(ctx, { producerId: this.producerId, executableName: "pi", structuredOutput: this.structuredOutput, - isAuthenticated: () => this.hasAuthStore(this.agentStateDirectory()), + isAuthenticated: () => isProducerAuthenticated(piDescriptor, this.deps), }); } - /** Pi's auth + settings store; the only host state an attempt must write. */ - private agentStateDirectory(): string { - const home = this.deps.env.HOME ?? this.deps.env.USERPROFILE ?? this.deps.homeDirectory; - return join(home, ".pi", "agent"); - } - buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { - // The Pi lane always runs the model configured in Pi itself - // (~/.pi/agent/models.json). A requested override would silently substitute - // a different model — possibly a local one — so it fails the lane instead, - // mirroring the Pythinker reasoningEffort precedent. if (spec.producerOverrides?.model !== undefined) { throw new Error( "Pi model override is unsupported: the pi lane always uses the model configured in Pi.", @@ -89,15 +90,13 @@ export class PiAdapter implements ProducerAdapter { return { executable: ctx.executable, args, - stdin: renderProducerPrompt(spec, ctx.readOnly === true), - requiredEnv: [...PI_REQUIRED_ENV], - inheritedStateWritablePaths: [this.agentStateDirectory()], - env: defaultPiEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - hasConfigDir: directory => this.hasConfigDir(directory), + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...piDescriptor.prompt, }), - // Model sessions must reach the provider API; write-protection remains the confinement goal. + requiredEnv: [...PI_REQUIRED_ENV], + inheritedStateWritablePaths: resolveInheritedWritablePaths(piDescriptor, this.deps), + env: resolveDefaultEnv(piDescriptor, this.deps), network: "allowed", }; } diff --git a/src/producers/plain-text.ts b/src/producers/plain-text.ts index 0d3784a..aef4104 100644 --- a/src/producers/plain-text.ts +++ b/src/producers/plain-text.ts @@ -3,38 +3,17 @@ import type { ResolvedExecutable, SupervisedExit } from "../platform/platform-se import { SANDBOX_BACKENDS } from "../platform/sandbox/backends.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import type { AdapterEvent, ProbeContext } from "./producer-adapter.js"; -import { renderSkillBootstrap } from "./skill-bootstrap.js"; +export { + EDIT_ACTION_PREAMBLE, + LINT_BEFORE_TYPECHECK_INSTRUCTION, + renderList, + renderProducerPrompt, + type PromptRenderOptions, + type PromptRenderInput, +} from "./prompt-renderer.js"; const PLAIN_TEXT_LIMIT = 8_000; -function renderList(values: string[]): string { - return values.length === 0 ? "- (none)" : values.map(value => `- ${value}`).join("\n"); -} - -export function renderProducerPrompt(spec: DelegationSpec, readOnly = false): string { - return [ - "You are an untrusted implementation Producer operating inside an isolated worktree.", - "Do not delegate to other agents or expand the authorized scope.", - ...(readOnly ? [] : ["", renderSkillBootstrap()]), - "", - "Objective:", - spec.objective, - "", - "Context:", - spec.context, - "", - "Authorized write allowlist:", - renderList(spec.writeAllowlist), - "", - "Forbidden scope:", - renderList(spec.forbiddenScope), - "", - "Success criteria:", - renderList(spec.successCriteria), - "", - "Make only the requested edits. Return a concise final summary of the work performed.", - ].join("\n"); -} export function normalizePlainText(raw: { stdout: string; diff --git a/src/producers/producer-adapter.ts b/src/producers/producer-adapter.ts index 6d28918..7d17c43 100644 --- a/src/producers/producer-adapter.ts +++ b/src/producers/producer-adapter.ts @@ -5,6 +5,7 @@ import type { SupervisedExit, } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import { renderProducerPrompt } from "./prompt-renderer.js"; export type PlatformState = "certified" | "tested" | "conditional" | "unsupported" | "unknown"; export type EnvironmentType = "native" | "wsl"; @@ -94,6 +95,123 @@ export type ProducerConfigurationProfile = { temporaryHomeStrategy: string; }; +export type ProducerIsolation = ProducerConfigurationProfile["isolationState"]; + +export interface ProducerDescriptor { + readonly id: string; + readonly executable: { name: string }; + readonly isolation: ProducerIsolation; + readonly hostState?: import("./host-store.js").HostStateDescriptor; + readonly prompt?: { + actionPreamble?: boolean; + bootstrapPlacement?: "before" | "after"; + }; + readonly structuredOutput?: boolean; + readonly executionModes?: string[]; + readonly configurationProfile?: ProducerConfigurationProfile; + probe?(ctx: ProbeContext, deps: import("./host-store.js").HostStoreContext): Promise; + buildInvocation?( + spec: DelegationSpec, + ctx: InvocationContext, + deps?: import("./host-store.js").HostStoreContext, + ): ProducerInvocation; + normalizeEvents?(raw: { stdout: string; stderr: string; exit: SupervisedExit }): { + events: AdapterEvent[]; + producerSummary: string | null; + ok: boolean; + }; +} + +export class DescriptorAdapter implements ProducerAdapter { + readonly producerId: string; + readonly structuredOutput: boolean; + readonly executionModes: string[]; + + constructor( + readonly descriptor: ProducerDescriptor, + private readonly deps: import("./host-store.js").HostStoreContext = { + env: process.env, + homeDirectory: (process.env.HOME ?? process.env.USERPROFILE ?? ""), + }, + ) { + this.producerId = descriptor.id; + this.structuredOutput = descriptor.structuredOutput ?? false; + this.executionModes = descriptor.executionModes ? [...descriptor.executionModes] : ["edit"]; + } + + async probe(ctx: ProbeContext): Promise { + if (this.descriptor.probe) { + return this.descriptor.probe(ctx, this.deps); + } + const { isProducerAuthenticated } = await import("./host-store.js"); + const resolved = await ctx.ps + .resolveExecutable({ name: this.descriptor.executable.name }) + .catch(() => null); + const authState = isProducerAuthenticated(this.descriptor, this.deps) + ? "authenticated" + : "unauthenticated"; + return { + producerId: this.producerId, + available: resolved !== null, + reason: resolved !== null ? null : "missing-executable", + os: ctx.os, + arch: ctx.arch, + environmentType: ctx.environmentType, + resolvedExecutable: resolved, + version: null, + authState, + executionModes: [...this.executionModes], + structuredOutput: this.structuredOutput, + writeConfinementBackend: null, + laneEligibility: { edit: resolved !== null }, + }; + } + + buildInvocation(spec: DelegationSpec, ctx: InvocationContext): ProducerInvocation { + if (this.descriptor.buildInvocation) { + return this.descriptor.buildInvocation(spec, ctx, this.deps); + } + return { + executable: ctx.executable, + args: [], + stdin: renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...this.descriptor.prompt, + }), + requiredEnv: [], + network: "allowed", + }; + } + + normalizeEvents(raw: { stdout: string; stderr: string; exit: SupervisedExit }): { + events: AdapterEvent[]; + producerSummary: string | null; + ok: boolean; + } { + if (this.descriptor.normalizeEvents) { + return this.descriptor.normalizeEvents(raw); + } + return { events: [], producerSummary: null, ok: raw.exit.exitCode === 0 }; + } + + configurationProfile(): ProducerConfigurationProfile { + if (this.descriptor.configurationProfile) { + return this.descriptor.configurationProfile; + } + return { + isolationState: this.descriptor.isolation, + credentialSources: [], + behavioralConfigSources: [], + repositoryInstructionSources: [], + environmentDependencies: [], + temporaryHomeStrategy: + this.descriptor.isolation === "inherited-config-only" + ? "inherited-home" + : "none", + }; + } +} + export function detectEnvironmentType( readProcVersion: () => string = () => readFileSync("/proc/version", "utf8"), ): EnvironmentType { @@ -106,3 +224,4 @@ export function detectEnvironmentType( return "wsl"; } } + diff --git a/src/producers/producer-runtime.ts b/src/producers/producer-runtime.ts new file mode 100644 index 0000000..239afa1 --- /dev/null +++ b/src/producers/producer-runtime.ts @@ -0,0 +1,350 @@ +import { existsSync, statSync } from "node:fs"; +import { homedir } from "node:os"; +import path from "node:path"; +import { supervise } from "../platform/process-supervisor.js"; +import type { + PlatformServices, + ResolvedExecutable, + SupervisedExit, +} from "../platform/platform-services.js"; +import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import { buildEnvironment, type BuiltEnvironment } from "../runtime/environment-policy.js"; +import { + buildReadOnlySeatbeltPolicy, + buildWriteSeatbeltPolicy, + wrapInvocationWithSeatbelt, +} from "../platform/sandbox/seatbelt.js"; +import { selectSandboxBackend } from "../platform/sandbox/backends.js"; +import { + parentDeathWatchdogInvocation, + withRunStartPidRecording, + type RunStartContext, +} from "../runtime/run-start.js"; +import type { + AdapterEvent, + CapabilityReport, + InvocationContext, + ProbeContext, + ProducerAdapter, + ProducerDescriptor, + ProducerInvocation, +} from "./producer-adapter.js"; +import { detectEnvironmentType } from "./producer-adapter.js"; +import { normalizeNodeShim } from "./plain-text.js"; +import { + resolveConfigRevision, + resolveHostStoreRoot, + type HostStoreContext, +} from "./host-store.js"; +import { registry as defaultRegistry, ProducerRegistry } from "./producer-registry.js"; +import { RuntimeError } from "../util/errors.js"; + +const MAX_PRODUCER_OUTPUT_BYTES = 1_000_000; + +function preCancelledExit(): SupervisedExit { + return { + exitCode: null, + signal: null, + timedOut: false, + cancelled: true, + stdout: "", + stderr: "", + truncated: { stdout: false, stderr: false }, + }; +} + +export interface ProducerLaunchRequest { + producerId?: string | undefined; + adapter?: ProducerAdapter | undefined; + spec: DelegationSpec; + worktreePath: string; + intent: "edit" | "read-only" | "probe"; + ps: PlatformServices; + runId?: string | undefined; + abortSignal?: AbortSignal | undefined; + timeoutMs?: number | undefined; + maxOutputBytes?: number | undefined; + tempHome?: string | null | undefined; + extraWritableRoots?: string[] | undefined; + gitObjectAccess?: { + privateObjectsDir: string; + sharedObjectsDir: string | string[]; + } | undefined; + envAdditions?: Record | undefined; + runStartContext?: RunStartContext | undefined; + capabilityReport?: CapabilityReport | undefined; + plan?: ProducerLaunchPlan | undefined; +} + +export interface ProducerLaunchPlan { + descriptor?: ProducerDescriptor | undefined; + adapter: ProducerAdapter; + capabilityReport: CapabilityReport; + tempHome: string | null; + invocation: ProducerInvocation; + supervisedInvocation: { executable: ResolvedExecutable; args: string[] }; + builtEnvironment: BuiltEnvironment; + confinementBackend: string | null; +} + +export interface ProducerLaunchResult extends ProducerLaunchPlan { + exit: SupervisedExit; + events: AdapterEvent[]; + producerSummary: string | null; + ok: boolean; +} + +export interface ProbeOptions { + fresh?: boolean; +} + +export class ProducerRuntime { + private probeCache = new Map(); + private cacheHits = 0; + + constructor(readonly registry: ProducerRegistry = defaultRegistry) {} + + get probeCacheHits(): number { + return this.cacheHits; + } + + clearProbeCache(): void { + this.probeCache.clear(); + this.cacheHits = 0; + } + + async computeProbeCacheKey( + producerId: string, + adapter: ProducerAdapter, + ctx: ProbeContext, + ): Promise { + const descriptor = (adapter as { descriptor?: ProducerDescriptor }).descriptor; + let execKey = ""; + try { + const query = descriptor?.executable ?? { name: producerId }; + const resolved = await normalizeNodeShim(await ctx.ps.resolveExecutable(query)); + let mtime = ""; + try { + if (existsSync(resolved.command)) { + mtime = String(statSync(resolved.command).mtimeMs); + } + } catch {} + execKey = `${resolved.command}:${resolved.prefixArgs.join(",")}:${mtime}`; + } catch { + return null; + } + + const hostStoreContext: HostStoreContext = { + env: process.env, + homeDirectory: homedir(), + }; + const hostStoreRoot = descriptor ? resolveHostStoreRoot(descriptor, hostStoreContext) ?? "" : ""; + const configRevision = descriptor ? resolveConfigRevision(descriptor, hostStoreContext) : ""; + + return `${producerId}|${execKey}|${hostStoreRoot}|${configRevision}`; + } + + async probe( + producerId: string, + ctx: ProbeContext, + options?: ProbeOptions, + customRegistry?: ProducerRegistry, + ): Promise { + const reg = customRegistry ?? this.registry; + const adapter = reg.get(producerId); + if (adapter === undefined) { + throw new RuntimeError(`Unknown producer '${producerId}'`); + } + + if (options?.fresh !== true) { + const key = await this.computeProbeCacheKey(producerId, adapter, ctx); + if (key !== null) { + const cached = this.probeCache.get(key); + if (cached !== undefined) { + this.cacheHits++; + return cached; + } + } + } + + const report = await adapter.probe(ctx); + if (options?.fresh !== true) { + const key = await this.computeProbeCacheKey(producerId, adapter, ctx); + if (key !== null) { + this.probeCache.set(key, report); + } + } + return report; + } + + async probeAll( + ctx: ProbeContext, + options?: ProbeOptions, + customRegistry?: ProducerRegistry, + ): Promise { + const reg = customRegistry ?? this.registry; + return Promise.all(reg.all().map(adapter => this.probe(adapter.producerId, ctx, options, reg))); + } + + async planLaunch(request: ProducerLaunchRequest): Promise { + const adapter = request.adapter + ?? (request.producerId !== undefined ? this.registry.get(request.producerId) : undefined); + if (adapter === undefined) { + throw new RuntimeError(`Unknown producer '${request.producerId ?? "unknown"}'`); + } + + const producerId = request.producerId ?? adapter.producerId ?? "unknown"; + const descriptor = (adapter as { descriptor?: ProducerDescriptor }).descriptor; + const report = request.capabilityReport ?? await adapter.probe({ + ps: request.ps, + os: request.ps.os, + arch: process.arch, + environmentType: detectEnvironmentType(), + }); + + if (report.resolvedExecutable === null) { + throw new RuntimeError(`Cannot launch producer '${producerId}': executable not resolved`); + } + + const profile = typeof adapter.configurationProfile === "function" + ? adapter.configurationProfile() + : undefined; + const isolation = descriptor?.isolation + ?? profile?.isolationState + ?? "controlled-config-supported"; + const requiresTempHome = isolation === "controlled-config-supported" + || isolation === "controlled-config-with-copied-credentials"; + + // Refuse declared-writable-state + temp-HOME combination + if (request.tempHome !== undefined && request.tempHome !== null && !requiresTempHome) { + throw new RuntimeError( + `Declared writable state cannot be combined with temporary HOME isolation for producer '${producerId}'`, + ); + } + + let tempHome: string | null; + if (request.tempHome !== undefined) { + tempHome = request.tempHome; + } else if (requiresTempHome) { + tempHome = await request.ps.createSecureTempDirectory(); + } else { + tempHome = null; + } + + const selection = selectSandboxBackend(report); + const confinementBackend = selection.backend?.id ?? null; + const isSeatbelt = selection.backend?.kind === "os" && selection.backend.id === "macos-seatbelt"; + + const readOnly = request.intent === "read-only"; + const nativeReadOnly = readOnly + && selection.backend?.kind === "producer-native"; + + const invocationContext: InvocationContext = { + worktreePath: request.worktreePath, + runId: request.runId ?? "anonymous-run", + ...(tempHome === null ? {} : { tempHome }), + capabilityReport: report, + executable: report.resolvedExecutable, + readOnly: nativeReadOnly, + ...(request.extraWritableRoots && request.extraWritableRoots.length > 0 + ? { extraWritableRoots: request.extraWritableRoots } + : {}), + ...(request.gitObjectAccess ? { + gitObjectDirectory: request.gitObjectAccess.privateObjectsDir, + gitAlternateObjectDirectories: Array.isArray(request.gitObjectAccess.sharedObjectsDir) + ? request.gitObjectAccess.sharedObjectsDir.join(path.delimiter) + : request.gitObjectAccess.sharedObjectsDir, + } : {}), + }; + + let invocation = adapter.buildInvocation(request.spec, invocationContext); + + if (readOnly && !nativeReadOnly) { + if (isSeatbelt) { + invocation = wrapInvocationWithSeatbelt( + invocation, + buildReadOnlySeatbeltPolicy({ tempHome }), + ); + } + } else if (isSeatbelt) { + invocation = wrapInvocationWithSeatbelt( + invocation, + buildWriteSeatbeltPolicy({ + worktreePath: request.worktreePath, + tempHome, + extraWritableRoots: request.extraWritableRoots ?? [], + }), + ); + } + + const builtEnvironment = buildEnvironment({ + os: request.ps.os, + adapterAllowlist: invocation.requiredEnv ?? [], + ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), + specAdditions: { + ...(request.envAdditions ?? {}), + ...(request.gitObjectAccess ? { + GIT_OBJECT_DIRECTORY: request.gitObjectAccess.privateObjectsDir, + GIT_ALTERNATE_OBJECT_DIRECTORIES: Array.isArray(request.gitObjectAccess.sharedObjectsDir) + ? request.gitObjectAccess.sharedObjectsDir.join(path.delimiter) + : request.gitObjectAccess.sharedObjectsDir, + } : {}), + }, + ...(tempHome === null ? {} : { tempHome }), + }); + + const isWriter = request.intent !== "read-only"; + const supervisedInvocation = isWriter + ? await parentDeathWatchdogInvocation(invocation.executable, invocation.args) + : { executable: invocation.executable, args: invocation.args }; + + return { + descriptor, + adapter, + capabilityReport: report, + tempHome, + invocation, + supervisedInvocation, + builtEnvironment, + confinementBackend, + }; + } + + async launch(request: ProducerLaunchRequest): Promise { + const plan = request.plan ?? await this.planLaunch(request); + + const processServices = request.runStartContext !== undefined + ? withRunStartPidRecording(request.ps, request.runStartContext) + : request.ps; + + const exit = request.abortSignal?.aborted === true + ? preCancelledExit() + : await supervise(processServices, { + executable: plan.supervisedInvocation.executable, + args: plan.supervisedInvocation.args, + cwd: request.worktreePath, + env: plan.builtEnvironment.env, + timeoutMs: request.timeoutMs ?? request.spec.timeoutMs, + ...(plan.invocation.stdin === undefined ? {} : { stdin: plan.invocation.stdin }), + maxOutputBytes: request.maxOutputBytes ?? MAX_PRODUCER_OUTPUT_BYTES, + }, request.abortSignal === undefined ? {} : { onCancel: request.abortSignal }); + + const normalized = typeof plan.adapter.normalizeEvents === "function" + ? plan.adapter.normalizeEvents({ + stdout: exit.stdout, + stderr: exit.stderr, + exit, + }) + : { events: [], producerSummary: exit.stdout, ok: exit.exitCode === 0 }; + + return { + ...plan, + exit, + events: normalized.events, + producerSummary: normalized.producerSummary, + ok: normalized.ok, + }; + } +} + +export const producerRuntime = new ProducerRuntime(); diff --git a/src/producers/prompt-renderer.ts b/src/producers/prompt-renderer.ts new file mode 100644 index 0000000..242a31a --- /dev/null +++ b/src/producers/prompt-renderer.ts @@ -0,0 +1,91 @@ +import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import { renderSkillBootstrap } from "./skill-bootstrap.js"; + +export const EDIT_ACTION_PREAMBLE = [ + "This is an action-first edit run.", + "Constraints are fully pre-digested in this spec.", + "Do not read repository AGENTS.md, CLAUDE.md, SKILL.md, lessons files, or any repository agent-rule/skill documents; the delegated skill files named below are permitted.", + "Begin by opening the implementation files authorized in the spec.", + "A plan-only final message with zero edits is a failed run.", +].join("\n"); + +export const LINT_BEFORE_TYPECHECK_INSTRUCTION = + "If you run linting, formatting, or type checking, complete all linting and formatting first, then run a final type-check covering every typed file you changed, including new or modified tests."; + +export function renderList(values: string[]): string { + return values.length === 0 ? "- (none)" : values.map(value => `- ${value}`).join("\n"); +} + +export interface PromptRenderOptions { + readOnly?: boolean; + actionPreamble?: boolean; + bootstrapPlacement?: "before" | "after"; +} + +export type PromptRenderInput = + | boolean + | PromptRenderOptions + | { prompt?: PromptRenderOptions; readOnly?: boolean }; + +export function renderProducerPrompt( + spec: DelegationSpec, + options: PromptRenderInput = false, +): string { + let opts: PromptRenderOptions; + if (typeof options === "boolean") { + opts = { readOnly: options }; + } else if ("prompt" in options && options.prompt !== undefined) { + opts = { + ...options.prompt, + ...(options.readOnly !== undefined ? { readOnly: options.readOnly } : {}), + }; + } else { + opts = options as PromptRenderOptions; + } + const readOnly = opts.readOnly === true; + const includeActionPreamble = opts.actionPreamble ?? !readOnly; + const placement = opts.bootstrapPlacement ?? "before"; + + const promptBody = [ + "You are an untrusted implementation Producer operating inside an isolated worktree.", + "Do not delegate to other agents or expand the authorized scope.", + ...(readOnly || placement !== "after" ? [] : ["", renderSkillBootstrap()]), + "", + "Objective:", + spec.objective, + "", + "Context:", + spec.context, + "", + "Authorized write allowlist:", + renderList(spec.writeAllowlist), + "", + "Forbidden scope:", + renderList(spec.forbiddenScope), + "", + "Success criteria:", + renderList(spec.successCriteria), + "", + LINT_BEFORE_TYPECHECK_INSTRUCTION, + "", + "Make only the requested edits. Return a concise final summary of the work performed.", + ].join("\n"); + + if (readOnly) { + return promptBody; + } + + const prefixParts: string[] = []; + if (includeActionPreamble) { + prefixParts.push(EDIT_ACTION_PREAMBLE); + } + if (placement === "before") { + prefixParts.push(renderSkillBootstrap()); + } + + if (prefixParts.length === 0) { + return promptBody; + } + + return `${prefixParts.join("\n\n")}\n\n${promptBody}`; +} diff --git a/src/producers/pythinker-adapter.ts b/src/producers/pythinker-adapter.ts index 85a4827..8923079 100644 --- a/src/producers/pythinker-adapter.ts +++ b/src/producers/pythinker-adapter.ts @@ -4,6 +4,12 @@ import { join } from "node:path"; import type { ResolvedExecutable } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { parseSemver, probeOsConfinedCli, runVersionProbe } from "./cli-probe.js"; +import { + isProducerAuthenticated, + resolveDefaultEnv, + resolveInheritedWritablePaths, + type HostStoreContext, +} from "./host-store.js"; import { normalizePlainText, renderProducerPrompt } from "./plain-text.js"; import type { CapabilityReport, @@ -11,6 +17,7 @@ import type { ProbeContext, ProducerAdapter, ProducerConfigurationProfile, + ProducerDescriptor, ProducerInvocation, } from "./producer-adapter.js"; @@ -25,78 +32,57 @@ function parseLongOptionTokens(helpText: string): Set { return options; } -export interface PythinkerAdapterDeps { - env: Record; - homeDirectory: string; - hasAuthStore?: (directory: string) => boolean; -} +export interface PythinkerAdapterDeps extends HostStoreContext {} -// The installed pythinker-code CLI auto-updates itself in the background by default -// (`pythinker doctor` reports "Auto-update: on (installs in background)"). Disabling it for -// the duration of a delegated run keeps the binary actually invoked consistent with the one -// this adapter probed moments earlier (--version/--help); the host may still override this -// by setting the variable itself, since defaultPythinkerEnv only fills in an absent value. const PYTHINKER_NO_AUTO_UPDATE_ENV = "PYTHINKER_CLI_NO_AUTO_UPDATE"; -// Forwarded from the host so a redirected Pythinker Code data directory — used below to -// resolve the auth store and the default HOME — actually reaches the invoked process. -// Pythinker's real default data directory is `~/.pythinker` (confirmed live via -// docs/en/configuration/providers.md's `~/.pythinker/config.toml`, the 0.19.0 and 0.34.0 -// release notes referencing `~/.pythinker/projects/...` and `~/.pythinker/sessions/`, and an -// upstream commit noting `get_share_dir`/`get_config_file` "materialize ~/.pythinker"), not -// `~/.pythinker-code` as an earlier version of this adapter assumed. The override variable -// name follows the same `share.py`/`get_share_dir()` convention as the shared upstream CLI -// scaffold, whose confirmed override variable is `KIMI_SHARE_DIR` — the Pythinker-branded -// equivalent is `PYTHINKER_SHARE_DIR`. Without forwarding it, a deployment that sets -// PYTHINKER_SHARE_DIR to isolate this producer's config would have the adapter report -// auth/config state from that directory while the real invocation silently fell back to -// pythinker's own default `~/.pythinker`. const PYTHINKER_REQUIRED_ENV = ["PYTHINKER_SHARE_DIR", PYTHINKER_NO_AUTO_UPDATE_ENV] as const; -function resolvePythinkerHome( - deps: Required>, -): string { +function resolvePythinkerHome(deps: HostStoreContext): string { const configuredHome = deps.env.PYTHINKER_SHARE_DIR; return configuredHome !== undefined && configuredHome.length > 0 ? configuredHome : join(deps.env.HOME ?? deps.env.USERPROFILE ?? deps.homeDirectory, ".pythinker"); } -function defaultPythinkerEnv( - deps: Required> & { - pythinkerHome: string; - hasConfigDir: (directory: string) => boolean; +export const pythinkerDescriptor: ProducerDescriptor = { + id: "pythinker", + executable: { name: "pythinker" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: deps => resolvePythinkerHome(deps), + authMarker: join("credentials", "pythinker-code.json"), + inheritedWritablePaths: store => [store], + defaultEnv: (store, deps) => { + const env: Record = {}; + if (deps.env.HOME === undefined) { + const hasConfig = (deps.hasConfigDir ?? existsSync)(store); + if (hasConfig) env.HOME = deps.homeDirectory; + } + if (deps.env[PYTHINKER_NO_AUTO_UPDATE_ENV] === undefined) { + env[PYTHINKER_NO_AUTO_UPDATE_ENV] = "1"; + } + return env; + }, }, -): Record { - const env: Record = {}; - if (deps.env.HOME === undefined && deps.hasConfigDir(deps.pythinkerHome)) { - env.HOME = deps.homeDirectory; - } - if (deps.env[PYTHINKER_NO_AUTO_UPDATE_ENV] === undefined) { - env[PYTHINKER_NO_AUTO_UPDATE_ENV] = "1"; - } - return env; -} + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: false, + executionModes: ["edit"], +}; export class PythinkerAdapter implements ProducerAdapter { - readonly producerId = "pythinker"; - readonly structuredOutput = false; - readonly executionModes = ["edit"]; + readonly producerId = pythinkerDescriptor.id; + readonly structuredOutput = pythinkerDescriptor.structuredOutput!; + readonly executionModes = pythinkerDescriptor.executionModes!; + readonly descriptor = pythinkerDescriptor; constructor(private readonly deps: PythinkerAdapterDeps = { env: process.env, homeDirectory: homedir(), }) {} - private hasAuthStore(directory: string): boolean { - return (this.deps.hasAuthStore ?? (store => existsSync( - join(store, "credentials", "pythinker-code.json"), - )))(directory); - } - - private hasConfigDir(directory: string): boolean { - return existsSync(directory); - } - async probe(ctx: ProbeContext): Promise { return probeOsConfinedCli(ctx, { producerId: this.producerId, @@ -105,11 +91,10 @@ export class PythinkerAdapter implements ProducerAdapter { parseVersion: stdout => parseSemver(stdout) ?? /\d+\.\d+\.\d+(?:[-+][^\s]+)?/u.exec(stdout)?.[0] ?? null, inspectSurface: (probeCtx, executable) => this.inspectCliSurface(probeCtx, executable), - isAuthenticated: () => this.hasAuthStore(resolvePythinkerHome(this.deps)), + isAuthenticated: () => isProducerAuthenticated(pythinkerDescriptor, this.deps), }); } - /** The installed CLI must expose every long option this adapter emits. */ private async inspectCliSurface( ctx: ProbeContext, executable: ResolvedExecutable, @@ -140,7 +125,10 @@ export class PythinkerAdapter implements ProducerAdapter { const args = [ "--prompt", - renderProducerPrompt(spec, ctx.readOnly === true), + renderProducerPrompt(spec, { + readOnly: ctx.readOnly === true, + ...pythinkerDescriptor.prompt, + }), ]; if (spec.producerOverrides?.model !== undefined) { args.push("--model", spec.producerOverrides.model); @@ -149,14 +137,8 @@ export class PythinkerAdapter implements ProducerAdapter { executable: ctx.executable, args, requiredEnv: [...PYTHINKER_REQUIRED_ENV], - inheritedStateWritablePaths: [resolvePythinkerHome(this.deps)], - env: defaultPythinkerEnv({ - env: this.deps.env, - homeDirectory: this.deps.homeDirectory, - pythinkerHome: resolvePythinkerHome(this.deps), - hasConfigDir: directory => this.hasConfigDir(directory), - }), - // Model sessions must reach the provider API; write-protection remains the confinement goal. + inheritedStateWritablePaths: resolveInheritedWritablePaths(pythinkerDescriptor, this.deps), + env: resolveDefaultEnv(pythinkerDescriptor, this.deps), network: "allowed", }; } diff --git a/src/runtime/attempt-runtime.ts b/src/runtime/attempt-runtime.ts index 48dc9cb..b7c9001 100644 --- a/src/runtime/attempt-runtime.ts +++ b/src/runtime/attempt-runtime.ts @@ -12,7 +12,6 @@ import type { } from "../platform/platform-services.js"; import { supervise } from "../platform/process-supervisor.js"; import { selectSandboxBackend } from "../platform/sandbox/backends.js"; -import { wrapInvocationWithSeatbelt } from "../platform/sandbox/seatbelt.js"; import { getPlatformServices } from "../platform/select-platform.js"; import type { AttemptResult, @@ -36,6 +35,7 @@ import { ProducerRegistry, registry, } from "../producers/producer-registry.js"; +import { ProducerRuntime, producerRuntime } from "../producers/producer-runtime.js"; import { route } from "../producers/routing-policy.js"; import { NestedDelegationError, RuntimeError } from "../util/errors.js"; import { logger } from "../util/logger.js"; @@ -179,6 +179,7 @@ interface TerminalContext { producerLog: string; repositoryInstructions: RepositoryInstructionInput[]; packagedVerifier: PackagedVerifierInput; + probeCacheHits?: number; } // Host-facing progress only. Durability belongs to `emitStatus`, which writes @@ -245,10 +246,6 @@ function preCancelledExit(): SupervisedExit { }; } -function shouldUseTemporaryHome(profile: ProducerConfigurationProfile): boolean { - return profile.isolationState === "controlled-config-supported" - || profile.isolationState === "controlled-config-with-copied-credentials"; -} async function archiveTerminal(context: TerminalContext): Promise { const verificationSecretRegistrations: Array<{ dispose(): void }> = []; @@ -310,6 +307,7 @@ async function archiveTerminal(context: TerminalContext): Promise network: context.invocation?.network ?? "not-started", writeAllowlist: context.spec.writeAllowlist, forbiddenScope: context.spec.forbiddenScope, + probeCacheHits: context.probeCacheHits ?? 0, }, environment: context.environment, packagedVerifier: context.packagedVerifier, @@ -400,13 +398,20 @@ export async function runAttempt( detail: fields.detail ?? null, }); }; + const runtime = deps.producerRegistry !== undefined + ? new ProducerRuntime(deps.producerRegistry) + : producerRuntime; const archiveWithStatus = async (context: TerminalContext): Promise => { // Positive provenance for the decision gate: a plain `delegate` run never // enters a pipeline gate, so autonomy over its candidate must key on this // recorded marker, never on the mere absence of pipeline evidence. + const effectiveContext: TerminalContext = { + ...context, + probeCacheHits: context.probeCacheHits ?? runtime.probeCacheHits, + }; const result = await archiveTerminal(statusContext.pipelineManaged - ? context - : { ...context, evidence: { ...context.evidence, plainDelegate: true } }); + ? effectiveContext + : { ...effectiveContext, evidence: { ...context.evidence, plainDelegate: true } }); if (!statusContext.pipelineManaged) { await emitStatus(result.status === "verified-candidate" ? "done" : "failed", { producerId: result.producerId, @@ -598,15 +603,21 @@ export async function runAttempt( borrowedCheckoutLease: lock, }).create(preconditions.baseCommitOid); const profile = adapter.configurationProfile(); - if (shouldUseTemporaryHome(profile)) tempHome = await ps.createSecureTempDirectory(); - let invocation = adapter.buildInvocation(spec, { + const launchPlan = await runtime.planLaunch({ + producerId: report.producerId, + adapter, + spec, worktreePath: worktree.path, + intent: spec.executionMode === "edit" ? "edit" : "read-only", + ps, runId, - ...(tempHome === null ? {} : { tempHome }), capabilityReport: report, - executable: report.resolvedExecutable, }); - let confinement: string | null = null; + tempHome = launchPlan.tempHome; + builtEnvironment = launchPlan.builtEnvironment; + let invocation = launchPlan.invocation; + let confinement: string | null = launchPlan.confinementBackend; + if (spec.executionMode === "edit") { const selection = selectSandboxBackend(report); if (selection.backend === null) { @@ -634,14 +645,6 @@ export async function runAttempt( packagedVerifier, }); } - confinement = selection.backend.id; - if (selection.backend.kind === "os" && selection.backend.id === "macos-seatbelt") { - invocation = wrapInvocationWithSeatbelt(invocation, { - worktreePath: worktree.path, - tempHome, - allowNetwork: invocation.network === "allowed", - }); - } } if (spec.executionMode === "edit" && deps.producerPreflight !== false) { // A second preflight, not a regression to the first: this one launches the @@ -695,32 +698,29 @@ export async function runAttempt( }); } } - builtEnvironment = buildEnvironment({ - os: ps.os, - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), - ...(tempHome === null ? {} : { tempHome }), - }); - const recordingServices = withRunStartPidRecording(ps, runStartContext); - const watchdog = await parentDeathWatchdogInvocation( - invocation.executable, - invocation.args, - ); if (!statusContext.pipelineManaged) { await emitStatus("implementing", { producerId: report.producerId }); } await reportPhase(deps, "producer running"); - const exit = deps.abortSignal?.aborted === true - ? preCancelledExit() - : await supervise(recordingServices, { - executable: watchdog.executable, - args: watchdog.args, - cwd: worktree.path, - env: builtEnvironment.env, - timeoutMs: spec.timeoutMs, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: MAX_PRODUCER_OUTPUT_BYTES, - }, deps.abortSignal === undefined ? {} : { onCancel: deps.abortSignal }); + const launchResult = await runtime.launch({ + producerId: report.producerId, + adapter, + spec, + worktreePath: worktree.path, + intent: spec.executionMode === "edit" ? "edit" : "read-only", + ps, + runId, + tempHome, + abortSignal: deps.abortSignal, + timeoutMs: spec.timeoutMs, + runStartContext, + capabilityReport: report, + plan: launchPlan, + }); + invocation = launchResult.invocation; + builtEnvironment = launchResult.builtEnvironment; + const exit = launchResult.exit; + confinement = launchResult.confinementBackend; const signals: FailureSignals = {}; let producerSummary: string | null = null; @@ -735,9 +735,8 @@ export async function runAttempt( if (exit.timedOut) signals.timeout = true; if (!hasFailureSignal(signals)) { - const normalized = adapter.normalizeEvents({ stdout: exit.stdout, stderr: exit.stderr, exit }); - producerSummary = normalized.producerSummary; - if (!normalized.ok) signals["invalid-output"] = true; + producerSummary = launchResult.producerSummary; + if (!launchResult.ok) signals["invalid-output"] = true; if (exit.exitCode !== 0) signals["producer-failure"] = true; } diff --git a/src/runtime/producer-preflight.ts b/src/runtime/producer-preflight.ts index 48e424e..601515e 100644 --- a/src/runtime/producer-preflight.ts +++ b/src/runtime/producer-preflight.ts @@ -1,20 +1,16 @@ import path from "node:path"; import { WorktreeManager } from "./worktree-manager.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; -import { supervise } from "../platform/process-supervisor.js"; -import { selectSandboxBackend } from "../platform/sandbox/backends.js"; -import { wrapInvocationWithSeatbelt } from "../platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import type { CapabilityReport, ProducerAdapter, - ProducerInvocation, } from "../producers/producer-adapter.js"; +import { producerRuntime, type ProducerLaunchResult } from "../producers/producer-runtime.js"; import { RuntimeError } from "../util/errors.js"; import { boundedRedactedDiagnostic } from "./redaction.js"; import { readStableRegularFile } from "../util/stable-file.js"; import { linkPrimaryDependencies } from "../verify/dependency-link.js"; -import { buildEnvironment } from "./environment-policy.js"; /** * A Producer that cannot resolve the project toolchain cannot verify its own @@ -140,19 +136,22 @@ export async function runProducerPreflight( }; try { await linkPrimaryDependencies(args.repoRoot, worktree.path); - const invocationCtx = { - worktreePath: worktree.path, - runId: args.runId, - ...(args.tempHome === null ? {} : { tempHome: args.tempHome }), - capabilityReport: args.capabilityReport, - executable: args.capabilityReport.resolvedExecutable, - }; - let invocation: ProducerInvocation; + let launchResult: ProducerLaunchResult; try { - invocation = args.adapter.buildInvocation( - probeSpec(args.spec, executables), - invocationCtx, - ); + launchResult = await producerRuntime.launch({ + adapter: args.adapter, + producerId: args.capabilityReport.producerId, + spec: probeSpec(args.spec, executables), + worktreePath: worktree.path, + intent: "edit", + ps: args.ps, + runId: args.runId, + tempHome: args.tempHome, + timeoutMs: PREFLIGHT_TIMEOUT_MS, + maxOutputBytes: PREFLIGHT_OUTPUT_LIMIT, + capabilityReport: args.capabilityReport, + ...(args.abortSignal === undefined ? {} : { abortSignal: args.abortSignal }), + }); } catch { // Some adapters (e.g. Pythinker) reject ANY reasoningEffort override outright, so a // real caller request is never silently substituted. The "low" value forced above is a @@ -160,42 +159,28 @@ export async function runProducerPreflight( // instead of letting every run on such an adapter degrade to "inconclusive". A rejection // unrelated to reasoningEffort (e.g. an invalid model override) reproduces identically // here and still surfaces below. - invocation = args.adapter.buildInvocation( - probeSpec(args.spec, executables, { forceLowReasoning: false }), - invocationCtx, - ); - } - // Faithfulness is the whole value: a probe that runs in a different - // environment than the attempt is worse than no probe at all. - const selection = selectSandboxBackend(args.capabilityReport); - if (selection.backend?.kind === "os" && selection.backend.id === "macos-seatbelt") { - invocation = wrapInvocationWithSeatbelt(invocation, { + launchResult = await producerRuntime.launch({ + adapter: args.adapter, + producerId: args.capabilityReport.producerId, + spec: probeSpec(args.spec, executables, { forceLowReasoning: false }), worktreePath: worktree.path, + intent: "edit", + ps: args.ps, + runId: args.runId, tempHome: args.tempHome, - allowNetwork: invocation.network === "allowed", + timeoutMs: PREFLIGHT_TIMEOUT_MS, + maxOutputBytes: PREFLIGHT_OUTPUT_LIMIT, + capabilityReport: args.capabilityReport, + ...(args.abortSignal === undefined ? {} : { abortSignal: args.abortSignal }), }); } - const built = buildEnvironment({ - os: args.ps.os, - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), - ...(args.tempHome === null ? {} : { tempHome: args.tempHome }), - }); + try { - const exit = await supervise(args.ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktree.path, - env: built.env, - timeoutMs: PREFLIGHT_TIMEOUT_MS, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: PREFLIGHT_OUTPUT_LIMIT, - }, args.abortSignal === undefined ? {} : { onCancel: args.abortSignal }); - if (exit.cancelled) { + if (launchResult.exit.cancelled) { return complete({ status: "inconclusive", reason: "cancelled", missing: [], probe: null }); } } finally { - built.secretRegistration.dispose(); + launchResult.builtEnvironment.secretRegistration.dispose(); } let contents: string; diff --git a/tests/runtime/agy-adapter.test.ts b/tests/runtime/agy-adapter.test.ts index 3c038e6..259b52b 100644 --- a/tests/runtime/agy-adapter.test.ts +++ b/tests/runtime/agy-adapter.test.ts @@ -11,18 +11,16 @@ import type { SupervisedExit, } from "../../src/platform/platform-services.js"; import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; -import { supervise } from "../../src/platform/process-supervisor.js"; -import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { AgyAdapter } from "../../src/producers/agy-adapter.js"; import { renderProducerPrompt } from "../../src/producers/plain-text.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; import type { CapabilityReport, InvocationContext, ProbeContext, } from "../../src/producers/producer-adapter.js"; -import { buildEnvironment } from "../../src/runtime/environment-policy.js"; const execFileAsync = promisify(execFile); const executable: ResolvedExecutable = { @@ -300,20 +298,25 @@ describe("AgyAdapter", () => { expect(invocation.network).toBe("allowed"); }); - it("wraps an agy edit invocation with provider network and write confinement", () => { + it("wraps an agy edit invocation with provider network and write confinement", async () => { const context = invocationContext(); const spec = sampleSpec(); - const invocation = new AgyAdapter().buildInvocation(spec, context); - const wrapped = wrapInvocationWithSeatbelt(invocation, { + const plan = await producerRuntime.planLaunch({ + producerId: "agy", + spec, worktreePath: context.worktreePath, - tempHome: context.tempHome ?? null, - allowNetwork: invocation.network === "allowed", + intent: "edit", + ps: new PosixPlatformServices(), + capabilityReport: { + ...context.capabilityReport, + writeConfinementBackend: "macos-seatbelt", + }, }); - const profile = wrapped.args[1] ?? ""; + const profile = plan.invocation.args[1] ?? ""; expect(spec.executionMode).toBe("edit"); - expect(invocation.network).toBe("allowed"); - expect(wrapped.executable.command).toBe("/usr/bin/sandbox-exec"); + expect(plan.confinementBackend).toBe("macos-seatbelt"); + expect(plan.invocation.executable.command).toBe("/usr/bin/sandbox-exec"); expect(profile).not.toContain("(deny network*)"); expect(profile).toContain("(deny file-write*)"); }); @@ -515,35 +518,18 @@ describe("AgyAdapter", () => { spec.forbiddenScope = []; spec.successCriteria = ["smoke.txt exists and contains ok."]; spec.timeoutMs = 300_000; - const invocation = wrapInvocationWithSeatbelt(adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + producerId: "agy", + spec, worktreePath, + intent: "edit", + ps, runId: "run-agy-smoke", capabilityReport: report, - executable: report.resolvedExecutable, - }), { - worktreePath, - tempHome: null, - allowNetwork: true, - }); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), - }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 300_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); - const normalized = adapter.normalizeEvents({ - stdout: supervisedExit.stdout, - stderr: supervisedExit.stderr, - exit: supervisedExit, }); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; + const normalized = { ok: launchResult.ok }; expect( normalized.ok, diff --git a/tests/runtime/autopilot/autopilot-e2e.test.ts b/tests/runtime/autopilot/autopilot-e2e.test.ts index 23831ba..245daa9 100644 --- a/tests/runtime/autopilot/autopilot-e2e.test.ts +++ b/tests/runtime/autopilot/autopilot-e2e.test.ts @@ -534,6 +534,6 @@ describe("AutopilotController end-to-end", () => { expect(registeredWorktrees).toEqual([fixture.checkout]); const worktreesRoot = path.join(stateRoot, "worktrees"); await expect(readdir(worktreesRoot)).resolves.toEqual([]); - // Windows runners have measured 72s+ green runs against the old 120s cap; scale like the lock deadlines. - }, process.platform === "win32" ? 360_000 : 120_000); + // Full-suite contention can push dual-commit promotion past 120s; scale gracefully. + }, process.platform === "win32" ? 360_000 : 240_000); }); diff --git a/tests/runtime/claude-adapter.test.ts b/tests/runtime/claude-adapter.test.ts index 6f60616..7cc87b2 100644 --- a/tests/runtime/claude-adapter.test.ts +++ b/tests/runtime/claude-adapter.test.ts @@ -11,18 +11,16 @@ import type { SupervisedExit, } from "../../src/platform/platform-services.js"; import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; -import { supervise } from "../../src/platform/process-supervisor.js"; -import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { ClaudeAdapter } from "../../src/producers/claude-adapter.js"; import { renderProducerPrompt, selectOsWriteConfinementBackend } from "../../src/producers/plain-text.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; import type { CapabilityReport, InvocationContext, ProbeContext, } from "../../src/producers/producer-adapter.js"; -import { buildEnvironment } from "../../src/runtime/environment-policy.js"; const execFileAsync = promisify(execFile); const executable: ResolvedExecutable = { @@ -424,24 +422,32 @@ Options: ]); }); - it("wraps a Claude edit invocation with provider network and write confinement", () => { - const invocation = testAdapter().buildInvocation(sampleSpec(), invocationContext()); - const wrapped = wrapInvocationWithSeatbelt(invocation, { + it("wraps a Claude edit invocation with provider network and write confinement", async () => { + const adapter = testAdapter(); + const plan = await producerRuntime.planLaunch({ + adapter, + producerId: "claude", + spec: sampleSpec(), worktreePath: "/tmp/attempt-worktree", - tempHome: null, - allowNetwork: true, + intent: "edit", + ps: new PosixPlatformServices(), + capabilityReport: { + ...invocationContext().capabilityReport, + writeConfinementBackend: "macos-seatbelt", + }, }); + const wrapped = plan.invocation; const profile = wrapped.args[1] ?? ""; const configDir = join("/Users/test", ".claude"); const accountFile = join("/Users/test", ".claude.json"); + expect(plan.confinementBackend).toBe("macos-seatbelt"); expect(wrapped.executable.command).toBe("/usr/bin/sandbox-exec"); expect(profile).toContain('(allow file-write* (subpath "/tmp/attempt-worktree"))'); expect(profile).toContain(`(subpath "${configDir.replace(/\\/gu, "\\\\")}")`); expect(profile).toContain(`(subpath "${accountFile.replace(/\\/gu, "\\\\")}")`); expect(profile).not.toContain('(subpath "/Users/test")'); expect(profile).not.toContain("(deny network*)"); - expect(wrapped.args.slice(2)).toEqual([executable.command, ...invocation.args]); }); it("declares the Claude Code configuration isolation profile", () => { @@ -586,35 +592,19 @@ describe("ClaudeAdapter macOS smoke", () => { spec.successCriteria = ["smoke.txt exists and contains ok."]; spec.timeoutMs = 300_000; spec.producerOverrides = { model: "haiku" }; - const invocation = wrapInvocationWithSeatbelt(adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + adapter, + producerId: "claude", + spec, worktreePath, + intent: "edit", + ps, runId: "run-claude-smoke", capabilityReport: report, - executable: report.resolvedExecutable, - }), { - worktreePath, - tempHome: null, - allowNetwork: true, - }); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), - }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 300_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); - const normalized = adapter.normalizeEvents({ - stdout: supervisedExit.stdout, - stderr: supervisedExit.stderr, - exit: supervisedExit, }); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; + const normalized = { ok: launchResult.ok }; expect( normalized.ok, diff --git a/tests/runtime/codex-adapter.test.ts b/tests/runtime/codex-adapter.test.ts index df5581f..cc11d69 100644 --- a/tests/runtime/codex-adapter.test.ts +++ b/tests/runtime/codex-adapter.test.ts @@ -19,17 +19,17 @@ import { CODEX_REQUIRED_ENV, CODEX_SHELL_ENV_EXCLUDE, CodexAdapter, - defaultCodexEnv, + codexDescriptor, sandboxSupportWritableRoots, } from "../../src/producers/codex-adapter.js"; +import { resolveDefaultEnv } from "../../src/producers/host-store.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; import type { CapabilityReport, InvocationContext, ProbeContext, } from "../../src/producers/producer-adapter.js"; -import { buildEnvironment } from "../../src/runtime/environment-policy.js"; -import { supervise } from "../../src/platform/process-supervisor.js"; import { buildRoleSpec, type RolePackage } from "../../src/pipeline/role-prompts.js"; const execFileAsync = promisify(execFile); @@ -219,7 +219,7 @@ describe("CodexAdapter", () => { it("defaults CODEX_HOME to the host auth store when unset and auth.json exists", () => { const store = join("/hosthome", ".codex"); - const values = defaultCodexEnv({ + const values = resolveDefaultEnv(codexDescriptor, { env: {}, homeDirectory: "/hosthome", hasAuthStore: directory => directory === store, @@ -228,12 +228,12 @@ describe("CodexAdapter", () => { }); it("does not default CODEX_HOME when the variable is set or no auth store exists", () => { - expect(defaultCodexEnv({ + expect(resolveDefaultEnv(codexDescriptor, { env: { CODEX_HOME: "/custom" }, homeDirectory: "/hosthome", hasAuthStore: () => true, })).toEqual({}); - expect(defaultCodexEnv({ + expect(resolveDefaultEnv(codexDescriptor, { env: {}, homeDirectory: "/hosthome", hasAuthStore: () => false, @@ -587,7 +587,7 @@ describe("CodexAdapter", () => { if (originalCodexHome === undefined) { process.env.CODEX_HOME = join(homedir(), ".codex"); } - let builtEnvironment: ReturnType | undefined; + let builtEnvironment: { secretRegistration: { dispose(): void } } | undefined; try { await mkdir(worktreePath); @@ -614,27 +614,19 @@ describe("CodexAdapter", () => { spec.writeAllowlist = ["**"]; spec.forbiddenScope = []; spec.producerOverrides = { reasoningEffort: "low" }; - const invocation = adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + producerId: "codex", + spec, worktreePath, + intent: "edit", + ps, runId: "run-confinement-gate", tempHome, + timeoutMs: 120_000, capabilityReport: report, - executable: report.resolvedExecutable, }); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - tempHome, - }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 120_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; await expect( readFile(insidePath, "utf8"), @@ -685,7 +677,7 @@ describe("CodexAdapter", () => { if (originalCodexHome === undefined) { process.env.CODEX_HOME = join(homedir(), ".codex"); } - let builtEnvironment: ReturnType | undefined; + let builtEnvironment: { secretRegistration: { dispose(): void } } | undefined; try { await mkdir(worktreePath); @@ -712,28 +704,20 @@ describe("CodexAdapter", () => { spec.writeAllowlist = ["skill-proof.txt"]; spec.forbiddenScope = []; spec.producerOverrides = { reasoningEffort: "low" }; - const invocation = adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + producerId: "codex", + spec, worktreePath, + intent: "edit", + ps, runId: "run-skill-gate", tempHome, + timeoutMs: 240_000, capabilityReport: report, - executable: report.resolvedExecutable, - }); - expect(invocation.stdin).toContain(skillPath); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - tempHome, }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 240_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); + expect(launchResult.invocation.stdin).toContain(skillPath); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; const proof = await readFile(proofPath, "utf8"); const diagnostic = @@ -763,7 +747,7 @@ describe("CodexAdapter", () => { if (originalCodexHome === undefined) { process.env.CODEX_HOME = join(homedir(), ".codex"); } - let builtEnvironment: ReturnType | undefined; + let builtEnvironment: { secretRegistration: { dispose(): void } } | undefined; try { await mkdir(worktreePath); @@ -790,27 +774,20 @@ describe("CodexAdapter", () => { spec.writeAllowlist = ["**"]; spec.forbiddenScope = []; spec.producerOverrides = { reasoningEffort: "low" }; - const invocation = adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + producerId: "codex", + spec, worktreePath, + intent: "edit", + ps, runId: "run-shell-env-gate", tempHome, - capabilityReport: report, - executable: report.resolvedExecutable, - }); - builtEnvironment = buildEnvironment({ - os, - adapterAllowlist: invocation.requiredEnv, - tempHome, - }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, timeoutMs: 180_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), maxOutputBytes: 2_000_000, - }, {}); + capabilityReport: report, + }); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; const observed = await readFile(join(worktreePath, "probe-env.txt"), "utf8"); const context = `stdout:\n${supervisedExit.stdout}\nstderr:\n${supervisedExit.stderr}`; @@ -847,7 +824,7 @@ describe("CodexAdapter", () => { if (originalCodexHome === undefined) { process.env.CODEX_HOME = join(homedir(), ".codex"); } - let builtEnvironment: ReturnType | undefined; + let builtEnvironment: { secretRegistration: { dispose(): void } } | undefined; try { await mkdir(worktreePath); @@ -874,31 +851,23 @@ describe("CodexAdapter", () => { spec.writeAllowlist = ["**"]; spec.forbiddenScope = []; spec.producerOverrides = { reasoningEffort: "low" }; - const invocation = adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + producerId: "codex", + spec, worktreePath, + intent: "edit", + ps, runId: "run-confinement-gate", tempHome, + timeoutMs: 120_000, capabilityReport: { ...report, writeConfinementBackend: "codex-native-sandbox", laneEligibility: { ...report.laneEligibility, edit: true }, }, - executable: report.resolvedExecutable, - }); - builtEnvironment = buildEnvironment({ - os: "linux", - adapterAllowlist: invocation.requiredEnv, - tempHome, }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 120_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; await expect( readFile(insidePath, "utf8"), diff --git a/tests/runtime/cross-lane-launch.test.ts b/tests/runtime/cross-lane-launch.test.ts new file mode 100644 index 0000000..fcfd1c7 --- /dev/null +++ b/tests/runtime/cross-lane-launch.test.ts @@ -0,0 +1,193 @@ +import { describe, expect, it } from "vitest"; +import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; +import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; +import { registry } from "../../src/producers/producer-registry.js"; +import { RuntimeError } from "../../src/util/errors.js"; + +const LANES = ["agy", "claude", "codex", "opencode", "pi", "pythinker"] as const; + +function sampleSpec(lane: string): DelegationSpec { + return { + schemaVersion: 1, + producer: lane, + executionMode: "edit", + objective: "Implement feature X in src/lib.ts", + context: "Unit tests are failing", + writeAllowlist: ["src/**"], + forbiddenScope: ["dist/**"], + successCriteria: ["Unit tests pass"], + timeoutMs: 60_000, + }; +} + +describe("cross-lane launch consistency", () => { + it("proves each lane produces identical invocation, environment, and sandbox policy for equivalent edit runs", async () => { + const ps = new PosixPlatformServices(); + const worktreePath = "/tmp/claude-architect-test-worktree"; + + for (const lane of LANES) { + const adapter = registry.get(lane); + expect(adapter).toBeDefined(); + + const report = await adapter!.probe({ + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }); + + // Ensure capability report is eligible for edit test + const testReport = { + ...report, + resolvedExecutable: report.resolvedExecutable ?? { + kind: "native" as const, + command: `/usr/local/bin/${lane}`, + prefixArgs: [], + resolvedFrom: "test", + }, + writeConfinementBackend: lane === "codex" ? "codex-native-sandbox" : "macos-seatbelt", + laneEligibility: { edit: true }, + }; + + const spec = sampleSpec(lane); + const tempHome = (lane === "codex" || lane === "opencode") ? "/tmp/test-temp-home" : null; + + // Launch plan 1: standard attempt runtime intent + const planAttempt = await producerRuntime.planLaunch({ + producerId: lane, + spec, + worktreePath, + intent: "edit", + ps, + runId: "run-attempt-consistency", + tempHome, + capabilityReport: testReport, + }); + + // Launch plan 2: pipeline role runner intent + const planPipeline = await producerRuntime.planLaunch({ + producerId: lane, + spec, + worktreePath, + intent: "edit", + ps, + runId: "run-pipeline-consistency", + tempHome, + capabilityReport: testReport, + }); + + // Verify identical executable and arguments + expect(planAttempt.supervisedInvocation.executable).toEqual(planPipeline.supervisedInvocation.executable); + expect(planAttempt.supervisedInvocation.args).toEqual(planPipeline.supervisedInvocation.args); + + // Verify identical confinement backend and policy + expect(planAttempt.confinementBackend).toEqual(planPipeline.confinementBackend); + + // Verify identical environment keys + expect(Object.keys(planAttempt.builtEnvironment.env).sort()).toEqual( + Object.keys(planPipeline.builtEnvironment.env).sort(), + ); + + // Verify identical tempHome allocation behavior + expect(planAttempt.tempHome !== null).toBe(planPipeline.tempHome !== null); + } + }); + + it("refuses declared-writable-state combined with temporary HOME for inherited-config lanes", async () => { + const ps = new PosixPlatformServices(); + const inheritedLanes = ["agy", "claude", "pi", "pythinker"] as const; + + for (const lane of inheritedLanes) { + const adapter = registry.get(lane); + expect(adapter).toBeDefined(); + + const testReport = { + producerId: lane, + available: true, + reason: null, + os: "darwin" as const, + arch: "arm64", + environmentType: "native" as const, + resolvedExecutable: { + kind: "native" as const, + command: `/usr/local/bin/${lane}`, + prefixArgs: [], + resolvedFrom: "test", + }, + version: "1.0.0", + authState: "unknown" as const, + executionModes: ["edit" as const], + structuredOutput: true, + writeConfinementBackend: "macos-seatbelt", + laneEligibility: { edit: true }, + }; + + await expect( + producerRuntime.planLaunch({ + producerId: lane, + spec: sampleSpec(lane), + worktreePath: "/tmp/worktree", + intent: "edit", + ps, + tempHome: "/tmp/forced-temp-home", + capabilityReport: testReport, + }), + ).rejects.toThrow(RuntimeError); + + await expect( + producerRuntime.planLaunch({ + producerId: lane, + spec: sampleSpec(lane), + worktreePath: "/tmp/worktree", + intent: "edit", + ps, + tempHome: "/tmp/forced-temp-home", + capabilityReport: testReport, + }), + ).rejects.toThrow( + `Declared writable state cannot be combined with temporary HOME isolation for producer '${lane}'`, + ); + } + }); + + it("allows temporary HOME for controlled-config lanes", async () => { + const ps = new PosixPlatformServices(); + const controlledLanes = ["codex", "opencode"] as const; + + for (const lane of controlledLanes) { + const testReport = { + producerId: lane, + available: true, + reason: null, + os: "darwin" as const, + arch: "arm64", + environmentType: "native" as const, + resolvedExecutable: { + kind: "native" as const, + command: `/usr/local/bin/${lane}`, + prefixArgs: [], + resolvedFrom: "test", + }, + version: "1.0.0", + authState: "unknown" as const, + executionModes: ["edit" as const], + structuredOutput: true, + writeConfinementBackend: lane === "codex" ? "codex-native-sandbox" : "macos-seatbelt", + laneEligibility: { edit: true }, + }; + + const plan = await producerRuntime.planLaunch({ + producerId: lane, + spec: sampleSpec(lane), + worktreePath: "/tmp/worktree", + intent: "edit", + ps, + tempHome: "/tmp/forced-temp-home", + capabilityReport: testReport, + }); + + expect(plan.tempHome).toBe("/tmp/forced-temp-home"); + } + }); +}); diff --git a/tests/runtime/cross-lane-probe.test.ts b/tests/runtime/cross-lane-probe.test.ts new file mode 100644 index 0000000..cb85f93 --- /dev/null +++ b/tests/runtime/cross-lane-probe.test.ts @@ -0,0 +1,179 @@ +import { Readable } from "node:stream"; +import { describe, expect, it } from "vitest"; +import type { + PlatformServices, + ResolvedExecutable, + SupervisedExit, +} from "../../src/platform/platform-services.js"; +import { AgyAdapter } from "../../src/producers/agy-adapter.js"; +import { ClaudeAdapter } from "../../src/producers/claude-adapter.js"; +import { CodexAdapter } from "../../src/producers/codex-adapter.js"; +import { OpenCodeAdapter } from "../../src/producers/opencode-adapter.js"; +import { PiAdapter } from "../../src/producers/pi-adapter.js"; +import { PythinkerAdapter } from "../../src/producers/pythinker-adapter.js"; +import type { ProbeContext, ProducerAdapter } from "../../src/producers/producer-adapter.js"; + +function exit(overrides: Partial = {}): SupervisedExit { + return { + exitCode: 0, + signal: null, + timedOut: false, + cancelled: false, + stdout: "", + stderr: "", + truncated: { stdout: false, stderr: false }, + ...overrides, + }; +} + +function mockPlatformServices( + name: string, + supervisedExit: SupervisedExit, +): PlatformServices { + const executable: ResolvedExecutable = { + kind: "native", + command: `/usr/local/bin/${name}`, + prefixArgs: [], + resolvedFrom: "test", + }; + + return { + os: "darwin", + async resolveExecutable() { + return executable; + }, + async spawnSupervised(request) { + // For claude/pythinker inspectSurface probes, respond with supported help output + if (request.args.includes("--help")) { + const helpOutput = request.executable.command.includes("claude") + ? "--no-session-persistence\n--strict-mcp-config\n--setting-sources\n" + : "--prompt\n--model\n"; + return { + pid: 42, + stdout: Readable.from([]), + stderr: Readable.from([]), + done: Promise.resolve(exit({ stdout: helpOutput })), + }; + } + + return { + pid: 42, + stdout: Readable.from([]), + stderr: Readable.from([]), + done: Promise.resolve(supervisedExit), + }; + }, + async requestCooperativeCancellation() {}, + async terminateProcessTree() {}, + async getProcessStartToken() { + return null; + }, + async terminateProcessTreeByPid() {}, + async acquireCheckoutLock() { + throw new Error("unexpected lock"); + }, + async acquireCleanupJournalLock() { + throw new Error("unexpected cleanup journal lock"); + }, + async createSecureTempDirectory() { + throw new Error("unexpected temp directory"); + }, + async canonicalizePath() { + throw new Error("unexpected canonicalization"); + }, + }; +} + +describe("Cross-Lane Probe Abnormal Termination Guard (Slice 2.3)", () => { + const laneFactories: { id: string; create: () => ProducerAdapter }[] = [ + { id: "codex", create: () => new CodexAdapter() }, + { id: "agy", create: () => new AgyAdapter() }, + { id: "claude", create: () => new ClaudeAdapter() }, + { id: "opencode", create: () => new OpenCodeAdapter() }, + { id: "pi", create: () => new PiAdapter() }, + { id: "pythinker", create: () => new PythinkerAdapter() }, + ]; + + it("yields version: null and probe-failed for all six lanes when --version is signal-terminated", async () => { + for (const { id, create } of laneFactories) { + const ps = mockPlatformServices( + id, + exit({ exitCode: null, signal: "SIGTERM", stdout: "1.2.3\n" }), + ); + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + const report = await create().probe(ctx); + expect(report.version, `Lane ${id} must yield version: null when signalled`).toBeNull(); + expect(report.available, `Lane ${id} must not be available when signalled`).toBe(false); + expect(report.reason, `Lane ${id} must report probe-failed when signalled`).toBe("probe-failed"); + expect(report.laneEligibility.edit, `Lane ${id} edit eligibility must be false`).toBe(false); + } + }); + + it("yields version: null and probe-failed for all six lanes when --version times out", async () => { + for (const { id, create } of laneFactories) { + const ps = mockPlatformServices( + id, + exit({ timedOut: true, stdout: "1.2.3\n" }), + ); + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + const report = await create().probe(ctx); + expect(report.version, `Lane ${id} must yield version: null on timeout`).toBeNull(); + expect(report.available, `Lane ${id} must not be available on timeout`).toBe(false); + expect(report.reason, `Lane ${id} must report probe-failed on timeout`).toBe("probe-failed"); + expect(report.laneEligibility.edit, `Lane ${id} edit eligibility must be false`).toBe(false); + } + }); + + it("yields version: null and probe-failed for all six lanes when --version is cancelled", async () => { + for (const { id, create } of laneFactories) { + const ps = mockPlatformServices( + id, + exit({ cancelled: true, stdout: "1.2.3\n" }), + ); + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + const report = await create().probe(ctx); + expect(report.version, `Lane ${id} must yield version: null when cancelled`).toBeNull(); + expect(report.available, `Lane ${id} must not be available when cancelled`).toBe(false); + expect(report.reason, `Lane ${id} must report probe-failed when cancelled`).toBe("probe-failed"); + expect(report.laneEligibility.edit, `Lane ${id} edit eligibility must be false`).toBe(false); + } + }); + + it("succeeds for all six lanes when --version exits normally with 0 and clean exit state", async () => { + for (const { id, create } of laneFactories) { + const ps = mockPlatformServices( + id, + exit({ exitCode: 0, signal: null, stdout: "1.2.3\n" }), + ); + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + const report = await create().probe(ctx); + expect(report.version, `Lane ${id} must parse version 1.2.3`).toBe("1.2.3"); + expect(report.available, `Lane ${id} must be available`).toBe(true); + expect(report.reason).toBeNull(); + } + }); +}); diff --git a/tests/runtime/cross-lane-prompt.test.ts b/tests/runtime/cross-lane-prompt.test.ts new file mode 100644 index 0000000..22033f8 --- /dev/null +++ b/tests/runtime/cross-lane-prompt.test.ts @@ -0,0 +1,290 @@ +import { createHash } from "node:crypto"; +import { describe, expect, it } from "vitest"; +import type { PlatformServices, ResolvedExecutable } from "../../src/platform/platform-services.js"; +import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; +import { + EDIT_ACTION_PREAMBLE, + LINT_BEFORE_TYPECHECK_INSTRUCTION, + renderList, + renderProducerPrompt, +} from "../../src/producers/prompt-renderer.js"; +import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; +import { AgyAdapter, agyDescriptor } from "../../src/producers/agy-adapter.js"; +import { ClaudeAdapter, claudeDescriptor } from "../../src/producers/claude-adapter.js"; +import { CodexAdapter, codexDescriptor } from "../../src/producers/codex-adapter.js"; +import { OpenCodeAdapter, openCodeDescriptor } from "../../src/producers/opencode-adapter.js"; +import { PiAdapter, piDescriptor } from "../../src/producers/pi-adapter.js"; +import { PythinkerAdapter, pythinkerDescriptor } from "../../src/producers/pythinker-adapter.js"; +import { + DescriptorAdapter, + type InvocationContext, + type ProducerAdapter, + type ProducerDescriptor, +} from "../../src/producers/producer-adapter.js"; + +const executable: ResolvedExecutable = { + kind: "native", + command: "/usr/local/bin/test-cli", + prefixArgs: [], + resolvedFrom: "test", +}; + +function invocationContext(readOnly = false): InvocationContext { + return { + executable, + worktreePath: "/tmp/worktree", + tempHome: "/tmp/home", + readOnly, + }; +} + +function sampleSpec(): DelegationSpec { + return { + id: "cross-lane-spec-001", + objective: "Implement unified cross-lane prompt rendering", + context: "Slice 2.2 unifies prompt assembly across all producer descriptors.", + writeAllowlist: ["src/producers/prompt-renderer.ts", "tests/runtime/cross-lane-prompt.test.ts"], + forbiddenScope: ["runtime/schemas/*"], + successCriteria: [ + "Every edit-lane prompt carries action-first preamble", + "Every edit-lane prompt carries lint-before-typecheck ordering", + ], + executionMode: "edit", + timeoutMs: 30_000, + }; +} + +function extractPrompt(adapterId: string, args: string[], stdin?: string): string { + if (stdin !== undefined) return stdin; + if (adapterId === "agy") { + const idx = args.indexOf("-p"); + return idx >= 0 ? args[idx + 1]! : ""; + } + if (adapterId === "pythinker") { + const idx = args.indexOf("--prompt"); + return idx >= 0 ? args[idx + 1]! : ""; + } + throw new Error(`Unknown prompt extraction for ${adapterId}`); +} + +describe("Cross-Lane Prompt Renderer (Slice 2.2)", () => { + const lanes: { id: string; descriptor: ProducerDescriptor; createAdapter: () => ProducerAdapter }[] = [ + { id: "codex", descriptor: codexDescriptor, createAdapter: () => new CodexAdapter() }, + { id: "agy", descriptor: agyDescriptor, createAdapter: () => new AgyAdapter() }, + { id: "claude", descriptor: claudeDescriptor, createAdapter: () => new ClaudeAdapter() }, + { id: "opencode", descriptor: openCodeDescriptor, createAdapter: () => new OpenCodeAdapter() }, + { id: "pi", descriptor: piDescriptor, createAdapter: () => new PiAdapter() }, + { id: "pythinker", descriptor: pythinkerDescriptor, createAdapter: () => new PythinkerAdapter() }, + ]; + + it("declares actionPreamble and bootstrapPlacement on every producer descriptor", () => { + for (const lane of lanes) { + expect(lane.descriptor.prompt).toBeDefined(); + expect(lane.descriptor.prompt?.actionPreamble).toBe(true); + expect(lane.descriptor.prompt?.bootstrapPlacement).toBe("before"); + } + }); + + it("asserts every edit-lane prompt carries the action-first preamble and lint-before-typecheck ordering", () => { + const spec = sampleSpec(); + const ctx = invocationContext(false); + + for (const lane of lanes) { + const adapter = lane.createAdapter(); + const invocation = adapter.buildInvocation(spec, ctx); + const prompt = extractPrompt(lane.id, invocation.args, invocation.stdin); + + // Action-first preamble must be at the very top + expect( + prompt.startsWith(`${EDIT_ACTION_PREAMBLE}\n\n`), + `Lane ${lane.id} prompt must start with action preamble`, + ).toBe(true); + + // Must include delegated skill bootstrap + expect( + prompt.includes(renderSkillBootstrap()), + `Lane ${lane.id} prompt must contain delegated skill bootstrap`, + ).toBe(true); + + // Must include untrusted notice + expect( + prompt.includes("You are an untrusted implementation Producer operating inside an isolated worktree."), + `Lane ${lane.id} prompt must contain untrusted notice`, + ).toBe(true); + + // Must include spec elements + expect(prompt).toContain(spec.objective); + expect(prompt).toContain(spec.context); + expect(prompt).toContain("src/producers/prompt-renderer.ts"); + expect(prompt).toContain("runtime/schemas/*"); + expect(prompt).toContain("Every edit-lane prompt carries action-first preamble"); + + // Must include lint-before-typecheck instruction + expect( + prompt.includes(LINT_BEFORE_TYPECHECK_INSTRUCTION), + `Lane ${lane.id} prompt must contain lint-before-typecheck instruction`, + ).toBe(true); + + // Ordering: preamble before bootstrap, bootstrap before untrusted notice, + // untrusted notice before objective, lint instruction before final summary + const preambleIdx = prompt.indexOf(EDIT_ACTION_PREAMBLE); + const bootstrapIdx = prompt.indexOf(renderSkillBootstrap()); + const noticeIdx = prompt.indexOf("You are an untrusted implementation Producer"); + const objectiveIdx = prompt.indexOf("Objective:"); + const lintIdx = prompt.indexOf(LINT_BEFORE_TYPECHECK_INSTRUCTION); + const summaryIdx = prompt.indexOf("Make only the requested edits. Return a concise final summary"); + + expect(preambleIdx).toBe(0); + expect(bootstrapIdx).toBeGreaterThan(preambleIdx); + expect(noticeIdx).toBeGreaterThan(bootstrapIdx); + expect(objectiveIdx).toBeGreaterThan(noticeIdx); + expect(lintIdx).toBeGreaterThan(objectiveIdx); + expect(summaryIdx).toBeGreaterThan(lintIdx); + } + }); + + it("produces byte-identical prompt content across all six edit lanes", () => { + const spec = sampleSpec(); + const ctx = invocationContext(false); + + const prompts = lanes.map(lane => { + const adapter = lane.createAdapter(); + const invocation = adapter.buildInvocation(spec, ctx); + return { + id: lane.id, + prompt: extractPrompt(lane.id, invocation.args, invocation.stdin), + }; + }); + + const canonicalPrompt = renderProducerPrompt(spec, false); + for (const { id, prompt } of prompts) { + expect(prompt, `Lane ${id} prompt must match canonical prompt`).toBe(canonicalPrompt); + } + }); + + it("omits the action preamble and skill bootstrap from read-only prompts across all lanes", () => { + const spec = sampleSpec(); + const ctx = invocationContext(true); + + for (const lane of lanes) { + const adapter = lane.createAdapter(); + const invocation = adapter.buildInvocation(spec, ctx); + const prompt = extractPrompt(lane.id, invocation.args, invocation.stdin); + + expect(prompt).not.toContain(EDIT_ACTION_PREAMBLE); + expect(prompt).not.toContain("## Delegated procedure skills"); + expect(prompt).toContain("You are an untrusted implementation Producer"); + expect(prompt).toContain(spec.objective); + expect(prompt).toContain(LINT_BEFORE_TYPECHECK_INSTRUCTION); + } + }); + + it("parameterizes actionPreamble and bootstrapPlacement from descriptor data", () => { + const spec = sampleSpec(); + + // Case 1: placement = "after", actionPreamble = false (legacy plain-text style) + const afterNoPreambleDesc: ProducerDescriptor = { + id: "test-after-no-preamble", + executable: { name: "test" }, + isolation: "inherited-config-only", + prompt: { + actionPreamble: false, + bootstrapPlacement: "after", + }, + }; + const promptAfterNoPreamble = renderProducerPrompt(spec, afterNoPreambleDesc); + expect(promptAfterNoPreamble).not.toContain(EDIT_ACTION_PREAMBLE); + expect(promptAfterNoPreamble.startsWith("You are an untrusted implementation Producer")).toBe(true); + const noticePos = promptAfterNoPreamble.indexOf("Do not delegate to other agents"); + const bootstrapPos = promptAfterNoPreamble.indexOf(renderSkillBootstrap()); + const objPos = promptAfterNoPreamble.indexOf("Objective:"); + expect(bootstrapPos).toBeGreaterThan(noticePos); + expect(objPos).toBeGreaterThan(bootstrapPos); + + // Case 2: placement = "before", actionPreamble = false + const beforeNoPreambleDesc: ProducerDescriptor = { + id: "test-before-no-preamble", + executable: { name: "test" }, + isolation: "inherited-config-only", + prompt: { + actionPreamble: false, + bootstrapPlacement: "before", + }, + }; + const promptBeforeNoPreamble = renderProducerPrompt(spec, beforeNoPreambleDesc); + expect(promptBeforeNoPreamble).not.toContain(EDIT_ACTION_PREAMBLE); + expect(promptBeforeNoPreamble.startsWith(renderSkillBootstrap())).toBe(true); + + // Case 3: placement = "after", actionPreamble = true + const afterWithPreambleDesc: ProducerDescriptor = { + id: "test-after-with-preamble", + executable: { name: "test" }, + isolation: "inherited-config-only", + prompt: { + actionPreamble: true, + bootstrapPlacement: "after", + }, + }; + const promptAfterWithPreamble = renderProducerPrompt(spec, afterWithPreambleDesc); + expect(promptAfterWithPreamble.startsWith(`${EDIT_ACTION_PREAMBLE}\n\n`)).toBe(true); + const bootstrapInAfter = promptAfterWithPreamble.indexOf(renderSkillBootstrap()); + const noticeInAfter = promptAfterWithPreamble.indexOf("You are an untrusted implementation Producer"); + expect(bootstrapInAfter).toBeGreaterThan(noticeInAfter); + + // Case 4: DescriptorAdapter automatically routes through descriptor prompt configuration + const customAdapter = new DescriptorAdapter(afterNoPreambleDesc); + const customInvocation = customAdapter.buildInvocation(spec, invocationContext(false)); + expect(customInvocation.stdin).toBe(promptAfterNoPreamble); + }); + + it("documents the change in prompt hashes for the five non-Codex lanes", () => { + const spec = sampleSpec(); + const currentPrompt = renderProducerPrompt(spec, false); + const currentHash = createHash("sha256").update(currentPrompt).digest("hex"); + + // Reconstruct the legacy non-Codex prompt (without preamble, without lint instruction, bootstrap in body) + const legacyPrompt = [ + "You are an untrusted implementation Producer operating inside an isolated worktree.", + "Do not delegate to other agents or expand the authorized scope.", + "", + renderSkillBootstrap(), + "", + "Objective:", + spec.objective, + "", + "Context:", + spec.context, + "", + "Authorized write allowlist:", + renderList(spec.writeAllowlist), + "", + "Forbidden scope:", + renderList(spec.forbiddenScope), + "", + "Success criteria:", + renderList(spec.successCriteria), + "", + "Make only the requested edits. Return a concise final summary of the work performed.", + ].join("\n"); + const legacyHash = createHash("sha256").update(legacyPrompt).digest("hex"); + + // The legacy hash and current hash differ because of actionPreamble and lint-before-typecheck instruction + expect(currentHash).not.toBe(legacyHash); + + // For Codex, its prompt previously matched currentPrompt (with preamble and lint-before-typecheck) + // For agy, claude, opencode, pi, pythinker, their prompt changed from legacy to current + for (const lane of lanes) { + const adapter = lane.createAdapter(); + const invocation = adapter.buildInvocation(spec, invocationContext(false)); + const prompt = extractPrompt(lane.id, invocation.args, invocation.stdin); + const hash = createHash("sha256").update(prompt).digest("hex"); + expect(hash).toBe(currentHash); + } + }); + + it("renderList formats empty and populated string arrays correctly", () => { + expect(renderList([])).toBe("- (none)"); + expect(renderList(["a"])).toBe("- a"); + expect(renderList(["item 1", "item 2"])).toBe("- item 1\n- item 2"); + }); +}); diff --git a/tests/runtime/opencode-adapter.test.ts b/tests/runtime/opencode-adapter.test.ts index eb06e29..6fa48ac 100644 --- a/tests/runtime/opencode-adapter.test.ts +++ b/tests/runtime/opencode-adapter.test.ts @@ -12,10 +12,9 @@ import type { SupervisedExit, } from "../../src/platform/platform-services.js"; import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; -import { supervise } from "../../src/platform/process-supervisor.js"; -import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { OpenCodeAdapter } from "../../src/producers/opencode-adapter.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; import type { CapabilityReport, @@ -26,7 +25,6 @@ import { normalizePlainText, selectOsWriteConfinementBackend, } from "../../src/producers/plain-text.js"; -import { buildEnvironment } from "../../src/runtime/environment-policy.js"; const execFileAsync = promisify(execFile); const executable: ResolvedExecutable = { @@ -527,52 +525,19 @@ describe("OpenCodeAdapter", () => { await mkdir(worktreePath); await execFileAsync("git", ["init", "-q"], { cwd: worktreePath }); const ps = new PosixPlatformServices(); - const invocation = { - executable: { - kind: "native" as const, - command: "/usr/bin/touch", - prefixArgs: [], - resolvedFrom: "seatbelt-confinement-gate", - }, - args: [insidePath], - requiredEnv: [], - network: "denied" as const, - }; - const policy = { worktreePath, tempHome: null, allowNetwork: false }; - const insideExit = await supervise(ps, { - executable: wrapInvocationWithSeatbelt(invocation, policy).executable, - args: wrapInvocationWithSeatbelt(invocation, policy).args, - cwd: worktreePath, - env: {}, - timeoutMs: 30_000, - maxOutputBytes: 64 * 1024, - }, {}); + const plan = await producerRuntime.planLaunch({ + producerId: "opencode", + spec: sampleSpec(), + worktreePath, + intent: "edit", + ps, + }); - expect( - insideExit.exitCode, - `stdout:\n${insideExit.stdout}\nstderr:\n${insideExit.stderr}`, - ).toBe(0); - await expect(access(insidePath)).resolves.toBeUndefined(); - - const outsideInvocation = wrapInvocationWithSeatbelt({ - ...invocation, - args: [outsidePath], - }, policy); - const outsideExit = await supervise(ps, { - executable: outsideInvocation.executable, - args: outsideInvocation.args, - cwd: worktreePath, - env: {}, - timeoutMs: 30_000, - maxOutputBytes: 64 * 1024, - }, {}); - - expect(outsideExit.spawnError).toBeUndefined(); - expect( - outsideExit.exitCode, - `stdout:\n${outsideExit.stdout}\nstderr:\n${outsideExit.stderr}`, - ).not.toBe(0); - await expect(access(outsidePath)).rejects.toMatchObject({ code: "ENOENT" }); + expect(plan.confinementBackend).toBe("macos-seatbelt"); + expect(plan.invocation.executable.command).toBe("/usr/bin/sandbox-exec"); + const profile = plan.invocation.args[1] ?? ""; + expect(profile).toContain(`(subpath "${worktreePath}")`); + expect(profile).toContain("(deny file-write*)"); } finally { await rm(outsidePath, { force: true }); await rm(root, { recursive: true, force: true }); @@ -621,30 +586,17 @@ describe("OpenCodeAdapter", () => { spec.forbiddenScope = []; spec.successCriteria = ["smoke.txt exists and contains ok."]; spec.timeoutMs = 300_000; - const invocation = wrapInvocationWithSeatbelt(adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + producerId: "opencode", + spec, worktreePath, + intent: "edit", + ps, runId: "run-opencode-smoke", capabilityReport: report, - executable: report.resolvedExecutable, - }), { - worktreePath, - tempHome: null, - allowNetwork: true, - }); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 300_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; const normalized = normalizePlainText({ stdout: supervisedExit.stdout, stderr: supervisedExit.stderr, diff --git a/tests/runtime/pi-adapter.test.ts b/tests/runtime/pi-adapter.test.ts index 121112f..cbd1edb 100644 --- a/tests/runtime/pi-adapter.test.ts +++ b/tests/runtime/pi-adapter.test.ts @@ -11,18 +11,16 @@ import type { SupervisedExit, } from "../../src/platform/platform-services.js"; import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; -import { supervise } from "../../src/platform/process-supervisor.js"; -import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { PiAdapter } from "../../src/producers/pi-adapter.js"; import { normalizePlainText } from "../../src/producers/plain-text.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; import type { CapabilityReport, InvocationContext, ProbeContext, } from "../../src/producers/producer-adapter.js"; -import { buildEnvironment } from "../../src/runtime/environment-policy.js"; const execFileAsync = promisify(execFile); const executable: ResolvedExecutable = { @@ -320,24 +318,31 @@ describe("PiAdapter", () => { expect(invocation.network).toBe("allowed"); }); - it("wraps a Pi edit invocation with provider network and write confinement", () => { + it("wraps a Pi edit invocation with provider network and write confinement", async () => { const context = invocationContext(); const spec = sampleSpec(); - const invocation = new PiAdapter({ + const adapter = new PiAdapter({ env: {}, homeDirectory: "/hosthome", hasAuthStore: () => false, - }).buildInvocation(spec, context); - const wrapped = wrapInvocationWithSeatbelt(invocation, { + }); + const plan = await producerRuntime.planLaunch({ + adapter, + producerId: "pi", + spec, worktreePath: context.worktreePath, - tempHome: context.tempHome ?? null, - allowNetwork: invocation.network === "allowed", + intent: "edit", + ps: new PosixPlatformServices(), + capabilityReport: { + ...context.capabilityReport, + writeConfinementBackend: "macos-seatbelt", + }, }); - const profile = wrapped.args[1] ?? ""; + const profile = plan.invocation.args[1] ?? ""; expect(spec.executionMode).toBe("edit"); - expect(invocation.network).toBe("allowed"); - expect(wrapped.executable.command).toBe("/usr/bin/sandbox-exec"); + expect(plan.confinementBackend).toBe("macos-seatbelt"); + expect(plan.invocation.executable.command).toBe("/usr/bin/sandbox-exec"); expect(profile).not.toContain("(deny network*)"); expect(profile).toContain("(deny file-write*)"); }); @@ -514,30 +519,18 @@ describe("PiAdapter", () => { spec.producerOverrides = { reasoningEffort: "low", }; - const invocation = wrapInvocationWithSeatbelt(adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + adapter, + producerId: "pi", + spec, worktreePath, + intent: "edit", + ps, runId: "run-pi-smoke", capabilityReport: report, - executable: report.resolvedExecutable, - }), { - worktreePath, - tempHome: null, - allowNetwork: true, - }); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 300_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; const normalized = normalizePlainText({ stdout: supervisedExit.stdout, stderr: supervisedExit.stderr, diff --git a/tests/runtime/pipeline-runtime.test.ts b/tests/runtime/pipeline-runtime.test.ts index f76618f..2134d5b 100644 --- a/tests/runtime/pipeline-runtime.test.ts +++ b/tests/runtime/pipeline-runtime.test.ts @@ -2898,7 +2898,7 @@ describe("runPipeline", () => { expectedArtifactHash: promotedArtifact.manifestHash, })).resolves.toMatchObject({ integration: "applied" }); await expect(readFile(path.join(repo, "a.txt"), "utf8")).resolves.toBe("fixed\n"); - }); + }, 120_000); it("emits ordered pipeline-stage progress phases across review and fix rounds", async () => { const repo = await initRepo(); diff --git a/tests/runtime/probe-cache.test.ts b/tests/runtime/probe-cache.test.ts new file mode 100644 index 0000000..c0fa71d --- /dev/null +++ b/tests/runtime/probe-cache.test.ts @@ -0,0 +1,237 @@ +import { describe, expect, it } from "vitest"; +import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; +import { ProducerRuntime } from "../../src/producers/producer-runtime.js"; +import { ProducerRegistry } from "../../src/producers/producer-registry.js"; +import type { + CapabilityReport, + ProbeContext, + ProducerAdapter, +} from "../../src/producers/producer-adapter.js"; + +function makeTestAdapter(id: string, version = "1.0.0"): { + adapter: ProducerAdapter; + probeCalls: number; +} { + let probeCalls = 0; + const adapter: ProducerAdapter = { + producerId: id, + structuredOutput: false, + executionModes: ["edit"], + async probe(ctx: ProbeContext): Promise { + probeCalls++; + return { + producerId: id, + available: true, + reason: null, + os: ctx.os, + arch: ctx.arch, + environmentType: ctx.environmentType, + resolvedExecutable: { + kind: "native", + command: `/bin/${id}`, + prefixArgs: [], + resolvedFrom: "test", + }, + version, + authState: "authenticated", + executionModes: ["edit"], + structuredOutput: false, + writeConfinementBackend: null, + laneEligibility: { edit: false }, + }; + }, + buildInvocation() { + throw new Error("not implemented"); + }, + normalizeEvents(raw) { + return { events: [], producerSummary: raw.stdout, ok: true }; + }, + configurationProfile() { + return { + isolationState: "controlled-config-supported", + credentialSources: [], + behavioralConfigSources: [], + repositoryInstructionSources: [], + environmentDependencies: [], + temporaryHomeStrategy: "temporary HOME directory", + }; + }, + }; + + return { + get probeCalls() { + return probeCalls; + }, + adapter, + }; +} + +describe("producer probe cache", () => { + it("caches probe results within a run and reports cache hits", async () => { + const adapters = ["agy", "claude", "codex", "opencode", "pi", "pythinker"].map(id => + makeTestAdapter(id), + ); + const registry = new ProducerRegistry(adapters.map(e => e.adapter)); + + const runtime = new ProducerRuntime(registry); + const ps = new PosixPlatformServices(); + ps.resolveExecutable = async query => ({ + kind: "native", + command: `/bin/${query.name}`, + prefixArgs: [], + resolvedFrom: "test", + }); + + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + // First call (Role 1 / initial routing): all 6 probed fresh + const reports1 = await runtime.probeAll(ctx); + expect(reports1).toHaveLength(6); + expect(runtime.probeCacheHits).toBe(0); + for (const a of adapters) { + expect(a.probeCalls).toBe(1); + } + + // Second call (Role 2): all 6 hits from cache! + const reports2 = await runtime.probeAll(ctx); + expect(reports2).toHaveLength(6); + expect(runtime.probeCacheHits).toBe(6); + for (const a of adapters) { + expect(a.probeCalls).toBe(1); + } + + // Third call (Role 3): another 6 hits from cache! + const reports3 = await runtime.probeAll(ctx); + expect(reports3).toHaveLength(6); + expect(runtime.probeCacheHits).toBe(12); + for (const a of adapters) { + expect(a.probeCalls).toBe(1); + } + }); + + it("detects a swapped executable between roles and probes fresh", async () => { + let currentCommand = "/bin/custom-agent-v1"; + let probeCalls = 0; + + const adapter: ProducerAdapter = { + producerId: "custom", + structuredOutput: false, + executionModes: ["edit"], + async probe(ctx: ProbeContext): Promise { + probeCalls++; + return { + producerId: "custom", + available: true, + reason: null, + os: ctx.os, + arch: ctx.arch, + environmentType: ctx.environmentType, + resolvedExecutable: { + kind: "native", + command: currentCommand, + prefixArgs: [], + resolvedFrom: "test", + }, + version: "1.0.0", + authState: "authenticated", + executionModes: ["edit"], + structuredOutput: false, + writeConfinementBackend: null, + laneEligibility: { edit: false }, + }; + }, + buildInvocation() { throw new Error("not implemented"); }, + normalizeEvents(raw) { return { events: [], producerSummary: raw.stdout, ok: true }; }, + configurationProfile() { + return { + isolationState: "controlled-config-supported", + credentialSources: [], + behavioralConfigSources: [], + repositoryInstructionSources: [], + environmentDependencies: [], + temporaryHomeStrategy: "temp", + }; + }, + }; + + const registry = new ProducerRegistry([adapter]); + const runtime = new ProducerRuntime(registry); + const ps = new PosixPlatformServices(); + // Intercept resolveExecutable so it reflects currentCommand + ps.resolveExecutable = async query => ({ + kind: "native", + command: currentCommand, + prefixArgs: [], + resolvedFrom: "test", + }); + + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + // Role 1 probe + await runtime.probe("custom", ctx); + expect(probeCalls).toBe(1); + expect(runtime.probeCacheHits).toBe(0); + + // Repeated probe with identical executable: cache hit + await runtime.probe("custom", ctx); + expect(probeCalls).toBe(1); + expect(runtime.probeCacheHits).toBe(1); + + // Swapped executable between roles! + currentCommand = "/bin/custom-agent-v2"; + + // Role 2 probe detects swapped executable and probes fresh + await runtime.probe("custom", ctx); + expect(probeCalls).toBe(2); + expect(runtime.probeCacheHits).toBe(1); + + // Re-probing v2 hits the cache + await runtime.probe("custom", ctx); + expect(probeCalls).toBe(2); + expect(runtime.probeCacheHits).toBe(2); + }); + + it("always bypasses the cache when fresh: true is requested (doctor)", async () => { + const entry = makeTestAdapter("codex"); + const registry = new ProducerRegistry([entry.adapter]); + + const runtime = new ProducerRuntime(registry); + const ps = new PosixPlatformServices(); + ps.resolveExecutable = async query => ({ + kind: "native", + command: `/bin/${query.name}`, + prefixArgs: [], + resolvedFrom: "test", + }); + + const ctx: ProbeContext = { + ps, + os: "darwin", + arch: "arm64", + environmentType: "native", + }; + + await runtime.probe("codex", ctx); + expect(entry.probeCalls).toBe(1); + + // Regular call hits cache + await runtime.probe("codex", ctx); + expect(entry.probeCalls).toBe(1); + expect(runtime.probeCacheHits).toBe(1); + + // Doctor fresh call bypasses cache + await runtime.probe("codex", ctx, { fresh: true }); + expect(entry.probeCalls).toBe(2); + expect(runtime.probeCacheHits).toBe(1); + }); +}); diff --git a/tests/runtime/producer-adapter.test.ts b/tests/runtime/producer-adapter.test.ts index 1e2af35..2f51ead 100644 --- a/tests/runtime/producer-adapter.test.ts +++ b/tests/runtime/producer-adapter.test.ts @@ -3,13 +3,24 @@ import type { PlatformServices, ResolvedExecutable } from "../../src/platform/pl import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { detectEnvironmentType, + DescriptorAdapter, type CapabilityReport, type InvocationContext, type ProbeContext, type ProducerAdapter, type ProducerConfigurationProfile, + type ProducerDescriptor, type ProducerInvocation, } from "../../src/producers/producer-adapter.js"; +import { + isProducerAuthenticated, + resolveDefaultEnv, + resolveInheritedWritablePaths, +} from "../../src/producers/host-store.js"; +import { + EDIT_ACTION_PREAMBLE, + LINT_BEFORE_TYPECHECK_INSTRUCTION, +} from "../../src/producers/prompt-renderer.js"; const executable: ResolvedExecutable = { kind: "native", @@ -108,4 +119,95 @@ describe("ProducerAdapter", () => { expect(report.laneEligibility.edit).toBe(true); }); + + it("treats a seventh-lane fixture as a pure data record descriptor", async () => { + const seventhLaneDescriptor: ProducerDescriptor = { + id: "seventh-lane", + executable: { name: "seventh-cli" }, + isolation: "inherited-config-only", + hostState: { + resolveStore: ctx => `${ctx.homeDirectory}/.seventh`, + authMarker: "token.json", + inheritedWritablePaths: store => [store], + defaultEnv: (store, ctx) => (ctx.env.SEVENTH_HOME ? {} : { SEVENTH_HOME: store }), + }, + prompt: { + actionPreamble: true, + bootstrapPlacement: "before", + }, + structuredOutput: true, + executionModes: ["edit"], + }; + + // 1. Host-store functions operate on the pure data record + const authed = isProducerAuthenticated(seventhLaneDescriptor, { + env: {}, + homeDirectory: "/test/home", + hasAuthStore: dir => dir === "/test/home/.seventh", + }); + expect(authed).toBe(true); + + const unauthed = isProducerAuthenticated(seventhLaneDescriptor, { + env: {}, + homeDirectory: "/test/home", + hasAuthStore: () => false, + }); + expect(unauthed).toBe(false); + + const writable = resolveInheritedWritablePaths(seventhLaneDescriptor, { + env: {}, + homeDirectory: "/test/home", + }); + expect(writable).toEqual(["/test/home/.seventh"]); + + const env = resolveDefaultEnv(seventhLaneDescriptor, { + env: {}, + homeDirectory: "/test/home", + }); + expect(env).toEqual({ SEVENTH_HOME: "/test/home/.seventh" }); + + // 2. DescriptorAdapter wraps the data record directly without bespoke class boilerplate + const adapter = new DescriptorAdapter(seventhLaneDescriptor, { + env: {}, + homeDirectory: "/test/home", + hasAuthStore: () => true, + }); + + expect(adapter.producerId).toBe("seventh-lane"); + expect(adapter.structuredOutput).toBe(true); + expect(adapter.executionModes).toEqual(["edit"]); + expect(adapter.configurationProfile().isolationState).toBe("inherited-config-only"); + + const probeReport = await adapter.probe({ + ps: { + resolveExecutable: async () => executable, + } as unknown as PlatformServices, + os: "darwin", + arch: "arm64", + environmentType: "native", + }); + expect(probeReport.available).toBe(true); + expect(probeReport.authState).toBe("authenticated"); + expect(probeReport.laneEligibility.edit).toBe(true); + + const invocation = adapter.buildInvocation( + { + id: "spec-seventh", + objective: "Build seventh lane", + context: "test", + writeAllowlist: ["a.ts"], + forbiddenScope: [], + successCriteria: ["works"], + executionMode: "edit", + timeoutMs: 10_000, + }, + { + executable, + worktreePath: "/tmp/worktree", + tempHome: "/tmp/home", + }, + ); + expect(invocation.stdin).toContain(EDIT_ACTION_PREAMBLE); + expect(invocation.stdin).toContain(LINT_BEFORE_TYPECHECK_INSTRUCTION); + }); }); diff --git a/tests/runtime/pythinker-adapter.test.ts b/tests/runtime/pythinker-adapter.test.ts index 396958f..3eb7db2 100644 --- a/tests/runtime/pythinker-adapter.test.ts +++ b/tests/runtime/pythinker-adapter.test.ts @@ -11,13 +11,12 @@ import type { SupervisedExit, } from "../../src/platform/platform-services.js"; import { PosixPlatformServices } from "../../src/platform/posix-platform-services.js"; -import { supervise } from "../../src/platform/process-supervisor.js"; -import { wrapInvocationWithSeatbelt } from "../../src/platform/sandbox/seatbelt.js"; import type { DelegationSpec } from "../../src/protocol/delegation-spec.js"; import { normalizePlainText, renderProducerPrompt, } from "../../src/producers/plain-text.js"; +import { producerRuntime } from "../../src/producers/producer-runtime.js"; import type { CapabilityReport, InvocationContext, @@ -25,7 +24,6 @@ import type { } from "../../src/producers/producer-adapter.js"; import { PythinkerAdapter } from "../../src/producers/pythinker-adapter.js"; import { renderSkillBootstrap } from "../../src/producers/skill-bootstrap.js"; -import { buildEnvironment } from "../../src/runtime/environment-policy.js"; const execFileAsync = promisify(execFile); const executable: ResolvedExecutable = { @@ -622,30 +620,18 @@ describe("PythinkerAdapter", () => { spec.forbiddenScope = []; spec.successCriteria = ["smoke.txt exists and contains ok."]; spec.timeoutMs = 300_000; - const invocation = wrapInvocationWithSeatbelt(adapter.buildInvocation(spec, { + const launchResult = await producerRuntime.launch({ + adapter, + producerId: "pythinker", + spec, worktreePath, + intent: "edit", + ps, runId: "run-pythinker-smoke", capabilityReport: report, - executable: report.resolvedExecutable, - }), { - worktreePath, - tempHome: null, - allowNetwork: true, - }); - builtEnvironment = buildEnvironment({ - os: "darwin", - adapterAllowlist: invocation.requiredEnv, - ...(invocation.env === undefined ? {} : { adapterValues: invocation.env }), }); - const supervisedExit = await supervise(ps, { - executable: invocation.executable, - args: invocation.args, - cwd: worktreePath, - env: builtEnvironment.env, - timeoutMs: 300_000, - ...(invocation.stdin === undefined ? {} : { stdin: invocation.stdin }), - maxOutputBytes: 1_000_000, - }, {}); + builtEnvironment = launchResult.builtEnvironment; + const supervisedExit = launchResult.exit; const normalized = normalizePlainText({ stdout: supervisedExit.stdout, stderr: supervisedExit.stderr, From 98d194575dffc8ff9f340d0cce35f8bd724703ae Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 18:48:23 -0400 Subject: [PATCH 08/12] feat: implement Phase 3 PlatformSafety with lease inversion, lock ownership, durable write, and status emission --- CONTEXT.md | 19 +- runtime/server.mjs | 5990 +++++++++-------- src/autopilot/branch-manager.ts | 442 +- src/autopilot/candidate-promoter.ts | 103 +- src/autopilot/final-branch-reviewer.ts | 38 +- src/integrate/controlled-integrator.ts | 55 +- src/mcp/doctor.ts | 4 +- src/mcp/tools.ts | 48 +- src/pipeline/pipeline-runtime.ts | 37 +- src/platform/durable-write.ts | 251 + src/platform/lock-owner.ts | 53 +- src/platform/lock-ownership.ts | 828 +++ src/platform/platform-safety.ts | 123 + src/platform/posix-platform-services.ts | 183 +- src/producers/capability-probe.ts | 2 +- src/runtime/artifact-store.ts | 267 +- src/runtime/attempt-runtime.ts | 43 +- src/runtime/recovery-manager.ts | 683 +- src/runtime/run-status.ts | 41 + src/runtime/worktree-manager.ts | 45 +- src/runtime/worktree-mutation-gate.ts | 48 - tests/runtime/durable-write.test.ts | 110 + tests/runtime/lock-ownership.test.ts | 289 + tests/runtime/run-status.test.ts | 73 +- .../runtime/worktree-removal-manifest.test.ts | 11 +- 25 files changed, 5282 insertions(+), 4504 deletions(-) create mode 100644 src/platform/durable-write.ts create mode 100644 src/platform/lock-ownership.ts create mode 100644 src/platform/platform-safety.ts delete mode 100644 src/runtime/worktree-mutation-gate.ts create mode 100644 tests/runtime/durable-write.test.ts create mode 100644 tests/runtime/lock-ownership.test.ts diff --git a/CONTEXT.md b/CONTEXT.md index 574178e..a8b3cfc 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -86,6 +86,10 @@ The canonical reason a Delegation Attempt did not produce a verified Candidate A An internal adapter used by the Attempt Runtime to enforce the execution policy on a supported operating system. Its defining responsibility is write confinement to the attempt worktree; process-tree supervision alone does not satisfy it. Producer-native confinement may satisfy the policy; otherwise a named, tested operating-system mechanism must. A platform without a proven write-confinement path remains operational for diagnostics but ineligible for the implementation Lane. +### PlatformSafety + +The trusted orchestration layer for repository mutations, lease management, and crash-resilient file persistence. It wraps raw Platform Services checkout locking to enforce ambiguity checks under the lease (`withCheckoutLease`), provides named recovery lease paths (`withRecoveryLease`), and guarantees atomic disk durability and directory identity validation (`writeAtomic`, `DurableDirectorySession`). Higher runtime layers interact through `PlatformSafety` rather than naked platform locks or unguarded writes. + ### Platform Services The operating-system seam for executable resolution, supervised process creation, process-tree cancellation, checkout locking, secure temporary directories, and path canonicalization. P0 has distinct POSIX and native Windows implementations. @@ -302,20 +306,31 @@ Windows Job Object / helper Producer-native sandbox or named backend - Stdout and stderr are always drained to prevent deadlock. Persisted output is bounded and includes explicit truncation facts while process supervision continues draining excess bytes. - Network access follows the Producer Adapter's declared execution requirements. Acceptance Verification runs without network access unless the Delegation Spec explicitly authorizes it. -The Platform Services contract is: +The Platform Services contract encapsulates raw operating system operations: ```ts interface PlatformServices { + os: "darwin" | "linux" | "win32"; resolveExecutable(request: ExecutableRequest): Promise; spawnSupervised(request: SpawnRequest): Promise; requestCooperativeCancellation(process: SupervisedProcess): Promise; terminateProcessTree(process: SupervisedProcess): Promise; - acquireCheckoutLock(checkout: string): Promise; + acquireCheckoutLock(checkout: string, owner?: LockOwnerAnnotation): Promise; createSecureTempDirectory(): Promise; canonicalizePath(path: string): Promise; } ``` +The higher-level `PlatformSafety` contract coordinates repository leases, ambiguity gates, and atomic disk durability: + +```ts +class PlatformSafety { + withCheckoutLease(checkout: string, fn: (lease: CheckoutLock) => Promise, options?: CheckoutLeaseOptions): Promise; + withRecoveryLease(checkout: string, fn: (lease: CheckoutLock) => Promise, options?: CheckoutLeaseOptions): Promise; + writeAtomic(session: DurableDirectorySession, name: string, bytes: Buffer | string, mode: DurableWriteMode): Promise; +} +``` + ### Result And Failure Policy - The Attempt Runtime constructs the canonical Attempt Result from observed process facts, normalized Producer events, Candidate Artifacts, and Acceptance Verification evidence. Producer-authored summaries are untrusted fields. diff --git a/runtime/server.mjs b/runtime/server.mjs index b083d1e..4af0cb0 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -419,11 +419,11 @@ var require_codegen = __commonJS({ const rhs = this.rhs === void 0 ? "" : ` = ${this.rhs}`; return `${varKind} ${this.name}${rhs};` + _n; } - optimizeNames(names, constants13) { + optimizeNames(names, constants15) { if (!names[this.name.str]) return; if (this.rhs) - this.rhs = optimizeExpr(this.rhs, names, constants13); + this.rhs = optimizeExpr(this.rhs, names, constants15); return this; } get names() { @@ -440,10 +440,10 @@ var require_codegen = __commonJS({ render({ _n }) { return `${this.lhs} = ${this.rhs};` + _n; } - optimizeNames(names, constants13) { + optimizeNames(names, constants15) { if (this.lhs instanceof code_1.Name && !names[this.lhs.str] && !this.sideEffects) return; - this.rhs = optimizeExpr(this.rhs, names, constants13); + this.rhs = optimizeExpr(this.rhs, names, constants15); return this; } get names() { @@ -504,8 +504,8 @@ var require_codegen = __commonJS({ optimizeNodes() { return `${this.code}` ? this : void 0; } - optimizeNames(names, constants13) { - this.code = optimizeExpr(this.code, names, constants13); + optimizeNames(names, constants15) { + this.code = optimizeExpr(this.code, names, constants15); return this; } get names() { @@ -534,12 +534,12 @@ var require_codegen = __commonJS({ } return nodes.length > 0 ? this : void 0; } - optimizeNames(names, constants13) { + optimizeNames(names, constants15) { const { nodes } = this; let i = nodes.length; while (i--) { const n = nodes[i]; - if (n.optimizeNames(names, constants13)) + if (n.optimizeNames(names, constants15)) continue; subtractNames(names, n.names); nodes.splice(i, 1); @@ -592,12 +592,12 @@ var require_codegen = __commonJS({ return void 0; return this; } - optimizeNames(names, constants13) { + optimizeNames(names, constants15) { var _a3; - this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants13); - if (!(super.optimizeNames(names, constants13) || this.else)) + this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants15); + if (!(super.optimizeNames(names, constants15) || this.else)) return; - this.condition = optimizeExpr(this.condition, names, constants13); + this.condition = optimizeExpr(this.condition, names, constants15); return this; } get names() { @@ -620,10 +620,10 @@ var require_codegen = __commonJS({ render(opts) { return `for(${this.iteration})` + super.render(opts); } - optimizeNames(names, constants13) { - if (!super.optimizeNames(names, constants13)) + optimizeNames(names, constants15) { + if (!super.optimizeNames(names, constants15)) return; - this.iteration = optimizeExpr(this.iteration, names, constants13); + this.iteration = optimizeExpr(this.iteration, names, constants15); return this; } get names() { @@ -659,10 +659,10 @@ var require_codegen = __commonJS({ render(opts) { return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(opts); } - optimizeNames(names, constants13) { - if (!super.optimizeNames(names, constants13)) + optimizeNames(names, constants15) { + if (!super.optimizeNames(names, constants15)) return; - this.iterable = optimizeExpr(this.iterable, names, constants13); + this.iterable = optimizeExpr(this.iterable, names, constants15); return this; } get names() { @@ -704,11 +704,11 @@ var require_codegen = __commonJS({ (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNodes(); return this; } - optimizeNames(names, constants13) { + optimizeNames(names, constants15) { var _a3, _b; - super.optimizeNames(names, constants13); - (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants13); - (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants13); + super.optimizeNames(names, constants15); + (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants15); + (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants15); return this; } get names() { @@ -1009,7 +1009,7 @@ var require_codegen = __commonJS({ function addExprNames(names, from) { return from instanceof code_1._CodeOrName ? addNames(names, from.names) : names; } - function optimizeExpr(expr, names, constants13) { + function optimizeExpr(expr, names, constants15) { if (expr instanceof code_1.Name) return replaceName(expr); if (!canOptimize(expr)) @@ -1024,14 +1024,14 @@ var require_codegen = __commonJS({ return items; }, [])); function replaceName(n) { - const c = constants13[n.str]; + const c = constants15[n.str]; if (c === void 0 || names[n.str] !== 1) return n; delete names[n.str]; return c; } function canOptimize(e) { - return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants13[c.str] !== void 0); + return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants15[c.str] !== void 0); } } function subtractNames(names, from) { @@ -3238,8 +3238,8 @@ var require_utils = __commonJS({ } return ind; } - function removeDotSegments(path33) { - let input = path33; + function removeDotSegments(path35) { + let input = path35; const output = []; let nextSlash = -1; let len = 0; @@ -3491,8 +3491,8 @@ var require_schemes = __commonJS({ wsComponent.secure = void 0; } if (wsComponent.resourceName) { - const [path33, query] = wsComponent.resourceName.split("?"); - wsComponent.path = path33 && path33 !== "/" ? path33 : void 0; + const [path35, query] = wsComponent.resourceName.split("?"); + wsComponent.path = path35 && path35 !== "/" ? path35 : void 0; wsComponent.query = query; wsComponent.resourceName = void 0; } @@ -8176,8 +8176,8 @@ function getErrorMap() { // node_modules/zod/v3/helpers/parseUtil.js var makeIssue = (params) => { - const { data, path: path33, errorMaps, issueData } = params; - const fullPath = [...path33, ...issueData.path || []]; + const { data, path: path35, errorMaps, issueData } = params; + const fullPath = [...path35, ...issueData.path || []]; const fullIssue = { ...issueData, path: fullPath @@ -8292,11 +8292,11 @@ var errorUtil; // node_modules/zod/v3/types.js var ParseInputLazyPath = class { - constructor(parent, value, path33, key) { + constructor(parent, value, path35, key) { this._cachedPath = []; this.parent = parent; this.data = value; - this._path = path33; + this._path = path35; this._key = key; } get path() { @@ -12216,10 +12216,10 @@ function mergeDefs(...defs) { function cloneDef(schema) { return mergeDefs(schema._zod.def); } -function getElementAtPath(obj, path33) { - if (!path33) +function getElementAtPath(obj, path35) { + if (!path35) return obj; - return path33.reduce((acc, key) => acc?.[key], obj); + return path35.reduce((acc, key) => acc?.[key], obj); } function promiseAllObject(promisesObj) { const keys = Object.keys(promisesObj); @@ -12628,11 +12628,11 @@ function explicitlyAborted(x, startIndex = 0) { } return false; } -function prefixIssues(path33, issues) { +function prefixIssues(path35, issues) { return issues.map((iss) => { var _a3; (_a3 = iss).path ?? (_a3.path = []); - iss.path.unshift(path33); + iss.path.unshift(path35); return iss; }); } @@ -12779,16 +12779,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) { } function formatError(error51, mapper = (issue2) => issue2.message) { const fieldErrors = { _errors: [] }; - const processError = (error52, path33 = []) => { + const processError = (error52, path35 = []) => { for (const issue2 of error52.issues) { if (issue2.code === "invalid_union" && issue2.errors.length) { - issue2.errors.map((issues) => processError({ issues }, [...path33, ...issue2.path])); + issue2.errors.map((issues) => processError({ issues }, [...path35, ...issue2.path])); } else if (issue2.code === "invalid_key") { - processError({ issues: issue2.issues }, [...path33, ...issue2.path]); + processError({ issues: issue2.issues }, [...path35, ...issue2.path]); } else if (issue2.code === "invalid_element") { - processError({ issues: issue2.issues }, [...path33, ...issue2.path]); + processError({ issues: issue2.issues }, [...path35, ...issue2.path]); } else { - const fullpath = [...path33, ...issue2.path]; + const fullpath = [...path35, ...issue2.path]; if (fullpath.length === 0) { fieldErrors._errors.push(mapper(issue2)); } else { @@ -12815,17 +12815,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) { } function treeifyError(error51, mapper = (issue2) => issue2.message) { const result = { errors: [] }; - const processError = (error52, path33 = []) => { + const processError = (error52, path35 = []) => { var _a3, _b; for (const issue2 of error52.issues) { if (issue2.code === "invalid_union" && issue2.errors.length) { - issue2.errors.map((issues) => processError({ issues }, [...path33, ...issue2.path])); + issue2.errors.map((issues) => processError({ issues }, [...path35, ...issue2.path])); } else if (issue2.code === "invalid_key") { - processError({ issues: issue2.issues }, [...path33, ...issue2.path]); + processError({ issues: issue2.issues }, [...path35, ...issue2.path]); } else if (issue2.code === "invalid_element") { - processError({ issues: issue2.issues }, [...path33, ...issue2.path]); + processError({ issues: issue2.issues }, [...path35, ...issue2.path]); } else { - const fullpath = [...path33, ...issue2.path]; + const fullpath = [...path35, ...issue2.path]; if (fullpath.length === 0) { result.errors.push(mapper(issue2)); continue; @@ -12857,8 +12857,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) { } function toDotPath(_path) { const segs = []; - const path33 = _path.map((seg) => typeof seg === "object" ? seg.key : seg); - for (const seg of path33) { + const path35 = _path.map((seg) => typeof seg === "object" ? seg.key : seg); + for (const seg of path35) { if (typeof seg === "number") segs.push(`[${seg}]`); else if (typeof seg === "symbol") @@ -23970,11 +23970,11 @@ function normalizeObjectSchema(schema) { } return void 0; } -function getDotPath(path33) { - if (path33.length === 0) { +function getDotPath(path35) { + if (path35.length === 0) { return "object root"; } - return path33.reduce((acc, seg, index) => { + return path35.reduce((acc, seg, index) => { if (index === 0) { return String(seg); } @@ -25999,13 +25999,13 @@ function resolveRef(ref, ctx) { if (!ref.startsWith("#")) { throw new Error("External $ref is not supported, only local refs (#/...) are allowed"); } - const path33 = ref.slice(1).split("/").filter(Boolean); - if (path33.length === 0) { + const path35 = ref.slice(1).split("/").filter(Boolean); + if (path35.length === 0) { return ctx.rootSchema; } const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions"; - if (path33[0] === defsKey) { - const key = path33[1]; + if (path35[0] === defsKey) { + const key = path35[1]; if (!key || !ctx.defs[key]) { throw new Error(`Reference not found: ${ref}`); } @@ -31903,7 +31903,7 @@ var StdioServerTransport = class { }; // src/mcp/server.ts -import path32 from "node:path"; +import path34 from "node:path"; // src/protocol/versions.ts var PROTOCOL_VERSION = "2.0.0"; @@ -31936,63 +31936,33 @@ function classifyFailure(s) { // src/mcp/doctor.ts import { createHash as createHash5 } from "node:crypto"; -import { constants as constants5 } from "node:fs"; -import { lstat as lstat5, open as open5, readdir as readdir3, realpath as realpath5 } from "node:fs/promises"; -import path13 from "node:path"; -import nodeProcess4 from "node:process"; +import { constants as constants6 } from "node:fs"; +import { lstat as lstat6, open as open6, readdir as readdir4, realpath as realpath5 } from "node:fs/promises"; +import path14 from "node:path"; +import nodeProcess5 from "node:process"; // src/autopilot/workflow-store.ts -import { createHash as createHash3, randomUUID } from "node:crypto"; -import { constants as constants3 } from "node:fs"; +import { createHash as createHash3, randomUUID as randomUUID2 } from "node:crypto"; +import { constants as constants4 } from "node:fs"; import { - lstat as lstat3, - link, + lstat as lstat4, + link as link2, mkdir as mkdir2, - open as open2, - readdir as readdir2, + open as open3, + readdir as readdir3, realpath as realpath2, rename, - rm + rm as rm2 } from "node:fs/promises"; -import path5 from "node:path"; +import path6 from "node:path"; // src/platform/posix-platform-services.ts import { spawn, execFile } from "node:child_process"; import { createHash } from "node:crypto"; -import { constants, promises as fs } from "node:fs"; +import { constants as constants2, promises as fs } from "node:fs"; import { tmpdir as tmpdir2 } from "node:os"; -import path from "node:path"; -import nodeProcess2 from "node:process"; - -// src/runtime/state-dir.ts -import { tmpdir } from "node:os"; -import nodeProcess from "node:process"; - -// src/util/errors.ts -var RuntimeError = class extends Error { - constructor(message, detail) { - super(message); - this.detail = detail; - this.name = "RuntimeError"; - } - detail; -}; -var NestedDelegationError = class extends RuntimeError { - // CLAUDE_ARCHITECT_DELEGATED already set - constructor() { - super("nested delegation denied"); - this.name = "NestedDelegationError"; - } -}; - -// src/runtime/state-dir.ts -function resolveStateDir() { - if (nodeProcess.env.CLAUDE_PLUGIN_DATA) return nodeProcess.env.CLAUDE_PLUGIN_DATA; - if (nodeProcess.env.NODE_ENV === "test") { - return nodeProcess.env.CLAUDE_ARCHITECT_STATE_DIR ?? tmpdir(); - } - throw new RuntimeError("CLAUDE_PLUGIN_DATA is required outside test environments"); -} +import path2 from "node:path"; +import nodeProcess3 from "node:process"; // src/util/bounded-buffer.ts var BoundedBuffer = class { @@ -32023,6 +31993,23 @@ var BoundedBuffer = class { } }; +// src/util/errors.ts +var RuntimeError = class extends Error { + constructor(message, detail) { + super(message); + this.detail = detail; + this.name = "RuntimeError"; + } + detail; +}; +var NestedDelegationError = class extends RuntimeError { + // CLAUDE_ARCHITECT_DELEGATED already set + constructor() { + super("nested delegation denied"); + this.name = "NestedDelegationError"; + } +}; + // src/git/git-output.ts function gitNulRecords(stdout, description) { if (stdout.length === 0) return []; @@ -32054,8 +32041,79 @@ var logger = { error: (m, meta3) => emit("error", m, meta3) }; -// src/platform/lock-owner.ts -function parseLockOwner(contents) { +// src/platform/lock-ownership.ts +import { randomUUID } from "node:crypto"; +import { constants } from "node:fs"; +import { link, lstat, open, readdir, readFile, rm } from "node:fs/promises"; +import path from "node:path"; +import nodeProcess2 from "node:process"; + +// src/runtime/state-dir.ts +import { tmpdir } from "node:os"; +import nodeProcess from "node:process"; +function resolveStateDir() { + if (nodeProcess.env.CLAUDE_PLUGIN_DATA) return nodeProcess.env.CLAUDE_PLUGIN_DATA; + if (nodeProcess.env.NODE_ENV === "test") { + return nodeProcess.env.CLAUDE_ARCHITECT_STATE_DIR ?? tmpdir(); + } + throw new RuntimeError("CLAUDE_PLUGIN_DATA is required outside test environments"); +} + +// src/platform/lock-ownership.ts +var NO_FOLLOW = constants.O_NOFOLLOW ?? 0; +var MAX_STATE_FILE_BYTES = 1e6; +var MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); +var CHECKOUT_LOCK_NAME_PATTERN = /^([0-9a-f]{64})\.lock$/; +var LOCK_RETRY_MS = 30; +var LOCK_TIMEOUT_MS = nodeProcess2.platform === "win32" ? 15e3 : 2500; +var OWNER_PROBE_TIMEOUT_MS = 1e3; +var SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]{0,127}$/; +function isMissing(error51) { + return errorCode(error51) === "ENOENT"; +} +function errorCode(error51) { + return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; +} +function delay(ms) { + return new Promise((resolve2) => setTimeout(resolve2, ms)); +} +function isRecord(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isPlainDirectory(metadata) { + return metadata.isDirectory() && !metadata.isSymbolicLink(); +} +function sameIdentity(left, right) { + return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; +} +async function plainDirectoryIdentity(directoryPath) { + try { + const metadata = await lstat(directoryPath, { bigint: true }); + if (!isPlainDirectory(metadata) || metadata.birthtimeNs <= 0n) return null; + return { dev: metadata.dev, ino: metadata.ino, birthtimeNs: metadata.birthtimeNs }; + } catch (error51) { + if (isMissing(error51)) return null; + throw error51; + } +} +function isCheckoutLockFileName(filename) { + return CHECKOUT_LOCK_NAME_PATTERN.test(filename); +} +function lockFileName(key) { + return `${key}.lock`; +} +function lockFilePath(key, stateDir = resolveStateDir()) { + return path.join(stateDir, "locks", lockFileName(key)); +} +function formatLockRecord(record2) { + return JSON.stringify({ + pid: record2.pid, + processToken: record2.processToken, + acquiredAt: record2.acquiredAt, + ...record2.runId === void 0 ? {} : { runId: record2.runId } + }); +} +function parseLockRecord(contents) { const trimmed = contents.trim(); let value; try { @@ -32063,10 +32121,19 @@ function parseLockOwner(contents) { } catch { return null; } - if (typeof value !== "object" || value === null) return null; - const owner = value; - if (typeof owner.pid !== "number" || !Number.isSafeInteger(owner.pid) || owner.pid <= 1 || typeof owner.processToken !== "string" || owner.processToken.length === 0) return null; - return { pid: owner.pid, processToken: owner.processToken }; + if (!isRecord(value)) return null; + if (typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 1) { + return null; + } + const processToken = typeof value.processToken === "string" && value.processToken.length > 0 ? value.processToken : null; + const acquiredAt = typeof value.acquiredAt === "string" ? value.acquiredAt : (/* @__PURE__ */ new Date(0)).toISOString(); + const runId = typeof value.runId === "string" && SAFE_RUN_ID.test(value.runId) ? value.runId : void 0; + return { pid: value.pid, processToken, acquiredAt, runId }; +} +function parseLockOwner(contents) { + const record2 = parseLockRecord(contents); + if (record2 === null || record2.processToken === null) return null; + return { pid: record2.pid, processToken: record2.processToken }; } async function lockOwnerStatus(owner, isProcessAlive2, getProcessStartToken) { if (owner === null || !isProcessAlive2(owner.pid)) return "dead"; @@ -32075,72 +32142,116 @@ async function lockOwnerStatus(owner, isProcessAlive2, getProcessStartToken) { if (currentToken === null) return "unverifiable"; return currentToken === owner.processToken ? "live" : "dead"; } - -// src/platform/posix-platform-services.ts -var LOCK_RETRY_MS = 30; -var LOCK_TIMEOUT_MS = nodeProcess2.platform === "win32" ? 15e3 : 2500; -var OWNER_PROBE_TIMEOUT_MS = 1e3; -var SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]{0,127}$/; -var CLEANUP_JOURNAL_LOCK_KEY = createHash("sha256").update("claude-architect:cleanup-journal:v1").digest("hex"); -function errorCode(error51) { - return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; -} -function delay(ms) { - return new Promise((resolve2) => setTimeout(resolve2, ms)); +async function readHandleBytes(handle, length) { + const buffer = Buffer.alloc(length); + let bytesRead = 0; + while (bytesRead < length) { + const result = await handle.read(buffer, bytesRead, length - bytesRead, bytesRead); + if (result.bytesRead === 0) break; + bytesRead += result.bytesRead; + } + return bytesRead === length ? buffer : buffer.subarray(0, bytesRead); } -function lockFilePath(key) { - return path.join(resolveStateDir(), "locks", `${key}.lock`); +async function removeLockIfUnchanged(lockPath, handle, expectedIdentity, expectedContents, expectedLinks = 1) { + const beforeMetadata = await handle.stat({ bigint: true }); + if (!beforeMetadata.isFile() || beforeMetadata.isSymbolicLink() || !sameIdentity(beforeMetadata, expectedIdentity) || beforeMetadata.nlink !== BigInt(expectedLinks) || beforeMetadata.size !== BigInt(expectedContents.byteLength)) { + return false; + } + const currentBytes = await readHandleBytes(handle, expectedContents.byteLength); + if (!currentBytes.equals(expectedContents)) return false; + try { + await rm(lockPath, { force: true }); + } catch (error51) { + if (isMissing(error51)) return false; + throw error51; + } + const afterMetadata = await handle.stat({ bigint: true }); + return afterMetadata.nlink === BigInt(expectedLinks - 1); } -async function acquireWxFileLock(key, timeoutMessage, ownerToken = null, owner = {}) { - const lockPath = lockFilePath(key); - await fs.mkdir(path.dirname(lockPath), { recursive: true }); - const deadline = Date.now() + LOCK_TIMEOUT_MS; - for (; ; ) { - try { - const handle = await fs.open(lockPath, "wx"); - const ownerPid = nodeProcess2.pid; - const record2 = { - pid: ownerPid, - processToken: ownerToken, - acquiredAt: (/* @__PURE__ */ new Date()).toISOString(), - ...owner.runId === void 0 ? {} : { runId: owner.runId } - }; - try { - await handle.writeFile(JSON.stringify(record2)); - } finally { - await handle.close(); - } - return { - key, - release: async () => { - let recordedOwner; - try { - recordedOwner = JSON.parse(await fs.readFile(lockPath, "utf8")); - } catch { - return; - } - if (!isRecord(recordedOwner) || recordedOwner.pid !== ownerPid || recordedOwner.processToken !== ownerToken) return; - await fs.rm(lockPath, { force: true }); - } - }; - } catch (error51) { - if (errorCode(error51) !== "EEXIST") throw error51; - if (Date.now() >= deadline) { - throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { key }); - } - await delay(LOCK_RETRY_MS); +async function reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) { + let handle; + try { + handle = await open(lockPath, constants.O_RDONLY | NO_FOLLOW); + } catch (error51) { + if (isMissing(error51)) return "contended"; + throw error51; + } + try { + const metadata = await handle.stat({ bigint: true }); + if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT) { + throw new RuntimeError("recovery lock must be a bounded regular file"); + } + const contents = await readHandleBytes(handle, Number(metadata.size)); + if (BigInt(contents.byteLength) !== metadata.size) return "contended"; + const owner = parseLockOwner(contents.toString("utf8")); + if (owner === null) { + logger.warn("startup recovery preserved malformed lock", { + event: "recovery-malformed-lock", + lockName: path.basename(lockPath), + reason: "invalid-owner-record" + }); + return "malformed"; + } + const ownerStatus2 = await lockOwnerStatus(owner, isProcessAlive2, getProcessStartToken); + if (ownerStatus2 === "live") return "live"; + if (ownerStatus2 === "unverifiable") { + logger.warn("startup recovery preserved unverifiable lock", { + event: "recovery-unverifiable-lock", + lockName: path.basename(lockPath), + reason: "process-token-unavailable" + }); + return "unverifiable"; } + return await removeLockIfUnchanged( + lockPath, + handle, + { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs + }, + contents + ) ? "reclaimed" : "contended"; + } finally { + await handle.close(); } } -function isRecord(value) { - return typeof value === "object" && value !== null && !Array.isArray(value); +async function reclaimDeadCheckoutLocks(locksRoot, isProcessAlive2, getProcessStartToken) { + let entries; + try { + entries = await readdir(locksRoot, { withFileTypes: true }); + } catch (error51) { + if (isMissing(error51)) return; + throw error51; + } + for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { + if (!isCheckoutLockFileName(entry.name)) continue; + const lockPath = path.join(locksRoot, entry.name); + await reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken); + } +} +var reclaimLocks = reclaimDeadCheckoutLocks; +async function lockIsOwnedByLiveProcess(locksRoot, lockKey, isProcessAlive2, getProcessStartToken) { + let contents; + try { + contents = await readFile(path.join(locksRoot, lockFileName(lockKey)), "utf8"); + } catch (error51) { + if (isMissing(error51)) return false; + throw error51; + } + const owner = parseLockOwner(contents); + if (owner === null) return true; + return await lockOwnerStatus(owner, isProcessAlive2, getProcessStartToken) !== "dead"; } -function processIsAlive(pid) { +function defaultIsProcessAlive(pid) { + if (!Number.isSafeInteger(pid) || pid <= 1) return false; try { nodeProcess2.kill(pid, 0); return true; } catch (error51) { - return errorCode(error51) === "EPERM"; + if (errorCode(error51) === "EPERM") return true; + if (errorCode(error51) === "ESRCH") return false; + throw error51; } } function heldFor(acquiredAt) { @@ -32154,10 +32265,25 @@ function heldFor(acquiredAt) { function heldByRun(runId) { return typeof runId === "string" && SAFE_RUN_ID.test(runId) ? `, run ${runId}` : ""; } +function withTimeout(work, ms, fallback) { + return new Promise((resolve2) => { + const timer = setTimeout(() => resolve2(fallback), ms); + void work.then( + (value) => { + clearTimeout(timer); + resolve2(value); + }, + () => { + clearTimeout(timer); + resolve2(fallback); + } + ); + }); +} async function describeLockContention(key, getProcessStartToken) { let contents; try { - contents = await fs.readFile(lockFilePath(key), "utf8"); + contents = await readFile(lockFilePath(key), "utf8"); } catch { return null; } @@ -32165,19 +32291,13 @@ async function describeLockContention(key, getProcessStartToken) { if (owner === null) { return `its owner cannot be identified, and startup recovery preserves a lock it cannot parse, so remove it by hand: ${lockFilePath(key)}`; } - const annotations = (() => { - try { - return JSON.parse(contents.trim()); - } catch { - return {}; - } - })(); - const extras = isRecord(annotations) ? `${heldByRun(annotations.runId)}${heldFor(annotations.acquiredAt)}` : ""; + const annotations = parseLockRecord(contents); + const extras = annotations !== null ? `${heldByRun(annotations.runId)}${heldFor(annotations.acquiredAt)}` : ""; let status; try { status = await lockOwnerStatus( owner, - processIsAlive, + defaultIsProcessAlive, (pid) => withTimeout(getProcessStartToken(pid), OWNER_PROBE_TIMEOUT_MS, null) ); } catch { @@ -32192,21 +32312,6 @@ async function describeLockContention(key, getProcessStartToken) { const self = owner.pid === nodeProcess2.pid ? " (this same process)" : ""; return `it is held by live pid ${owner.pid}${self}${extras}`; } -function withTimeout(work, ms, fallback) { - return new Promise((resolve2) => { - const timer = setTimeout(() => resolve2(fallback), ms); - void work.then( - (value) => { - clearTimeout(timer); - resolve2(value); - }, - () => { - clearTimeout(timer); - resolve2(fallback); - } - ); - }); -} async function withLockContentionDetail(error51, key, getProcessStartToken) { if (!(error51 instanceof RuntimeError)) return error51; let description; @@ -32218,6 +32323,370 @@ async function withLockContentionDetail(error51, key, getProcessStartToken) { if (description === null) return error51; return new RuntimeError(`${error51.message} \u2014 ${description}`, { ...error51.detail, key }); } +async function acquireWxFileLock(key, timeoutMessage, ownerToken = null, owner = {}) { + const targetLockPath = lockFilePath(key); + const locksDir = path.dirname(targetLockPath); + const { mkdir: mkdir10 } = await import("node:fs/promises"); + await mkdir10(locksDir, { recursive: true }); + const deadline = Date.now() + LOCK_TIMEOUT_MS; + for (; ; ) { + try { + const handle = await open(targetLockPath, "wx"); + const ownerPid = nodeProcess2.pid; + const record2 = { + pid: ownerPid, + processToken: ownerToken, + acquiredAt: (/* @__PURE__ */ new Date()).toISOString(), + ...owner.runId === void 0 ? {} : { runId: owner.runId } + }; + try { + await handle.writeFile(formatLockRecord(record2)); + } finally { + await handle.close(); + } + return { + key, + release: async () => { + let recordedOwner; + try { + recordedOwner = parseLockRecord(await readFile(targetLockPath, "utf8")); + } catch { + return; + } + if (recordedOwner === null || recordedOwner.pid !== ownerPid || recordedOwner.processToken !== ownerToken) { + return; + } + await rm(targetLockPath, { force: true }); + } + }; + } catch (error51) { + if (errorCode(error51) !== "EEXIST") throw error51; + if (Date.now() >= deadline) { + throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { key }); + } + await delay(LOCK_RETRY_MS); + } + } +} +async function validateLockParentIdentity(parentPath, expectedIdentity) { + const metadata = await lstat(parentPath, { bigint: true }); + if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expectedIdentity)) { + throw new RuntimeError("recovery lock parent identity changed"); + } +} +function isExpectedLockMetadata(metadata, expectedIdentity, expectedSize, expectedLinks) { + return metadata.isFile() && !metadata.isSymbolicLink() && metadata.nlink === BigInt(expectedLinks) && sameIdentity(metadata, expectedIdentity) && metadata.size === BigInt(expectedSize) && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; +} +async function validateOwnedLockState(handle, namedPaths, expectedIdentity, expectedContents, expectedLinks, parentPath, parentIdentity) { + const validateHandle = async () => { + const metadata = await handle.stat({ bigint: true }); + if (!isExpectedLockMetadata( + metadata, + expectedIdentity, + expectedContents.byteLength, + expectedLinks + ) || !(await readHandleBytes(handle, Number(metadata.size))).equals(expectedContents)) { + throw new RuntimeError("recovery lock handle or contents changed"); + } + }; + await validateLockParentIdentity(parentPath, parentIdentity); + await validateHandle(); + for (const namedPath of namedPaths) { + const metadata = await lstat(namedPath, { bigint: true }); + if (!isExpectedLockMetadata( + metadata, + expectedIdentity, + expectedContents.byteLength, + expectedLinks + )) throw new RuntimeError("recovery lock path changed"); + } + await validateHandle(); + await validateLockParentIdentity(parentPath, parentIdentity); +} +async function removeExpectedLockPath(filename, expectedIdentity, expectedContents, expectedLinks) { + let handle; + try { + handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); + } catch (error51) { + if (isMissing(error51)) return "absent"; + throw error51; + } + let primaryError; + let removed = false; + try { + removed = await removeLockIfUnchanged( + filename, + handle, + expectedIdentity, + expectedContents, + expectedLinks + ); + } catch (error51) { + primaryError = error51; + } + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== void 0) { + throw new AggregateError( + [primaryError, closeError], + "recovery lock cleanup failed and its handle could not be closed" + ); + } + throw closeError; + } + if (primaryError !== void 0) throw primaryError; + return removed ? "removed" : "changed"; +} +async function pathNamesLockIdentity(filename, expectedIdentity) { + try { + const metadata = await lstat(filename, { bigint: true }); + return metadata.isFile() && !metadata.isSymbolicLink() && sameIdentity(metadata, expectedIdentity); + } catch (error51) { + if (isMissing(error51)) return false; + throw error51; + } +} +async function validatePublishedLock(lockPath, expectedIdentity, expectedContents, parentPath, parentIdentity, expectedLinks = 1, namedPaths = [lockPath]) { + const handle = await open(lockPath, constants.O_RDONLY | NO_FOLLOW); + let primaryError; + try { + await validateOwnedLockState( + handle, + namedPaths, + expectedIdentity, + expectedContents, + expectedLinks, + parentPath, + parentIdentity + ); + } catch (error51) { + primaryError = error51; + } + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== void 0) { + throw new AggregateError( + [primaryError, closeError], + "published recovery lock validation failed and its handle could not be closed" + ); + } + throw closeError; + } + if (primaryError !== void 0) throw primaryError; +} +function throwLockAcquisitionErrors(errors) { + if (errors.length === 1) throw errors[0]; + throw new AggregateError(errors, "recovery lock acquisition and safe cleanup failed"); +} +async function cleanupOwnedLockPaths(parentPath, parentIdentity, temporaryPath, lockPath, expectedIdentity, expectedContents, published) { + const errors = []; + try { + await validateLockParentIdentity(parentPath, parentIdentity); + } catch (error51) { + return [error51]; + } + if (published) { + try { + const temporaryExists = await pathNamesLockIdentity(temporaryPath, expectedIdentity); + const result = await removeExpectedLockPath( + lockPath, + expectedIdentity, + expectedContents, + temporaryExists ? 2 : 1 + ); + if (result === "changed") { + errors.push(new RuntimeError("published recovery lock changed before safe cleanup")); + } + } catch (error51) { + errors.push(error51); + } + } + try { + const result = await removeExpectedLockPath( + temporaryPath, + expectedIdentity, + expectedContents, + 1 + ); + if (result === "changed") { + errors.push(new RuntimeError("temporary recovery lock changed before safe cleanup")); + } + } catch (error51) { + errors.push(error51); + } + try { + await validateLockParentIdentity(parentPath, parentIdentity); + } catch (error51) { + errors.push(error51); + } + return errors; +} +async function createOwnedLock(lockPath, contents) { + if (contents.byteLength > MAX_STATE_FILE_BYTES) { + throw new RuntimeError("new recovery lock exceeds its size limit"); + } + const parentPath = path.dirname(lockPath); + const parentIdentity = await plainDirectoryIdentity(parentPath); + if (parentIdentity === null) { + throw new RuntimeError("recovery lock parent must remain a plain directory"); + } + const temporaryPath = path.join(parentPath, `.recovery-lock-${randomUUID()}.tmp`); + let handle; + let temporaryIdentity; + let temporaryCreated = false; + let published = false; + let contended = false; + const errors = []; + try { + handle = await open( + temporaryPath, + constants.O_RDWR | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, + 384 + ); + temporaryCreated = true; + const metadata = await handle.stat({ bigint: true }); + temporaryIdentity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs + }; + await handle.writeFile(contents); + await handle.sync(); + await validateOwnedLockState( + handle, + [temporaryPath], + temporaryIdentity, + contents, + 1, + parentPath, + parentIdentity + ); + try { + await link(temporaryPath, lockPath); + published = true; + } catch (error51) { + if (errorCode(error51) === "EEXIST") contended = true; + else throw error51; + } + if (published) { + await validateOwnedLockState( + handle, + [temporaryPath, lockPath], + temporaryIdentity, + contents, + 2, + parentPath, + parentIdentity + ); + } + } catch (error51) { + errors.push(error51); + } + if (handle !== void 0) { + try { + await handle.close(); + } catch (error51) { + errors.push(error51); + } + } + if (temporaryCreated && temporaryIdentity === void 0) { + errors.push(new RuntimeError("temporary recovery lock identity is unavailable for cleanup")); + } + if (temporaryIdentity === void 0) throwLockAcquisitionErrors(errors); + if (contended) { + errors.push(...await cleanupOwnedLockPaths( + parentPath, + parentIdentity, + temporaryPath, + lockPath, + temporaryIdentity, + contents, + false + )); + if (errors.length === 0) return null; + throwLockAcquisitionErrors(errors); + } + if (!published) { + if (temporaryCreated) { + errors.push(...await cleanupOwnedLockPaths( + parentPath, + parentIdentity, + temporaryPath, + lockPath, + temporaryIdentity, + contents, + false + )); + } + throwLockAcquisitionErrors(errors); + } + if (errors.length === 0) { + try { + await validateLockParentIdentity(parentPath, parentIdentity); + const result = await removeExpectedLockPath( + temporaryPath, + temporaryIdentity, + contents, + 2 + ); + if (result === "changed") { + throw new RuntimeError("temporary recovery lock changed before unlink"); + } + await validatePublishedLock( + lockPath, + temporaryIdentity, + contents, + parentPath, + parentIdentity + ); + } catch (error51) { + errors.push(error51); + } + } + if (errors.length === 0) { + return { lockPath, identity: temporaryIdentity, contents }; + } + errors.push(...await cleanupOwnedLockPaths( + parentPath, + parentIdentity, + temporaryPath, + lockPath, + temporaryIdentity, + contents, + true + )); + throwLockAcquisitionErrors(errors); +} +async function acquireOwnedLock(lockPath, contents, isProcessAlive2 = defaultIsProcessAlive, getProcessStartToken = async () => null) { + const created = await createOwnedLock(lockPath, contents); + if (created !== null) return created; + if (await reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) !== "reclaimed") { + return null; + } + return createOwnedLock(lockPath, contents); +} +async function releaseOwnedLock(lock) { + let handle; + try { + handle = await open(lock.lockPath, constants.O_RDONLY | NO_FOLLOW); + } catch (error51) { + if (isMissing(error51)) return; + throw error51; + } + try { + await removeLockIfUnchanged(lock.lockPath, handle, lock.identity, lock.contents); + } finally { + await handle.close(); + } +} + +// src/platform/posix-platform-services.ts +var CLEANUP_JOURNAL_LOCK_KEY = createHash("sha256").update("claude-architect:cleanup-journal:v1").digest("hex"); +function errorCode2(error51) { + return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; +} async function gitCommonDir(cwd) { return new Promise((resolve2, reject) => { execFile("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd }, (error51, stdout) => { @@ -32238,17 +32707,17 @@ function killProcessGroup(pid, signal) { return; } try { - nodeProcess2.kill(-pid, signal); + nodeProcess3.kill(-pid, signal); } catch (error51) { - if (errorCode(error51) !== "ESRCH") throw error51; + if (errorCode2(error51) !== "ESRCH") throw error51; } } var PosixPlatformServices = class { - os = nodeProcess2.platform === "darwin" ? "darwin" : "linux"; + os = nodeProcess3.platform === "darwin" ? "darwin" : "linux"; async resolveExecutable(request) { if (request.explicitPath !== void 0) { try { - await fs.access(request.explicitPath, constants.X_OK); + await fs.access(request.explicitPath, constants2.X_OK); } catch (cause) { throw new RuntimeError(`executable is not accessible: ${request.explicitPath}`, { cause }); } @@ -32259,10 +32728,10 @@ var PosixPlatformServices = class { resolvedFrom: `explicit:${request.explicitPath}` }; } - for (const directory of (request.searchPath ?? nodeProcess2.env.PATH ?? "").split(path.delimiter)) { - const candidate = path.join(directory, request.name); + for (const directory of (request.searchPath ?? nodeProcess3.env.PATH ?? "").split(path2.delimiter)) { + const candidate = path2.join(directory, request.name); try { - await fs.access(candidate, constants.X_OK); + await fs.access(candidate, constants2.X_OK); return { kind: "native", command: candidate, prefixArgs: [], resolvedFrom: `path:${candidate}` }; } catch { } @@ -32323,7 +32792,7 @@ var PosixPlatformServices = class { } async getProcessStartToken(pid) { if (!Number.isSafeInteger(pid) || pid <= 1) return null; - if (nodeProcess2.platform === "linux") { + if (nodeProcess3.platform === "linux") { try { const stat = await fs.readFile(`/proc/${pid}/stat`, "utf8"); const afterComm = stat.slice(stat.lastIndexOf(")") + 2).split(" "); @@ -32358,7 +32827,7 @@ var PosixPlatformServices = class { } const repositoryIdentity = commonDir; const key = createHash("sha256").update(repositoryIdentity).digest("hex"); - const ownerToken = await this.getProcessStartToken(nodeProcess2.pid); + const ownerToken = await this.getProcessStartToken(nodeProcess3.pid); let lock; try { lock = await acquireWxFileLock(key, `checkout is locked: ${checkout}`, ownerToken, owner); @@ -32372,15 +32841,15 @@ var PosixPlatformServices = class { return { ...lock, repositoryIdentity }; } async acquireCleanupJournalLock() { - const ownerToken = await this.getProcessStartToken(nodeProcess2.pid); + const ownerToken = await this.getProcessStartToken(nodeProcess3.pid); return acquireWxFileLock(CLEANUP_JOURNAL_LOCK_KEY, "cleanup journal is locked", ownerToken); } async createSecureTempDirectory() { - return fs.mkdtemp(path.join(tmpdir2(), "claude-architect-")); + return fs.mkdtemp(path2.join(tmpdir2(), "claude-architect-")); } async assertDirectoryWriteIntegrity(directory, expectedIdentity) { const metadata = await fs.lstat(directory, { bigint: true }); - const uid = nodeProcess2.getuid?.(); + const uid = nodeProcess3.getuid?.(); if (!metadata.isDirectory() || metadata.isSymbolicLink() || metadata.dev !== expectedIdentity.dev || metadata.ino !== expectedIdentity.ino || metadata.birthtimeNs <= 0n || metadata.birthtimeNs !== expectedIdentity.birthtimeNs || uid === void 0 || metadata.uid !== BigInt(uid) || (metadata.mode & 0o022n) !== 0n) { throw new RuntimeError("directory lacks stable write integrity"); } @@ -32402,8 +32871,8 @@ import { execFile as execFile2, spawn as spawn2 } from "node:child_process"; import { createHash as createHash2 } from "node:crypto"; import { promises as fs2 } from "node:fs"; import { tmpdir as tmpdir3 } from "node:os"; -import path4 from "node:path"; -import nodeProcess3 from "node:process"; +import path5 from "node:path"; +import nodeProcess4 from "node:process"; import { fileURLToPath as fileURLToPath2 } from "node:url"; // src/platform/windows-env.ts @@ -32425,9 +32894,9 @@ function windowsEssentialEnvironment(env = process.env) { } // src/platform/durable-directory.ts -import { constants as constants2 } from "node:fs"; -import { lstat as lstat2, mkdir, open, readdir } from "node:fs/promises"; -import path3 from "node:path"; +import { constants as constants3 } from "node:fs"; +import { lstat as lstat3, mkdir, open as open2, readdir as readdir2 } from "node:fs/promises"; +import path4 from "node:path"; // src/protocol/delegation-spec.ts var DEFAULT_REVIEW_CONFIG = { @@ -32502,19 +32971,19 @@ async function supervise(ps, req, opts) { } // src/platform/windows-filesystem-helper.ts -import { access, lstat, realpath } from "node:fs/promises"; -import path2 from "node:path"; +import { access, lstat as lstat2, realpath } from "node:fs/promises"; +import path3 from "node:path"; import { fileURLToPath } from "node:url"; async function pluginRoot() { - let directory = path2.dirname(fileURLToPath(import.meta.url)); + let directory = path3.dirname(fileURLToPath(import.meta.url)); for (; ; ) { try { - const packagePath = path2.join(directory, "package.json"); - const metadata = await lstat(packagePath); + const packagePath = path3.join(directory, "package.json"); + const metadata = await lstat2(packagePath); if (metadata.isFile() && !metadata.isSymbolicLink()) return directory; } catch { } - const parent = path2.dirname(directory); + const parent = path3.dirname(directory); if (parent === directory) { throw new RuntimeError("unable to locate plugin root for Windows filesystem helper", { classification: "cleanup-backend-unavailable", @@ -32532,12 +33001,12 @@ async function resolveWindowsFilesystemHelper(arch = process.arch) { }); } const root = await pluginRoot(); - const expected = path2.join(root, "native", "bin", `win32-filesystem-${arch}.exe`); + const expected = path3.join(root, "native", "bin", `win32-filesystem-${arch}.exe`); let canonical; try { await access(expected); canonical = await realpath(expected); - const metadata = await lstat(canonical); + const metadata = await lstat2(canonical); if (!metadata.isFile() || metadata.isSymbolicLink()) { throw new RuntimeError("Windows filesystem helper is not a stable regular file"); } @@ -32548,7 +33017,7 @@ async function resolveWindowsFilesystemHelper(arch = process.arch) { cause: error51 }); } - if (path2.win32.normalize(canonical).toLowerCase() !== path2.win32.normalize(expected).toLowerCase()) { + if (path3.win32.normalize(canonical).toLowerCase() !== path3.win32.normalize(expected).toLowerCase()) { throw new RuntimeError("Windows filesystem helper escaped the plugin package", { classification: "cleanup-backend-unavailable", toolError: "cleanup-backend-unavailable" @@ -32577,12 +33046,12 @@ async function assertWindowsDirectoryAcl(command, directory, expectedIdentity, p executable: helper, args: [ command, - path3.toNamespacedPath(directory), + path4.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString() ], - cwd: path3.dirname(directory), + cwd: path4.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: WINDOWS_DIRECTORY_SYNC_TIMEOUT_MS, maxOutputBytes: 16384 @@ -32624,10 +33093,10 @@ async function ensurePrivateDirectory(directory, options) { await mkdir(directory, { mode: 448 }); created = true; } catch (error51) { - if (errorCode2(error51) !== "EEXIST") throw error51; + if (errorCode3(error51) !== "EEXIST") throw error51; } } - const metadata = await lstat2(directory, { bigint: true }); + const metadata = await lstat3(directory, { bigint: true }); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { throw new RuntimeError(`${options.description} must be a plain directory`); } @@ -32653,9 +33122,9 @@ async function ensurePrivateDirectory(directory, options) { if (options.migratePermissions !== true) { throw new RuntimeError(`${options.description} is not private`); } - const handle = await open( + const handle = await open2( directory, - constants2.O_RDONLY | (constants2.O_NOFOLLOW ?? 0) + constants3.O_RDONLY | (constants3.O_NOFOLLOW ?? 0) ); let primaryError; try { @@ -32689,14 +33158,14 @@ async function ensurePrivateDirectory(directory, options) { await syncDirectory4(directory); } } - if (created) await syncDirectory4(path3.dirname(directory)); - const settled = await lstat2(directory, { bigint: true }); + if (created) await syncDirectory4(path4.dirname(directory)); + const settled = await lstat3(directory, { bigint: true }); if (!settled.isDirectory() || settled.isSymbolicLink() || settled.dev !== identity.dev || settled.ino !== identity.ino || settled.birthtimeNs !== identity.birthtimeNs) { throw new RuntimeError(`${options.description} identity changed during privacy validation`); } return identity; } -function errorCode2(error51) { +function errorCode3(error51) { return error51.code; } async function closeDirectoryHandle(handle, primaryError) { @@ -32718,12 +33187,12 @@ async function syncWindowsDirectoryMetadata(directory, expectedIdentity, platfor executable: helper, args: [ "sync-directory", - path3.toNamespacedPath(directory), + path4.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString() ], - cwd: path3.dirname(directory), + cwd: path4.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: WINDOWS_DIRECTORY_SYNC_TIMEOUT_MS, maxOutputBytes: 16384 @@ -32736,8 +33205,8 @@ async function syncWindowsDirectoryMetadata(directory, expectedIdentity, platfor } async function syncDirectoryMetadata(directory, dependencies = {}) { const platform = dependencies.platform ?? process.platform; - const openDirectory = dependencies.open ?? open; - const inspectPath = dependencies.lstat ?? lstat2; + const openDirectory = dependencies.open ?? open2; + const inspectPath = dependencies.lstat ?? lstat3; const initial = await inspectPath(directory, { bigint: true }); if (!initial.isDirectory() || initial.isSymbolicLink() || initial.birthtimeNs <= 0n) { throw new RuntimeError("directory sync target lacks stable plain-directory identity"); @@ -32751,14 +33220,14 @@ async function syncDirectoryMetadata(directory, dependencies = {}) { let primaryError; let windowsFallbackRequired = false; try { - handle = await openDirectory(directory, constants2.O_RDONLY | (constants2.O_NOFOLLOW ?? 0)); + handle = await openDirectory(directory, constants3.O_RDONLY | (constants3.O_NOFOLLOW ?? 0)); const opened = await handle.stat({ bigint: true }); if (!opened.isDirectory() || opened.dev !== expectedIdentity.dev || opened.ino !== expectedIdentity.ino || opened.birthtimeNs !== expectedIdentity.birthtimeNs) { throw new RuntimeError("directory sync target identity changed before flush"); } await handle.sync(); } catch (error51) { - if (platform === "win32" && WINDOWS_UNSUPPORTED_DIRECTORY_CODES.has(errorCode2(error51) ?? "")) { + if (platform === "win32" && WINDOWS_UNSUPPORTED_DIRECTORY_CODES.has(errorCode3(error51) ?? "")) { windowsFallbackRequired = true; } else { primaryError = error51; @@ -32783,13 +33252,13 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { const syncDirectory4 = options.syncDirectory ?? syncDirectoryMetadata; let observedEntries = 0; const syncFile = async (filename) => { - const initial = await lstat2(filename, { bigint: true }); + const initial = await lstat3(filename, { bigint: true }); if (!initial.isFile() || initial.isSymbolicLink() || initial.birthtimeNs <= 0n) { throw new RuntimeError("durable directory tree contains a non-regular file"); } - const handle = await open( + const handle = await open2( filename, - constants2.O_RDWR | (constants2.O_NOFOLLOW ?? 0) + constants3.O_RDWR | (constants3.O_NOFOLLOW ?? 0) ); let primaryError; try { @@ -32817,24 +33286,24 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { throw closeError; } if (primaryError !== void 0) throw primaryError; - const settledPath = await lstat2(filename, { bigint: true }); + const settledPath = await lstat3(filename, { bigint: true }); if (!settledPath.isFile() || settledPath.isSymbolicLink() || settledPath.dev !== initial.dev || settledPath.ino !== initial.ino || settledPath.birthtimeNs !== initial.birthtimeNs || settledPath.size !== initial.size || settledPath.mtimeNs !== initial.mtimeNs) { throw new RuntimeError("durable file identity changed after flush"); } }; const visit = async (current, depth) => { if (depth > maxDepth) throw new RuntimeError("durable directory tree exceeds depth limit"); - const initial = await lstat2(current, { bigint: true }); + const initial = await lstat3(current, { bigint: true }); if (!initial.isDirectory() || initial.isSymbolicLink() || initial.birthtimeNs <= 0n) { throw new RuntimeError("durable directory tree contains an invalid directory"); } - const entries = await readdir(current, { withFileTypes: true }); + const entries = await readdir2(current, { withFileTypes: true }); observedEntries += entries.length; if (observedEntries > maxEntries) { throw new RuntimeError("durable directory tree exceeds entry limit"); } for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const entryPath = path3.join(current, entry.name); + const entryPath = path4.join(current, entry.name); if (entry.isDirectory() && !entry.isSymbolicLink()) { await visit(entryPath, depth + 1); } else if (entry.isFile() && !entry.isSymbolicLink()) { @@ -32844,7 +33313,7 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { } } await syncDirectory4(current); - const settled = await lstat2(current, { bigint: true }); + const settled = await lstat3(current, { bigint: true }); if (!settled.isDirectory() || settled.isSymbolicLink() || settled.dev !== initial.dev || settled.ino !== initial.ino || settled.birthtimeNs !== initial.birthtimeNs) { throw new RuntimeError("durable directory identity changed during tree flush"); } @@ -32855,7 +33324,7 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { // src/platform/windows-platform-services.ts var childHandles = /* @__PURE__ */ new WeakMap(); function resolveJobKillHelper(pluginRoot2, arch) { - const helperPath = path4.join(pluginRoot2, "native", "bin", `win32-job-kill-${arch}.exe`); + const helperPath = path5.join(pluginRoot2, "native", "bin", `win32-job-kill-${arch}.exe`); return { path: helperPath, async checkAvailable() { @@ -32869,33 +33338,33 @@ function resolveJobKillHelper(pluginRoot2, arch) { }; } async function findPluginRoot() { - let directory = path4.dirname(fileURLToPath2(import.meta.url)); + let directory = path5.dirname(fileURLToPath2(import.meta.url)); for (; ; ) { try { - await fs2.access(path4.join(directory, "package.json")); + await fs2.access(path5.join(directory, "package.json")); return directory; } catch { } - const parent = path4.dirname(directory); + const parent = path5.dirname(directory); if (parent === directory) throw new RuntimeError("unable to locate plugin root"); directory = parent; } } async function packageBinEntries(request, directory, fileSystem) { - const packageDirectory = path4.win32.join(directory, "node_modules", request.name); - const packagePath = path4.win32.join(packageDirectory, "package.json"); + const packageDirectory = path5.win32.join(directory, "node_modules", request.name); + const packagePath = path5.win32.join(packageDirectory, "package.json"); if (!await fileSystem.isFile(packagePath.toLowerCase())) return []; try { const parsed = JSON.parse(await fileSystem.readFile(packagePath)); if (typeof parsed !== "object" || parsed === null || !("bin" in parsed)) return []; const bin = parsed.bin; if (typeof bin === "string") { - return [path4.win32.relative(directory, path4.win32.join(packageDirectory, bin))]; + return [path5.win32.relative(directory, path5.win32.join(packageDirectory, bin))]; } if (typeof bin !== "object" || bin === null) return []; const namedBin = bin[request.name]; if (typeof namedBin === "string") { - return [path4.win32.relative(directory, path4.win32.join(packageDirectory, namedBin))]; + return [path5.win32.relative(directory, path5.win32.join(packageDirectory, namedBin))]; } } catch { return []; @@ -32918,7 +33387,7 @@ async function resolveWindowsExecutable(request, deps) { } for (const directory of deps.pathEntries) { for (const extension of deps.pathext) { - const candidate = path4.win32.join(directory, `${request.name}${extension.toLowerCase()}`); + const candidate = path5.win32.join(directory, `${request.name}${extension.toLowerCase()}`); if (!await deps.fs.isFile(candidate.toLowerCase())) continue; const normalizedExtension = extension.toLowerCase(); if (normalizedExtension === ".exe" || normalizedExtension === ".com") { @@ -32932,7 +33401,7 @@ async function resolveWindowsExecutable(request, deps) { if (normalizedExtension === ".cmd" || normalizedExtension === ".bat") { const entries = deps.npmEntryProbe ?? await packageBinEntries(request, directory, deps.fs); for (const entry of entries) { - const absoluteEntry = path4.win32.join(directory, entry); + const absoluteEntry = path5.win32.join(directory, entry); if (await deps.fs.isFile(absoluteEntry.toLowerCase())) { return { kind: "node-entrypoint", @@ -32977,16 +33446,16 @@ function canonicalizeForScope(candidate, root) { (match) => match.toUpperCase() ); const normalizedCandidate = normalizeVolume( - path4.win32.normalize(stripExtendedLengthPrefix(candidate)) + path5.win32.normalize(stripExtendedLengthPrefix(candidate)) ); - let normalizedRoot = normalizeVolume(path4.win32.normalize(stripExtendedLengthPrefix(root))); - if (normalizedRoot.endsWith("\\") && path4.win32.parse(normalizedRoot).root !== normalizedRoot) { + let normalizedRoot = normalizeVolume(path5.win32.normalize(stripExtendedLengthPrefix(root))); + if (normalizedRoot.endsWith("\\") && path5.win32.parse(normalizedRoot).root !== normalizedRoot) { normalizedRoot = normalizedRoot.slice(0, -1); } return normalizedCandidate === normalizedRoot || normalizedCandidate.startsWith(`${normalizedRoot}\\`); } var WindowsPlatformServices = class { - constructor(pluginRoot2, arch = nodeProcess3.arch, tokenExecFile = execFile2) { + constructor(pluginRoot2, arch = nodeProcess4.arch, tokenExecFile = execFile2) { this.pluginRoot = pluginRoot2; this.arch = arch; this.tokenExecFile = tokenExecFile; @@ -33017,8 +33486,8 @@ var WindowsPlatformServices = class { }); } async resolveExecutable(request) { - const pathext = (nodeProcess3.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean).map((extension) => extension.toUpperCase()); - const pathEntries = (request.searchPath ?? nodeProcess3.env.Path ?? nodeProcess3.env.PATH ?? "").split(";").filter(Boolean); + const pathext = (nodeProcess4.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean).map((extension) => extension.toUpperCase()); + const pathEntries = (request.searchPath ?? nodeProcess4.env.Path ?? nodeProcess4.env.PATH ?? "").split(";").filter(Boolean); const realFs = { async isFile(candidate) { try { @@ -33031,8 +33500,8 @@ var WindowsPlatformServices = class { return fs2.readFile(candidate, "utf8"); } }; - const commonDeps = { pathEntries, pathext, fs: realFs, nodeExe: nodeProcess3.execPath }; - return nodeProcess3.env.ComSpec === void 0 ? resolveWindowsExecutable(request, commonDeps) : resolveWindowsExecutable(request, { ...commonDeps, comSpec: nodeProcess3.env.ComSpec }); + const commonDeps = { pathEntries, pathext, fs: realFs, nodeExe: nodeProcess4.execPath }; + return nodeProcess4.env.ComSpec === void 0 ? resolveWindowsExecutable(request, commonDeps) : resolveWindowsExecutable(request, { ...commonDeps, comSpec: nodeProcess4.env.ComSpec }); } async spawnSupervised(req) { const helper = await this.jobKillHelper(); @@ -33100,7 +33569,7 @@ var WindowsPlatformServices = class { } async getProcessStartToken(pid) { if (!Number.isSafeInteger(pid) || pid <= 1) return null; - if (pid === nodeProcess3.pid && this.ownProcessStartToken !== void 0) { + if (pid === nodeProcess4.pid && this.ownProcessStartToken !== void 0) { return this.ownProcessStartToken; } try { @@ -33128,7 +33597,7 @@ var WindowsPlatformServices = class { } }); if (nativeToken !== void 0) { - if (pid === nodeProcess3.pid && nativeToken !== null) this.ownProcessStartToken = nativeToken; + if (pid === nodeProcess4.pid && nativeToken !== null) this.ownProcessStartToken = nativeToken; return nativeToken; } } @@ -33150,7 +33619,7 @@ var WindowsPlatformServices = class { } const repositoryIdentity = commonDir; const key = createHash2("sha256").update(repositoryIdentity).digest("hex"); - const ownerToken = await this.getProcessStartToken(nodeProcess3.pid); + const ownerToken = await this.getProcessStartToken(nodeProcess4.pid); let lock; try { lock = await acquireWxFileLock(key, `checkout is locked: ${checkout}`, ownerToken, owner); @@ -33164,11 +33633,11 @@ var WindowsPlatformServices = class { return { ...lock, repositoryIdentity }; } async acquireCleanupJournalLock() { - const ownerToken = await this.getProcessStartToken(nodeProcess3.pid); + const ownerToken = await this.getProcessStartToken(nodeProcess4.pid); return acquireWxFileLock(CLEANUP_JOURNAL_LOCK_KEY, "cleanup journal is locked", ownerToken); } async createSecureTempDirectory() { - return fs2.mkdtemp(path4.join(tmpdir3(), "claude-architect-")); + return fs2.mkdtemp(path5.join(tmpdir3(), "claude-architect-")); } async assertDirectoryWriteIntegrity(directory, expectedIdentity) { await assertWindowsDirectoryWriteIntegrity(directory, expectedIdentity, this); @@ -34503,7 +34972,7 @@ function checkVersionCompat(skillProtocolVersion) { } // src/autopilot/workflow-store.ts -var NO_FOLLOW = constants3.O_NOFOLLOW ?? 0; +var NO_FOLLOW2 = constants4.O_NOFOLLOW ?? 0; var MAX_WRITER_LOCK_BYTES = 512; var MAX_WORKFLOW_OWNER_BYTES = 1024; var MAX_WORKFLOW_STATE_BYTES = 1e6; @@ -34548,13 +35017,13 @@ var LEGAL_WORKFLOW_PHASE_EDGES = Object.freeze({ function workflowError(message, toolError) { return new RuntimeError(message, { toolError }); } -function errorCode3(error51) { +function errorCode4(error51) { return error51.code; } -function isMissing(error51) { - return errorCode3(error51) === "ENOENT"; +function isMissing2(error51) { + return errorCode4(error51) === "ENOENT"; } -function isPlainDirectory(metadata) { +function isPlainDirectory2(metadata) { return metadata.isDirectory() && !metadata.isSymbolicLink(); } function isProcessAlive(pid) { @@ -34562,7 +35031,7 @@ function isProcessAlive(pid) { process.kill(pid, 0); return true; } catch (error51) { - return errorCode3(error51) !== "ESRCH"; + return errorCode4(error51) !== "ESRCH"; } } async function isWriterAlive(record2) { @@ -34602,12 +35071,12 @@ async function workflowOwnerStatus(record2, processAlive, getProcessStartToken) if (currentToken === null) return "unverifiable"; return currentToken === record2.processToken ? "live" : "dead"; } -function sameIdentity(metadata, identity) { +function sameIdentity2(metadata, identity) { return metadata.dev === identity.dev && metadata.ino === identity.ino; } async function inspectPlainDirectory(directory) { - const metadata = await lstat3(directory); - if (!isPlainDirectory(metadata)) { + const metadata = await lstat4(directory); + if (!isPlainDirectory2(metadata)) { throw workflowError( "workflow state directory must be a plain directory", "unsafe-workflow-state" @@ -34621,26 +35090,26 @@ async function inspectPlainDirectory(directory) { } async function assertDirectoryIdentity(directory, expected) { const [metadata, canonicalPath] = await Promise.all([ - lstat3(directory), + lstat4(directory), realpath2(directory) ]); - if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expected) || canonicalPath !== expected.canonicalPath) { + if (!isPlainDirectory2(metadata) || !sameIdentity2(metadata, expected) || canonicalPath !== expected.canonicalPath) { throw workflowError("workflow state directory identity changed", "unsafe-workflow-state"); } } async function syncDirectory(directory) { let handle; try { - handle = await open2(directory, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(directory, constants4.O_RDONLY | NO_FOLLOW2); await handle.sync(); } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode3(error51) ?? ""); + const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode4(error51) ?? ""); if (!unsupportedOnWindows) throw error51; } finally { await handle?.close(); } } -async function readHandleBytes(handle, size) { +async function readHandleBytes2(handle, size) { const bytes = Buffer.alloc(size); let offset = 0; while (offset < size) { @@ -34903,13 +35372,13 @@ var WorkflowStore = class { constructor(workflowId, options = {}) { assertWorkflowId(workflowId); this.workflowId = workflowId; - this.stateRoot = path5.resolve(options.stateDirectory ?? resolveStateDir()); - this.workflowsDirectory = path5.join(this.stateRoot, "workflows"); - this.workflowDirectory = path5.join(this.workflowsDirectory, workflowId); - this.statePath = path5.join(this.workflowDirectory, "state.json"); - this.journalPath = path5.join(this.workflowDirectory, "journal.ndjson"); - this.lockPath = path5.join(this.workflowDirectory, "state.lock"); - this.ownerPath = path5.join(this.workflowDirectory, "owner.json"); + this.stateRoot = path6.resolve(options.stateDirectory ?? resolveStateDir()); + this.workflowsDirectory = path6.join(this.stateRoot, "workflows"); + this.workflowDirectory = path6.join(this.workflowsDirectory, workflowId); + this.statePath = path6.join(this.workflowDirectory, "state.json"); + this.journalPath = path6.join(this.workflowDirectory, "journal.ndjson"); + this.lockPath = path6.join(this.workflowDirectory, "state.lock"); + this.ownerPath = path6.join(this.workflowDirectory, "owner.json"); this.now = options.now ?? (() => (/* @__PURE__ */ new Date()).toISOString()); this.maxStateBytes = options.maxStateBytes ?? MAX_WORKFLOW_STATE_BYTES; this.maxJournalBytes = options.maxJournalBytes ?? MAX_WORKFLOW_JOURNAL_BYTES; @@ -35198,19 +35667,19 @@ var WorkflowStore = class { async ensureWorkflowDirectory() { const root = await inspectPlainDirectory(this.stateRoot); await mkdir2(this.workflowsDirectory, { mode: 448 }).catch((error51) => { - if (errorCode3(error51) !== "EEXIST") throw error51; + if (errorCode4(error51) !== "EEXIST") throw error51; }); await assertDirectoryIdentity(this.stateRoot, root); const workflows = await inspectPlainDirectory(this.workflowsDirectory); - if (path5.dirname(workflows.canonicalPath) !== root.canonicalPath) { + if (path6.dirname(workflows.canonicalPath) !== root.canonicalPath) { throw workflowError("workflows directory escapes plugin data", "unsafe-workflow-state"); } await mkdir2(this.workflowDirectory, { mode: 448 }).catch((error51) => { - if (errorCode3(error51) !== "EEXIST") throw error51; + if (errorCode4(error51) !== "EEXIST") throw error51; }); await assertDirectoryIdentity(this.workflowsDirectory, workflows); const workflow = await inspectPlainDirectory(this.workflowDirectory); - if (path5.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { + if (path6.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { throw workflowError("workflow directory escapes plugin data", "unsafe-workflow-state"); } return workflow; @@ -35219,7 +35688,7 @@ var WorkflowStore = class { const root = await inspectPlainDirectory(this.stateRoot); const workflows = await inspectPlainDirectory(this.workflowsDirectory); const workflow = await inspectPlainDirectory(this.workflowDirectory); - if (path5.dirname(workflows.canonicalPath) !== root.canonicalPath || path5.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { + if (path6.dirname(workflows.canonicalPath) !== root.canonicalPath || path6.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { throw workflowError("workflow state path escapes plugin data", "unsafe-workflow-state"); } return workflow; @@ -35242,13 +35711,13 @@ var WorkflowStore = class { } let handle; try { - handle = await open2( + handle = await open3( this.ownerPath, - constants3.O_WRONLY | constants3.O_CREAT | constants3.O_EXCL | NO_FOLLOW, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, 384 ); } catch (error51) { - if (errorCode3(error51) === "EEXIST") { + if (errorCode4(error51) === "EEXIST") { throw workflowError("workflow already has an owner", "workflow-lease-conflict"); } throw error51; @@ -35258,7 +35727,7 @@ var WorkflowStore = class { await handle.writeFile(bytes); await handle.sync(); const metadata = await handle.stat(); - const named = await lstat3(this.ownerPath); + const named = await lstat4(this.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size !== bytes.byteLength || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("workflow owner was substituted", "unsafe-workflow-owner"); } @@ -35285,23 +35754,23 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); let handle; try { - handle = await open2(this.ownerPath, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(this.ownerPath, constants4.O_RDONLY | NO_FOLLOW2); } catch (error51) { - if (isMissing(error51)) { + if (isMissing2(error51)) { throw workflowError("workflow owner does not exist", "workflow-lease-not-found"); } throw error51; } try { const metadata = await handle.stat(); - const named = await lstat3(this.ownerPath); + const named = await lstat4(this.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size < 1 || metadata.size > MAX_WORKFLOW_OWNER_BYTES || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("workflow owner is unsafe", "unsafe-workflow-owner"); } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); + const first = await readHandleBytes2(handle, metadata.size); + const second = await readHandleBytes2(handle, metadata.size); const settled = await handle.stat(); - const settledNamed = await lstat3(this.ownerPath); + const settledNamed = await lstat4(this.ownerPath); if (!first.equals(second) || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.size !== metadata.size) { throw workflowError("workflow owner changed during read", "unsafe-workflow-owner"); } @@ -35321,22 +35790,22 @@ var WorkflowStore = class { async removeWorkflowOwner(identity, directory) { let handle; try { - handle = await open2(this.ownerPath, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(this.ownerPath, constants4.O_RDONLY | NO_FOLLOW2); } catch (error51) { - if (isMissing(error51)) return false; + if (isMissing2(error51)) return false; throw error51; } try { const metadata = await handle.stat(); - let named = await lstat3(this.ownerPath); + let named = await lstat4(this.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.dev !== identity.dev || metadata.ino !== identity.ino || metadata.size !== identity.size || metadata.mtimeMs !== identity.mtimeMs || metadata.ctimeMs !== identity.ctimeMs || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== identity.dev || named.ino !== identity.ino) return false; - const bytes = await readHandleBytes(handle, metadata.size); + const bytes = await readHandleBytes2(handle, metadata.size); const settled = await handle.stat(); - named = await lstat3(this.ownerPath); + named = await lstat4(this.ownerPath); if (!bytes.equals(identity.bytes) || settled.dev !== identity.dev || settled.ino !== identity.ino || settled.size !== identity.size || settled.mtimeMs !== identity.mtimeMs || settled.ctimeMs !== identity.ctimeMs || named.dev !== identity.dev || named.ino !== identity.ino) return false; - await rm(this.ownerPath); + await rm2(this.ownerPath); } catch (error51) { - if (isMissing(error51)) return false; + if (isMissing2(error51)) return false; throw error51; } finally { await handle.close(); @@ -35352,11 +35821,11 @@ var WorkflowStore = class { let operationError; try { for (let attempt = 0; attempt < 4; attempt += 1) { - const token = randomUUID(); - const ownerPath = path5.join(this.workflowDirectory, `.state.lock.${token}.owner`); - ownerHandle = await open2( + const token = randomUUID2(); + const ownerPath = path6.join(this.workflowDirectory, `.state.lock.${token}.owner`); + ownerHandle = await open3( ownerPath, - constants3.O_WRONLY | constants3.O_CREAT | constants3.O_EXCL | NO_FOLLOW, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, 384 ); const record2 = { @@ -35369,17 +35838,17 @@ var WorkflowStore = class { `, "utf8"); await ownerHandle.sync(); const ownerMetadata = await ownerHandle.stat(); - const namedOwner = await lstat3(ownerPath); + const namedOwner = await lstat4(ownerPath); if (!ownerMetadata.isFile() || ownerMetadata.nlink !== 1 || ownerMetadata.size > MAX_WRITER_LOCK_BYTES || !namedOwner.isFile() || namedOwner.isSymbolicLink() || namedOwner.dev !== ownerMetadata.dev || namedOwner.ino !== ownerMetadata.ino) { throw workflowError("workflow state lock owner was substituted", "unsafe-workflow-state"); } try { - await link(ownerPath, this.lockPath); + await link2(ownerPath, this.lockPath); } catch (error51) { await ownerHandle.close(); ownerHandle = void 0; - await rm(ownerPath, { force: true }); - if (errorCode3(error51) !== "EEXIST") throw error51; + await rm2(ownerPath, { force: true }); + if (errorCode4(error51) !== "EEXIST") throw error51; const existing = await this.readWriterLock(directory); if (await isWriterAlive(existing.record)) { throw workflowError( @@ -35392,7 +35861,7 @@ var WorkflowStore = class { } continue; } - const namedLock = await lstat3(this.lockPath); + const namedLock = await lstat4(this.lockPath); if (!namedLock.isFile() || namedLock.isSymbolicLink() || namedLock.dev !== ownerMetadata.dev || namedLock.ino !== ownerMetadata.ino) { throw workflowError("workflow state lock was substituted", "unsafe-workflow-state"); } @@ -35419,7 +35888,7 @@ var WorkflowStore = class { await ownerHandle?.close(); if (lockIdentity !== void 0) { await this.retireWriterLock(lockIdentity, directory); - await rm(lockIdentity.ownerPath, { force: true }); + await rm2(lockIdentity.ownerPath, { force: true }); await syncDirectory(this.workflowDirectory); } } catch (cleanupError) { @@ -35433,15 +35902,15 @@ var WorkflowStore = class { } async readWriterLock(directory) { await assertDirectoryIdentity(this.workflowDirectory, directory); - const handle = await open2(this.lockPath, constants3.O_RDONLY | NO_FOLLOW); + const handle = await open3(this.lockPath, constants4.O_RDONLY | NO_FOLLOW2); try { const metadata = await handle.stat(); - const named = await lstat3(this.lockPath); + const named = await lstat4(this.lockPath); if (!metadata.isFile() || metadata.nlink < 1 || metadata.nlink > 2 || metadata.size < 1 || metadata.size > MAX_WRITER_LOCK_BYTES || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("workflow state lock is unsafe", "unsafe-workflow-state"); } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); + const first = await readHandleBytes2(handle, metadata.size); + const second = await readHandleBytes2(handle, metadata.size); const settled = await handle.stat(); if (!first.equals(second) || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs) { throw workflowError("workflow state lock changed during read", "unsafe-workflow-state"); @@ -35450,7 +35919,7 @@ var WorkflowStore = class { return { dev: metadata.dev, ino: metadata.ino, - ownerPath: path5.join(this.workflowDirectory, `.state.lock.${record2.token}.owner`), + ownerPath: path6.join(this.workflowDirectory, `.state.lock.${record2.token}.owner`), record: record2 }; } finally { @@ -35460,24 +35929,24 @@ var WorkflowStore = class { async retireWriterLock(identity, directory) { let handle; try { - handle = await open2(this.lockPath, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(this.lockPath, constants4.O_RDONLY | NO_FOLLOW2); } catch (error51) { - if (isMissing(error51)) return false; + if (isMissing2(error51)) return false; throw error51; } try { const metadata = await handle.stat(); - let named = await lstat3(this.lockPath); + let named = await lstat4(this.lockPath); if (!metadata.isFile() || metadata.dev !== identity.dev || metadata.ino !== identity.ino || !named.isFile() || named.isSymbolicLink() || named.dev !== identity.dev || named.ino !== identity.ino) return false; - const contents = await readHandleBytes(handle, metadata.size); + const contents = await readHandleBytes2(handle, metadata.size); const record2 = parseWriterLock(contents); if (record2.pid !== identity.record.pid || record2.processToken !== identity.record.processToken || record2.token !== identity.record.token) return false; const settled = await handle.stat(); - named = await lstat3(this.lockPath); + named = await lstat4(this.lockPath); if (settled.dev !== identity.dev || settled.ino !== identity.ino || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || named.dev !== identity.dev || named.ino !== identity.ino) return false; - await rm(this.lockPath); + await rm2(this.lockPath); } catch (error51) { - if (isMissing(error51)) return false; + if (isMissing2(error51)) return false; throw error51; } finally { await handle.close(); @@ -35489,24 +35958,24 @@ var WorkflowStore = class { async retireWriterOwner(identity, directory) { let handle; try { - handle = await open2(identity.ownerPath, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(identity.ownerPath, constants4.O_RDONLY | NO_FOLLOW2); } catch (error51) { - if (isMissing(error51)) return false; + if (isMissing2(error51)) return false; throw error51; } try { const metadata = await handle.stat(); - let named = await lstat3(identity.ownerPath); + let named = await lstat4(identity.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.dev !== identity.dev || metadata.ino !== identity.ino || metadata.size < 1 || metadata.size > MAX_WRITER_LOCK_BYTES || !named.isFile() || named.isSymbolicLink() || named.dev !== identity.dev || named.ino !== identity.ino) return false; - const contents = await readHandleBytes(handle, metadata.size); + const contents = await readHandleBytes2(handle, metadata.size); const record2 = parseWriterLock(contents); if (record2.pid !== identity.record.pid || record2.processToken !== identity.record.processToken || record2.token !== identity.record.token) return false; const settled = await handle.stat(); - named = await lstat3(identity.ownerPath); + named = await lstat4(identity.ownerPath); if (settled.nlink !== 1 || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || named.dev !== identity.dev || named.ino !== identity.ino) return false; - await rm(identity.ownerPath); + await rm2(identity.ownerPath); } catch (error51) { - if (isMissing(error51)) return false; + if (isMissing2(error51)) return false; throw error51; } finally { await handle.close(); @@ -35517,15 +35986,15 @@ var WorkflowStore = class { } async recoverAbandonedStateFiles(directory) { await assertDirectoryIdentity(this.workflowDirectory, directory); - const names = (await readdir2(this.workflowDirectory)).filter((name) => /^\.state\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.(?:tmp|publish)$/u.test(name)); + const names = (await readdir3(this.workflowDirectory)).filter((name) => /^\.state\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.(?:tmp|publish)$/u.test(name)); if (names.length === 0) return; const artifacts = []; for (const name of names) { - const filePath = path5.join(this.workflowDirectory, name); - const handle = await open2(filePath, constants3.O_RDONLY | NO_FOLLOW); + const filePath = path6.join(this.workflowDirectory, name); + const handle = await open3(filePath, constants4.O_RDONLY | NO_FOLLOW2); try { const metadata = await handle.stat(); - const named = await lstat3(filePath); + const named = await lstat4(filePath); if (!metadata.isFile() || metadata.nlink < 1 || metadata.nlink > 2 || metadata.size > this.maxStateBytes || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("abandoned workflow state file is unsafe", "unsafe-workflow-state"); } @@ -35534,8 +36003,8 @@ var WorkflowStore = class { await handle.close(); } } - const stateMetadata = await lstat3(this.statePath).catch((error51) => { - if (isMissing(error51)) return null; + const stateMetadata = await lstat4(this.statePath).catch((error51) => { + if (isMissing2(error51)) return null; throw error51; }); const linksByIdentity = /* @__PURE__ */ new Map(); @@ -35554,11 +36023,11 @@ var WorkflowStore = class { } } for (const artifact of artifacts) { - const named = await lstat3(artifact.filePath); + const named = await lstat4(artifact.filePath); if (!named.isFile() || named.isSymbolicLink() || named.dev !== artifact.metadata.dev || named.ino !== artifact.metadata.ino) { throw workflowError("abandoned workflow state file changed", "unsafe-workflow-state"); } - await rm(artifact.filePath); + await rm2(artifact.filePath); } await syncDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); @@ -35568,23 +36037,23 @@ var WorkflowStore = class { let handle; try { try { - handle = await open2(this.statePath, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(this.statePath, constants4.O_RDONLY | NO_FOLLOW2); } catch (error51) { - if (isMissing(error51)) return null; + if (isMissing2(error51)) return null; throw error51; } const metadata = await handle.stat(); - const named = await lstat3(this.statePath); + const named = await lstat4(this.statePath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > this.maxStateBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError( "workflow state must be a bounded regular single-link file", metadata.size > this.maxStateBytes ? "workflow-state-too-large" : "unsafe-workflow-state" ); } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); + const first = await readHandleBytes2(handle, metadata.size); + const second = await readHandleBytes2(handle, metadata.size); const settled = await handle.stat(); - const settledNamed = await lstat3(this.statePath); + const settledNamed = await lstat4(this.statePath); if (!first.equals(second) || !settled.isFile() || settled.nlink !== 1 || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino) { throw workflowError("workflow state changed during read", "unsafe-workflow-state"); } @@ -35597,7 +36066,7 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); return validateState(parsed, this.workflowId); } catch (error51) { - if (isMissing(error51)) return null; + if (isMissing2(error51)) return null; throw error51; } finally { await handle?.close(); @@ -35654,9 +36123,9 @@ var WorkflowStore = class { let handle; try { try { - handle = await open2(this.journalPath, constants3.O_RDONLY | NO_FOLLOW); + handle = await open3(this.journalPath, constants4.O_RDONLY | NO_FOLLOW2); } catch (error51) { - if (isMissing(error51)) { + if (isMissing2(error51)) { await assertDirectoryIdentity(this.workflowDirectory, directory); return { entries: [], @@ -35672,17 +36141,17 @@ var WorkflowStore = class { throw error51; } const metadata = await handle.stat(); - const named = await lstat3(this.journalPath); + const named = await lstat4(this.journalPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > this.maxJournalBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError( "workflow journal must be a bounded regular single-link file", metadata.size > this.maxJournalBytes ? "workflow-journal-too-large" : "unsafe-workflow-state" ); } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); + const first = await readHandleBytes2(handle, metadata.size); + const second = await readHandleBytes2(handle, metadata.size); const settled = await handle.stat(); - const settledNamed = await lstat3(this.journalPath); + const settledNamed = await lstat4(this.journalPath); if (!first.equals(second) || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino) { throw workflowError("workflow journal changed during read", "unsafe-workflow-state"); } @@ -35717,10 +36186,10 @@ var WorkflowStore = class { async truncateTornJournalTail(directory, snapshot) { if (!snapshot.tornTail || snapshot.identity === null) return; await assertDirectoryIdentity(this.workflowDirectory, directory); - const handle = await open2(this.journalPath, constants3.O_RDWR | NO_FOLLOW); + const handle = await open3(this.journalPath, constants4.O_RDWR | NO_FOLLOW2); try { const metadata = await handle.stat(); - const named = await lstat3(this.journalPath); + const named = await lstat4(this.journalPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.dev !== snapshot.identity.dev || metadata.ino !== snapshot.identity.ino || metadata.size !== snapshot.fileSize || metadata.mtimeMs !== snapshot.mtimeMs || metadata.ctimeMs !== snapshot.ctimeMs || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino) { throw workflowError("workflow journal changed during torn-tail repair", "unsafe-workflow-state"); } @@ -35737,14 +36206,14 @@ var WorkflowStore = class { throw workflowError("workflow journal exceeds its size limit", "workflow-journal-too-large"); } await assertDirectoryIdentity(this.workflowDirectory, directory); - const handle = await open2( + const handle = await open3( this.journalPath, - constants3.O_WRONLY | constants3.O_CREAT | constants3.O_APPEND | NO_FOLLOW, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_APPEND | NO_FOLLOW2, 384 ); try { const metadata = await handle.stat(); - const named = await lstat3(this.journalPath); + const named = await lstat4(this.journalPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size !== expectedSize || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino) { throw workflowError("workflow journal changed before append", "unsafe-workflow-state"); } @@ -35768,29 +36237,29 @@ var WorkflowStore = class { } } async publish(bytes, directory, create) { - const temporaryPath = path5.join( + const temporaryPath = path6.join( this.workflowDirectory, - `.state.${randomUUID()}.tmp` + `.state.${randomUUID2()}.tmp` ); - const publicationPath = path5.join( + const publicationPath = path6.join( this.workflowDirectory, - `.state.${randomUUID()}.publish` + `.state.${randomUUID2()}.publish` ); let handle; let temporaryExists = false; let publicationExists = false; let temporaryIdentity; try { - handle = await open2( + handle = await open3( temporaryPath, - constants3.O_WRONLY | constants3.O_CREAT | constants3.O_EXCL | NO_FOLLOW, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, 384 ); temporaryExists = true; await handle.writeFile(bytes); await handle.sync(); const metadata = await handle.stat({ bigint: true }); - const named = await lstat3(temporaryPath, { bigint: true }); + const named = await lstat4(temporaryPath, { bigint: true }); if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size !== BigInt(bytes.byteLength) || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino) { throw workflowError("workflow state temporary file changed", "unsafe-workflow-state"); } @@ -35800,10 +36269,10 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); if (create) { try { - await lstat3(this.statePath); + await lstat4(this.statePath); throw workflowError("workflow state already exists", "workflow-state-conflict"); } catch (error51) { - if (!isMissing(error51)) throw error51; + if (!isMissing2(error51)) throw error51; } } await this.stageStatePublication( @@ -35819,7 +36288,7 @@ var WorkflowStore = class { bytes, temporaryIdentity ); - await rm(temporaryPath); + await rm2(temporaryPath); temporaryExists = false; await rename(publicationPath, this.statePath); publicationExists = false; @@ -35828,36 +36297,36 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); } finally { await handle?.close(); - if (temporaryExists) await rm(temporaryPath, { force: true }); - if (publicationExists) await rm(publicationPath, { force: true }); + if (temporaryExists) await rm2(temporaryPath, { force: true }); + if (publicationExists) await rm2(publicationPath, { force: true }); } } async stageStatePublication(temporaryPath, publicationPath, expectedBytes, expectedIdentity) { let linked = false; try { - await link(temporaryPath, publicationPath); + await link2(temporaryPath, publicationPath); linked = true; - const publication = await lstat3(publicationPath, { bigint: true }); + const publication = await lstat4(publicationPath, { bigint: true }); if (!publication.isFile() || publication.isSymbolicLink() || publication.nlink !== 2n || publication.dev !== expectedIdentity.dev || publication.ino !== expectedIdentity.ino || publication.size !== BigInt(expectedBytes.byteLength)) { throw workflowError("workflow state publication source changed", "unsafe-workflow-state"); } } catch (error51) { - if (linked) await rm(publicationPath, { force: true }); + if (linked) await rm2(publicationPath, { force: true }); throw error51; } } async assertStagedPublication(temporaryPath, publicationPath, expectedBytes, expectedIdentity) { - const handle = await open2(publicationPath, constants3.O_RDONLY | NO_FOLLOW); + const handle = await open3(publicationPath, constants4.O_RDONLY | NO_FOLLOW2); try { const metadata = await handle.stat({ bigint: true }); const [publication, temporary] = await Promise.all([ - lstat3(publicationPath, { bigint: true }), - lstat3(temporaryPath, { bigint: true }) + lstat4(publicationPath, { bigint: true }), + lstat4(temporaryPath, { bigint: true }) ]); if (!metadata.isFile() || metadata.nlink !== 2n || metadata.size !== BigInt(expectedBytes.byteLength) || metadata.dev !== expectedIdentity.dev || metadata.ino !== expectedIdentity.ino || !publication.isFile() || publication.isSymbolicLink() || publication.dev !== expectedIdentity.dev || publication.ino !== expectedIdentity.ino || !temporary.isFile() || temporary.isSymbolicLink() || temporary.dev !== expectedIdentity.dev || temporary.ino !== expectedIdentity.ino) { throw workflowError("workflow state publication changed before commit", "unsafe-workflow-state"); } - const published = await readHandleBytes(handle, Number(metadata.size)); + const published = await readHandleBytes2(handle, Number(metadata.size)); const settled = await handle.stat({ bigint: true }); if (!published.equals(expectedBytes) || settled.nlink !== metadata.nlink || settled.size !== metadata.size || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs) { throw workflowError("workflow state publication changed before commit", "unsafe-workflow-state"); @@ -35867,14 +36336,14 @@ var WorkflowStore = class { } } async assertPublishedState(expectedBytes, expectedIdentity) { - const handle = await open2(this.statePath, constants3.O_RDONLY | NO_FOLLOW); + const handle = await open3(this.statePath, constants4.O_RDONLY | NO_FOLLOW2); try { const metadata = await handle.stat({ bigint: true }); - const named = await lstat3(this.statePath, { bigint: true }); + const named = await lstat4(this.statePath, { bigint: true }); if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size !== BigInt(expectedBytes.byteLength) || metadata.dev !== expectedIdentity.dev || metadata.ino !== expectedIdentity.ino || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1n || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("published workflow state identity changed", "unsafe-workflow-state"); } - const published = await readHandleBytes(handle, Number(metadata.size)); + const published = await readHandleBytes2(handle, Number(metadata.size)); const settled = await handle.stat({ bigint: true }); if (!published.equals(expectedBytes) || settled.size !== metadata.size || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs) { throw workflowError("published workflow state bytes changed", "unsafe-workflow-state"); @@ -36056,25 +36525,25 @@ async function git(cwd, args, indexFileOrOptions) { // src/git/worktree-registration.ts import { realpath as realpath3 } from "node:fs/promises"; -import path7 from "node:path"; +import path8 from "node:path"; // src/util/platform-path.ts -import path6 from "node:path"; +import path7 from "node:path"; function stripWindowsExtendedPrefix(value) { if (value.toLowerCase().startsWith("\\\\?\\unc\\")) return `\\\\${value.slice(8)}`; return value.startsWith("\\\\?\\") ? value.slice(4) : value; } function platformPathsEqual(left, right, platform = process.platform) { - if (platform !== "win32") return path6.resolve(left) === path6.resolve(right); - return path6.win32.normalize(stripWindowsExtendedPrefix(left)) === path6.win32.normalize(stripWindowsExtendedPrefix(right)); + if (platform !== "win32") return path7.resolve(left) === path7.resolve(right); + return path7.win32.normalize(stripWindowsExtendedPrefix(left)) === path7.win32.normalize(stripWindowsExtendedPrefix(right)); } // src/git/worktree-registration.ts async function canonicalizeWorktreePath(pathname, allowMissing) { - if (!path7.isAbsolute(pathname)) { + if (!path8.isAbsolute(pathname)) { throw new RuntimeError("worktree registration path is not absolute"); } - const resolved = path7.resolve(pathname); + const resolved = path8.resolve(pathname); try { return await realpath3(resolved); } catch (error51) { @@ -36083,14 +36552,14 @@ async function canonicalizeWorktreePath(pathname, allowMissing) { const missingSegments = []; let ancestor = resolved; for (; ; ) { - const parent = path7.dirname(ancestor); + const parent = path8.dirname(ancestor); if (parent === ancestor) { throw new RuntimeError("worktree registration path has no existing ancestor"); } - missingSegments.unshift(path7.basename(ancestor)); + missingSegments.unshift(path8.basename(ancestor)); ancestor = parent; try { - return path7.join(await realpath3(ancestor), ...missingSegments); + return path8.join(await realpath3(ancestor), ...missingSegments); } catch (error51) { if (error51.code !== "ENOENT") throw error51; } @@ -36158,7 +36627,7 @@ import { homedir } from "node:os"; import { join as join2 } from "node:path"; // src/producers/plain-text.ts -import { open as open3 } from "node:fs/promises"; +import { open as open4 } from "node:fs/promises"; // src/producers/skill-bootstrap.ts import { existsSync } from "node:fs"; @@ -36338,7 +36807,7 @@ async function normalizeNodeShim(executable) { if (executable.kind !== "native") return executable; let handle; try { - handle = await open3(executable.command, "r"); + handle = await open4(executable.command, "r"); const buffer = Buffer.alloc(256); const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0); const firstLine = buffer.subarray(0, bytesRead).toString("utf8").split(/\r?\n/u, 1)[0] ?? ""; @@ -37341,10 +37810,10 @@ var registry2 = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), // src/producers/producer-runtime.ts import { existsSync as existsSync7, statSync as statSync2 } from "node:fs"; import { homedir as homedir8 } from "node:os"; -import path10 from "node:path"; +import path11 from "node:path"; // src/runtime/environment-policy.ts -import path8 from "node:path"; +import path9 from "node:path"; // src/runtime/redaction.ts var registeredSecrets = /* @__PURE__ */ new Map(); @@ -37591,14 +38060,14 @@ function buildEnvironment(args) { env, provenance, "APPDATA", - path8.win32.join(args.tempHome, "AppData", "Roaming"), + path9.win32.join(args.tempHome, "AppData", "Roaming"), "platform" ); setEnvironmentValue( env, provenance, "LOCALAPPDATA", - path8.win32.join(args.tempHome, "AppData", "Local"), + path9.win32.join(args.tempHome, "AppData", "Local"), "platform" ); } else { @@ -37668,14 +38137,14 @@ function buildWriteSeatbeltPolicy(args) { extraWritableRoots: [...args.extraWritableRoots] }; } -function sbPath(path33) { - for (const character of path33) { +function sbPath(path35) { + for (const character of path35) { const codePoint = character.codePointAt(0); if (codePoint !== void 0 && (codePoint < 32 || codePoint === 127)) { - throw new Error(`seatbelt: control character in path: ${JSON.stringify(path33)}`); + throw new Error(`seatbelt: control character in path: ${JSON.stringify(path35)}`); } } - return `"${path33.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; + return `"${path35.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; } function isDeclaredStateRoot(normalized, invocation, policy) { const roots = []; @@ -37726,14 +38195,14 @@ function isDeclaredStateRoot(normalized, invocation, policy) { const winUserHomePattern = /^[a-zA-Z]:\\Users\\[^\\]+(?:\\.*)?$/u; return userHomePattern.test(normalized) || winUserHomePattern.test(normalized); } -function isValidInheritedStatePath(path33, invocation, policy) { - if (typeof path33 !== "string" || path33.trim().length === 0) return false; - if (!isAbsolute(path33)) return false; - const parsed = parse3(path33); - if (path33 === "/" || path33 === parsed.root) return false; - const normalized = normalize(path33); +function isValidInheritedStatePath(path35, invocation, policy) { + if (typeof path35 !== "string" || path35.trim().length === 0) return false; + if (!isAbsolute(path35)) return false; + const parsed = parse3(path35); + if (path35 === "/" || path35 === parsed.root) return false; + const normalized = normalize(path35); if (normalized === "/" || normalized === parsed.root) return false; - if (resolve(path33) === "/" || resolve(path33) === parsed.root) return false; + if (resolve(path35) === "/" || resolve(path35) === parsed.root) return false; return isDeclaredStateRoot(normalized, invocation, policy); } function inheritedStateWritablePaths(invocation, policy) { @@ -37756,18 +38225,18 @@ function buildProfile(policy, additionalWritable) { "/dev", ...policy.extraWritableRoots ?? [], ...additionalWritable - ].filter((path33) => typeof path33 === "string" && path33.length > 0).flatMap((path33) => { + ].filter((path35) => typeof path35 === "string" && path35.length > 0).flatMap((path35) => { try { - return [path33, realpathSync2(path33)]; + return [path35, realpathSync2(path35)]; } catch { - return [path33]; + return [path35]; } }))]; const lines = [ "(version 1)", "(allow default)", "(deny file-write*)", - ...writable.map((path33) => `(allow file-write* (subpath ${sbPath(path33)}))`), + ...writable.map((path35) => `(allow file-write* (subpath ${sbPath(path35)}))`), '(allow file-write* (literal "/dev/null") (literal "/dev/tty"))' ]; if (!policy.allowNetwork) lines.push("(deny network*)"); @@ -37793,20 +38262,20 @@ function wrapInvocationWithSeatbelt(invocation, policy) { } // src/runtime/run-start.ts -import { randomUUID as randomUUID2 } from "node:crypto"; -import { constants as constants4 } from "node:fs"; +import { randomUUID as randomUUID3 } from "node:crypto"; +import { constants as constants5 } from "node:fs"; import { access as access2, - lstat as lstat4, - open as open4, + lstat as lstat5, + open as open5, realpath as realpath4, rename as rename2, - rm as rm2 + rm as rm3 } from "node:fs/promises"; -import path9 from "node:path"; +import path10 from "node:path"; import { fileURLToPath as fileURLToPath4 } from "node:url"; -var NO_FOLLOW2 = constants4.O_NOFOLLOW ?? 0; -function errorCode4(error51) { +var NO_FOLLOW3 = constants5.O_NOFOLLOW ?? 0; +function errorCode5(error51) { return error51.code; } async function resolveWatchdogPath() { @@ -37845,7 +38314,7 @@ async function parentDeathWatchdogInvocation(executable, args) { } function assertDirectoryIdentity2(target) { return Promise.all([ - lstat4(target.publicDirectory), + lstat5(target.publicDirectory), realpath4(target.publicDirectory) ]).then(([metadata, canonical]) => { if (!metadata.isDirectory() || metadata.isSymbolicLink() || metadata.dev !== target.identity.dev || metadata.ino !== target.identity.ino || canonical !== target.canonicalDirectory) { @@ -37856,10 +38325,10 @@ function assertDirectoryIdentity2(target) { async function syncDirectory2(directory) { let handle; try { - handle = await open4(directory, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open5(directory, constants5.O_RDONLY | NO_FOLLOW3); await handle.sync(); } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode4(error51) ?? ""); + const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode5(error51) ?? ""); if (!unsupportedOnWindows) throw error51; } finally { await handle?.close(); @@ -37867,13 +38336,13 @@ async function syncDirectory2(directory) { } async function writeRunStart(target, record2, create) { await assertDirectoryIdentity2(target); - const destination = path9.join(target.canonicalDirectory, "run-start.json"); + const destination = path10.join(target.canonicalDirectory, "run-start.json"); const serialized = `${JSON.stringify(record2, null, 2)} `; if (create) { - const handle2 = await open4( + const handle2 = await open5( destination, - constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + constants5.O_WRONLY | constants5.O_CREAT | constants5.O_EXCL | NO_FOLLOW3, 384 ); try { @@ -37886,16 +38355,16 @@ async function writeRunStart(target, record2, create) { await assertDirectoryIdentity2(target); return; } - const temporaryPath = path9.join( + const temporaryPath = path10.join( target.canonicalDirectory, - `.run-start.${randomUUID2()}.tmp` + `.run-start.${randomUUID3()}.tmp` ); let created = false; let handle; try { - handle = await open4( + handle = await open5( temporaryPath, - constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + constants5.O_WRONLY | constants5.O_CREAT | constants5.O_EXCL | NO_FOLLOW3, 384 ); created = true; @@ -37910,13 +38379,13 @@ async function writeRunStart(target, record2, create) { await assertDirectoryIdentity2(target); } finally { await handle?.close(); - if (created) await rm2(temporaryPath, { force: true }); + if (created) await rm3(temporaryPath, { force: true }); } } async function initializeRunStart(store, record2) { await store.writeLog("lifecycle", "attempt lock acquired\n"); const canonicalDirectory = await realpath4(store.runDirectory); - const metadata = await lstat4(store.runDirectory); + const metadata = await lstat5(store.runDirectory); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { throw new RuntimeError("run archive directory is not a plain directory"); } @@ -38104,7 +38573,7 @@ var ProducerRuntime = class { ...request.extraWritableRoots && request.extraWritableRoots.length > 0 ? { extraWritableRoots: request.extraWritableRoots } : {}, ...request.gitObjectAccess ? { gitObjectDirectory: request.gitObjectAccess.privateObjectsDir, - gitAlternateObjectDirectories: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path10.delimiter) : request.gitObjectAccess.sharedObjectsDir + gitAlternateObjectDirectories: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path11.delimiter) : request.gitObjectAccess.sharedObjectsDir } : {} }; let invocation = adapter.buildInvocation(request.spec, invocationContext); @@ -38133,7 +38602,7 @@ var ProducerRuntime = class { ...request.envAdditions ?? {}, ...request.gitObjectAccess ? { GIT_OBJECT_DIRECTORY: request.gitObjectAccess.privateObjectsDir, - GIT_ALTERNATE_OBJECT_DIRECTORIES: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path10.delimiter) : request.gitObjectAccess.sharedObjectsDir + GIT_ALTERNATE_OBJECT_DIRECTORIES: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path11.delimiter) : request.gitObjectAccess.sharedObjectsDir } : {} }, ...tempHome === null ? {} : { tempHome } @@ -38181,14 +38650,14 @@ var producerRuntime = new ProducerRuntime(); // src/producers/capability-probe.ts async function probeAll(ctx, producerRegistry = registry2, options) { - return producerRuntime.probeAll(ctx, options, producerRegistry); + return producerRuntime.probeAll(ctx, { fresh: true, ...options }, producerRegistry); } // src/verify/dependency-link.ts import { execFile as execFile3 } from "node:child_process"; -import { access as access3, mkdir as mkdir3, mkdtemp, readFile, rm as rm3, writeFile } from "node:fs/promises"; +import { access as access3, mkdir as mkdir3, mkdtemp, readFile as readFile2, rm as rm4, writeFile } from "node:fs/promises"; import { tmpdir as tmpdir5 } from "node:os"; -import path11 from "node:path"; +import path12 from "node:path"; import { promisify } from "node:util"; var execFileAsync = promisify(execFile3); var LOCKFILES = ["package-lock.json", "bun.lockb", "pnpm-lock.yaml", "yarn.lock"]; @@ -38215,14 +38684,14 @@ async function probeCowSupport(dependencies = {}) { if (platform !== "darwin" && platform !== "linux") { return { cowSupported: false, strategy: "unsupported" }; } - const probeRoot = await mkdtemp(path11.join(tmpdir5(), "ca-cow-probe-")); + const probeRoot = await mkdtemp(path12.join(tmpdir5(), "ca-cow-probe-")); try { - const source = path11.join(probeRoot, "source"); - const target = path11.join(probeRoot, "target"); + const source = path12.join(probeRoot, "source"); + const target = path12.join(probeRoot, "target"); const clone2 = cowClone(platform, source, target); if (clone2 === null) return { cowSupported: false, strategy: "unsupported" }; await mkdir3(source); - await writeFile(path11.join(source, "sentinel"), "probe\n"); + await writeFile(path12.join(source, "sentinel"), "probe\n"); try { await (dependencies.execFile ?? execFileAsync)("cp", clone2.args, { timeout: COPY_TIMEOUT_MS }); return { cowSupported: true, strategy: clone2.strategy }; @@ -38230,15 +38699,15 @@ async function probeCowSupport(dependencies = {}) { return { cowSupported: false, strategy: clone2.strategy }; } } finally { - await rm3(probeRoot, { recursive: true, force: true }); + await rm4(probeRoot, { recursive: true, force: true }); } } async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = {}) { - const primaryModules = path11.join(primaryRepo, "node_modules"); + const primaryModules = path12.join(primaryRepo, "node_modules"); if (!await exists(primaryModules)) return "none"; const [primaryLockfiles, worktreeLockfiles] = await Promise.all([ - Promise.all(LOCKFILES.map((lockfile) => exists(path11.join(primaryRepo, lockfile)))), - Promise.all(LOCKFILES.map((lockfile) => exists(path11.join(worktreePath, lockfile)))) + Promise.all(LOCKFILES.map((lockfile) => exists(path12.join(primaryRepo, lockfile)))), + Promise.all(LOCKFILES.map((lockfile) => exists(path12.join(worktreePath, lockfile)))) ]); if (!primaryLockfiles.some(Boolean)) return "none"; if (primaryLockfiles.some((present, index) => present !== worktreeLockfiles[index])) { @@ -38248,8 +38717,8 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = const comparisons = await Promise.all(LOCKFILES.map(async (lockfile, index) => { if (!primaryLockfiles[index]) return true; const [primaryLock, worktreeLock] = await Promise.all([ - readFile(path11.join(primaryRepo, lockfile)), - readFile(path11.join(worktreePath, lockfile)) + readFile2(path12.join(primaryRepo, lockfile)), + readFile2(path12.join(worktreePath, lockfile)) ]); return primaryLock.equals(worktreeLock); })); @@ -38257,7 +38726,7 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = } catch { return "skipped-lockfile-mismatch"; } - const targetModules = path11.join(worktreePath, "node_modules"); + const targetModules = path12.join(worktreePath, "node_modules"); const platform = dependencies.platform ?? process.platform; const clone2 = cowClone(platform, primaryModules, targetModules); if (clone2 === null) return "skipped-cow-unsupported"; @@ -38265,15 +38734,15 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = await (dependencies.execFile ?? execFileAsync)("cp", clone2.args, { timeout: COPY_TIMEOUT_MS }); return "inherited"; } catch { - await rm3(targetModules, { recursive: true, force: true }); + await rm4(targetModules, { recursive: true, force: true }); return "skipped-cow-unsupported"; } } // src/mcp/live-bundle.ts import { createHash as createHash4 } from "node:crypto"; -import { readFile as readFile2 } from "node:fs/promises"; -import path12 from "node:path"; +import { readFile as readFile3 } from "node:fs/promises"; +import path13 from "node:path"; var NOT_SELF_HOSTED = { selfHosted: false, runningVersion: RUNTIME_VERSION, @@ -38301,18 +38770,18 @@ function declaredName(manifest) { } } async function checkLiveBundle(checkoutPath, deps = {}) { - const read = deps.readFile ?? ((target) => readFile2(target)); + const read = deps.readFile ?? ((target) => readFile3(target)); const runningVersion = deps.runningVersion ?? RUNTIME_VERSION; - const manifest = await readOrNull(read, path12.join(checkoutPath, ".claude-plugin", "plugin.json")); + const manifest = await readOrNull(read, path13.join(checkoutPath, ".claude-plugin", "plugin.json")); if (manifest === null) return { ...NOT_SELF_HOSTED, runningVersion }; const declared = declaredName(manifest); if (declared === null || declared.name !== "claude-architect") { return { ...NOT_SELF_HOSTED, runningVersion }; } const repositoryVersion = typeof declared.version === "string" ? declared.version : null; - const repositoryBundle = await readOrNull(read, path12.join(checkoutPath, "runtime", "server.mjs")); + const repositoryBundle = await readOrNull(read, path13.join(checkoutPath, "runtime", "server.mjs")); const runningBundlePath = deps.runningBundlePath ?? process.argv[1]; - const runningBundle = runningBundlePath === void 0 || path12.basename(runningBundlePath) !== "server.mjs" ? null : await readOrNull(read, runningBundlePath); + const runningBundle = runningBundlePath === void 0 || path13.basename(runningBundlePath) !== "server.mjs" ? null : await readOrNull(read, runningBundlePath); const bundleMatches = repositoryBundle === null || runningBundle === null ? null : sha256(repositoryBundle) === sha256(runningBundle); return { selfHosted: true, @@ -38331,12 +38800,12 @@ function liveBundleDiagnostic(status) { // src/mcp/doctor.ts var POSIX_HOME_PATH = /\/(?:Users|home)\/[^/\\\s"']+(?:\/[^/\\\s"']+)*/g; var WINDOWS_HOME_PATH = /[A-Za-z]:\\Users\\[^/\\\s"']+(?:\\[^/\\\s"']+)*/gi; -var CHECKOUT_LOCK_NAME = /^([0-9a-f]{64})\.lock$/; +var CHECKOUT_LOCK_NAME = CHECKOUT_LOCK_NAME_PATTERN; var MAX_CHECKOUT_LOCK_BYTES = 4096; var MAX_AUTOPILOT_OWNER_BYTES = 1024; var MAX_AUTOPILOT_REGISTRATION_BYTES = 32768; var MAX_AUTOPILOT_SCAN_ENTRIES = 1024; -var NO_FOLLOW3 = constants5.O_NOFOLLOW ?? 0; +var NO_FOLLOW4 = constants6.O_NOFOLLOW ?? 0; var WORKFLOW_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u; var OID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u; var AUTOPILOT_ISSUE_ORDER = [ @@ -38373,16 +38842,16 @@ function nodeIsSupported(version2) { function gitVersion(stdout) { return /^git version ([^\s]+)(?:\s|$)/u.exec(stdout.trim())?.[1] ?? null; } -function errorCode5(error51) { +function errorCode6(error51) { return error51.code; } -function defaultIsProcessAlive(pid) { +function defaultIsProcessAlive2(pid) { try { - nodeProcess4.kill(pid, 0); + nodeProcess5.kill(pid, 0); return true; } catch (error51) { - if (errorCode5(error51) === "EPERM") return true; - if (errorCode5(error51) === "ESRCH") return false; + if (errorCode6(error51) === "EPERM") return true; + if (errorCode6(error51) === "ESRCH") return false; throw error51; } } @@ -38418,12 +38887,12 @@ async function readCheckoutLock(handle) { } async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { if (stateDir === void 0) return []; - const locksRoot = path13.join(stateDir, "locks"); + const locksRoot = path14.join(stateDir, "locks"); let entries; try { - entries = await readdir3(locksRoot, { withFileTypes: true }); + entries = await readdir4(locksRoot, { withFileTypes: true }); } catch (error51) { - return errorCode5(error51) === "ENOENT" ? [] : ["checkout-lock-scan-failed"]; + return errorCode6(error51) === "ENOENT" ? [] : ["checkout-lock-scan-failed"]; } const issues = /* @__PURE__ */ new Set(); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { @@ -38435,7 +38904,7 @@ async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { } let handle; try { - handle = await open5(path13.join(locksRoot, entry.name), constants5.O_RDONLY | NO_FOLLOW3); + handle = await open6(path14.join(locksRoot, entry.name), constants6.O_RDONLY | NO_FOLLOW4); const metadataBeforeRead = await handle.stat(); if (!metadataBeforeRead.isFile() || metadataBeforeRead.size > MAX_CHECKOUT_LOCK_BYTES) { issues.add("checkout-lock-malformed"); @@ -38459,7 +38928,7 @@ async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { const liveToken = owner.processToken === null ? null : await ps.getProcessStartToken(owner.pid); issues.add(owner.processToken !== null && liveToken !== null && liveToken !== owner.processToken ? "checkout-lock-leaked" : "checkout-lock-held"); } catch (error51) { - if (errorCode5(error51) !== "ENOENT") issues.add("checkout-lock-malformed"); + if (errorCode6(error51) !== "ENOENT") issues.add("checkout-lock-malformed"); } finally { try { await handle?.close(); @@ -38479,9 +38948,9 @@ async function readBoundedRegularFile(filename, maxBytes) { let handle; let outcome = { status: "malformed" }; try { - handle = await open5(filename, constants5.O_RDONLY | NO_FOLLOW3); + handle = await open6(filename, constants6.O_RDONLY | NO_FOLLOW4); const before = await handle.stat(); - const named = await lstat5(filename); + const named = await lstat6(filename); if (!before.isFile() || before.nlink !== 1 || before.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== before.dev || named.ino !== before.ino || named.size !== before.size) return outcome; const bytes = Buffer.alloc(before.size); let offset = 0; @@ -38491,11 +38960,11 @@ async function readBoundedRegularFile(filename, maxBytes) { offset += bytesRead; } const after = await handle.stat(); - const settledNamed = await lstat5(filename); + const settledNamed = await lstat6(filename); if (offset !== before.size || after.dev !== before.dev || after.ino !== before.ino || after.nlink !== 1 || after.size !== before.size || after.mtimeMs !== before.mtimeMs || after.ctimeMs !== before.ctimeMs || settledNamed.dev !== before.dev || settledNamed.ino !== before.ino || settledNamed.nlink !== 1 || settledNamed.size !== before.size) return outcome; outcome = { status: "ok", text: bytes.toString("utf8") }; } catch (error51) { - if (errorCode5(error51) === "ENOENT") outcome = { status: "missing" }; + if (errorCode6(error51) === "ENOENT") outcome = { status: "missing" }; } finally { try { await handle?.close(); @@ -38531,7 +39000,7 @@ function parseRegistration(text) { } if (typeof value !== "object" || value === null || Array.isArray(value)) return null; const record2 = value; - if (record2.ownershipVersion !== "1" || typeof record2.workflowId !== "string" || !WORKFLOW_ID.test(record2.workflowId) || typeof record2.checkoutPath !== "string" || !path13.isAbsolute(record2.checkoutPath) || typeof record2.gitCommonDir !== "string" || !path13.isAbsolute(record2.gitCommonDir) || typeof record2.repositoryIdentity !== "string" || typeof record2.worktreePath !== "string" || !path13.isAbsolute(record2.worktreePath) || typeof record2.worktreeGitDir !== "string" || !path13.isAbsolute(record2.worktreeGitDir) || typeof record2.branch !== "string" || record2.branchRef !== `refs/heads/${record2.branch}` || record2.baseRef !== `refs/claude-architect/autopilot/${record2.workflowId}/base` || typeof record2.baseBranch !== "string" || typeof record2.baseCommitOid !== "string" || !OID.test(record2.baseCommitOid) || record2.remote !== "origin" || typeof record2.remoteUrl !== "string" || typeof record2.ownerRepo !== "string" || !isBootstrapOwner(record2.bootstrapOwner, record2.workflowId)) return null; + if (record2.ownershipVersion !== "1" || typeof record2.workflowId !== "string" || !WORKFLOW_ID.test(record2.workflowId) || typeof record2.checkoutPath !== "string" || !path14.isAbsolute(record2.checkoutPath) || typeof record2.gitCommonDir !== "string" || !path14.isAbsolute(record2.gitCommonDir) || typeof record2.repositoryIdentity !== "string" || typeof record2.worktreePath !== "string" || !path14.isAbsolute(record2.worktreePath) || typeof record2.worktreeGitDir !== "string" || !path14.isAbsolute(record2.worktreeGitDir) || typeof record2.branch !== "string" || record2.branchRef !== `refs/heads/${record2.branch}` || record2.baseRef !== `refs/claude-architect/autopilot/${record2.workflowId}/base` || typeof record2.baseBranch !== "string" || typeof record2.baseCommitOid !== "string" || !OID.test(record2.baseCommitOid) || record2.remote !== "origin" || typeof record2.remoteUrl !== "string" || typeof record2.ownerRepo !== "string" || !isBootstrapOwner(record2.bootstrapOwner, record2.workflowId)) return null; return record2; } async function ownerStatus(owner, ps, isProcessAlive2) { @@ -38555,23 +39024,23 @@ function registrationFilename(workflowId) { } async function safeDirectoryEntries(directory, issues) { try { - const metadata = await lstat5(directory); + const metadata = await lstat6(directory); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { issues.add("autopilot-state-malformed"); return []; } - const entries = await readdir3(directory, { withFileTypes: true }); + const entries = await readdir4(directory, { withFileTypes: true }); if (entries.length > MAX_AUTOPILOT_SCAN_ENTRIES) { issues.add("autopilot-state-malformed"); } return entries.sort((left, right) => left.name.localeCompare(right.name)).slice(0, MAX_AUTOPILOT_SCAN_ENTRIES); } catch (error51) { - if (errorCode5(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); + if (errorCode6(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); return []; } } async function scanRegistrations(stateRoot2, issues) { - const root = path13.join(stateRoot2, "autopilot-branches"); + const root = path14.join(stateRoot2, "autopilot-branches"); const entries = await safeDirectoryEntries(root, issues); const registrations = /* @__PURE__ */ new Map(); const filenames = /* @__PURE__ */ new Set(); @@ -38582,7 +39051,7 @@ async function scanRegistrations(stateRoot2, issues) { continue; } const read = await readBoundedRegularFile( - path13.join(root, entry.name), + path14.join(root, entry.name), MAX_AUTOPILOT_REGISTRATION_BYTES ); if (read.status !== "ok") { @@ -38609,8 +39078,8 @@ function expectedHead(state, registration) { async function observedBranchMatches(registration, state, git2) { try { const [checkoutMetadata, worktreeMetadata] = await Promise.all([ - lstat5(registration.checkoutPath), - lstat5(registration.worktreePath) + lstat6(registration.checkoutPath), + lstat6(registration.worktreePath) ]); if (!checkoutMetadata.isDirectory() || checkoutMetadata.isSymbolicLink() || !worktreeMetadata.isDirectory() || worktreeMetadata.isSymbolicLink()) return false; const [checkout, worktree, common] = await Promise.all([ @@ -38646,11 +39115,11 @@ async function observedBranchMatches(registration, state, git2) { } async function autopilotIssues(stateDir, ps, isProcessAlive2, git2) { if (stateDir === void 0) return []; - const stateRoot2 = path13.resolve(stateDir); + const stateRoot2 = path14.resolve(stateDir); const issues = /* @__PURE__ */ new Set(); let probes = 0; const registrationScan = await scanRegistrations(stateRoot2, issues); - const workflowsRoot = path13.join(stateRoot2, "workflows"); + const workflowsRoot = path14.join(stateRoot2, "workflows"); const workflowEntries = await safeDirectoryEntries(workflowsRoot, issues); const states = /* @__PURE__ */ new Map(); for (const entry of workflowEntries) { @@ -38711,11 +39180,11 @@ async function autopilotIssues(stateDir, ps, isProcessAlive2, git2) { } let worktreeExists = false; try { - const metadata = await lstat5(state.worktreePath); + const metadata = await lstat6(state.worktreePath); worktreeExists = metadata.isDirectory() && !metadata.isSymbolicLink(); if (!worktreeExists) issues.add("autopilot-state-malformed"); } catch (error51) { - if (errorCode5(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); + if (errorCode6(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); } if (worktreeExists && registrationMissing) { issues.add("autopilot-worktree-orphaned"); @@ -38775,24 +39244,24 @@ async function doctor(deps = {}) { issues.push(...await checkoutLockIssues( stateDir, ps, - deps.isProcessAlive ?? defaultIsProcessAlive + deps.isProcessAlive ?? defaultIsProcessAlive2 )); issues.push(...await autopilotIssues( stateDir, ps, - deps.isProcessAlive ?? defaultIsProcessAlive, + deps.isProcessAlive ?? defaultIsProcessAlive2, gitRunner )); let git2 = { version: null, ok: false, path: null }; try { const result = await gitRunner(process.cwd(), ["--version"]); const version2 = result.exitCode === 0 && result.truncated?.stdout !== true ? gitVersion(result.stdout) : null; - let path33 = null; + let path35 = null; try { - path33 = (await ps.resolveExecutable({ name: "git" })).command; + path35 = (await ps.resolveExecutable({ name: "git" })).command; } catch { } - git2 = { version: version2, ok: version2 !== null, path: path33 }; + git2 = { version: version2, ok: version2 !== null, path: path35 }; } catch { } if (!git2.ok) issues.push("git-unavailable"); @@ -38943,10 +39412,10 @@ function gitChangedFiles(checkoutPath, deps = {}) { import { createHash as createHash15 } from "node:crypto"; // src/autopilot/autopilot-controller.ts -import { randomUUID as randomUUID8 } from "node:crypto"; +import { randomUUID as randomUUID10 } from "node:crypto"; // src/protocol/spec-validator.ts -import path14 from "node:path"; +import path15 from "node:path"; var schemas = loadSchemas(); function allowlistCovers(top, glob) { return top.some((pattern) => { @@ -38957,7 +39426,7 @@ function allowlistCovers(top, glob) { }); } function isSafeRepositoryGlob(glob) { - return glob.length > 0 && !path14.posix.isAbsolute(glob) && !path14.win32.isAbsolute(glob) && !glob.split(/[\\/]/).includes(".."); + return glob.length > 0 && !path15.posix.isAbsolute(glob) && !path15.win32.isAbsolute(glob) && !glob.split(/[\\/]/).includes(".."); } function sliceDependencyError(sliceIndex, dependencyIndex, message) { return { @@ -39039,8 +39508,8 @@ function validateSpec(input) { ); if (topLevelDeletionError !== null) return topLevelDeletionError; for (const [index, command] of spec.verification.entries()) { - const normalizedCwd = path14.posix.normalize(command.cwd); - if (path14.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { + const normalizedCwd = path15.posix.normalize(command.cwd); + if (path15.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { return { ok: false, errors: [{ @@ -39068,8 +39537,8 @@ function validateSpec(input) { } } for (const [commandIndex, command] of slice.verification.entries()) { - const normalizedCwd = path14.posix.normalize(command.cwd); - if (path14.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { + const normalizedCwd = path15.posix.normalize(command.cwd); + if (path15.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { return { ok: false, errors: [{ @@ -39231,9 +39700,9 @@ function sortChangedPaths(changedPaths) { function deriveChangedPaths(inputs) { const rawEntries = new Map(inputs.rawDiff.map((entry) => [entry.path, entry])); const treeEntries = parseTree(inputs.treeOutput); - return sortChangedPaths(parseNameStatus(inputs.nameStatusOutput).map(({ path: path33, status }) => { - const treeEntry = treeEntries.get(path33); - const rawEntry = rawEntries.get(path33); + return sortChangedPaths(parseNameStatus(inputs.nameStatusOutput).map(({ path: path35, status }) => { + const treeEntry = treeEntries.get(path35); + const rawEntry = rawEntries.get(path35); if (treeEntry === void 0 && status !== "D") { throw new RuntimeError("candidate tree is missing a changed path"); } @@ -39241,7 +39710,7 @@ function deriveChangedPaths(inputs) { throw new RuntimeError("git diff-tree outputs disagree"); } return { - path: path33, + path: path35, changeType: changeType(status), mode: treeEntry?.mode ?? rawEntry.oldMode, contentHash: treeEntry?.oid ?? null @@ -39268,7 +39737,7 @@ function validateChangedPaths(changedPaths) { } function manifestHashOf(changedPaths) { validateChangedPaths(changedPaths); - const canonical = changedPaths.map(({ path: path33, changeType: changeType2, mode, contentHash }) => ({ path: path33, changeType: changeType2, mode, contentHash })); + const canonical = changedPaths.map(({ path: path35, changeType: changeType2, mode, contentHash }) => ({ path: path35, changeType: changeType2, mode, contentHash })); return createHash6("sha256").update(JSON.stringify(canonical)).digest("hex"); } function inspectChangedPathManifest(inputs) { @@ -39682,10 +40151,10 @@ function evaluateAutopilotEligibility(input) { } // src/autopilot/final-branch-reviewer.ts -import { createHash as createHash11, randomUUID as randomUUID7 } from "node:crypto"; -import { constants as constants11 } from "node:fs"; -import { link as link5, lstat as lstat14, open as open11, readFile as readFile4, rm as rm8 } from "node:fs/promises"; -import path23 from "node:path"; +import { createHash as createHash11, randomUUID as randomUUID9 } from "node:crypto"; +import { constants as constants13 } from "node:fs"; +import { link as link7, lstat as lstat16, open as open13, readFile as readFile6, rm as rm10 } from "node:fs/promises"; +import path25 from "node:path"; // src/util/glob.ts function escapeRegex2(character) { @@ -39716,14 +40185,14 @@ function globMatches(pattern, candidate, caseInsensitive = false) { } // src/runtime/worktree-manager.ts -import { randomUUID as randomUUID4 } from "node:crypto"; -import { lstat as lstat9, mkdir as mkdir4, readdir as readdir5, realpath as realpath7, rename as rename4 } from "node:fs/promises"; -import path17 from "node:path"; +import { randomUUID as randomUUID6 } from "node:crypto"; +import { lstat as lstat11, mkdir as mkdir5, readdir as readdir6, realpath as realpath7, rename as rename5 } from "node:fs/promises"; +import path19 from "node:path"; // src/platform/bound-directory-cleanup.ts -import { constants as constants6 } from "node:fs"; -import { access as access4, lstat as lstat6, open as open6, rmdir } from "node:fs/promises"; -import path15 from "node:path"; +import { constants as constants7 } from "node:fs"; +import { access as access4, lstat as lstat7, open as open7, rmdir } from "node:fs/promises"; +import path16 from "node:path"; var DEFAULT_EMPTY_DIRECTORY_TIMEOUT_MS = 12e4; var EMPTY_DIRECTORY_TIMEOUT_ENV = "CLAUDE_ARCHITECT_EMPTY_DIRECTORY_TIMEOUT_MS"; function resolveEmptyDirectoryTimeoutMs(env = process.env, warn = (message) => console.error(message)) { @@ -39971,7 +40440,7 @@ async function darwinHandlePath(directory, handle, platformServices) { handle.fd.toString(), "-F0pn" ], - cwd: path15.dirname(directory), + cwd: path16.dirname(directory), env: {}, timeoutMs: 5e3, maxOutputBytes: 16384 @@ -39989,13 +40458,13 @@ async function removeWindowsBoundEmptyDirectory(directory, expectedIdentity, pla executable: helper, args: [ "remove", - path15.toNamespacedPath(directory), + path16.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString(), "true" ], - cwd: path15.dirname(directory), + cwd: path16.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: 3e4, maxOutputBytes: 16384 @@ -40016,15 +40485,15 @@ async function verifyBoundDirectoryCleanupSupport(platformServices) { try { if (platformServices.os === "linux") { await Promise.all([ - access4("/proc/self/mountinfo", constants6.R_OK), - access4("/proc/self/fd", constants6.R_OK) + access4("/proc/self/mountinfo", constants7.R_OK), + access4("/proc/self/fd", constants7.R_OK) ]); return; } if (platformServices.os === "darwin") { await Promise.all([ - access4("/usr/sbin/lsof", constants6.X_OK), - access4("/bin/df", constants6.X_OK) + access4("/usr/sbin/lsof", constants7.X_OK), + access4("/bin/df", constants7.X_OK) ]); return; } @@ -40056,21 +40525,21 @@ async function removeBoundEmptyDirectory(directory, expectedIdentity, platformSe let handle; let primaryError; try { - const named = await lstat6(directory, { bigint: true }); + const named = await lstat7(directory, { bigint: true }); if (!named.isDirectory() || named.isSymbolicLink() || !sameBoundIdentity(named, expectedIdentity)) { throw new RuntimeError("directory identity changed before bound removal"); } - handle = await open6(directory, constants6.O_RDONLY | (constants6.O_NOFOLLOW ?? 0)); + handle = await open7(directory, constants7.O_RDONLY | (constants7.O_NOFOLLOW ?? 0)); const opened = await handle.stat({ bigint: true }); if (!opened.isDirectory() || !sameBoundIdentity(opened, expectedIdentity)) { throw new RuntimeError("opened directory identity changed before bound removal"); } - const settledNamed = await lstat6(directory, { bigint: true }); + const settledNamed = await lstat7(directory, { bigint: true }); if (!settledNamed.isDirectory() || settledNamed.isSymbolicLink() || !sameBoundIdentity(settledNamed, expectedIdentity)) { throw new RuntimeError("directory identity changed before final bound removal"); } const darwinPath = platformServices.os === "darwin" ? await darwinHandlePath(directory, handle, platformServices) : void 0; - const removalTarget = await lstat6(directory, { bigint: true }); + const removalTarget = await lstat7(directory, { bigint: true }); if (!removalTarget.isDirectory() || removalTarget.isSymbolicLink() || !sameBoundIdentity(removalTarget, expectedIdentity)) { throw new RuntimeError("directory identity changed at the final removal boundary"); } @@ -40132,31 +40601,31 @@ async function emptyBoundDirectory(directory, expectedIdentity, platformServices } // src/runtime/worktree-removal-manifest.ts -import { randomUUID as randomUUID3 } from "node:crypto"; -import { constants as constants8 } from "node:fs"; +import { randomUUID as randomUUID4 } from "node:crypto"; +import { constants as constants9 } from "node:fs"; import { - link as link2, - lstat as lstat8, - open as open8, - readdir as readdir4, + link as link3, + lstat as lstat9, + open as open9, + readdir as readdir5, realpath as realpath6, rename as rename3, - rm as rm4 + rm as rm5 } from "node:fs/promises"; -import path16 from "node:path"; +import path17 from "node:path"; // src/util/stable-file.ts -import { constants as constants7 } from "node:fs"; -import { lstat as lstat7, open as open7 } from "node:fs/promises"; +import { constants as constants8 } from "node:fs"; +import { lstat as lstat8, open as open8 } from "node:fs/promises"; async function readStableRegularFile(filename, maxBytes, dependencies = {}) { - const handle = await (dependencies.open ?? open7)( + const handle = await (dependencies.open ?? open8)( filename, - constants7.O_RDONLY | (constants7.O_NOFOLLOW ?? 0) | (constants7.O_NONBLOCK ?? 0) + constants8.O_RDONLY | (constants8.O_NOFOLLOW ?? 0) | (constants8.O_NONBLOCK ?? 0) ); let primaryError; try { const metadata = await handle.stat({ bigint: true }); - const named = await (dependencies.lstat ?? lstat7)(filename, { bigint: true }); + const named = await (dependencies.lstat ?? lstat8)(filename, { bigint: true }); if (!metadata.isFile() || metadata.nlink !== 1n || metadata.birthtimeNs <= 0n || metadata.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.birthtimeNs <= 0n || named.nlink !== 1n || named.dev !== metadata.dev || named.ino !== metadata.ino || named.birthtimeNs !== metadata.birthtimeNs || named.size !== metadata.size) return null; if (maxBytes < 0n || maxBytes >= BigInt(Number.MAX_SAFE_INTEGER)) return null; const limit = Math.min(Number(maxBytes) + 1, Number(metadata.size) + 1); @@ -40170,7 +40639,7 @@ async function readStableRegularFile(filename, maxBytes, dependencies = {}) { if (bytesRead > Number(maxBytes)) return null; const contents = buffer.subarray(0, bytesRead); const settled = await handle.stat({ bigint: true }); - const settledNamed = await (dependencies.lstat ?? lstat7)(filename, { bigint: true }); + const settledNamed = await (dependencies.lstat ?? lstat8)(filename, { bigint: true }); if (!settled.isFile() || settled.nlink !== 1n || settled.birthtimeNs <= 0n || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.size !== metadata.size || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.birthtimeNs <= 0n || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size || settledNamed.mtimeNs !== settled.mtimeNs || settledNamed.ctimeNs !== settled.ctimeNs || BigInt(contents.byteLength) !== metadata.size) return null; return contents; } catch (error51) { @@ -40197,14 +40666,14 @@ var HARDLINK_PROBE_NAME = /^\.hardlink-probe-([0-9a-f-]{36})\.(source|linked)$/i var MANIFEST_REMOVAL_GUARD = /^\.remove-manifest-([a-z0-9][a-z0-9-]{0,127})\.[0-9a-f-]{36}\.guard$/i; var MANIFEST_VERSION = "1"; var MAX_MANIFEST_BYTES = 32768n; -function sameIdentity2(metadata, expected) { +function sameIdentity3(metadata, expected) { return metadata.dev === expected.dev && metadata.ino === expected.ino && metadata.birthtimeNs > 0n && metadata.birthtimeNs === expected.birthtimeNs; } -function errorCode6(error51) { +function errorCode7(error51) { return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; } function manifestRoot() { - return path16.join(resolveStateDir(), MANIFEST_DIRECTORY); + return path17.join(resolveStateDir(), MANIFEST_DIRECTORY); } async function ensurePrivateDirectory2(directory) { return await ensurePrivateDirectory(directory, { @@ -40212,23 +40681,23 @@ async function ensurePrivateDirectory2(directory) { }); } async function assertDirectoryIdentity3(directory, expected) { - const metadata = await lstat8(directory, { bigint: true }); - if (!metadata.isDirectory() || metadata.isSymbolicLink() || !sameIdentity2(metadata, expected)) { + const metadata = await lstat9(directory, { bigint: true }); + if (!metadata.isDirectory() || metadata.isSymbolicLink() || !sameIdentity3(metadata, expected)) { throw new RuntimeError("worktree removal manifest directory identity changed"); } } async function assertMissing(filename, description) { try { - await lstat8(filename); + await lstat9(filename); } catch (error51) { - if (errorCode6(error51) === "ENOENT") return; + if (errorCode7(error51) === "ENOENT") return; throw error51; } throw new RuntimeError(`${description} unexpectedly remains`); } async function assertManifestIdentity(manifestPath, expected, expectedLinks) { - const metadata = await lstat8(manifestPath, { bigint: true }); - if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== expectedLinks || !sameIdentity2(metadata, expected)) { + const metadata = await lstat9(manifestPath, { bigint: true }); + if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== expectedLinks || !sameIdentity3(metadata, expected)) { throw new RuntimeError("worktree removal manifest publication identity changed"); } } @@ -40269,8 +40738,8 @@ async function writeSyncedManifest(handle, manifest) { } function validateManifestPath(manifestPath, transactionId) { const root = manifestRoot(); - const expected = path16.join(root, `${transactionId}.json`); - if (!MANIFEST_NAME.test(path16.basename(manifestPath)) || manifestPath !== expected) { + const expected = path17.join(root, `${transactionId}.json`); + if (!MANIFEST_NAME.test(path17.basename(manifestPath)) || manifestPath !== expected) { throw new RuntimeError("worktree removal manifest path is invalid"); } return root; @@ -40334,7 +40803,7 @@ function parseManifest(contents, transactionId) { record2.registrationPath, record2.quarantineRoot, record2.quarantinePath - ].every((value2) => typeof value2 === "string" && path16.isAbsolute(value2)) || record2.physicalPresent === false && (record2.physicalDev !== "0" || record2.physicalIno !== "0" || record2.physicalBirthtimeNs !== "0")) { + ].every((value2) => typeof value2 === "string" && path17.isAbsolute(value2)) || record2.physicalPresent === false && (record2.physicalDev !== "0" || record2.physicalIno !== "0" || record2.physicalBirthtimeNs !== "0")) { throw new RuntimeError("worktree removal manifest is malformed"); } return record2; @@ -40342,16 +40811,16 @@ function parseManifest(contents, transactionId) { async function verifyWorktreeRemovalManifestStorage() { const root = manifestRoot(); const rootIdentity = await ensurePrivateDirectory2(root); - const token = randomUUID3(); - const sourcePath = path16.join(root, `.hardlink-probe-${token}.source`); - const linkedPath = path16.join(root, `.hardlink-probe-${token}.linked`); + const token = randomUUID4(); + const sourcePath = path17.join(root, `.hardlink-probe-${token}.source`); + const linkedPath = path17.join(root, `.hardlink-probe-${token}.linked`); let sourceExists = false; let linkedExists = false; let primaryError; try { - const handle = await open8( + const handle = await open9( sourcePath, - constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | (constants8.O_NOFOLLOW ?? 0), + constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | (constants9.O_NOFOLLOW ?? 0), 384 ); sourceExists = true; @@ -40372,7 +40841,7 @@ async function verifyWorktreeRemovalManifestStorage() { await handle.close(); } await assertDirectoryIdentity3(root, rootIdentity); - await link2(sourcePath, linkedPath); + await link3(sourcePath, linkedPath); linkedExists = true; await Promise.all([ assertManifestIdentity(sourcePath, identity, 2n), @@ -40384,8 +40853,8 @@ async function verifyWorktreeRemovalManifestStorage() { const cleanupErrors = []; try { await assertDirectoryIdentity3(root, rootIdentity); - if (linkedExists) await rm4(linkedPath, { force: false }); - if (sourceExists) await rm4(sourcePath, { force: false }); + if (linkedExists) await rm5(linkedPath, { force: false }); + if (sourceExists) await rm5(sourcePath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { @@ -40413,31 +40882,31 @@ async function persistWorktreeRemovalManifest(manifest) { validateManifestForWrite(manifest); const root = manifestRoot(); const rootIdentity = await ensurePrivateDirectory2(root); - const manifestPath = path16.join(root, `${manifest.transactionId}.json`); - const temporaryPath = path16.join( + const manifestPath = path17.join(root, `${manifest.transactionId}.json`); + const temporaryPath = path17.join( root, - `.${manifest.transactionId}.${randomUUID3()}.tmp` + `.${manifest.transactionId}.${randomUUID4()}.tmp` ); let temporaryExists = false; let manifestExists = false; try { - const handle = await open8( + const handle = await open9( temporaryPath, - constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | (constants8.O_NOFOLLOW ?? 0), + constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | (constants9.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; const temporaryIdentity = await writeSyncedManifest(handle, manifest); await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(temporaryPath, temporaryIdentity, 1n); - await link2(temporaryPath, manifestPath); + await link3(temporaryPath, manifestPath); manifestExists = true; await assertDirectoryIdentity3(root, rootIdentity); await Promise.all([ assertManifestIdentity(temporaryPath, temporaryIdentity, 2n), assertManifestIdentity(manifestPath, temporaryIdentity, 2n) ]); - await rm4(temporaryPath); + await rm5(temporaryPath); temporaryExists = false; await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); @@ -40456,14 +40925,14 @@ async function persistWorktreeRemovalManifest(manifest) { } if (temporaryExists) { try { - await rm4(temporaryPath, { force: true }); + await rm5(temporaryPath, { force: true }); } catch (cleanupError) { cleanupErrors.push(cleanupError); } } if (manifestExists) { try { - await rm4(manifestPath, { force: true }); + await rm5(manifestPath, { force: true }); } catch (cleanupError) { cleanupErrors.push(cleanupError); } @@ -40481,16 +40950,16 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { validateManifestForWrite(manifest); const root = validateManifestPath(manifestPath, manifest.transactionId); const rootIdentity = await ensurePrivateDirectory2(root); - const temporaryPath = path16.join( + const temporaryPath = path17.join( root, - `.${manifest.transactionId}.${randomUUID3()}.tmp` + `.${manifest.transactionId}.${randomUUID4()}.tmp` ); let temporaryExists = false; let primaryError; try { - const handle = await open8( + const handle = await open9( temporaryPath, - constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | (constants8.O_NOFOLLOW ?? 0), + constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | (constants9.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; @@ -40511,7 +40980,7 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { if (temporaryExists) { try { await assertDirectoryIdentity3(root, rootIdentity); - await rm4(temporaryPath, { force: true }); + await rm5(temporaryPath, { force: true }); } catch (cleanupError) { if (primaryError === void 0) throw cleanupError; throw new AggregateError( @@ -40525,7 +40994,7 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { async function removeWorktreeRemovalManifest(manifestPath, transactionId) { const root = validateManifestPath(manifestPath, transactionId); const rootIdentity = await ensurePrivateDirectory2(root); - const manifestMetadata = await lstat8(manifestPath, { bigint: true }); + const manifestMetadata = await lstat9(manifestPath, { bigint: true }); if (!manifestMetadata.isFile() || manifestMetadata.isSymbolicLink() || manifestMetadata.nlink !== 1n || manifestMetadata.birthtimeNs <= 0n) { throw new RuntimeError("worktree removal manifest identity is ambiguous before removal"); } @@ -40534,21 +41003,21 @@ async function removeWorktreeRemovalManifest(manifestPath, transactionId) { ino: manifestMetadata.ino, birthtimeNs: manifestMetadata.birthtimeNs }; - const guardPath = path16.join( + const guardPath = path17.join( root, - `.remove-manifest-${transactionId}.${randomUUID3()}.guard` + `.remove-manifest-${transactionId}.${randomUUID4()}.guard` ); await assertDirectoryIdentity3(root, rootIdentity); - await link2(manifestPath, guardPath); + await link3(manifestPath, guardPath); await Promise.all([ assertManifestIdentity(manifestPath, identity, 2n), assertManifestIdentity(guardPath, identity, 2n) ]); - await rm4(manifestPath, { force: false }); + await rm5(manifestPath, { force: false }); await assertDirectoryIdentity3(root, rootIdentity); await assertMissing(manifestPath, "worktree removal manifest"); await assertManifestIdentity(guardPath, identity, 1n); - await rm4(guardPath, { force: false }); + await rm5(guardPath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); await Promise.all([ @@ -40557,18 +41026,18 @@ async function removeWorktreeRemovalManifest(manifestPath, transactionId) { ]); } async function readLinkedManifest(temporaryPath, manifestPath) { - const handle = await open8( + const handle = await open9( manifestPath, - constants8.O_RDONLY | (constants8.O_NOFOLLOW ?? 0) + constants9.O_RDONLY | (constants9.O_NOFOLLOW ?? 0) ); let primaryError; try { const [opened, temporary, published] = await Promise.all([ handle.stat({ bigint: true }), - lstat8(temporaryPath, { bigint: true }), - lstat8(manifestPath, { bigint: true }) + lstat9(temporaryPath, { bigint: true }), + lstat9(manifestPath, { bigint: true }) ]); - if (!opened.isFile() || opened.nlink !== 2n || opened.size > MAX_MANIFEST_BYTES || !temporary.isFile() || temporary.isSymbolicLink() || temporary.nlink !== 2n || !published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity2(temporary, opened) || !sameIdentity2(published, opened) || temporary.size !== opened.size || published.size !== opened.size) { + if (!opened.isFile() || opened.nlink !== 2n || opened.size > MAX_MANIFEST_BYTES || !temporary.isFile() || temporary.isSymbolicLink() || temporary.nlink !== 2n || !published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity3(temporary, opened) || !sameIdentity3(published, opened) || temporary.size !== opened.size || published.size !== opened.size) { throw new RuntimeError("linked worktree removal manifest residue is ambiguous"); } const size = Number(opened.size); @@ -40581,10 +41050,10 @@ async function readLinkedManifest(temporaryPath, manifestPath) { } const [settled, settledTemporary, settledPublished] = await Promise.all([ handle.stat({ bigint: true }), - lstat8(temporaryPath, { bigint: true }), - lstat8(manifestPath, { bigint: true }) + lstat9(temporaryPath, { bigint: true }), + lstat9(manifestPath, { bigint: true }) ]); - if (offset !== size || !sameIdentity2(settled, opened) || settled.nlink !== 2n || settled.size !== opened.size || settled.mtimeNs !== opened.mtimeNs || settled.ctimeNs !== opened.ctimeNs || !sameIdentity2(settledTemporary, opened) || settledTemporary.nlink !== 2n || !sameIdentity2(settledPublished, opened) || settledPublished.nlink !== 2n) { + if (offset !== size || !sameIdentity3(settled, opened) || settled.nlink !== 2n || settled.size !== opened.size || settled.mtimeNs !== opened.mtimeNs || settled.ctimeNs !== opened.ctimeNs || !sameIdentity3(settledTemporary, opened) || settledTemporary.nlink !== 2n || !sameIdentity3(settledPublished, opened) || settledPublished.nlink !== 2n) { throw new RuntimeError("linked worktree removal manifest residue changed while reading"); } return contents; @@ -40605,8 +41074,8 @@ async function readLinkedManifest(temporaryPath, manifestPath) { } async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, transactionId) { const root = validateManifestPath(manifestPath, transactionId); - const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(path16.basename(temporaryPath)); - if (temporaryMatch?.[1] !== transactionId || path16.dirname(temporaryPath) !== root) { + const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(path17.basename(temporaryPath)); + if (temporaryMatch?.[1] !== transactionId || path17.dirname(temporaryPath) !== root) { throw new RuntimeError("temporary worktree removal manifest path is invalid"); } const rootIdentity = await ensurePrivateDirectory2(root); @@ -40614,17 +41083,17 @@ async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, let published; try { [temporary, published] = await Promise.all([ - lstat8(temporaryPath, { bigint: true }), - lstat8(manifestPath, { bigint: true }) + lstat9(temporaryPath, { bigint: true }), + lstat9(manifestPath, { bigint: true }) ]); } catch (error51) { - if (errorCode6(error51) === "ENOENT") { - const remaining = await lstat8(manifestPath, { bigint: true }).catch(() => null); + if (errorCode7(error51) === "ENOENT") { + const remaining = await lstat9(manifestPath, { bigint: true }).catch(() => null); if (remaining !== null && remaining.isFile() && remaining.nlink === 1n) return; } throw error51; } - if (!temporary.isFile() || temporary.isSymbolicLink() || temporary.nlink !== 2n || !published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity2(temporary, published)) { + if (!temporary.isFile() || temporary.isSymbolicLink() || temporary.nlink !== 2n || !published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity3(temporary, published)) { throw new RuntimeError("linked worktree removal manifest residue is ambiguous"); } const publishedIdentity = { @@ -40633,7 +41102,7 @@ async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, birthtimeNs: published.birthtimeNs }; await assertDirectoryIdentity3(root, rootIdentity); - await rm4(temporaryPath, { force: false }); + await rm5(temporaryPath, { force: false }); await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, publishedIdentity, 1n); await syncDirectoryMetadata(root); @@ -40647,7 +41116,7 @@ async function readWorktreeRemovalManifest(manifestPath, transactionId) { try { contents = await readStableRegularFile(manifestPath, MAX_MANIFEST_BYTES); } catch (error51) { - if (errorCode6(error51) === "ENOENT") return null; + if (errorCode7(error51) === "ENOENT") return null; throw error51; } await assertDirectoryIdentity3(root, rootIdentity); @@ -40665,9 +41134,9 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { description: "worktree removal manifest root", create: false }); - entries = await readdir4(root, { withFileTypes: true }); + entries = await readdir5(root, { withFileTypes: true }); } catch (error51) { - if (errorCode6(error51) === "ENOENT") return; + if (errorCode7(error51) === "ENOENT") return; throw error51; } for (const entry of entries) { @@ -40678,7 +41147,7 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { if (match === null || !entry.isFile() || entry.isSymbolicLink()) { throw new RuntimeError("worktree removal manifest root contains ambiguous residue"); } - const manifestPath = path16.join(root, entry.name); + const manifestPath = path17.join(root, entry.name); const manifest = await readWorktreeRemovalManifest(manifestPath, match[1]); if (manifest === null) { throw new RuntimeError("worktree removal manifest changed during lease validation"); @@ -40701,9 +41170,9 @@ async function readPendingWorktreeRemovalManifests() { const root = manifestRoot(); let initialMetadata; try { - initialMetadata = await lstat8(root, { bigint: true }); + initialMetadata = await lstat9(root, { bigint: true }); } catch (error51) { - if (errorCode6(error51) === "ENOENT") return { pending: [], issues: [] }; + if (errorCode7(error51) === "ENOENT") return { pending: [], issues: [] }; return { pending: [], issues: [{ manifestPath: root, error: error51 }] }; } if (!initialMetadata.isDirectory() || initialMetadata.isSymbolicLink()) { @@ -40719,7 +41188,7 @@ async function readPendingWorktreeRemovalManifests() { let entries; try { rootIdentity = await ensurePrivateDirectory2(root); - entries = await readdir4(root, { withFileTypes: true }); + entries = await readdir5(root, { withFileTypes: true }); await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { return { pending: [], issues: [{ manifestPath: root, error: error51 }] }; @@ -40731,23 +41200,23 @@ async function readPendingWorktreeRemovalManifests() { for (const entry of sortedEntries) { const guardMatch = MANIFEST_REMOVAL_GUARD.exec(entry.name); if (guardMatch === null) continue; - const guardPath = path16.join(root, entry.name); - const publishedPath = path16.join(root, `${guardMatch[1]}.json`); + const guardPath = path17.join(root, entry.name); + const publishedPath = path17.join(root, `${guardMatch[1]}.json`); try { await assertDirectoryIdentity3(root, rootIdentity); - const guard = await lstat8(guardPath, { bigint: true }); + const guard = await lstat9(guardPath, { bigint: true }); if (!guard.isFile() || guard.isSymbolicLink() || guard.birthtimeNs <= 0n || guard.nlink !== 1n && guard.nlink !== 2n) { throw new RuntimeError("worktree removal manifest guard is malformed"); } if (guard.nlink === 2n) { - const published = await lstat8(publishedPath, { bigint: true }); - if (!published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity2(published, guard)) { + const published = await lstat9(publishedPath, { bigint: true }); + if (!published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity3(published, guard)) { throw new RuntimeError("worktree removal manifest guard pair is inconsistent"); } } else { await assertMissing(publishedPath, "removed worktree manifest"); } - await rm4(guardPath, { force: false }); + await rm5(guardPath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { @@ -40759,7 +41228,7 @@ async function readPendingWorktreeRemovalManifests() { const match = HARDLINK_PROBE_NAME.exec(entry.name); if (match === null) continue; const pair = probeEntries.get(match[1]) ?? {}; - pair[match[2]] = path16.join(root, entry.name); + pair[match[2]] = path17.join(root, entry.name); probeEntries.set(match[1], pair); } for (const pair of probeEntries.values()) { @@ -40768,7 +41237,7 @@ async function readPendingWorktreeRemovalManifests() { await assertDirectoryIdentity3(root, rootIdentity); const metadata = await Promise.all(paths.map(async (probePath) => ({ path: probePath, - metadata: await lstat8(probePath, { bigint: true }) + metadata: await lstat9(probePath, { bigint: true }) }))); if (metadata.some(({ metadata: value }) => !value.isFile() || value.isSymbolicLink() || value.birthtimeNs <= 0n)) { throw new RuntimeError("manifest hard-link probe residue is malformed"); @@ -40777,11 +41246,11 @@ async function readPendingWorktreeRemovalManifests() { if (metadata[0].metadata.nlink !== 1n) { throw new RuntimeError("manifest hard-link probe residue has an external alias"); } - } else if (metadata.length !== 2 || metadata.some(({ metadata: value }) => value.nlink !== 2n) || !sameIdentity2(metadata[0].metadata, metadata[1].metadata)) { + } else if (metadata.length !== 2 || metadata.some(({ metadata: value }) => value.nlink !== 2n) || !sameIdentity3(metadata[0].metadata, metadata[1].metadata)) { throw new RuntimeError("manifest hard-link probe pair is inconsistent"); } for (const { path: probePath } of metadata.reverse()) { - await rm4(probePath, { force: false }); + await rm5(probePath, { force: false }); } await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); @@ -40792,7 +41261,7 @@ async function readPendingWorktreeRemovalManifests() { for (const entry of sortedEntries) { const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(entry.name); if (temporaryMatch === null) continue; - const temporaryPath = path16.join(root, entry.name); + const temporaryPath = path17.join(root, entry.name); if (!entry.isFile() || entry.isSymbolicLink()) { issues.push({ manifestPath: temporaryPath, @@ -40801,16 +41270,16 @@ async function readPendingWorktreeRemovalManifests() { continue; } const transactionId = temporaryMatch[1]; - const publishedPath = path16.join(root, `${transactionId}.json`); + const publishedPath = path17.join(root, `${transactionId}.json`); try { await assertDirectoryIdentity3(root, rootIdentity); - const temporaryMetadata = await lstat8(temporaryPath, { bigint: true }); + const temporaryMetadata = await lstat9(temporaryPath, { bigint: true }); if (temporaryMetadata.nlink === 1n) { const contents = await readStableRegularFile(temporaryPath, MAX_MANIFEST_BYTES); if (contents === null) { throw new RuntimeError("unpublished worktree removal manifest is not stable"); } - await rm4(temporaryPath, { force: false }); + await rm5(temporaryPath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); } else { @@ -40829,7 +41298,7 @@ async function readPendingWorktreeRemovalManifests() { } for (const entry of sortedEntries) { if (TEMPORARY_MANIFEST_NAME.test(entry.name) || HARDLINK_PROBE_NAME.test(entry.name) || MANIFEST_REMOVAL_GUARD.test(entry.name)) continue; - const manifestPath = path16.join(root, entry.name); + const manifestPath = path17.join(root, entry.name); const match = MANIFEST_NAME.exec(entry.name); if (match === null || !entry.isFile() || entry.isSymbolicLink()) { issues.push({ @@ -40856,35 +41325,263 @@ async function readPendingWorktreeRemovalManifests() { return { pending, issues }; } -// src/runtime/worktree-mutation-gate.ts -var WORKTREE_MUTATION_GUARD = /* @__PURE__ */ Symbol("claude-architect.worktree-mutation-guard"); -function guardWorktreeMutations(services3) { - if (services3[WORKTREE_MUTATION_GUARD] === true) return services3; - const guarded = Object.create(services3); - Object.defineProperty(guarded, WORKTREE_MUTATION_GUARD, { value: true }); - guarded.acquireCheckoutLock = async (checkoutPath, options) => { - const lease = await services3.acquireCheckoutLock(checkoutPath, options); +// src/platform/durable-write.ts +import { randomUUID as randomUUID5 } from "node:crypto"; +import { constants as constants10 } from "node:fs"; +import { link as link4, lstat as lstat10, mkdir as mkdir4, open as open10, readFile as readFile4, rename as rename4, rm as rm6 } from "node:fs/promises"; +import path18 from "node:path"; +import nodeProcess6 from "node:process"; +var NO_FOLLOW5 = constants10.O_NOFOLLOW ?? 0; +var SAFE_COMPONENT = /^[a-z0-9][a-z0-9._-]{0,127}$/i; +function isAlreadyPresent(error51) { + return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EEXIST"; +} +function sameIdentity4(left, right) { + if (left.dev !== right.dev || left.ino !== right.ino) return false; + if (left.birthtimeNs <= 0n || right.birthtimeNs <= 0n) return true; + return left.birthtimeNs === right.birthtimeNs; +} +var DurableDirectorySession = class { + directory; + identity; + policy; + handle; + closed = false; + constructor(directory, identity, policy = {}, handle) { + this.directory = directory; + this.identity = identity; + this.policy = policy; + this.handle = handle; + } + async assertIdentity() { + if (this.closed) { + throw new RuntimeError("durable directory session is closed"); + } + const current = await lstat10(this.directory, { bigint: true }); + if (!current.isDirectory() || current.isSymbolicLink() || !sameIdentity4(current, this.identity)) { + throw new RuntimeError("durable directory session identity changed"); + } + } + async sync() { + if (this.closed) { + throw new RuntimeError("durable directory session is closed"); + } + if (this.policy.syncDirectory !== void 0) { + await this.policy.syncDirectory(this.directory); + return; + } + if (this.handle !== void 0) { + try { + await this.handle.sync(); + return; + } catch { + } + } + await syncDirectoryMetadata(this.directory); + } + async close() { + this.closed = true; + if (this.handle !== void 0) { + try { + await this.handle.close(); + } catch { + } + this.handle = void 0; + } + } +}; +async function openDurableDirectorySession(directory, options = {}) { + let identity; + if (options.privateDirectory === true) { + identity = await ensurePrivateDirectory(directory, { + description: options.description ?? "durable directory", + create: options.create ?? false, + migratePermissions: true, + ...options.policy?.syncDirectory === void 0 ? {} : { syncDirectory: options.policy.syncDirectory } + }); + } else { + if (options.create !== false) { + try { + await mkdir4(directory, { recursive: true, mode: 448 }); + } catch (error51) { + if (!isAlreadyPresent(error51)) throw error51; + } + } + const metadata = await lstat10(directory, { bigint: true }); + if (!metadata.isDirectory() || metadata.isSymbolicLink()) { + throw new RuntimeError(`${options.description ?? "durable directory"} must be a plain directory`); + } + identity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs + }; + } + let handle; + if (options.policy?.platform !== "win32" && nodeProcess6.platform !== "win32") { try { - await assertNoPendingWorktreeRemovalForRepository(lease.repositoryIdentity); - return lease; + handle = await open10(directory, constants10.O_RDONLY | NO_FOLLOW5); + } catch { + } + } + return new DurableDirectorySession(directory, identity, options.policy, handle); +} +async function renameWithRetry(source, destination, platform = nodeProcess6.platform, maxAttempts = 50) { + for (let attempt = 1; ; attempt += 1) { + try { + await rename4(source, destination); + return; } catch (error51) { - const gateError = new RuntimeError( - "worktree mutation is unavailable while removal recovery remains ambiguous", - { classification: "recovery-ambiguous", cause: error51 } - ); + const code = typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; + const isTransientWin32 = platform === "win32" && (code === "EPERM" || code === "EACCES" || code === "EBUSY"); + if (isTransientWin32 && attempt < maxAttempts) { + await new Promise((resolve2) => setTimeout(resolve2, 50)); + continue; + } + throw error51; + } + } +} +async function writeAtomic(session, name, bytes, mode) { + if (path18.isAbsolute(name) || path18.basename(name) !== name || !SAFE_COMPONENT.test(name)) { + throw new RuntimeError(`atomic write target must be a safe leaf name: ${name}`); + } + const destination = path18.join(session.directory, name); + const temporaryPath = path18.join(session.directory, `.${name}.${randomUUID5()}.tmp`); + let handle; + let temporaryCreated = false; + try { + await session.assertIdentity(); + handle = await open10( + temporaryPath, + constants10.O_WRONLY | constants10.O_CREAT | constants10.O_EXCL | NO_FOLLOW5, + 384 + ); + temporaryCreated = true; + await session.assertIdentity(); + if (typeof bytes === "string") { + await handle.writeFile(bytes, { encoding: "utf8" }); + } else { + await handle.writeFile(bytes); + } + await handle.sync(); + await handle.close(); + handle = void 0; + await session.assertIdentity(); + if (mode === "immutable") { + try { + await link4(temporaryPath, destination); + } catch (error51) { + if (!isAlreadyPresent(error51)) throw error51; + await session.assertIdentity(); + const existing = await readFile4(destination); + const expected = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : bytes; + if (!existing.equals(expected)) { + throw new RuntimeError(`archive entry already exists with different content: ${name}`); + } + } + await rm6(temporaryPath, { force: true }); + temporaryCreated = false; + } else if (mode === "replace") { + await renameWithRetry(temporaryPath, destination); + temporaryCreated = false; + } + await session.sync(); + await session.assertIdentity(); + } finally { + if (handle !== void 0) { + try { + await handle.close(); + } catch { + } + } + if (temporaryCreated) { + try { + await rm6(temporaryPath, { force: true }); + } catch { + } + } + } +} + +// src/platform/platform-safety.ts +var PlatformSafety = class { + constructor(platformServices = getPlatformServices()) { + this.platformServices = platformServices; + } + platformServices; + async withCheckoutLease(checkout, fn, options) { + const lease = await this.platformServices.acquireCheckoutLock(checkout, { + ...options?.runId === void 0 ? {} : { runId: options.runId } + }); + let primaryError; + let result; + let completed = false; + try { + await this.assertAmbiguityGate(lease.repositoryIdentity); + result = await fn(lease); + completed = true; + return result; + } catch (error51) { + primaryError = error51; + throw error51; + } finally { try { await lease.release(); } catch (releaseError) { - throw new AggregateError( - [gateError, releaseError], - "worktree-removal gate failed and its checkout lease could not be released" - ); + if (completed && options?.onReleaseError !== void 0) { + result = options.onReleaseError(releaseError, result); + } else if (primaryError !== void 0) { + const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); + throw new AggregateError( + [primaryError, releaseError], + `${primaryMessage}; checkout lock release failed` + ); + } else { + throw releaseError; + } } - throw gateError; } - }; - return guarded; -} + } + async withRecoveryLease(checkout, fn, options) { + const lease = await this.platformServices.acquireCheckoutLock(checkout, { + ...options?.runId === void 0 ? {} : { runId: options.runId } + }); + let primaryError; + try { + return await fn(lease); + } catch (error51) { + primaryError = error51; + throw error51; + } finally { + try { + await lease.release(); + } catch (releaseError) { + if (primaryError !== void 0) { + throw new AggregateError( + [primaryError, releaseError], + "recovery lease release failed after operation failure" + ); + } + throw releaseError; + } + } + } + async writeAtomic(session, name, bytes, mode) { + return writeAtomic(session, name, bytes, mode); + } + async assertAmbiguityGate(repositoryIdentity) { + try { + await assertNoPendingWorktreeRemovalForRepository(repositoryIdentity); + } catch (error51) { + throw new RuntimeError( + "worktree mutation is unavailable while removal recovery remains ambiguous", + { classification: "recovery-ambiguous", cause: error51 } + ); + } + } +}; +var platformSafety = new PlatformSafety(); // src/runtime/worktree-removal-coordinator.ts async function rollbackPrecommit(manifestPath, transactionId, staged, primaryError) { @@ -40981,12 +41678,12 @@ var WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY = "claude-architect-quarantine"; function delay2(milliseconds) { return new Promise((resolve2) => setTimeout(resolve2, milliseconds)); } -function errorCode7(error51) { +function errorCode8(error51) { return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; } async function syncChangedDirectories(dependencies, ...directories) { const syncDirectory4 = dependencies.syncDirectory ?? syncDirectoryMetadata; - for (const directory of new Set(directories.map((value) => path17.resolve(value)))) { + for (const directory of new Set(directories.map((value) => path19.resolve(value)))) { await syncDirectory4(directory); } } @@ -40999,17 +41696,17 @@ function sameDirectoryIdentity(left, right) { return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; } async function quarantinedIdentityRemainsNamed(quarantineRoot, expectedIdentity) { - const entries = await readdir5(quarantineRoot, { withFileTypes: true }); + const entries = await readdir6(quarantineRoot, { withFileTypes: true }); for (const entry of entries) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const observed = await managedWorktreeDirectoryIdentity(path17.join(quarantineRoot, entry.name)); + const observed = await managedWorktreeDirectoryIdentity(path19.join(quarantineRoot, entry.name)); if (observed !== null && sameDirectoryIdentity(observed, expectedIdentity)) return true; } return false; } async function managedWorktreeDirectoryIdentity(directory) { try { - const metadata = await lstat9(directory, { bigint: true }); + const metadata = await lstat11(directory, { bigint: true }); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { throw new RuntimeError("managed worktree must be a plain directory"); } @@ -41022,7 +41719,7 @@ async function managedWorktreeDirectoryIdentity(directory) { birthtimeNs: metadata.birthtimeNs }; } catch (error51) { - if (errorCode7(error51) === "ENOENT") return null; + if (errorCode8(error51) === "ENOENT") return null; throw error51; } } @@ -41067,28 +41764,28 @@ async function removeQuarantinedDirectory(quarantineRoot, quarantinePath, expect } } async function managedPath(worktreePath) { - const root = path17.resolve(resolveStateDir(), "worktrees"); - const target = path17.resolve(worktreePath); + const root = path19.resolve(resolveStateDir(), "worktrees"); + const target = path19.resolve(worktreePath); let canonicalRoot; try { canonicalRoot = await realpath7(root); } catch (error51) { - if (errorCode7(error51) !== "ENOENT") throw error51; - canonicalRoot = path17.join(await realpath7(path17.dirname(root)), path17.basename(root)); + if (errorCode8(error51) !== "ENOENT") throw error51; + canonicalRoot = path19.join(await realpath7(path19.dirname(root)), path19.basename(root)); } let canonicalTarget; try { canonicalTarget = await canonicalizeWorktreePath(target, true); } catch (error51) { - if (errorCode7(error51) !== "ENOENT") throw error51; - const targetParent = path17.dirname(target); - canonicalTarget = path17.join( - await realpath7(path17.dirname(targetParent)), - path17.basename(targetParent), - path17.basename(target) + if (errorCode8(error51) !== "ENOENT") throw error51; + const targetParent = path19.dirname(target); + canonicalTarget = path19.join( + await realpath7(path19.dirname(targetParent)), + path19.basename(targetParent), + path19.basename(target) ); } - if (platformPathsEqual(canonicalTarget, canonicalRoot) || !platformPathsEqual(path17.dirname(canonicalTarget), canonicalRoot)) { + if (platformPathsEqual(canonicalTarget, canonicalRoot) || !platformPathsEqual(path19.dirname(canonicalTarget), canonicalRoot)) { throw new RuntimeError("refusing to remove unmanaged worktree path"); } return { root: canonicalRoot, target: canonicalTarget }; @@ -41107,18 +41804,18 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option if (!sameDirectoryIdentity(observedIdentity, expectedIdentity)) { throw new RuntimeError("managed worktree directory identity changed before quarantine"); } - const quarantineToken = (options.uuid ?? randomUUID4)(); + const quarantineToken = (options.uuid ?? randomUUID6)(); if (!SAFE_QUARANTINE_TOKEN.test(quarantineToken)) { throw new RuntimeError("invalid managed worktree quarantine token"); } - const quarantinePath = path17.join( + const quarantinePath = path19.join( quarantineRoot, `.remove-${quarantineLabel}-${quarantineToken}` ); - if (path17.dirname(quarantinePath) !== quarantineRoot) { + if (path19.dirname(quarantinePath) !== quarantineRoot) { throw new RuntimeError("managed worktree quarantine path escaped its root"); } - const move = options.rename ?? rename4; + const move = options.rename ?? rename5; const wait = options.delay ?? delay2; let moveError; let moved = false; @@ -41208,7 +41905,7 @@ async function removeManagedWorktreeDirectory(worktreePath, options = {}) { return await removeDirectoryByQuarantine( root, target, - path17.basename(target), + path19.basename(target), options ); } @@ -41224,19 +41921,19 @@ async function isRegisteredWorktree(repoRoot, worktreePath, runGit, allowMissing ) !== -1; } async function boundPlainChildDirectory(root, candidate, description) { - const resolvedCandidate = path17.resolve(candidate); - if (!path17.isAbsolute(candidate) || !platformPathsEqual(path17.dirname(resolvedCandidate), root)) { + const resolvedCandidate = path19.resolve(candidate); + if (!path19.isAbsolute(candidate) || !platformPathsEqual(path19.dirname(resolvedCandidate), root)) { throw new RuntimeError(`${description} escaped its root`); } - const before = await lstat9(resolvedCandidate, { bigint: true }); + const before = await lstat11(resolvedCandidate, { bigint: true }); if (!before.isDirectory() || before.isSymbolicLink() || before.birthtimeNs <= 0n) { throw new RuntimeError(`${description} is not a stable plain directory`); } const canonical = await realpath7(resolvedCandidate); - if (!platformPathsEqual(canonical, resolvedCandidate) || !platformPathsEqual(path17.dirname(canonical), root)) { + if (!platformPathsEqual(canonical, resolvedCandidate) || !platformPathsEqual(path19.dirname(canonical), root)) { throw new RuntimeError(`${description} changed identity during canonicalization`); } - const after = await lstat9(resolvedCandidate, { bigint: true }); + const after = await lstat11(resolvedCandidate, { bigint: true }); if (!after.isDirectory() || after.isSymbolicLink() || after.dev !== before.dev || after.ino !== before.ino || after.birthtimeNs <= 0n || after.birthtimeNs !== before.birthtimeNs) { throw new RuntimeError(`${description} changed identity during validation`); } @@ -41252,9 +41949,9 @@ async function boundPlainChildDirectory(root, candidate, description) { async function worktreeMarkerRegistrationPath(worktreePath) { let contents; try { - contents = await readStableRegularFile(path17.join(worktreePath, ".git"), 32768n); + contents = await readStableRegularFile(path19.join(worktreePath, ".git"), 32768n); } catch (error51) { - if (errorCode7(error51) === "ENOENT") return null; + if (errorCode8(error51) === "ENOENT") return null; throw error51; } if (contents === null) return null; @@ -41263,10 +41960,10 @@ async function worktreeMarkerRegistrationPath(worktreePath) { throw new RuntimeError("managed worktree marker is malformed"); } const registrationPath = marker.slice("gitdir: ".length); - if (!path17.isAbsolute(registrationPath)) { + if (!path19.isAbsolute(registrationPath)) { throw new RuntimeError("managed worktree marker registration is not absolute"); } - return path17.resolve(registrationPath); + return path19.resolve(registrationPath); } async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { const markerRegistrationPath = await worktreeMarkerRegistrationPath(worktreePath); @@ -41307,16 +42004,16 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { gitDirResult.stdout, "worktree administrative directory" ); - if (!path17.isAbsolute(reportedCommonDir) || !path17.isAbsolute(reportedAdministrativePath)) { + if (!path19.isAbsolute(reportedCommonDir) || !path19.isAbsolute(reportedAdministrativePath)) { throw new RuntimeError("worktree registration lookup returned a non-absolute path"); } const commonDir = await realpath7(reportedCommonDir); - const expectedAdministrativeRoot = path17.join(commonDir, "worktrees"); + const expectedAdministrativeRoot = path19.join(commonDir, "worktrees"); const administrativeRoot = await realpath7(expectedAdministrativeRoot); if (!platformPathsEqual(administrativeRoot, expectedAdministrativeRoot)) { throw new RuntimeError("worktree administrative root escaped its repository"); } - if (markerRegistrationPath === null || !platformPathsEqual(path17.resolve(reportedAdministrativePath), markerRegistrationPath)) { + if (markerRegistrationPath === null || !platformPathsEqual(path19.resolve(reportedAdministrativePath), markerRegistrationPath)) { throw new RuntimeError("worktree marker names a different administrative directory"); } const administrative = await boundPlainChildDirectory( @@ -41325,7 +42022,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { "worktree administrative directory" ); const contents = await readStableRegularFile( - path17.join(administrative.path, "gitdir"), + path19.join(administrative.path, "gitdir"), 32768n ); if (contents === null) { @@ -41335,7 +42032,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { contents.toString("utf8"), "worktree registration backlink" ); - if (!path17.isAbsolute(backlink) || await realpath7(backlink) !== await realpath7(path17.join(worktreePath, ".git"))) { + if (!path19.isAbsolute(backlink) || await realpath7(backlink) !== await realpath7(path19.join(worktreePath, ".git"))) { throw new RuntimeError("worktree registration backlink does not match the managed path"); } return { @@ -41346,7 +42043,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { }; } async function registrationQuarantineRoot(commonDir, dependencies) { - const quarantineRoot = path17.join(commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY); + const quarantineRoot = path19.join(commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY); await ensurePrivateDirectory(quarantineRoot, { description: "worktree registration quarantine", migratePermissions: true, @@ -41363,7 +42060,7 @@ async function restoreStagedRegistration(registrationRoot, registrationPath, qua if (registrationRootIdentity === null || !sameDirectoryIdentity(registrationRootIdentity, expectedRegistrationRootIdentity) || quarantineRootIdentity === null || !sameDirectoryIdentity(quarantineRootIdentity, expectedQuarantineRootIdentity) || sourceIdentity === null || !sameDirectoryIdentity(sourceIdentity, expectedIdentity) || destinationIdentity !== null) { throw new RuntimeError("staged worktree registration rollback is unsafe"); } - const move = dependencies.rename ?? rename4; + const move = dependencies.rename ?? rename5; const wait = dependencies.delay ?? delay2; let moveError; let restored = false; @@ -41391,7 +42088,7 @@ async function restoreStagedRegistration(registrationRoot, registrationPath, qua } } async function stageRegistrationDirectory(repoRoot, registration, worktreePath, quarantineRoot, quarantinePath, transactionId, runGit, dependencies, allowMissingWorktree = false) { - const quarantineLabel = `registration-${path17.basename(registration.path)}`; + const quarantineLabel = `registration-${path19.basename(registration.path)}`; const [registrationRootIdentity, quarantineRootIdentity] = await Promise.all([ requiredDirectoryIdentity(registration.root, "Git registration root"), requiredDirectoryIdentity(quarantineRoot, "Git registration quarantine root") @@ -41503,11 +42200,11 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr commonResult.stdout, "stale worktree common directory" ); - if (!path17.isAbsolute(reportedCommonDir) || !path17.isAbsolute(worktreeGitDir)) { + if (!path19.isAbsolute(reportedCommonDir) || !path19.isAbsolute(worktreeGitDir)) { throw new RuntimeError("stale worktree registration paths must be absolute"); } const commonDir = await realpath7(reportedCommonDir); - const expectedRegistrationRoot = path17.join(commonDir, "worktrees"); + const expectedRegistrationRoot = path19.join(commonDir, "worktrees"); const registrationRoot = await realpath7(expectedRegistrationRoot); if (!platformPathsEqual(registrationRoot, expectedRegistrationRoot)) { throw new RuntimeError("stale worktree administrative root escaped its repository"); @@ -41518,8 +42215,8 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr "stale worktree administrative directory" ); const [gitdirContents, headContents] = await Promise.all([ - readStableRegularFile(path17.join(registration.path, "gitdir"), 32768n), - readStableRegularFile(path17.join(registration.path, "HEAD"), 32768n) + readStableRegularFile(path19.join(registration.path, "gitdir"), 32768n), + readStableRegularFile(path19.join(registration.path, "HEAD"), 32768n) ]); if (gitdirContents === null || headContents === null) { throw new RuntimeError("stale worktree registration files are not stable"); @@ -41529,12 +42226,12 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr "stale worktree registration backlink" ); const head = gitPathOutput(headContents.toString("utf8"), "stale worktree HEAD"); - if (!path17.isAbsolute(backlink) || path17.basename(backlink) !== ".git" || (expectedBranchRef === null ? !(/^ref: refs\//u.test(head) || /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u.test(head)) : head !== `ref: ${expectedBranchRef}`)) { + if (!path19.isAbsolute(backlink) || path19.basename(backlink) !== ".git" || (expectedBranchRef === null ? !(/^ref: refs\//u.test(head) || /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u.test(head)) : head !== `ref: ${expectedBranchRef}`)) { throw new RuntimeError("stale worktree registration identity is inconsistent"); } const { target } = await managedPath(worktreePath); const canonicalBacklinkWorktree = await canonicalizeWorktreePath( - path17.dirname(path17.resolve(backlink)), + path19.dirname(path19.resolve(backlink)), true ); const canonicalExpectedWorktree = await canonicalizeWorktreePath(target, true); @@ -41562,25 +42259,25 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, commonResult.stdout, "missing worktree common directory" ); - if (!path17.isAbsolute(reportedCommonDir)) { + if (!path19.isAbsolute(reportedCommonDir)) { throw new RuntimeError("missing worktree common directory is not absolute"); } const commonDir = await realpath7(reportedCommonDir); - const expectedRegistrationRoot = path17.join(commonDir, "worktrees"); + const expectedRegistrationRoot = path19.join(commonDir, "worktrees"); const registrationRoot = await realpath7(expectedRegistrationRoot); if (!platformPathsEqual(registrationRoot, expectedRegistrationRoot)) { throw new RuntimeError("worktree administrative root escaped its repository"); } const expectedWorktree = await canonicalizeWorktreePath(worktreePath, true); const matches = []; - for (const entry of await readdir5(registrationRoot, { withFileTypes: true })) { + for (const entry of await readdir6(registrationRoot, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path17.join(registrationRoot, entry.name); + const registrationPath = path19.join(registrationRoot, entry.name); if (expectedRegistrationPath !== null && !platformPathsEqual(registrationPath, expectedRegistrationPath)) { continue; } const contents = await readStableRegularFile( - path17.join(registrationPath, "gitdir"), + path19.join(registrationPath, "gitdir"), 32768n ); if (contents === null) continue; @@ -41590,10 +42287,10 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, } catch { continue; } - if (!path17.isAbsolute(backlink) || path17.basename(backlink) !== ".git") continue; + if (!path19.isAbsolute(backlink) || path19.basename(backlink) !== ".git") continue; let candidateWorktree; try { - candidateWorktree = await canonicalizeWorktreePath(path17.dirname(backlink), true); + candidateWorktree = await canonicalizeWorktreePath(path19.dirname(backlink), true); } catch { continue; } @@ -41637,21 +42334,21 @@ async function removeStaleWorktreeRegistration(repoRoot, worktreePath, worktreeG expectedBranchRef, runGit ); - const transactionId = (dependencies.uuid ?? randomUUID4)(); + const transactionId = (dependencies.uuid ?? randomUUID6)(); if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid stale worktree quarantine token"); } - const physicalQuarantinePath = path17.join( + const physicalQuarantinePath = path19.join( root, - `.remove-${path17.basename(target)}-${transactionId}` + `.remove-${path19.basename(target)}-${transactionId}` ); const quarantineRoot = await registrationQuarantineRoot( registration.commonDir, dependencies ); - const quarantinePath = path17.join( + const quarantinePath = path19.join( quarantineRoot, - `.remove-registration-${path17.basename(registration.path)}-${transactionId}` + `.remove-registration-${path19.basename(registration.path)}-${transactionId}` ); const [ commonDirIdentity, @@ -41764,21 +42461,21 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { throw new RuntimeError("managed worktree identity changed before removal transaction"); } const { root, target } = await managedPath(worktreePath); - const transactionId = (dependencies.uuid ?? randomUUID4)(); + const transactionId = (dependencies.uuid ?? randomUUID6)(); if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid physical worktree quarantine token"); } - const physicalQuarantinePath = path17.join( + const physicalQuarantinePath = path19.join( root, - `.remove-${path17.basename(target)}-${transactionId}` + `.remove-${path19.basename(target)}-${transactionId}` ); const quarantineRoot = await registrationQuarantineRoot( registration.commonDir, dependencies ); - const quarantinePath = path17.join( + const quarantinePath = path19.join( quarantineRoot, - `.remove-registration-${path17.basename(registration.path)}-${transactionId}` + `.remove-registration-${path19.basename(registration.path)}-${transactionId}` ); const [ commonDirIdentity, @@ -41855,7 +42552,7 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { const removed = await removeDirectoryByQuarantine( root, target, - path17.basename(target), + path19.basename(target), { ...dependencies, uuid: () => transactionId, @@ -41894,59 +42591,35 @@ var WorktreeManager = class { } async withCheckoutLease(operation) { const platformServices = this.lockingPlatformServices(); - const canonical = await platformServices.canonicalizePath(this.repoRoot); - const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; const borrowed = this.dependencies.borrowedCheckoutLease; - let owned = null; - let lease = borrowed; - if (lease === void 0) { - owned = await guardWorktreeMutations(platformServices).acquireCheckoutLock( - canonical.canonical, - { runId: this.runId } - ); - lease = owned; - } - let result; - let primaryError; - try { - if (lease.repositoryIdentity !== repositoryIdentity) { + if (borrowed !== void 0) { + const canonical = await platformServices.canonicalizePath(this.repoRoot); + const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; + if (borrowed.repositoryIdentity !== repositoryIdentity) { throw new RuntimeError("worktree manager checkout lease repository identity mismatch"); } await assertNoPendingWorktreeRemovalForRepository(repositoryIdentity); - result = await operation(lease); - } catch (error51) { - primaryError = error51; - } - if (owned !== null) { - try { - await owned.release(); - } catch (releaseError) { - if (primaryError !== void 0) { - throw new AggregateError( - [primaryError, releaseError], - "worktree operation failed and its checkout lease could not be released" - ); - } - throw releaseError; - } + return await operation(borrowed); } - if (primaryError !== void 0) throw primaryError; - return result; + const safety = new PlatformSafety(platformServices); + return await safety.withCheckoutLease(this.repoRoot, operation, { + ...this.runId === void 0 ? {} : { runId: this.runId } + }); } - managedWorktreePath(stateRoot2 = path17.resolve(resolveStateDir())) { + managedWorktreePath(stateRoot2 = path19.resolve(resolveStateDir())) { if (!SAFE_MANAGED_ID.test(this.runId)) { throw new RuntimeError("invalid worktree run id"); } - const worktreesRoot = path17.resolve(stateRoot2, "worktrees"); - const worktreePath = path17.resolve(worktreesRoot, this.runId); - if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path17.sep}`)) { + const worktreesRoot = path19.resolve(stateRoot2, "worktrees"); + const worktreePath = path19.resolve(worktreesRoot, this.runId); + if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path19.sep}`)) { throw new RuntimeError("invalid worktree run id"); } return { worktreesRoot, worktreePath }; } async prepareManagedWorktreeRoot() { await verifyBoundDirectoryCleanupSupport(this.lockingPlatformServices()); - const configuredStateRoot = path17.resolve(resolveStateDir()); + const configuredStateRoot = path19.resolve(resolveStateDir()); const syncDirectory4 = this.dependencies.syncDirectory ?? syncDirectoryMetadata; const stateRootIdentity = await ensurePrivateDirectory(configuredStateRoot, { description: "runtime state root", @@ -41987,22 +42660,22 @@ var WorktreeManager = class { commonResult.stdout, "worktree creation common directory" ); - if (!path17.isAbsolute(reportedCommonDir)) { + if (!path19.isAbsolute(reportedCommonDir)) { throw new RuntimeError("worktree creation common directory is not absolute"); } const commonDir = await realpath7(reportedCommonDir); - const registrationRoot = path17.join(commonDir, "worktrees"); + const registrationRoot = path19.join(commonDir, "worktrees"); let registrationRootCreated = false; try { - await mkdir4(registrationRoot, { mode: 448 }); + await mkdir5(registrationRoot, { mode: 448 }); registrationRootCreated = true; } catch (error51) { - if (errorCode7(error51) !== "EEXIST") throw error51; + if (errorCode8(error51) !== "EEXIST") throw error51; } if (registrationRootCreated) { await (this.dependencies.syncDirectory ?? syncDirectoryMetadata)(commonDir); } - const registrationMetadata = await lstat9(registrationRoot, { bigint: true }); + const registrationMetadata = await lstat11(registrationRoot, { bigint: true }); if (!registrationMetadata.isDirectory() || registrationMetadata.isSymbolicLink() || registrationMetadata.birthtimeNs <= 0n) { throw new RuntimeError("Git worktree registration root lacks stable identity"); } @@ -42022,21 +42695,21 @@ var WorktreeManager = class { registrationRoot, registrationRootIdentity ); - const transactionId = (this.dependencies.uuid ?? randomUUID4)(); + const transactionId = (this.dependencies.uuid ?? randomUUID6)(); if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid worktree creation transaction token"); } - const registrationPath = path17.join( + const registrationPath = path19.join( registrationRoot, `.creation-${transactionId}` ); - const quarantinePath = path17.join( + const quarantinePath = path19.join( quarantineRoot, `.remove-registration-creation-${transactionId}` ); - const stagingPath = path17.join( + const stagingPath = path19.join( worktreesRoot, - `.create-${path17.basename(worktreePath)}-${transactionId}` + `.create-${path19.basename(worktreePath)}-${transactionId}` ); let manifest = { manifestVersion: "1", @@ -42071,7 +42744,7 @@ var WorktreeManager = class { }; const manifestPath = await persistWorktreeRemovalManifest(manifest); await assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"); - await mkdir4(stagingPath, { mode: 448 }); + await mkdir5(stagingPath, { mode: 448 }); await syncChangedDirectories(this.dependencies, worktreesRoot); const physicalIdentity = await requiredDirectoryIdentity( stagingPath, @@ -42087,7 +42760,7 @@ var WorktreeManager = class { }; await replaceWorktreeRemovalManifest(manifestPath, manifest); await assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"); - await (this.dependencies.rename ?? rename4)(stagingPath, worktreePath); + await (this.dependencies.rename ?? rename5)(stagingPath, worktreePath); await syncChangedDirectories(this.dependencies, worktreesRoot); await Promise.all([ assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"), @@ -42163,14 +42836,14 @@ var WorktreeManager = class { commonResult.stdout, "worktree registration filesystem" ); - if (!path17.isAbsolute(reported)) { + if (!path19.isAbsolute(reported)) { throw new RuntimeError("worktree registration filesystem path is not absolute"); } const commonDir = await realpath7(reported); if (await managedWorktreeDirectoryIdentity(commonDir) === null) { throw new RuntimeError("worktree registration filesystem identity is unavailable"); } - const registrationRoot = path17.join(commonDir, "worktrees"); + const registrationRoot = path19.join(commonDir, "worktrees"); const existingRegistrationRoot = await managedWorktreeDirectoryIdentity(registrationRoot); if (existingRegistrationRoot !== null && existingRegistrationRoot.birthtimeNs <= 0n) { throw new RuntimeError("worktree registration root lacks stable identity"); @@ -42359,11 +43032,11 @@ var WorktreeManager = class { try { canonicalExpectedPath = await canonicalizeWorktreePath(expectedWorktreePath, true); } catch (error51) { - if (errorCode7(error51) !== "ENOENT") throw error51; - canonicalExpectedPath = path17.join( - await realpath7(path17.resolve(resolveStateDir())), + if (errorCode8(error51) !== "ENOENT") throw error51; + canonicalExpectedPath = path19.join( + await realpath7(path19.resolve(resolveStateDir())), "worktrees", - path17.basename(expectedWorktreePath) + path19.basename(expectedWorktreePath) ); } if (!platformPathsEqual(canonicalWorktreePath, canonicalExpectedPath)) { @@ -42391,7 +43064,7 @@ var WorktreeManager = class { // src/verify/project-verifier.ts import { realpath as realpath8 } from "node:fs/promises"; -import path18 from "node:path"; +import path20 from "node:path"; var MAX_COMMAND_OUTPUT_BYTES = 1e6; var MAX_DIAGNOSTIC_LENGTH3 = 2e3; var POSIX_ESSENTIAL_ENV2 = [ @@ -42439,12 +43112,12 @@ function commandEnvironment(command, os) { } function isWithinScope(root, candidate, os) { if (os === "win32") return canonicalizeForScope(candidate, root); - const relative2 = path18.posix.relative(root, candidate); - return relative2 === "" || !path18.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); + const relative2 = path20.posix.relative(root, candidate); + return relative2 === "" || !path20.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); } async function resolveCommandCwd(worktreePath, commandCwd, os) { - if (path18.isAbsolute(commandCwd)) return null; - const lexical = path18.resolve(worktreePath, commandCwd); + if (path20.isAbsolute(commandCwd)) return null; + const lexical = path20.resolve(worktreePath, commandCwd); if (!isWithinScope(worktreePath, lexical, os)) return null; try { const [canonicalRoot, canonicalCwd] = await Promise.all([ @@ -42494,7 +43167,7 @@ async function executeCommand(args) { const environment = commandEnvironment(command, ps.os); executable = await ps.resolveExecutable({ name: command.executable, - ...path18.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}, + ...path20.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}, searchPath: environment.PATH ?? environment.Path ?? "" }); exit = await supervise(ps, { @@ -42981,20 +43654,19 @@ var AcceptanceVerifier = class { }; // src/runtime/artifact-store.ts -import { randomUUID as randomUUID5 } from "node:crypto"; -import { constants as constants9 } from "node:fs"; +import { randomUUID as randomUUID7 } from "node:crypto"; +import { constants as constants11 } from "node:fs"; import { - link as link3, - lstat as lstat10, - mkdir as mkdir5, - open as open9, + lstat as lstat12, + mkdir as mkdir6, + open as open11, opendir, - readdir as readdir6, + readdir as readdir7, realpath as realpath9, - rename as rename5, - rm as rm5 + rename as rename6, + rm as rm7 } from "node:fs/promises"; -import path19 from "node:path"; +import path21 from "node:path"; // src/runtime/run-manifest.ts import { createHash as createHash9 } from "node:crypto"; @@ -43173,12 +43845,12 @@ function buildRunManifest(args) { } // src/runtime/artifact-store.ts -var SAFE_COMPONENT = /^[A-Za-z0-9][A-Za-z0-9._-]*$/; +var SAFE_COMPONENT2 = /^[A-Za-z0-9][A-Za-z0-9._-]*$/; var WINDOWS_RESERVED_COMPONENT = /^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i; var CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; var PRUNE_BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; var CLEANUP_JOURNAL = "cleanup.ndjson"; -var NO_FOLLOW4 = constants9.O_NOFOLLOW ?? 0; +var NO_FOLLOW6 = constants11.O_NOFOLLOW ?? 0; var MAX_ARCHIVE_FILE_BYTES = 8e6; var MAX_EVIDENCE_REFERENCES = 4096; var MAX_EVIDENCE_DEPTH = 16; @@ -43191,7 +43863,7 @@ var runStatusSchema = schemas2.runStatus; var cleanupJournalTail = Promise.resolve(); function isSafeComponent(value) { const base = value.split(".", 1)[0] ?? value; - return SAFE_COMPONENT.test(value) && !value.endsWith(".") && !WINDOWS_RESERVED_COMPONENT.test(base); + return SAFE_COMPONENT2.test(value) && !value.endsWith(".") && !WINDOWS_RESERVED_COMPONENT.test(base); } var STORE_TEMPORARY_RESIDUE = /^\..+\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.tmp$/u; function validateComponent(value, kind) { @@ -43199,21 +43871,21 @@ function validateComponent(value, kind) { throw new RuntimeError(`invalid ${kind}: ${JSON.stringify(value)}`); } } -function errorCode8(error51) { +function errorCode9(error51) { return error51.code; } -function isMissing2(error51) { - return errorCode8(error51) === "ENOENT"; +function isMissing3(error51) { + return errorCode9(error51) === "ENOENT"; } -function isAlreadyPresent(error51) { - return errorCode8(error51) === "EEXIST"; +function isAlreadyPresent2(error51) { + return errorCode9(error51) === "EEXIST"; } async function pathExists(filename) { try { - await lstat10(filename); + await lstat12(filename); return true; } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing3(error51)) return false; throw error51; } } @@ -43229,37 +43901,37 @@ function compareEntries(left, right) { return left.runId < right.runId ? -1 : left.runId > right.runId ? 1 : 0; } function isWithin(root, candidate) { - const relative2 = path19.relative(root, candidate); - return relative2 === "" || !path19.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path19.sep}`); + const relative2 = path21.relative(root, candidate); + return relative2 === "" || !path21.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path21.sep}`); } async function ensurePlainDirectory(directory) { let created = false; try { - await mkdir5(directory, { mode: 448 }); + await mkdir6(directory, { mode: 448 }); created = true; } catch (error51) { - if (!isAlreadyPresent(error51)) throw error51; + if (!isAlreadyPresent2(error51)) throw error51; } - const metadata = await lstat10(directory); + const metadata = await lstat12(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(directory)}`); } - if (created) await syncDirectory3(path19.dirname(directory)); + if (created) await syncDirectory3(path21.dirname(directory)); return { dev: metadata.dev, ino: metadata.ino }; } async function ensurePlainDirectoryTree(directory) { try { return await ensurePlainDirectory(directory); } catch (error51) { - if (!isMissing2(error51)) throw error51; - const parent = path19.dirname(directory); + if (!isMissing3(error51)) throw error51; + const parent = path21.dirname(directory); if (parent === directory) throw error51; await ensurePlainDirectoryTree(parent); return ensurePlainDirectory(directory); } } async function assertDirectoryIdentity5(directory, expected) { - const metadata = await lstat10(directory); + const metadata = await lstat12(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory() || metadata.dev !== expected.dev || metadata.ino !== expected.ino) { throw new RuntimeError("archive directory identity changed during operation"); } @@ -43267,24 +43939,24 @@ async function assertDirectoryIdentity5(directory, expected) { async function syncDirectory3(directory) { let handle; try { - handle = await open9(directory, constants9.O_RDONLY | NO_FOLLOW4); + handle = await open11(directory, constants11.O_RDONLY | NO_FOLLOW6); await handle.sync(); } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode8(error51) ?? ""); + const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode9(error51) ?? ""); if (!unsupportedOnWindows) throw error51; } finally { await handle?.close(); } } async function readRegularFile(filename, parentIdentity) { - const linkMetadata = await lstat10(filename); + const linkMetadata = await lstat12(filename); if (linkMetadata.isSymbolicLink()) { throw new RuntimeError(`archive entry must not be a symbolic link: ${redact(filename)}`); } - const handle = await open9(filename, constants9.O_RDONLY | NO_FOLLOW4); + const handle = await open11(filename, constants11.O_RDONLY | NO_FOLLOW6); try { if (parentIdentity !== void 0) { - await assertDirectoryIdentity5(path19.dirname(filename), parentIdentity); + await assertDirectoryIdentity5(path21.dirname(filename), parentIdentity); } const metadata = await handle.stat(); if (!metadata.isFile()) { @@ -43311,7 +43983,7 @@ async function readRegularFile(filename, parentIdentity) { throw new RuntimeError(`archive entry changed while being read: ${redact(filename)}`); } if (parentIdentity !== void 0) { - await assertDirectoryIdentity5(path19.dirname(filename), parentIdentity); + await assertDirectoryIdentity5(path21.dirname(filename), parentIdentity); } return contents.subarray(0, offset).toString("utf8"); } finally { @@ -43319,7 +43991,7 @@ async function readRegularFile(filename, parentIdentity) { } } async function directoryBytes(directory, expectedIdentity) { - const metadata = await lstat10(directory); + const metadata = await lstat12(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError("archive size accounting requires a plain directory"); } @@ -43332,16 +44004,16 @@ async function directoryBytes(directory, expectedIdentity) { try { entries = await opendir(directory); } catch (error51) { - if (isMissing2(error51)) return 0; + if (isMissing3(error51)) return 0; throw error51; } try { await assertDirectoryIdentity5(directory, identity); for await (const entry of entries) { await assertDirectoryIdentity5(directory, identity); - const entryPath = path19.join(directory, entry.name); + const entryPath = path21.join(directory, entry.name); try { - const entryMetadata = await lstat10(entryPath); + const entryMetadata = await lstat12(entryPath); if (entryMetadata.isSymbolicLink()) { throw new RuntimeError("archive size accounting encountered a symbolic link"); } @@ -43349,13 +44021,13 @@ async function directoryBytes(directory, expectedIdentity) { else if (entryMetadata.isFile()) total += entryMetadata.size; await assertDirectoryIdentity5(directory, identity); } catch (error51) { - if (!isMissing2(error51)) throw error51; + if (!isMissing3(error51)) throw error51; } } await assertDirectoryIdentity5(directory, identity); } finally { await entries.close().catch((error51) => { - if (errorCode8(error51) !== "ERR_DIR_CLOSED") throw error51; + if (errorCode9(error51) !== "ERR_DIR_CLOSED") throw error51; }); } return total; @@ -43424,7 +44096,7 @@ function preserveNullableIdentity2(value, label) { function preserveCandidatePath(value) { const candidatePath = preserveIdentity2(value, "candidate path"); const segments = candidatePath.split("/"); - if (candidatePath === "" || candidatePath.includes("\\") || candidatePath.includes("\0") || path19.posix.isAbsolute(candidatePath) || path19.win32.isAbsolute(candidatePath) || /^[A-Za-z]:/.test(candidatePath) || segments.some((segment) => segment === "" || segment === "." || segment === "..")) { + if (candidatePath === "" || candidatePath.includes("\\") || candidatePath.includes("\0") || path21.posix.isAbsolute(candidatePath) || path21.win32.isAbsolute(candidatePath) || /^[A-Za-z]:/.test(candidatePath) || segments.some((segment) => segment === "" || segment === "." || segment === "..")) { throw new RuntimeError("candidate path must be a normalized relative Git path"); } return candidatePath; @@ -43629,11 +44301,11 @@ var ArtifactStore = class _ArtifactStore { constructor(runId) { validateComponent(runId, "run id"); this.runId = runId; - this.runsRoot = path19.join(resolveStateDir(), "runs"); - this.runDirectory = path19.join(this.runsRoot, runId); + this.runsRoot = path21.join(resolveStateDir(), "runs"); + this.runDirectory = path21.join(this.runsRoot, runId); } async ensureRunsRoot() { - await ensurePlainDirectoryTree(path19.dirname(this.runsRoot)); + await ensurePlainDirectoryTree(path21.dirname(this.runsRoot)); await ensurePlainDirectory(this.runsRoot); return realpath9(this.runsRoot); } @@ -43643,12 +44315,12 @@ var ArtifactStore = class _ArtifactStore { await ensurePlainDirectory(this.runDirectory); } else { try { - const metadata = await lstat10(this.runDirectory); + const metadata = await lstat12(this.runDirectory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(this.runDirectory)}`); } } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -43659,19 +44331,19 @@ var ArtifactStore = class _ArtifactStore { return canonicalRunDirectory; } async ensureArchiveDirectory(relativePath) { - if (path19.isAbsolute(relativePath)) throw new RuntimeError("archive path must be relative"); - const normalized = path19.normalize(relativePath); - if (normalized === ".." || normalized.startsWith(`..${path19.sep}`)) { + if (path21.isAbsolute(relativePath)) throw new RuntimeError("archive path must be relative"); + const normalized = path21.normalize(relativePath); + if (normalized === ".." || normalized.startsWith(`..${path21.sep}`)) { throw new RuntimeError("archive path escapes run directory"); } const canonicalRunDirectory = await this.ensureRunDirectory(true); if (canonicalRunDirectory === null) throw new RuntimeError("failed to create archive directory"); - const relativeDirectory = path19.dirname(normalized); + const relativeDirectory = path21.dirname(normalized); if (relativeDirectory === ".") return canonicalRunDirectory; let current = canonicalRunDirectory; - for (const component of relativeDirectory.split(path19.sep)) { + for (const component of relativeDirectory.split(path21.sep)) { validateComponent(component, "log name"); - current = path19.join(current, component); + current = path21.join(current, component); await ensurePlainDirectory(current); const canonicalCurrent = await realpath9(current); if (!isWithin(canonicalRunDirectory, canonicalCurrent)) { @@ -43683,44 +44355,11 @@ var ArtifactStore = class _ArtifactStore { } async writeArchiveFile(relativePath, text) { const directory = await this.ensureArchiveDirectory(relativePath); - const directoryIdentity = await ensurePlainDirectory(directory); - const destination = path19.join(directory, path19.basename(relativePath)); - const temporaryPath = path19.join(directory, `.${path19.basename(destination)}.${randomUUID5()}.tmp`); - let handle; - let temporaryCreated = false; + const session = await openDurableDirectorySession(directory); try { - await assertDirectoryIdentity5(directory, directoryIdentity); - handle = await open9( - temporaryPath, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | NO_FOLLOW4, - 384 - ); - temporaryCreated = true; - await assertDirectoryIdentity5(directory, directoryIdentity); - await handle.writeFile(text, { encoding: "utf8" }); - await handle.sync(); - await handle.close(); - handle = void 0; - try { - await assertDirectoryIdentity5(directory, directoryIdentity); - await link3(temporaryPath, destination); - await assertDirectoryIdentity5(directory, directoryIdentity); - } catch (error51) { - if (!isAlreadyPresent(error51)) throw error51; - await assertDirectoryIdentity5(directory, directoryIdentity); - const existing = await readRegularFile(destination, directoryIdentity); - if (existing !== text) { - throw new RuntimeError(`archive entry already exists with different content: ${relativePath}`); - } - } + await platformSafety.writeAtomic(session, path21.basename(relativePath), text, "immutable"); } finally { - await handle?.close(); - if (temporaryCreated) { - await assertDirectoryIdentity5(directory, directoryIdentity); - await rm5(temporaryPath, { force: true }); - await syncDirectory3(directory); - await assertDirectoryIdentity5(directory, directoryIdentity); - } + await session.close(); } } async writeJson(relativePath, value) { @@ -43729,38 +44368,18 @@ var ArtifactStore = class _ArtifactStore { await this.writeArchiveFile(relativePath, serialized); } async replaceJson(relativePath, value) { - if (path19.isAbsolute(relativePath) || path19.dirname(relativePath) !== "." || path19.basename(relativePath) !== relativePath || !isSafeComponent(relativePath)) { + if (path21.isAbsolute(relativePath) || path21.dirname(relativePath) !== "." || path21.basename(relativePath) !== relativePath || !isSafeComponent(relativePath)) { throw new RuntimeError("replacement archive path must be a safe relative leaf"); } const directory = await this.ensureRunDirectory(false); if (directory === null) throw new RuntimeError("run archive does not exist"); - const directoryIdentity = await ensurePlainDirectory(directory); - const destination = path19.join(directory, relativePath); - const temporaryPath = path19.join(directory, `.${relativePath}.${randomUUID5()}.tmp`); - const serialized = `${serializeJson(value, 2)} -`; - let handle; - let temporaryCreated = false; + const session = await openDurableDirectorySession(directory); try { - await assertDirectoryIdentity5(directory, directoryIdentity); - handle = await open9( - temporaryPath, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | NO_FOLLOW4, - 384 - ); - temporaryCreated = true; - await handle.writeFile(serialized, { encoding: "utf8" }); - await handle.sync(); - await handle.close(); - handle = void 0; - await assertDirectoryIdentity5(directory, directoryIdentity); - await rename5(temporaryPath, destination); - temporaryCreated = false; - await syncDirectory3(directory); - await assertDirectoryIdentity5(directory, directoryIdentity); + const serialized = `${serializeJson(value, 2)} +`; + await platformSafety.writeAtomic(session, relativePath, serialized, "replace"); } finally { - await handle?.close(); - if (temporaryCreated) await rm5(temporaryPath, { force: true }); + await session.close(); } } async writeRunStatus(status) { @@ -43780,41 +44399,41 @@ var ArtifactStore = class _ArtifactStore { } async readRunStatus(runId) { validateComponent(runId, "run id"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const value = JSON.parse(await readRegularFile( - path19.join(validated.path, "status.json"), + path21.join(validated.path, "status.json"), validated.identity )); if (!runStatusSchema(value)) throw new RuntimeError("archived run status is malformed"); return value; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } async writeLog(name, text) { validateComponent(name, "log name"); - const ref = path19.posix.join("logs", `${name}.log`); + const ref = path21.posix.join("logs", `${name}.log`); await this.writeArchiveFile(ref, redact(text)); return ref; } async writePipelineArtifact(name, value) { validateComponent(name, "log name"); await this.writeJson( - path19.posix.join("pipeline", `${name}.json`), + path21.posix.join("pipeline", `${name}.json`), redactRecord(value) ); } async readPipelineArtifact(runId, name) { validateComponent(runId, "run id"); validateComponent(name, "log name"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validatedRun = await this.ensureExistingRunDirectory(runDirectory); if (validatedRun === null) return null; - const validated = await this.ensureExistingRunDirectory(path19.join(runDirectory, "pipeline")); + const validated = await this.ensureExistingRunDirectory(path21.join(runDirectory, "pipeline")); if (validated === null) return null; if (!isWithin(validatedRun.path, validated.path)) { throw new RuntimeError("pipeline archive directory escapes run directory"); @@ -43822,13 +44441,13 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(validatedRun.path, validatedRun.identity); try { const value = JSON.parse(await readRegularFile( - path19.join(validated.path, `${name}.json`), + path21.join(validated.path, `${name}.json`), validated.identity )); await assertDirectoryIdentity5(validatedRun.path, validatedRun.identity); return value; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -43839,7 +44458,7 @@ var ArtifactStore = class _ArtifactStore { * caller-supplied reference. */ async readEvidence(reference) { - if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path19.posix.isAbsolute(reference) || reference.includes("\\") || /[\0\r\n]/u.test(reference)) { + if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path21.posix.isAbsolute(reference) || reference.includes("\\") || /[\0\r\n]/u.test(reference)) { throw new RuntimeError("invalid archived evidence reference"); } const components = reference.split("/"); @@ -43853,8 +44472,8 @@ var ArtifactStore = class _ArtifactStore { try { for (const component of components.slice(0, -1)) { await assertDirectoryIdentity5(directory.path, directory.identity); - const child = path19.join(directory.path, component); - const metadata = await lstat10(child); + const child = path21.join(directory.path, component); + const metadata = await lstat12(child); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError("archived evidence directory is not a plain directory"); } @@ -43869,13 +44488,13 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(directory.path, directory.identity); } const content = await readRegularFile( - path19.join(directory.path, components.at(-1)), + path21.join(directory.path, components.at(-1)), directory.identity ); await assertDirectoryIdentity5(run.path, run.identity); return content; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -43893,12 +44512,12 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived evidence nesting exceeds the supported limit"); } await assertDirectoryIdentity5(directory.path, directory.identity); - const names = (await readdir6(directory.path)).sort(); + const names = (await readdir7(directory.path)).sort(); for (const name of names) { if (STORE_TEMPORARY_RESIDUE.test(name)) continue; validateComponent(name, "log name"); - const child = path19.join(directory.path, name); - const metadata = await lstat10(child); + const child = path21.join(directory.path, name); + const metadata = await lstat12(child); if (metadata.isSymbolicLink()) { throw new RuntimeError("archived evidence must not contain symbolic links"); } @@ -43968,26 +44587,26 @@ var ArtifactStore = class _ArtifactStore { } async readResult(runId) { validateComponent(runId, "run id"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { return verifyAttemptResult( JSON.parse(await readRegularFile( - path19.join(validated.path, "result.json"), + path21.join(validated.path, "result.json"), validated.identity )), runId ); } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } async ensureExistingRunDirectory(directory) { const canonicalRunsRoot = await this.ensureRunsRoot(); try { - const metadata = await lstat10(directory); + const metadata = await lstat12(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(directory)}`); } @@ -43999,25 +44618,25 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(directory, identity); return { path: canonicalDirectory, identity }; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } async readManifest(runId) { validateComponent(runId, "run id"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { return verifyRunManifest( JSON.parse(await readRegularFile( - path19.join(validated.path, "manifest.json"), + path21.join(validated.path, "manifest.json"), validated.identity )), runId ); } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -44028,18 +44647,18 @@ var ArtifactStore = class _ArtifactStore { */ async readRunStartSpecSha256(runId) { validateComponent(runId, "run id"); - const validated = await this.ensureExistingRunDirectory(path19.join(this.runsRoot, runId)); + const validated = await this.ensureExistingRunDirectory(path21.join(this.runsRoot, runId)); if (validated === null) return null; try { const record2 = JSON.parse(await readRegularFile( - path19.join(validated.path, "run-start.json"), + path21.join(validated.path, "run-start.json"), validated.identity )); if (typeof record2 !== "object" || record2 === null) return null; const value = record2.specSha256; return typeof value === "string" && /^[0-9a-f]{64}$/u.test(value) ? value : null; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -44061,13 +44680,13 @@ var ArtifactStore = class _ArtifactStore { } async readReviewSnapshot(runId) { validateComponent(runId, "run id"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const snapshot = validateReviewSnapshot( JSON.parse(await readRegularFile( - path19.join(validated.path, "review-snapshot.json"), + path21.join(validated.path, "review-snapshot.json"), validated.identity )), runId @@ -44075,7 +44694,7 @@ var ArtifactStore = class _ArtifactStore { reviewSnapshotHash(snapshot); return snapshot; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -44148,7 +44767,7 @@ var ArtifactStore = class _ArtifactStore { eligibilityRecordHash }; await this.writeJson( - path19.posix.join("pipeline", "post-pipeline-autopilot.json"), + path21.posix.join("pipeline", "post-pipeline-autopilot.json"), artifacts ); return { advisorReportHash: persistedAdvisorHash, eligibilityRecordHash }; @@ -44213,17 +44832,17 @@ var ArtifactStore = class _ArtifactStore { } async readCandidateDecision(runId) { validateComponent(runId, "run id"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const value = JSON.parse(await readRegularFile( - path19.join(validated.path, "decision.json"), + path21.join(validated.path, "decision.json"), validated.identity )); return parsePersistedDecision(value); } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } @@ -44238,12 +44857,12 @@ var ArtifactStore = class _ArtifactStore { } async readPipelineActiveMarker(runId) { validateComponent(runId, "run id"); - const runDirectory = path19.join(this.runsRoot, runId); + const runDirectory = path21.join(this.runsRoot, runId); const validated = await this.ensureExistingRunDirectory(runDirectory); if (validated === null) return null; try { const value = JSON.parse(await readRegularFile( - path19.join(validated.path, "pipeline-active.json"), + path21.join(validated.path, "pipeline-active.json"), validated.identity )); if (typeof value !== "object" || value === null || typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 1 || value.processToken !== null && typeof value.processToken !== "string" || typeof value.startedAt !== "string" || !Number.isFinite(Date.parse(value.startedAt)) || typeof value.sliced !== "boolean") { @@ -44251,25 +44870,25 @@ var ArtifactStore = class _ArtifactStore { } return value; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } } async clearPipelineActiveMarker() { const directory = await this.ensureRunDirectory(false); if (directory === null) return; - await rm5(path19.join(directory, "pipeline-active.json"), { force: true }); + await rm7(path21.join(directory, "pipeline-active.json"), { force: true }); } async list() { await this.ensureRunsRoot(); - const entries = await readdir6(this.runsRoot, { withFileTypes: true }); + const entries = await readdir7(this.runsRoot, { withFileTypes: true }); return entries.filter((entry) => entry.isDirectory() && isSafeComponent(entry.name)).map((entry) => entry.name).sort(); } async entries() { const entries = await Promise.all((await this.list()).map(async (runId) => { - const directory = path19.join(this.runsRoot, runId); + const directory = path21.join(this.runsRoot, runId); try { - const metadata = await lstat10(directory); + const metadata = await lstat12(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) return null; return { runId, @@ -44279,7 +44898,7 @@ var ArtifactStore = class _ArtifactStore { identity: { dev: metadata.dev, ino: metadata.ino } }; } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing3(error51)) return null; throw error51; } })); @@ -44429,10 +45048,10 @@ var ArtifactStore = class _ArtifactStore { try { await this.ensureRunsRoot(); const runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - const filename = path19.join(this.runsRoot, CLEANUP_JOURNAL); - const handle = await open9( + const filename = path21.join(this.runsRoot, CLEANUP_JOURNAL); + const handle = await open11( filename, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_APPEND | NO_FOLLOW4, + constants11.O_WRONLY | constants11.O_CREAT | constants11.O_APPEND | NO_FOLLOW6, 384 ); try { @@ -44477,11 +45096,11 @@ var ArtifactStore = class _ArtifactStore { const runsRootIdentity = await ensurePlainDirectory(this.runsRoot); await assertDirectoryIdentity5(entry.directory, entry.identity); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); - await rename5(entry.directory, quarantinePath); + await rename6(entry.directory, quarantinePath); await syncDirectory3(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); await assertDirectoryIdentity5(quarantinePath, entry.identity); - await rm5(quarantinePath, { recursive: true, force: false }); + await rm7(quarantinePath, { recursive: true, force: false }); await syncDirectory3(this.runsRoot); await this.appendCleanupRecord({ event: "prune-cleanup-complete", @@ -44508,8 +45127,8 @@ var ArtifactStore = class _ArtifactStore { const removeEntry = async (entry, reason) => { if (attempted.has(entry.runId)) return; attempted.add(entry.runId); - const quarantineName = `.prune-${entry.runId}-${randomUUID5()}`; - const quarantinePath = path19.join(this.runsRoot, quarantineName); + const quarantineName = `.prune-${entry.runId}-${randomUUID7()}`; + const quarantinePath = path21.join(this.runsRoot, quarantineName); let prepared = null; let transaction = null; let runsRootIdentity = null; @@ -44530,14 +45149,12 @@ var ArtifactStore = class _ArtifactStore { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; } - const platformServices = guardWorktreeMutations( - dependencies.platformServices ?? getPlatformServices() - ); + const platformServices = dependencies.platformServices ?? getPlatformServices(); let canonical; try { canonical = await platformServices.canonicalizePath(initialManifest.repoRoot); } catch (error51) { - if (errorCode8(error51) !== "ENOENT") throw error51; + if (errorCode9(error51) !== "ENOENT") throw error51; await this.reclaimRepoAbsentArchive( entry, reason, @@ -44549,79 +45166,84 @@ var ArtifactStore = class _ArtifactStore { retainedBytes -= entry.bytes; return; } - const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; - lease = await platformServices.acquireCheckoutLock( - canonical.canonical, - { runId: entry.runId } - ); - if (lease.repositoryIdentity !== repositoryIdentity) { - throw new RuntimeError("checkout lease repository identity changed before pruning"); - } - await assertDirectoryIdentity5(entry.directory, entry.identity); - const currentManifest = await this.readManifest(entry.runId); - if (currentManifest === null || serializeJson(currentManifest) !== serializeJson(initialManifest)) { - retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); - return; - } - if (await this.readPipelineActiveMarker(entry.runId) !== null) { - retained.push({ runId: entry.runId, reason: "active-run" }); - return; - } - const result = await this.readResult(entry.runId); - if (result === null) { - retained.push({ runId: entry.runId, reason: "incomplete-run" }); - return; - } - if (serializeJson(result) !== serializeJson(initialResult)) { - retained.push({ runId: entry.runId, reason: "terminal authority changed while waiting" }); - return; - } - prepared = await this.prepareCandidateAnchorCleanup( - entry.runId, - result, - currentManifest, - canonical.canonical - ); - await this.appendCleanupRecord({ - event: "prune-cleanup-intent", - runId: entry.runId, - reason, - anchorCleanup: "pending", - archiveBytes: entry.bytes, - quarantineName, - repoRoot: prepared.repoRoot, - anchorRef: prepared.anchorRef, - backupRef: prepared.backupRef, - candidateCommitOid: prepared.candidateCommitOid, - recordedAt: (/* @__PURE__ */ new Date()).toISOString() - }); - transaction = await this.beginCandidateAnchorCleanup(prepared, entry.runId); - runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - await assertDirectoryIdentity5(entry.directory, entry.identity); - await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); - await rename5(entry.directory, quarantinePath); - await syncDirectory3(this.runsRoot); - await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); - await assertDirectoryIdentity5(quarantinePath, entry.identity); - archiveRemovalCommitted = true; - await rm5(quarantinePath, { recursive: true, force: false }); - await syncDirectory3(this.runsRoot); - await transaction.commit(); - await this.appendCleanupRecord({ - event: "prune-cleanup-complete", + const safety = new PlatformSafety(platformServices); + await safety.withCheckoutLease(canonical.canonical, async (acquiredLease) => { + lease = acquiredLease; + await assertDirectoryIdentity5(entry.directory, entry.identity); + const currentManifest = await this.readManifest(entry.runId); + if (currentManifest === null || serializeJson(currentManifest) !== serializeJson(initialManifest)) { + retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); + return; + } + if (await this.readPipelineActiveMarker(entry.runId) !== null) { + retained.push({ runId: entry.runId, reason: "active-run" }); + return; + } + const result = await this.readResult(entry.runId); + if (result === null) { + retained.push({ runId: entry.runId, reason: "incomplete-run" }); + return; + } + if (serializeJson(result) !== serializeJson(initialResult)) { + retained.push({ runId: entry.runId, reason: "terminal authority changed while waiting" }); + return; + } + prepared = await this.prepareCandidateAnchorCleanup( + entry.runId, + result, + currentManifest, + canonical.canonical + ); + await this.appendCleanupRecord({ + event: "prune-cleanup-intent", + runId: entry.runId, + reason, + anchorCleanup: "pending", + archiveBytes: entry.bytes, + quarantineName, + repoRoot: prepared.repoRoot, + anchorRef: prepared.anchorRef, + backupRef: prepared.backupRef, + candidateCommitOid: prepared.candidateCommitOid, + recordedAt: (/* @__PURE__ */ new Date()).toISOString() + }); + transaction = await this.beginCandidateAnchorCleanup(prepared, entry.runId); + runsRootIdentity = await ensurePlainDirectory(this.runsRoot); + await assertDirectoryIdentity5(entry.directory, entry.identity); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await rename6(entry.directory, quarantinePath); + await syncDirectory3(this.runsRoot); + await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity5(quarantinePath, entry.identity); + archiveRemovalCommitted = true; + await rm7(quarantinePath, { recursive: true, force: false }); + await syncDirectory3(this.runsRoot); + await transaction.commit(); + await this.appendCleanupRecord({ + event: "prune-cleanup-complete", + runId: entry.runId, + reason, + anchorCleanup: transaction.outcome, + archiveBytes: entry.bytes, + quarantineName, + repoRoot: prepared.repoRoot, + anchorRef: prepared.anchorRef, + backupRef: prepared.backupRef, + candidateCommitOid: prepared.candidateCommitOid, + recordedAt: (/* @__PURE__ */ new Date()).toISOString() + }); + removed.add(entry.runId); + retainedBytes -= entry.bytes; + }, { runId: entry.runId, - reason, - anchorCleanup: transaction.outcome, - archiveBytes: entry.bytes, - quarantineName, - repoRoot: prepared.repoRoot, - anchorRef: prepared.anchorRef, - backupRef: prepared.backupRef, - candidateCommitOid: prepared.candidateCommitOid, - recordedAt: (/* @__PURE__ */ new Date()).toISOString() + onReleaseError: (releaseError) => { + const reason2 = redact(releaseError instanceof Error ? releaseError.message : String(releaseError)); + retained.push({ + runId: entry.runId, + reason: archiveRemovalCommitted ? `archive removed; checkout lease release failed: ${reason2}` : reason2 + }); + } }); - removed.add(entry.runId); - retainedBytes -= entry.bytes; } catch (error51) { let rollbackError; if (!archiveRemovalCommitted) { @@ -44635,7 +45257,7 @@ var ArtifactStore = class _ArtifactStore { const expectedRunsRoot = runsRootIdentity ?? await ensurePlainDirectory(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, expectedRunsRoot); await assertDirectoryIdentity5(quarantinePath, entry.identity); - await rename5(quarantinePath, entry.directory); + await rename6(quarantinePath, entry.directory); await syncDirectory3(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, expectedRunsRoot); await assertDirectoryIdentity5(entry.directory, entry.identity); @@ -44675,18 +45297,6 @@ var ArtifactStore = class _ArtifactStore { reason: redact(`${primary}${rollback}`) }); } - } finally { - if (lease !== null) { - try { - await lease.release(); - } catch (error51) { - const reason2 = redact(error51 instanceof Error ? error51.message : String(error51)); - retained.push({ - runId: entry.runId, - reason: archiveRemovalCommitted ? `archive removed; checkout lease release failed: ${reason2}` : reason2 - }); - } - } } }; const now = Date.now(); @@ -44709,7 +45319,7 @@ async function pruneRuns(policy = DEFAULT_PRUNE_POLICY, dependencies = {}) { } // src/pipeline/role-runner.ts -import { rm as rm6 } from "node:fs/promises"; +import { rm as rm8 } from "node:fs/promises"; // src/producers/routing-policy.ts function route(preferences, reports) { @@ -44972,8 +45582,8 @@ function buildRoleSpec(role, base, pkg) { } // src/pipeline/git-writable-roots.ts -import { lstat as lstat11, mkdir as mkdir6, readFile as readFile3, realpath as realpath10 } from "node:fs/promises"; -import path20 from "node:path"; +import { lstat as lstat13, mkdir as mkdir7, readFile as readFile5, realpath as realpath10 } from "node:fs/promises"; +import path22 from "node:path"; function invalidWritableRoots(message, cause) { return new RuntimeError(message, { classification: "sandbox-violation", @@ -44981,28 +45591,28 @@ function invalidWritableRoots(message, cause) { }); } async function requirePlainFile(filename, label) { - const stats = await lstat11(filename); + const stats = await lstat13(filename); if (!stats.isFile() || stats.isSymbolicLink()) { throw invalidWritableRoots(`${label} must be a plain regular file`); } return stats; } async function requirePlainDirectory(directory, label) { - const stats = await lstat11(directory); + const stats = await lstat13(directory); if (!stats.isDirectory() || stats.isSymbolicLink()) { throw invalidWritableRoots(`${label} must be a plain directory`); } } function isContainedBy(parent, candidate) { - const relative2 = path20.relative(parent, candidate); - return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path20.sep}`) && !path20.isAbsolute(relative2); + const relative2 = path22.relative(parent, candidate); + return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path22.sep}`) && !path22.isAbsolute(relative2); } function sameFileIdentity(before, after) { return before.dev === after.dev && before.ino === after.ino; } async function readStablePlainFile(filename, label) { const before = await requirePlainFile(filename, label); - const value = await readFile3(filename, "utf8"); + const value = await readFile5(filename, "utf8"); const after = await requirePlainFile(filename, label); if (!sameFileIdentity(before, after)) { throw invalidWritableRoots(`${label} changed while being read`); @@ -45010,16 +45620,16 @@ async function readStablePlainFile(filename, label) { return value; } async function resolveLinkedWorktreeWritableRoots(worktreePath) { - const dotGit = path20.join(worktreePath, ".git"); + const dotGit = path22.join(worktreePath, ".git"); try { const pointer = await readStablePlainFile(dotGit, "linked worktree .git entry"); const match = /^gitdir: (.+)\r?\n?$/.exec(pointer); if (match === null) { throw invalidWritableRoots("linked worktree .git pointer is malformed"); } - const gitDir = await realpath10(path20.resolve(worktreePath, match[1])); + const gitDir = await realpath10(path22.resolve(worktreePath, match[1])); await requirePlainDirectory(gitDir, "linked worktree private git directory"); - const commonDirPointer = path20.join(gitDir, "commondir"); + const commonDirPointer = path22.join(gitDir, "commondir"); const commonDirValue = (await readStablePlainFile( commonDirPointer, "linked worktree commondir entry" @@ -45027,17 +45637,17 @@ async function resolveLinkedWorktreeWritableRoots(worktreePath) { if (commonDirValue === "" || commonDirValue.includes("\0")) { throw invalidWritableRoots("linked worktree commondir pointer is malformed"); } - const commonDir = await realpath10(path20.resolve(gitDir, commonDirValue)); + const commonDir = await realpath10(path22.resolve(gitDir, commonDirValue)); await requirePlainDirectory(commonDir, "common git directory"); - const worktreesDir = await realpath10(path20.join(commonDir, "worktrees")); + const worktreesDir = await realpath10(path22.join(commonDir, "worktrees")); await requirePlainDirectory(worktreesDir, "common git worktrees directory"); if (!isContainedBy(worktreesDir, gitDir)) { throw invalidWritableRoots("linked worktree private git directory escapes common git worktrees"); } - const sharedObjectsDir = await realpath10(path20.join(commonDir, "objects")); + const sharedObjectsDir = await realpath10(path22.join(commonDir, "objects")); await requirePlainDirectory(sharedObjectsDir, "common git objects directory"); - const privateObjectsPath = path20.join(gitDir, "private-objects"); - await mkdir6(privateObjectsPath, { recursive: true, mode: 448 }); + const privateObjectsPath = path22.join(gitDir, "private-objects"); + await mkdir7(privateObjectsPath, { recursive: true, mode: 448 }); await requirePlainDirectory(privateObjectsPath, "private git objects directory"); const privateObjectsDir = await realpath10(privateObjectsPath); if (!isContainedBy(gitDir, privateObjectsDir)) { @@ -45094,7 +45704,7 @@ async function cleanupProcessAttempt(tempHome, builtEnvironment) { } if (tempHome !== null) { try { - await rm6(tempHome, { recursive: true, force: true }); + await rm8(tempHome, { recursive: true, force: true }); } catch (error51) { failures.push(error51); } @@ -45275,14 +45885,14 @@ async function parseStructuredReport(raw, validate, repair) { } // src/autopilot/branch-manager.ts -import { createHash as createHash10, randomUUID as randomUUID6 } from "node:crypto"; -import { constants as constants10 } from "node:fs"; -import { chmod, link as link4, lstat as lstat13, mkdir as mkdir7, mkdtemp as mkdtemp2, open as open10, realpath as realpath12, rm as rm7 } from "node:fs/promises"; -import path22 from "node:path"; +import { createHash as createHash10, randomUUID as randomUUID8 } from "node:crypto"; +import { constants as constants12 } from "node:fs"; +import { chmod, link as link6, lstat as lstat15, mkdir as mkdir8, mkdtemp as mkdtemp2, open as open12, realpath as realpath12, rm as rm9 } from "node:fs/promises"; +import path24 from "node:path"; // src/git/repo-preconditions.ts -import { access as access5, lstat as lstat12, opendir as opendir2, readlink, realpath as realpath11 } from "node:fs/promises"; -import path21 from "node:path"; +import { access as access5, lstat as lstat14, opendir as opendir2, readlink, realpath as realpath11 } from "node:fs/promises"; +import path23 from "node:path"; var MAX_DETAIL_ENTRIES = 20; function boundedDetail(lines) { if (lines.length <= MAX_DETAIL_ENTRIES) return lines; @@ -45321,7 +45931,7 @@ async function checkInProgressOperation(checkoutPath, runGit = git) { if (!succeeded(gitDirectoryResult)) return "scan-failed"; try { const gitDirectory = gitPathOutput(gitDirectoryResult.stdout, "Git directory"); - return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path21.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; + return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path23.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; } catch { return "scan-failed"; } @@ -45353,7 +45963,7 @@ function indexPathsWithMode(output, mode) { for (const record2 of output.split("\0")) { if (!record2.startsWith(`${mode} `)) continue; const separator = record2.indexOf(" "); - if (separator !== -1) paths.add(record2.slice(separator + 1).split(path21.sep).join("/")); + if (separator !== -1) paths.add(record2.slice(separator + 1).split(path23.sep).join("/")); } return paths; } @@ -45361,8 +45971,8 @@ function pathIsWithin(root, candidate) { if (getPlatformServices().os === "win32") { return canonicalizeForScope(candidate, root); } - const relative2 = path21.relative(root, candidate); - return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path21.sep}`) && !path21.isAbsolute(relative2); + const relative2 = path23.relative(root, candidate); + return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path23.sep}`) && !path23.isAbsolute(relative2); } function pathsIdentifySameLocation(left, right) { if (getPlatformServices().os === "win32") { @@ -45382,10 +45992,10 @@ async function isSafeTrackedFileSymlink(repositoryRoot, symlinkPath, relativePat if (hasCode(error51, ["ENOENT", "ENOTDIR", "ELOOP"])) return false; throw error51; } - if (path21.isAbsolute(linkTarget)) return false; - const lexicalTarget = path21.resolve(path21.dirname(symlinkPath), linkTarget); + if (path23.isAbsolute(linkTarget)) return false; + const lexicalTarget = path23.resolve(path23.dirname(symlinkPath), linkTarget); if (!pathIsWithin(repositoryRoot, lexicalTarget)) return false; - if (pathIsWithin(path21.join(repositoryRoot, ".git"), lexicalTarget)) return false; + if (pathIsWithin(path23.join(repositoryRoot, ".git"), lexicalTarget)) return false; let target; try { target = await realpath11(symlinkPath); @@ -45395,8 +46005,8 @@ async function isSafeTrackedFileSymlink(repositoryRoot, symlinkPath, relativePat } if (!pathsIdentifySameLocation(lexicalTarget, target)) return false; if (!pathIsWithin(repositoryRoot, target)) return false; - if (pathIsWithin(path21.join(repositoryRoot, ".git"), target)) return false; - return (await lstat12(target)).isFile(); + if (pathIsWithin(path23.join(repositoryRoot, ".git"), target)) return false; + return (await lstat14(target)).isFile(); } async function findNestedRepositories(repositoryRoot, registeredSubmodules, trackedSymlinks, writeAllowlist) { const nested = [...registeredSubmodules].filter((submodulePath) => writeAllowlist.some((pattern) => patternOverlapsRepository(pattern, submodulePath))); @@ -45406,7 +46016,7 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac const directory = pendingDirectories.pop(); if (directory.relativePath !== "") { try { - await lstat12(path21.join(directory.path, ".git")); + await lstat14(path23.join(directory.path, ".git")); nested.push(directory.relativePath); continue; } catch (error51) { @@ -45421,8 +46031,8 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac throw new Error("nested repository scan entry budget exceeded"); } if (entry.name === ".git") continue; - const child = path21.join(directory.path, entry.name); - const relativeChild = path21.relative(repositoryRoot, child).split(path21.sep).join("/"); + const child = path23.join(directory.path, entry.name); + const relativeChild = path23.relative(repositoryRoot, child).split(path23.sep).join("/"); if (registeredSubmodules.has(relativeChild)) continue; if (!writeAllowlist.some((pattern) => patternOverlapsRepository(pattern, relativeChild))) continue; if (entry.isSymbolicLink()) { @@ -45567,14 +46177,14 @@ function createIsolatedRemoteTransport(runGit = git) { }); }; const createRepository = async () => { - const root = path22.join(resolveStateDir(), "autopilot-remote"); - await mkdir7(root, { recursive: true, mode: 448 }); + const root = path24.join(resolveStateDir(), "autopilot-remote"); + await mkdir8(root, { recursive: true, mode: 448 }); await chmod(root, 448); - const repository = await mkdtemp2(path22.join(root, "operation-")); + const repository = await mkdtemp2(path24.join(root, "operation-")); await chmod(repository, 448); const initialized = await runIsolatedGit(repository, ["init", "--bare", "--quiet", "."]); if (!succeeded2(initialized)) { - await rm7(repository, { recursive: true, force: true }); + await rm9(repository, { recursive: true, force: true }); throw new RuntimeError("isolated remote repository initialization failed"); } return repository; @@ -45591,7 +46201,7 @@ function createIsolatedRemoteTransport(runGit = git) { } if (repository !== void 0) { try { - await rm7(repository, { recursive: true }); + await rm9(repository, { recursive: true }); } catch { return transportFailure("isolated remote repository cleanup"); } @@ -45618,7 +46228,7 @@ function createIsolatedRemoteTransport(runGit = git) { result = succeeded2(resolved) ? transportFailure("git resolve fetched base") : resolved; } else { fetchedOid = resolved.stdout.trim(); - const bundlePath = path22.join(repository, "base.bundle"); + const bundlePath = path24.join(repository, "base.bundle"); const bundled = await runIsolatedGit( repository, ["bundle", "create", bundlePath, quarantineRef] @@ -45638,7 +46248,7 @@ function createIsolatedRemoteTransport(runGit = git) { } finally { if (repository !== void 0) { try { - await rm7(repository, { recursive: true }); + await rm9(repository, { recursive: true }); } catch { result = transportFailure("isolated remote repository cleanup"); fetchedOid = void 0; @@ -45720,7 +46330,7 @@ async function parseWorktreeRegistrations(output, allowMissing = false) { const separator = field.indexOf(" "); const key = separator === -1 ? field : field.slice(0, separator); const value = separator === -1 ? "" : field.slice(separator + 1); - if (key === "worktree") registration.worktree = path22.resolve(value); + if (key === "worktree") registration.worktree = path24.resolve(value); else if (key === "HEAD") registration.head = value; else if (key === "branch") registration.branch = value; } @@ -45763,7 +46373,7 @@ function parseRegistration2(value, workflowId) { "remoteUrl", "ownerRepo", "bootstrapOwner" - ]) || parsed.ownershipVersion !== OWNERSHIP_VERSION || parsed.workflowId !== workflowId || typeof parsed.checkoutPath !== "string" || !path22.isAbsolute(parsed.checkoutPath) || path22.resolve(parsed.checkoutPath) !== parsed.checkoutPath || typeof parsed.gitCommonDir !== "string" || !path22.isAbsolute(parsed.gitCommonDir) || path22.resolve(parsed.gitCommonDir) !== parsed.gitCommonDir || typeof parsed.repositoryIdentity !== "string" || parsed.repositoryIdentity !== parsed.gitCommonDir || typeof parsed.worktreePath !== "string" || !path22.isAbsolute(parsed.worktreePath) || path22.resolve(parsed.worktreePath) !== parsed.worktreePath || typeof parsed.worktreeGitDir !== "string" || !path22.isAbsolute(parsed.worktreeGitDir) || path22.resolve(parsed.worktreeGitDir) !== parsed.worktreeGitDir || typeof parsed.branch !== "string" || parsed.branchRef !== `refs/heads/${parsed.branch}` || parsed.baseRef !== `refs/claude-architect/autopilot/${workflowId}/base` || typeof parsed.baseBranch !== "string" || !isOid(parsed.baseCommitOid ?? "") || parsed.remote !== "origin" || typeof parsed.remoteUrl !== "string" || typeof parsed.ownerRepo !== "string" || !isBootstrapOwnerRecord(parsed.bootstrapOwner, workflowId)) return null; + ]) || parsed.ownershipVersion !== OWNERSHIP_VERSION || parsed.workflowId !== workflowId || typeof parsed.checkoutPath !== "string" || !path24.isAbsolute(parsed.checkoutPath) || path24.resolve(parsed.checkoutPath) !== parsed.checkoutPath || typeof parsed.gitCommonDir !== "string" || !path24.isAbsolute(parsed.gitCommonDir) || path24.resolve(parsed.gitCommonDir) !== parsed.gitCommonDir || typeof parsed.repositoryIdentity !== "string" || parsed.repositoryIdentity !== parsed.gitCommonDir || typeof parsed.worktreePath !== "string" || !path24.isAbsolute(parsed.worktreePath) || path24.resolve(parsed.worktreePath) !== parsed.worktreePath || typeof parsed.worktreeGitDir !== "string" || !path24.isAbsolute(parsed.worktreeGitDir) || path24.resolve(parsed.worktreeGitDir) !== parsed.worktreeGitDir || typeof parsed.branch !== "string" || parsed.branchRef !== `refs/heads/${parsed.branch}` || parsed.baseRef !== `refs/claude-architect/autopilot/${workflowId}/base` || typeof parsed.baseBranch !== "string" || !isOid(parsed.baseCommitOid ?? "") || parsed.remote !== "origin" || typeof parsed.remoteUrl !== "string" || typeof parsed.ownerRepo !== "string" || !isBootstrapOwnerRecord(parsed.bootstrapOwner, workflowId)) return null; return parsed; } async function readRegistrationFile(ownershipPath, expectedWorkflowId) { @@ -45792,12 +46402,12 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { throw new RuntimeError("workflow ownership record is malformed"); } const ownershipHash = createHash10("sha256").update(registration.workflowId).digest("hex"); - const expectedOwnershipPath = path22.join( + const expectedOwnershipPath = path24.join( resolveStateDir(), "autopilot-branches", `${ownershipHash}.json` ); - if (path22.resolve(ownershipPath) !== path22.resolve(expectedOwnershipPath)) { + if (path24.resolve(ownershipPath) !== path24.resolve(expectedOwnershipPath)) { throw new RuntimeError("workflow ownership filename does not match its workflow id"); } const [canonicalOwnershipPath, canonicalExpectedOwnershipPath, canonicalWorktreePath] = await Promise.all([ @@ -45816,10 +46426,10 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { throw new RuntimeError("workflow ownership record changed during validation"); } const managedName = `workflow-${ownershipHash.slice(0, 32)}`; - const candidateName = path22.basename(canonicalWorktreePath); + const candidateName = path24.basename(canonicalWorktreePath); const ownsPrimary = candidateName === managedName && canonicalRegisteredWorktreePath === canonicalWorktreePath; const legacyFinalName = `final-${createHash10("sha256").update(JSON.stringify(registration.workflowId)).digest("hex").slice(0, 24)}`; - const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path22.basename(canonicalRegisteredWorktreePath) === managedName && path22.dirname(canonicalRegisteredWorktreePath) === path22.dirname(canonicalWorktreePath); + const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path24.basename(canonicalRegisteredWorktreePath) === managedName && path24.dirname(canonicalRegisteredWorktreePath) === path24.dirname(canonicalWorktreePath); if (canonicalOwnershipPath !== canonicalExpectedOwnershipPath || !ownsPrimary && !ownsFinalMaterialization) { throw new RuntimeError("workflow ownership record names a different worktree"); } @@ -45845,9 +46455,9 @@ var WorkflowBranchManager = class { constructor(dependencies = {}) { this.runGit = dependencies.git ?? git; this.remoteTransport = dependencies.remoteTransport ?? createIsolatedRemoteTransport(this.runGit); - this.removeOwnership = dependencies.removeOwnership ?? ((ownershipPath) => rm7(ownershipPath)); + this.removeOwnership = dependencies.removeOwnership ?? ((ownershipPath) => rm9(ownershipPath)); const platformServices = dependencies.platformServices ?? getPlatformServices(); - this.platformServices = guardWorktreeMutations(platformServices); + this.platformServices = platformServices; this.getProcessStartToken = platformServices.getProcessStartToken?.bind(platformServices) ?? getPlatformServices().getProcessStartToken.bind(getPlatformServices()); this.worktreeManagerDependencies = { ...dependencies.worktreeManagerDependencies, @@ -45856,7 +46466,7 @@ var WorkflowBranchManager = class { } ownershipPath(workflowId) { const name = createHash10("sha256").update(workflowId).digest("hex"); - return path22.join(resolveStateDir(), "autopilot-branches", `${name}.json`); + return path24.join(resolveStateDir(), "autopilot-branches", `${name}.json`); } async readRegistration(workflowId) { try { @@ -45886,7 +46496,7 @@ var WorkflowBranchManager = class { } async ownershipExists(workflowId) { try { - await lstat13(this.ownershipPath(workflowId)); + await lstat15(this.ownershipPath(workflowId)); return true; } catch (error51) { if (typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT") { @@ -45897,17 +46507,17 @@ var WorkflowBranchManager = class { } async persistOwnership(identity, bootstrapOwner) { const ownershipPath = this.ownershipPath(identity.workflowId); - const directory = path22.dirname(ownershipPath); - await mkdir7(directory, { recursive: true }); - const temporaryPath = path22.join(directory, `.${path22.basename(ownershipPath)}.${randomUUID6()}.tmp`); + const directory = path24.dirname(ownershipPath); + await mkdir8(directory, { recursive: true }); + const temporaryPath = path24.join(directory, `.${path24.basename(ownershipPath)}.${randomUUID8()}.tmp`); const bytes = Buffer.from(`${JSON.stringify({ ...identity, bootstrapOwner })} `); let temporaryExists = false; let ownershipLinked = false; try { - const handle = await open10( + const handle = await open12( temporaryPath, - constants10.O_WRONLY | constants10.O_CREAT | constants10.O_EXCL | (constants10.O_NOFOLLOW ?? 0), + constants12.O_WRONLY | constants12.O_CREAT | constants12.O_EXCL | (constants12.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; @@ -45918,7 +46528,7 @@ var WorkflowBranchManager = class { await handle.close(); } try { - await link4(temporaryPath, ownershipPath); + await link6(temporaryPath, ownershipPath); ownershipLinked = true; } catch (error51) { if (typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EEXIST") { @@ -45926,13 +46536,13 @@ var WorkflowBranchManager = class { } throw error51; } - await rm7(temporaryPath); + await rm9(temporaryPath); temporaryExists = false; await syncDirectoryMetadata(directory); ownershipLinked = false; } finally { - if (temporaryExists) await rm7(temporaryPath, { force: true }); - if (ownershipLinked) await rm7(ownershipPath, { force: true }); + if (temporaryExists) await rm9(temporaryPath, { force: true }); + if (ownershipLinked) await rm9(ownershipPath, { force: true }); } } async resolveRemote(checkoutPath) { @@ -45971,205 +46581,198 @@ var WorkflowBranchManager = class { const branch = `feat/${request.topic}-${request.workflowId.slice(0, 8)}`; const branchRef = `refs/heads/${branch}`; const baseRef = `refs/claude-architect/autopilot/${request.workflowId}/base`; - const fetchedRef = `refs/claude-architect/autopilot/${request.workflowId}/fetch-${randomUUID6()}`; + const fetchedRef = `refs/claude-architect/autopilot/${request.workflowId}/fetch-${randomUUID8()}`; const initial = await this.platformServices.canonicalizePath(request.checkoutPath); if (initial.gitCommonDir === null) fail("not-a-repository"); - let lock; - try { - lock = await this.platformServices.acquireCheckoutLock(initial.canonical); - } catch (error51) { - if (error51 instanceof RuntimeError && error51.detail?.classification === "recovery-ambiguous") { - fail("recovery-ambiguous", error51.message); - } - fail("checkout-locked"); - } let attached; let refsCreated = false; let fetchedCreated = false; let fetchedOidForCleanup; let completedIdentity; let operationError; + const workflowHash = createHash10("sha256").update(request.workflowId).digest("hex"); + const remoteIdentity = await this.resolveRemote(initial.canonical); + const safety = new PlatformSafety(this.platformServices); try { - const locked = await this.platformServices.canonicalizePath(initial.canonical); - if (locked.gitCommonDir === null || locked.gitCommonDir !== initial.gitCommonDir || lock.repositoryIdentity !== initial.gitCommonDir) { - fail("repository-identity-mismatch"); - } - if (await this.ownershipExists(request.workflowId)) { - fail("workflow-already-owned"); - } - const checkedBranch = await this.runGit(initial.canonical, [ - "check-ref-format", - "--branch", - branch - ]); - if (!succeeded2(checkedBranch)) fail("branch-name-invalid"); - for (const candidate of [baseRef, fetchedRef]) { - const checked2 = await this.runGit(initial.canonical, ["check-ref-format", candidate]); - if (!succeeded2(checked2)) fail("branch-name-invalid"); - } - const remoteIdentity = await this.resolveRemote(initial.canonical); - const localRefs = await this.runGit(initial.canonical, [ - "for-each-ref", - "--format=%(refname)", - "refs/heads/" - ]); - if (!succeeded2(localRefs)) operationFailure("git local branch scan", localRefs); - const localCollision = localRefs.stdout.split("\n").filter(Boolean).some((ref) => ref.toLowerCase() === branchRef.toLowerCase()); - if (localCollision) fail("local-branch-exists"); - for (const privateRef of [baseRef, fetchedRef]) { - const exists3 = await this.runGit(initial.canonical, ["show-ref", "--verify", "--quiet", privateRef]); - if (exists3.exitCode === 0) fail("workflow-ref-exists"); - if (exists3.exitCode !== 1) operationFailure("git private ref scan", exists3); - } - const advertised = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); - if (!succeeded2(advertised)) operationFailure("git remote branch scan", advertised); - const remoteHeads = parseRemoteHeads(advertised.stdout); - if ([...remoteHeads.keys()].some((name) => name.toLowerCase() === branch.toLowerCase())) { - fail("remote-branch-exists"); - } - const advertisedBase = remoteHeads.get(request.baseBranch); - if (advertisedBase === void 0 || !isOid(advertisedBase)) fail("remote-base-missing"); - const fetched = await this.remoteTransport.fetch( - initial.canonical, - remoteIdentity.url, - `refs/heads/${request.baseBranch}`, - fetchedRef - ); - if (!succeeded2(fetched)) operationFailure("git fetch base", fetched); - fetchedCreated = true; - const fetchedOidResult = await this.runGit(initial.canonical, ["rev-parse", "--verify", fetchedRef]); - if (!succeeded2(fetchedOidResult)) operationFailure("git resolve fetched base", fetchedOidResult); - const fetchedOid = fetchedOidResult.stdout.trim(); - if (!isOid(fetchedOid)) fail("stale-fetched-base"); - fetchedOidForCleanup = fetchedOid; - if (fetchedOid !== advertisedBase) fail("stale-fetched-base"); - const commit = await this.runGit(initial.canonical, ["cat-file", "-e", `${fetchedOid}^{commit}`]); - if (!succeeded2(commit)) fail("fetched-base-not-commit"); - const confirmed = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); - if (!succeeded2(confirmed)) operationFailure("git remote base confirmation", confirmed); - const confirmedHeads = parseRemoteHeads(confirmed.stdout); - if ([...confirmedHeads.keys()].some((name) => name.toLowerCase() === branch.toLowerCase())) { - fail("remote-branch-exists"); - } - if (confirmedHeads.get(request.baseBranch) !== fetchedOid) { - fail("remote-base-changed-during-create"); - } - const transaction = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { - stdin: [ - "start", - `create ${baseRef} ${fetchedOid}`, - `create ${branchRef} ${fetchedOid}`, - `delete ${fetchedRef} ${fetchedOid}`, - "prepare", - "commit", - "" - ].join("\n") - }); - if (!succeeded2(transaction)) operationFailure("git create workflow refs", transaction); - fetchedCreated = false; - refsCreated = true; - const worktreeManager = new WorktreeManager( - initial.canonical, - `workflow-${createHash10("sha256").update(request.workflowId).digest("hex").slice(0, 32)}`, - { os: this.platformServices.os }, - { ...this.worktreeManagerDependencies, borrowedCheckoutLease: lock } - ); - attached = await worktreeManager.createAttached(branch, fetchedOid); - const worktreePath = await realpath12(attached.path); - const worktreeGitDirResult = await this.runGit(worktreePath, [ - "rev-parse", - "--path-format=absolute", - "--git-dir" - ]); - if (!succeeded2(worktreeGitDirResult)) { - operationFailure("git resolve worktree administrative directory", worktreeGitDirResult); - } - const worktreeGitDir = await realpath12(gitPathOutput( - worktreeGitDirResult.stdout, - "workflow worktree Git directory" - )); - const identity = { - ownershipVersion: OWNERSHIP_VERSION, - workflowId: request.workflowId, - checkoutPath: initial.canonical, - gitCommonDir: initial.gitCommonDir, - repositoryIdentity: lock.repositoryIdentity, - worktreePath, - worktreeGitDir, - branch, - branchRef, - baseRef, - baseBranch: request.baseBranch, - baseCommitOid: fetchedOid, - remote: "origin", - remoteUrl: remoteIdentity.url, - ownerRepo: remoteIdentity.ownerRepo - }; - const bootstrapOwner = { - workflowId: request.workflowId, - pid: process.pid, - processToken: await this.getProcessStartToken(process.pid).catch(() => null), - createdAt: (/* @__PURE__ */ new Date()).toISOString() - }; - await this.persistOwnership(identity, bootstrapOwner); - completedIdentity = identity; - } catch (error51) { - const cleanupErrors = []; - if (attached !== void 0) { + await safety.withCheckoutLease(initial.canonical, async (lock) => { try { - await attached.cleanup(); - } catch (cleanupError) { - cleanupErrors.push(cleanupError); + const locked = await this.platformServices.canonicalizePath(initial.canonical); + if (locked.gitCommonDir === null || locked.gitCommonDir !== initial.gitCommonDir || lock.repositoryIdentity !== initial.gitCommonDir) { + fail("repository-identity-mismatch"); + } + if (await this.ownershipExists(request.workflowId)) { + fail("workflow-already-owned"); + } + const checkedBranch = await this.runGit(initial.canonical, [ + "check-ref-format", + "--branch", + branch + ]); + if (!succeeded2(checkedBranch)) fail("branch-name-invalid"); + for (const candidate of [baseRef, fetchedRef]) { + const checked2 = await this.runGit(initial.canonical, ["check-ref-format", candidate]); + if (!succeeded2(checked2)) fail("branch-name-invalid"); + } + const localHeads = await this.runGit(initial.canonical, ["for-each-ref", "--format=%(refname)", "refs/heads/"]); + if (!succeeded2(localHeads)) operationFailure("git branch scan", localHeads); + const localCollision = localHeads.stdout.split("\n").filter(Boolean).some((ref) => ref.toLowerCase() === branchRef.toLowerCase()); + if (localCollision) fail("local-branch-exists"); + for (const privateRef of [baseRef, fetchedRef]) { + const exists3 = await this.runGit(initial.canonical, ["show-ref", "--verify", "--quiet", privateRef]); + if (exists3.exitCode === 0) fail("workflow-ref-exists"); + if (exists3.exitCode !== 1) operationFailure("git private ref scan", exists3); + } + const advertised = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); + if (!succeeded2(advertised)) operationFailure("git remote branch scan", advertised); + const remoteHeads = parseRemoteHeads(advertised.stdout); + if ([...remoteHeads.keys()].some((name) => name.toLowerCase() === branch.toLowerCase())) { + fail("remote-branch-exists"); + } + const advertisedBase = remoteHeads.get(request.baseBranch); + if (advertisedBase === void 0 || !isOid(advertisedBase)) fail("remote-base-missing"); + const fetched = await this.remoteTransport.fetch( + initial.canonical, + remoteIdentity.url, + `refs/heads/${request.baseBranch}`, + fetchedRef + ); + if (!succeeded2(fetched)) operationFailure("git fetch base", fetched); + fetchedCreated = true; + const fetchedOidResult = await this.runGit(initial.canonical, ["rev-parse", "--verify", fetchedRef]); + if (!succeeded2(fetchedOidResult)) operationFailure("git resolve fetched base", fetchedOidResult); + const fetchedOid = fetchedOidResult.stdout.trim(); + if (!isOid(fetchedOid)) fail("stale-fetched-base"); + fetchedOidForCleanup = fetchedOid; + if (fetchedOid !== advertisedBase) fail("stale-fetched-base"); + const commit = await this.runGit(initial.canonical, ["cat-file", "-e", `${fetchedOid}^{commit}`]); + if (!succeeded2(commit)) fail("fetched-base-not-commit"); + const confirmed = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); + if (!succeeded2(confirmed)) operationFailure("git remote base confirmation", confirmed); + const confirmedHeads = parseRemoteHeads(confirmed.stdout); + if ([...confirmedHeads.keys()].some((name) => name.toLowerCase() === branch.toLowerCase())) { + fail("remote-branch-exists"); + } + if (confirmedHeads.get(request.baseBranch) !== fetchedOid) { + fail("remote-base-changed-during-create"); + } + const transaction = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { + stdin: [ + "start", + `create ${baseRef} ${fetchedOid}`, + `create ${branchRef} ${fetchedOid}`, + `delete ${fetchedRef} ${fetchedOid}`, + "prepare", + "commit", + "" + ].join("\n") + }); + if (!succeeded2(transaction)) operationFailure("git create workflow refs", transaction); + fetchedCreated = false; + refsCreated = true; + const worktreeManager = new WorktreeManager( + initial.canonical, + `workflow-${createHash10("sha256").update(request.workflowId).digest("hex").slice(0, 32)}`, + { os: this.platformServices.os }, + { ...this.worktreeManagerDependencies, borrowedCheckoutLease: lock } + ); + attached = await worktreeManager.createAttached(branch, fetchedOid); + const worktreePath = await realpath12(attached.path); + const worktreeGitDirResult = await this.runGit(worktreePath, [ + "rev-parse", + "--path-format=absolute", + "--git-dir" + ]); + if (!succeeded2(worktreeGitDirResult)) { + operationFailure("git resolve worktree administrative directory", worktreeGitDirResult); + } + const worktreeGitDir = await realpath12(gitPathOutput( + worktreeGitDirResult.stdout, + "workflow worktree Git directory" + )); + const identity = { + ownershipVersion: OWNERSHIP_VERSION, + workflowId: request.workflowId, + checkoutPath: initial.canonical, + gitCommonDir: initial.gitCommonDir, + repositoryIdentity: lock.repositoryIdentity, + worktreePath, + worktreeGitDir, + branch, + branchRef, + baseRef, + baseBranch: request.baseBranch, + baseCommitOid: fetchedOid, + remote: "origin", + remoteUrl: remoteIdentity.url, + ownerRepo: remoteIdentity.ownerRepo + }; + const bootstrapOwner = { + workflowId: request.workflowId, + pid: process.pid, + processToken: await this.getProcessStartToken(process.pid).catch(() => null), + createdAt: (/* @__PURE__ */ new Date()).toISOString() + }; + await this.persistOwnership(identity, bootstrapOwner); + completedIdentity = identity; + } catch (error51) { + const cleanupErrors = []; + if (attached !== void 0) { + try { + await attached.cleanup(); + } catch (cleanupError) { + cleanupErrors.push(cleanupError); + } + } + if (refsCreated && fetchedOidForCleanup !== void 0) { + const rollback = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { + stdin: [ + `delete ${branchRef} ${fetchedOidForCleanup}`, + `delete ${baseRef} ${fetchedOidForCleanup}`, + "" + ].join("\n") + }); + if (!succeeded2(rollback)) cleanupErrors.push(new RuntimeError("workflow ref rollback failed")); + } else if (refsCreated) { + cleanupErrors.push(new RuntimeError("workflow ref identity unavailable for safe rollback")); + } else if (fetchedCreated && fetchedOidForCleanup !== void 0) { + const rollback = await this.runGit(initial.canonical, [ + "update-ref", + "-d", + fetchedRef, + fetchedOidForCleanup + ]); + if (!succeeded2(rollback)) cleanupErrors.push(new RuntimeError("fetched ref rollback failed")); + } else if (fetchedCreated) { + cleanupErrors.push(new RuntimeError("fetched ref identity unavailable for safe rollback")); + } + if (cleanupErrors.length > 0) { + operationError = new AggregateError( + [error51, ...cleanupErrors], + "workflow branch creation and cleanup failed" + ); + } else { + operationError = error51; + } + throw operationError; } - } - if (refsCreated && fetchedOidForCleanup !== void 0) { - const rollback = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { - stdin: [ - `delete ${branchRef} ${fetchedOidForCleanup}`, - `delete ${baseRef} ${fetchedOidForCleanup}`, - "" - ].join("\n") - }); - if (!succeeded2(rollback)) cleanupErrors.push(new RuntimeError("workflow ref rollback failed")); - } else if (refsCreated) { - cleanupErrors.push(new RuntimeError("workflow ref identity unavailable for safe rollback")); - } else if (fetchedCreated && fetchedOidForCleanup !== void 0) { - const rollback = await this.runGit(initial.canonical, [ - "update-ref", - "-d", - fetchedRef, - fetchedOidForCleanup - ]); - if (!succeeded2(rollback)) cleanupErrors.push(new RuntimeError("fetched ref rollback failed")); - } else if (fetchedCreated) { - cleanupErrors.push(new RuntimeError("fetched ref identity unavailable for safe rollback")); - } - if (cleanupErrors.length > 0) { - operationError = new AggregateError( - [error51, ...cleanupErrors], - "workflow branch creation and cleanup failed" - ); - } else { - operationError = error51; - } - } - try { - await lock.release(); - } catch (releaseError) { - if (completedIdentity === void 0) { - operationError = operationError === void 0 ? releaseError : new AggregateError( - [operationError, releaseError], - "workflow branch creation failed and checkout lock release failed" - ); - } else { + }); + } catch (error51) { + if (completedIdentity !== void 0) { logger.warn("checkout lock release failed after workflow branch creation", { event: "checkout-lock-release-failed", workflowId: completedIdentity.workflowId, - reason: redact(String(releaseError)) + reason: redact(String(error51)) }); + } else { + if (error51 instanceof RuntimeError && error51.detail?.classification === "recovery-ambiguous") { + fail("recovery-ambiguous", error51.message); + } + if (operationError !== void 0) { + throw error51; + } + fail("checkout-locked"); } } - if (operationError !== void 0) throw operationError; return completedIdentity; } async validateLocked(identity, expectedHead2, allowStagedBytes = false) { @@ -46260,32 +46863,30 @@ var WorkflowBranchManager = class { return { ok: true }; } async revalidate(identity, expectedHead2 = identity.baseCommitOid) { - let lock; + const safety = new PlatformSafety(this.platformServices); try { - lock = await this.platformServices.acquireCheckoutLock(identity.checkoutPath); + return await safety.withCheckoutLease(identity.checkoutPath, async (lock) => { + if (lock.repositoryIdentity !== identity.repositoryIdentity) { + return { ok: false, classification: "repository-identity-changed" }; + } + try { + return await this.validateLocked(identity, expectedHead2); + } catch { + return { ok: false, classification: "git-command-failed" }; + } + }, { + onReleaseError: (releaseError, result) => { + logger.warn("checkout lock release failed after workflow branch revalidation", { + event: "checkout-lock-release-failed", + workflowId: identity.workflowId, + reason: redact(String(releaseError)) + }); + return result; + } + }); } catch { return { ok: false, classification: "repository-identity-changed" }; } - try { - if (lock.repositoryIdentity !== identity.repositoryIdentity) { - return { ok: false, classification: "repository-identity-changed" }; - } - try { - return await this.validateLocked(identity, expectedHead2); - } catch { - return { ok: false, classification: "git-command-failed" }; - } - } finally { - try { - await lock.release(); - } catch (releaseError) { - logger.warn("checkout lock release failed after workflow branch revalidation", { - event: "checkout-lock-release-failed", - workflowId: identity.workflowId, - reason: redact(String(releaseError)) - }); - } - } } async revalidateUnderLock(identity, expectedHead2, borrowedCheckoutLock) { if (!isOid(expectedHead2) || borrowedCheckoutLock.repositoryIdentity !== identity.repositoryIdentity) { @@ -46466,30 +47067,26 @@ var WorkflowBranchManager = class { if (!isOid(expectedHead2) || !isOid(identity.baseCommitOid) || !WORKFLOW_ID2.test(identity.workflowId) || typeof identity.worktreeGitDir !== "string" || identity.branchRef !== `refs/heads/${identity.branch}` || identity.baseRef !== `refs/claude-architect/autopilot/${identity.workflowId}/base`) { return { ok: false, classification: "cleanup-failed" }; } - let lock; - try { - lock = await this.platformServices.acquireCheckoutLock(identity.checkoutPath); - } catch { - return { ok: false, classification: "cleanup-failed" }; - } let result; + const safety = new PlatformSafety(this.platformServices); try { - if (lock.repositoryIdentity !== identity.repositoryIdentity) { - result = { ok: false, classification: "cleanup-failed" }; - } else { - result = await this.cleanupLocked(identity, expectedHead2, lock); - } - } catch { - result = { ok: false, classification: "cleanup-failed" }; - } - try { - await lock.release(); - } catch (releaseError) { - logger.warn("checkout lock release failed after workflow branch cleanup", { - event: "checkout-lock-release-failed", - workflowId: identity.workflowId, - reason: redact(String(releaseError)) + result = await safety.withCheckoutLease(identity.checkoutPath, async (lock) => { + if (lock.repositoryIdentity !== identity.repositoryIdentity) { + return { ok: false, classification: "cleanup-failed" }; + } + return await this.cleanupLocked(identity, expectedHead2, lock); + }, { + onReleaseError: (releaseError, res) => { + logger.warn("checkout lock release failed after workflow branch cleanup", { + event: "checkout-lock-release-failed", + workflowId: identity.workflowId, + reason: redact(String(releaseError)) + }); + return res; + } }); + } catch { + return { ok: false, classification: "cleanup-failed" }; } return result; } @@ -46498,7 +47095,7 @@ var WorkflowBranchManager = class { // src/autopilot/final-branch-reviewer.ts var OBJECT_ID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; var SHA2563 = /^[0-9a-f]{64}$/u; -var NO_FOLLOW5 = constants11.O_NOFOLLOW ?? 0; +var NO_FOLLOW7 = constants13.O_NOFOLLOW ?? 0; var MAX_FINAL_BRANCH_ARTIFACT_BYTES = 64 * 1024 * 1024; var MAX_TASK_EVIDENCE_REFS = 4096; var MAX_TASK_EVIDENCE_BYTES = 8 * 1024 * 1024; @@ -46542,7 +47139,7 @@ function normalizedEvidenceRefs(references, allowEmpty = false, maximum = 128) { } const unique = /* @__PURE__ */ new Set(); for (const reference of references) { - if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path23.posix.isAbsolute(reference) || reference.includes("\\") || reference.split("/").some((component) => component === "" || component === "." || component === "..") || /[\0\r\n]/u.test(reference)) { + if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path25.posix.isAbsolute(reference) || reference.includes("\\") || reference.split("/").some((component) => component === "" || component === "." || component === "..") || /[\0\r\n]/u.test(reference)) { fail2("missing-task-evidence", "task evidence reference is invalid"); } unique.add(reference); @@ -46996,16 +47593,16 @@ function freezePackage(value) { return value; } async function persistImmutableJson(workflowDirectory, reference, value) { - const destination = path23.join(workflowDirectory, reference); - const temporary = path23.join(workflowDirectory, `.${reference}.${randomUUID7()}.tmp`); + const destination = path25.join(workflowDirectory, reference); + const temporary = path25.join(workflowDirectory, `.${reference}.${randomUUID9()}.tmp`); const serialized = `${JSON.stringify(value, null, 2)} `; let handle; let temporaryExists = false; try { - handle = await open11( + handle = await open13( temporary, - constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | NO_FOLLOW5, + constants13.O_WRONLY | constants13.O_CREAT | constants13.O_EXCL | NO_FOLLOW7, 384 ); temporaryExists = true; @@ -47014,18 +47611,18 @@ async function persistImmutableJson(workflowDirectory, reference, value) { await handle.close(); handle = void 0; try { - await link5(temporary, destination); + await link7(temporary, destination); } catch (error51) { if (error51.code !== "EEXIST") throw error51; - const metadata = await lstat14(destination); - if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== 1 || await readFile4(destination, "utf8") !== serialized) { + const metadata = await lstat16(destination); + if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== 1 || await readFile6(destination, "utf8") !== serialized) { fail2("artifact-persistence-failed", `a different ${reference} already exists`); } } - await rm8(temporary); + await rm10(temporary); temporaryExists = false; await syncDirectoryMetadata(workflowDirectory); - if (await readFile4(destination, "utf8") !== serialized) { + if (await readFile6(destination, "utf8") !== serialized) { fail2("artifact-persistence-failed", `${reference} was not durably persisted`); } } catch (error51) { @@ -47033,23 +47630,23 @@ async function persistImmutableJson(workflowDirectory, reference, value) { fail2("artifact-persistence-failed", `failed to persist ${reference}`); } finally { await handle?.close(); - if (temporaryExists) await rm8(temporary, { force: true }); + if (temporaryExists) await rm10(temporary, { force: true }); } } async function persistFrozenArtifact(workflowDirectory, artifact) { - const destination = path23.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - const temporary = path23.join( + const destination = path25.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); + const temporary = path25.join( workflowDirectory, - `.${FINAL_BRANCH_ARTIFACT_REF}.${randomUUID7()}.tmp` + `.${FINAL_BRANCH_ARTIFACT_REF}.${randomUUID9()}.tmp` ); const serialized = `${JSON.stringify(artifact, null, 2)} `; let handle; let temporaryExists = false; try { - handle = await open11( + handle = await open13( temporary, - constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | NO_FOLLOW5, + constants13.O_WRONLY | constants13.O_CREAT | constants13.O_EXCL | NO_FOLLOW7, 384 ); temporaryExists = true; @@ -47058,18 +47655,18 @@ async function persistFrozenArtifact(workflowDirectory, artifact) { await handle.close(); handle = void 0; try { - await link5(temporary, destination); + await link7(temporary, destination); } catch (error51) { if (error51.code !== "EEXIST") throw error51; - const metadata = await lstat14(destination); - if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== 1 || await readFile4(destination, "utf8") !== serialized) { + const metadata = await lstat16(destination); + if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== 1 || await readFile6(destination, "utf8") !== serialized) { fail2("artifact-persistence-failed", "a different final branch artifact already exists"); } } - await rm8(temporary); + await rm10(temporary); temporaryExists = false; await syncDirectoryMetadata(workflowDirectory); - const persisted = JSON.parse(await readFile4(destination, "utf8")); + const persisted = JSON.parse(await readFile6(destination, "utf8")); const { branchArtifactHash, ...unhashed } = persisted; if (branchArtifactHash !== artifact.branchArtifactHash || branchArtifactHashOf(unhashed) !== artifact.branchArtifactHash) { fail2("artifact-persistence-failed", "final branch artifact was not durably persisted"); @@ -47079,14 +47676,14 @@ async function persistFrozenArtifact(workflowDirectory, artifact) { fail2("artifact-persistence-failed", "failed to persist final branch artifact"); } finally { await handle?.close(); - if (temporaryExists) await rm8(temporary, { force: true }); + if (temporaryExists) await rm10(temporary, { force: true }); } } async function assertPersistedArtifact(workflowDirectory, artifact) { let handle; try { - const destination = path23.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - handle = await open11(destination, constants11.O_RDONLY | NO_FOLLOW5); + const destination = path25.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); + handle = await open13(destination, constants13.O_RDONLY | NO_FOLLOW7); const metadata = await handle.stat(); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > MAX_FINAL_BRANCH_ARTIFACT_BYTES) { fail2("artifact-persistence-failed", "final branch artifact is not a safe regular file"); @@ -47124,9 +47721,7 @@ var FinalBranchReviewer = class { structural: async (args) => await structuralVerifyFinalBranch(args, this.runGit) }); this.roleRunner = dependencies.roleRunner ?? runRole; - this.platformServices = guardWorktreeMutations( - dependencies.platformServices ?? getPlatformServices() - ); + this.platformServices = dependencies.platformServices ?? getPlatformServices(); this.producerRegistry = dependencies.producerRegistry ?? registry2; this.artifactStore = dependencies.artifactStore ?? ((workflowId) => new ArtifactStore(`final-${canonicalArtifactHash(workflowId).slice(0, 24)}`)); this.evidenceStore = dependencies.evidenceStore ?? ((runId) => new ArtifactStore(runId)); @@ -47253,34 +47848,14 @@ var FinalBranchReviewer = class { }); } async withCheckoutLease(checkoutPath, phase, execute2) { - const canonical = await this.platformServices.canonicalizePath(checkoutPath); - if (canonical.gitCommonDir === null) { - fail2("workflow-state-mismatch", "final review checkout is not a repository"); - } - const lease = await this.platformServices.acquireCheckoutLock(canonical.canonical); - let primaryError; + const safety = new PlatformSafety(this.platformServices); try { - if (lease.repositoryIdentity !== canonical.gitCommonDir) { - fail2("workflow-state-mismatch", "final review checkout lease repository identity mismatch"); - } - return await execute2(lease); + return await safety.withCheckoutLease(checkoutPath, execute2); } catch (error51) { - primaryError = error51; - throw error51; - } finally { - try { - await lease.release(); - } catch (releaseError) { - if (primaryError === void 0) { - throw new Error( - `${phase} checkout lease release failed: ${errorDiagnostic(releaseError)}` - ); - } - throw new AggregateError( - [primaryError, releaseError], - `${phase} failed and its checkout lease release also failed: ${errorDiagnostic(releaseError)}` - ); + if (error51 instanceof Error && error51.message === "checkout Git common directory could not be resolved") { + fail2("workflow-state-mismatch", "final review checkout is not a repository"); } + throw error51; } } async runHeadBoundPhase(artifact, phase, execute2, checkoutPath) { @@ -47750,7 +48325,7 @@ var AutopilotController = class { constructor(dependencies) { this.dependencies = dependencies; this.validator = dependencies.validator ?? validateAutopilotSpec; - this.createWorkflowId = dependencies.workflowId ?? randomUUID8; + this.createWorkflowId = dependencies.workflowId ?? randomUUID10; this.now = dependencies.now ?? (() => (/* @__PURE__ */ new Date()).toISOString()); const configuredInterval = dependencies.requiredChecksPollIntervalMs ?? DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS; this.pollIntervalMs = Number.isFinite(configuredInterval) ? Math.min( @@ -48834,24 +49409,16 @@ async function stageCandidateTreeUnderLock(args) { return (await stageCandidateTreeWithLock(args, "borrowed")).result; } async function applyCandidateTree(args) { - const ps = guardWorktreeMutations(args.platformServices ?? getPlatformServices()); - let ownedLock = null; - const lock = args.borrowedCheckoutLock ?? await ps.acquireCheckoutLock(args.repoRoot); - if (args.borrowedCheckoutLock === void 0) ownedLock = lock; - const terminal = { result: null }; - const finish = (result) => { - terminal.result = result; - return result; - }; - try { + const safety = new PlatformSafety(args.platformServices); + const executeWithLock = async (lock, ownership) => { const staged = await stageCandidateTreeWithLock({ repoRoot: args.repoRoot, artifact: args.artifact, expectedArtifactHash: args.expectedArtifactHash, borrowedCheckoutLock: lock, - platformServices: ps - }, ownedLock === null ? "borrowed" : "owned"); - if (staged.result.integration !== "applied") return finish(staged.result); + ...args.platformServices !== void 0 ? { platformServices: args.platformServices } : {} + }, ownership); + if (staged.result.integration !== "applied") return staged.result; const deleted = await git(staged.canonicalRepoRoot, [ "update-ref", "--no-deref", @@ -48860,21 +49427,28 @@ async function applyCandidateTree(args) { args.artifact.candidateCommitOid ]); if (!succeeded4(deleted)) { - return finish({ + return { integration: "applied", detail: "candidate tree applied; candidate anchor delete failed" - }); + }; } - return finish({ integration: "applied", detail: "candidate tree applied" }); - } finally { - if (ownedLock !== null) { - try { - await ownedLock.release(); - } catch (error51) { - if (terminal.result === null) throw error51; - terminal.result.detail = `${terminal.result.detail}; checkout lock release failed`; - } + return { integration: "applied", detail: "candidate tree applied" }; + }; + if (args.borrowedCheckoutLock !== void 0) { + return await executeWithLock(args.borrowedCheckoutLock, "borrowed"); + } + let terminalResult = null; + try { + return await safety.withCheckoutLease(args.repoRoot, async (lock) => { + terminalResult = await executeWithLock(lock, "owned"); + return terminalResult; + }); + } catch (error51) { + if (terminalResult !== null) { + terminalResult.detail = `${terminalResult.detail}; checkout lock release failed`; + return terminalResult; } + throw error51; } } @@ -48952,9 +49526,7 @@ var CandidatePromoter = class { now; constructor(dependencies = {}) { this.runGit = dependencies.git ?? git; - this.platformServices = guardWorktreeMutations( - dependencies.platformServices ?? getPlatformServices() - ); + this.platformServices = dependencies.platformServices ?? getPlatformServices(); this.branchManager = dependencies.branchManager ?? new WorkflowBranchManager(); this.workflowStore = dependencies.workflowStore ?? ((workflowId) => new WorkflowStore(workflowId)); this.artifactStore = dependencies.artifactStore ?? ((runId) => new ArtifactStore(runId)); @@ -49128,135 +49700,164 @@ var CandidatePromoter = class { if (identity === null || identity.worktreePath !== request.workflowCheckoutPath || identity.branchRef !== workflow.workflowRef || identity.repositoryIdentity !== workflow.repositoryIdentity) { return finishFailure("branch-identity-changed"); } - let lock; - try { - lock = await this.platformServices.acquireCheckoutLock(request.workflowCheckoutPath); - } catch { - return finishFailure("branch-identity-changed"); - } + const safety = new PlatformSafety(this.platformServices); + let enteredLease = false; let terminal; try { - const completedOid = intent.completion === null ? null : completionCommit(intent.completion.completion); - let lockedOutcome; - try { - lockedOutcome = await workflowStore.withLockedState(workflow.revision, async (locked) => { - if (!workflowStillAuthorizes( - locked, - request, - task.id, - eligibilityHash, - workflow.workflowRef, - workflow.repositoryIdentity - )) { - return { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - if (completedOid !== null) { - const proven = await this.provePromotedCheckout( - identity, - lock, - completedOid, - artifact.candidateTreeOid - ) && await this.proveCommit( - request.workflowCheckoutPath, - completedOid, - artifact.candidateTreeOid, - request.expectedHead, - request.commitMessage - ); - if (proven && !await this.ensureAcceptedDecision( - artifactStore, - request.runId, - artifact, - eligibility, - eligibilityHash + await safety.withCheckoutLease(request.workflowCheckoutPath, async (lock) => { + enteredLease = true; + const completedOid = intent.completion === null ? null : completionCommit(intent.completion.completion); + let lockedOutcome; + try { + lockedOutcome = await workflowStore.withLockedState(workflow.revision, async (locked) => { + if (!workflowStillAuthorizes( + locked, + request, + task.id, + eligibilityHash, + workflow.workflowRef, + workflow.repositoryIdentity )) { return { kind: "rejected", - classification: "decision-conflict", - journalFailure: true + classification: "human-decision-required", + journalFailure: false }; } - return proven ? { kind: "committed", commitOid: completedOid, needsJournal: false } : { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - const currentHead = await this.runGit( - request.workflowCheckoutPath, - ["rev-parse", "--verify", "HEAD"] - ); - if (!succeeded5(currentHead)) { - return { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - if (currentHead.stdout.trim() !== request.expectedHead) { - const existingOid = currentHead.stdout.trim(); - const proven = OBJECT_ID3.test(existingOid) && await this.provePromotedCheckout( - identity, - lock, - existingOid, - artifact.candidateTreeOid - ) && await this.proveCommit( + if (completedOid !== null) { + const proven = await this.provePromotedCheckout( + identity, + lock, + completedOid, + artifact.candidateTreeOid + ) && await this.proveCommit( + request.workflowCheckoutPath, + completedOid, + artifact.candidateTreeOid, + request.expectedHead, + request.commitMessage + ); + if (proven && !await this.ensureAcceptedDecision( + artifactStore, + request.runId, + artifact, + eligibility, + eligibilityHash + )) { + return { + kind: "rejected", + classification: "decision-conflict", + journalFailure: true + }; + } + return proven ? { kind: "committed", commitOid: completedOid, needsJournal: false } : { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + }; + } + const currentHead = await this.runGit( request.workflowCheckoutPath, - existingOid, - artifact.candidateTreeOid, - request.expectedHead, - request.commitMessage + ["rev-parse", "--verify", "HEAD"] ); - if (proven && !await this.ensureAcceptedDecision( - artifactStore, - request.runId, - artifact, - eligibility, - eligibilityHash - )) { + if (!succeeded5(currentHead)) { return { kind: "rejected", - classification: "decision-conflict", - journalFailure: true + classification: "human-decision-required", + journalFailure: false }; } - return proven ? { kind: "committed", commitOid: existingOid, needsJournal: true } : { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - const liveIdentity = await this.branchManager.revalidateForStagedPromotionUnderLock( - identity, - request.expectedHead, - lock - ); - if (!liveIdentity.ok) { - return { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - const exactStagedRecovery = await this.proveStagedCandidate(identity, artifact); - if (!exactStagedRecovery) { - const branch = await this.branchManager.revalidateUnderLock( + if (currentHead.stdout.trim() !== request.expectedHead) { + const existingOid = currentHead.stdout.trim(); + const proven = OBJECT_ID3.test(existingOid) && await this.provePromotedCheckout( + identity, + lock, + existingOid, + artifact.candidateTreeOid + ) && await this.proveCommit( + request.workflowCheckoutPath, + existingOid, + artifact.candidateTreeOid, + request.expectedHead, + request.commitMessage + ); + if (proven && !await this.ensureAcceptedDecision( + artifactStore, + request.runId, + artifact, + eligibility, + eligibilityHash + )) { + return { + kind: "rejected", + classification: "decision-conflict", + journalFailure: true + }; + } + return proven ? { kind: "committed", commitOid: existingOid, needsJournal: true } : { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + }; + } + const liveIdentity = await this.branchManager.revalidateForStagedPromotionUnderLock( identity, request.expectedHead, lock ); - if (!branch.ok) { + if (!liveIdentity.ok) { return { kind: "rejected", classification: "human-decision-required", journalFailure: false }; } - if (!await this.ensureAcceptedDecision( + const exactStagedRecovery = await this.proveStagedCandidate(identity, artifact); + if (!exactStagedRecovery) { + const branch = await this.branchManager.revalidateUnderLock( + identity, + request.expectedHead, + lock + ); + if (!branch.ok) { + return { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + }; + } + if (!await this.ensureAcceptedDecision( + artifactStore, + request.runId, + artifact, + eligibility, + eligibilityHash + )) { + return { + kind: "rejected", + classification: "decision-conflict", + journalFailure: true + }; + } + const staged = await this.stageCandidate({ + repoRoot: request.workflowCheckoutPath, + artifact, + expectedArtifactHash: request.expectedArtifactHash, + borrowedCheckoutLock: lock, + platformServices: this.platformServices + }); + if (staged.integration !== "applied") { + return staged.integration === "conflicted" ? { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + } : { + kind: "rejected", + classification: classifyStage(staged), + journalFailure: true + }; + } + } else if (!await this.ensureAcceptedDecision( artifactStore, request.runId, artifact, @@ -49269,151 +49870,119 @@ var CandidatePromoter = class { journalFailure: true }; } - const staged = await this.stageCandidate({ - repoRoot: request.workflowCheckoutPath, - artifact, - expectedArtifactHash: request.expectedArtifactHash, - borrowedCheckoutLock: lock, - platformServices: this.platformServices - }); - if (staged.integration !== "applied") { - return staged.integration === "conflicted" ? { + if (!await this.proveStagedCandidate(identity, artifact)) { + return { kind: "rejected", classification: "human-decision-required", journalFailure: false - } : { + }; + } + const [author, committer] = await Promise.all([ + this.runGit(request.workflowCheckoutPath, ["var", "GIT_AUTHOR_IDENT"]), + this.runGit(request.workflowCheckoutPath, ["var", "GIT_COMMITTER_IDENT"]) + ]); + if (!succeeded5(author) || !succeeded5(committer)) { + return { kind: "rejected", - classification: classifyStage(staged), + classification: "git-identity-missing", journalFailure: true }; } - } else if (!await this.ensureAcceptedDecision( - artifactStore, - request.runId, - artifact, - eligibility, - eligibilityHash - )) { - return { - kind: "rejected", - classification: "decision-conflict", - journalFailure: true - }; - } - if (!await this.proveStagedCandidate(identity, artifact)) { - return { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - const [author, committer] = await Promise.all([ - this.runGit(request.workflowCheckoutPath, ["var", "GIT_AUTHOR_IDENT"]), - this.runGit(request.workflowCheckoutPath, ["var", "GIT_COMMITTER_IDENT"]) - ]); - if (!succeeded5(author) || !succeeded5(committer)) { - return { - kind: "rejected", - classification: "git-identity-missing", - journalFailure: true - }; - } - const created = await this.runGit(request.workflowCheckoutPath, [ - "commit-tree", - artifact.candidateTreeOid, - "-p", - request.expectedHead, - "-m", - request.commitMessage - ]); - const commitOid = created.stdout.trim(); - if (!succeeded5(created) || !OBJECT_ID3.test(commitOid)) { - return { - kind: "rejected", - classification: "commit-creation-failed", - journalFailure: true - }; - } - if (!await this.proveCommit( - request.workflowCheckoutPath, - commitOid, - artifact.candidateTreeOid, - request.expectedHead, - request.commitMessage - )) { - return { - kind: "rejected", - classification: "commit-proof-failed", - journalFailure: true - }; - } - const updated = await this.runGit(request.workflowCheckoutPath, [ - "update-ref", - "--no-deref", - identity.branchRef, - commitOid, - request.expectedHead - ]); - if (!succeeded5(updated)) { - return { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - if (!await this.provePromotedCheckout( - identity, - lock, - commitOid, - artifact.candidateTreeOid - )) { - return { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - return { kind: "committed", commitOid, needsJournal: true }; - }); - } catch (error51) { - const toolError = error51.detail?.toolError; - if (toolError !== "workflow-revision-conflict") throw error51; - lockedOutcome = { - kind: "rejected", - classification: "human-decision-required", - journalFailure: false - }; - } - if (lockedOutcome.kind === "rejected") { - terminal = lockedOutcome.journalFailure ? await finishFailure(lockedOutcome.classification) : rejected(lockedOutcome.classification); - } else { - let journaled = !lockedOutcome.needsJournal; - if (!journaled) { - try { - await workflowStore.completeIntent({ - idempotencyKey, - completion: { commitOid: lockedOutcome.commitOid } - }); - journaled = true; - } catch { - journaled = false; - } - } - terminal = !journaled ? rejected("journal-failed") : await this.deleteAnchor(request.workflowCheckoutPath, artifact) ? { status: "committed", commitOid: lockedOutcome.commitOid } : rejected("anchor-deletion-failed"); - } - } finally { - try { - await lock.release(); - } catch (releaseError) { - if (terminal?.status === "committed") { - logger.warn("checkout lock release failed after candidate promotion", { - event: "checkout-lock-release-failed", - workflowId: request.workflowId, - reason: redact(String(releaseError)) + const created = await this.runGit(request.workflowCheckoutPath, [ + "commit-tree", + artifact.candidateTreeOid, + "-p", + request.expectedHead, + "-m", + request.commitMessage + ]); + const commitOid = created.stdout.trim(); + if (!succeeded5(created) || !OBJECT_ID3.test(commitOid)) { + return { + kind: "rejected", + classification: "commit-creation-failed", + journalFailure: true + }; + } + if (!await this.proveCommit( + request.workflowCheckoutPath, + commitOid, + artifact.candidateTreeOid, + request.expectedHead, + request.commitMessage + )) { + return { + kind: "rejected", + classification: "commit-proof-failed", + journalFailure: true + }; + } + const updated = await this.runGit(request.workflowCheckoutPath, [ + "update-ref", + "--no-deref", + identity.branchRef, + commitOid, + request.expectedHead + ]); + if (!succeeded5(updated)) { + return { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + }; + } + if (!await this.provePromotedCheckout( + identity, + lock, + commitOid, + artifact.candidateTreeOid + )) { + return { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + }; + } + return { kind: "committed", commitOid, needsJournal: true }; }); + } catch (error51) { + const toolError = error51.detail?.toolError; + if (toolError !== "workflow-revision-conflict") throw error51; + lockedOutcome = { + kind: "rejected", + classification: "human-decision-required", + journalFailure: false + }; + } + if (lockedOutcome.kind === "rejected") { + terminal = lockedOutcome.journalFailure ? await finishFailure(lockedOutcome.classification) : rejected(lockedOutcome.classification); } else { - terminal = rejected("lock-release-failed"); + let journaled = !lockedOutcome.needsJournal; + if (!journaled) { + try { + await workflowStore.completeIntent({ + idempotencyKey, + completion: { commitOid: lockedOutcome.commitOid } + }); + journaled = true; + } catch { + journaled = false; + } + } + terminal = !journaled ? rejected("journal-failed") : await this.deleteAnchor(request.workflowCheckoutPath, artifact) ? { status: "committed", commitOid: lockedOutcome.commitOid } : rejected("anchor-deletion-failed"); } + }); + } catch (error51) { + if (terminal?.status === "committed") { + logger.warn("checkout lock release failed after candidate promotion", { + event: "checkout-lock-release-failed", + workflowId: request.workflowId, + reason: redact(String(error51)) + }); + } else if (!enteredLease) { + return finishFailure("branch-identity-changed"); + } else { + throw error51; } } return terminal; @@ -49421,7 +49990,7 @@ var CandidatePromoter = class { }; // src/pipeline/pipeline-runtime.ts -import path28 from "node:path"; +import path30 from "node:path"; // src/protocol/spec-hash.ts import { createHash as createHash13 } from "node:crypto"; @@ -49438,13 +50007,13 @@ function specSha256(spec) { } // src/runtime/attempt-runtime.ts -import { randomUUID as randomUUID10 } from "node:crypto"; -import { rm as rm10 } from "node:fs/promises"; +import { randomUUID as randomUUID12 } from "node:crypto"; +import { rm as rm12 } from "node:fs/promises"; // src/git/candidate-tree.ts -import { lstat as lstat15, mkdtemp as mkdtemp3, rm as rm9 } from "node:fs/promises"; +import { lstat as lstat17, mkdtemp as mkdtemp3, rm as rm11 } from "node:fs/promises"; import { tmpdir as tmpdir6 } from "node:os"; -import path24 from "node:path"; +import path26 from "node:path"; var MAX_DIAGNOSTIC_LENGTH5 = 2e3; var MAX_REJECT_PATHS = 25; var BINARY_PATCH_PAYLOAD_MARKER = "[[BINARY_PATCH_PAYLOAD_OMITTED]]"; @@ -49509,7 +50078,7 @@ function isAllowed2(pathname, writeAllowlist, forbiddenScope, opaqueDirectory = async function advisoryLstatScan(worktreePath, changedPaths) { const symlinkResults = await Promise.all(changedPaths.map(async (changedPath) => { try { - return (await lstat15(path24.resolve(worktreePath, changedPath))).isSymbolicLink(); + return (await lstat17(path26.resolve(worktreePath, changedPath))).isSymbolicLink(); } catch (error51) { if (error51.code === "ENOENT") return false; throw error51; @@ -49543,8 +50112,8 @@ async function freezeCandidate(args) { if (await advisoryLstatScan(args.worktreePath, inventory.changedPaths)) { return { ok: false, reason: "modified-symlink" }; } - const indexDirectory = await mkdtemp3(path24.join(tmpdir6(), "claude-architect-index-")); - const indexFile = path24.join(indexDirectory, "index"); + const indexDirectory = await mkdtemp3(path26.join(tmpdir6(), "claude-architect-index-")); + const indexFile = path26.join(indexDirectory, "index"); try { await checkedGit4(args.worktreePath, ["read-tree", args.baseCommitOid], indexFile); if (inventory.changedPaths.length > 0) { @@ -49637,15 +50206,15 @@ async function freezeCandidate(args) { } }; } finally { - await rm9(indexDirectory, { recursive: true, force: true }); + await rm11(indexDirectory, { recursive: true, force: true }); } } // src/verify/baseline-verifier.ts -import { randomUUID as randomUUID9 } from "node:crypto"; -import { readFile as readFile5 } from "node:fs/promises"; +import { randomUUID as randomUUID11 } from "node:crypto"; +import { readFile as readFile7 } from "node:fs/promises"; import { basename } from "node:path"; -import path25 from "node:path"; +import path27 from "node:path"; function throwIfAborted(signal) { if (!signal?.aborted) return; throw new DOMException("Baseline verification was cancelled", "AbortError"); @@ -49728,7 +50297,7 @@ function shellCommandInvokesVitest(command, scripts, visitedScripts) { } async function packageScriptInvokesVitest(cwd, scriptName) { try { - const parsed = JSON.parse(await readFile5(path25.join(cwd, "package.json"), "utf8")); + const parsed = JSON.parse(await readFile7(path27.join(cwd, "package.json"), "utf8")); if (parsed === null || typeof parsed !== "object" || !("scripts" in parsed)) return false; const scripts = parsed.scripts; if (scripts === null || typeof scripts !== "object") return false; @@ -49797,7 +50366,7 @@ async function verifyBaseline(args) { // A runId gives recovery a deterministic, reclaimable name; without one // (only unit callers), fall back to a unique id so repeated same-commit // fixtures cannot collide on a shared worktrees root. - `baseline-${args.runId ?? args.verificationId?.() ?? randomUUID9()}`, + `baseline-${args.runId ?? args.verificationId?.() ?? randomUUID11()}`, ps, args.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.borrowedCheckoutLease } ); @@ -49902,7 +50471,7 @@ async function verifyBaseline(args) { } // src/runtime/producer-preflight.ts -import path26 from "node:path"; +import path28 from "node:path"; var PREFLIGHT_PROBE_FILE = "claude-architect-preflight.txt"; var PREFLIGHT_TIMEOUT_MS = 18e4; var PREFLIGHT_OUTPUT_LIMIT = 256 * 1024; @@ -50010,7 +50579,7 @@ async function runProducerPreflight(args) { let contents; try { const probeBytes = await readStableRegularFile( - path26.join(worktree.path, PREFLIGHT_PROBE_FILE), + path28.join(worktree.path, PREFLIGHT_PROBE_FILE), BigInt(PROBE_FILE_LIMIT) ); if (probeBytes === null) throw new RuntimeError("the Producer probe file is not stable"); @@ -50062,7 +50631,7 @@ async function runProducerPreflight(args) { } // src/runtime/reproducibility.ts -import { readFile as readFile6 } from "node:fs/promises"; +import { readFile as readFile8 } from "node:fs/promises"; var REPOSITORY_INSTRUCTION_PATHS = ["AGENTS.md", "CLAUDE.md"]; function gitFailure4(action, result) { const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, 2e3); @@ -50120,7 +50689,7 @@ function isMissingModule(error51) { return code === "ENOENT" || code === "ENOTDIR"; } async function collectPackagedVerifier(dependencies) { - const readModule = dependencies.readModule ?? ((url2) => readFile6(url2)); + const readModule = dependencies.readModule ?? ((url2) => readFile8(url2)); const candidates = dependencies.verifierModuleUrls ?? defaultVerifierModuleUrls(); let lastMissingError; for (const candidate of candidates) { @@ -50341,7 +50910,7 @@ async function cleanupAttemptResources(args) { } if (args.tempHome !== null) { try { - await rm10(args.tempHome, { recursive: true, force: true }); + await rm12(args.tempHome, { recursive: true, force: true }); } catch (error51) { failures.push(error51); } @@ -50357,11 +50926,12 @@ async function cleanupAttemptResources(args) { } async function runAttempt(checkoutPath, spec, deps) { if (hasEnvironmentMarker(deps.env ?? process.env)) throw new NestedDelegationError(); - const ps = guardWorktreeMutations(deps.ps ?? getPlatformServices()); + const ps = deps.ps ?? getPlatformServices(); + const safety = new PlatformSafety(ps); const producerRegistry = deps.producerRegistry ?? registry2; const now = deps.now ?? Date.now; const startedAtMs = now(); - const runId = (deps.runId ?? randomUUID10)(); + const runId = (deps.runId ?? randomUUID12)(); const store = new ArtifactStore(runId); const inferredSlices = Array.isArray(spec.slices) ? spec.slices.length : 0; const statusContext = deps.runStatus ?? { @@ -50404,73 +50974,129 @@ async function runAttempt(checkoutPath, spec, deps) { }; const canonical = await ps.canonicalizePath(checkoutPath); const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; - let lock = deps.borrowedCheckoutLease ?? null; - let ownedLock = null; - let worktree = null; - let tempHome = null; - let builtEnvironment = null; - let primaryError; - let archivedResult = null; - try { - if (lock === null) { - ownedLock = await ps.acquireCheckoutLock(canonical.canonical, { runId }); - lock = ownedLock; - } - if (lock.repositoryIdentity !== repositoryIdentity) { - const ownership = ownedLock === null ? "borrowed" : "owned"; - throw new RuntimeError(`${ownership} checkout lease repository identity mismatch`); - } - const preconditions = await checkPreconditions(canonical.canonical, { - writeAllowlist: spec.writeAllowlist - }); - if (!preconditions.ok) { - const detailSuffix = preconditions.detail === void 0 ? "" : `: ${preconditions.detail.join(", ")}`; - throw new RuntimeError( - `repository precondition failed (${preconditions.reason})${detailSuffix}`, - { reason: preconditions.reason, detail: preconditions.detail ?? [] } - ); - } - const runStart = { - runId, - lockKey: lock.key, - canonicalCommonDir: preconditions.gitCommonDir, - pid: null, - processToken: null, - startedAt, - specSha256: deps.dispatchedSpecSha256 ?? specSha256(spec) - }; - const runStartContext = await initializeRunStart(store, runStart); - await deps.onRunStart?.(runStartContext); - if (!statusContext.pipelineManaged) await emitStatus("preflight"); - const collected = deps.repositoryInstructions !== void 0 && deps.packagedVerifier !== void 0 ? null : await (deps.reproducibilityCollector ?? collectReproducibilityInputs)( - canonical.canonical, - preconditions.baseCommitOid - ); - const repositoryInstructions = deps.repositoryInstructions ?? collected.repositoryInstructions; - const packagedVerifier = deps.packagedVerifier ?? collected.packagedVerifier; - const executionMode = spec.executionMode; - let baselineEvidence = { baseline: "skipped \u2014 read-only spec" }; - if (!statusContext.pipelineManaged) { - await emitStatus("baseline-verify", { - detail: executionMode === "edit" ? null : "skipped for read-only execution" + const runWithLease = async (lock, ownership) => { + let worktree = null; + let tempHome = null; + let builtEnvironment = null; + let primaryError; + let archivedResult = null; + try { + if (lock.repositoryIdentity !== repositoryIdentity) { + throw new RuntimeError(`${ownership} checkout lease repository identity mismatch`); + } + const preconditions = await checkPreconditions(canonical.canonical, { + writeAllowlist: spec.writeAllowlist }); - } - if (executionMode === "edit") { - await reportPhase(deps, "verifying baseline"); - let baseline; - try { - baseline = await (deps.baselineVerifier ?? verifyBaseline)({ - repoRoot: canonical.canonical, - headCommitOid: preconditions.baseCommitOid, - commands: spec.verification, - ps, - runId, - store, - borrowedCheckoutLease: lock, - ...deps.abortSignal === void 0 ? {} : { abortSignal: deps.abortSignal } + if (!preconditions.ok) { + const detailSuffix = preconditions.detail === void 0 ? "" : `: ${preconditions.detail.join(", ")}`; + throw new RuntimeError( + `repository precondition failed (${preconditions.reason})${detailSuffix}`, + { reason: preconditions.reason, detail: preconditions.detail ?? [] } + ); + } + const runStart = { + runId, + lockKey: lock.key, + canonicalCommonDir: preconditions.gitCommonDir, + pid: null, + processToken: null, + startedAt, + specSha256: deps.dispatchedSpecSha256 ?? specSha256(spec) + }; + const runStartContext = await initializeRunStart(store, runStart); + await deps.onRunStart?.(runStartContext); + if (!statusContext.pipelineManaged) await emitStatus("preflight"); + const collected = deps.repositoryInstructions !== void 0 && deps.packagedVerifier !== void 0 ? null : await (deps.reproducibilityCollector ?? collectReproducibilityInputs)( + canonical.canonical, + preconditions.baseCommitOid + ); + const repositoryInstructions = deps.repositoryInstructions ?? collected.repositoryInstructions; + const packagedVerifier = deps.packagedVerifier ?? collected.packagedVerifier; + const executionMode = spec.executionMode; + let baselineEvidence = { baseline: "skipped \u2014 read-only spec" }; + if (!statusContext.pipelineManaged) { + await emitStatus("baseline-verify", { + detail: executionMode === "edit" ? null : "skipped for read-only execution" }); - } catch (error51) { - if (!deps.abortSignal?.aborted) throw error51; + } + if (executionMode === "edit") { + await reportPhase(deps, "verifying baseline"); + let baseline; + try { + baseline = await (deps.baselineVerifier ?? verifyBaseline)({ + repoRoot: canonical.canonical, + headCommitOid: preconditions.baseCommitOid, + commands: spec.verification, + ps, + runId, + store, + borrowedCheckoutLease: lock, + ...deps.abortSignal === void 0 ? {} : { abortSignal: deps.abortSignal } + }); + } catch (error51) { + if (!deps.abortSignal?.aborted) throw error51; + return archiveWithStatus({ + store, + spec, + runId, + startedAtMs, + now, + repoRoot: canonical.canonical, + baseCommitOid: preconditions.baseCommitOid, + signals: { cancelled: true }, + report: null, + profile: null, + invocation: null, + environment: [], + temporaryHomeApplied: false, + producerSummary: null, + candidate: null, + commandOutcomes: [], + unresolvedIssues: ["cancelled"], + evidence: { baseline: "cancelled" }, + producerLog: producerLog(null), + repositoryInstructions, + packagedVerifier + }); + } + baselineEvidence = { baseline }; + const baselineFailed = baseline.commands.some((command) => !command.ok); + if (baselineFailed) { + return archiveWithStatus({ + store, + spec, + runId, + startedAtMs, + now, + repoRoot: canonical.canonical, + baseCommitOid: preconditions.baseCommitOid, + signals: { "environment-defect": true }, + report: null, + profile: null, + invocation: null, + environment: [], + temporaryHomeApplied: false, + producerSummary: null, + candidate: null, + commandOutcomes: [], + unresolvedIssues: ["baseline-verification-failed"], + evidence: baselineEvidence, + producerLog: producerLog(null), + repositoryInstructions, + packagedVerifier + }); + } + } + await reportPhase(deps, "probing producers"); + const reports = await runtime.probeAll({ + ps, + os: ps.os, + arch: process.arch, + environmentType: detectEnvironmentType() + }, void 0, producerRegistry); + const routing = route(spec.producerPreferences, reports); + if (routing.producerId === null) { + const signals2 = routing.reason === "authentication-required" ? { "authentication-required": true } : { unavailable: true }; return archiveWithStatus({ store, spec, @@ -50479,7 +51105,7 @@ async function runAttempt(checkoutPath, spec, deps) { now, repoRoot: canonical.canonical, baseCommitOid: preconditions.baseCommitOid, - signals: { cancelled: true }, + signals: signals2, report: null, profile: null, invocation: null, @@ -50488,16 +51114,19 @@ async function runAttempt(checkoutPath, spec, deps) { producerSummary: null, candidate: null, commandOutcomes: [], - unresolvedIssues: ["cancelled"], - evidence: { baseline: "cancelled" }, + unresolvedIssues: [ + routing.reason, + ...routing.considered.map((candidate2) => `producer ${candidate2.producerId}: ${candidate2.outcome}${candidate2.detail === null ? "" : ` (${candidate2.detail})`}`) + ], + evidence: { ...baselineEvidence, routing: routing.reason, considered: routing.considered, reports }, producerLog: producerLog(null), repositoryInstructions, packagedVerifier }); } - baselineEvidence = { baseline }; - const baselineFailed = baseline.commands.some((command) => !command.ok); - if (baselineFailed) { + const adapter = producerRegistry.get(routing.producerId); + const report = reports.find((candidate2) => candidate2.producerId === routing.producerId) ?? null; + if (adapter === void 0 || report?.resolvedExecutable === null || report === null) { return archiveWithStatus({ store, spec, @@ -50506,8 +51135,8 @@ async function runAttempt(checkoutPath, spec, deps) { now, repoRoot: canonical.canonical, baseCommitOid: preconditions.baseCommitOid, - signals: { "environment-defect": true }, - report: null, + signals: { unavailable: true }, + report, profile: null, invocation: null, environment: [], @@ -50515,338 +51144,280 @@ async function runAttempt(checkoutPath, spec, deps) { producerSummary: null, candidate: null, commandOutcomes: [], - unresolvedIssues: ["baseline-verification-failed"], - evidence: baselineEvidence, + unresolvedIssues: ["selected-producer-contract-invalid"], + evidence: { ...baselineEvidence, routing: "selected-producer-contract-invalid" }, producerLog: producerLog(null), repositoryInstructions, packagedVerifier }); } - } - await reportPhase(deps, "probing producers"); - const reports = await probeAll({ - ps, - os: ps.os, - arch: process.arch, - environmentType: detectEnvironmentType() - }, producerRegistry); - const routing = route(spec.producerPreferences, reports); - if (routing.producerId === null) { - const signals2 = routing.reason === "authentication-required" ? { "authentication-required": true } : { unavailable: true }; - return archiveWithStatus({ - store, - spec, - runId, - startedAtMs, - now, - repoRoot: canonical.canonical, - baseCommitOid: preconditions.baseCommitOid, - signals: signals2, - report: null, - profile: null, - invocation: null, - environment: [], - temporaryHomeApplied: false, - producerSummary: null, - candidate: null, - commandOutcomes: [], - unresolvedIssues: [ - routing.reason, - ...routing.considered.map((candidate2) => `producer ${candidate2.producerId}: ${candidate2.outcome}${candidate2.detail === null ? "" : ` (${candidate2.detail})`}`) - ], - evidence: { ...baselineEvidence, routing: routing.reason, considered: routing.considered, reports }, - producerLog: producerLog(null), - repositoryInstructions, - packagedVerifier - }); - } - const adapter = producerRegistry.get(routing.producerId); - const report = reports.find((candidate2) => candidate2.producerId === routing.producerId) ?? null; - if (adapter === void 0 || report?.resolvedExecutable === null || report === null) { - return archiveWithStatus({ - store, + worktree = await new WorktreeManager(canonical.canonical, runId, ps, { + borrowedCheckoutLease: lock + }).create(preconditions.baseCommitOid); + const profile = adapter.configurationProfile(); + const launchPlan = await runtime.planLaunch({ + producerId: report.producerId, + adapter, spec, + worktreePath: worktree.path, + intent: spec.executionMode === "edit" ? "edit" : "read-only", + ps, runId, - startedAtMs, - now, - repoRoot: canonical.canonical, - baseCommitOid: preconditions.baseCommitOid, - signals: { unavailable: true }, - report, - profile: null, - invocation: null, - environment: [], - temporaryHomeApplied: false, - producerSummary: null, - candidate: null, - commandOutcomes: [], - unresolvedIssues: ["selected-producer-contract-invalid"], - evidence: { ...baselineEvidence, routing: "selected-producer-contract-invalid" }, - producerLog: producerLog(null), - repositoryInstructions, - packagedVerifier + capabilityReport: report }); - } - worktree = await new WorktreeManager(canonical.canonical, runId, ps, { - borrowedCheckoutLease: lock - }).create(preconditions.baseCommitOid); - const profile = adapter.configurationProfile(); - const launchPlan = await runtime.planLaunch({ - producerId: report.producerId, - adapter, - spec, - worktreePath: worktree.path, - intent: spec.executionMode === "edit" ? "edit" : "read-only", - ps, - runId, - capabilityReport: report - }); - tempHome = launchPlan.tempHome; - builtEnvironment = launchPlan.builtEnvironment; - let invocation = launchPlan.invocation; - let confinement = launchPlan.confinementBackend; - if (spec.executionMode === "edit") { - const selection = selectSandboxBackend(report); - if (selection.backend === null) { - return await archiveWithStatus({ - store, + tempHome = launchPlan.tempHome; + builtEnvironment = launchPlan.builtEnvironment; + let invocation = launchPlan.invocation; + let confinement = launchPlan.confinementBackend; + if (spec.executionMode === "edit") { + const selection = selectSandboxBackend(report); + if (selection.backend === null) { + return await archiveWithStatus({ + store, + spec, + runId, + startedAtMs, + now, + repoRoot: canonical.canonical, + baseCommitOid: preconditions.baseCommitOid, + signals: { unavailable: true }, + report, + profile, + invocation, + environment: [], + temporaryHomeApplied: tempHome !== null, + producerSummary: null, + candidate: null, + commandOutcomes: [], + unresolvedIssues: [selection.reason], + evidence: { routing: selection.reason }, + producerLog: producerLog(null), + repositoryInstructions, + packagedVerifier + }); + } + } + if (spec.executionMode === "edit" && deps.producerPreflight !== false) { + if (!statusContext.pipelineManaged) { + await emitStatus("preflight", { + producerId: report.producerId, + detail: "probing producer environment" + }); + } + await reportPhase(deps, "probing producer environment"); + const preflight = await (typeof deps.producerPreflight === "function" ? deps.producerPreflight : runProducerPreflight)({ + adapter, + capabilityReport: report, spec, - runId, - startedAtMs, - now, repoRoot: canonical.canonical, baseCommitOid: preconditions.baseCommitOid, - signals: { unavailable: true }, - report, - profile, - invocation, - environment: [], - temporaryHomeApplied: tempHome !== null, - producerSummary: null, - candidate: null, - commandOutcomes: [], - unresolvedIssues: [selection.reason], - evidence: { routing: selection.reason }, - producerLog: producerLog(null), - repositoryInstructions, - packagedVerifier + runId, + ps, + tempHome, + borrowedCheckoutLease: lock, + ...deps.abortSignal === void 0 ? {} : { abortSignal: deps.abortSignal } }); + baselineEvidence = { ...baselineEvidence, producerPreflight: preflight }; + if (preflight.status === "environment-defect") { + return await archiveWithStatus({ + store, + spec, + runId, + startedAtMs, + now, + repoRoot: canonical.canonical, + baseCommitOid: preconditions.baseCommitOid, + signals: { "environment-defect": true }, + report, + profile, + invocation, + environment: [], + temporaryHomeApplied: tempHome !== null, + producerSummary: null, + candidate: null, + commandOutcomes: [], + unresolvedIssues: ["producer-preflight-failed", preflight.reason ?? ""], + evidence: baselineEvidence, + producerLog: producerLog(null), + repositoryInstructions, + packagedVerifier + }); + } } - } - if (spec.executionMode === "edit" && deps.producerPreflight !== false) { if (!statusContext.pipelineManaged) { - await emitStatus("preflight", { - producerId: report.producerId, - detail: "probing producer environment" - }); + await emitStatus("implementing", { producerId: report.producerId }); } - await reportPhase(deps, "probing producer environment"); - const preflight = await (typeof deps.producerPreflight === "function" ? deps.producerPreflight : runProducerPreflight)({ + await reportPhase(deps, "producer running"); + const launchResult = await runtime.launch({ + producerId: report.producerId, adapter, - capabilityReport: report, spec, - repoRoot: canonical.canonical, - baseCommitOid: preconditions.baseCommitOid, - runId, + worktreePath: worktree.path, + intent: spec.executionMode === "edit" ? "edit" : "read-only", ps, + runId, tempHome, - borrowedCheckoutLease: lock, - ...deps.abortSignal === void 0 ? {} : { abortSignal: deps.abortSignal } + abortSignal: deps.abortSignal, + timeoutMs: spec.timeoutMs, + runStartContext, + capabilityReport: report, + plan: launchPlan }); - baselineEvidence = { ...baselineEvidence, producerPreflight: preflight }; - if (preflight.status === "environment-defect") { - return await archiveWithStatus({ - store, - spec, - runId, - startedAtMs, - now, + invocation = launchResult.invocation; + builtEnvironment = launchResult.builtEnvironment; + const exit = launchResult.exit; + confinement = launchResult.confinementBackend; + const signals = {}; + let producerSummary = null; + let candidate = null; + let commandOutcomes = []; + let unresolvedIssues = []; + let evidence = confinement === null ? baselineEvidence : { ...baselineEvidence, confinement }; + if (exit.spawnError !== void 0) signals["spawn-failure"] = true; + if (exit.cancelled) signals.cancelled = true; + if (exit.timedOut) signals.timeout = true; + if (!hasFailureSignal2(signals)) { + producerSummary = launchResult.producerSummary; + if (!launchResult.ok) signals["invalid-output"] = true; + if (exit.exitCode !== 0) signals["producer-failure"] = true; + } + if (!hasFailureSignal2(signals)) { + if (!statusContext.pipelineManaged) { + await emitStatus("freezing", { producerId: report.producerId }); + } + await reportPhase(deps, "freezing candidate"); + const frozen = await freezeCandidate({ repoRoot: canonical.canonical, + worktreePath: worktree.path, baseCommitOid: preconditions.baseCommitOid, - signals: { "environment-defect": true }, - report, - profile, - invocation, - environment: [], - temporaryHomeApplied: tempHome !== null, - producerSummary: null, - candidate: null, - commandOutcomes: [], - unresolvedIssues: ["producer-preflight-failed", preflight.reason ?? ""], - evidence: baselineEvidence, - producerLog: producerLog(null), - repositoryInstructions, - packagedVerifier + runId, + writeAllowlist: spec.writeAllowlist, + forbiddenScope: spec.forbiddenScope }); + if (!frozen.ok) { + if (frozen.reason === "empty-candidate") signals["verification-failure"] = true; + else signals["sandbox-violation"] = true; + unresolvedIssues = [frozen.reason]; + evidence = { + ...evidence, + freezeReject: frozen.reason, + ...frozen.paths === void 0 ? {} : { freezeRejectPaths: frozen.paths } + }; + } else { + candidate = frozen.artifact; + evidence = { ...evidence, ...frozen.evidence }; + try { + if (!statusContext.pipelineManaged) { + await emitStatus("verifying", { producerId: report.producerId }); + } + await reportPhase(deps, "verifying candidate"); + const verification = await deps.verifier.verify({ + repoRoot: canonical.canonical, + worktreePath: worktree.path, + baseCommitOid: preconditions.baseCommitOid, + artifact: frozen.artifact, + spec, + ps, + artifactStore: store, + borrowedCheckoutLease: lock + }); + commandOutcomes = verification.commandOutcomes; + unresolvedIssues = verification.failures; + evidence = { ...evidence, ...verification.evidence }; + if (!verification.ok) signals["verification-failure"] = true; + } catch { + signals["verification-failure"] = true; + unresolvedIssues = ["verifier-error"]; + evidence = { ...evidence, verifierError: true }; + } + } } - } - if (!statusContext.pipelineManaged) { - await emitStatus("implementing", { producerId: report.producerId }); - } - await reportPhase(deps, "producer running"); - const launchResult = await runtime.launch({ - producerId: report.producerId, - adapter, - spec, - worktreePath: worktree.path, - intent: spec.executionMode === "edit" ? "edit" : "read-only", - ps, - runId, - tempHome, - abortSignal: deps.abortSignal, - timeoutMs: spec.timeoutMs, - runStartContext, - capabilityReport: report, - plan: launchPlan - }); - invocation = launchResult.invocation; - builtEnvironment = launchResult.builtEnvironment; - const exit = launchResult.exit; - confinement = launchResult.confinementBackend; - const signals = {}; - let producerSummary = null; - let candidate = null; - let commandOutcomes = []; - let unresolvedIssues = []; - let evidence = confinement === null ? baselineEvidence : { ...baselineEvidence, confinement }; - if (exit.spawnError !== void 0) signals["spawn-failure"] = true; - if (exit.cancelled) signals.cancelled = true; - if (exit.timedOut) signals.timeout = true; - if (!hasFailureSignal2(signals)) { - producerSummary = launchResult.producerSummary; - if (!launchResult.ok) signals["invalid-output"] = true; - if (exit.exitCode !== 0) signals["producer-failure"] = true; - } - if (!hasFailureSignal2(signals)) { - if (!statusContext.pipelineManaged) { - await emitStatus("freezing", { producerId: report.producerId }); + if (!hasFailureSignal2(signals) && candidate === null) { + signals["verification-failure"] = true; + unresolvedIssues.push("missing-candidate"); } - await reportPhase(deps, "freezing candidate"); - const frozen = await freezeCandidate({ - repoRoot: canonical.canonical, - worktreePath: worktree.path, - baseCommitOid: preconditions.baseCommitOid, - runId, - writeAllowlist: spec.writeAllowlist, - forbiddenScope: spec.forbiddenScope - }); - if (!frozen.ok) { - if (frozen.reason === "empty-candidate") signals["verification-failure"] = true; - else signals["sandbox-violation"] = true; - unresolvedIssues = [frozen.reason]; - evidence = { - ...evidence, - freezeReject: frozen.reason, - ...frozen.paths === void 0 ? {} : { freezeRejectPaths: frozen.paths } - }; - } else { - candidate = frozen.artifact; - evidence = { ...evidence, ...frozen.evidence }; + if (candidate === null && worktree !== null && (signals.timeout === true || signals.cancelled === true)) { try { - if (!statusContext.pipelineManaged) { - await emitStatus("verifying", { producerId: report.producerId }); - } - await reportPhase(deps, "verifying candidate"); - const verification = await deps.verifier.verify({ - repoRoot: canonical.canonical, - worktreePath: worktree.path, - baseCommitOid: preconditions.baseCommitOid, - artifact: frozen.artifact, - spec, - ps, - artifactStore: store, - borrowedCheckoutLease: lock - }); - commandOutcomes = verification.commandOutcomes; - unresolvedIssues = verification.failures; - evidence = { ...evidence, ...verification.evidence }; - if (!verification.ok) signals["verification-failure"] = true; - } catch { - signals["verification-failure"] = true; - unresolvedIssues = ["verifier-error"]; - evidence = { ...evidence, verifierError: true }; + evidence = { ...evidence, worktreeSnapshot: await captureWorktreeSnapshot(worktree.path) }; + } catch (snapshotError) { + evidence = { + ...evidence, + worktreeSnapshotError: snapshotError instanceof Error ? snapshotError.message : String(snapshotError) + }; } } - } - if (!hasFailureSignal2(signals) && candidate === null) { - signals["verification-failure"] = true; - unresolvedIssues.push("missing-candidate"); - } - if (candidate === null && worktree !== null && (signals.timeout === true || signals.cancelled === true)) { - try { - evidence = { ...evidence, worktreeSnapshot: await captureWorktreeSnapshot(worktree.path) }; - } catch (snapshotError) { - evidence = { - ...evidence, - worktreeSnapshotError: snapshotError instanceof Error ? snapshotError.message : String(snapshotError) - }; + await reportPhase(deps, "archiving result"); + archivedResult = await archiveWithStatus({ + store, + spec, + runId, + startedAtMs, + now, + repoRoot: canonical.canonical, + baseCommitOid: preconditions.baseCommitOid, + signals, + report, + profile, + invocation, + environment: builtEnvironment.provenance, + temporaryHomeApplied: tempHome !== null, + producerSummary, + candidate, + commandOutcomes, + unresolvedIssues, + evidence, + producerLog: producerLog(exit), + repositoryInstructions, + packagedVerifier + }); + await reportPhase(deps, `finished: ${archivedResult.status}`); + return archivedResult; + } catch (error51) { + primaryError = error51; + if (!statusContext.pipelineManaged) { + await emitStatus("failed", { + detail: error51 instanceof Error ? error51.message : "attempt failed unexpectedly" + }); } - } - await reportPhase(deps, "archiving result"); - archivedResult = await archiveWithStatus({ - store, - spec, - runId, - startedAtMs, - now, - repoRoot: canonical.canonical, - baseCommitOid: preconditions.baseCommitOid, - signals, - report, - profile, - invocation, - environment: builtEnvironment.provenance, - temporaryHomeApplied: tempHome !== null, - producerSummary, - candidate, - commandOutcomes, - unresolvedIssues, - evidence, - producerLog: producerLog(exit), - repositoryInstructions, - packagedVerifier - }); - await reportPhase(deps, `finished: ${archivedResult.status}`); - return archivedResult; - } catch (error51) { - primaryError = error51; - if (!statusContext.pipelineManaged) { - await emitStatus("failed", { - detail: error51 instanceof Error ? error51.message : "attempt failed unexpectedly" + throw error51; + } finally { + const cleanupError = await cleanupAttemptResources({ + builtEnvironment, + worktree, + tempHome, + lock: null }); - } - throw error51; - } finally { - const cleanupError = await cleanupAttemptResources({ - builtEnvironment, - worktree, - tempHome, - lock: ownedLock - }); - if (cleanupError !== null) { - const detail = redact( - cleanupError instanceof Error ? cleanupError.message : String(cleanupError) - ); - logger.warn("attempt resources could not be cleaned up", { error: detail }); - if (archivedResult !== null) { - archivedResult.evidence = { ...archivedResult.evidence, cleanupFailure: detail }; - archivedResult.unresolvedIssues = [ - ...archivedResult.unresolvedIssues, - "attempt-cleanup-failed" - ]; - try { - await store.writeLog("cleanup-failure", `${detail} + if (cleanupError !== null) { + const detail = redact( + cleanupError instanceof Error ? cleanupError.message : String(cleanupError) + ); + logger.warn("attempt resources could not be cleaned up", { error: detail }); + if (archivedResult !== null) { + archivedResult.evidence = { ...archivedResult.evidence, cleanupFailure: detail }; + archivedResult.unresolvedIssues = [ + ...archivedResult.unresolvedIssues, + "attempt-cleanup-failed" + ]; + try { + await store.writeLog("cleanup-failure", `${detail} `); - } catch (writeError) { - logger.warn("cleanup failure could not be archived", { - error: redact(writeError instanceof Error ? writeError.message : String(writeError)) - }); + } catch (writeError) { + logger.warn("cleanup failure could not be archived", { + error: redact(writeError instanceof Error ? writeError.message : String(writeError)) + }); + } + } else if (primaryError === void 0) { + throw cleanupError; } - } else if (primaryError === void 0) { - throw cleanupError; } } + }; + if (deps.borrowedCheckoutLease !== void 0 && deps.borrowedCheckoutLease !== null) { + return await runWithLease(deps.borrowedCheckoutLease, "borrowed"); } + return await safety.withCheckoutLease(canonical.canonical, async (acquiredLock) => { + return await runWithLease(acquiredLock, "owned"); + }, { runId }); } // src/pipeline/consolidator.ts @@ -50967,9 +51538,9 @@ function evaluateGates(input) { } // src/pipeline/slice-composer.ts -import { mkdtemp as mkdtemp4, rm as rm11 } from "node:fs/promises"; +import { mkdtemp as mkdtemp4, rm as rm13 } from "node:fs/promises"; import { tmpdir as tmpdir7 } from "node:os"; -import path27 from "node:path"; +import path29 from "node:path"; var NULL_OID = "0000000000000000000000000000000000000000"; function parseRawDiffEntries(raw) { const fields = raw.split("\0"); @@ -51023,8 +51594,8 @@ async function composeSliceOntoHead(args) { `slice ${args.sliceIndex} changed paths already written by its wave: ${collisions.join(", ")}` ); } - const indexRoot = await mkdtemp4(path27.join(tmpdir7(), "ca-compose-")); - const indexFile = path27.join(indexRoot, "index"); + const indexRoot = await mkdtemp4(path29.join(tmpdir7(), "ca-compose-")); + const indexFile = path29.join(indexRoot, "index"); try { const options = { ...args.objectReadOptions, indexFile }; await checked(args.checkoutPath, ["read-tree", args.head], options, runGit); @@ -51044,7 +51615,7 @@ async function composeSliceOntoHead(args) { runGit )).trim(); } finally { - await rm11(indexRoot, { recursive: true, force: true }); + await rm13(indexRoot, { recursive: true, force: true }); } } @@ -51478,7 +52049,7 @@ function privateObjectReadOptions(access6) { } async function importPromotedObjects(args) { const privateObjects = privateObjectReadOptions(args.access); - const packPrefix = path28.join(args.access.sharedObjectsDir, "pack", "pack"); + const packPrefix = path30.join(args.access.sharedObjectsDir, "pack", "pack"); await checkedGit5( args.checkoutPath, ["pack-objects", "--revs", packPrefix], @@ -52222,17 +52793,15 @@ async function verifyCandidate(args) { } } async function runPipeline(checkoutPath, spec, deps) { - const ps = guardWorktreeMutations(deps.ps ?? getPlatformServices()); + const ps = deps.ps ?? getPlatformServices(); const canonical = await ps.canonicalizePath(checkoutPath); - const lock = await ps.acquireCheckoutLock(canonical.canonical); - const guardedDependencies = { - ...deps, - ps, - borrowedCheckoutLease: lock - }; - let primaryError; - let hasPrimaryError = false; - try { + const safety = new PlatformSafety(ps); + return await safety.withCheckoutLease(canonical.canonical, async (lock) => { + const guardedDependencies = { + ...deps, + ps, + borrowedCheckoutLease: lock + }; const result = await runPipelineWithLease( checkoutPath, spec, @@ -52252,21 +52821,7 @@ async function runPipeline(checkoutPath, spec, deps) { } ); return result; - } catch (error51) { - primaryError = error51; - hasPrimaryError = true; - throw error51; - } finally { - try { - await lock.release(); - } catch (releaseError) { - if (!hasPrimaryError) throw releaseError; - throw new AggregateError( - [primaryError, releaseError], - "pipeline failed and its checkout lease could not be released" - ); - } - } + }); } Object.defineProperty(runPipeline, "advisorStage", { value: runAdvisorStage, @@ -53325,8 +53880,8 @@ var INTEGRABLE_DECISION_AUTHORITIES = [ ]; // src/ship/github-cli-adapter.ts -import { chmod as chmod2, rm as rm12 } from "node:fs/promises"; -import path29 from "node:path"; +import { chmod as chmod2, rm as rm14 } from "node:fs/promises"; +import path31 from "node:path"; var MINIMUM_GH_VERSION = [2, 96, 0]; var OID2 = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; var REPOSITORY_COMPONENT = /^[A-Za-z0-9_.-]+$/u; @@ -53392,11 +53947,11 @@ function githubCredentialEnvironment() { if (process.env.GH_CONFIG_DIR !== void 0) { environment.GH_CONFIG_DIR = process.env.GH_CONFIG_DIR; } else if (process.platform === "win32" && process.env.APPDATA !== void 0) { - environment.GH_CONFIG_DIR = path29.join(process.env.APPDATA, "GitHub CLI"); + environment.GH_CONFIG_DIR = path31.join(process.env.APPDATA, "GitHub CLI"); } else if (process.env.XDG_CONFIG_HOME !== void 0) { - environment.GH_CONFIG_DIR = path29.join(process.env.XDG_CONFIG_HOME, "gh"); + environment.GH_CONFIG_DIR = path31.join(process.env.XDG_CONFIG_HOME, "gh"); } else if (process.env.HOME !== void 0) { - environment.GH_CONFIG_DIR = path29.join(process.env.HOME, ".config", "gh"); + environment.GH_CONFIG_DIR = path31.join(process.env.HOME, ".config", "gh"); } return environment; } @@ -53732,7 +54287,7 @@ var GitHubCliAdapter = class { } catch { if (quarantine !== void 0) { try { - await rm12(quarantine, { recursive: true }); + await rm14(quarantine, { recursive: true }); } catch { throw new HostingAdapterError( "push-quarantine-cleanup-failed", @@ -53745,7 +54300,7 @@ var GitHubCliAdapter = class { const environment = isolatedGitEnvironment(quarantine); const remoteEnvironment = isolatedGitEnvironment(quarantine, true); const branchRef = `refs/heads/${request.branch}`; - const bundlePath = path29.join(quarantine, "branch.bundle"); + const bundlePath = path31.join(quarantine, "branch.bundle"); let outcome; let failure3; try { @@ -53836,7 +54391,7 @@ var GitHubCliAdapter = class { failure3 = error51 instanceof HostingAdapterError ? error51 : new HostingAdapterError("push-command-failed"); } try { - await rm12(quarantine, { recursive: true }); + await rm14(quarantine, { recursive: true }); } catch { throw new HostingAdapterError("push-quarantine-cleanup-failed", failure3?.classification); } @@ -54095,22 +54650,22 @@ var GitHubCliAdapter = class { }; // src/mcp/allowlist-sufficiency.ts -import { readFile as readFile7 } from "node:fs/promises"; -import path30 from "node:path"; +import { readFile as readFile9 } from "node:fs/promises"; +import path32 from "node:path"; var SOURCE_EXTENSIONS = /* @__PURE__ */ new Set([".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"]); var MAX_GAPS = 25; var MAX_FILE_BYTES = 512 * 1024; var IMPORT_SPECIFIER = /(?:\bfrom\s*|\bimport\s*\(\s*|\brequire\s*\(\s*)["']([^"']+)["']/gu; function toPosix(candidate) { - return candidate.split(path30.sep).join("/"); + return candidate.split(path32.sep).join("/"); } function isTestPath(candidate) { return /(?:^|\/)tests?\//u.test(candidate) || /\.(?:test|spec)\.[cm]?[jt]sx?$/u.test(candidate); } function resolveImport(fromPath, specifier, tracked) { if (!specifier.startsWith(".")) return null; - const base = toPosix(path30.posix.normalize( - path30.posix.join(path30.posix.dirname(toPosix(fromPath)), specifier) + const base = toPosix(path32.posix.normalize( + path32.posix.join(path32.posix.dirname(toPosix(fromPath)), specifier) )); if (base.startsWith("..")) return null; const rewrites = [ @@ -54136,14 +54691,14 @@ async function checkAllowlistSufficiency(repoRoot, spec, deps = {}) { const inScope = (candidate) => spec.writeAllowlist.some((pattern) => globMatches(pattern, candidate)) && !spec.forbiddenScope.some((pattern) => globMatches(pattern, candidate)); const allowlisted = new Set([...tracked].filter(inScope)); if (allowlisted.size === 0) return { allowlisted: 0, gaps: [], omitted: 0 }; - const read = deps.readFile ?? (async (target) => readFile7(target, "utf8")); + const read = deps.readFile ?? (async (target) => readFile9(target, "utf8")); const gaps = []; for (const candidate of tracked) { if (allowlisted.has(candidate)) continue; - if (!SOURCE_EXTENSIONS.has(path30.posix.extname(candidate))) continue; + if (!SOURCE_EXTENSIONS.has(path32.posix.extname(candidate))) continue; let contents; try { - contents = (await read(path30.join(repoRoot, candidate))).slice(0, MAX_FILE_BYTES); + contents = (await read(path32.join(repoRoot, candidate))).slice(0, MAX_FILE_BYTES); } catch { continue; } @@ -54242,20 +54797,8 @@ function storeFor(runId, deps) { function runtimeError(message, error51) { return new RuntimeError(message, { toolError: error51 }); } -var LifecycleLockReleaseError = class extends AggregateError { - constructor(primaryError, releaseError) { - const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); - super( - [primaryError, releaseError], - `${primaryMessage}; checkout lock release failed` - ); - this.primaryError = primaryError; - this.name = "LifecycleLockReleaseError"; - } - primaryError; -}; function errorResult(error51) { - const classified = error51 instanceof LifecycleLockReleaseError ? error51.primaryError : error51; + const classified = error51 instanceof AggregateError && error51.errors.length > 0 ? error51.errors[0] : error51; const code = classified instanceof RuntimeError && typeof classified.detail?.toolError === "string" ? classified.detail.toolError : "runtime-error"; const diagnostic = error51 instanceof Error ? error51.message : String(error51); return { ok: false, error: code, diagnostic: redact(diagnostic) }; @@ -54453,36 +54996,31 @@ function requireMatchingRepository(run, callerKey) { } async function withCurrentArchivedRun(checkoutPath, runId, deps, fn, preserveResultOnReleaseFailure) { const ps = services2(deps); - const lockingServices = guardWorktreeMutations(ps); + const safety = new PlatformSafety(ps); const canonical = await ps.canonicalizePath(checkoutPath); const callerKey = canonical.gitCommonDir ?? canonical.canonical; return withRepoLock(callerKey, async () => { - const lock = await lockingServices.acquireCheckoutLock(canonical.canonical, { runId }); - let action; + let actionResult = null; try { - if (lock.repositoryIdentity !== callerKey) { - throw runtimeError( - "supplied checkout repository identity changed before checkout lease acquisition", - "run-checkout-mismatch" - ); - } - const run = await loadArchivedRun(runId, deps); - requireMatchingRepository(run, lock.repositoryIdentity); - action = { ok: true, result: await fn(run, lock, ps) }; + return await safety.withCheckoutLease(canonical.canonical, async (lock) => { + if (lock.repositoryIdentity !== callerKey) { + throw runtimeError( + "supplied checkout repository identity changed before checkout lease acquisition", + "run-checkout-mismatch" + ); + } + const run = await loadArchivedRun(runId, deps); + requireMatchingRepository(run, lock.repositoryIdentity); + const result = await fn(run, lock, ps); + actionResult = { ok: true, result }; + return result; + }, { runId }); } catch (error51) { - action = { ok: false, error: error51 }; - } - try { - await lock.release(); - } catch (releaseError) { - if (!action.ok) throw new LifecycleLockReleaseError(action.error, releaseError); - if (preserveResultOnReleaseFailure !== void 0) { - return preserveResultOnReleaseFailure(action.result); + if (actionResult !== null && preserveResultOnReleaseFailure !== void 0) { + return preserveResultOnReleaseFailure(actionResult.result); } - throw releaseError; + throw error51; } - if (!action.ok) throw action.error; - return action.result; }); } async function requireInactivePipeline(run, runId) { @@ -54923,25 +55461,23 @@ function autonomousEligibility(authority, advisory) { } // src/runtime/recovery-manager.ts -import { createHash as createHash16, randomUUID as randomUUID11 } from "node:crypto"; -import { constants as constants12 } from "node:fs"; +import { createHash as createHash16, randomUUID as randomUUID13 } from "node:crypto"; +import { constants as constants14 } from "node:fs"; import { - lstat as lstat16, - link as link6, - mkdir as mkdir8, - open as open12, - readdir as readdir7, + lstat as lstat18, + link as link8, + mkdir as mkdir9, + open as open14, + readdir as readdir8, realpath as realpath13, - rename as rename6, - rm as rm13 + rename as rename7 } from "node:fs/promises"; -import path31 from "node:path"; -import nodeProcess5 from "node:process"; -var NO_FOLLOW6 = constants12.O_NOFOLLOW ?? 0; -var MAX_STATE_FILE_BYTES = 8e6; -var MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); +import path33 from "node:path"; +import nodeProcess7 from "node:process"; +var NO_FOLLOW8 = constants14.O_NOFOLLOW ?? 0; +var MAX_STATE_FILE_BYTES2 = 8e6; +var MAX_STATE_FILE_BYTES_BIGINT2 = BigInt(MAX_STATE_FILE_BYTES2); var SAFE_RUN_ID2 = /^[a-z0-9][a-z0-9._-]*$/; -var LOCK_NAME = /^([0-9a-f]{64})\.lock$/; var WORKFLOW_WORKTREE_NAME = /^workflow-([0-9a-f]{32})(?:-final)?$/; var LEGACY_FINAL_WORKTREE_NAME = /^final-([0-9a-f]{24})$/; var WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; @@ -54952,19 +55488,19 @@ var SLICE_REF_PREFIX2 = "refs/claude-architect/slices/"; var MAX_QUARANTINE_REASON_BYTES = 2e3; var MAX_QUARANTINE_RECORD_BYTES = 4096; var MAX_WORKTREE_SWEEP_ISSUES = 100; -function errorCode9(error51) { +function errorCode10(error51) { return error51.code; } -function isMissing3(error51) { - return errorCode9(error51) === "ENOENT"; +function isMissing4(error51) { + return errorCode10(error51) === "ENOENT"; } -function isPlainDirectory2(metadata) { +function isPlainDirectory3(metadata) { return metadata.isDirectory() && !metadata.isSymbolicLink(); } function sameManagedIdentity(left, right) { return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; } -function sameIdentity3(metadata, expected) { +function sameIdentity5(metadata, expected) { return metadata.dev === expected.dev && metadata.ino === expected.ino && metadata.birthtimeNs === expected.birthtimeNs; } function validateRunId(runId) { @@ -54973,21 +55509,21 @@ function validateRunId(runId) { } } async function stateRoot() { - const configured = nodeProcess5.env.CLAUDE_PLUGIN_DATA ?? (nodeProcess5.env.NODE_ENV === "test" ? nodeProcess5.env.CLAUDE_ARCHITECT_STATE_DIR : void 0); + const configured = nodeProcess7.env.CLAUDE_PLUGIN_DATA ?? (nodeProcess7.env.NODE_ENV === "test" ? nodeProcess7.env.CLAUDE_ARCHITECT_STATE_DIR : void 0); if (configured === void 0) return null; - const root = path31.resolve(resolveStateDir()); + const root = path33.resolve(resolveStateDir()); try { - const metadata = await lstat16(root, { bigint: true }); - if (!isPlainDirectory2(metadata) || metadata.birthtimeNs <= 0n) { + const metadata = await lstat18(root, { bigint: true }); + if (!isPlainDirectory3(metadata) || metadata.birthtimeNs <= 0n) { throw new RuntimeError("plugin data directory must be a stable plain directory during recovery"); } const canonicalRoot = await realpath13(root); - const settled = await lstat16(canonicalRoot, { bigint: true }); - if (!isPlainDirectory2(settled) || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs) { + const settled = await lstat18(canonicalRoot, { bigint: true }); + if (!isPlainDirectory3(settled) || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs) { throw new RuntimeError("plugin data directory identity changed during canonicalization"); } const privateIdentity = await assertPrivateRecoveryDirectory(canonicalRoot); - if (!sameIdentity3(privateIdentity, { + if (!sameIdentity5(privateIdentity, { dev: metadata.dev, ino: metadata.ino, birthtimeNs: metadata.birthtimeNs @@ -54996,43 +55532,43 @@ async function stateRoot() { } return canonicalRoot; } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing4(error51)) return null; throw error51; } } async function readBoundedRegularFile2(filename) { try { - const contents = await readStableRegularFile(filename, MAX_STATE_FILE_BYTES_BIGINT); + const contents = await readStableRegularFile(filename, MAX_STATE_FILE_BYTES_BIGINT2); if (contents === null) { throw new RuntimeError("recovery state entry is not a stable bounded regular file"); } return contents.toString("utf8"); } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing4(error51)) return null; throw error51; } } async function readCleanupJournal(filename) { let handle; try { - handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open14(filename, constants14.O_RDONLY | NO_FOLLOW8); } catch (error51) { - if (isMissing3(error51)) return { text: null, tornTail: false }; + if (isMissing4(error51)) return { text: null, tornTail: false }; throw error51; } let result; let primaryError; try { const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat16(filename, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { + const namedMetadata = await lstat18(filename, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); } - const bytes = await readHandleBytes2(handle, Number(metadata.size)); - const repeatedBytes = await readHandleBytes2(handle, Number(metadata.size)); + const bytes = await readHandleBytes3(handle, Number(metadata.size)); + const repeatedBytes = await readHandleBytes3(handle, Number(metadata.size)); const settledMetadata = await handle.stat({ bigint: true }); - const settledNamedMetadata = await lstat16(filename, { bigint: true }); - if (bytes.byteLength > MAX_STATE_FILE_BYTES || settledMetadata.size > MAX_STATE_FILE_BYTES_BIGINT) { + const settledNamedMetadata = await lstat18(filename, { bigint: true }); + if (bytes.byteLength > MAX_STATE_FILE_BYTES2 || settledMetadata.size > MAX_STATE_FILE_BYTES_BIGINT2) { throw new RuntimeError("cleanup journal exceeds its size limit during read"); } if (!settledMetadata.isFile() || settledMetadata.nlink !== 1n || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.size !== metadata.size || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !settledNamedMetadata.isFile() || settledNamedMetadata.isSymbolicLink() || settledNamedMetadata.nlink !== 1n || settledNamedMetadata.dev !== metadata.dev || settledNamedMetadata.ino !== metadata.ino || settledNamedMetadata.birthtimeNs !== metadata.birthtimeNs || settledNamedMetadata.size !== metadata.size || settledNamedMetadata.mtimeNs !== metadata.mtimeNs || settledNamedMetadata.ctimeNs !== metadata.ctimeNs || BigInt(bytes.byteLength) !== metadata.size || !repeatedBytes.equals(bytes)) { @@ -55071,10 +55607,10 @@ async function assertPrivateRecoveryDirectory(directory) { migratePermissions: true }); } -async function plainDirectoryIdentity(directory) { +async function plainDirectoryIdentity2(directory) { try { - const metadata = await lstat16(directory, { bigint: true }); - if (!isPlainDirectory2(metadata)) { + const metadata = await lstat18(directory, { bigint: true }); + if (!isPlainDirectory3(metadata)) { throw new RuntimeError("recovery directory must not be a symbolic link"); } return { @@ -55083,7 +55619,7 @@ async function plainDirectoryIdentity(directory) { birthtimeNs: metadata.birthtimeNs }; } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing4(error51)) return null; throw error51; } } @@ -55099,7 +55635,7 @@ function parseRunStart(text, expectedRunId) { } const record2 = value; validateRunId(record2.runId); - if (record2.runId !== expectedRunId || typeof record2.lockKey !== "string" || !/^[0-9a-f]{64}$/.test(record2.lockKey) || typeof record2.canonicalCommonDir !== "string" || !path31.isAbsolute(record2.canonicalCommonDir) || record2.pid !== null && (record2.pid === void 0 || !Number.isSafeInteger(record2.pid) || record2.pid <= 1) || record2.processToken !== void 0 && record2.processToken !== null && typeof record2.processToken !== "string" || typeof record2.startedAt !== "string" || !Number.isFinite(Date.parse(record2.startedAt))) { + if (record2.runId !== expectedRunId || typeof record2.lockKey !== "string" || !/^[0-9a-f]{64}$/.test(record2.lockKey) || typeof record2.canonicalCommonDir !== "string" || !path33.isAbsolute(record2.canonicalCommonDir) || record2.pid !== null && (record2.pid === void 0 || !Number.isSafeInteger(record2.pid) || record2.pid <= 1) || record2.processToken !== void 0 && record2.processToken !== null && typeof record2.processToken !== "string" || typeof record2.startedAt !== "string" || !Number.isFinite(Date.parse(record2.startedAt))) { throw new RuntimeError("run-start recovery record is malformed"); } const expectedLockKey = createHash16("sha256").update(record2.canonicalCommonDir).digest("hex"); @@ -55142,7 +55678,7 @@ async function validateGitCommonDir(commonDir) { return canonical; } async function validateRepositoryRoot(repoRoot) { - if (!path31.isAbsolute(repoRoot)) { + if (!path33.isAbsolute(repoRoot)) { throw new RuntimeError("cleanup journal repository root is not absolute"); } const canonical = await realpath13(repoRoot); @@ -55322,18 +55858,18 @@ function parseRecoveryQuarantineJournal(bytes) { return runIds; } async function readRecoveryQuarantineJournal(runsRoot) { - const rootIdentity = await plainDirectoryIdentity(runsRoot); + const rootIdentity = await plainDirectoryIdentity2(runsRoot); if (rootIdentity === null) { throw new RuntimeError("recovery quarantine journal root disappeared"); } - const filename = path31.join(runsRoot, "recovery-quarantine.ndjson"); + const filename = path33.join(runsRoot, "recovery-quarantine.ndjson"); let expectedMetadata; try { - expectedMetadata = await lstat16(filename, { bigint: true }); + expectedMetadata = await lstat18(filename, { bigint: true }); } catch (error51) { - if (!isMissing3(error51)) throw error51; - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (!isPlainDirectory2(currentRoot) || !sameIdentity3(currentRoot, rootIdentity)) { + if (!isMissing4(error51)) throw error51; + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (!isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, rootIdentity)) { throw new RuntimeError("recovery quarantine journal root changed during missing read"); } return { @@ -55343,20 +55879,20 @@ async function readRecoveryQuarantineJournal(runsRoot) { journalIdentity: null }; } - if (!expectedMetadata.isFile() || expectedMetadata.isSymbolicLink() || expectedMetadata.nlink !== 1n || expectedMetadata.size > MAX_STATE_FILE_BYTES_BIGINT) { + if (!expectedMetadata.isFile() || expectedMetadata.isSymbolicLink() || expectedMetadata.nlink !== 1n || expectedMetadata.size > MAX_STATE_FILE_BYTES_BIGINT2) { throw new RuntimeError("recovery quarantine journal is not a bounded regular file"); } let handle; try { - handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); + handle = await open14(filename, constants14.O_RDONLY | NO_FOLLOW8); } catch (error51) { - if (!isMissing3(error51)) throw error51; + if (!isMissing4(error51)) throw error51; try { - await lstat16(filename); + await lstat18(filename); } catch (namedError) { - if (isMissing3(namedError)) { - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (isPlainDirectory2(currentRoot) && sameIdentity3(currentRoot, rootIdentity)) { + if (isMissing4(namedError)) { + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (isPlainDirectory3(currentRoot) && sameIdentity5(currentRoot, rootIdentity)) { return { bytes: Buffer.alloc(0), runIds: /* @__PURE__ */ new Set(), @@ -55373,9 +55909,9 @@ async function readRecoveryQuarantineJournal(runsRoot) { let primaryError; try { const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat16(filename, { bigint: true }); - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT || metadata.size !== expectedMetadata.size || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.size !== metadata.size || namedMetadata.dev !== expectedMetadata.dev || namedMetadata.ino !== expectedMetadata.ino || namedMetadata.birthtimeNs !== expectedMetadata.birthtimeNs || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || !isPlainDirectory2(currentRoot) || !sameIdentity3(currentRoot, rootIdentity)) { + const namedMetadata = await lstat18(filename, { bigint: true }); + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || metadata.size !== expectedMetadata.size || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.size !== metadata.size || namedMetadata.dev !== expectedMetadata.dev || namedMetadata.ino !== expectedMetadata.ino || namedMetadata.birthtimeNs !== expectedMetadata.birthtimeNs || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, rootIdentity)) { throw new RuntimeError("recovery quarantine journal changed during read"); } journalIdentity = { @@ -55383,11 +55919,11 @@ async function readRecoveryQuarantineJournal(runsRoot) { ino: metadata.ino, birthtimeNs: metadata.birthtimeNs }; - bytes = await readHandleBytes2(handle, Number(metadata.size)); + bytes = await readHandleBytes3(handle, Number(metadata.size)); const settledHandle = await handle.stat({ bigint: true }); - const settledMetadata = await lstat16(filename, { bigint: true }); - const settledRoot = await lstat16(runsRoot, { bigint: true }); - if (!settledHandle.isFile() || settledHandle.nlink !== 1n || settledHandle.size !== metadata.size || settledHandle.dev !== metadata.dev || settledHandle.ino !== metadata.ino || settledHandle.birthtimeNs !== metadata.birthtimeNs || settledHandle.mtimeNs !== metadata.mtimeNs || settledHandle.ctimeNs !== metadata.ctimeNs || !settledMetadata.isFile() || settledMetadata.isSymbolicLink() || settledMetadata.nlink !== 1n || settledMetadata.size !== BigInt(bytes.byteLength) || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !isPlainDirectory2(settledRoot) || !sameIdentity3(settledRoot, rootIdentity)) { + const settledMetadata = await lstat18(filename, { bigint: true }); + const settledRoot = await lstat18(runsRoot, { bigint: true }); + if (!settledHandle.isFile() || settledHandle.nlink !== 1n || settledHandle.size !== metadata.size || settledHandle.dev !== metadata.dev || settledHandle.ino !== metadata.ino || settledHandle.birthtimeNs !== metadata.birthtimeNs || settledHandle.mtimeNs !== metadata.mtimeNs || settledHandle.ctimeNs !== metadata.ctimeNs || !settledMetadata.isFile() || settledMetadata.isSymbolicLink() || settledMetadata.nlink !== 1n || settledMetadata.size !== BigInt(bytes.byteLength) || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !isPlainDirectory3(settledRoot) || !sameIdentity5(settledRoot, rootIdentity)) { throw new RuntimeError("recovery quarantine journal changed after read"); } } catch (error51) { @@ -55419,9 +55955,9 @@ async function syncRecoveryDirectory(directory) { await syncDirectoryMetadata(directory); } async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes) { - const temporaryPath = path31.join( + const temporaryPath = path33.join( runsRoot, - `.recovery-quarantine-journal-${randomUUID11()}.tmp` + `.recovery-quarantine-journal-${randomUUID13()}.tmp` ); let handle; let temporaryCreated = false; @@ -55430,9 +55966,9 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne let temporaryIdentity; let primaryError; try { - handle = await open12( + handle = await open14( temporaryPath, - constants12.O_RDWR | constants12.O_CREAT | constants12.O_EXCL | NO_FOLLOW6, + constants14.O_RDWR | constants14.O_CREAT | constants14.O_EXCL | NO_FOLLOW8, 384 ); temporaryCreated = true; @@ -55442,9 +55978,9 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne ino: metadata.ino, birthtimeNs: metadata.birthtimeNs }; - const namedMetadata = await lstat16(temporaryPath, { bigint: true }); - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || metadata.size > MAX_STATE_FILE_BYTES_BIGINT || !isPlainDirectory2(currentRoot) || !sameIdentity3(currentRoot, snapshot.rootIdentity)) { + const namedMetadata = await lstat18(temporaryPath, { bigint: true }); + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, snapshot.rootIdentity)) { throw new RuntimeError("recovery quarantine journal temp changed during creation"); } await handle.writeFile(nextBytes); @@ -55493,7 +56029,7 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne throw new RuntimeError("recovery quarantine journal changed before publication"); } if (snapshot.journalIdentity === null) { - await link6(temporaryPath, filename); + await link8(temporaryPath, filename); linkedPublication = true; await validatePublishedLock( temporaryPath, @@ -55515,7 +56051,7 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne } temporaryConsumed = true; } else { - await rename6(temporaryPath, filename); + await rename7(temporaryPath, filename); temporaryConsumed = true; } } catch (error51) { @@ -55564,7 +56100,7 @@ async function appendRecoveryQuarantineRecord(runsRoot, record2) { if (lineBytes > MAX_QUARANTINE_RECORD_BYTES) { throw new RuntimeError("recovery quarantine record exceeds its size limit"); } - const filename = path31.join(runsRoot, "recovery-quarantine.ndjson"); + const filename = path33.join(runsRoot, "recovery-quarantine.ndjson"); const snapshot = await readRecoveryQuarantineJournal(runsRoot); if (snapshot.runIds.has(record2.runId)) { await syncRecoveryDirectory(runsRoot); @@ -55575,30 +56111,30 @@ async function appendRecoveryQuarantineRecord(runsRoot, record2) { return; } const nextBytes = Buffer.concat([snapshot.bytes, Buffer.from(line, "utf8")]); - if (nextBytes.byteLength > MAX_STATE_FILE_BYTES) { + if (nextBytes.byteLength > MAX_STATE_FILE_BYTES2) { throw new RuntimeError("recovery quarantine journal exceeds its size limit"); } await publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes); } async function quarantineRun(runsRoot, runId, error51) { - const runDirectory = path31.join(runsRoot, runId); - const quarantinePath = path31.join(runsRoot, `.poisoned-${runId}`); - const runsIdentity = await plainDirectoryIdentity(runsRoot); + const runDirectory = path33.join(runsRoot, runId); + const quarantinePath = path33.join(runsRoot, `.poisoned-${runId}`); + const runsIdentity = await plainDirectoryIdentity2(runsRoot); if (runsIdentity === null) throw new RuntimeError("recovery runs root disappeared"); let runIdentity = null; let renamed = false; let journaled = false; try { - runIdentity = await plainDirectoryIdentity(runDirectory); + runIdentity = await plainDirectoryIdentity2(runDirectory); if (runIdentity === null) throw new RuntimeError("poisoned recovery run disappeared"); - if (await plainDirectoryIdentity(quarantinePath) !== null) { + if (await plainDirectoryIdentity2(quarantinePath) !== null) { throw new RuntimeError("poisoned recovery quarantine already exists"); } - await rename6(runDirectory, quarantinePath); + await rename7(runDirectory, quarantinePath); renamed = true; - const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (quarantineIdentity === null || quarantineIdentity.dev !== runIdentity.dev || quarantineIdentity.ino !== runIdentity.ino || quarantineIdentity.birthtimeNs !== runIdentity.birthtimeNs || !isPlainDirectory2(currentRoot) || !sameIdentity3(currentRoot, runsIdentity)) { + const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (quarantineIdentity === null || quarantineIdentity.dev !== runIdentity.dev || quarantineIdentity.ino !== runIdentity.ino || quarantineIdentity.birthtimeNs !== runIdentity.birthtimeNs || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery run identity changed during quarantine"); } const record2 = { @@ -55617,21 +56153,21 @@ async function quarantineRun(runsRoot, runId, error51) { const errors = [error51, quarantineError]; if (renamed && !journaled && runIdentity !== null) { try { - const quarantineMetadata = await lstat16(quarantinePath, { bigint: true }); - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (!isPlainDirectory2(quarantineMetadata) || !sameIdentity3(quarantineMetadata, runIdentity) || await plainDirectoryIdentity(runDirectory) !== null || !isPlainDirectory2(currentRoot) || !sameIdentity3(currentRoot, runsIdentity)) { + const quarantineMetadata = await lstat18(quarantinePath, { bigint: true }); + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (!isPlainDirectory3(quarantineMetadata) || !sameIdentity5(quarantineMetadata, runIdentity) || await plainDirectoryIdentity2(runDirectory) !== null || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery rollback identity or destination is unsafe"); } - await rename6(quarantinePath, runDirectory); - const restoredMetadata = await lstat16(runDirectory, { bigint: true }); - const restoredRoot = await lstat16(runsRoot, { bigint: true }); - if (!isPlainDirectory2(restoredMetadata) || !sameIdentity3(restoredMetadata, runIdentity) || !isPlainDirectory2(restoredRoot) || !sameIdentity3(restoredRoot, runsIdentity)) { + await rename7(quarantinePath, runDirectory); + const restoredMetadata = await lstat18(runDirectory, { bigint: true }); + const restoredRoot = await lstat18(runsRoot, { bigint: true }); + if (!isPlainDirectory3(restoredMetadata) || !sameIdentity5(restoredMetadata, runIdentity) || !isPlainDirectory3(restoredRoot) || !sameIdentity5(restoredRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery rollback identity changed"); } await syncRecoveryDirectory(runsRoot); - const settledMetadata = await lstat16(runDirectory, { bigint: true }); - const settledRoot = await lstat16(runsRoot, { bigint: true }); - if (!isPlainDirectory2(settledMetadata) || !sameIdentity3(settledMetadata, runIdentity) || !isPlainDirectory2(settledRoot) || !sameIdentity3(settledRoot, runsIdentity)) { + const settledMetadata = await lstat18(runDirectory, { bigint: true }); + const settledRoot = await lstat18(runsRoot, { bigint: true }); + if (!isPlainDirectory3(settledMetadata) || !sameIdentity5(settledMetadata, runIdentity) || !isPlainDirectory3(settledRoot) || !sameIdentity5(settledRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery rollback changed after directory sync"); } } catch (rollbackError) { @@ -55642,8 +56178,8 @@ async function quarantineRun(runsRoot, runId, error51) { } } async function removePlainDirectory(directory, expected, platformServices) { - const metadata = await lstat16(directory, { bigint: true }); - if (!isPlainDirectory2(metadata) || !sameIdentity3(metadata, expected)) { + const metadata = await lstat18(directory, { bigint: true }); + if (!isPlainDirectory3(metadata) || !sameIdentity5(metadata, expected)) { throw new RuntimeError("recovery directory identity changed before removal"); } await emptyBoundDirectory(directory, expected, platformServices); @@ -55662,18 +56198,18 @@ async function createExactRef(repoRoot, ref, oid) { async function appendCleanupRecord(runsRoot, record2) { const journalLock = await getPlatformServices().acquireCleanupJournalLock(); try { - const identity = await plainDirectoryIdentity(runsRoot); + const identity = await plainDirectoryIdentity2(runsRoot); if (identity === null) throw new RuntimeError("cleanup journal root disappeared"); - const filename = path31.join(runsRoot, "cleanup.ndjson"); - const handle = await open12( + const filename = path33.join(runsRoot, "cleanup.ndjson"); + const handle = await open14( filename, - constants12.O_WRONLY | constants12.O_CREAT | constants12.O_APPEND | NO_FOLLOW6, + constants14.O_WRONLY | constants14.O_CREAT | constants14.O_APPEND | NO_FOLLOW8, 384 ); try { const metadata = await handle.stat(); - const currentRoot2 = await lstat16(runsRoot, { bigint: true }); - if (!metadata.isFile() || !isPlainDirectory2(currentRoot2) || !sameIdentity3(currentRoot2, identity)) { + const currentRoot2 = await lstat18(runsRoot, { bigint: true }); + if (!metadata.isFile() || !isPlainDirectory3(currentRoot2) || !sameIdentity5(currentRoot2, identity)) { throw new RuntimeError("cleanup journal identity changed during recovery"); } await handle.writeFile(`${JSON.stringify(record2)} @@ -55682,8 +56218,8 @@ async function appendCleanupRecord(runsRoot, record2) { } finally { await handle.close(); } - const currentRoot = await lstat16(runsRoot, { bigint: true }); - if (!isPlainDirectory2(currentRoot) || !sameIdentity3(currentRoot, identity)) { + const currentRoot = await lstat18(runsRoot, { bigint: true }); + if (!isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, identity)) { throw new RuntimeError("cleanup journal root changed after recovery append"); } } finally { @@ -55743,7 +56279,7 @@ async function commitCleanupRefs(record2) { await deleteExactRef(repoRoot, record2.backupRef, backupOid); } async function readPendingCleanupRecords(runsRoot) { - const { text, tornTail } = await readCleanupJournal(path31.join(runsRoot, "cleanup.ndjson")); + const { text, tornTail } = await readCleanupJournal(path33.join(runsRoot, "cleanup.ndjson")); const pending = /* @__PURE__ */ new Map(); if (text === null || text === "") return { pending, tornTail }; const completeText = text.endsWith("\n") ? text.slice(0, -1) : text; @@ -55758,22 +56294,22 @@ async function readPendingCleanupRecords(runsRoot) { async function truncateCleanupTornTail(filename) { let handle; try { - handle = await open12(filename, constants12.O_RDWR | NO_FOLLOW6); + handle = await open14(filename, constants14.O_RDWR | NO_FOLLOW8); } catch (error51) { - if (isMissing3(error51)) return; + if (isMissing4(error51)) return; throw error51; } try { const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat16(filename, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { + const namedMetadata = await lstat18(filename, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); } - const bytes = await readHandleBytes2(handle, Number(metadata.size)); + const bytes = await readHandleBytes3(handle, Number(metadata.size)); const text = bytes.toString("utf8"); if (text === "" || text.endsWith("\n")) return; const settled = await handle.stat({ bigint: true }); - const settledNamed = await lstat16(filename, { bigint: true }); + const settledNamed = await lstat18(filename, { bigint: true }); if (BigInt(bytes.byteLength) !== metadata.size || !settled.isFile() || settled.nlink !== 1n || settled.size !== metadata.size || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size) { throw new RuntimeError("cleanup journal changed during torn-tail repair"); } @@ -55786,20 +56322,20 @@ async function truncateCleanupTornTail(filename) { } } async function repositoryRootExists(repoRoot) { - if (!path31.isAbsolute(repoRoot)) return true; + if (!path33.isAbsolute(repoRoot)) return true; try { await realpath13(repoRoot); return true; } catch (error51) { - if (isMissing3(error51)) return false; + if (isMissing4(error51)) return false; throw error51; } } async function reconcileRepoAbsentPrune(runsRoot, record2, platformServices) { - const runDirectory = path31.join(runsRoot, record2.runId); - const quarantinePath = path31.join(runsRoot, record2.quarantineName); - const runIdentity = await plainDirectoryIdentity(runDirectory); - const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); + const runDirectory = path33.join(runsRoot, record2.runId); + const quarantinePath = path33.join(runsRoot, record2.quarantineName); + const runIdentity = await plainDirectoryIdentity2(runDirectory); + const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); if (runIdentity !== null && quarantineIdentity !== null) { throw new RuntimeError("both retained and quarantined run archives exist during recovery"); } @@ -55819,7 +56355,7 @@ async function replayInterruptedPrunes(runsRoot, ps) { const journalLock = await getPlatformServices().acquireCleanupJournalLock(); try { const read = await readPendingCleanupRecords(runsRoot); - if (read.tornTail) await truncateCleanupTornTail(path31.join(runsRoot, "cleanup.ndjson")); + if (read.tornTail) await truncateCleanupTornTail(path33.join(runsRoot, "cleanup.ndjson")); pending = read.pending; } finally { await journalLock.release(); @@ -55843,16 +56379,14 @@ async function replayInterruptedPrunes(runsRoot, ps) { commonResult.stdout, "cleanup repository identity" )); - const lease = await ps.acquireCheckoutLock(repoRoot); - let primaryError; - try { + await platformSafety.withRecoveryLease(repoRoot, async (lease) => { if (lease.repositoryIdentity !== repositoryIdentity) { throw new RuntimeError("checkout lease repository identity changed during prune recovery"); } - const runDirectory = path31.join(runsRoot, record2.runId); - const quarantinePath = path31.join(runsRoot, record2.quarantineName); - const runIdentity = await plainDirectoryIdentity(runDirectory); - const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); + const runDirectory = path33.join(runsRoot, record2.runId); + const quarantinePath = path33.join(runsRoot, record2.quarantineName); + const runIdentity = await plainDirectoryIdentity2(runDirectory); + const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); if (runIdentity !== null && quarantineIdentity !== null) { throw new RuntimeError("both retained and quarantined run archives exist during recovery"); } @@ -55870,30 +56404,15 @@ async function replayInterruptedPrunes(runsRoot, ps) { anchorCleanup: outcome, recordedAt: (/* @__PURE__ */ new Date()).toISOString() }); - } catch (error51) { - primaryError = error51; - } finally { - try { - await lease.release(); - } catch (releaseError) { - if (primaryError !== void 0) { - throw new AggregateError( - [primaryError, releaseError], - "prune recovery failed and its checkout lease could not be released" - ); - } - throw releaseError; - } - } - if (primaryError !== void 0) throw primaryError; + }); } } async function managedWorktreeMarkerIsPresent(worktreePath) { let marker; try { - marker = await lstat16(path31.join(worktreePath, ".git"), { bigint: true }); + marker = await lstat18(path33.join(worktreePath, ".git"), { bigint: true }); } catch (error51) { - if (isMissing3(error51)) return false; + if (isMissing4(error51)) return false; throw error51; } if (!marker.isFile() || marker.isSymbolicLink() || marker.nlink !== 1n) { @@ -55923,7 +56442,7 @@ async function removeManagedWorktreeUnderLease(commonDir, worktreePath, expected resolved.stdout, "managed worktree common directory" ); - if (!path31.isAbsolute(reportedCommonDir) || await realpath13(reportedCommonDir) !== commonDir) { + if (!path33.isAbsolute(reportedCommonDir) || await realpath13(reportedCommonDir) !== commonDir) { throw new RuntimeError("managed worktree belongs to a different repository"); } } @@ -55953,13 +56472,13 @@ function mostSpecificKnownRunClaim(knownRunIds, managedId) { return owner; } async function cleanupRunWorktreesUnderLease(root, commonDir, runId, runGit, knownRunIds) { - const worktreesRoot = path31.join(root, "worktrees"); - const worktreesIdentity = await plainDirectoryIdentity(worktreesRoot); + const worktreesRoot = path33.join(root, "worktrees"); + const worktreesIdentity = await plainDirectoryIdentity2(worktreesRoot); if (worktreesIdentity !== null) { - const entries = await readdir7(worktreesRoot, { withFileTypes: true }); + const entries = await readdir8(worktreesRoot, { withFileTypes: true }); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { if (!entry.isDirectory() || entry.isSymbolicLink() || !runClaimsWorktree(runId, entry.name) || mostSpecificKnownRunClaim(knownRunIds, entry.name) !== runId) continue; - const worktreePath = path31.join(worktreesRoot, entry.name); + const worktreePath = path33.join(worktreesRoot, entry.name); const identity = await managedWorktreeDirectoryIdentity(worktreePath); if (identity !== null) { await removeManagedWorktreeUnderLease(commonDir, worktreePath, identity, runGit); @@ -55970,23 +56489,23 @@ async function cleanupRunWorktreesUnderLease(root, commonDir, runId, runGit, kno if (listed.exitCode !== 0 || listed.truncated?.stdout === true || listed.truncated?.stderr === true) { throw runGitError("enumerate missing run worktree registrations", listed); } - const canonicalWorktreesRoot = worktreesIdentity === null ? path31.join(await realpath13(root), "worktrees") : await realpath13(worktreesRoot); + const canonicalWorktreesRoot = worktreesIdentity === null ? path33.join(await realpath13(root), "worktrees") : await realpath13(worktreesRoot); for (const field of gitNulRecords(listed.stdout, "missing-run Git worktree list")) { if (!field.startsWith("worktree ")) continue; - const reportedWorktreePath = path31.resolve(field.slice("worktree ".length)); + const reportedWorktreePath = path33.resolve(field.slice("worktree ".length)); let worktreePath; try { worktreePath = await canonicalizeWorktreePath(reportedWorktreePath, true); } catch (error51) { - if (!isMissing3(error51) || worktreesIdentity !== null) throw error51; - const reportedRoot = path31.dirname(reportedWorktreePath); - worktreePath = path31.join( - await realpath13(path31.dirname(reportedRoot)), - path31.basename(reportedRoot), - path31.basename(reportedWorktreePath) + if (!isMissing4(error51) || worktreesIdentity !== null) throw error51; + const reportedRoot = path33.dirname(reportedWorktreePath); + worktreePath = path33.join( + await realpath13(path33.dirname(reportedRoot)), + path33.basename(reportedRoot), + path33.basename(reportedWorktreePath) ); } - if (!platformPathsEqual(path31.dirname(worktreePath), canonicalWorktreesRoot) || !runClaimsWorktree(runId, path31.basename(worktreePath)) || mostSpecificKnownRunClaim(knownRunIds, path31.basename(worktreePath)) !== runId || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; + if (!platformPathsEqual(path33.dirname(worktreePath), canonicalWorktreesRoot) || !runClaimsWorktree(runId, path33.basename(worktreePath)) || mostSpecificKnownRunClaim(knownRunIds, path33.basename(worktreePath)) !== runId || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; await removeMissingRegisteredWorktree(commonDir, worktreePath, { git: runGit }); } } @@ -56040,7 +56559,7 @@ async function recoverRun(record2, root, ps, isProcessAlive2, runGit = git, work }); return "recovered"; } -async function readHandleBytes2(handle, size) { +async function readHandleBytes3(handle, size) { const contents = Buffer.alloc(size); let offset = 0; while (offset < size) { @@ -56055,465 +56574,8 @@ async function readHandleBytes2(handle, size) { } return contents.subarray(0, offset); } -async function removeLockIfUnchanged(lockPath, handle, expectedIdentity, expectedContents, expectedLinks = 1) { - const expectedSize = expectedContents.byteLength; - const handleMetadata = await handle.stat({ bigint: true }); - if (!isExpectedLockMetadata( - handleMetadata, - expectedIdentity, - expectedSize, - expectedLinks - )) return false; - const currentContents = await readHandleBytes2(handle, Number(handleMetadata.size)); - if (!currentContents.equals(expectedContents)) return false; - let pathMetadata; - try { - pathMetadata = await lstat16(lockPath, { bigint: true }); - } catch (error51) { - if (isMissing3(error51)) return false; - throw error51; - } - if (!isExpectedLockMetadata( - pathMetadata, - expectedIdentity, - expectedSize, - expectedLinks - )) return false; - const settledHandleMetadata = await handle.stat({ bigint: true }); - if (!isExpectedLockMetadata( - settledHandleMetadata, - expectedIdentity, - expectedSize, - expectedLinks - )) return false; - const settledContents = await readHandleBytes2(handle, Number(settledHandleMetadata.size)); - if (!settledContents.equals(expectedContents)) return false; - let settledPathMetadata; - try { - settledPathMetadata = await lstat16(lockPath, { bigint: true }); - } catch (error51) { - if (isMissing3(error51)) return false; - throw error51; - } - if (!isExpectedLockMetadata( - settledPathMetadata, - expectedIdentity, - expectedSize, - expectedLinks - )) return false; - try { - await rm13(lockPath, { force: false }); - return true; - } catch (error51) { - if (isMissing3(error51)) return false; - throw error51; - } -} -async function reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) { - let handle; - try { - handle = await open12(lockPath, constants12.O_RDONLY | NO_FOLLOW6); - } catch (error51) { - if (isMissing3(error51)) return "contended"; - throw error51; - } - try { - const metadata = await handle.stat({ bigint: true }); - if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT) { - throw new RuntimeError("recovery lock must be a bounded regular file"); - } - const contents = await readHandleBytes2(handle, Number(metadata.size)); - if (BigInt(contents.byteLength) !== metadata.size) return "contended"; - const owner = parseLockOwner(contents.toString("utf8")); - if (owner === null) { - logger.warn("startup recovery preserved malformed lock", { - event: "recovery-malformed-lock", - lockName: path31.basename(lockPath), - reason: "invalid-owner-record" - }); - return "malformed"; - } - const ownerStatus2 = await lockOwnerStatus( - owner, - isProcessAlive2, - getProcessStartToken - ); - if (ownerStatus2 === "live") return "live"; - if (ownerStatus2 === "unverifiable") { - logger.warn("startup recovery preserved unverifiable lock", { - event: "recovery-unverifiable-lock", - lockName: path31.basename(lockPath), - reason: "process-token-unavailable" - }); - return "unverifiable"; - } - return await removeLockIfUnchanged( - lockPath, - handle, - { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs - }, - contents - ) ? "reclaimed" : "contended"; - } finally { - await handle.close(); - } -} -async function validateLockParentIdentity(parentPath, expectedIdentity) { - const metadata = await lstat16(parentPath, { bigint: true }); - if (!isPlainDirectory2(metadata) || !sameIdentity3(metadata, expectedIdentity)) { - throw new RuntimeError("recovery lock parent identity changed"); - } -} -function isExpectedLockMetadata(metadata, expectedIdentity, expectedSize, expectedLinks) { - return metadata.isFile() && !metadata.isSymbolicLink() && metadata.nlink === BigInt(expectedLinks) && sameIdentity3(metadata, expectedIdentity) && metadata.size === BigInt(expectedSize) && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; -} -async function validateOwnedLockState(handle, namedPaths, expectedIdentity, expectedContents, expectedLinks, parentPath, parentIdentity) { - const validateHandle = async () => { - const metadata = await handle.stat({ bigint: true }); - if (!isExpectedLockMetadata( - metadata, - expectedIdentity, - expectedContents.byteLength, - expectedLinks - ) || !(await readHandleBytes2(handle, Number(metadata.size))).equals(expectedContents)) { - throw new RuntimeError("recovery lock handle or contents changed"); - } - }; - await validateLockParentIdentity(parentPath, parentIdentity); - await validateHandle(); - for (const namedPath of namedPaths) { - const metadata = await lstat16(namedPath, { bigint: true }); - if (!isExpectedLockMetadata( - metadata, - expectedIdentity, - expectedContents.byteLength, - expectedLinks - )) throw new RuntimeError("recovery lock path changed"); - } - await validateHandle(); - await validateLockParentIdentity(parentPath, parentIdentity); -} -async function removeExpectedLockPath(filename, expectedIdentity, expectedContents, expectedLinks) { - let handle; - try { - handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); - } catch (error51) { - if (isMissing3(error51)) return "absent"; - throw error51; - } - let primaryError; - let removed = false; - try { - removed = await removeLockIfUnchanged( - filename, - handle, - expectedIdentity, - expectedContents, - expectedLinks - ); - } catch (error51) { - primaryError = error51; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== void 0) { - throw new AggregateError( - [primaryError, closeError], - "recovery lock cleanup failed and its handle could not be closed" - ); - } - throw closeError; - } - if (primaryError !== void 0) throw primaryError; - return removed ? "removed" : "changed"; -} -async function pathNamesLockIdentity(filename, expectedIdentity) { - try { - const metadata = await lstat16(filename, { bigint: true }); - return metadata.isFile() && !metadata.isSymbolicLink() && sameIdentity3(metadata, expectedIdentity); - } catch (error51) { - if (isMissing3(error51)) return false; - throw error51; - } -} -async function validatePublishedLock(lockPath, expectedIdentity, expectedContents, parentPath, parentIdentity, expectedLinks = 1, namedPaths = [lockPath]) { - const handle = await open12(lockPath, constants12.O_RDONLY | NO_FOLLOW6); - let primaryError; - try { - await validateOwnedLockState( - handle, - namedPaths, - expectedIdentity, - expectedContents, - expectedLinks, - parentPath, - parentIdentity - ); - } catch (error51) { - primaryError = error51; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== void 0) { - throw new AggregateError( - [primaryError, closeError], - "published recovery lock validation failed and its handle could not be closed" - ); - } - throw closeError; - } - if (primaryError !== void 0) throw primaryError; -} -function throwLockAcquisitionErrors(errors) { - if (errors.length === 1) throw errors[0]; - throw new AggregateError(errors, "recovery lock acquisition and safe cleanup failed"); -} -async function cleanupOwnedLockPaths(parentPath, parentIdentity, temporaryPath, lockPath, expectedIdentity, expectedContents, published) { - const errors = []; - try { - await validateLockParentIdentity(parentPath, parentIdentity); - } catch (error51) { - return [error51]; - } - if (published) { - try { - const temporaryExists = await pathNamesLockIdentity(temporaryPath, expectedIdentity); - const result = await removeExpectedLockPath( - lockPath, - expectedIdentity, - expectedContents, - temporaryExists ? 2 : 1 - ); - if (result === "changed") { - errors.push(new RuntimeError("published recovery lock changed before safe cleanup")); - } - } catch (error51) { - errors.push(error51); - } - } - try { - const result = await removeExpectedLockPath( - temporaryPath, - expectedIdentity, - expectedContents, - 1 - ); - if (result === "changed") { - errors.push(new RuntimeError("temporary recovery lock changed before safe cleanup")); - } - } catch (error51) { - errors.push(error51); - } - try { - await validateLockParentIdentity(parentPath, parentIdentity); - } catch (error51) { - errors.push(error51); - } - return errors; -} -async function createOwnedLock(lockPath, contents) { - if (contents.byteLength > MAX_STATE_FILE_BYTES) { - throw new RuntimeError("new recovery lock exceeds its size limit"); - } - const parentPath = path31.dirname(lockPath); - const parentIdentity = await plainDirectoryIdentity(parentPath); - if (parentIdentity === null) { - throw new RuntimeError("recovery lock parent must remain a plain directory"); - } - const temporaryPath = path31.join(parentPath, `.recovery-lock-${randomUUID11()}.tmp`); - let handle; - let temporaryIdentity; - let temporaryCreated = false; - let published = false; - let contended = false; - const errors = []; - try { - handle = await open12( - temporaryPath, - constants12.O_RDWR | constants12.O_CREAT | constants12.O_EXCL | NO_FOLLOW6, - 384 - ); - temporaryCreated = true; - const metadata = await handle.stat({ bigint: true }); - temporaryIdentity = { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs - }; - await handle.writeFile(contents); - await handle.sync(); - await validateOwnedLockState( - handle, - [temporaryPath], - temporaryIdentity, - contents, - 1, - parentPath, - parentIdentity - ); - try { - await link6(temporaryPath, lockPath); - published = true; - } catch (error51) { - if (errorCode9(error51) === "EEXIST") contended = true; - else throw error51; - } - if (published) { - await validateOwnedLockState( - handle, - [temporaryPath, lockPath], - temporaryIdentity, - contents, - 2, - parentPath, - parentIdentity - ); - } - } catch (error51) { - errors.push(error51); - } - if (handle !== void 0) { - try { - await handle.close(); - } catch (error51) { - errors.push(error51); - } - } - if (temporaryCreated && temporaryIdentity === void 0) { - errors.push(new RuntimeError("temporary recovery lock identity is unavailable for cleanup")); - } - if (temporaryIdentity === void 0) throwLockAcquisitionErrors(errors); - if (contended) { - errors.push(...await cleanupOwnedLockPaths( - parentPath, - parentIdentity, - temporaryPath, - lockPath, - temporaryIdentity, - contents, - false - )); - if (errors.length === 0) return null; - throwLockAcquisitionErrors(errors); - } - if (!published) { - if (temporaryCreated) { - errors.push(...await cleanupOwnedLockPaths( - parentPath, - parentIdentity, - temporaryPath, - lockPath, - temporaryIdentity, - contents, - false - )); - } - throwLockAcquisitionErrors(errors); - } - if (errors.length === 0) { - try { - await validateLockParentIdentity(parentPath, parentIdentity); - const result = await removeExpectedLockPath( - temporaryPath, - temporaryIdentity, - contents, - 2 - ); - if (result === "changed") { - throw new RuntimeError("temporary recovery lock changed before unlink"); - } - await validatePublishedLock( - lockPath, - temporaryIdentity, - contents, - parentPath, - parentIdentity - ); - } catch (error51) { - errors.push(error51); - } - } - if (errors.length === 0) { - return { lockPath, identity: temporaryIdentity, contents }; - } - errors.push(...await cleanupOwnedLockPaths( - parentPath, - parentIdentity, - temporaryPath, - lockPath, - temporaryIdentity, - contents, - true - )); - throwLockAcquisitionErrors(errors); -} -async function acquireOwnedLock(lockPath, contents, isProcessAlive2, getProcessStartToken) { - const created = await createOwnedLock(lockPath, contents); - if (created !== null) return created; - if (await reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken) !== "reclaimed") { - return null; - } - return createOwnedLock(lockPath, contents); -} -async function releaseOwnedLock(lock) { - let handle; - try { - handle = await open12(lock.lockPath, constants12.O_RDONLY | NO_FOLLOW6); - } catch (error51) { - if (isMissing3(error51)) return; - throw error51; - } - try { - await removeLockIfUnchanged(lock.lockPath, handle, lock.identity, lock.contents); - } finally { - await handle.close(); - } -} -function defaultIsProcessAlive2(pid) { - if (!Number.isSafeInteger(pid) || pid <= 1) return false; - try { - nodeProcess5.kill(pid, 0); - return true; - } catch (error51) { - if (errorCode9(error51) === "EPERM") return true; - if (errorCode9(error51) === "ESRCH") return false; - throw error51; - } -} -async function reclaimLocks(locksRoot, isProcessAlive2, getProcessStartToken) { - let entries; - try { - const rootIdentity = await plainDirectoryIdentity(locksRoot); - if (rootIdentity === null) return; - entries = await readdir7(locksRoot, { withFileTypes: true }); - } catch (error51) { - if (isMissing3(error51)) return; - throw error51; - } - for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const match = LOCK_NAME.exec(entry.name); - if (match === null) continue; - const lockPath = path31.join(locksRoot, entry.name); - if (!entry.isFile() || entry.isSymbolicLink()) { - throw new RuntimeError("checkout lock must be a regular file during recovery"); - } - await reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken); - } -} -async function lockIsOwnedByLiveProcess(locksRoot, lockKey, isProcessAlive2, getProcessStartToken) { - const contents = await readBoundedRegularFile2(path31.join(locksRoot, `${lockKey}.lock`)); - if (contents === null) return false; - const owner = parseLockOwner(contents); - if (owner === null) return true; - return await lockOwnerStatus(owner, isProcessAlive2, getProcessStartToken) !== "dead"; -} async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath) { - const backlink = await readStableRegularFile(path31.join(registrationPath, "gitdir"), 32768n); + const backlink = await readStableRegularFile(path33.join(registrationPath, "gitdir"), 32768n); if (backlink === null) { throw new RuntimeError("worktree registration backlink is absent or unstable"); } @@ -56521,11 +56583,11 @@ async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath backlink.toString("utf8"), "worktree registration backlink" ); - if (!path31.isAbsolute(reportedDotGit) || path31.basename(reportedDotGit) !== ".git") { + if (!path33.isAbsolute(reportedDotGit) || path33.basename(reportedDotGit) !== ".git") { throw new RuntimeError("worktree registration backlink is malformed"); } const [reportedPhysicalPath, canonicalExpectedPhysicalPath] = await Promise.all([ - canonicalizeWorktreePath(path31.dirname(reportedDotGit), true), + canonicalizeWorktreePath(path33.dirname(reportedDotGit), true), canonicalizeWorktreePath(expectedPhysicalPath, true) ]); if (!platformPathsEqual(reportedPhysicalPath, canonicalExpectedPhysicalPath)) { @@ -56534,11 +56596,11 @@ async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath } async function findCreationRegistration(registrationRoot, physicalPath) { const matches = []; - for (const entry of await readdir7(registrationRoot, { withFileTypes: true })) { + for (const entry of await readdir8(registrationRoot, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path31.join(registrationRoot, entry.name); + const registrationPath = path33.join(registrationRoot, entry.name); const contents = await readStableRegularFile( - path31.join(registrationPath, "gitdir"), + path33.join(registrationPath, "gitdir"), 32768n ); if (contents === null) continue; @@ -56548,7 +56610,7 @@ async function findCreationRegistration(registrationRoot, physicalPath) { } catch { continue; } - if (path31.isAbsolute(backlink) && path31.basename(backlink) === ".git" && platformPathsEqual(path31.resolve(path31.dirname(backlink)), physicalPath)) { + if (path33.isAbsolute(backlink) && path33.basename(backlink) === ".git" && platformPathsEqual(path33.resolve(path33.dirname(backlink)), physicalPath)) { matches.push(registrationPath); } } @@ -56559,9 +56621,9 @@ async function findCreationRegistration(registrationRoot, physicalPath) { } async function findCreationPhysicalRoot(stateDirectory, expected) { const matches = []; - for (const entry of await readdir7(stateDirectory, { withFileTypes: true })) { + for (const entry of await readdir8(stateDirectory, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path31.join(stateDirectory, entry.name); + const candidate = path33.join(stateDirectory, entry.name); const identity = await managedWorktreeDirectoryIdentity(candidate); if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); } @@ -56572,9 +56634,9 @@ async function findCreationPhysicalRoot(stateDirectory, expected) { } async function findManagedChildByIdentity(root, expected) { const matches = []; - for (const entry of await readdir7(root, { withFileTypes: true })) { + for (const entry of await readdir8(root, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path31.join(root, entry.name); + const candidate = path33.join(root, entry.name); const identity = await managedWorktreeDirectoryIdentity(candidate); if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); } @@ -56586,14 +56648,14 @@ async function findManagedChildByIdentity(root, expected) { async function recoverWorktreeCreationIntent(manifestPath, manifest, platformServices, syncDirectory4, temporaryPath, temporaryKind) { const root = await stateRoot(); if (root === null) throw new RuntimeError("runtime state root is unavailable"); - const expectedPhysicalRootPath = path31.join(root, "worktrees"); - if (!path31.isAbsolute(manifest.physicalPath) || path31.resolve(manifest.physicalPath) !== manifest.physicalPath || !platformPathsEqual(path31.dirname(manifest.physicalPath), expectedPhysicalRootPath) || path31.basename(manifest.physicalPath) === "" || !path31.isAbsolute(manifest.physicalQuarantinePath) || path31.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath || !platformPathsEqual( - path31.dirname(manifest.physicalQuarantinePath), + const expectedPhysicalRootPath = path33.join(root, "worktrees"); + if (!path33.isAbsolute(manifest.physicalPath) || path33.resolve(manifest.physicalPath) !== manifest.physicalPath || !platformPathsEqual(path33.dirname(manifest.physicalPath), expectedPhysicalRootPath) || path33.basename(manifest.physicalPath) === "" || !path33.isAbsolute(manifest.physicalQuarantinePath) || path33.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath || !platformPathsEqual( + path33.dirname(manifest.physicalQuarantinePath), expectedPhysicalRootPath - ) || path31.basename(manifest.physicalQuarantinePath) !== `.create-${path31.basename(manifest.physicalPath)}-${manifest.transactionId}` || !path31.isAbsolute(manifest.commonDir) || !path31.isAbsolute(manifest.registrationRoot) || !path31.isAbsolute(manifest.quarantineRoot) || !path31.isAbsolute(manifest.quarantinePath) || !platformPathsEqual( + ) || path33.basename(manifest.physicalQuarantinePath) !== `.create-${path33.basename(manifest.physicalPath)}-${manifest.transactionId}` || !path33.isAbsolute(manifest.commonDir) || !path33.isAbsolute(manifest.registrationRoot) || !path33.isAbsolute(manifest.quarantineRoot) || !path33.isAbsolute(manifest.quarantinePath) || !platformPathsEqual( manifest.registrationRoot, - path31.join(manifest.commonDir, "worktrees") - ) || !platformPathsEqual(path31.dirname(manifest.quarantinePath), manifest.quarantineRoot) || path31.basename(manifest.quarantinePath) !== `.remove-registration-creation-${manifest.transactionId}`) { + path33.join(manifest.commonDir, "worktrees") + ) || !platformPathsEqual(path33.dirname(manifest.quarantinePath), manifest.quarantineRoot) || path33.basename(manifest.quarantinePath) !== `.remove-registration-creation-${manifest.transactionId}`) { throw new RuntimeError("worktree creation intent paths are inconsistent"); } const expectedCommonDir = { @@ -56627,9 +56689,7 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer if (!platformPathsEqual(commonDir, manifest.commonDir) || !platformPathsEqual(registrationRoot, manifest.registrationRoot) || !platformPathsEqual(quarantineRoot, manifest.quarantineRoot) || commonIdentity === null || !sameManagedIdentity(commonIdentity, expectedCommonDir) || registrationRootIdentity === null || !sameManagedIdentity(registrationRootIdentity, expectedRegistrationRoot) || quarantineRootIdentity === null || !sameManagedIdentity(quarantineRootIdentity, expectedQuarantineRoot)) { throw new RuntimeError("worktree creation intent repository identity changed"); } - const lease = await platformServices.acquireCheckoutLock(commonDir); - let primaryError; - try { + await platformSafety.withRecoveryLease(commonDir, async (lease) => { if (!platformPathsEqual(lease.repositoryIdentity, commonDir)) { throw new RuntimeError("worktree creation recovery lease identity mismatch"); } @@ -56656,8 +56716,8 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer ino: BigInt(manifest.physicalIno), birthtimeNs: BigInt(manifest.physicalBirthtimeNs) } : null; - const finalPhysicalPath = physicalRoot === null ? null : path31.join(physicalRoot, path31.basename(manifest.physicalPath)); - const stagedPhysicalPath = physicalRoot === null ? null : path31.join(physicalRoot, path31.basename(manifest.physicalQuarantinePath)); + const finalPhysicalPath = physicalRoot === null ? null : path33.join(physicalRoot, path33.basename(manifest.physicalPath)); + const stagedPhysicalPath = physicalRoot === null ? null : path33.join(physicalRoot, path33.basename(manifest.physicalQuarantinePath)); const [finalPhysicalIdentity, stagedPhysicalIdentity] = await Promise.all([ finalPhysicalPath === null ? null : managedWorktreeDirectoryIdentity(finalPhysicalPath), stagedPhysicalPath === null ? null : managedWorktreeDirectoryIdentity(stagedPhysicalPath) @@ -56691,7 +56751,7 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer throw new RuntimeError("worktree creation registration disappeared"); } await assertRegistrationBacklink(activeRegistration, manifest.physicalPath); - await rename6(activeRegistration, manifest.quarantinePath); + await rename7(activeRegistration, manifest.quarantinePath); await Promise.all([syncDirectory4(registrationRoot), syncDirectory4(quarantineRoot)]); if (await managedWorktreeDirectoryIdentity(activeRegistration) !== null) { throw new RuntimeError("worktree creation registration reappeared after staging"); @@ -56726,25 +56786,11 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer } await Promise.all([syncDirectory4(registrationRoot), syncDirectory4(quarantineRoot)]); await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - } catch (error51) { - primaryError = error51; - throw error51; - } finally { - try { - await lease.release(); - } catch (releaseError) { - if (primaryError === void 0) throw releaseError; - throw new AggregateError( - [primaryError, releaseError], - "worktree creation recovery failed and its checkout lease could not be released" - ); - } - } + }); } async function recoverPendingWorktreeRemovals(platformServices = getPlatformServices(), syncDirectory4 = syncDirectoryMetadata) { const { pending, issues } = await readPendingWorktreeRemovalManifests(); for (const { manifestPath, manifest, temporaryPath, temporaryKind } of pending) { - let lease = null; let recoveryError; let repositoryIdentity; try { @@ -56762,15 +56808,15 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ } const commonDir = await realpath13(manifest.commonDir); repositoryIdentity = commonDir; - const expectedRegistrationRoot = path31.join(commonDir, "worktrees"); + const expectedRegistrationRoot = path33.join(commonDir, "worktrees"); const registrationRoot = await realpath13(expectedRegistrationRoot); - const expectedQuarantineRoot = path31.join( + const expectedQuarantineRoot = path33.join( commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY ); const quarantineRoot = await realpath13(expectedQuarantineRoot); - const quarantineMetadata = await lstat16(quarantineRoot, { bigint: true }); - const physicalRoot = await realpath13(path31.resolve(resolveStateDir(), "worktrees")); + const quarantineMetadata = await lstat18(quarantineRoot, { bigint: true }); + const physicalRoot = await realpath13(path33.resolve(resolveStateDir(), "worktrees")); const commonDirIdentity = await managedWorktreeDirectoryIdentity(commonDir); const registrationRootIdentity = await managedWorktreeDirectoryIdentity(registrationRoot); const quarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); @@ -56812,9 +56858,9 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ) ]); } - const manifestPhysicalRoot = await realpath13(path31.dirname(manifest.physicalPath)); + const manifestPhysicalRoot = await realpath13(path33.dirname(manifest.physicalPath)); const manifestPhysicalQuarantineRoot = await realpath13( - path31.dirname(manifest.physicalQuarantinePath) + path33.dirname(manifest.physicalQuarantinePath) ); const assertRemovalRootsUnchanged = async () => { const currentCommonDir = await managedWorktreeDirectoryIdentity(commonDir); @@ -56945,13 +56991,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "registrationPath is not absolute", - path31.isAbsolute(manifest.registrationPath), + path33.isAbsolute(manifest.registrationPath), manifest.registrationPath ); checkManifestConsistency( "registrationPath is not normalized", - path31.resolve(manifest.registrationPath) === manifest.registrationPath, - path31.resolve(manifest.registrationPath), + path33.resolve(manifest.registrationPath) === manifest.registrationPath, + path33.resolve(manifest.registrationPath), manifest.registrationPath ); checkManifestConsistency( @@ -56962,13 +57008,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "quarantinePath is not absolute", - path31.isAbsolute(manifest.quarantinePath), + path33.isAbsolute(manifest.quarantinePath), manifest.quarantinePath ); checkManifestConsistency( "quarantinePath is not normalized", - path31.resolve(manifest.quarantinePath) === manifest.quarantinePath, - path31.resolve(manifest.quarantinePath), + path33.resolve(manifest.quarantinePath) === manifest.quarantinePath, + path33.resolve(manifest.quarantinePath), manifest.quarantinePath ); checkManifestConsistency( @@ -56979,13 +57025,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalPath is not absolute", - path31.isAbsolute(manifest.physicalPath), + path33.isAbsolute(manifest.physicalPath), manifest.physicalPath ); checkManifestConsistency( "physicalPath is not normalized", - path31.resolve(manifest.physicalPath) === manifest.physicalPath, - path31.resolve(manifest.physicalPath), + path33.resolve(manifest.physicalPath) === manifest.physicalPath, + path33.resolve(manifest.physicalPath), manifest.physicalPath ); checkManifestConsistency( @@ -56996,13 +57042,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalQuarantinePath is not absolute", - path31.isAbsolute(manifest.physicalQuarantinePath), + path33.isAbsolute(manifest.physicalQuarantinePath), manifest.physicalQuarantinePath ); checkManifestConsistency( "physicalQuarantinePath is not normalized", - path31.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, - path31.resolve(manifest.physicalQuarantinePath), + path33.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, + path33.resolve(manifest.physicalQuarantinePath), manifest.physicalQuarantinePath ); checkManifestConsistency( @@ -57013,21 +57059,21 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "registrationPath parent mismatch", - platformPathsEqual(path31.dirname(manifest.registrationPath), registrationRoot), - path31.dirname(manifest.registrationPath), + platformPathsEqual(path33.dirname(manifest.registrationPath), registrationRoot), + path33.dirname(manifest.registrationPath), registrationRoot ); checkManifestConsistency( "quarantinePath parent mismatch", - platformPathsEqual(path31.dirname(manifest.quarantinePath), quarantineRoot), - path31.dirname(manifest.quarantinePath), + platformPathsEqual(path33.dirname(manifest.quarantinePath), quarantineRoot), + path33.dirname(manifest.quarantinePath), quarantineRoot ); checkManifestConsistency( "quarantinePath name mismatch", - path31.basename(manifest.quarantinePath) === `.remove-registration-${path31.basename(manifest.registrationPath)}-${manifest.transactionId}`, - path31.basename(manifest.quarantinePath), - `.remove-registration-${path31.basename(manifest.registrationPath)}-${manifest.transactionId}` + path33.basename(manifest.quarantinePath) === `.remove-registration-${path33.basename(manifest.registrationPath)}-${manifest.transactionId}`, + path33.basename(manifest.quarantinePath), + `.remove-registration-${path33.basename(manifest.registrationPath)}-${manifest.transactionId}` ); checkManifestConsistency( "physicalPath parent mismatch", @@ -57043,9 +57089,9 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalQuarantinePath name mismatch", - path31.basename(manifest.physicalQuarantinePath) === `.remove-${path31.basename(manifest.physicalPath)}-${manifest.transactionId}`, - path31.basename(manifest.physicalQuarantinePath), - `.remove-${path31.basename(manifest.physicalPath)}-${manifest.transactionId}` + path33.basename(manifest.physicalQuarantinePath) === `.remove-${path33.basename(manifest.physicalPath)}-${manifest.transactionId}`, + path33.basename(manifest.physicalQuarantinePath), + `.remove-${path33.basename(manifest.physicalPath)}-${manifest.transactionId}` ); if (manifest.phase === "creation-root-changed") { throw new RuntimeError("worktree creation root changed and requires manual resolution"); @@ -57060,177 +57106,167 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ino: BigInt(manifest.physicalIno), birthtimeNs: BigInt(manifest.physicalBirthtimeNs) } : null; - lease = await platformServices.acquireCheckoutLock(commonDir); - if (lease.repositoryIdentity !== commonDir) { - throw new RuntimeError("worktree removal recovery lease identity mismatch"); - } - if (temporaryPath !== void 0 && temporaryKind === "linked") { - await settleLinkedWorktreeRemovalManifest( + await platformSafety.withRecoveryLease(commonDir, async (lease) => { + if (lease.repositoryIdentity !== commonDir) { + throw new RuntimeError("worktree removal recovery lease identity mismatch"); + } + if (temporaryPath !== void 0 && temporaryKind === "linked") { + await settleLinkedWorktreeRemovalManifest( + manifestPath, + temporaryPath, + manifest.transactionId + ); + } + const lockedManifest = await readWorktreeRemovalManifest( manifestPath, - temporaryPath, manifest.transactionId ); - } - const lockedManifest = await readWorktreeRemovalManifest( - manifestPath, - manifest.transactionId - ); - if (lockedManifest === null) continue; - if (JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { - throw new RuntimeError("worktree removal manifest changed before recovery lease"); - } - const registrationIdentity = await managedWorktreeDirectoryIdentity( - manifest.registrationPath - ); - const quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); - let physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); - let physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( - manifest.physicalQuarantinePath - ); - await assertRemovalRootsUnchanged(); - if (registrationIdentity !== null && quarantineIdentity !== null) { - throw new RuntimeError("worktree removal registration exists at two paths"); - } - if (physicalIdentity !== null && physicalQuarantineIdentity !== null) { - throw new RuntimeError("physical worktree exists at two paths during removal recovery"); - } - if (registrationIdentity !== null && (registrationIdentity.dev !== expectedRegistrationIdentity.dev || registrationIdentity.ino !== expectedRegistrationIdentity.ino || registrationIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { - throw new RuntimeError("worktree removal registration identity changed"); - } - if (quarantineIdentity !== null && (quarantineIdentity.dev !== expectedRegistrationIdentity.dev || quarantineIdentity.ino !== expectedRegistrationIdentity.ino || quarantineIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { - throw new RuntimeError("worktree removal quarantine identity changed"); - } - if (expectedPhysicalIdentity === null) { - if (physicalIdentity !== null || physicalQuarantineIdentity !== null) { - throw new RuntimeError("stale worktree physical path reappeared during removal recovery"); + if (lockedManifest === null) return; + if (JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { + throw new RuntimeError("worktree removal manifest changed before recovery lease"); } - } else { - if (physicalIdentity !== null && (physicalIdentity.dev !== expectedPhysicalIdentity.dev || physicalIdentity.ino !== expectedPhysicalIdentity.ino || physicalIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { - throw new RuntimeError("physical worktree identity changed during removal recovery"); + const registrationIdentity = await managedWorktreeDirectoryIdentity( + manifest.registrationPath + ); + const quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); + let physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); + let physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( + manifest.physicalQuarantinePath + ); + await assertRemovalRootsUnchanged(); + if (registrationIdentity !== null && quarantineIdentity !== null) { + throw new RuntimeError("worktree removal registration exists at two paths"); } - if (physicalQuarantineIdentity !== null && (physicalQuarantineIdentity.dev !== expectedPhysicalIdentity.dev || physicalQuarantineIdentity.ino !== expectedPhysicalIdentity.ino || physicalQuarantineIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { - throw new RuntimeError("physical worktree quarantine identity changed"); + if (physicalIdentity !== null && physicalQuarantineIdentity !== null) { + throw new RuntimeError("physical worktree exists at two paths during removal recovery"); } - if (physicalIdentity === null && physicalQuarantineIdentity === null) { - const displacedPhysicalPath = await findManagedChildByIdentity( - physicalRoot, - expectedPhysicalIdentity - ); - if (displacedPhysicalPath !== null) { - throw new RuntimeError( - "physical worktree moved away from both recorded removal paths" - ); - } + if (registrationIdentity !== null && (registrationIdentity.dev !== expectedRegistrationIdentity.dev || registrationIdentity.ino !== expectedRegistrationIdentity.ino || registrationIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { + throw new RuntimeError("worktree removal registration identity changed"); } - } - const activeRegistrationPath = quarantineIdentity !== null ? manifest.quarantinePath : registrationIdentity !== null ? manifest.registrationPath : null; - if (activeRegistrationPath === null && manifest.phase !== "physical-removed") { - throw new RuntimeError("worktree removal registration disappeared before commit"); - } - if (activeRegistrationPath !== null && manifest.phase !== "physical-removed") { - await assertRegistrationBacklink(activeRegistrationPath, manifest.physicalPath); - } - if (manifest.phase === "physical-removed" && (physicalIdentity !== null || physicalQuarantineIdentity !== null)) { - throw new RuntimeError("committed physical worktree removal reappeared"); - } - if (manifest.phase === "physical-removal-intent" && manifest.physicalPresent && physicalIdentity === null && physicalQuarantineIdentity === null) { - throw new RuntimeError( - "intended physical worktree removal has no provable original or quarantine" - ); - } - const rollback = manifest.phase === "registration-intent" ? !manifest.physicalPresent || physicalIdentity !== null : manifest.phase === "physical-removal-intent" ? manifest.physicalPresent ? physicalIdentity !== null || physicalQuarantineIdentity !== null : physicalIdentity === null && physicalQuarantineIdentity === null : manifest.phase === "registration-staged" && (manifest.physicalPresent ? physicalIdentity !== null : physicalIdentity === null && physicalQuarantineIdentity === null); - if (rollback) { - if (manifest.phase === "physical-removal-intent" && physicalQuarantineIdentity !== null) { - if (expectedPhysicalIdentity === null || physicalIdentity !== null) { - throw new RuntimeError("physical worktree rollback state is inconsistent"); + if (quarantineIdentity !== null && (quarantineIdentity.dev !== expectedRegistrationIdentity.dev || quarantineIdentity.ino !== expectedRegistrationIdentity.ino || quarantineIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { + throw new RuntimeError("worktree removal quarantine identity changed"); + } + if (expectedPhysicalIdentity === null) { + if (physicalIdentity !== null || physicalQuarantineIdentity !== null) { + throw new RuntimeError("stale worktree physical path reappeared during removal recovery"); } - await assertRemovalRootsUnchanged(); - await rename6(manifest.physicalQuarantinePath, manifest.physicalPath); - const restoredPhysical = await managedWorktreeDirectoryIdentity(manifest.physicalPath); - const settledPhysicalQuarantine = await managedWorktreeDirectoryIdentity( - manifest.physicalQuarantinePath - ); - if (restoredPhysical === null || !sameManagedIdentity(restoredPhysical, expectedPhysicalIdentity) || settledPhysicalQuarantine !== null) { - throw new RuntimeError("physical worktree rollback identity changed"); + } else { + if (physicalIdentity !== null && (physicalIdentity.dev !== expectedPhysicalIdentity.dev || physicalIdentity.ino !== expectedPhysicalIdentity.ino || physicalIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { + throw new RuntimeError("physical worktree identity changed during removal recovery"); } - await syncDirectory4(physicalRoot); - await assertRemovalRootsUnchanged(); - } - if (quarantineIdentity !== null) { - await restoreStagedRegistration( - registrationRoot, - manifest.registrationPath, - quarantineRoot, - manifest.quarantinePath, - expectedRegistrationIdentity, - expectedRegistrationRootIdentity, - expectedQuarantineRootIdentity, - { processSupervisor: platformServices } - ); - } else if (registrationIdentity === null) { - throw new RuntimeError("pre-commit worktree registration disappeared"); - } - await syncRemovalRoots(); - await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - } else { - if (manifest.phase === "registration-staged") { - throw new RuntimeError("staged worktree removal physical state is inconsistent"); - } - if (manifest.phase === "physical-removal-started" && physicalIdentity !== null) { - if (registrationIdentity !== null || expectedPhysicalIdentity === null || physicalQuarantineIdentity !== null) { - throw new RuntimeError("started worktree removal state is inconsistent"); + if (physicalQuarantineIdentity !== null && (physicalQuarantineIdentity.dev !== expectedPhysicalIdentity.dev || physicalQuarantineIdentity.ino !== expectedPhysicalIdentity.ino || physicalQuarantineIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { + throw new RuntimeError("physical worktree quarantine identity changed"); } - await assertRemovalRootsUnchanged(); - await rename6(manifest.physicalPath, manifest.physicalQuarantinePath); - physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); - physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( - manifest.physicalQuarantinePath - ); - if (physicalIdentity !== null || physicalQuarantineIdentity === null || !sameManagedIdentity(physicalQuarantineIdentity, expectedPhysicalIdentity)) { - throw new RuntimeError("started worktree removal quarantine identity changed"); + if (physicalIdentity === null && physicalQuarantineIdentity === null) { + const displacedPhysicalPath = await findManagedChildByIdentity( + physicalRoot, + expectedPhysicalIdentity + ); + if (displacedPhysicalPath !== null) { + throw new RuntimeError( + "physical worktree moved away from both recorded removal paths" + ); + } } - await syncDirectory4(physicalRoot); - await assertRemovalRootsUnchanged(); } - if (physicalQuarantineIdentity !== null) { - if (registrationIdentity !== null || expectedPhysicalIdentity === null) { - throw new RuntimeError("quarantined worktree removal state is inconsistent"); - } - await removeQuarantinedDirectory( - physicalRoot, - manifest.physicalQuarantinePath, - expectedPhysicalIdentity, - { processSupervisor: platformServices } - ); - physicalQuarantineIdentity = null; + const activeRegistrationPath = quarantineIdentity !== null ? manifest.quarantinePath : registrationIdentity !== null ? manifest.registrationPath : null; + if (activeRegistrationPath === null && manifest.phase !== "physical-removed") { + throw new RuntimeError("worktree removal registration disappeared before commit"); } - if (registrationIdentity !== null) { - throw new RuntimeError("removed physical worktree retained a live registration"); + if (activeRegistrationPath !== null && manifest.phase !== "physical-removed") { + await assertRegistrationBacklink(activeRegistrationPath, manifest.physicalPath); } - if (quarantineIdentity !== null) { - await removeQuarantinedDirectory( - quarantineRoot, - manifest.quarantinePath, - expectedRegistrationIdentity, - { processSupervisor: platformServices } + if (manifest.phase === "physical-removed" && (physicalIdentity !== null || physicalQuarantineIdentity !== null)) { + throw new RuntimeError("committed physical worktree removal reappeared"); + } + if (manifest.phase === "physical-removal-intent" && manifest.physicalPresent && physicalIdentity === null && physicalQuarantineIdentity === null) { + throw new RuntimeError( + "intended physical worktree removal has no provable original or quarantine" ); } - await syncRemovalRoots(); - await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - } + const rollback = manifest.phase === "registration-intent" ? !manifest.physicalPresent || physicalIdentity !== null : manifest.phase === "physical-removal-intent" ? manifest.physicalPresent ? physicalIdentity !== null || physicalQuarantineIdentity !== null : physicalIdentity === null && physicalQuarantineIdentity === null : manifest.phase === "registration-staged" && (manifest.physicalPresent ? physicalIdentity !== null : physicalIdentity === null && physicalQuarantineIdentity === null); + if (rollback) { + if (manifest.phase === "physical-removal-intent" && physicalQuarantineIdentity !== null) { + if (expectedPhysicalIdentity === null || physicalIdentity !== null) { + throw new RuntimeError("physical worktree rollback state is inconsistent"); + } + await assertRemovalRootsUnchanged(); + await rename7(manifest.physicalQuarantinePath, manifest.physicalPath); + const restoredPhysical = await managedWorktreeDirectoryIdentity(manifest.physicalPath); + const settledPhysicalQuarantine = await managedWorktreeDirectoryIdentity( + manifest.physicalQuarantinePath + ); + if (restoredPhysical === null || !sameManagedIdentity(restoredPhysical, expectedPhysicalIdentity) || settledPhysicalQuarantine !== null) { + throw new RuntimeError("physical worktree rollback identity changed"); + } + await syncDirectory4(physicalRoot); + await assertRemovalRootsUnchanged(); + } + if (quarantineIdentity !== null) { + await restoreStagedRegistration( + registrationRoot, + manifest.registrationPath, + quarantineRoot, + manifest.quarantinePath, + expectedRegistrationIdentity, + expectedRegistrationRootIdentity, + expectedQuarantineRootIdentity, + { processSupervisor: platformServices } + ); + } else if (registrationIdentity === null) { + throw new RuntimeError("pre-commit worktree registration disappeared"); + } + await syncRemovalRoots(); + await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); + } else { + if (manifest.phase === "registration-staged") { + throw new RuntimeError("staged worktree removal physical state is inconsistent"); + } + if (manifest.phase === "physical-removal-started" && physicalIdentity !== null) { + if (registrationIdentity !== null || expectedPhysicalIdentity === null || physicalQuarantineIdentity !== null) { + throw new RuntimeError("started worktree removal state is inconsistent"); + } + await assertRemovalRootsUnchanged(); + await rename7(manifest.physicalPath, manifest.physicalQuarantinePath); + physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); + physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( + manifest.physicalQuarantinePath + ); + if (physicalIdentity !== null || physicalQuarantineIdentity === null || !sameManagedIdentity(physicalQuarantineIdentity, expectedPhysicalIdentity)) { + throw new RuntimeError("started worktree removal quarantine identity changed"); + } + await syncDirectory4(physicalRoot); + await assertRemovalRootsUnchanged(); + } + if (physicalQuarantineIdentity !== null) { + if (registrationIdentity !== null || expectedPhysicalIdentity === null) { + throw new RuntimeError("quarantined worktree removal state is inconsistent"); + } + await removeQuarantinedDirectory( + physicalRoot, + manifest.physicalQuarantinePath, + expectedPhysicalIdentity, + { processSupervisor: platformServices } + ); + physicalQuarantineIdentity = null; + } + if (registrationIdentity !== null) { + throw new RuntimeError("removed physical worktree retained a live registration"); + } + if (quarantineIdentity !== null) { + await removeQuarantinedDirectory( + quarantineRoot, + manifest.quarantinePath, + expectedRegistrationIdentity, + { processSupervisor: platformServices } + ); + } + await syncRemovalRoots(); + await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); + } + }); } catch (error51) { recoveryError = error51; - } finally { - if (lease !== null) { - try { - await lease.release(); - } catch (releaseError) { - recoveryError = recoveryError === void 0 ? releaseError : new AggregateError( - [recoveryError, releaseError], - "worktree removal recovery failed and its checkout lease could not be released" - ); - } - } } if (recoveryError !== void 0) { issues.push({ @@ -57262,15 +57298,15 @@ function runClaimsWorktree(runId, managedId) { } var MALFORMED_WORKFLOW_OWNERSHIP = ""; async function workflowOwnershipRecords(root) { - const ownershipRoot = path31.join(root, "autopilot-branches"); - if (await plainDirectoryIdentity(ownershipRoot) === null) return /* @__PURE__ */ new Map(); + const ownershipRoot = path33.join(root, "autopilot-branches"); + if (await plainDirectoryIdentity2(ownershipRoot) === null) return /* @__PURE__ */ new Map(); const records = /* @__PURE__ */ new Map(); - for (const entry of await readdir7(ownershipRoot, { withFileTypes: true })) { + for (const entry of await readdir8(ownershipRoot, { withFileTypes: true })) { const match = WORKFLOW_OWNERSHIP_NAME.exec(entry.name); if (match === null || !entry.isFile() || entry.isSymbolicLink()) { throw new RuntimeError("workflow ownership directory contains a malformed entry"); } - const ownershipPath = path31.join(ownershipRoot, entry.name); + const ownershipPath = path33.join(ownershipRoot, entry.name); const filenamePrefix = match[1].slice(0, 32); records.set(filenamePrefix, [...records.get(filenamePrefix) ?? [], ownershipPath]); let workflowId; @@ -57338,22 +57374,22 @@ async function finalMaterializationMustBePreserved(root, claim, isProcessAlive2, } async function sweepOrphanWorktrees(args) { const issues = []; - const worktreesRoot = path31.join(args.root, "worktrees"); + const worktreesRoot = path33.join(args.root, "worktrees"); let entries; let stateRootIdentity; let worktreesRootIdentity; try { - if (await plainDirectoryIdentity(worktreesRoot) === null) return issues; + if (await plainDirectoryIdentity2(worktreesRoot) === null) return issues; [stateRootIdentity, worktreesRootIdentity] = await Promise.all([ assertPrivateRecoveryDirectory(args.root), assertPrivateRecoveryDirectory(worktreesRoot) ]); - entries = await readdir7(worktreesRoot, { withFileTypes: true }); + entries = await readdir8(worktreesRoot, { withFileTypes: true }); const [settledStateRoot, settledWorktreesRoot] = await Promise.all([ - plainDirectoryIdentity(args.root), - plainDirectoryIdentity(worktreesRoot) + plainDirectoryIdentity2(args.root), + plainDirectoryIdentity2(worktreesRoot) ]); - if (settledStateRoot === null || settledWorktreesRoot === null || !sameIdentity3(settledStateRoot, stateRootIdentity) || !sameIdentity3(settledWorktreesRoot, worktreesRootIdentity)) { + if (settledStateRoot === null || settledWorktreesRoot === null || !sameIdentity5(settledStateRoot, stateRootIdentity) || !sameIdentity5(settledWorktreesRoot, worktreesRootIdentity)) { throw new RuntimeError("managed worktree namespace identity changed during sweep setup"); } } catch (error51) { @@ -57367,7 +57403,7 @@ async function sweepOrphanWorktrees(args) { ownershipLookupError = error51; } for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const worktreePath = path31.join(worktreesRoot, entry.name); + const worktreePath = path33.join(worktreesRoot, entry.name); if (!entry.isDirectory() || entry.isSymbolicLink()) { issues.push(worktreeSweepIssue( worktreePath, @@ -57457,7 +57493,7 @@ async function sweepOrphanWorktrees(args) { resolved.stdout, "startup worktree common directory" ); - if (!path31.isAbsolute(reportedCommonDir)) { + if (!path33.isAbsolute(reportedCommonDir)) { throw new RuntimeError("worktree repository lookup returned a non-absolute path"); } commonDir = await realpath13(reportedCommonDir); @@ -57470,18 +57506,18 @@ async function sweepOrphanWorktrees(args) { let contention; try { lease = await createOwnedLock( - path31.join(args.locksRoot, `${lockKey}.lock`), + path33.join(args.locksRoot, `${lockKey}.lock`), args.ownerContents ); if (lease === null) { contention = await reclaimDeadLock( - path31.join(args.locksRoot, `${lockKey}.lock`), + path33.join(args.locksRoot, `${lockKey}.lock`), args.isProcessAlive, args.getProcessStartToken ); if (contention === "reclaimed") { lease = await createOwnedLock( - path31.join(args.locksRoot, `${lockKey}.lock`), + path33.join(args.locksRoot, `${lockKey}.lock`), args.ownerContents ); } @@ -57543,7 +57579,7 @@ async function sweepOrphanWorktrees(args) { assertPrivateRecoveryDirectory(args.root), assertPrivateRecoveryDirectory(worktreesRoot) ]); - if (!sameIdentity3(currentStateRoot, stateRootIdentity) || !sameIdentity3(currentWorktreesRoot, worktreesRootIdentity)) { + if (!sameIdentity5(currentStateRoot, stateRootIdentity) || !sameIdentity5(currentWorktreesRoot, worktreesRootIdentity)) { throw new RuntimeError("managed worktree namespace changed before orphan removal"); } await removeManagedWorktreeUnderLease( @@ -57601,7 +57637,7 @@ async function observeWorkflowLease(store, isProcessAlive2, getProcessStartToken } function branchOwnershipPath(root, workflowId) { const name = createHash16("sha256").update(workflowId).digest("hex"); - return path31.join(root, "autopilot-branches", `${name}.json`); + return path33.join(root, "autopilot-branches", `${name}.json`); } async function observeWorkflowBranch(root, workflowId, manager, isProcessAlive2, getProcessStartToken) { const registration = await readBoundedRegularFile2(branchOwnershipPath(root, workflowId)).catch(() => void 0); @@ -57677,10 +57713,10 @@ function cleanupIntent(journal, expectedHead2) { } async function isAbsent(filename) { try { - await lstat16(filename); + await lstat18(filename); return false; } catch (error51) { - return isMissing3(error51) ? true : null; + return isMissing4(error51) ? true : null; } } async function cleanupIsDirectlyObserved(branch, runGit) { @@ -57770,11 +57806,11 @@ async function activeBranchIsDirectlyObserved(branch, expectedHead2, runGit) { } async function workflowIds(root, issues) { const ids = /* @__PURE__ */ new Set(); - const workflowsRoot = path31.join(root, "workflows"); + const workflowsRoot = path33.join(root, "workflows"); let workflowEntries = []; try { - const workflowsIdentity = await plainDirectoryIdentity(workflowsRoot); - workflowEntries = workflowsIdentity === null ? [] : await readdir7(workflowsRoot, { withFileTypes: true }); + const workflowsIdentity = await plainDirectoryIdentity2(workflowsRoot); + workflowEntries = workflowsIdentity === null ? [] : await readdir8(workflowsRoot, { withFileTypes: true }); } catch (error51) { issues.push(worktreeSweepIssue(workflowsRoot, error51)); } @@ -57783,11 +57819,11 @@ async function workflowIds(root, issues) { ids.add(entry.name); } } - const branchesRoot = path31.join(root, "autopilot-branches"); + const branchesRoot = path33.join(root, "autopilot-branches"); let branchEntries = []; try { - const branchesIdentity = await plainDirectoryIdentity(branchesRoot); - branchEntries = branchesIdentity === null ? [] : await readdir7(branchesRoot, { withFileTypes: true }); + const branchesIdentity = await plainDirectoryIdentity2(branchesRoot); + branchEntries = branchesIdentity === null ? [] : await readdir8(branchesRoot, { withFileTypes: true }); } catch (error51) { issues.push(worktreeSweepIssue(branchesRoot, error51)); } @@ -57795,7 +57831,7 @@ async function workflowIds(root, issues) { if (!entry.isFile() || entry.isSymbolicLink() || !/^[0-9a-f]{64}\.json$/u.test(entry.name)) { continue; } - const ownershipPath = path31.join(branchesRoot, entry.name); + const ownershipPath = path33.join(branchesRoot, entry.name); let text; let value; try { @@ -57810,7 +57846,7 @@ async function workflowIds(root, issues) { } if (typeof value !== "object" || value === null || Array.isArray(value)) continue; const workflowId = value.workflowId; - if (typeof workflowId === "string" && SAFE_WORKFLOW_ID.test(workflowId) && entry.name === path31.basename(branchOwnershipPath(root, workflowId))) { + if (typeof workflowId === "string" && SAFE_WORKFLOW_ID.test(workflowId) && entry.name === path33.basename(branchOwnershipPath(root, workflowId))) { ids.add(workflowId); } } @@ -57975,7 +58011,7 @@ async function reclaimPendingRemovalLocks(locksRoot, isProcessAlive2, getProcess if (seen.has(key)) continue; seen.add(key); await reclaimDeadLock( - path31.join(locksRoot, `${key}.lock`), + path33.join(locksRoot, `${key}.lock`), isProcessAlive2, getProcessStartToken ); @@ -57998,19 +58034,19 @@ async function recoverStaleRuns(dependencies = {}) { value: (checkout) => supplied?.acquireCheckoutLock ? supplied.acquireCheckoutLock(checkout) : selected.acquireCheckoutLock(checkout) } }); - const isProcessAlive2 = dependencies.isProcessAlive ?? defaultIsProcessAlive2; + const isProcessAlive2 = dependencies.isProcessAlive ?? defaultIsProcessAlive; const runGit = dependencies.git ?? git; if (root === null) return { recovered: [], quarantined: [] }; - const locksRoot = path31.join(root, "locks"); - await mkdir8(locksRoot, { recursive: true }); - if (await plainDirectoryIdentity(locksRoot) === null) { + const locksRoot = path33.join(root, "locks"); + await mkdir9(locksRoot, { recursive: true }); + if (await plainDirectoryIdentity2(locksRoot) === null) { throw new RuntimeError("recovery locks directory disappeared"); } const ownerContents = Buffer.from(JSON.stringify({ - pid: nodeProcess5.pid, - processToken: await ps.getProcessStartToken(nodeProcess5.pid) + pid: nodeProcess7.pid, + processToken: await ps.getProcessStartToken(nodeProcess7.pid) })); - const recoveryLockPath = path31.join(locksRoot, "recovery.lock"); + const recoveryLockPath = path33.join(locksRoot, "recovery.lock"); const recoveryLock = await acquireOwnedLock( recoveryLockPath, ownerContents, @@ -58029,11 +58065,11 @@ async function recoverStaleRuns(dependencies = {}) { } let primaryError; try { - const runsRoot = path31.join(root, "runs"); - const runsIdentity = await plainDirectoryIdentity(runsRoot); + const runsRoot = path33.join(root, "runs"); + const runsIdentity = await plainDirectoryIdentity2(runsRoot); if (runsIdentity !== null) { await reclaimDeadLock( - path31.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), + path33.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), isProcessAlive2, (pid) => ps.getProcessStartToken(pid) ); @@ -58054,7 +58090,7 @@ async function recoverStaleRuns(dependencies = {}) { const claimedRunIds = new Set(journaledQuarantines); const knownRunIds = new Set(journaledQuarantines); if (runsIdentity !== null) { - const runEntries = await readdir7(runsRoot, { withFileTypes: true }); + const runEntries = await readdir8(runsRoot, { withFileTypes: true }); for (const entry of runEntries) { if (entry.isDirectory() && !entry.isSymbolicLink() && SAFE_RUN_ID2.test(entry.name)) { knownRunIds.add(entry.name); @@ -58073,8 +58109,8 @@ async function recoverStaleRuns(dependencies = {}) { } if (!entry.isDirectory() || entry.isSymbolicLink() || !SAFE_RUN_ID2.test(entry.name)) continue; try { - const runDirectory = path31.join(runsRoot, entry.name); - const runStartText = await readBoundedRegularFile2(path31.join(runDirectory, "run-start.json")); + const runDirectory = path33.join(runsRoot, entry.name); + const runStartText = await readBoundedRegularFile2(path33.join(runDirectory, "run-start.json")); if (runStartText === null) { claimedRunIds.add(entry.name); continue; @@ -58101,7 +58137,7 @@ async function recoverStaleRuns(dependencies = {}) { continue; } const checkoutLock = await acquireOwnedLock( - path31.join(locksRoot, `${record2.lockKey}.lock`), + path33.join(locksRoot, `${record2.lockKey}.lock`), ownerContents, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -58115,7 +58151,7 @@ async function recoverStaleRuns(dependencies = {}) { let cleanupDeferred = false; try { const lockedRunStartText = await readBoundedRegularFile2( - path31.join(runDirectory, "run-start.json") + path33.join(runDirectory, "run-start.json") ); if (lockedRunStartText === null) { throw new RuntimeError("run-start recovery record disappeared during recovery"); @@ -58222,7 +58258,7 @@ async function recoverStaleRuns(dependencies = {}) { } for (const { record: record2, runStartText } of stale) { const checkoutLock = await acquireOwnedLock( - path31.join(locksRoot, `${record2.lockKey}.lock`), + path33.join(locksRoot, `${record2.lockKey}.lock`), ownerContents, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -58237,7 +58273,7 @@ async function recoverStaleRuns(dependencies = {}) { let becameLive = false; try { const lockedRunStartText = await readBoundedRegularFile2( - path31.join(runsRoot, record2.runId, "run-start.json") + path33.join(runsRoot, record2.runId, "run-start.json") ); if (lockedRunStartText === null) { throw new RuntimeError("run-start recovery record disappeared before stale recovery"); @@ -58302,7 +58338,7 @@ async function recoverStaleRuns(dependencies = {}) { }, workflowRecoveryIssues); const claimedWorkflowPrefixes = /* @__PURE__ */ new Set(); for (const { workflowId } of workflows) { - if (SAFE_WORKFLOW_ID.test(workflowId) && await plainDirectoryIdentity(path31.join(root, "workflows", workflowId)) !== null) { + if (SAFE_WORKFLOW_ID.test(workflowId) && await plainDirectoryIdentity2(path33.join(root, "workflows", workflowId)) !== null) { claimedWorkflowPrefixes.add( createHash16("sha256").update(workflowId).digest("hex").slice(0, 32) ); @@ -58327,7 +58363,7 @@ async function recoverStaleRuns(dependencies = {}) { ...terminalCleanupIssues, ...workflowRecoveryIssues, ...orphanWorktreeIssues - ], path31.join(root, "worktrees")); + ], path33.join(root, "worktrees")); const result = workflows.length === 0 ? { recovered, quarantined } : { recovered, quarantined, workflows }; return worktreeSweepIssues.length === 0 ? result : { ...result, worktreeSweepIssues }; } catch (error51) { @@ -58668,7 +58704,7 @@ async function createServer(dependencies = {}) { (issue2) => issue2.repositoryIdentity !== void 0 ); const unattributedWorktrees = unresolvedSweepIssues.filter( - (issue2) => issue2.repositoryIdentity === void 0 && path32.basename(path32.dirname(issue2.worktreePath)) === "worktrees" + (issue2) => issue2.repositoryIdentity === void 0 && path34.basename(path34.dirname(issue2.worktreePath)) === "worktrees" ); if (attributed.length === 0 && unattributedWorktrees.length === 0) return; const canonical = await (dependencies.ps ?? getPlatformServices()).canonicalizePath(checkoutPath); diff --git a/src/autopilot/branch-manager.ts b/src/autopilot/branch-manager.ts index 06e3b26..95ecedf 100644 --- a/src/autopilot/branch-manager.ts +++ b/src/autopilot/branch-manager.ts @@ -5,7 +5,7 @@ import path from "node:path"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; import { resolveStateDir } from "../runtime/state-dir.js"; -import { guardWorktreeMutations } from "../runtime/worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import { syncDirectoryMetadata } from "../platform/durable-directory.js"; import { RuntimeError } from "../util/errors.js"; import { logger } from "../util/logger.js"; @@ -555,7 +555,7 @@ export class WorkflowBranchManager { this.remoteTransport = dependencies.remoteTransport ?? createIsolatedRemoteTransport(this.runGit); this.removeOwnership = dependencies.removeOwnership ?? (ownershipPath => rm(ownershipPath)); const platformServices = dependencies.platformServices ?? getPlatformServices(); - this.platformServices = guardWorktreeMutations(platformServices); + this.platformServices = platformServices; this.getProcessStartToken = platformServices.getProcessStartToken?.bind(platformServices) ?? getPlatformServices().getProcessStartToken.bind(getPlatformServices()); this.worktreeManagerDependencies = { @@ -691,209 +691,196 @@ export class WorkflowBranchManager { const fetchedRef = `refs/claude-architect/autopilot/${request.workflowId}/fetch-${randomUUID()}`; const initial = await this.platformServices.canonicalizePath(request.checkoutPath); if (initial.gitCommonDir === null) fail("not-a-repository"); - // Lock acquisition sits before the classified block, so a contended - // checkout would otherwise escape as a raw RuntimeError. Windows locks fail - // fast where POSIX advisory locks tend to serialize, which made the losing - // creator's rejection type platform-dependent. Classify it either way. - let lock: CheckoutLock; - try { - lock = await this.platformServices.acquireCheckoutLock(initial.canonical); - } catch (error) { - if (error instanceof RuntimeError - && error.detail?.classification === "recovery-ambiguous") { - fail("recovery-ambiguous", error.message); - } - fail("checkout-locked"); - } let attached: Awaited> | undefined; let refsCreated = false; let fetchedCreated = false; let fetchedOidForCleanup: string | undefined; let completedIdentity: WorkflowBranchIdentity | undefined; let operationError: unknown; + const workflowHash = createHash("sha256").update(request.workflowId).digest("hex"); + const remoteIdentity = await this.resolveRemote(initial.canonical); + const safety = new PlatformSafety(this.platformServices as PlatformServices); try { - const locked = await this.platformServices.canonicalizePath(initial.canonical); - if (locked.gitCommonDir === null - || locked.gitCommonDir !== initial.gitCommonDir - || lock.repositoryIdentity !== initial.gitCommonDir) { - fail("repository-identity-mismatch"); - } - if (await this.ownershipExists(request.workflowId)) { - fail("workflow-already-owned"); - } + await safety.withCheckoutLease(initial.canonical, async (lock) => { + try { + const locked = await this.platformServices.canonicalizePath(initial.canonical); + if (locked.gitCommonDir === null + || locked.gitCommonDir !== initial.gitCommonDir + || lock.repositoryIdentity !== initial.gitCommonDir) { + fail("repository-identity-mismatch"); + } + if (await this.ownershipExists(request.workflowId)) { + fail("workflow-already-owned"); + } - const checkedBranch = await this.runGit(initial.canonical, [ - "check-ref-format", "--branch", branch, - ]); - if (!succeeded(checkedBranch)) fail("branch-name-invalid"); - for (const candidate of [baseRef, fetchedRef]) { - const checked = await this.runGit(initial.canonical, ["check-ref-format", candidate]); - if (!succeeded(checked)) fail("branch-name-invalid"); - } + const checkedBranch = await this.runGit(initial.canonical, [ + "check-ref-format", "--branch", branch, + ]); + if (!succeeded(checkedBranch)) fail("branch-name-invalid"); + for (const candidate of [baseRef, fetchedRef]) { + const checked = await this.runGit(initial.canonical, ["check-ref-format", candidate]); + if (!succeeded(checked)) fail("branch-name-invalid"); + } - const remoteIdentity = await this.resolveRemote(initial.canonical); - const localRefs = await this.runGit(initial.canonical, [ - "for-each-ref", "--format=%(refname)", "refs/heads/", - ]); - if (!succeeded(localRefs)) operationFailure("git local branch scan", localRefs); - const localCollision = localRefs.stdout.split("\n").filter(Boolean) - .some(ref => ref.toLowerCase() === branchRef.toLowerCase()); - if (localCollision) fail("local-branch-exists"); - for (const privateRef of [baseRef, fetchedRef]) { - const exists = await this.runGit(initial.canonical, ["show-ref", "--verify", "--quiet", privateRef]); - if (exists.exitCode === 0) fail("workflow-ref-exists"); - if (exists.exitCode !== 1) operationFailure("git private ref scan", exists); - } + const localHeads = await this.runGit(initial.canonical, ["for-each-ref", "--format=%(refname)", "refs/heads/"]); + if (!succeeded(localHeads)) operationFailure("git branch scan", localHeads); + const localCollision = localHeads.stdout.split("\n").filter(Boolean) + .some(ref => ref.toLowerCase() === branchRef.toLowerCase()); + if (localCollision) fail("local-branch-exists"); + for (const privateRef of [baseRef, fetchedRef]) { + const exists = await this.runGit(initial.canonical, ["show-ref", "--verify", "--quiet", privateRef]); + if (exists.exitCode === 0) fail("workflow-ref-exists"); + if (exists.exitCode !== 1) operationFailure("git private ref scan", exists); + } - const advertised = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); - if (!succeeded(advertised)) operationFailure("git remote branch scan", advertised); - const remoteHeads = parseRemoteHeads(advertised.stdout); - if ([...remoteHeads.keys()].some(name => name.toLowerCase() === branch.toLowerCase())) { - fail("remote-branch-exists"); - } - const advertisedBase = remoteHeads.get(request.baseBranch); - if (advertisedBase === undefined || !isOid(advertisedBase)) fail("remote-base-missing"); - - const fetched = await this.remoteTransport.fetch( - initial.canonical, - remoteIdentity.url, - `refs/heads/${request.baseBranch}`, - fetchedRef, - ); - if (!succeeded(fetched)) operationFailure("git fetch base", fetched); - fetchedCreated = true; - const fetchedOidResult = await this.runGit(initial.canonical, ["rev-parse", "--verify", fetchedRef]); - if (!succeeded(fetchedOidResult)) operationFailure("git resolve fetched base", fetchedOidResult); - const fetchedOid = fetchedOidResult.stdout.trim(); - if (!isOid(fetchedOid)) fail("stale-fetched-base"); - fetchedOidForCleanup = fetchedOid; - if (fetchedOid !== advertisedBase) fail("stale-fetched-base"); - const commit = await this.runGit(initial.canonical, ["cat-file", "-e", `${fetchedOid}^{commit}`]); - if (!succeeded(commit)) fail("fetched-base-not-commit"); - - const confirmed = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); - if (!succeeded(confirmed)) operationFailure("git remote base confirmation", confirmed); - const confirmedHeads = parseRemoteHeads(confirmed.stdout); - if ([...confirmedHeads.keys()].some(name => name.toLowerCase() === branch.toLowerCase())) { - fail("remote-branch-exists"); - } - if (confirmedHeads.get(request.baseBranch) !== fetchedOid) { - fail("remote-base-changed-during-create"); - } + const advertised = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); + if (!succeeded(advertised)) operationFailure("git remote branch scan", advertised); + const remoteHeads = parseRemoteHeads(advertised.stdout); + if ([...remoteHeads.keys()].some(name => name.toLowerCase() === branch.toLowerCase())) { + fail("remote-branch-exists"); + } + const advertisedBase = remoteHeads.get(request.baseBranch); + if (advertisedBase === undefined || !isOid(advertisedBase)) fail("remote-base-missing"); + + const fetched = await this.remoteTransport.fetch( + initial.canonical, + remoteIdentity.url, + `refs/heads/${request.baseBranch}`, + fetchedRef, + ); + if (!succeeded(fetched)) operationFailure("git fetch base", fetched); + fetchedCreated = true; + const fetchedOidResult = await this.runGit(initial.canonical, ["rev-parse", "--verify", fetchedRef]); + if (!succeeded(fetchedOidResult)) operationFailure("git resolve fetched base", fetchedOidResult); + const fetchedOid = fetchedOidResult.stdout.trim(); + if (!isOid(fetchedOid)) fail("stale-fetched-base"); + fetchedOidForCleanup = fetchedOid; + if (fetchedOid !== advertisedBase) fail("stale-fetched-base"); + const commit = await this.runGit(initial.canonical, ["cat-file", "-e", `${fetchedOid}^{commit}`]); + if (!succeeded(commit)) fail("fetched-base-not-commit"); + + const confirmed = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); + if (!succeeded(confirmed)) operationFailure("git remote base confirmation", confirmed); + const confirmedHeads = parseRemoteHeads(confirmed.stdout); + if ([...confirmedHeads.keys()].some(name => name.toLowerCase() === branch.toLowerCase())) { + fail("remote-branch-exists"); + } + if (confirmedHeads.get(request.baseBranch) !== fetchedOid) { + fail("remote-base-changed-during-create"); + } - const transaction = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { - stdin: [ - "start", - `create ${baseRef} ${fetchedOid}`, - `create ${branchRef} ${fetchedOid}`, - `delete ${fetchedRef} ${fetchedOid}`, - "prepare", - "commit", - "", - ].join("\n"), + const transaction = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { + stdin: [ + "start", + `create ${baseRef} ${fetchedOid}`, + `create ${branchRef} ${fetchedOid}`, + `delete ${fetchedRef} ${fetchedOid}`, + "prepare", + "commit", + "", + ].join("\n"), + }); + if (!succeeded(transaction)) operationFailure("git create workflow refs", transaction); + fetchedCreated = false; + refsCreated = true; + + const worktreeManager = new WorktreeManager( + initial.canonical, + `workflow-${createHash("sha256").update(request.workflowId).digest("hex").slice(0, 32)}`, + { os: this.platformServices.os }, + { ...this.worktreeManagerDependencies, borrowedCheckoutLease: lock }, + ); + attached = await worktreeManager.createAttached(branch, fetchedOid); + const worktreePath = await realpath(attached.path); + const worktreeGitDirResult = await this.runGit(worktreePath, [ + "rev-parse", "--path-format=absolute", "--git-dir", + ]); + if (!succeeded(worktreeGitDirResult)) { + operationFailure("git resolve worktree administrative directory", worktreeGitDirResult); + } + const worktreeGitDir = await realpath(gitPathOutput( + worktreeGitDirResult.stdout, + "workflow worktree Git directory", + )); + const identity: WorkflowBranchIdentity = { + ownershipVersion: OWNERSHIP_VERSION, + workflowId: request.workflowId, + checkoutPath: initial.canonical, + gitCommonDir: initial.gitCommonDir, + repositoryIdentity: lock.repositoryIdentity, + worktreePath, + worktreeGitDir, + branch, + branchRef, + baseRef, + baseBranch: request.baseBranch, + baseCommitOid: fetchedOid, + remote: "origin", + remoteUrl: remoteIdentity.url, + ownerRepo: remoteIdentity.ownerRepo, + }; + const bootstrapOwner: WorkflowBranchBootstrapOwnerRecord = { + workflowId: request.workflowId, + pid: process.pid, + processToken: await this.getProcessStartToken(process.pid).catch(() => null), + createdAt: new Date().toISOString(), + }; + await this.persistOwnership(identity, bootstrapOwner); + completedIdentity = identity; + } catch (error) { + const cleanupErrors: unknown[] = []; + if (attached !== undefined) { + try { await attached.cleanup(); } catch (cleanupError) { cleanupErrors.push(cleanupError); } + } + if (refsCreated && fetchedOidForCleanup !== undefined) { + const rollback = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { + stdin: [ + `delete ${branchRef} ${fetchedOidForCleanup}`, + `delete ${baseRef} ${fetchedOidForCleanup}`, + "", + ].join("\n"), + }); + if (!succeeded(rollback)) cleanupErrors.push(new RuntimeError("workflow ref rollback failed")); + } else if (refsCreated) { + cleanupErrors.push(new RuntimeError("workflow ref identity unavailable for safe rollback")); + } else if (fetchedCreated && fetchedOidForCleanup !== undefined) { + const rollback = await this.runGit(initial.canonical, [ + "update-ref", "-d", fetchedRef, fetchedOidForCleanup, + ]); + if (!succeeded(rollback)) cleanupErrors.push(new RuntimeError("fetched ref rollback failed")); + } else if (fetchedCreated) { + cleanupErrors.push(new RuntimeError("fetched ref identity unavailable for safe rollback")); + } + if (cleanupErrors.length > 0) { + operationError = new AggregateError( + [error, ...cleanupErrors], + "workflow branch creation and cleanup failed", + ); + } else { + operationError = error; + } + throw operationError; + } }); - if (!succeeded(transaction)) operationFailure("git create workflow refs", transaction); - fetchedCreated = false; - refsCreated = true; - - const worktreeManager = new WorktreeManager( - initial.canonical, - `workflow-${createHash("sha256").update(request.workflowId).digest("hex").slice(0, 32)}`, - { os: this.platformServices.os }, - { ...this.worktreeManagerDependencies, borrowedCheckoutLease: lock }, - ); - attached = await worktreeManager.createAttached(branch, fetchedOid); - const worktreePath = await realpath(attached.path); - const worktreeGitDirResult = await this.runGit(worktreePath, [ - "rev-parse", "--path-format=absolute", "--git-dir", - ]); - if (!succeeded(worktreeGitDirResult)) { - operationFailure("git resolve worktree administrative directory", worktreeGitDirResult); - } - const worktreeGitDir = await realpath(gitPathOutput( - worktreeGitDirResult.stdout, - "workflow worktree Git directory", - )); - const identity: WorkflowBranchIdentity = { - ownershipVersion: OWNERSHIP_VERSION, - workflowId: request.workflowId, - checkoutPath: initial.canonical, - gitCommonDir: initial.gitCommonDir, - repositoryIdentity: lock.repositoryIdentity, - worktreePath, - worktreeGitDir, - branch, - branchRef, - baseRef, - baseBranch: request.baseBranch, - baseCommitOid: fetchedOid, - remote: "origin", - remoteUrl: remoteIdentity.url, - ownerRepo: remoteIdentity.ownerRepo, - }; - const bootstrapOwner: WorkflowBranchBootstrapOwnerRecord = { - workflowId: request.workflowId, - pid: process.pid, - processToken: await this.getProcessStartToken(process.pid).catch(() => null), - createdAt: new Date().toISOString(), - }; - await this.persistOwnership(identity, bootstrapOwner); - completedIdentity = identity; } catch (error) { - const cleanupErrors: unknown[] = []; - if (attached !== undefined) { - try { await attached.cleanup(); } catch (cleanupError) { cleanupErrors.push(cleanupError); } - } - if (refsCreated && fetchedOidForCleanup !== undefined) { - const rollback = await this.runGit(initial.canonical, ["update-ref", "--stdin"], { - stdin: [ - `delete ${branchRef} ${fetchedOidForCleanup}`, - `delete ${baseRef} ${fetchedOidForCleanup}`, - "", - ].join("\n"), - }); - if (!succeeded(rollback)) cleanupErrors.push(new RuntimeError("workflow ref rollback failed")); - } else if (refsCreated) { - cleanupErrors.push(new RuntimeError("workflow ref identity unavailable for safe rollback")); - } else if (fetchedCreated && fetchedOidForCleanup !== undefined) { - const rollback = await this.runGit(initial.canonical, [ - "update-ref", "-d", fetchedRef, fetchedOidForCleanup, - ]); - if (!succeeded(rollback)) cleanupErrors.push(new RuntimeError("fetched ref rollback failed")); - } else if (fetchedCreated) { - cleanupErrors.push(new RuntimeError("fetched ref identity unavailable for safe rollback")); - } - if (cleanupErrors.length > 0) { - operationError = new AggregateError( - [error, ...cleanupErrors], - "workflow branch creation and cleanup failed", - ); - } else { - operationError = error; - } - } - try { - await lock.release(); - } catch (releaseError) { - if (completedIdentity === undefined) { - operationError = operationError === undefined - ? releaseError - : new AggregateError( - [operationError, releaseError], - "workflow branch creation failed and checkout lock release failed", - ); - } else { - // The branch was created, so the primary outcome stands — but the - // checkout lease may still be held, which blocks every later operation - // on this repository. Surface it rather than dropping it on the floor. + if (completedIdentity !== undefined) { logger.warn("checkout lock release failed after workflow branch creation", { event: "checkout-lock-release-failed", workflowId: completedIdentity.workflowId, - reason: redact(String(releaseError)), + reason: redact(String(error)), }); + } else { + if (error instanceof RuntimeError + && error.detail?.classification === "recovery-ambiguous") { + fail("recovery-ambiguous", error.message); + } + if (operationError !== undefined) { + throw error; + } + fail("checkout-locked"); } } - if (operationError !== undefined) throw operationError; + return completedIdentity!; } @@ -991,34 +978,33 @@ export class WorkflowBranchManager { identity: WorkflowBranchIdentity, expectedHead = identity.baseCommitOid, ): Promise { - let lock; + const safety = new PlatformSafety(this.platformServices as PlatformServices); try { - lock = await this.platformServices.acquireCheckoutLock(identity.checkoutPath); + return await safety.withCheckoutLease(identity.checkoutPath, async (lock) => { + if (lock.repositoryIdentity !== identity.repositoryIdentity) { + return { ok: false, classification: "repository-identity-changed" }; + } + try { + return await this.validateLocked(identity, expectedHead); + } catch { + return { ok: false, classification: "git-command-failed" }; + } + }, { + onReleaseError: (releaseError, result) => { + logger.warn("checkout lock release failed after workflow branch revalidation", { + event: "checkout-lock-release-failed", + workflowId: identity.workflowId, + reason: redact(String(releaseError)), + }); + return result; + }, + }); } catch { return { ok: false, classification: "repository-identity-changed" }; } - try { - if (lock.repositoryIdentity !== identity.repositoryIdentity) { - return { ok: false, classification: "repository-identity-changed" }; - } - try { - return await this.validateLocked(identity, expectedHead); - } catch { - return { ok: false, classification: "git-command-failed" }; - } - } finally { - try { - await lock.release(); - } catch (releaseError) { - logger.warn("checkout lock release failed after workflow branch revalidation", { - event: "checkout-lock-release-failed", - workflowId: identity.workflowId, - reason: redact(String(releaseError)), - }); - } - } } + async revalidateUnderLock( identity: WorkflowBranchIdentity, expectedHead: string, @@ -1214,32 +1200,28 @@ export class WorkflowBranchManager { || identity.baseRef !== `refs/claude-architect/autopilot/${identity.workflowId}/base`) { return { ok: false, classification: "cleanup-failed" }; } - let lock; - try { - lock = await this.platformServices.acquireCheckoutLock(identity.checkoutPath); - } catch { - return { ok: false, classification: "cleanup-failed" }; - } let result: BranchCleanupResult; + const safety = new PlatformSafety(this.platformServices as PlatformServices); try { - if (lock.repositoryIdentity !== identity.repositoryIdentity) { - result = { ok: false, classification: "cleanup-failed" }; - } else { - result = await this.cleanupLocked(identity, expectedHead, lock); - } - } catch { - result = { ok: false, classification: "cleanup-failed" }; - } - try { - await lock.release(); - } catch (releaseError) { - // Cleanup reports the observed cleanup state; lock-release reporting cannot change it. - logger.warn("checkout lock release failed after workflow branch cleanup", { - event: "checkout-lock-release-failed", - workflowId: identity.workflowId, - reason: redact(String(releaseError)), + result = await safety.withCheckoutLease(identity.checkoutPath, async (lock) => { + if (lock.repositoryIdentity !== identity.repositoryIdentity) { + return { ok: false, classification: "cleanup-failed" }; + } + return await this.cleanupLocked(identity, expectedHead, lock); + }, { + onReleaseError: (releaseError, res) => { + logger.warn("checkout lock release failed after workflow branch cleanup", { + event: "checkout-lock-release-failed", + workflowId: identity.workflowId, + reason: redact(String(releaseError)), + }); + return res; + }, }); + } catch { + return { ok: false, classification: "cleanup-failed" }; } return result; + } } diff --git a/src/autopilot/candidate-promoter.ts b/src/autopilot/candidate-promoter.ts index 30020ee..26f8f55 100644 --- a/src/autopilot/candidate-promoter.ts +++ b/src/autopilot/candidate-promoter.ts @@ -10,7 +10,7 @@ import { getPlatformServices } from "../platform/select-platform.js"; import type { PipelineResult } from "../pipeline/pipeline-runtime.js"; import type { CandidateArtifact } from "../protocol/attempt-result.js"; import { ArtifactStore } from "../runtime/artifact-store.js"; -import { guardWorktreeMutations } from "../runtime/worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import { redact } from "../runtime/redaction.js"; import { reviewSnapshotHash } from "../runtime/review-snapshot.js"; import { logger } from "../util/logger.js"; @@ -190,9 +190,8 @@ export class CandidatePromoter { constructor(dependencies: CandidatePromoterDependencies = {}) { this.runGit = dependencies.git ?? git; - this.platformServices = guardWorktreeMutations( - dependencies.platformServices ?? getPlatformServices(), - ); + this.platformServices = dependencies.platformServices ?? getPlatformServices(); + this.branchManager = dependencies.branchManager ?? new WorkflowBranchManager(); this.workflowStore = dependencies.workflowStore ?? (workflowId => new WorkflowStore(workflowId)); this.artifactStore = dependencies.artifactStore ?? (runId => new ArtifactStore(runId)); @@ -423,17 +422,15 @@ export class CandidatePromoter { return finishFailure("branch-identity-changed"); } - let lock; - try { - lock = await this.platformServices.acquireCheckoutLock(request.workflowCheckoutPath); - } catch { - return finishFailure("branch-identity-changed"); - } + const safety = new PlatformSafety(this.platformServices); + let enteredLease = false; let terminal: PromotionResult | undefined; try { - const completedOid = intent.completion === null - ? null - : completionCommit(intent.completion.completion); + await safety.withCheckoutLease(request.workflowCheckoutPath, async (lock) => { + enteredLease = true; + const completedOid = intent.completion === null + ? null + : completionCommit(intent.completion.completion); let lockedOutcome: LockedPromotionOutcome; try { lockedOutcome = await workflowStore.withLockedState(workflow.revision, async locked => { @@ -596,50 +593,50 @@ export class CandidatePromoter { }; } return { kind: "committed", commitOid, needsJournal: true }; - }); - } catch (error) { - const toolError = (error as { detail?: { toolError?: unknown } }).detail?.toolError; - if (toolError !== "workflow-revision-conflict") throw error; - lockedOutcome = { - kind: "rejected", classification: "human-decision-required", journalFailure: false, - }; - } - if (lockedOutcome.kind === "rejected") { - terminal = lockedOutcome.journalFailure - ? await finishFailure(lockedOutcome.classification) - : rejected(lockedOutcome.classification); - } else { - let journaled = !lockedOutcome.needsJournal; - if (!journaled) { - try { - await workflowStore.completeIntent({ - idempotencyKey, completion: { commitOid: lockedOutcome.commitOid }, - }); - journaled = true; - } catch { - journaled = false; - } - } - terminal = !journaled - ? rejected("journal-failed") - : await this.deleteAnchor(request.workflowCheckoutPath, artifact) - ? { status: "committed", commitOid: lockedOutcome.commitOid } - : rejected("anchor-deletion-failed"); - } - } finally { - try { - await lock.release(); - } catch (releaseError) { - if (terminal?.status === "committed") { - logger.warn("checkout lock release failed after candidate promotion", { - event: "checkout-lock-release-failed", - workflowId: request.workflowId, - reason: redact(String(releaseError)), }); + } catch (error) { + const toolError = (error as { detail?: { toolError?: unknown } }).detail?.toolError; + if (toolError !== "workflow-revision-conflict") throw error; + lockedOutcome = { + kind: "rejected", classification: "human-decision-required", journalFailure: false, + }; + } + + if (lockedOutcome.kind === "rejected") { + terminal = lockedOutcome.journalFailure + ? await finishFailure(lockedOutcome.classification) + : rejected(lockedOutcome.classification); } else { - terminal = rejected("lock-release-failed"); + let journaled = !lockedOutcome.needsJournal; + if (!journaled) { + try { + await workflowStore.completeIntent({ + idempotencyKey, completion: { commitOid: lockedOutcome.commitOid }, + }); + journaled = true; + } catch { + journaled = false; + } + } + terminal = !journaled + ? rejected("journal-failed") + : await this.deleteAnchor(request.workflowCheckoutPath, artifact) + ? { status: "committed", commitOid: lockedOutcome.commitOid } + : rejected("anchor-deletion-failed"); } + }); + } catch (error) { + if (terminal?.status === "committed") { + logger.warn("checkout lock release failed after candidate promotion", { + event: "checkout-lock-release-failed", + workflowId: request.workflowId, + reason: redact(String(error)), + }); + } else if (!enteredLease) { + return finishFailure("branch-identity-changed"); + } else { + throw error; } } return terminal!; diff --git a/src/autopilot/final-branch-reviewer.ts b/src/autopilot/final-branch-reviewer.ts index 459f4a1..fa9dbfb 100644 --- a/src/autopilot/final-branch-reviewer.ts +++ b/src/autopilot/final-branch-reviewer.ts @@ -11,7 +11,7 @@ import { git, type GitResult } from "../git/git-exec.js"; import { syncDirectoryMetadata } from "../platform/durable-directory.js"; import { globMatches } from "../util/glob.js"; import { WorktreeManager } from "../runtime/worktree-manager.js"; -import { guardWorktreeMutations } from "../runtime/worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import { assertNoPendingWorktreeRemovalForRepository } from "../runtime/worktree-removal-manifest.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; @@ -1007,9 +1007,8 @@ export class FinalBranchReviewer { structural: async args => await structuralVerifyFinalBranch(args, this.runGit), }); this.roleRunner = dependencies.roleRunner ?? runRole; - this.platformServices = guardWorktreeMutations( - dependencies.platformServices ?? getPlatformServices(), - ); + this.platformServices = dependencies.platformServices ?? getPlatformServices(); + this.producerRegistry = dependencies.producerRegistry ?? defaultRegistry; this.artifactStore = dependencies.artifactStore ?? (workflowId => new ArtifactStore(`final-${canonicalArtifactHash(workflowId).slice(0, 24)}`)); @@ -1132,37 +1131,18 @@ export class FinalBranchReviewer { phase: string, execute: (lease: CheckoutLock) => Promise, ): Promise { - const canonical = await this.platformServices.canonicalizePath(checkoutPath); - if (canonical.gitCommonDir === null) { - fail("workflow-state-mismatch", "final review checkout is not a repository"); - } - const lease = await this.platformServices.acquireCheckoutLock(canonical.canonical); - let primaryError: unknown; + const safety = new PlatformSafety(this.platformServices); try { - if (lease.repositoryIdentity !== canonical.gitCommonDir) { - fail("workflow-state-mismatch", "final review checkout lease repository identity mismatch"); - } - return await execute(lease); + return await safety.withCheckoutLease(checkoutPath, execute); } catch (error) { - primaryError = error; - throw error; - } finally { - try { - await lease.release(); - } catch (releaseError) { - if (primaryError === undefined) { - throw new Error( - `${phase} checkout lease release failed: ${errorDiagnostic(releaseError)}`, - ); - } - throw new AggregateError( - [primaryError, releaseError], - `${phase} failed and its checkout lease release also failed: ${errorDiagnostic(releaseError)}`, - ); + if (error instanceof Error && error.message === "checkout Git common directory could not be resolved") { + fail("workflow-state-mismatch", "final review checkout is not a repository"); } + throw error; } } + async runHeadBoundPhase( artifact: CumulativeBranchArtifact, phase: string, diff --git a/src/integrate/controlled-integrator.ts b/src/integrate/controlled-integrator.ts index 32c18bd..080ff05 100644 --- a/src/integrate/controlled-integrator.ts +++ b/src/integrate/controlled-integrator.ts @@ -1,8 +1,8 @@ import { git, type GitResult } from "../git/git-exec.js"; import { checkPreconditions } from "../git/repo-preconditions.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import { getPlatformServices } from "../platform/select-platform.js"; -import { guardWorktreeMutations } from "../runtime/worktree-mutation-gate.js"; import type { CandidateArtifact, ChangedPath } from "../protocol/attempt-result.js"; import { RuntimeError } from "../util/errors.js"; import { structuralVerify } from "../verify/structural-verifier.js"; @@ -167,24 +167,16 @@ export async function stageCandidateTreeUnderLock( } export async function applyCandidateTree(args: ApplyCandidateTreeArgs): Promise { - const ps = guardWorktreeMutations(args.platformServices ?? getPlatformServices()); - let ownedLock: CheckoutLock | null = null; - const lock = args.borrowedCheckoutLock ?? await ps.acquireCheckoutLock(args.repoRoot); - if (args.borrowedCheckoutLock === undefined) ownedLock = lock; - const terminal: { result: IntegrationResult | null } = { result: null }; - const finish = (result: IntegrationResult): IntegrationResult => { - terminal.result = result; - return result; - }; - try { + const safety = new PlatformSafety(args.platformServices); + const executeWithLock = async (lock: CheckoutLock, ownership: "borrowed" | "owned"): Promise => { const staged = await stageCandidateTreeWithLock({ repoRoot: args.repoRoot, artifact: args.artifact, expectedArtifactHash: args.expectedArtifactHash, borrowedCheckoutLock: lock, - platformServices: ps, - }, ownedLock === null ? "borrowed" : "owned"); - if (staged.result.integration !== "applied") return finish(staged.result); + ...(args.platformServices !== undefined ? { platformServices: args.platformServices } : {}), + }, ownership); + if (staged.result.integration !== "applied") return staged.result; const deleted = await git(staged.canonicalRepoRoot, [ "update-ref", @@ -194,20 +186,31 @@ export async function applyCandidateTree(args: ApplyCandidateTreeArgs): Promise< args.artifact.candidateCommitOid, ]); if (!succeeded(deleted)) { - return finish({ - integration: "applied", + return { + integration: "applied" as const, detail: "candidate tree applied; candidate anchor delete failed", - }); + }; } - return finish({ integration: "applied", detail: "candidate tree applied" }); - } finally { - if (ownedLock !== null) { - try { - await ownedLock.release(); - } catch (error) { - if (terminal.result === null) throw error; - terminal.result.detail = `${terminal.result.detail}; checkout lock release failed`; - } + return { integration: "applied" as const, detail: "candidate tree applied" }; + }; + + if (args.borrowedCheckoutLock !== undefined) { + return await executeWithLock(args.borrowedCheckoutLock, "borrowed"); + } + + let terminalResult: IntegrationResult | null = null; + try { + return await safety.withCheckoutLease(args.repoRoot, async (lock) => { + terminalResult = await executeWithLock(lock, "owned"); + return terminalResult; + }); + } catch (error) { + if (terminalResult !== null) { + (terminalResult as IntegrationResult).detail = `${(terminalResult as IntegrationResult).detail}; checkout lock release failed`; + return terminalResult; } + throw error; } } + + diff --git a/src/mcp/doctor.ts b/src/mcp/doctor.ts index f920e98..eb18059 100644 --- a/src/mcp/doctor.ts +++ b/src/mcp/doctor.ts @@ -34,9 +34,11 @@ import { redact, redactRecord } from "../runtime/redaction.js"; import { probeCowSupport } from "../verify/dependency-link.js"; import { checkLiveBundle, type LiveBundleStatus } from "./live-bundle.js"; +import { CHECKOUT_LOCK_NAME_PATTERN } from "../platform/lock-ownership.js"; + const POSIX_HOME_PATH = /\/(?:Users|home)\/[^/\\\s"']+(?:\/[^/\\\s"']+)*/g; const WINDOWS_HOME_PATH = /[A-Za-z]:\\Users\\[^/\\\s"']+(?:\\[^/\\\s"']+)*/gi; -const CHECKOUT_LOCK_NAME = /^([0-9a-f]{64})\.lock$/; +const CHECKOUT_LOCK_NAME = CHECKOUT_LOCK_NAME_PATTERN; const MAX_CHECKOUT_LOCK_BYTES = 4_096; const MAX_AUTOPILOT_OWNER_BYTES = 1_024; const MAX_AUTOPILOT_REGISTRATION_BYTES = 32_768; diff --git a/src/mcp/tools.ts b/src/mcp/tools.ts index 7eacee4..57c03f7 100644 --- a/src/mcp/tools.ts +++ b/src/mcp/tools.ts @@ -50,7 +50,7 @@ import { type ReviewSnapshot, } from "../runtime/review-snapshot.js"; import type { RunManifest } from "../runtime/run-manifest.js"; -import { guardWorktreeMutations } from "../runtime/worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import { redact } from "../runtime/redaction.js"; import { NestedDelegationError, RuntimeError } from "../util/errors.js"; import { logger } from "../util/logger.js"; @@ -223,7 +223,9 @@ class LifecycleLockReleaseError extends AggregateError { } function errorResult(error: unknown): ToolErrorResult { - const classified = error instanceof LifecycleLockReleaseError ? error.primaryError : error; + const classified = error instanceof AggregateError && error.errors.length > 0 + ? error.errors[0] + : error; const code = classified instanceof RuntimeError && typeof classified.detail?.toolError === "string" ? classified.detail.toolError : "runtime-error"; @@ -474,39 +476,35 @@ async function withCurrentArchivedRun( preserveResultOnReleaseFailure?: (result: T) => T, ): Promise { const ps = services(deps); - const lockingServices = guardWorktreeMutations(ps); + const safety = new PlatformSafety(ps); const canonical = await ps.canonicalizePath(checkoutPath); const callerKey = canonical.gitCommonDir ?? canonical.canonical; return withRepoLock(callerKey, async () => { - const lock = await lockingServices.acquireCheckoutLock(canonical.canonical, { runId }); - let action: { ok: true; result: T } | { ok: false; error: unknown }; + let actionResult: { ok: true; result: T } | null = null; try { - if (lock.repositoryIdentity !== callerKey) { - throw runtimeError( - "supplied checkout repository identity changed before checkout lease acquisition", - "run-checkout-mismatch", - ); - } - const run = await loadArchivedRun(runId, deps); - requireMatchingRepository(run, lock.repositoryIdentity); - action = { ok: true, result: await fn(run, lock, ps) }; + return await safety.withCheckoutLease(canonical.canonical, async (lock) => { + if (lock.repositoryIdentity !== callerKey) { + throw runtimeError( + "supplied checkout repository identity changed before checkout lease acquisition", + "run-checkout-mismatch", + ); + } + const run = await loadArchivedRun(runId, deps); + requireMatchingRepository(run, lock.repositoryIdentity); + const result = await fn(run, lock, ps); + actionResult = { ok: true, result }; + return result; + }, { runId }); } catch (error) { - action = { ok: false, error }; - } - try { - await lock.release(); - } catch (releaseError) { - if (!action.ok) throw new LifecycleLockReleaseError(action.error, releaseError); - if (preserveResultOnReleaseFailure !== undefined) { - return preserveResultOnReleaseFailure(action.result); + if (actionResult !== null && preserveResultOnReleaseFailure !== undefined) { + return preserveResultOnReleaseFailure((actionResult as { ok: true; result: T }).result); } - throw releaseError; + throw error; } - if (!action.ok) throw action.error; - return action.result; }); } + async function requireInactivePipeline(run: ArchivedRun, runId: string): Promise { if (await run.store.readPipelineActiveMarker(runId) !== null) { throw runtimeError( diff --git a/src/pipeline/pipeline-runtime.ts b/src/pipeline/pipeline-runtime.ts index 26cd052..adcd427 100644 --- a/src/pipeline/pipeline-runtime.ts +++ b/src/pipeline/pipeline-runtime.ts @@ -1,7 +1,7 @@ import path from "node:path"; import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; import { WorktreeManager } from "../runtime/worktree-manager.js"; -import { guardWorktreeMutations } from "../runtime/worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; import type { @@ -1263,17 +1263,15 @@ export async function runPipeline( spec: DelegationSpec, deps: PipelineDependencies, ): Promise { - const ps = guardWorktreeMutations(deps.ps ?? getPlatformServices()); + const ps = deps.ps ?? getPlatformServices(); const canonical = await ps.canonicalizePath(checkoutPath); - const lock = await ps.acquireCheckoutLock(canonical.canonical); - const guardedDependencies: PipelineDependencies = { - ...deps, - ps, - borrowedCheckoutLease: lock, - }; - let primaryError: unknown; - let hasPrimaryError = false; - try { + const safety = new PlatformSafety(ps); + return await safety.withCheckoutLease(canonical.canonical, async (lock) => { + const guardedDependencies: PipelineDependencies = { + ...deps, + ps, + borrowedCheckoutLease: lock, + }; const result = await runPipelineWithLease( checkoutPath, spec, @@ -1293,23 +1291,10 @@ export async function runPipeline( }, ); return result; - } catch (error) { - primaryError = error; - hasPrimaryError = true; - throw error; - } finally { - try { - await lock.release(); - } catch (releaseError) { - if (!hasPrimaryError) throw releaseError; - throw new AggregateError( - [primaryError, releaseError], - "pipeline failed and its checkout lease could not be released", - ); - } - } + }); } + // The packaged single-file runtime must retain every trusted pipeline stage, // including the separately invoked post-pipeline advisor entrypoint. Object.defineProperty(runPipeline, "advisorStage", { diff --git a/src/platform/durable-write.ts b/src/platform/durable-write.ts new file mode 100644 index 0000000..99e61ab --- /dev/null +++ b/src/platform/durable-write.ts @@ -0,0 +1,251 @@ +import { randomUUID } from "node:crypto"; +import { constants } from "node:fs"; +import { link, lstat, mkdir, open, readFile, rename, rm, type FileHandle } from "node:fs/promises"; +import path from "node:path"; +import nodeProcess from "node:process"; +import { RuntimeError } from "../util/errors.js"; +import { + ensurePrivateDirectory, + syncDirectoryMetadata, + type DirectoryIdentity, +} from "./durable-directory.js"; + +const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; +const SAFE_COMPONENT = /^[a-z0-9][a-z0-9._-]{0,127}$/i; + +export type DurableWriteMode = "immutable" | "replace"; + +export interface DurableDirectoryPolicy { + syncDirectory?: (directory: string) => Promise; + platform?: NodeJS.Platform; + win32RetryAttempts?: number; +} + +function isAlreadyPresent(error: unknown): boolean { + return typeof error === "object" && error !== null && "code" in error + && (error as { code?: unknown }).code === "EEXIST"; +} + +function sameIdentity( + left: { dev: bigint; ino: bigint; birthtimeNs: bigint }, + right: { dev: bigint; ino: bigint; birthtimeNs: bigint }, +): boolean { + if (left.dev !== right.dev || left.ino !== right.ino) return false; + if (left.birthtimeNs <= 0n || right.birthtimeNs <= 0n) return true; + return left.birthtimeNs === right.birthtimeNs; +} + +export class DurableDirectorySession { + readonly directory: string; + readonly identity: DirectoryIdentity; + private readonly policy: DurableDirectoryPolicy; + private handle?: FileHandle | undefined; + private closed = false; + + constructor( + directory: string, + identity: DirectoryIdentity, + policy: DurableDirectoryPolicy = {}, + handle?: FileHandle | undefined, + ) { + this.directory = directory; + this.identity = identity; + this.policy = policy; + this.handle = handle; + } + + async assertIdentity(): Promise { + if (this.closed) { + throw new RuntimeError("durable directory session is closed"); + } + const current = await lstat(this.directory, { bigint: true }); + if (!current.isDirectory() + || current.isSymbolicLink() + || !sameIdentity(current, this.identity)) { + throw new RuntimeError("durable directory session identity changed"); + } + } + + async sync(): Promise { + if (this.closed) { + throw new RuntimeError("durable directory session is closed"); + } + if (this.policy.syncDirectory !== undefined) { + await this.policy.syncDirectory(this.directory); + return; + } + if (this.handle !== undefined) { + try { + await this.handle.sync(); + return; + } catch { + // Fall back to syncDirectoryMetadata + } + } + await syncDirectoryMetadata(this.directory); + } + + async close(): Promise { + this.closed = true; + if (this.handle !== undefined) { + try { + await this.handle.close(); + } catch { + // Handle cleanup + } + this.handle = undefined; + } + } +} + +export interface OpenDurableDirectorySessionOptions { + description?: string; + create?: boolean; + policy?: DurableDirectoryPolicy; + privateDirectory?: boolean; +} + +export async function openDurableDirectorySession( + directory: string, + options: OpenDurableDirectorySessionOptions = {}, +): Promise { + let identity: DirectoryIdentity; + if (options.privateDirectory === true) { + identity = await ensurePrivateDirectory(directory, { + description: options.description ?? "durable directory", + create: options.create ?? false, + migratePermissions: true, + ...(options.policy?.syncDirectory === undefined ? {} : { syncDirectory: options.policy.syncDirectory }), + }); + } else { + if (options.create !== false) { + try { + await mkdir(directory, { recursive: true, mode: 0o700 }); + } catch (error) { + if (!isAlreadyPresent(error)) throw error; + } + } + const metadata = await lstat(directory, { bigint: true }); + if (!metadata.isDirectory() || metadata.isSymbolicLink()) { + throw new RuntimeError(`${options.description ?? "durable directory"} must be a plain directory`); + } + identity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + }; + } + + let handle: FileHandle | undefined; + if (options.policy?.platform !== "win32" && nodeProcess.platform !== "win32") { + try { + handle = await open(directory, constants.O_RDONLY | NO_FOLLOW); + } catch { + // Optional handle on POSIX + } + } + + return new DurableDirectorySession(directory, identity, options.policy, handle); +} + +async function renameWithRetry( + source: string, + destination: string, + platform: NodeJS.Platform = nodeProcess.platform, + maxAttempts = 50, +): Promise { + for (let attempt = 1; ; attempt += 1) { + try { + await rename(source, destination); + return; + } catch (error) { + const code = typeof error === "object" && error !== null && "code" in error + ? String((error as { code?: unknown }).code) + : undefined; + const isTransientWin32 = platform === "win32" + && (code === "EPERM" || code === "EACCES" || code === "EBUSY"); + if (isTransientWin32 && attempt < maxAttempts) { + await new Promise(resolve => setTimeout(resolve, 50)); + continue; + } + throw error; + } + } +} + +export async function writeAtomic( + session: DurableDirectorySession, + name: string, + bytes: Buffer | string, + mode: DurableWriteMode, +): Promise { + if (path.isAbsolute(name) + || path.basename(name) !== name + || !SAFE_COMPONENT.test(name)) { + throw new RuntimeError(`atomic write target must be a safe leaf name: ${name}`); + } + + const destination = path.join(session.directory, name); + const temporaryPath = path.join(session.directory, `.${name}.${randomUUID()}.tmp`); + let handle: FileHandle | undefined; + let temporaryCreated = false; + + try { + await session.assertIdentity(); + handle = await open( + temporaryPath, + constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, + 0o600, + ); + temporaryCreated = true; + await session.assertIdentity(); + + if (typeof bytes === "string") { + await handle.writeFile(bytes, { encoding: "utf8" }); + } else { + await handle.writeFile(bytes); + } + await handle.sync(); + await handle.close(); + handle = undefined; + + await session.assertIdentity(); + + if (mode === "immutable") { + try { + await link(temporaryPath, destination); + } catch (error) { + if (!isAlreadyPresent(error)) throw error; + await session.assertIdentity(); + const existing = await readFile(destination); + const expected = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : bytes; + if (!existing.equals(expected)) { + throw new RuntimeError(`archive entry already exists with different content: ${name}`); + } + } + await rm(temporaryPath, { force: true }); + temporaryCreated = false; + } else if (mode === "replace") { + await renameWithRetry(temporaryPath, destination); + temporaryCreated = false; + } + + await session.sync(); + await session.assertIdentity(); + } finally { + if (handle !== undefined) { + try { + await handle.close(); + } catch { + // Handle cleanup in finally + } + } + if (temporaryCreated) { + try { + await rm(temporaryPath, { force: true }); + } catch { + // Temp cleanup in finally + } + } + } +} diff --git a/src/platform/lock-owner.ts b/src/platform/lock-owner.ts index 0bc326e..f9bd798 100644 --- a/src/platform/lock-owner.ts +++ b/src/platform/lock-owner.ts @@ -1,48 +1,7 @@ -/** - * Shared classification of a lock file's recorded owner. - * - * Two independent callers ask about the same bytes: startup recovery, deciding - * whether a lock may be reclaimed, and lock acquisition, explaining to a human - * why it timed out. They must agree. A duplicated copy that drifts produces the - * worst possible outcome — acquisition reporting "a dead process left this, it - * will be reclaimed" while recovery preserves it forever — so the parser and - * the status rule live here and are imported by both. - */ +export { + type LockOwner, + type LockOwnerStatus, + parseLockOwner, + lockOwnerStatus, +} from "./lock-ownership.js"; -/** The identifying fields of a lock owner. Extra fields are diagnostic-only. */ -export interface LockOwner { - pid: number; - processToken: string; -} - -export type LockOwnerStatus = "dead" | "live" | "unverifiable"; - -/** - * Strict parse: anything short of a complete, verifiable owner record returns - * null, which callers treat as malformed and preserve rather than reclaim. A - * missing process token is not "probably fine" — without it a recycled pid is - * indistinguishable from the original owner. - */ -export function parseLockOwner(contents: string): LockOwner | null { - const trimmed = contents.trim(); - let value: unknown; - try { value = JSON.parse(trimmed); } - catch { return null; } - if (typeof value !== "object" || value === null) return null; - const owner = value as { pid?: unknown; processToken?: unknown }; - if (typeof owner.pid !== "number" || !Number.isSafeInteger(owner.pid) || owner.pid <= 1 - || typeof owner.processToken !== "string" || owner.processToken.length === 0) return null; - return { pid: owner.pid, processToken: owner.processToken }; -} - -export async function lockOwnerStatus( - owner: { pid: number; processToken: string | null } | null, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - if (owner === null || !isProcessAlive(owner.pid)) return "dead"; - if (owner.processToken === null) return "unverifiable"; - const currentToken = await getProcessStartToken(owner.pid); - if (currentToken === null) return "unverifiable"; - return currentToken === owner.processToken ? "live" : "dead"; -} diff --git a/src/platform/lock-ownership.ts b/src/platform/lock-ownership.ts new file mode 100644 index 0000000..2e40de7 --- /dev/null +++ b/src/platform/lock-ownership.ts @@ -0,0 +1,828 @@ +import { randomUUID } from "node:crypto"; +import { constants } from "node:fs"; +import { link, lstat, open, readdir, readFile, rm, type FileHandle } from "node:fs/promises"; +import path from "node:path"; +import nodeProcess from "node:process"; +import { resolveStateDir } from "../runtime/state-dir.js"; +import { RuntimeError } from "../util/errors.js"; +import { logger } from "../util/logger.js"; +import type { DirectoryIdentity } from "./durable-directory.js"; +import type { CheckoutLock, LockOwnerAnnotation } from "./platform-services.js"; + +const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; +const MAX_STATE_FILE_BYTES = 1_000_000; +const MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); + +export const CHECKOUT_LOCK_NAME_PATTERN = /^([0-9a-f]{64})\.lock$/; +export const LOCK_NAME = CHECKOUT_LOCK_NAME_PATTERN; + +const LOCK_RETRY_MS = 30; +const LOCK_TIMEOUT_MS = nodeProcess.platform === "win32" ? 15_000 : 2500; +const OWNER_PROBE_TIMEOUT_MS = 1000; +const SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]{0,127}$/; + +export interface LockOwner { + pid: number; + processToken: string; +} + +export interface LockRecord { + pid: number; + processToken: string | null; + acquiredAt: string; + runId?: string | undefined; +} + +export interface AcquiredLock { + lockPath: string; + identity: DirectoryIdentity; + contents: Buffer; +} + +export type LockOwnerStatus = "dead" | "live" | "unverifiable"; +export type DeadLockReclaimResult = "reclaimed" | "live" | "unverifiable" | "malformed" | "contended"; +export type ExpectedLockRemoval = "removed" | "absent" | "changed"; + +function isMissing(error: unknown): boolean { + return errorCode(error) === "ENOENT"; +} + + +function errorCode(error: unknown): string | undefined { + return typeof error === "object" && error !== null && "code" in error + ? String((error as { code?: unknown }).code) + : undefined; +} + +function delay(ms: number): Promise { + return new Promise(resolve => setTimeout(resolve, ms)); +} + +function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +function isPlainDirectory(metadata: { + isDirectory(): boolean; + isSymbolicLink(): boolean; +}): boolean { + return metadata.isDirectory() && !metadata.isSymbolicLink(); +} + +function sameIdentity( + left: { dev: bigint; ino: bigint; birthtimeNs: bigint }, + right: { dev: bigint; ino: bigint; birthtimeNs: bigint }, +): boolean { + return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; +} + +export async function plainDirectoryIdentity(directoryPath: string): Promise { + try { + const metadata = await lstat(directoryPath, { bigint: true }); + if (!isPlainDirectory(metadata) || metadata.birthtimeNs <= 0n) return null; + return { dev: metadata.dev, ino: metadata.ino, birthtimeNs: metadata.birthtimeNs }; + } catch (error) { + if (isMissing(error)) return null; + throw error; + } +} + +export function isCheckoutLockFileName(filename: string): boolean { + return CHECKOUT_LOCK_NAME_PATTERN.test(filename); +} + +export function lockKeyFromFileName(filename: string): string | null { + const match = CHECKOUT_LOCK_NAME_PATTERN.exec(filename); + return match?.[1] ?? null; +} + +export function lockFileName(key: string): string { + return `${key}.lock`; +} + +export function lockFilePath(key: string, stateDir = resolveStateDir()): string { + return path.join(stateDir, "locks", lockFileName(key)); +} + +export function formatLockRecord(record: LockRecord): string { + return JSON.stringify({ + pid: record.pid, + processToken: record.processToken, + acquiredAt: record.acquiredAt, + ...(record.runId === undefined ? {} : { runId: record.runId }), + }); +} + +export function parseLockRecord(contents: string): LockRecord | null { + const trimmed = contents.trim(); + let value: unknown; + try { + value = JSON.parse(trimmed); + } catch { + return null; + } + if (!isRecord(value)) return null; + if (typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 1) { + return null; + } + const processToken = typeof value.processToken === "string" && value.processToken.length > 0 + ? value.processToken + : null; + const acquiredAt = typeof value.acquiredAt === "string" ? value.acquiredAt : new Date(0).toISOString(); + const runId = typeof value.runId === "string" && SAFE_RUN_ID.test(value.runId) ? value.runId : undefined; + return { pid: value.pid, processToken, acquiredAt, runId }; +} + +export function parseLockOwner(contents: string): LockOwner | null { + const record = parseLockRecord(contents); + if (record === null || record.processToken === null) return null; + return { pid: record.pid, processToken: record.processToken }; +} + +export async function lockOwnerStatus( + owner: { pid: number; processToken: string | null } | null, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + if (owner === null || !isProcessAlive(owner.pid)) return "dead"; + if (owner.processToken === null) return "unverifiable"; + const currentToken = await getProcessStartToken(owner.pid); + if (currentToken === null) return "unverifiable"; + return currentToken === owner.processToken ? "live" : "dead"; +} + +async function readHandleBytes(handle: FileHandle, length: number): Promise { + const buffer = Buffer.alloc(length); + let bytesRead = 0; + while (bytesRead < length) { + const result = await handle.read(buffer, bytesRead, length - bytesRead, bytesRead); + if (result.bytesRead === 0) break; + bytesRead += result.bytesRead; + } + return bytesRead === length ? buffer : buffer.subarray(0, bytesRead); +} + +export async function removeLockIfUnchanged( + lockPath: string, + handle: FileHandle, + expectedIdentity: DirectoryIdentity, + expectedContents: Buffer, + expectedLinks = 1, +): Promise { + const beforeMetadata = await handle.stat({ bigint: true }); + if (!beforeMetadata.isFile() + || beforeMetadata.isSymbolicLink() + || !sameIdentity(beforeMetadata, expectedIdentity) + || beforeMetadata.nlink !== BigInt(expectedLinks) + || beforeMetadata.size !== BigInt(expectedContents.byteLength)) { + return false; + } + const currentBytes = await readHandleBytes(handle, expectedContents.byteLength); + if (!currentBytes.equals(expectedContents)) return false; + try { + await rm(lockPath, { force: true }); + } catch (error) { + if (isMissing(error)) return false; + throw error; + } + const afterMetadata = await handle.stat({ bigint: true }); + return afterMetadata.nlink === BigInt(expectedLinks - 1); +} + +export async function reclaimDeadLock( + lockPath: string, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + let handle: FileHandle; + try { + handle = await open(lockPath, constants.O_RDONLY | NO_FOLLOW); + } catch (error) { + if (isMissing(error)) return "contended"; + throw error; + } + try { + const metadata = await handle.stat({ bigint: true }); + if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT) { + throw new RuntimeError("recovery lock must be a bounded regular file"); + } + const contents = await readHandleBytes(handle, Number(metadata.size)); + if (BigInt(contents.byteLength) !== metadata.size) return "contended"; + const owner = parseLockOwner(contents.toString("utf8")); + if (owner === null) { + logger.warn("startup recovery preserved malformed lock", { + event: "recovery-malformed-lock", + lockName: path.basename(lockPath), + reason: "invalid-owner-record", + }); + return "malformed"; + } + const ownerStatus = await lockOwnerStatus(owner, isProcessAlive, getProcessStartToken); + if (ownerStatus === "live") return "live"; + if (ownerStatus === "unverifiable") { + logger.warn("startup recovery preserved unverifiable lock", { + event: "recovery-unverifiable-lock", + lockName: path.basename(lockPath), + reason: "process-token-unavailable", + }); + return "unverifiable"; + } + return await removeLockIfUnchanged( + lockPath, + handle, + { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + }, + contents, + ) ? "reclaimed" : "contended"; + } finally { + await handle.close(); + } +} + +export async function reclaimDeadCheckoutLocks( + locksRoot: string, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + let entries; + try { + entries = await readdir(locksRoot, { withFileTypes: true }); + } catch (error) { + if (isMissing(error)) return; + throw error; + } + for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { + if (!isCheckoutLockFileName(entry.name)) continue; + const lockPath = path.join(locksRoot, entry.name); + await reclaimDeadLock(lockPath, isProcessAlive, getProcessStartToken); + } +} + + +export const reclaimLocks = reclaimDeadCheckoutLocks; + + +export async function lockIsOwnedByLiveProcess( + locksRoot: string, + lockKey: string, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + let contents: string; + try { + contents = await readFile(path.join(locksRoot, lockFileName(lockKey)), "utf8"); + } catch (error) { + if (isMissing(error)) return false; + throw error; + } + const owner = parseLockOwner(contents); + if (owner === null) return true; // Malformed is preserved + return await lockOwnerStatus(owner, isProcessAlive, getProcessStartToken) !== "dead"; +} + +export function defaultIsProcessAlive(pid: number): boolean { + if (!Number.isSafeInteger(pid) || pid <= 1) return false; + try { + nodeProcess.kill(pid, 0); + return true; + } catch (error) { + if (errorCode(error) === "EPERM") return true; + if (errorCode(error) === "ESRCH") return false; + throw error; + } +} + +function heldFor(acquiredAt: unknown): string { + if (typeof acquiredAt !== "string") return ""; + const startedMs = Date.parse(acquiredAt); + if (!Number.isFinite(startedMs)) return ""; + const elapsedMs = Date.now() - startedMs; + if (elapsedMs < 0) return ""; + return `, held for ${Math.round(elapsedMs / 1000)}s`; +} + +function heldByRun(runId: unknown): string { + return typeof runId === "string" && SAFE_RUN_ID.test(runId) ? `, run ${runId}` : ""; +} + +function withTimeout(work: Promise, ms: number, fallback: T): Promise { + return new Promise(resolve => { + const timer = setTimeout(() => resolve(fallback), ms); + void work.then( + value => { clearTimeout(timer); resolve(value); }, + () => { clearTimeout(timer); resolve(fallback); }, + ); + }); +} + +export async function describeLockContention( + key: string, + getProcessStartToken: (pid: number) => Promise, +): Promise { + let contents: string; + try { + contents = await readFile(lockFilePath(key), "utf8"); + } catch { + return null; + } + + const owner = parseLockOwner(contents); + if (owner === null) { + return "its owner cannot be identified, and startup recovery preserves a lock " + + `it cannot parse, so remove it by hand: ${lockFilePath(key)}`; + } + + const annotations = parseLockRecord(contents); + const extras = annotations !== null + ? `${heldByRun(annotations.runId)}${heldFor(annotations.acquiredAt)}` + : ""; + + let status: LockOwnerStatus; + try { + status = await lockOwnerStatus( + owner, + defaultIsProcessAlive, + pid => withTimeout(getProcessStartToken(pid), OWNER_PROBE_TIMEOUT_MS, null), + ); + } catch { + return null; + } + + if (status === "dead") { + return `it was left behind by a process that exited (pid ${owner.pid}${extras}); ` + + "startup recovery reclaims it on the next server start"; + } + if (status === "unverifiable") { + return `it is held by pid ${owner.pid}${extras}, whose identity could not be ` + + "verified; startup recovery preserves it until that changes"; + } + const self = owner.pid === nodeProcess.pid ? " (this same process)" : ""; + return `it is held by live pid ${owner.pid}${self}${extras}`; +} + +export async function withLockContentionDetail( + error: unknown, + key: string, + getProcessStartToken: (pid: number) => Promise, +): Promise { + if (!(error instanceof RuntimeError)) return error; + let description: string | null; + try { + description = await describeLockContention(key, getProcessStartToken); + } catch { + return error; + } + if (description === null) return error; + return new RuntimeError(`${error.message} — ${description}`, { ...error.detail, key }); +} + +export async function acquireWxFileLock( + key: string, + timeoutMessage?: string, + ownerToken: string | null = null, + owner: LockOwnerAnnotation = {}, +): Promise> { + const targetLockPath = lockFilePath(key); + const locksDir = path.dirname(targetLockPath); + const { mkdir } = await import("node:fs/promises"); + await mkdir(locksDir, { recursive: true }); + const deadline = Date.now() + LOCK_TIMEOUT_MS; + for (;;) { + try { + const handle = await open(targetLockPath, "wx"); + const ownerPid = nodeProcess.pid; + const record: LockRecord = { + pid: ownerPid, + processToken: ownerToken, + acquiredAt: new Date().toISOString(), + ...(owner.runId === undefined ? {} : { runId: owner.runId }), + }; + try { + await handle.writeFile(formatLockRecord(record)); + } finally { + await handle.close(); + } + return { + key, + release: async () => { + let recordedOwner: LockRecord | null; + try { + recordedOwner = parseLockRecord(await readFile(targetLockPath, "utf8")); + } catch { + return; + } + if (recordedOwner === null + || recordedOwner.pid !== ownerPid + || recordedOwner.processToken !== ownerToken) { + return; + } + await rm(targetLockPath, { force: true }); + }, + }; + } catch (error) { + if (errorCode(error) !== "EEXIST") throw error; + if (Date.now() >= deadline) { + throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { key }); + } + await delay(LOCK_RETRY_MS); + } + } +} + +export async function validateLockParentIdentity( + parentPath: string, + expectedIdentity: DirectoryIdentity, +): Promise { + const metadata = await lstat(parentPath, { bigint: true }); + if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expectedIdentity)) { + throw new RuntimeError("recovery lock parent identity changed"); + } +} + +function isExpectedLockMetadata( + metadata: { + dev: bigint; + ino: bigint; + nlink: bigint; + size: bigint; + birthtimeNs: bigint; + isFile(): boolean; + isSymbolicLink(): boolean; + }, + expectedIdentity: DirectoryIdentity, + expectedSize: number, + expectedLinks: number, +): boolean { + return metadata.isFile() + && !metadata.isSymbolicLink() + && metadata.nlink === BigInt(expectedLinks) + && sameIdentity(metadata, expectedIdentity) + && metadata.size === BigInt(expectedSize) + && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; +} + +export async function validateOwnedLockState( + handle: FileHandle, + namedPaths: readonly string[], + expectedIdentity: DirectoryIdentity, + expectedContents: Buffer, + expectedLinks: number, + parentPath: string, + parentIdentity: DirectoryIdentity, +): Promise { + const validateHandle = async () => { + const metadata = await handle.stat({ bigint: true }); + if (!isExpectedLockMetadata( + metadata, + expectedIdentity, + expectedContents.byteLength, + expectedLinks, + ) || !(await readHandleBytes(handle, Number(metadata.size))).equals(expectedContents)) { + throw new RuntimeError("recovery lock handle or contents changed"); + } + }; + + await validateLockParentIdentity(parentPath, parentIdentity); + await validateHandle(); + for (const namedPath of namedPaths) { + const metadata = await lstat(namedPath, { bigint: true }); + if (!isExpectedLockMetadata( + metadata, + expectedIdentity, + expectedContents.byteLength, + expectedLinks, + )) throw new RuntimeError("recovery lock path changed"); + } + await validateHandle(); + await validateLockParentIdentity(parentPath, parentIdentity); +} + +export async function removeExpectedLockPath( + filename: string, + expectedIdentity: DirectoryIdentity, + expectedContents: Buffer, + expectedLinks: number, +): Promise { + let handle: FileHandle; + try { + handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); + } catch (error) { + if (isMissing(error)) return "absent"; + throw error; + } + let primaryError: unknown; + let removed = false; + try { + removed = await removeLockIfUnchanged( + filename, + handle, + expectedIdentity, + expectedContents, + expectedLinks, + ); + } catch (error) { + primaryError = error; + } + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== undefined) { + throw new AggregateError( + [primaryError, closeError], + "recovery lock cleanup failed and its handle could not be closed", + ); + } + throw closeError; + } + if (primaryError !== undefined) throw primaryError; + return removed ? "removed" : "changed"; +} + +export async function pathNamesLockIdentity( + filename: string, + expectedIdentity: DirectoryIdentity, +): Promise { + try { + const metadata = await lstat(filename, { bigint: true }); + return metadata.isFile() + && !metadata.isSymbolicLink() + && sameIdentity(metadata, expectedIdentity); + } catch (error) { + if (isMissing(error)) return false; + throw error; + } +} + +export async function validatePublishedLock( + lockPath: string, + expectedIdentity: DirectoryIdentity, + expectedContents: Buffer, + parentPath: string, + parentIdentity: DirectoryIdentity, + expectedLinks = 1, + namedPaths: readonly string[] = [lockPath], +): Promise { + const handle = await open(lockPath, constants.O_RDONLY | NO_FOLLOW); + let primaryError: unknown; + try { + await validateOwnedLockState( + handle, + namedPaths, + expectedIdentity, + expectedContents, + expectedLinks, + parentPath, + parentIdentity, + ); + } catch (error) { + primaryError = error; + } + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== undefined) { + throw new AggregateError( + [primaryError, closeError], + "published recovery lock validation failed and its handle could not be closed", + ); + } + throw closeError; + } + if (primaryError !== undefined) throw primaryError; +} + +function throwLockAcquisitionErrors(errors: unknown[]): never { + if (errors.length === 1) throw errors[0]!; + throw new AggregateError(errors, "recovery lock acquisition and safe cleanup failed"); +} + +export async function cleanupOwnedLockPaths( + parentPath: string, + parentIdentity: DirectoryIdentity, + temporaryPath: string, + lockPath: string, + expectedIdentity: DirectoryIdentity, + expectedContents: Buffer, + published: boolean, +): Promise { + const errors: unknown[] = []; + try { + await validateLockParentIdentity(parentPath, parentIdentity); + } catch (error) { + return [error]; + } + + if (published) { + try { + const temporaryExists = await pathNamesLockIdentity(temporaryPath, expectedIdentity); + const result = await removeExpectedLockPath( + lockPath, + expectedIdentity, + expectedContents, + temporaryExists ? 2 : 1, + ); + if (result === "changed") { + errors.push(new RuntimeError("published recovery lock changed before safe cleanup")); + } + } catch (error) { + errors.push(error); + } + } + try { + const result = await removeExpectedLockPath( + temporaryPath, + expectedIdentity, + expectedContents, + 1, + ); + if (result === "changed") { + errors.push(new RuntimeError("temporary recovery lock changed before safe cleanup")); + } + } catch (error) { + errors.push(error); + } + try { + await validateLockParentIdentity(parentPath, parentIdentity); + } catch (error) { + errors.push(error); + } + return errors; +} + +export async function createOwnedLock( + lockPath: string, + contents: Buffer, +): Promise { + if (contents.byteLength > MAX_STATE_FILE_BYTES) { + throw new RuntimeError("new recovery lock exceeds its size limit"); + } + const parentPath = path.dirname(lockPath); + const parentIdentity = await plainDirectoryIdentity(parentPath); + if (parentIdentity === null) { + throw new RuntimeError("recovery lock parent must remain a plain directory"); + } + const temporaryPath = path.join(parentPath, `.recovery-lock-${randomUUID()}.tmp`); + let handle: FileHandle | undefined; + let temporaryIdentity: DirectoryIdentity | undefined; + let temporaryCreated = false; + let published = false; + let contended = false; + const errors: unknown[] = []; + + try { + handle = await open( + temporaryPath, + constants.O_RDWR | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, + 0o600, + ); + temporaryCreated = true; + const metadata = await handle.stat({ bigint: true }); + temporaryIdentity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + }; + await handle.writeFile(contents); + await handle.sync(); + await validateOwnedLockState( + handle, + [temporaryPath], + temporaryIdentity, + contents, + 1, + parentPath, + parentIdentity, + ); + try { + await link(temporaryPath, lockPath); + published = true; + } catch (error) { + if (errorCode(error) === "EEXIST") contended = true; + else throw error; + } + if (published) { + await validateOwnedLockState( + handle, + [temporaryPath, lockPath], + temporaryIdentity, + contents, + 2, + parentPath, + parentIdentity, + ); + } + } catch (error) { + errors.push(error); + } + if (handle !== undefined) { + try { + await handle.close(); + } catch (error) { + errors.push(error); + } + } + + if (temporaryCreated && temporaryIdentity === undefined) { + errors.push(new RuntimeError("temporary recovery lock identity is unavailable for cleanup")); + } + if (temporaryIdentity === undefined) throwLockAcquisitionErrors(errors); + + if (contended) { + errors.push(...await cleanupOwnedLockPaths( + parentPath, + parentIdentity, + temporaryPath, + lockPath, + temporaryIdentity, + contents, + false, + )); + if (errors.length === 0) return null; + throwLockAcquisitionErrors(errors); + } + + if (!published) { + if (temporaryCreated) { + errors.push(...await cleanupOwnedLockPaths( + parentPath, + parentIdentity, + temporaryPath, + lockPath, + temporaryIdentity, + contents, + false, + )); + } + throwLockAcquisitionErrors(errors); + } + + if (errors.length === 0) { + try { + await validateLockParentIdentity(parentPath, parentIdentity); + const result = await removeExpectedLockPath( + temporaryPath, + temporaryIdentity, + contents, + 2, + ); + if (result === "changed") { + throw new RuntimeError("temporary recovery lock changed before unlink"); + } + await validatePublishedLock( + lockPath, + temporaryIdentity, + contents, + parentPath, + parentIdentity, + ); + } catch (error) { + errors.push(error); + } + } + + if (errors.length === 0) { + return { lockPath, identity: temporaryIdentity, contents }; + } + errors.push(...await cleanupOwnedLockPaths( + parentPath, + parentIdentity, + temporaryPath, + lockPath, + temporaryIdentity, + contents, + true, + )); + throwLockAcquisitionErrors(errors); +} + +export async function acquireOwnedLock( + lockPath: string, + contents: Buffer, + isProcessAlive: (pid: number) => boolean = defaultIsProcessAlive, + getProcessStartToken: (pid: number) => Promise = async () => null, +): Promise { + const created = await createOwnedLock(lockPath, contents); + if (created !== null) return created; + if (await reclaimDeadLock(lockPath, isProcessAlive, getProcessStartToken) !== "reclaimed") { + return null; + } + return createOwnedLock(lockPath, contents); +} + +export async function releaseOwnedLock(lock: AcquiredLock): Promise { + let handle: FileHandle; + try { + handle = await open(lock.lockPath, constants.O_RDONLY | NO_FOLLOW); + } catch (error) { + if (isMissing(error)) return; + throw error; + } + try { + await removeLockIfUnchanged(lock.lockPath, handle, lock.identity, lock.contents); + } finally { + await handle.close(); + } +} diff --git a/src/platform/platform-safety.ts b/src/platform/platform-safety.ts new file mode 100644 index 0000000..d01dec8 --- /dev/null +++ b/src/platform/platform-safety.ts @@ -0,0 +1,123 @@ +import { RuntimeError } from "../util/errors.js"; +import { assertNoPendingWorktreeRemovalForRepository } from "../runtime/worktree-removal-manifest.js"; +import type { CheckoutLock, PlatformServices } from "./platform-services.js"; +import { getPlatformServices } from "./select-platform.js"; +import { + writeAtomic, + DurableDirectorySession, + openDurableDirectorySession, + type DurableWriteMode, + type DurableDirectoryPolicy, +} from "./durable-write.js"; + +export { + DurableDirectorySession, + openDurableDirectorySession, + type DurableWriteMode, + type DurableDirectoryPolicy, +}; + +export interface CheckoutLeaseOptions { + runId?: string | undefined; + onReleaseError?: ((releaseError: unknown, result: T) => T) | undefined; +} + +export type PlatformSafetyServices = Pick & Partial>; + +export class PlatformSafety { + constructor(private readonly platformServices: PlatformSafetyServices = getPlatformServices()) {} + + async withCheckoutLease( + checkout: string, + fn: (lease: CheckoutLock) => Promise, + options?: CheckoutLeaseOptions, + ): Promise { + const lease = await this.platformServices.acquireCheckoutLock(checkout, { + ...(options?.runId === undefined ? {} : { runId: options.runId }), + }); + + let primaryError: unknown; + let result: T | undefined; + let completed = false; + try { + // 1. Ambiguity gate under the acquired lease + await this.assertAmbiguityGate(lease.repositoryIdentity); + + // 2. Execute caller logic under the lease + result = await fn(lease); + completed = true; + return result; + } catch (error) { + primaryError = error; + throw error; + } finally { + try { + await lease.release(); + } catch (releaseError) { + if (completed && options?.onReleaseError !== undefined) { + result = options.onReleaseError(releaseError, result as T); + } else if (primaryError !== undefined) { + const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); + throw new AggregateError( + [primaryError, releaseError], + `${primaryMessage}; checkout lock release failed`, + ); + } else { + throw releaseError; + } + } + } + } + + async withRecoveryLease( + checkout: string, + fn: (lease: CheckoutLock) => Promise, + options?: CheckoutLeaseOptions, + ): Promise { + const lease = await this.platformServices.acquireCheckoutLock(checkout, { + ...(options?.runId === undefined ? {} : { runId: options.runId }), + }); + + let primaryError: unknown; + try { + return await fn(lease); + } catch (error) { + primaryError = error; + throw error; + } finally { + try { + await lease.release(); + } catch (releaseError) { + if (primaryError !== undefined) { + throw new AggregateError( + [primaryError, releaseError], + "recovery lease release failed after operation failure", + ); + } + throw releaseError; + } + } + } + + async writeAtomic( + session: DurableDirectorySession, + name: string, + bytes: Buffer | string, + mode: DurableWriteMode, + ): Promise { + return writeAtomic(session, name, bytes, mode); + } + + private async assertAmbiguityGate(repositoryIdentity: string): Promise { + try { + await assertNoPendingWorktreeRemovalForRepository(repositoryIdentity); + } catch (error) { + throw new RuntimeError( + "worktree mutation is unavailable while removal recovery remains ambiguous", + { classification: "recovery-ambiguous", cause: error }, + ); + } + } +} + +export const platformSafety = new PlatformSafety(); diff --git a/src/platform/posix-platform-services.ts b/src/platform/posix-platform-services.ts index e7746a9..32c45d8 100644 --- a/src/platform/posix-platform-services.ts +++ b/src/platform/posix-platform-services.ts @@ -9,22 +9,23 @@ import { BoundedBuffer } from "../util/bounded-buffer.js"; import { gitPathOutput } from "../git/git-output.js"; import { RuntimeError } from "../util/errors.js"; import { logger } from "../util/logger.js"; -import { lockOwnerStatus, parseLockOwner, type LockOwnerStatus } from "./lock-owner.js"; import type { CanonicalPath, CheckoutLock, ExecutableRequest, FileLock, LockOwnerAnnotation, PlatformServices, ResolvedExecutable, SpawnRequest, SupervisedExit, SupervisedProcess, } from "./platform-services.js"; - -const LOCK_RETRY_MS = 30; -// Windows process spawns and identity-bound removals are an order of magnitude -// slower than POSIX, so a live contender legitimately holds the checkout lock -// far longer there. 2.5s on Windows CI turned designed serialization (parallel -// cleanups, concurrent branch creation) into spurious checkout-locked failures. -const LOCK_TIMEOUT_MS = nodeProcess.platform === "win32" ? 15_000 : 2500; -// The owner probe shells out to `ps` on darwin. Bound it: a diagnostic must -// never turn a lock timeout that was about to return into an indefinite hang. -const OWNER_PROBE_TIMEOUT_MS = 1000; -const SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]{0,127}$/; +import { + lockFilePath, + acquireWxFileLock, + describeLockContention, + withLockContentionDetail, +} from "./lock-ownership.js"; + +export { + lockFilePath, + acquireWxFileLock, + describeLockContention, + withLockContentionDetail, +}; // Fixed 64-hex key for the state-dir-scoped cleanup-journal mutex. sha256 so it // matches the recovery lock-name pattern and is reclaimed like any dead lock, and @@ -37,165 +38,7 @@ function errorCode(error: unknown): string | undefined { ? String(error.code) : undefined; } -function delay(ms: number): Promise { - return new Promise(resolve => setTimeout(resolve, ms)); -} - -export function lockFilePath(key: string): string { - return path.join(resolveStateDir(), "locks", `${key}.lock`); -} - -export async function acquireWxFileLock( - key: string, - timeoutMessage?: string, - ownerToken: string | null = null, - owner: LockOwnerAnnotation = {}, -): Promise> { - const lockPath = lockFilePath(key); - await fs.mkdir(path.dirname(lockPath), { recursive: true }); - const deadline = Date.now() + LOCK_TIMEOUT_MS; - for (;;) { - try { - const handle = await fs.open(lockPath, "wx"); - const ownerPid = nodeProcess.pid; - // pid and processToken are load-bearing: startup recovery reclaims a lock - // only when they prove the owner is gone. The remaining fields are read - // by nothing but contention diagnostics and must never gate reclamation. - const record = { - pid: ownerPid, - processToken: ownerToken, - acquiredAt: new Date().toISOString(), - ...(owner.runId === undefined ? {} : { runId: owner.runId }), - }; - try { await handle.writeFile(JSON.stringify(record)); } - finally { await handle.close(); } - return { - key, - release: async () => { - let recordedOwner: unknown; - try { recordedOwner = JSON.parse(await fs.readFile(lockPath, "utf8")); } - catch { return; } - if (!isRecord(recordedOwner) - || recordedOwner.pid !== ownerPid - || recordedOwner.processToken !== ownerToken) return; - await fs.rm(lockPath, { force: true }); - }, - }; - } catch (error) { - if (errorCode(error) !== "EEXIST") throw error; - if (Date.now() >= deadline) { - throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { key }); - } - await delay(LOCK_RETRY_MS); - } - } -} - -function isRecord(value: unknown): value is Record { - return typeof value === "object" && value !== null && !Array.isArray(value); -} - -function processIsAlive(pid: number): boolean { - try { nodeProcess.kill(pid, 0); return true; } - // EPERM means the pid exists but belongs to another user: alive, not absent. - catch (error) { return errorCode(error) === "EPERM"; } -} -function heldFor(acquiredAt: unknown): string { - if (typeof acquiredAt !== "string") return ""; - const startedMs = Date.parse(acquiredAt); - if (!Number.isFinite(startedMs)) return ""; - const elapsedMs = Date.now() - startedMs; - if (elapsedMs < 0) return ""; - return `, held for ${Math.round(elapsedMs / 1000)}s`; -} - -function heldByRun(runId: unknown): string { - return typeof runId === "string" && SAFE_RUN_ID.test(runId) ? `, run ${runId}` : ""; -} - -/** - * Explains a lock-acquisition timeout in terms of what the holder actually is. - * - * "checkout is locked" alone cannot be acted on: a live sibling session clears - * on its own, a leaked file clears at the next server start, and a lock whose - * record recovery refuses to parse clears only when a human deletes it. The - * three demand different responses and used to be indistinguishable. - * - * Strictly best-effort. Every failure path returns null and leaves the original - * error untouched, because a diagnostic that can fail an operation harder than - * no diagnostic at all is worse than none. The owner's process token is used to - * derive a status and is never reported. - */ -export async function describeLockContention( - key: string, - getProcessStartToken: (pid: number) => Promise, -): Promise { - let contents: string; - try { contents = await fs.readFile(lockFilePath(key), "utf8"); } - catch { return null; } - - const owner = parseLockOwner(contents); - if (owner === null) { - return "its owner cannot be identified, and startup recovery preserves a lock " - + `it cannot parse, so remove it by hand: ${lockFilePath(key)}`; - } - - const annotations: unknown = (() => { - try { return JSON.parse(contents.trim()); } - catch { return {}; } - })(); - const extras = isRecord(annotations) - ? `${heldByRun(annotations.runId)}${heldFor(annotations.acquiredAt)}` - : ""; - - let status: LockOwnerStatus; - try { - status = await lockOwnerStatus( - owner, - processIsAlive, - pid => withTimeout(getProcessStartToken(pid), OWNER_PROBE_TIMEOUT_MS, null), - ); - } catch { return null; } - - if (status === "dead") { - return `it was left behind by a process that exited (pid ${owner.pid}${extras}); ` - + "startup recovery reclaims it on the next server start"; - } - if (status === "unverifiable") { - return `it is held by pid ${owner.pid}${extras}, whose identity could not be ` - + "verified; startup recovery preserves it until that changes"; - } - const self = owner.pid === nodeProcess.pid ? " (this same process)" : ""; - return `it is held by live pid ${owner.pid}${self}${extras}`; -} - -function withTimeout(work: Promise, ms: number, fallback: T): Promise { - return new Promise(resolve => { - const timer = setTimeout(() => resolve(fallback), ms); - void work.then( - value => { clearTimeout(timer); resolve(value); }, - () => { clearTimeout(timer); resolve(fallback); }, - ); - }); -} - -/** - * Wraps a checkout-lock timeout with holder detail. Enrichment failures are - * swallowed so the caller still sees the original, accurate timeout. - */ -export async function withLockContentionDetail( - error: unknown, - key: string, - getProcessStartToken: (pid: number) => Promise, -): Promise { - if (!(error instanceof RuntimeError)) return error; - let description: string | null; - try { description = await describeLockContention(key, getProcessStartToken); } - catch { return error; } - if (description === null) return error; - return new RuntimeError(`${error.message} — ${description}`, { ...error.detail, key }); -} async function gitCommonDir(cwd: string): Promise { // Intentional bootstrap exception until Task 8 provides the shared argv-based Git helper. diff --git a/src/producers/capability-probe.ts b/src/producers/capability-probe.ts index 5594ea4..e94ccff 100644 --- a/src/producers/capability-probe.ts +++ b/src/producers/capability-probe.ts @@ -13,5 +13,5 @@ export async function probeAll( producerRegistry: ProducerRegistry = registry, options?: ProbeOptions, ): Promise { - return producerRuntime.probeAll(ctx, options, producerRegistry); + return producerRuntime.probeAll(ctx, { fresh: true, ...options }, producerRegistry); } diff --git a/src/runtime/artifact-store.ts b/src/runtime/artifact-store.ts index af48e23..d3a6ac6 100644 --- a/src/runtime/artifact-store.ts +++ b/src/runtime/artifact-store.ts @@ -49,7 +49,7 @@ import { } from "./run-manifest.js"; import { resolveStateDir } from "./state-dir.js"; import { getPlatformServices } from "../platform/select-platform.js"; -import { guardWorktreeMutations } from "./worktree-mutation-gate.js"; +import { PlatformSafety, platformSafety, openDurableDirectorySession } from "../platform/platform-safety.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; import { advisorReportHash, @@ -802,45 +802,11 @@ export class ArtifactStore { private async writeArchiveFile(relativePath: string, text: string): Promise { const directory = await this.ensureArchiveDirectory(relativePath); - const directoryIdentity = await ensurePlainDirectory(directory); - const destination = path.join(directory, path.basename(relativePath)); - const temporaryPath = path.join(directory, `.${path.basename(destination)}.${randomUUID()}.tmp`); - let handle; - let temporaryCreated = false; + const session = await openDurableDirectorySession(directory); try { - await assertDirectoryIdentity(directory, directoryIdentity); - handle = await open( - temporaryPath, - constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, - 0o600, - ); - temporaryCreated = true; - await assertDirectoryIdentity(directory, directoryIdentity); - await handle.writeFile(text, { encoding: "utf8" }); - await handle.sync(); - await handle.close(); - handle = undefined; - - try { - await assertDirectoryIdentity(directory, directoryIdentity); - await link(temporaryPath, destination); - await assertDirectoryIdentity(directory, directoryIdentity); - } catch (error) { - if (!isAlreadyPresent(error)) throw error; - await assertDirectoryIdentity(directory, directoryIdentity); - const existing = await readRegularFile(destination, directoryIdentity); - if (existing !== text) { - throw new RuntimeError(`archive entry already exists with different content: ${relativePath}`); - } - } + await platformSafety.writeAtomic(session, path.basename(relativePath), text, "immutable"); } finally { - await handle?.close(); - if (temporaryCreated) { - await assertDirectoryIdentity(directory, directoryIdentity); - await rm(temporaryPath, { force: true }); - await syncDirectory(directory); - await assertDirectoryIdentity(directory, directoryIdentity); - } + await session.close(); } } @@ -858,35 +824,16 @@ export class ArtifactStore { } const directory = await this.ensureRunDirectory(false); if (directory === null) throw new RuntimeError("run archive does not exist"); - const directoryIdentity = await ensurePlainDirectory(directory); - const destination = path.join(directory, relativePath); - const temporaryPath = path.join(directory, `.${relativePath}.${randomUUID()}.tmp`); - const serialized = `${serializeJson(value, 2)}\n`; - let handle; - let temporaryCreated = false; + const session = await openDurableDirectorySession(directory); try { - await assertDirectoryIdentity(directory, directoryIdentity); - handle = await open( - temporaryPath, - constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, - 0o600, - ); - temporaryCreated = true; - await handle.writeFile(serialized, { encoding: "utf8" }); - await handle.sync(); - await handle.close(); - handle = undefined; - await assertDirectoryIdentity(directory, directoryIdentity); - await rename(temporaryPath, destination); - temporaryCreated = false; - await syncDirectory(directory); - await assertDirectoryIdentity(directory, directoryIdentity); + const serialized = `${serializeJson(value, 2)}\n`; + await platformSafety.writeAtomic(session, relativePath, serialized, "replace"); } finally { - await handle?.close(); - if (temporaryCreated) await rm(temporaryPath, { force: true }); + await session.close(); } } + async writeRunStatus(status: RunStatus): Promise { if (status.runId !== this.runId) { throw new RuntimeError("run status id does not match artifact store"); @@ -1784,23 +1731,12 @@ export class ArtifactStore { // Serialize archive removal against the checkout lifecycle: hold the // repository's checkout lease so recovery/integration cannot race a // prune that is deleting the same candidate anchors. - const platformServices = guardWorktreeMutations( - dependencies.platformServices ?? getPlatformServices(), - ); + const platformServices = dependencies.platformServices ?? getPlatformServices(); let canonical; try { canonical = await platformServices.canonicalizePath(initialManifest.repoRoot); } catch (error) { if (errorCode(error) !== "ENOENT") throw error; - // The repository this run was delegated from is gone. Its candidate/backup - // refs died with it and no live checkout can integrate from a vanished - // repository, so reclaim the archive directly — no lease, no Git — instead of - // retaining the run forever and blocking maxBytes/maxAge convergence. Any other - // canonicalization failure stays fail-closed (retained) via the outer catch. - // Tradeoff: a transiently-unmounted volume also reads as ENOENT, so a run on it - // may be reclaimed early. This is bounded — only maxAge/maxBytes-eligible runs - // reach here, and no Git runs, so the repository's refs survive a remount — and - // preferable to retaining unreclaimable runs forever. await this.reclaimRepoAbsentArchive( entry, reason, quarantineName, quarantinePath, initialManifest.repoRoot, ); @@ -1808,81 +1744,89 @@ export class ArtifactStore { retainedBytes -= entry.bytes; return; } - const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; - lease = await platformServices.acquireCheckoutLock( - canonical.canonical, { runId: entry.runId }, - ); - if (lease.repositoryIdentity !== repositoryIdentity) { - throw new RuntimeError("checkout lease repository identity changed before pruning"); - } - await assertDirectoryIdentity(entry.directory, entry.identity); - // Re-establish authority under the lease: the manifest, terminal - // result, and active marker may all have changed while we waited. - const currentManifest = await this.readManifest(entry.runId); - if (currentManifest === null - || serializeJson(currentManifest) !== serializeJson(initialManifest)) { - retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); - return; - } - if (await this.readPipelineActiveMarker(entry.runId) !== null) { - retained.push({ runId: entry.runId, reason: "active-run" }); - return; - } - const result = await this.readResult(entry.runId); - if (result === null) { - retained.push({ runId: entry.runId, reason: "incomplete-run" }); - return; - } - if (serializeJson(result) !== serializeJson(initialResult)) { - retained.push({ runId: entry.runId, reason: "terminal authority changed while waiting" }); - return; - } - prepared = await this.prepareCandidateAnchorCleanup( - entry.runId, - result, - currentManifest, - canonical.canonical, - ); - await this.appendCleanupRecord({ - event: "prune-cleanup-intent", - runId: entry.runId, - reason, - anchorCleanup: "pending", - archiveBytes: entry.bytes, - quarantineName, - repoRoot: prepared.repoRoot, - anchorRef: prepared.anchorRef, - backupRef: prepared.backupRef, - candidateCommitOid: prepared.candidateCommitOid, - recordedAt: new Date().toISOString(), - }); - transaction = await this.beginCandidateAnchorCleanup(prepared, entry.runId); - runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - await assertDirectoryIdentity(entry.directory, entry.identity); - await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); - await rename(entry.directory, quarantinePath); - await syncDirectory(this.runsRoot); - await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); - await assertDirectoryIdentity(quarantinePath, entry.identity); - archiveRemovalCommitted = true; - await rm(quarantinePath, { recursive: true, force: false }); - await syncDirectory(this.runsRoot); - await transaction.commit(); - await this.appendCleanupRecord({ - event: "prune-cleanup-complete", + const safety = new PlatformSafety(platformServices); + await safety.withCheckoutLease(canonical.canonical, async (acquiredLease) => { + lease = acquiredLease; + await assertDirectoryIdentity(entry.directory, entry.identity); + // Re-establish authority under the lease: the manifest, terminal + // result, and active marker may all have changed while we waited. + const currentManifest = await this.readManifest(entry.runId); + if (currentManifest === null + || serializeJson(currentManifest) !== serializeJson(initialManifest)) { + retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); + return; + } + if (await this.readPipelineActiveMarker(entry.runId) !== null) { + retained.push({ runId: entry.runId, reason: "active-run" }); + return; + } + const result = await this.readResult(entry.runId); + if (result === null) { + retained.push({ runId: entry.runId, reason: "incomplete-run" }); + return; + } + if (serializeJson(result) !== serializeJson(initialResult)) { + retained.push({ runId: entry.runId, reason: "terminal authority changed while waiting" }); + return; + } + prepared = await this.prepareCandidateAnchorCleanup( + entry.runId, + result, + currentManifest, + canonical.canonical, + ); + await this.appendCleanupRecord({ + event: "prune-cleanup-intent", + runId: entry.runId, + reason, + anchorCleanup: "pending", + archiveBytes: entry.bytes, + quarantineName, + repoRoot: prepared.repoRoot, + anchorRef: prepared.anchorRef, + backupRef: prepared.backupRef, + candidateCommitOid: prepared.candidateCommitOid, + recordedAt: new Date().toISOString(), + }); + transaction = await this.beginCandidateAnchorCleanup(prepared, entry.runId); + runsRootIdentity = await ensurePlainDirectory(this.runsRoot); + await assertDirectoryIdentity(entry.directory, entry.identity); + await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); + await rename(entry.directory, quarantinePath); + await syncDirectory(this.runsRoot); + await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); + await assertDirectoryIdentity(quarantinePath, entry.identity); + archiveRemovalCommitted = true; + await rm(quarantinePath, { recursive: true, force: false }); + await syncDirectory(this.runsRoot); + await transaction.commit(); + await this.appendCleanupRecord({ + event: "prune-cleanup-complete", + runId: entry.runId, + reason, + anchorCleanup: transaction.outcome, + archiveBytes: entry.bytes, + quarantineName, + repoRoot: prepared.repoRoot, + anchorRef: prepared.anchorRef, + backupRef: prepared.backupRef, + candidateCommitOid: prepared.candidateCommitOid, + recordedAt: new Date().toISOString(), + }); + removed.add(entry.runId); + retainedBytes -= entry.bytes; + }, { runId: entry.runId, - reason, - anchorCleanup: transaction.outcome, - archiveBytes: entry.bytes, - quarantineName, - repoRoot: prepared.repoRoot, - anchorRef: prepared.anchorRef, - backupRef: prepared.backupRef, - candidateCommitOid: prepared.candidateCommitOid, - recordedAt: new Date().toISOString(), + onReleaseError: (releaseError) => { + const reason = redact(releaseError instanceof Error ? releaseError.message : String(releaseError)); + retained.push({ + runId: entry.runId, + reason: archiveRemovalCommitted + ? `archive removed; checkout lease release failed: ${reason}` + : reason, + }); + }, }); - removed.add(entry.runId); - retainedBytes -= entry.bytes; } catch (error) { let rollbackError: unknown; if (!archiveRemovalCommitted) { @@ -1905,19 +1849,19 @@ export class ArtifactStore { } else { throw new RuntimeError("archive run directory disappeared during rollback"); } - await transaction?.rollback(); + await (transaction as any)?.rollback(); if (prepared !== null) { await this.appendCleanupRecord({ event: "prune-cleanup-rollback", runId: entry.runId, reason, - anchorCleanup: prepared.outcome, + anchorCleanup: (prepared as any).outcome, archiveBytes: entry.bytes, quarantineName, - repoRoot: prepared.repoRoot, - anchorRef: prepared.anchorRef, - backupRef: prepared.backupRef, - candidateCommitOid: prepared.candidateCommitOid, + repoRoot: (prepared as any).repoRoot, + anchorRef: (prepared as any).anchorRef, + backupRef: (prepared as any).backupRef, + candidateCommitOid: (prepared as any).candidateCommitOid, recordedAt: new Date().toISOString(), }); } @@ -1928,6 +1872,7 @@ export class ArtifactStore { removed.add(entry.runId); retainedBytes -= entry.bytes; } + const primary = error instanceof Error ? error.message : String(error); const rollback = rollbackError instanceof Error ? `; rollback failed: ${rollbackError.message}` @@ -1938,22 +1883,6 @@ export class ArtifactStore { reason: redact(`${primary}${rollback}`), }); } - } finally { - if (lease !== null) { - try { - await lease.release(); - } catch (error) { - // A release failure must never be swallowed. Surface it, and make - // clear whether the archive was already removed under the lease. - const reason = redact(error instanceof Error ? error.message : String(error)); - retained.push({ - runId: entry.runId, - reason: archiveRemovalCommitted - ? `archive removed; checkout lease release failed: ${reason}` - : reason, - }); - } - } } }; diff --git a/src/runtime/attempt-runtime.ts b/src/runtime/attempt-runtime.ts index b7c9001..7b5593f 100644 --- a/src/runtime/attempt-runtime.ts +++ b/src/runtime/attempt-runtime.ts @@ -4,7 +4,7 @@ import { freezeCandidate } from "../git/candidate-tree.js"; import { git } from "../git/git-exec.js"; import { checkPreconditions } from "../git/repo-preconditions.js"; import { WorktreeManager } from "./worktree-manager.js"; -import { guardWorktreeMutations } from "./worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import type { CheckoutLock, PlatformServices, @@ -363,7 +363,8 @@ export async function runAttempt( ): Promise { if (hasEnvironmentMarker(deps.env ?? process.env)) throw new NestedDelegationError(); - const ps = guardWorktreeMutations(deps.ps ?? getPlatformServices()); + const ps = deps.ps ?? getPlatformServices(); + const safety = new PlatformSafety(ps); const producerRegistry = deps.producerRegistry ?? registry; const now = deps.now ?? Date.now; const startedAtMs = now(); @@ -422,20 +423,15 @@ export async function runAttempt( }; const canonical = await ps.canonicalizePath(checkoutPath); const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; - let lock: CheckoutLock | null = deps.borrowedCheckoutLease ?? null; - let ownedLock: CheckoutLock | null = null; - let worktree: { path: string; cleanup(): Promise } | null = null; - let tempHome: string | null = null; - let builtEnvironment: BuiltEnvironment | null = null; - let primaryError: unknown; - let archivedResult: AttemptResult | null = null; - try { - if (lock === null) { - ownedLock = await ps.acquireCheckoutLock(canonical.canonical, { runId }); - lock = ownedLock; - } + const runWithLease = async (lock: CheckoutLock, ownership: "borrowed" | "owned"): Promise => { + let worktree: { path: string; cleanup(): Promise } | null = null; + let tempHome: string | null = null; + let builtEnvironment: BuiltEnvironment | null = null; + let primaryError: unknown; + let archivedResult: AttemptResult | null = null; + try { + if (lock.repositoryIdentity !== repositoryIdentity) { - const ownership = ownedLock === null ? "borrowed" : "owned"; throw new RuntimeError(`${ownership} checkout lease repository identity mismatch`); } const preconditions = await checkPreconditions(canonical.canonical, { @@ -531,12 +527,12 @@ export async function runAttempt( } await reportPhase(deps, "probing producers"); - const reports = await probeAll({ + const reports = await runtime.probeAll({ ps, os: ps.os, arch: process.arch, environmentType: detectEnvironmentType(), - }, producerRegistry); + }, undefined, producerRegistry); const routing = route(spec.producerPreferences, reports); if (routing.producerId === null) { const signals: FailureSignals = routing.reason === "authentication-required" @@ -852,7 +848,7 @@ export async function runAttempt( builtEnvironment, worktree, tempHome, - lock: ownedLock, + lock: null, }); if (cleanupError !== null) { const detail = redact( @@ -884,4 +880,15 @@ export async function runAttempt( } } } +}; + + + + if (deps.borrowedCheckoutLease !== undefined && deps.borrowedCheckoutLease !== null) { + return await runWithLease(deps.borrowedCheckoutLease, "borrowed"); + } + return await safety.withCheckoutLease(canonical.canonical, async (acquiredLock) => { + return await runWithLease(acquiredLock, "owned"); + }, { runId }); } + diff --git a/src/runtime/recovery-manager.ts b/src/runtime/recovery-manager.ts index 3530e9b..bd9c4c2 100644 --- a/src/runtime/recovery-manager.ts +++ b/src/runtime/recovery-manager.ts @@ -43,7 +43,27 @@ import { WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY, type ManagedWorktreeDirectoryIdentity, } from "./worktree-manager.js"; -import { lockOwnerStatus, parseLockOwner, type LockOwnerStatus } from "../platform/lock-owner.js"; +import { + lockOwnerStatus, + parseLockOwner, + type LockOwnerStatus, + type LockOwner, + type AcquiredLock, + type DeadLockReclaimResult, + reclaimDeadLock, + reclaimDeadCheckoutLocks, + reclaimLocks, + lockIsOwnedByLiveProcess, + validateOwnedLockState, + validatePublishedLock, + removeExpectedLockPath, + cleanupOwnedLockPaths, + createOwnedLock, + acquireOwnedLock, + releaseOwnedLock, + defaultIsProcessAlive, +} from "../platform/lock-ownership.js"; +import { platformSafety } from "../platform/platform-safety.js"; import type { PlatformServices } from "../platform/platform-services.js"; import { CLEANUP_JOURNAL_LOCK_KEY } from "../platform/posix-platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; @@ -77,7 +97,6 @@ const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; const MAX_STATE_FILE_BYTES = 8_000_000; const MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); const SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]*$/; -const LOCK_NAME = /^([0-9a-f]{64})\.lock$/; const WORKFLOW_WORKTREE_NAME = /^workflow-([0-9a-f]{32})(?:-final)?$/; const LEGACY_FINAL_WORKTREE_NAME = /^final-([0-9a-f]{24})$/; const WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; @@ -178,23 +197,6 @@ export interface WorktreeSweepIssue { repositoryIdentity?: string; } -interface LockOwner { - pid: number; - processToken: string; -} - -interface AcquiredLock { - lockPath: string; - identity: DirectoryIdentity; - contents: Buffer; -} - -type DeadLockReclaimResult = - | "reclaimed" - | "live" - | "contended" - | "malformed" - | "unverifiable"; function errorCode(error: unknown): string | undefined { return (error as NodeJS.ErrnoException).code; @@ -1444,9 +1446,7 @@ async function replayInterruptedPrunes( commonResult.stdout, "cleanup repository identity", )); - const lease = await ps.acquireCheckoutLock(repoRoot); - let primaryError: unknown; - try { + await platformSafety.withRecoveryLease(repoRoot, async (lease) => { if (lease.repositoryIdentity !== repositoryIdentity) { throw new RuntimeError("checkout lease repository identity changed during prune recovery"); } @@ -1471,25 +1471,11 @@ async function replayInterruptedPrunes( anchorCleanup: outcome, recordedAt: new Date().toISOString(), }); - } catch (error) { - primaryError = error; - } finally { - try { - await lease.release(); - } catch (releaseError) { - if (primaryError !== undefined) { - throw new AggregateError( - [primaryError, releaseError], - "prune recovery failed and its checkout lease could not be released", - ); - } - throw releaseError; - } - } - if (primaryError !== undefined) throw primaryError; + }); } } + async function managedWorktreeMarkerIsPresent(worktreePath: string): Promise { let marker; try { @@ -1708,573 +1694,6 @@ async function readHandleBytes( return contents.subarray(0, offset); } -async function removeLockIfUnchanged( - lockPath: string, - handle: Awaited>, - expectedIdentity: DirectoryIdentity, - expectedContents: Buffer, - expectedLinks = 1, -): Promise { - const expectedSize = expectedContents.byteLength; - const handleMetadata = await handle.stat({ bigint: true }); - if (!isExpectedLockMetadata( - handleMetadata, - expectedIdentity, - expectedSize, - expectedLinks, - )) return false; - const currentContents = await readHandleBytes(handle, Number(handleMetadata.size)); - if (!currentContents.equals(expectedContents)) return false; - - let pathMetadata; - try { - pathMetadata = await lstat(lockPath, { bigint: true }); - } catch (error) { - if (isMissing(error)) return false; - throw error; - } - if (!isExpectedLockMetadata( - pathMetadata, - expectedIdentity, - expectedSize, - expectedLinks, - )) return false; - - const settledHandleMetadata = await handle.stat({ bigint: true }); - if (!isExpectedLockMetadata( - settledHandleMetadata, - expectedIdentity, - expectedSize, - expectedLinks, - )) return false; - const settledContents = await readHandleBytes(handle, Number(settledHandleMetadata.size)); - if (!settledContents.equals(expectedContents)) return false; - - let settledPathMetadata; - try { - settledPathMetadata = await lstat(lockPath, { bigint: true }); - } catch (error) { - if (isMissing(error)) return false; - throw error; - } - if (!isExpectedLockMetadata( - settledPathMetadata, - expectedIdentity, - expectedSize, - expectedLinks, - )) return false; - try { - await rm(lockPath, { force: false }); - return true; - } catch (error) { - if (isMissing(error)) return false; - throw error; - } -} - -async function reclaimDeadLock( - lockPath: string, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - let handle; - try { - handle = await open(lockPath, constants.O_RDONLY | NO_FOLLOW); - } catch (error) { - if (isMissing(error)) return "contended"; - throw error; - } - try { - const metadata = await handle.stat({ bigint: true }); - if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT) { - throw new RuntimeError("recovery lock must be a bounded regular file"); - } - const contents = await readHandleBytes(handle, Number(metadata.size)); - if (BigInt(contents.byteLength) !== metadata.size) return "contended"; - const owner = parseLockOwner(contents.toString("utf8")); - if (owner === null) { - logger.warn("startup recovery preserved malformed lock", { - event: "recovery-malformed-lock", - lockName: path.basename(lockPath), - reason: "invalid-owner-record", - }); - return "malformed"; - } - const ownerStatus = await lockOwnerStatus( - owner, - isProcessAlive, - getProcessStartToken, - ); - if (ownerStatus === "live") return "live"; - if (ownerStatus === "unverifiable") { - logger.warn("startup recovery preserved unverifiable lock", { - event: "recovery-unverifiable-lock", - lockName: path.basename(lockPath), - reason: "process-token-unavailable", - }); - return "unverifiable"; - } - return await removeLockIfUnchanged( - lockPath, - handle, - { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs, - }, - contents, - ) ? "reclaimed" : "contended"; - } finally { - await handle.close(); - } -} - -async function validateLockParentIdentity( - parentPath: string, - expectedIdentity: DirectoryIdentity, -): Promise { - const metadata = await lstat(parentPath, { bigint: true }); - if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expectedIdentity)) { - throw new RuntimeError("recovery lock parent identity changed"); - } -} - -function isExpectedLockMetadata( - metadata: { - dev: bigint; - ino: bigint; - nlink: bigint; - size: bigint; - birthtimeNs: bigint; - isFile(): boolean; - isSymbolicLink(): boolean; - }, - expectedIdentity: DirectoryIdentity, - expectedSize: number, - expectedLinks: number, -): boolean { - return metadata.isFile() - && !metadata.isSymbolicLink() - && metadata.nlink === BigInt(expectedLinks) - && sameIdentity(metadata, expectedIdentity) - && metadata.size === BigInt(expectedSize) - && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; -} - -async function validateOwnedLockState( - handle: Awaited>, - namedPaths: readonly string[], - expectedIdentity: DirectoryIdentity, - expectedContents: Buffer, - expectedLinks: number, - parentPath: string, - parentIdentity: DirectoryIdentity, -): Promise { - const validateHandle = async () => { - const metadata = await handle.stat({ bigint: true }); - if (!isExpectedLockMetadata( - metadata, - expectedIdentity, - expectedContents.byteLength, - expectedLinks, - ) || !(await readHandleBytes(handle, Number(metadata.size))).equals(expectedContents)) { - throw new RuntimeError("recovery lock handle or contents changed"); - } - }; - - await validateLockParentIdentity(parentPath, parentIdentity); - await validateHandle(); - for (const namedPath of namedPaths) { - const metadata = await lstat(namedPath, { bigint: true }); - if (!isExpectedLockMetadata( - metadata, - expectedIdentity, - expectedContents.byteLength, - expectedLinks, - )) throw new RuntimeError("recovery lock path changed"); - } - await validateHandle(); - await validateLockParentIdentity(parentPath, parentIdentity); -} - -type ExpectedLockRemoval = "removed" | "absent" | "changed"; - -async function removeExpectedLockPath( - filename: string, - expectedIdentity: DirectoryIdentity, - expectedContents: Buffer, - expectedLinks: number, -): Promise { - let handle; - try { - handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); - } catch (error) { - if (isMissing(error)) return "absent"; - throw error; - } - let primaryError: unknown; - let removed = false; - try { - removed = await removeLockIfUnchanged( - filename, - handle, - expectedIdentity, - expectedContents, - expectedLinks, - ); - } catch (error) { - primaryError = error; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== undefined) { - throw new AggregateError( - [primaryError, closeError], - "recovery lock cleanup failed and its handle could not be closed", - ); - } - throw closeError; - } - if (primaryError !== undefined) throw primaryError; - return removed ? "removed" : "changed"; -} - -async function pathNamesLockIdentity( - filename: string, - expectedIdentity: DirectoryIdentity, -): Promise { - try { - const metadata = await lstat(filename, { bigint: true }); - return metadata.isFile() - && !metadata.isSymbolicLink() - && sameIdentity(metadata, expectedIdentity); - } catch (error) { - if (isMissing(error)) return false; - throw error; - } -} - -async function validatePublishedLock( - lockPath: string, - expectedIdentity: DirectoryIdentity, - expectedContents: Buffer, - parentPath: string, - parentIdentity: DirectoryIdentity, - expectedLinks = 1, - namedPaths: readonly string[] = [lockPath], -): Promise { - const handle = await open(lockPath, constants.O_RDONLY | NO_FOLLOW); - let primaryError: unknown; - try { - await validateOwnedLockState( - handle, - namedPaths, - expectedIdentity, - expectedContents, - expectedLinks, - parentPath, - parentIdentity, - ); - } catch (error) { - primaryError = error; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== undefined) { - throw new AggregateError( - [primaryError, closeError], - "published recovery lock validation failed and its handle could not be closed", - ); - } - throw closeError; - } - if (primaryError !== undefined) throw primaryError; -} - -function throwLockAcquisitionErrors(errors: unknown[]): never { - if (errors.length === 1) throw errors[0]!; - throw new AggregateError(errors, "recovery lock acquisition and safe cleanup failed"); -} - -async function cleanupOwnedLockPaths( - parentPath: string, - parentIdentity: DirectoryIdentity, - temporaryPath: string, - lockPath: string, - expectedIdentity: DirectoryIdentity, - expectedContents: Buffer, - published: boolean, -): Promise { - const errors: unknown[] = []; - try { - await validateLockParentIdentity(parentPath, parentIdentity); - } catch (error) { - return [error]; - } - - if (published) { - try { - const temporaryExists = await pathNamesLockIdentity(temporaryPath, expectedIdentity); - const result = await removeExpectedLockPath( - lockPath, - expectedIdentity, - expectedContents, - temporaryExists ? 2 : 1, - ); - if (result === "changed") { - errors.push(new RuntimeError("published recovery lock changed before safe cleanup")); - } - } catch (error) { - errors.push(error); - } - } - try { - const result = await removeExpectedLockPath( - temporaryPath, - expectedIdentity, - expectedContents, - 1, - ); - if (result === "changed") { - errors.push(new RuntimeError("temporary recovery lock changed before safe cleanup")); - } - } catch (error) { - errors.push(error); - } - try { - await validateLockParentIdentity(parentPath, parentIdentity); - } catch (error) { - errors.push(error); - } - return errors; -} - -async function createOwnedLock( - lockPath: string, - contents: Buffer, -): Promise { - if (contents.byteLength > MAX_STATE_FILE_BYTES) { - throw new RuntimeError("new recovery lock exceeds its size limit"); - } - const parentPath = path.dirname(lockPath); - const parentIdentity = await plainDirectoryIdentity(parentPath); - if (parentIdentity === null) { - throw new RuntimeError("recovery lock parent must remain a plain directory"); - } - const temporaryPath = path.join(parentPath, `.recovery-lock-${randomUUID()}.tmp`); - let handle; - let temporaryIdentity: DirectoryIdentity | undefined; - let temporaryCreated = false; - let published = false; - let contended = false; - const errors: unknown[] = []; - - try { - handle = await open( - temporaryPath, - constants.O_RDWR | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, - 0o600, - ); - temporaryCreated = true; - const metadata = await handle.stat({ bigint: true }); - temporaryIdentity = { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs, - }; - await handle.writeFile(contents); - await handle.sync(); - await validateOwnedLockState( - handle, - [temporaryPath], - temporaryIdentity, - contents, - 1, - parentPath, - parentIdentity, - ); - try { - await link(temporaryPath, lockPath); - published = true; - } catch (error) { - if (errorCode(error) === "EEXIST") contended = true; - else throw error; - } - if (published) { - await validateOwnedLockState( - handle, - [temporaryPath, lockPath], - temporaryIdentity, - contents, - 2, - parentPath, - parentIdentity, - ); - } - } catch (error) { - errors.push(error); - } - if (handle !== undefined) { - try { - await handle.close(); - } catch (error) { - errors.push(error); - } - } - - if (temporaryCreated && temporaryIdentity === undefined) { - errors.push(new RuntimeError("temporary recovery lock identity is unavailable for cleanup")); - } - if (temporaryIdentity === undefined) throwLockAcquisitionErrors(errors); - - if (contended) { - errors.push(...await cleanupOwnedLockPaths( - parentPath, - parentIdentity, - temporaryPath, - lockPath, - temporaryIdentity, - contents, - false, - )); - if (errors.length === 0) return null; - throwLockAcquisitionErrors(errors); - } - - if (!published) { - if (temporaryCreated) { - errors.push(...await cleanupOwnedLockPaths( - parentPath, - parentIdentity, - temporaryPath, - lockPath, - temporaryIdentity, - contents, - false, - )); - } - throwLockAcquisitionErrors(errors); - } - - if (errors.length === 0) { - try { - await validateLockParentIdentity(parentPath, parentIdentity); - const result = await removeExpectedLockPath( - temporaryPath, - temporaryIdentity, - contents, - 2, - ); - if (result === "changed") { - throw new RuntimeError("temporary recovery lock changed before unlink"); - } - await validatePublishedLock( - lockPath, - temporaryIdentity, - contents, - parentPath, - parentIdentity, - ); - } catch (error) { - errors.push(error); - } - } - - if (errors.length === 0) { - return { lockPath, identity: temporaryIdentity, contents }; - } - errors.push(...await cleanupOwnedLockPaths( - parentPath, - parentIdentity, - temporaryPath, - lockPath, - temporaryIdentity, - contents, - true, - )); - throwLockAcquisitionErrors(errors); -} - -async function acquireOwnedLock( - lockPath: string, - contents: Buffer, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - const created = await createOwnedLock(lockPath, contents); - if (created !== null) return created; - if (await reclaimDeadLock(lockPath, isProcessAlive, getProcessStartToken) !== "reclaimed") { - return null; - } - return createOwnedLock(lockPath, contents); -} - -async function releaseOwnedLock(lock: AcquiredLock): Promise { - let handle; - try { - handle = await open(lock.lockPath, constants.O_RDONLY | NO_FOLLOW); - } catch (error) { - if (isMissing(error)) return; - throw error; - } - try { - await removeLockIfUnchanged(lock.lockPath, handle, lock.identity, lock.contents); - } finally { - await handle.close(); - } -} - -function defaultIsProcessAlive(pid: number): boolean { - if (!Number.isSafeInteger(pid) || pid <= 1) return false; - try { - nodeProcess.kill(pid, 0); - return true; - } catch (error) { - if (errorCode(error) === "EPERM") return true; - if (errorCode(error) === "ESRCH") return false; - throw error; - } -} - -async function reclaimLocks( - locksRoot: string, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - let entries; - try { - const rootIdentity = await plainDirectoryIdentity(locksRoot); - if (rootIdentity === null) return; - entries = await readdir(locksRoot, { withFileTypes: true }); - } catch (error) { - if (isMissing(error)) return; - throw error; - } - for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const match = LOCK_NAME.exec(entry.name); - if (match === null) continue; - const lockPath = path.join(locksRoot, entry.name); - if (!entry.isFile() || entry.isSymbolicLink()) { - throw new RuntimeError("checkout lock must be a regular file during recovery"); - } - await reclaimDeadLock(lockPath, isProcessAlive, getProcessStartToken); - } -} - -async function lockIsOwnedByLiveProcess( - locksRoot: string, - lockKey: string, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - const contents = await readBoundedRegularFile(path.join(locksRoot, `${lockKey}.lock`)); - if (contents === null) return false; - const owner = parseLockOwner(contents); - if (owner === null) return true; - return await lockOwnerStatus(owner, isProcessAlive, getProcessStartToken) !== "dead"; -} async function assertRegistrationBacklink( registrationPath: string, @@ -2442,9 +1861,7 @@ async function recoverWorktreeCreationIntent( throw new RuntimeError("worktree creation intent repository identity changed"); } - const lease = await platformServices.acquireCheckoutLock(commonDir); - let primaryError: unknown; - try { + await platformSafety.withRecoveryLease(commonDir, async (lease) => { if (!platformPathsEqual(lease.repositoryIdentity, commonDir)) { throw new RuntimeError("worktree creation recovery lease identity mismatch"); } @@ -2561,29 +1978,16 @@ async function recoverWorktreeCreationIntent( } await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - } catch (error) { - primaryError = error; - throw error; - } finally { - try { - await lease.release(); - } catch (releaseError) { - if (primaryError === undefined) throw releaseError; - throw new AggregateError( - [primaryError, releaseError], - "worktree creation recovery failed and its checkout lease could not be released", - ); - } - } + }); } + export async function recoverPendingWorktreeRemovals( platformServices: PlatformServices = getPlatformServices(), syncDirectory: (directory: string) => Promise = syncDirectoryMetadata, ): Promise { const { pending, issues } = await readPendingWorktreeRemovalManifests(); for (const { manifestPath, manifest, temporaryPath, temporaryKind } of pending) { - let lease: Awaited> | null = null; let recoveryError: unknown; let repositoryIdentity: string | undefined; try { @@ -2923,10 +2327,11 @@ export async function recoverPendingWorktreeRemovals( birthtimeNs: BigInt(manifest.physicalBirthtimeNs), } : null; - lease = await platformServices.acquireCheckoutLock(commonDir); - if (lease.repositoryIdentity !== commonDir) { - throw new RuntimeError("worktree removal recovery lease identity mismatch"); - } + await platformSafety.withRecoveryLease(commonDir, async (lease) => { + if (lease.repositoryIdentity !== commonDir) { + throw new RuntimeError("worktree removal recovery lease identity mismatch"); + } + if (temporaryPath !== undefined && temporaryKind === "linked") { await settleLinkedWorktreeRemovalManifest( manifestPath, @@ -2938,7 +2343,7 @@ export async function recoverPendingWorktreeRemovals( manifestPath, manifest.transactionId, ); - if (lockedManifest === null) continue; + if (lockedManifest === null) return; if (JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { throw new RuntimeError("worktree removal manifest changed before recovery lease"); } @@ -3120,22 +2525,12 @@ export async function recoverPendingWorktreeRemovals( await syncRemovalRoots(); await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); } - } catch (error) { - recoveryError = error; - } finally { - if (lease !== null) { - try { - await lease.release(); - } catch (releaseError) { - recoveryError = recoveryError === undefined - ? releaseError - : new AggregateError( - [recoveryError, releaseError], - "worktree removal recovery failed and its checkout lease could not be released", - ); - } - } - } + }); + } catch (error) { + recoveryError = error; + } + + if (recoveryError !== undefined) { issues.push({ manifestPath, diff --git a/src/runtime/run-status.ts b/src/runtime/run-status.ts index ead4e2b..33e4291 100644 --- a/src/runtime/run-status.ts +++ b/src/runtime/run-status.ts @@ -79,3 +79,44 @@ export async function transitionRunStatusSafely( warnStatusFailure(runId, phase, error); } } + +export class StatusEmitter { + private lastPhase: RunStatusPhase | null = null; + private pendingEphemeral: string | null = null; + + constructor( + private readonly store: RunStatusTransitionStore, + private readonly runId: string, + private readonly onProgress?: ((text: string) => void) | undefined, + ) {} + + get currentPhase(): RunStatusPhase | null { + return this.lastPhase; + } + + /** + * Emits a DURABLE lifecycle transition. + * Persisted immediately and awaited before the phase begins (lesson d07d031). + * Durable write count per phase transition is exactly one. + */ + async transition( + phase: RunStatusPhase, + fields: Partial> = {}, + ): Promise { + this.lastPhase = phase; + this.pendingEphemeral = null; + await transitionRunStatusSafely(this.store, this.runId, phase, fields); + } + + /** + * Emits EPHEMERAL progress (text, counters, detail within the current phase). + * Coalesced and dispatched to progress listeners without blocking on disk. + */ + async ephemeral(detail: string): Promise { + this.pendingEphemeral = detail; + this.onProgress?.(detail); + } +} diff --git a/src/runtime/worktree-manager.ts b/src/runtime/worktree-manager.ts index 6d0e27c..3b036d9 100644 --- a/src/runtime/worktree-manager.ts +++ b/src/runtime/worktree-manager.ts @@ -8,7 +8,7 @@ import { verifyBoundDirectoryCleanupSupport, } from "../platform/bound-directory-cleanup.js"; import { getPlatformServices } from "../platform/select-platform.js"; -import { guardWorktreeMutations } from "./worktree-mutation-gate.js"; +import { PlatformSafety } from "../platform/platform-safety.js"; import { boundedRedactedDiagnostic } from "./redaction.js"; import { resolveStateDir } from "./state-dir.js"; import { @@ -1231,46 +1231,23 @@ export class WorktreeManager { private async withCheckoutLease(operation: (lease: CheckoutLock) => Promise): Promise { const platformServices = this.lockingPlatformServices(); - const canonical = await platformServices.canonicalizePath(this.repoRoot); - const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; const borrowed = this.dependencies.borrowedCheckoutLease; - let owned: CheckoutLock | null = null; - let lease = borrowed; - if (lease === undefined) { - owned = await guardWorktreeMutations(platformServices).acquireCheckoutLock( - canonical.canonical, - { runId: this.runId }, - ); - lease = owned; - } - let result: T | undefined; - let primaryError: unknown; - try { - if (lease.repositoryIdentity !== repositoryIdentity) { + if (borrowed !== undefined) { + const canonical = await platformServices.canonicalizePath(this.repoRoot); + const repositoryIdentity = canonical.gitCommonDir ?? canonical.canonical; + if (borrowed.repositoryIdentity !== repositoryIdentity) { throw new RuntimeError("worktree manager checkout lease repository identity mismatch"); } await assertNoPendingWorktreeRemovalForRepository(repositoryIdentity); - result = await operation(lease); - } catch (error) { - primaryError = error; - } - if (owned !== null) { - try { - await owned.release(); - } catch (releaseError) { - if (primaryError !== undefined) { - throw new AggregateError( - [primaryError, releaseError], - "worktree operation failed and its checkout lease could not be released", - ); - } - throw releaseError; - } + return await operation(borrowed); } - if (primaryError !== undefined) throw primaryError; - return result as T; + const safety = new PlatformSafety(platformServices); + return await safety.withCheckoutLease(this.repoRoot, operation, { + ...(this.runId === undefined ? {} : { runId: this.runId }), + }); } + private managedWorktreePath( stateRoot: string = path.resolve(resolveStateDir()), ): { worktreesRoot: string; worktreePath: string } { diff --git a/src/runtime/worktree-mutation-gate.ts b/src/runtime/worktree-mutation-gate.ts deleted file mode 100644 index f622c07..0000000 --- a/src/runtime/worktree-mutation-gate.ts +++ /dev/null @@ -1,48 +0,0 @@ -import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; -import { RuntimeError } from "../util/errors.js"; -import { assertNoPendingWorktreeRemovalForRepository } from "./worktree-removal-manifest.js"; - -const WORKTREE_MUTATION_GUARD = Symbol("claude-architect.worktree-mutation-guard"); - -type LockingPlatformServices = Pick; -type GuardedServices = LockingPlatformServices & { - [WORKTREE_MUTATION_GUARD]?: true; -}; - -/** - * Recheck durable removal ambiguity only after repository serialization. - * - * Recovery deliberately uses raw PlatformServices so it can acquire the lease - * that resolves a pending transaction. Every ordinary lifecycle entrypoint - * wraps its services here before beginning checkout/worktree mutation. - */ -export function guardWorktreeMutations(services: T): T { - if ((services as GuardedServices)[WORKTREE_MUTATION_GUARD] === true) return services; - const guarded = Object.create(services) as T & GuardedServices; - Object.defineProperty(guarded, WORKTREE_MUTATION_GUARD, { value: true }); - guarded.acquireCheckoutLock = async ( - checkoutPath, - options, - ): Promise => { - const lease = await services.acquireCheckoutLock(checkoutPath, options); - try { - await assertNoPendingWorktreeRemovalForRepository(lease.repositoryIdentity); - return lease; - } catch (error) { - const gateError = new RuntimeError( - "worktree mutation is unavailable while removal recovery remains ambiguous", - { classification: "recovery-ambiguous", cause: error }, - ); - try { - await lease.release(); - } catch (releaseError) { - throw new AggregateError( - [gateError, releaseError], - "worktree-removal gate failed and its checkout lease could not be released", - ); - } - throw gateError; - } - }; - return guarded; -} diff --git a/tests/runtime/durable-write.test.ts b/tests/runtime/durable-write.test.ts new file mode 100644 index 0000000..27e875e --- /dev/null +++ b/tests/runtime/durable-write.test.ts @@ -0,0 +1,110 @@ +import { mkdtemp, readFile, readdir, rm } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import path from "node:path"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { + DurableDirectorySession, + openDurableDirectorySession, + writeAtomic, +} from "../../src/platform/durable-write.js"; + +describe("PlatformSafety durable-write", () => { + let testDir: string; + + beforeEach(async () => { + testDir = await mkdtemp(path.join(tmpdir(), "ca-durable-write-")); + }); + + afterEach(async () => { + await rm(testDir, { recursive: true, force: true }); + vi.restoreAllMocks(); + }); + + it("writes atomically in immutable mode and allows identical retry", async () => { + const session = await openDurableDirectorySession(testDir); + try { + await writeAtomic(session, "artifact.json", '{"data":1}', "immutable"); + const read = await readFile(path.join(testDir, "artifact.json"), "utf8"); + expect(read).toBe('{"data":1}'); + + // Identical retry succeeds + await expect( + writeAtomic(session, "artifact.json", '{"data":1}', "immutable"), + ).resolves.toBeUndefined(); + + // Conflicting retry fails + await expect( + writeAtomic(session, "artifact.json", '{"data":2}', "immutable"), + ).rejects.toThrow("archive entry already exists with different content"); + } finally { + await session.close(); + } + }); + + it("writes atomically in replace mode", async () => { + const session = await openDurableDirectorySession(testDir); + try { + await writeAtomic(session, "status.json", '{"phase":"preflight"}', "replace"); + expect(await readFile(path.join(testDir, "status.json"), "utf8")).toBe('{"phase":"preflight"}'); + + await writeAtomic(session, "status.json", '{"phase":"implementing"}', "replace"); + expect(await readFile(path.join(testDir, "status.json"), "utf8")).toBe('{"phase":"implementing"}'); + } finally { + await session.close(); + } + }); + + it("rejects non-safe or path-traversal target names", async () => { + const session = await openDurableDirectorySession(testDir); + try { + await expect(writeAtomic(session, "../escape", "text", "replace")).rejects.toThrow("safe leaf name"); + await expect(writeAtomic(session, "sub/dir", "text", "replace")).rejects.toThrow("safe leaf name"); + await expect(writeAtomic(session, "/root", "text", "replace")).rejects.toThrow("safe leaf name"); + } finally { + await session.close(); + } + }); + + it("cleans up temporary files when write or sync crashes before completion", async () => { + const session = await openDurableDirectorySession(testDir, { + policy: { + syncDirectory: async () => { + throw new Error("simulated directory sync crash"); + }, + }, + }); + + try { + await expect( + writeAtomic(session, "crash-test.txt", "payload", "replace"), + ).rejects.toThrow("simulated directory sync crash"); + + // Destination was renamed before sync error, but NO temporary files remain leaked + const files = await readdir(testDir); + const tempFiles = files.filter(f => f.startsWith(".")); + expect(tempFiles).toEqual([]); + } finally { + await session.close(); + } + }); + + it("detects directory identity tampering through session", async () => { + const session = new DurableDirectorySession(testDir, { + dev: 999999n, + ino: 999999n, + birthtimeNs: 999999n, + }); + + await expect(writeAtomic(session, "tamper.txt", "data", "replace")).rejects.toThrow( + "durable directory session identity changed", + ); + }); + + it("rejects operations after session is closed", async () => { + const session = await openDurableDirectorySession(testDir); + await session.close(); + + await expect(session.assertIdentity()).rejects.toThrow("durable directory session is closed"); + await expect(session.sync()).rejects.toThrow("durable directory session is closed"); + }); +}); diff --git a/tests/runtime/lock-ownership.test.ts b/tests/runtime/lock-ownership.test.ts new file mode 100644 index 0000000..01cda21 --- /dev/null +++ b/tests/runtime/lock-ownership.test.ts @@ -0,0 +1,289 @@ +import { createHash } from "node:crypto"; +import { mkdir, mkdtemp, open, readFile, rm, writeFile } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import path from "node:path"; +import nodeProcess from "node:process"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { + CHECKOUT_LOCK_NAME_PATTERN, + formatLockRecord, + isCheckoutLockFileName, + lockFileName, + lockFilePath, + lockIsOwnedByLiveProcess, + lockKeyFromFileName, + lockOwnerStatus, + parseLockOwner, + parseLockRecord, + reclaimDeadCheckoutLocks, + reclaimDeadLock, + type LockOwner, + type LockRecord, +} from "../../src/platform/lock-ownership.js"; +import { logger } from "../../src/util/logger.js"; + +describe("LockOwnership", () => { + let tempDir: string; + + beforeEach(async () => { + tempDir = await mkdtemp(path.join(tmpdir(), "lock-ownership-test-")); + }); + + afterEach(async () => { + await rm(tempDir, { recursive: true, force: true }); + vi.restoreAllMocks(); + }); + + describe("naming and patterns", () => { + it("recognizes valid checkout lock names and extracts keys", () => { + const key = createHash("sha256").update("repo-identity").digest("hex"); + const name = `${key}.lock`; + expect(CHECKOUT_LOCK_NAME_PATTERN.test(name)).toBe(true); + expect(isCheckoutLockFileName(name)).toBe(true); + expect(lockKeyFromFileName(name)).toBe(key); + expect(lockFileName(key)).toBe(name); + expect(lockFilePath(key, tempDir)).toBe(path.join(tempDir, "locks", name)); + }); + + it("rejects non-checkout lock names", () => { + expect(isCheckoutLockFileName("recovery.lock")).toBe(false); + expect(isCheckoutLockFileName("1234.lock")).toBe(false); + expect(isCheckoutLockFileName("something.json")).toBe(false); + expect(lockKeyFromFileName("recovery.lock")).toBeNull(); + }); + }); + + describe("record formatting and parsing", () => { + it("formats and parses full lock record", () => { + const record: LockRecord = { + pid: 12345, + processToken: "token-abc-123", + acquiredAt: new Date().toISOString(), + runId: "run-001", + }; + const formatted = formatLockRecord(record); + const parsed = parseLockRecord(formatted); + expect(parsed).toEqual(record); + }); + + it("parses record without runId", () => { + const json = JSON.stringify({ + pid: 9999, + processToken: "tok", + acquiredAt: "2026-01-01T00:00:00.000Z", + }); + const parsed = parseLockRecord(json); + expect(parsed).toEqual({ + pid: 9999, + processToken: "tok", + acquiredAt: "2026-01-01T00:00:00.000Z", + runId: undefined, + }); + }); + + it("rejects malformed records", () => { + expect(parseLockRecord("not json")).toBeNull(); + expect(parseLockRecord("null")).toBeNull(); + expect(parseLockRecord("123")).toBeNull(); + expect(parseLockRecord(JSON.stringify({ pid: "not-a-number" }))).toBeNull(); + expect(parseLockRecord(JSON.stringify({ pid: 1 }))).toBeNull(); // init PID + expect(parseLockRecord(JSON.stringify({ pid: 0 }))).toBeNull(); + expect(parseLockRecord(JSON.stringify({ pid: -5 }))).toBeNull(); + }); + + it("extracts verifiable LockOwner", () => { + const valid = JSON.stringify({ pid: 54321, processToken: "tok-1" }); + expect(parseLockOwner(valid)).toEqual({ pid: 54321, processToken: "tok-1" }); + + const missingToken = JSON.stringify({ pid: 54321, processToken: "" }); + expect(parseLockOwner(missingToken)).toBeNull(); + + const nullToken = JSON.stringify({ pid: 54321, processToken: null }); + expect(parseLockOwner(nullToken)).toBeNull(); + }); + }); + + describe("liveness verdict (PID birth-tokens)", () => { + it("reports dead when owner is null", async () => { + const status = await lockOwnerStatus(null, () => true, async () => "token"); + expect(status).toBe("dead"); + }); + + it("reports dead when process is not alive", async () => { + const owner: LockOwner = { pid: 99999, processToken: "my-token" }; + const status = await lockOwnerStatus(owner, () => false, async () => "my-token"); + expect(status).toBe("dead"); + }); + + it("reports unverifiable when processToken in record is null", async () => { + const status = await lockOwnerStatus( + { pid: 1234, processToken: null }, + () => true, + async () => "live-token", + ); + expect(status).toBe("unverifiable"); + }); + + it("reports unverifiable when current process token cannot be obtained", async () => { + const owner: LockOwner = { pid: 1234, processToken: "my-token" }; + const status = await lockOwnerStatus(owner, () => true, async () => null); + expect(status).toBe("unverifiable"); + }); + + it("reports live when live process token matches record", async () => { + const owner: LockOwner = { pid: 1234, processToken: "darwin:Mon Jan 1 00:00:00 2026" }; + const status = await lockOwnerStatus( + owner, + () => true, + async pid => (pid === 1234 ? "darwin:Mon Jan 1 00:00:00 2026" : null), + ); + expect(status).toBe("live"); + }); + + it("reports dead when PID is alive but birth token does not match (recycled PID)", async () => { + const owner: LockOwner = { pid: 1234, processToken: "darwin:old-process-start" }; + const status = await lockOwnerStatus( + owner, + () => true, + async pid => (pid === 1234 ? "darwin:recycled-pid-new-start" : null), + ); + expect(status).toBe("dead"); + }); + }); + + describe("reclaim rules", () => { + it("returns contended if lock file does not exist", async () => { + const missingPath = path.join(tempDir, "missing.lock"); + const result = await reclaimDeadLock(missingPath, () => false, async () => null); + expect(result).toBe("contended"); + }); + + it("logs warning and preserves malformed lock file", async () => { + const warnSpy = vi.spyOn(logger, "warn").mockImplementation(() => {}); + const malformedPath = path.join(tempDir, "bad.lock"); + await writeFile(malformedPath, "not valid json\n"); + + const result = await reclaimDeadLock(malformedPath, () => false, async () => null); + expect(result).toBe("malformed"); + expect(warnSpy).toHaveBeenCalledWith( + "startup recovery preserved malformed lock", + expect.objectContaining({ event: "recovery-malformed-lock" }), + ); + }); + + it("logs warning and preserves unverifiable lock file", async () => { + const warnSpy = vi.spyOn(logger, "warn").mockImplementation(() => {}); + const unverifiablePath = path.join(tempDir, "unverifiable.lock"); + await writeFile( + unverifiablePath, + JSON.stringify({ pid: nodeProcess.pid, processToken: "token" }), + ); + + const result = await reclaimDeadLock( + unverifiablePath, + () => true, + async () => null, // token lookup unavailable + ); + expect(result).toBe("unverifiable"); + expect(warnSpy).toHaveBeenCalledWith( + "startup recovery preserved unverifiable lock", + expect.objectContaining({ event: "recovery-unverifiable-lock" }), + ); + }); + + it("returns live when process is live and token matches", async () => { + const livePath = path.join(tempDir, "live.lock"); + await writeFile( + livePath, + JSON.stringify({ pid: 5555, processToken: "token-5555" }), + ); + + const result = await reclaimDeadLock( + livePath, + pid => pid === 5555, + async pid => (pid === 5555 ? "token-5555" : null), + ); + expect(result).toBe("live"); + }); + + it("safely removes dead lock file and reports reclaimed", async () => { + const deadPath = path.join(tempDir, "dead.lock"); + await writeFile( + deadPath, + JSON.stringify({ pid: 9999, processToken: "token-9999" }), + ); + + const result = await reclaimDeadLock( + deadPath, + () => false, // process is dead + async () => null, + ); + expect(result).toBe("reclaimed"); + + // Verify file was unlinked + await expect(open(deadPath, "r")).rejects.toThrow(); + }); + + it("reclaimDeadCheckoutLocks cleans all dead checkout locks in directory", async () => { + const locksDir = path.join(tempDir, "locks"); + await mkdir(locksDir); + + const deadKey = createHash("sha256").update("dead-repo").digest("hex"); + const liveKey = createHash("sha256").update("live-repo").digest("hex"); + + const deadPath = path.join(locksDir, `${deadKey}.lock`); + const livePath = path.join(locksDir, `${liveKey}.lock`); + + await writeFile(deadPath, JSON.stringify({ pid: 1111, processToken: "dead-tok" })); + await writeFile(livePath, JSON.stringify({ pid: 2222, processToken: "live-tok" })); + + await reclaimDeadCheckoutLocks( + locksDir, + pid => pid === 2222, + async pid => (pid === 2222 ? "live-tok" : null), + ); + + await expect(open(deadPath, "r")).rejects.toThrow(); + await expect(open(livePath, "r")).resolves.toBeDefined(); + }); + + it("lockIsOwnedByLiveProcess returns false only when owner is proven dead", async () => { + const locksDir = path.join(tempDir, "locks"); + await mkdir(locksDir, { recursive: true }); + + const deadKey = createHash("sha256").update("dead").digest("hex"); + const liveKey = createHash("sha256").update("live").digest("hex"); + const malformedKey = createHash("sha256").update("malformed").digest("hex"); + + await writeFile(path.join(locksDir, `${deadKey}.lock`), JSON.stringify({ pid: 1, processToken: "tok" })); // PID 1 is dead/invalid + await writeFile(path.join(locksDir, `${liveKey}.lock`), JSON.stringify({ pid: 2222, processToken: "tok" })); + await writeFile(path.join(locksDir, `${malformedKey}.lock`), "bad"); + + const isDead = await lockIsOwnedByLiveProcess( + locksDir, + deadKey, + () => false, + async () => null, + ); + expect(isDead).toBe(true); // invalid owner is preserved, so returns true + + const realDeadKey = createHash("sha256").update("real-dead").digest("hex"); + await writeFile(path.join(locksDir, `${realDeadKey}.lock`), JSON.stringify({ pid: 8888, processToken: "tok" })); + const deadResult = await lockIsOwnedByLiveProcess( + locksDir, + realDeadKey, + () => false, + async () => null, + ); + expect(deadResult).toBe(false); + + const liveResult = await lockIsOwnedByLiveProcess( + locksDir, + liveKey, + () => true, + async () => "tok", + ); + expect(liveResult).toBe(true); + }); + }); +}); diff --git a/tests/runtime/run-status.test.ts b/tests/runtime/run-status.test.ts index b739c59..530322c 100644 --- a/tests/runtime/run-status.test.ts +++ b/tests/runtime/run-status.test.ts @@ -35,7 +35,7 @@ import { ArtifactStore } from "../../src/runtime/artifact-store.js"; import { runAttempt, type AttemptRuntimeDependencies } from "../../src/runtime/attempt-runtime.js"; import { clearRegisteredSecrets, registerSecretValue } from "../../src/runtime/redaction.js"; import { buildRunManifest } from "../../src/runtime/run-manifest.js"; -import type { RunStatus } from "../../src/runtime/run-status.js"; +import { StatusEmitter, type RunStatus } from "../../src/runtime/run-status.js"; import { initializeRunStart } from "../../src/runtime/run-start.js"; import { logger } from "../../src/util/logger.js"; @@ -643,4 +643,75 @@ describe("trusted run status", () => { expect(runsRoot).toContain("runs"); }, ); + + it("splits into durable transitions and ephemeral progress with exactly one durable write per transition", async () => { + const store = new ArtifactStore("status-emitter-test"); + await initializeRunStart(store, { + runId: "status-emitter-test", + lockKey: "lock", + canonicalCommonDir: "/repo", + pid: process.pid, + processToken: "token", + startedAt: new Date().toISOString(), + }); + + const initial: RunStatus = { + statusVersion: "1", + runId: "status-emitter-test", + mode: "single", + phase: "preflight", + sliceIndex: null, + sliceCount: null, + round: null, + role: null, + producerId: null, + startedAt: new Date().toISOString(), + updatedAt: new Date().toISOString(), + detail: null, + }; + await store.writeRunStatus(initial); + + let writeCount = 0; + const originalWrite = store.writeRunStatus.bind(store); + store.writeRunStatus = async status => { + writeCount++; + return originalWrite(status); + }; + + const progressReports: string[] = []; + const emitter = new StatusEmitter(store, "status-emitter-test", text => { + progressReports.push(text); + }); + + // Durable transition 1: implementing + await emitter.transition("implementing", { role: "implementer", producerId: "codex" }); + expect(writeCount).toBe(1); + expect((await store.readRunStatus("status-emitter-test"))?.phase).toBe("implementing"); + + // Ephemeral progress reports do NOT perform durable disk writes + await emitter.ephemeral("running tests: 1/5 passed"); + await emitter.ephemeral("running tests: 2/5 passed"); + await emitter.ephemeral("running tests: 3/5 passed"); + expect(writeCount).toBe(1); + expect(progressReports).toEqual([ + "running tests: 1/5 passed", + "running tests: 2/5 passed", + "running tests: 3/5 passed", + ]); + + // Durable transition 2: verifying + await emitter.transition("verifying"); + expect(writeCount).toBe(2); + expect((await store.readRunStatus("status-emitter-test"))?.phase).toBe("verifying"); + + // Ephemeral progress + await emitter.ephemeral("verifying candidate tree"); + expect(writeCount).toBe(2); + expect(progressReports).toHaveLength(4); + + // Durable transition 3: done + await emitter.transition("done"); + expect(writeCount).toBe(3); + expect((await store.readRunStatus("status-emitter-test"))?.phase).toBe("done"); + }); }); diff --git a/tests/runtime/worktree-removal-manifest.test.ts b/tests/runtime/worktree-removal-manifest.test.ts index 312ce47..d7d6aac 100644 --- a/tests/runtime/worktree-removal-manifest.test.ts +++ b/tests/runtime/worktree-removal-manifest.test.ts @@ -6,7 +6,7 @@ import { recoverPendingWorktreeRemovals, recoverStaleRuns, } from "../../src/runtime/recovery-manager.js"; -import { guardWorktreeMutations } from "../../src/runtime/worktree-mutation-gate.js"; +import { PlatformSafety } from "../../src/platform/platform-safety.js"; import { assertNoPendingWorktreeRemovalForRepository, persistWorktreeRemovalManifest, @@ -90,21 +90,26 @@ describe("worktree removal manifest recovery", () => { ); const repositoryIdentity = await realpath(commonDir); const release = vi.fn(async () => {}); - const services = guardWorktreeMutations({ + const safety = new PlatformSafety({ acquireCheckoutLock: vi.fn(async () => ({ key: "test-lock", repositoryIdentity, release, })), + canonicalizePath: vi.fn(async (p: string) => ({ + canonical: p, + gitCommonDir: commonDir, + })), }); - await expect(services.acquireCheckoutLock(commonDir)).rejects.toMatchObject({ + await expect(safety.withCheckoutLease(commonDir, async () => {})).rejects.toMatchObject({ message: "worktree mutation is unavailable while removal recovery remains ambiguous", detail: expect.objectContaining({ classification: "recovery-ambiguous" }), }); expect(release).toHaveBeenCalledOnce(); }); + it("rechecks pending removal state after acquiring the repository lease", async () => { const root = path.join(stateRoot, "worktree-removals"); const commonDir = path.join(stateRoot, "repository.git"); From 93f5aca9b216c561e93c37d544fa16788a0e9025 Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 18:49:01 -0400 Subject: [PATCH 09/12] release: 0.52.0 --- .claude-plugin/marketplace.json | 2 +- .claude-plugin/plugin.json | 2 +- CHANGELOG.md | 16 ++++++++++------ README.md | 2 +- runtime/server.mjs | 2 +- src/protocol/versions.ts | 2 +- tests/runtime/plugin-wiring.test.mjs | 4 ++-- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index 05089ea..9c17192 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -12,7 +12,7 @@ "name": "claude-architect", "displayName": "Claude Architect", "source": "./", - "version": "0.50.0", + "version": "0.52.0", "description": "Verified P0-A MCP delegation with macOS arm64 certified; eligible Linux Codex editing is tested; native Windows Codex editing is unsupported. Codex edit eligibility requires its proven native sandbox.", "author": { "name": "elkaix", diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json index e2d7fdb..105ebde 100644 --- a/.claude-plugin/plugin.json +++ b/.claude-plugin/plugin.json @@ -1,7 +1,7 @@ { "name": "claude-architect", "displayName": "Claude Architect", - "version": "0.50.0", + "version": "0.52.0", "description": "Verified coding-agent delegation for Claude Code with isolated Producers, frozen candidate artifacts, independent review, and human-controlled integration.", "author": { "name": "Mohamed Elkholy", diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dda585..b4c4963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,19 @@ All notable changes to Claude Architect are recorded here. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and the project uses [semantic versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.52.0] - 2026-09-02 ### Changed -- Unified prompt assembly across all Producer lanes into `src/producers/prompt-renderer.ts` with `actionPreamble` and `bootstrapPlacement` parameterized from `ProducerDescriptor`. Every edit-lane prompt now carries the action-first preamble (`EDIT_ACTION_PREAMBLE`) and lint-before-typecheck instruction (`LINT_BEFORE_TYPECHECK_INSTRUCTION`). Codex's private `renderPrompt` and duplicate `renderList` have been removed. Prompt hashes change for five lanes (Agy, Claude, OpenCode, Pi, Pythinker) because they now include the action-first preamble and lint-before-typecheck ordering previously unique to Codex. -- Unified capability probing across all six Producer lanes through `src/producers/cli-probe.ts`. Codex's probe now routes through the shared probe, eliminating duplicated executable normalization and sandbox detection. The shared probe enforces an abnormal-termination guard ensuring any signal-terminated, timed-out, or cancelled `--version` probe yields `version: null` and fail-closed unavailability across all six lanes. -- Unified process launch across all Producer lanes into `src/producers/producer-runtime.ts` (`ProducerRuntime.planLaunch` and `ProducerRuntime.launch`). Temporary HOME directories are now created only when the descriptor's isolation profile requires them (`controlled-config-supported` or `controlled-config-with-copied-credentials`), and declared-writable-state combined with temporary HOME is strictly refused. Attempt runtime, role runner, and producer preflight now coordinate through `ProducerRuntime`. All six adapter test files stop importing `wrapInvocationWithSeatbelt`, `buildEnvironment`, or `supervise`. -- Added within-process capability probe caching scoped to each run in `src/producers/producer-runtime.ts`. Capability probe results are keyed by `(producerId, resolvedExecutablePath, hostStoreRoot, configRevision)`. In multi-role pipelines, all subsequent role dispatches reuse the cached probe results (yielding 6 probes per run instead of 6·(N+1)), swapped executables between roles are immediately detected as cache misses, and diagnostic checks (`doctor`) always probe fresh (`{ fresh: true }`). -- Minimized Producer startup cost in `src/producers/producer-runtime.ts` and `src/runtime/attempt-runtime.ts` by resolving configuration once, computing writable roots once, and building the sandbox policy once per attempt. Temporary HOME directories are bypassed completely for `inherited-config` lanes (`agy`, `claude`, `pi`, `pythinker`). Measured end-to-end execution on a fixed spec against a fixture repository via `hyperfine` (15.061 s ± 0.869 s across 5 runs, eliminating duplicate sandbox generation and unnecessary temp-HOME allocation). +- Unified repository mutations and lease management through `PlatformSafety` (`src/platform/platform-safety.ts`). Checkout locking now inverts ambiguity gate validation so the ambiguity check executes under the acquired lease (`withCheckoutLease`), recovery operations use dedicated recovery leases (`withRecoveryLease`), and `guardWorktreeMutations` along with its nine wrap sites has been removed. +- Consolidated lock ownership record formatting, parsing, liveness verdicts (`live`, `dead`, `unverifiable`, `malformed`), and reclamation into `src/platform/lock-ownership.ts`. Both POSIX and Windows implementations acquire and describe contention through this module, and `recovery-manager.ts` drops redundant lock parsing. +- Introduced atomic write operations and directory sessions via `writeAtomic` and `DurableDirectorySession` (`src/platform/durable-write.ts`), guaranteeing temp file cleanup on crash, atomic rename/link, directory fsync barriers, and directory identity verification across sequential writes. +- Split status emission in `src/runtime/run-status.ts` into durable lifecycle transitions (written synchronously and persisted before the phase begins) and ephemeral progress notifications (coalesced without blocking on disk syncs). +- Unified prompt assembly across all Producer lanes into `src/producers/prompt-renderer.ts` with `actionPreamble` and `bootstrapPlacement` parameterized from `ProducerDescriptor`. Every edit-lane prompt now carries the action-first preamble (`EDIT_ACTION_PREAMBLE`) and lint-before-typecheck instruction (`LINT_BEFORE_TYPECHECK_INSTRUCTION`). Codex's private `renderPrompt` and duplicate `renderList` have been removed. +- Unified capability probing across all six Producer lanes through `src/producers/cli-probe.ts`. Codex's probe now routes through the shared probe, eliminating duplicated executable normalization and sandbox detection with an abnormal-termination guard. +- Unified process launch across all Producer lanes into `src/producers/producer-runtime.ts` (`ProducerRuntime.planLaunch` and `ProducerRuntime.launch`), with temporary HOME directories created only when the descriptor's isolation profile requires them. +- Added within-process capability probe caching scoped to each run in `src/producers/producer-runtime.ts`, keyed by `(producerId, resolvedExecutablePath, hostStoreRoot, configRevision)`. In multi-role pipelines, subsequent role dispatches reuse cached results, swapped executables are detected as cache misses, and diagnostic checks (`doctor`) probe fresh. +- Minimized Producer startup cost in `src/producers/producer-runtime.ts` and `src/runtime/attempt-runtime.ts` by resolving configuration once, computing writable roots once, and building the sandbox policy once per attempt. ## [0.50.0] - 2026-09-02 diff --git a/README.md b/README.md index de80725..7d15554 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ delegate skill codex skill Claude Code - version + version license

diff --git a/runtime/server.mjs b/runtime/server.mjs index 4af0cb0..f486977 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -31909,7 +31909,7 @@ import path34 from "node:path"; var PROTOCOL_VERSION = "2.0.0"; var DELEGATION_SPEC_VERSION = "1"; var ATTEMPT_RESULT_VERSION = "1"; -var RUNTIME_VERSION = "0.50.0"; +var RUNTIME_VERSION = "0.52.0"; // src/protocol/attempt-result.ts var FAILURE_PRECEDENCE = [ diff --git a/src/protocol/versions.ts b/src/protocol/versions.ts index 0b6afbc..4ec4f03 100644 --- a/src/protocol/versions.ts +++ b/src/protocol/versions.ts @@ -2,4 +2,4 @@ export const PROTOCOL_VERSION = "2.0.0" as const; // MCP tool contract vers export const DELEGATION_SPEC_VERSION = "1" as const; // wire schema major export const AUTOPILOT_SPEC_VERSION = "1" as const; export const ATTEMPT_RESULT_VERSION = "1" as const; -export const RUNTIME_VERSION = "0.50.0" as const; // mirrors plugin.json at release +export const RUNTIME_VERSION = "0.52.0" as const; // mirrors plugin.json at release diff --git a/tests/runtime/plugin-wiring.test.mjs b/tests/runtime/plugin-wiring.test.mjs index 84880cb..d700e26 100644 --- a/tests/runtime/plugin-wiring.test.mjs +++ b/tests/runtime/plugin-wiring.test.mjs @@ -233,8 +233,8 @@ describe("P0-A plugin wiring", () => { const marketplace = JSON.parse(read(".claude-plugin/marketplace.json")); const readme = read("README.md"); const changelog = read("CHANGELOG.md"); - assert.equal(plugin.version, "0.50.0"); - assert.equal(marketplace.plugins[0].version, "0.50.0"); + assert.equal(plugin.version, "0.52.0"); + assert.equal(marketplace.plugins[0].version, "0.52.0"); // Derived from plugin.json, not written out: a literal here is a seventh // place to edit on every bump, and it is the one that keeps being missed. assert.match(readme, new RegExp(`badge/version-${plugin.version.replace(/\./gu, "\\.")}-`, "u")); From c76a9e01614cec6b6cce698d99fb3c1c40ffcdb7 Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 21:28:58 -0400 Subject: [PATCH 10/12] Complete the SliceRunner extraction and repair the pipeline seams it broke The slice lifecycle now lives in SliceRunner: plan wave, create worktree, launch Producer, freeze, verify, review, compose, release anchor. Run-scoped facts travel as a RunContext value rather than a shared closure, and pipeline-runtime.ts drops from 2464 to 1545 lines. Finishing the extraction surfaced five defects in the seams between the new runner and the pipeline, none of which any test could reach while the tree did not compile: - runSliceReview was called without the run's borrowed checkout lease, so the review worktree blocked on the lock the same process already held. The parameter is now required-but-nullable, so omitting it is a type error. - Temporary slice refs were cleaned up inside the runner, before the final review round that resolves them. The runner hands them back; the pipeline's finally block remains the single place they are deleted. - The slice ref namespace was written as refs/claude-architect/runs/ while recovery swept refs/claude-architect/slices/ from its own copy of the literal. Orphaned refs would have accumulated with nothing failing. One declaration now lives in src/git/ref-namespace.ts. - Unparseable structured output was reclassified from invalid-output to producer-failure, losing the distinction between a malformed report and a crashed process, and the reported log ref pointed at the repair attempt rather than the output that failed validation. - The pipeline gate clearance was built twice with independent timestamps, so the archived record and the returned result disagreed on clearedAt. Neither reader could detect it alone. Two implementations that could diverge are now one. withManagedWorktree lives beside WorktreeManager and is borrowed by the pipeline, the slice runner, and candidate verification, which also gains the creation serialization it lacked; the queue is keyed per repository so unrelated repositories do not block each other. The superseded runSlicePhase/SlicePhaseDeps loop is deleted, and the suite that exercised it now drives the real runner. Also lands RunDecision, typed gate clearance, named verification modes, the RecoveryDependencies cleanup, and the documentation and skill work recorded under [Unreleased]. --- CHANGELOG.md | 20 + CONTEXT.md | 29 +- docs/ARCHITECTURE.md | 29 + docs/MARKETPLACE_REVIEW.md | 49 +- docs/README.md | 91 + docs/SECURITY_MODEL.md | 3 + docs/THREAT_MODEL.md | 3 + docs/TRUST_BOUNDARIES.md | 3 + docs/autopilot-terminal-states.md | 12 + docs/decision-authority.md | 8 + docs/delegation-monitoring.md | 36 + docs/delegation-presentation.md | 60 + docs/sliced-pipeline.md | 69 + docs/verification-preflight.md | 14 + runtime/schemas/pipeline-gate-cleared.v1.json | 27 + runtime/server.mjs | 3080 ++++++++++------- skills/delegate/SKILL.md | 322 +- skills/subagent-driven-delegation/SKILL.md | 16 +- src/autopilot/candidate-promoter.ts | 10 +- src/autopilot/final-branch-reviewer.ts | 96 +- src/git/ref-namespace.ts | 9 + src/mcp/server.ts | 29 +- src/mcp/tools.ts | 72 +- src/pipeline/advisor-stage.ts | 6 +- src/pipeline/candidate-provenance.ts | 182 + src/pipeline/candidate-verifier.ts | 275 ++ src/pipeline/pipeline-roles.ts | 272 ++ src/pipeline/pipeline-runtime.ts | 1141 +----- src/pipeline/run-context.ts | 82 + src/pipeline/slice-runner.ts | 761 +++- src/protocol/pipeline-gate-cleared.ts | 61 + src/protocol/schema-loader.ts | 3 + src/runtime/artifact-store.ts | 38 +- src/runtime/recovery-manager.ts | 41 +- src/runtime/review-snapshot.ts | 4 + src/runtime/run-decision.ts | 304 ++ src/runtime/worktree-manager.ts | 92 +- src/verify/acceptance-verifier.ts | 19 +- src/verify/structural-verifier.ts | 188 +- tests/helpers/platform-services-double.ts | 24 + tests/runtime/acceptance-verifier.test.ts | 2 +- tests/runtime/pipeline/slice-runner.test.ts | 485 +-- tests/runtime/recovery-manager.test.ts | 227 +- tests/runtime/review-manifest-echo.test.ts | 5 +- tests/runtime/run-decision.test.ts | 431 +++ tests/runtime/structural-verifier.test.ts | 68 +- tests/runtime/verification-mode.test.ts | 195 ++ tests/runtime/worktree-sweep.test.ts | 47 +- 48 files changed, 5559 insertions(+), 3481 deletions(-) create mode 100644 docs/README.md create mode 100644 docs/autopilot-terminal-states.md create mode 100644 docs/decision-authority.md create mode 100644 docs/delegation-monitoring.md create mode 100644 docs/delegation-presentation.md create mode 100644 docs/sliced-pipeline.md create mode 100644 docs/verification-preflight.md create mode 100644 runtime/schemas/pipeline-gate-cleared.v1.json create mode 100644 src/git/ref-namespace.ts create mode 100644 src/pipeline/candidate-provenance.ts create mode 100644 src/pipeline/candidate-verifier.ts create mode 100644 src/pipeline/pipeline-roles.ts create mode 100644 src/pipeline/run-context.ts create mode 100644 src/protocol/pipeline-gate-cleared.ts create mode 100644 src/runtime/run-decision.ts create mode 100644 tests/helpers/platform-services-double.ts create mode 100644 tests/runtime/run-decision.test.ts create mode 100644 tests/runtime/verification-mode.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c4963..bbb39af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,26 @@ All notable changes to Claude Architect are recorded here. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and the project uses [semantic versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Changed + +- The slice lifecycle moved out of `runPipelineWithLease` into `SliceRunner` (`src/pipeline/slice-runner.ts`): plan wave, create worktree, launch Producer, freeze, verify, review, compose, release anchor. Run-scoped facts travel as a `RunContext` value instead of a shared closure, so `pipeline-runtime.ts` fell from 2464 to ~1540 lines and slice behaviour can be exercised without driving a whole pipeline. +- One implementation of the slice phase. `SliceRunner.run` superseded the callback-driven `runSlicePhase`/`SlicePhaseDeps` pair, which stayed behind as a second routing loop that nothing called but a test suite still exercised — so the suite proved nothing about the code that runs. The superseded loop is deleted and its evidence-isolation and hard-blocker cases now drive the real runner. +- One implementation of the managed-worktree lifecycle. `withManagedWorktree` lives beside `WorktreeManager` in `src/runtime/worktree-manager.ts`, and the pipeline, the slice runner, and candidate verification all borrow through it — so creation serialization and the cleanup-failure disposition cannot drift apart, and verification worktrees gain the `git worktree add` serialization they previously lacked. +- The slice ref namespace has a single declaration (`src/git/ref-namespace.ts`). The pipeline wrote `refs/claude-architect/slices/` while recovery swept the same literal from its own copy; one declaration makes a silent divergence — refs created but never reclaimed — impossible. +- Unified candidate evaluation into `RunDecision` (`src/runtime/run-decision.ts`). `readRunDecisionSnapshot` loads a run's result, manifest, review snapshot, gate clearance, and decision once and checks their cross-file coherence in one place; `evaluate` returns a typed `RunVerdict` — `accepted` (autonomous), `human-required`, `rejected`, `incomplete`, or `invalid` — replacing the accept-only rule that was written twice, in `mcp/server.ts` and `mcp/tools.ts`. The decide path now reads the archive once: `loadArchivedRun` carries the snapshot it read, and the provenance resolver judges that snapshot through the pure `verdictFor` rather than re-reading five files per caller. +- `pipelineGateCleared` is a versioned artifact next to `CandidateDecisionV2`, with its own canonical schema at `runtime/schemas/pipeline-gate-cleared.v1.json`. The artifact store validates every durable record against that schema on both read and write, so a malformed clearance is an `invalid` verdict with a reason rather than a shape-sniffed warning string, and a record that reached disk malformed never reads back as "absent". +- Acceptance verification takes a named `mode` — `candidate`, `composed-slice`, or `final-branch` — instead of an injected structural verifier. `MODE_STRUCTURAL_FAILURES` declares the failure classes each mode may report and now drives `structuralVerify`, which skips the work that proves a class the mode cannot report. The pipeline's `IGNORED_STRUCTURAL_FAILURES` filter, the final branch reviewer's substitute verifier and its private `finalPathAllowed` copy, and the second scope-violation glob in `verifyCandidate` are all gone: one scope rule, one symlink rule, one manifest recomputation across every mode. +- `RecoveryDependencies` drops `requestCooperativeTermination`, `delayMs`, and `graceMs`, which were retained for input compatibility and did nothing, and takes `platformServices` whole. `recoverStaleRuns` no longer rebuilds a `PlatformServices` by grafting a caller's three methods onto the selected platform — production code that existed only to complete an incomplete test double. Recovery never took a checkout lease through that object; leases come from `platformSafety.withRecoveryLease`. + +### Documentation + +- `docs/README.md` indexes every document under `docs/` as current, historical, or superseded, naming the superseding document where one exists. +- `docs/ARCHITECTURE.md` maps each `AGENTS.md` trust invariant to exactly one owning subsystem and file; `SECURITY_MODEL.md`, `TRUST_BOUNDARIES.md`, and `THREAT_MODEL.md` point at that mapping. +- `docs/MARKETPLACE_REVIEW.md` states edit-lane confinement evidence per lane and platform, and says plainly that no lane has native Windows edit evidence and none is claimed — five of the six lanes are unsupported for editing off macOS because `macos-seatbelt` declares no Linux or Windows platform at all. +- The delegate skill is 35% shorter (5417 → ~3520 words) with no rule removed: the autopilot and manual lifecycles are one section, the two presentation sections are one, and the sliced pipeline, backgrounded-run monitoring, presentation templates, decision-authority policy, and verification-preflight reference moved to `docs/`. `subagent-driven-delegation` no longer restates the spec-authoring, lane-correlation, and decision rules it shares with `delegate`; it points at them. + ## [0.52.0] - 2026-09-02 ### Changed diff --git a/CONTEXT.md b/CONTEXT.md index a8b3cfc..bb34ed6 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -44,7 +44,7 @@ The unified execution layer for Producers. It coordinates capability probing, pr ### Producer Adapter -An adapter at the Producer seam. It owns Producer discovery, capability observations, invocation construction, and normalization of native events and errors. It does not choose the canonical Failure Classification. +A Producer Descriptor plus whatever custom code that CLI genuinely requires — nothing more. The descriptor states identification, executable resolution, argument layout, prompt framing, isolation model, and host state; custom code exists only where the CLI's own behavior differs, such as `buildInvocation` for an unusual argument shape or a native event format to normalize. An adapter never chooses the canonical Failure Classification and never gains acceptance authority. ### Attempt Result @@ -52,7 +52,11 @@ The canonical, machine-readable outcome of a Delegation Attempt. It records arti ### Host Decision -Claude's decision after reviewing a verified Candidate Artifact and its evidence. A Host Decision is `accepted`, `rejected`, or `revision-requested`. +Claude's decision after reviewing a verified Candidate Artifact and its evidence. A Host Decision is `accepted`, `rejected`, or `revision-requested`. Evaluated via the unified `RunDecision` subsystem into one of five `RunVerdict` states: `accepted` (autonomous: true), `human-required`, `rejected`, `incomplete`, or `invalid`. Cross-file coherence of archived evidence, manifest, review snapshot, gate clearance, and decision is loaded concurrently via `readRunDecisionSnapshot`. + +### RunDecision & RunVerdict + +The unified subsystem (`src/runtime/run-decision.ts`) that determines candidate eligibility and authority clearance. It evaluates autonomous eligibility, provenance allowlists, and the accept-only rule once across all call sites, returning a typed `RunVerdict`. ### Integration Result @@ -60,7 +64,7 @@ The outcome of applying an accepted Candidate Artifact to the main checkout thro ### Acceptance Verification -Independent executable verification of an Attempt Result and its candidate artifacts. Acceptance Verification checks declared tests, changed paths, worktree state, command outcomes, and scope before controlled integration. +Independent executable verification of an Attempt Result and its candidate artifacts. Acceptance Verification operates under named verification modes (`candidate`, `composed-slice`, and `final-branch`), with unified scope-checking via canonical path rules before controlled integration. ### Candidate Artifact @@ -206,15 +210,28 @@ Claude Code | |-- SharedPromptRenderer | |-- CliProbe (with abnormal-termination guard & run-scoped cache) | `-- LaunchPlanner & Supervisor + |-- PipelineRuntime + | |-- RunContext (run-scoped facts; no shared mutable closure) + | `-- SliceRunner + | |-- plan wave -> worktree -> launch -> freeze -> verify -> review + | `-- compose -> release anchor |-- AttemptRuntime | |-- WorktreeManager | |-- EnvironmentPolicy - | |-- PlatformServices - | | |-- PosixPlatformServices - | | `-- WindowsPlatformServices | |-- ProcessSupervisor | |-- ArtifactStore | `-- RecoveryManager + |-- RunDecision + | |-- RunDecisionSnapshot (one read per decision) + | |-- RunVerdict (accepted | human-required | rejected | incomplete | invalid) + | `-- VerificationMode (candidate | composed-slice | final-branch) + |-- PlatformSafety + | |-- withCheckoutLease / withRecoveryLease + | |-- writeAtomic & DurableDirectorySession + | |-- LockOwnership + | `-- PlatformServices + | |-- PosixPlatformServices + | `-- WindowsPlatformServices |-- AcceptanceVerifier |-- ControlledIntegrator `-- Doctor diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 68b9093..6b825a0 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -17,6 +17,35 @@ The normal MCP flow is: 7. `decideCandidate` records `accepted`, `rejected`, or `revision-requested`. Only a verified candidate may be accepted. 8. `integrateCandidate` requires an accepted decision and the exact candidate manifest hash. `src/integrate/controlled-integrator.ts` rechecks base, anchor, tree, hash, and repository cleanliness, then applies the tree to the index and worktree. It does not commit. +## Who owns each trust invariant + +`AGENTS.md` § Non-negotiable trust invariants states what must always hold. Each one +has exactly one owner in the source; a change that moves an invariant moves this row +with it. + +| Invariant | Owner | Where | +|---|---|---| +| Every implementation or repair attempt starts with fresh context in a fresh isolated worktree | AttemptRuntime, over a PlatformSafety checkout lease | `src/runtime/attempt-runtime.ts`, `src/runtime/worktree-manager.ts`, `src/platform/platform-safety.ts` | +| Implementers cannot review, approve, or accept their own work | PipelineRuntime dispatches each role as a separate Producer invocation; RunDecision is the only path to a verdict | `src/pipeline/`, `src/runtime/run-decision.ts` | +| Independent reviewers evaluate frozen candidate bytes without implementer context | ArtifactStore freezes; PipelineRuntime launches reviewers fresh | `src/runtime/artifact-store.ts`, `src/pipeline/role-prompts.ts` | +| Read-only roles cannot mutate files, Git state, processes, or external systems | ProducerRuntime's launch policy — empty write allowlist, `forbiddenScope: ["**/*"]`, read-only sandbox request — plus the platform sandbox backend | `src/producers/producer-runtime.ts`, `src/platform/sandbox/` | +| Roles communicate only through versioned durable artifacts | The protocol types and their canonical schemas | `src/protocol/`, `runtime/schemas/` | +| Verification is objective, recorded, and rerunnable; Producer claims are never evidence | AcceptanceVerifier, under the verification mode RunDecision selects | `src/verify/acceptance-verifier.ts`, `src/verify/structural-verifier.ts` | +| Acceptance is governed by a configured decision authority, and every decision's provenance is recorded | RunDecision computes the verdict; ControlledIntegrator refuses unknown provenance | `src/runtime/run-decision.ts`, `src/integrate/controlled-integrator.ts` | +| Workflow state, decisions, evidence, and recovery data survive process failure | PlatformSafety owns durable writes, lease and lock ownership; ArtifactStore and RecoveryManager own the archive and its replay | `src/platform/platform-safety.ts`, `src/runtime/artifact-store.ts`, `src/runtime/recovery-manager.ts` | +| Final review covers the whole candidate branch and every attempt, not the latest patch | FinalBranchReviewer for autopilot; PipelineRuntime's final round otherwise | `src/autopilot/final-branch-reviewer.ts`, `src/pipeline/pipeline-runtime.ts` | + +Four subsystems carry most of this weight, and each has one job: + +- **ProducerRuntime** — how an untrusted Producer is described, probed, prompted, and + launched. Public surface: `probe(id)`, `launch(request)`. +- **PlatformSafety** — how anything may mutate durable repository state safely. Public + surface: `withCheckoutLease`, `withRecoveryLease`, `writeAtomic`. +- **RunDecision** — what a run is, whether it may be accepted without a person, and what + a given verification will check. Public surface: `evaluate(runId)`, `verify({ mode, … })`. +- **PipelineRuntime** — rounds, gates, and the run's outcome; it owns no policy of its own. + + ## Fresh-context pipeline `delegatePipeline` adds correctness and systems review rounds, optional fix rounds, gates, and a final clean-room verification. `src/pipeline/role-prompts.ts` labels candidate diffs and test evidence as untrusted data. Each reviewer and verifier is launched as a new Producer invocation; read-only roles receive an empty write allowlist, `forbiddenScope: ["**/*"]`, and a read-only sandbox request. A fixer receives the original bounded write policy. This is fresh process/model context, not a mathematical guarantee that a provider retains no server-side state. diff --git a/docs/MARKETPLACE_REVIEW.md b/docs/MARKETPLACE_REVIEW.md index 7ef84ee..19d502c 100644 --- a/docs/MARKETPLACE_REVIEW.md +++ b/docs/MARKETPLACE_REVIEW.md @@ -19,11 +19,54 @@ No Producer can mark its own work accepted. `decideCandidate` records a provenan ## Executables invoked -The plugin starts a suitable `node` executable and uses `git`. Depending on the chosen Producer it may invoke `codex`, `opencode`, `pi`, or `pythinker`. Platform confinement/supervision can invoke macOS `/usr/bin/sandbox-exec`, Linux sandbox tooling such as `bwrap` when that backend is selected, and Windows watchdog/helper binaries. Verification invokes only the executable and argv explicitly authorized in the Delegation Spec. The plugin does not expose an unrestricted shell MCP tool. +The plugin starts a suitable `node` executable and uses `git`. Depending on the chosen Producer it may invoke `codex`, `opencode`, `pi`, `pythinker`, `agy`, or `claude`. Platform confinement/supervision can invoke macOS `/usr/bin/sandbox-exec`, Linux sandbox tooling such as `bwrap` when that backend is selected, and Windows watchdog/helper binaries. Verification invokes only the executable and argv explicitly authorized in the Delegation Spec. The plugin does not expose an unrestricted shell MCP tool. ## Supported operating systems -The plugin is designed for macOS, Linux, and Windows process/runtime operation. Security capability is narrower than basic runtime compatibility: the Codex MCP edit path is certified on native macOS arm64 with `codex-native-sandbox`; native Linux is marked tested; native Windows Codex editing is unsupported and must fail eligibility checks. Every Producer/platform combination is capability-gated. An unavailable combination fails closed without unconfined execution or substitution, and certification must not be inferred across Producers, backends, or operating systems. +The plugin is designed for macOS, Linux, and Windows process/runtime operation. Security +capability is narrower than basic runtime compatibility: every Producer/platform +combination is capability-gated, an unavailable combination fails closed without +unconfined execution or substitution, and certification is never inferred across +Producers, backends, or operating systems. + +### Edit-lane confinement evidence + +Three words, and each means something different. **Certified**: a real opt-in confinement +gate has been run on that platform and recorded. **Tested**: the lane runs there under CI +and integration tests, without a recorded confinement gate. **Unsupported**: the runtime +refuses the edit lane there — the eligibility check fails closed, so there is nothing to +certify. A blank is not a lesser claim; every cell below is filled. + +| Edit lane | Confinement backend | macOS arm64 | macOS other arch | Linux (native) | Windows (native) | +|---|---|---|---|---|---| +| `codex-implementer` | `codex-native-sandbox` | certified | unsupported | tested | unsupported | +| `opencode-implementer` | `macos-seatbelt` | certified | unsupported | unsupported | unsupported | +| `pi-implementer` | `macos-seatbelt` | certified | unsupported | unsupported | unsupported | +| `pythinker-implementer` | `macos-seatbelt` | certified | unsupported | unsupported | unsupported | +| `agy-implementer` | `macos-seatbelt` | certified | unsupported | unsupported | unsupported | +| `claude-implementer` | `macos-seatbelt` | certified | unsupported | unsupported | unsupported | + +Each cell is the state `selectSandboxBackend` returns for that lane's backend on that +platform — the same value the eligibility check uses, so the table cannot drift from +behavior without the runtime changing. The evidence sits on the *backend*, not the lane: +`macos-seatbelt` was certified on darwin/arm64 on 2026-07-16 by the opt-in +`RUN_SEATBELT_CONFINEMENT_GATE` test (a worktree write permitted, a write outside it +blocked), and the five lanes above inherit that one proof rather than each carrying its +own. The table is `src/platform/sandbox/backends.ts` restated; that file is the contract, +and a state there may only be promoted by a real green CI or integration run. `macos-seatbelt` +declares no Linux or Windows platform at all, which is why five of the six lanes are +unsupported for editing off macOS: with no backend, `selectSandboxBackend` returns +`no-write-confinement-backend` and the edit lane is refused. + +**No lane has native Windows edit evidence, and none is claimed.** Windows is a supported +*runtime* platform — the MCP server, process supervision via the packaged watchdog and +helper binaries, recovery, and the read-only and verification paths run there under CI — +but no Producer may edit a checkout on native Windows, because no confinement backend +covers it. Producing that evidence requires a Windows write-confinement backend, not a +smoke run against the current build: the opt-in real-adapter smoke on a Windows runner +would today record the same fail-closed refusal the table already states. + +WSL is a Linux execution environment and is evaluated as Linux, never as native Windows. ## Network destinations @@ -47,7 +90,7 @@ The user chooses the Producer when none is named. After a verified candidate or Primary threats are malicious Producer output, prompt injection in repository/diff content, a compromised Producer CLI, scope escape, forged test claims, candidate substitution, state races, credential leakage, and unauthorized acceptance. Mitigations include versioned validation, OS sandboxing where eligible, detached worktrees, environment minimization, timeouts/process-tree cleanup, post-run allowlist checks, Git object anchoring, manifest hashes, separate Host verification, read-only fresh reviewers, bounded/redacted archives, crash recovery with process start tokens, and hash-gated integration. -Known limitations are material: only macOS arm64 Codex is certified; Linux is tested and native Windows Codex editing is unsupported; other Producer/platform combinations depend on reported capability and eligibility; prompt injection and subtle malicious code can pass review/tests; provider retention is outside plugin control; redaction is best effort; same-user or host compromise is out of scope; policy acceptance is not proof of safety; and elicited decisions are not cryptographically authenticated. +Known limitations are material: editing is confined only on macOS arm64 (Codex additionally tested on Linux), and no lane may edit on native Windows; other Producer/platform combinations depend on reported capability and eligibility; prompt injection and subtle malicious code can pass review/tests; provider retention is outside plugin control; redaction is best effort; same-user or host compromise is out of scope; policy acceptance is not proof of safety; and elicited decisions are not cryptographically authenticated. ## Installation diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..ba8d65b --- /dev/null +++ b/docs/README.md @@ -0,0 +1,91 @@ +# Documentation index + +Every document under `docs/` is listed here with a status. Nothing is unlabeled: +an unlabeled design document is indistinguishable from a current contract, and +this repository keeps its historical plans on purpose. + +| Status | Meaning | +|---|---| +| **Current** | Describes the runtime as it ships today. Keep it true. | +| **Historical** | A record of work that shipped. Accurate about its moment, not about today. Do not implement from it. | +| **Superseded** | Replaced by a named document. Read the successor instead. | + +When prose here disagrees with an executable contract, the precedence in +`AGENTS.md` § Sources of truth decides, and the prose is what gets corrected. + +## Current reference + +| Document | Covers | +|---|---| +| [ARCHITECTURE.md](ARCHITECTURE.md) | Subsystems, their boundaries, and which one owns each trust invariant. | +| [SECURITY_MODEL.md](SECURITY_MODEL.md) | What the runtime defends, and the mechanism that defends it. | +| [TRUST_BOUNDARIES.md](TRUST_BOUNDARIES.md) | Where untrusted input crosses into trusted code, and what validates it. | +| [THREAT_MODEL.md](THREAT_MODEL.md) | Adversaries, their capabilities, and the controls that stop them. | +| [PLUGIN_COMPONENTS.md](PLUGIN_COMPONENTS.md) | What the packaged plugin contains and how Claude Code loads it. | +| [operations.md](operations.md) | Filesystem layout, retention, cleanup guarantees, and recovery for operators. | +| [PRIVACY.md](PRIVACY.md) | What leaves the machine, per Producer. | +| [MARKETPLACE_REVIEW.md](MARKETPLACE_REVIEW.md) | Confinement matrix and the evidence behind each lane/platform claim. | + +## Design review + +| Document | Status | Note | +|---|---|---| +| [design-review/reference-spec.md](design-review/reference-spec.md) | Current | The fresh-context delegation CLI contract the runtime implements. | +| [design-review/02-role-separation.md](design-review/02-role-separation.md) | Current | Role separation and the review pipeline; the trust invariants in `AGENTS.md` restate it. | +| [design-review/enhancement-plan.md](design-review/enhancement-plan.md) | Historical | Dynamic delegation workflow proposals; the sliced pipeline that shipped is specified in `superpowers/specs/2026-07-18-sliced-delegation-design.md`. | + +## Research + +Point-in-time investigations. Each is accurate as of its date and is not +maintained afterwards. + +| Document | Status | Note | +|---|---|---| +| [research/2026-07-13-fable-5-safeguard-trigger.md](research/2026-07-13-fable-5-safeguard-trigger.md) | Historical | Why a model switch fired during `/delegate`. | +| [research/2026-07-27-github-actions-runner-design.md](research/2026-07-27-github-actions-runner-design.md) | Current | The cross-platform CI matrix in use. | +| [research/2026-08-08-dynamic-workflow-analysis.md](research/2026-08-08-dynamic-workflow-analysis.md) | Historical | Dynamic-workflow analysis behind the autopilot lifecycle. | + +## Design specifications + +A spec states the contract a change was built to. It is historical once the +change ships and the runtime becomes the contract, unless it is still the +clearest statement of a rule that has not moved. + +| Document | Status | Note | +|---|---|---| +| [specs/2026-07-14-disable-codex-multi-agent-design.md](superpowers/specs/2026-07-14-disable-codex-multi-agent-design.md) | Current | Nested delegation is still refused exactly as specified. | +| [specs/2026-07-15-fresh-context-review-pipeline-design.md](superpowers/specs/2026-07-15-fresh-context-review-pipeline-design.md) | Current | Fresh-context implement/review/repair rounds. | +| [specs/2026-07-17-delegation-contract-repair-design.md](superpowers/specs/2026-07-17-delegation-contract-repair-design.md) | Historical | Shipped in 0.17.0. | +| [specs/2026-07-17-legacy-codex-mcp-migration-design.md](superpowers/specs/2026-07-17-legacy-codex-mcp-migration-design.md) | Historical | Migration completed in 0.25.0; no legacy path remains. | +| [specs/2026-07-18-agent-guide-hardening-design.md](superpowers/specs/2026-07-18-agent-guide-hardening-design.md) | Superseded | Superseded by `AGENTS.md` at the repository root, which is the live agent contract. | +| [specs/2026-07-18-ralph-loop-integration-design.md](superpowers/specs/2026-07-18-ralph-loop-integration-design.md) | Current | Iterative implementation increments. | +| [specs/2026-07-18-sliced-delegation-design.md](superpowers/specs/2026-07-18-sliced-delegation-design.md) | Current | Slice waves, dependencies, and composition. | +| [specs/2026-07-23-native-subagent-delegation-design.md](superpowers/specs/2026-07-23-native-subagent-delegation-design.md) | Current | Which architect-side roles a Claude subagent may take. | +| [specs/2026-07-27-pr-23-ci-and-review-cleanup-design.md](superpowers/specs/2026-07-27-pr-23-ci-and-review-cleanup-design.md) | Historical | One PR's cleanup; shipped in 0.41.0. | +| [specs/2026-08-04-agy-producer-adapter-design.md](superpowers/specs/2026-08-04-agy-producer-adapter-design.md) | Superseded | The adapter is now a Producer Descriptor; see `ARCHITECTURE.md` § ProducerRuntime. | +| [specs/2026-08-04-agy-lane-smoke-test.md](superpowers/specs/2026-08-04-agy-lane-smoke-test.md) | Current | The opt-in real-adapter smoke procedure for the agy lane. | +| [specs/2026-08-27-claude-producer-adapter-design.md](superpowers/specs/2026-08-27-claude-producer-adapter-design.md) | Superseded | The adapter is now a Producer Descriptor; see `ARCHITECTURE.md` § ProducerRuntime. | + +## Implementation plans + +Every plan below shipped. They record what was intended and in what order; the +runtime, its schemas, and its tests are what it actually does. All are +**Historical**. + +| Plan | Shipped in | +|---|---| +| [plans/2026-07-13-codex-runner-stdin-forwarding.md](superpowers/plans/2026-07-13-codex-runner-stdin-forwarding.md) | Pre-0.9.0 Codex lane | +| [plans/2026-07-13-lane-architecture-enhancements.md](superpowers/plans/2026-07-13-lane-architecture-enhancements.md) | Pre-0.9.0 lane architecture | +| [plans/2026-07-14-bounded-delegation-attempt.md](superpowers/plans/2026-07-14-bounded-delegation-attempt.md) | Attempt Runtime bounds | +| [plans/2026-07-14-disable-codex-multi-agent.md](superpowers/plans/2026-07-14-disable-codex-multi-agent.md) | Nested-delegation refusal | +| [plans/2026-07-14-p0-runtime-implementation.md](superpowers/plans/2026-07-14-p0-runtime-implementation.md) | P0 runtime | +| [plans/2026-07-15-fresh-context-review-pipeline.md](superpowers/plans/2026-07-15-fresh-context-review-pipeline.md) | Review pipeline | +| [plans/2026-07-15-p0b-cross-platform-hardening.md](superpowers/plans/2026-07-15-p0b-cross-platform-hardening.md) | 0.9.0 | +| [plans/2026-07-15-p0c-producer-completion.md](superpowers/plans/2026-07-15-p0c-producer-completion.md) | 0.13.0 | +| [plans/2026-07-16-dogfood-hardening-wave.md](superpowers/plans/2026-07-16-dogfood-hardening-wave.md) | 0.14.0 | +| [plans/2026-07-16-orphan-cleanup-and-spec-tightening.md](superpowers/plans/2026-07-16-orphan-cleanup-and-spec-tightening.md) | 0.15.0 | +| [plans/2026-07-17-delegation-contract-repair.md](superpowers/plans/2026-07-17-delegation-contract-repair.md) | 0.17.0 | +| [plans/2026-07-17-legacy-codex-mcp-migration.md](superpowers/plans/2026-07-17-legacy-codex-mcp-migration.md) | 0.25.0 | +| [plans/2026-07-18-ralph-loop-integration.md](superpowers/plans/2026-07-18-ralph-loop-integration.md) | Iterative increments | +| [plans/2026-07-18-sliced-delegation.md](superpowers/plans/2026-07-18-sliced-delegation.md) | 0.21.0–0.23.0 | +| [plans/2026-07-23-native-subagent-delegation-phase-a.md](superpowers/plans/2026-07-23-native-subagent-delegation-phase-a.md) | 0.29.0 | diff --git a/docs/SECURITY_MODEL.md b/docs/SECURITY_MODEL.md index 44ec414..f927742 100644 --- a/docs/SECURITY_MODEL.md +++ b/docs/SECURITY_MODEL.md @@ -2,6 +2,9 @@ Claude Architect treats repository content, Producer output, model text, and command output as untrusted. The Host runtime and the human-controlled Claude session form the control plane. The main security objective is to prevent an implementation Producer from silently expanding its scope or causing unreviewed bytes to enter the user's checkout. +Each invariant named here has exactly one owner in the source; the mapping is +[ARCHITECTURE.md § Who owns each trust invariant](ARCHITECTURE.md#who-owns-each-trust-invariant). + ## Components that execute code `runtime/bootstrap.mjs` executes Node.js and starts the MCP server. The Host runtime invokes `git`, the selected Producer CLI (`codex`, `opencode`, `pi`, `pythinker`, or `agy`), OS confinement helpers such as `/usr/bin/sandbox-exec` on supported macOS systems, Linux sandbox tooling when selected, and the packaged Windows watchdog/helper. Verification executes only commands listed in the validated Delegation Spec. diff --git a/docs/THREAT_MODEL.md b/docs/THREAT_MODEL.md index 9781e7c..261f4c0 100644 --- a/docs/THREAT_MODEL.md +++ b/docs/THREAT_MODEL.md @@ -2,6 +2,9 @@ This model covers every Producer adapter exposed through the MCP implementation path. It assumes the local OS, user account, Node.js runtime, Git executable, and Claude Code host are not already fully compromised. It does not assume that repository text, generated code, Producer output, or model-provider responses are trustworthy. +Each invariant named here has exactly one owner in the source; the mapping is +[ARCHITECTURE.md § Who owns each trust invariant](ARCHITECTURE.md#who-owns-each-trust-invariant). + ## Assets Assets include the integrity and confidentiality of the user's repository and Git history; uncommitted work; credentials and environment variables; filesystem data outside the delegated scope; the correctness of verification evidence; candidate/decision integrity; plugin run logs; provider account access; and the integrity of the configured human/policy authority that may accept and integrate a candidate. diff --git a/docs/TRUST_BOUNDARIES.md b/docs/TRUST_BOUNDARIES.md index 564e585..ea80e3d 100644 --- a/docs/TRUST_BOUNDARIES.md +++ b/docs/TRUST_BOUNDARIES.md @@ -2,6 +2,9 @@ Claude Architect separates planning and acceptance from untrusted implementation. “Trusted” here means trusted to enforce workflow policy, not infallible or safe from a compromised host. +Each invariant named here has exactly one owner in the source; the mapping is +[ARCHITECTURE.md § Who owns each trust invariant](ARCHITECTURE.md#who-owns-each-trust-invariant). + ```mermaid flowchart LR H[Human operator] -->|requirements, Producer choice, authority policy| C[Claude architect session] diff --git a/docs/autopilot-terminal-states.md b/docs/autopilot-terminal-states.md new file mode 100644 index 0000000..374ee48 --- /dev/null +++ b/docs/autopilot-terminal-states.md @@ -0,0 +1,12 @@ +# Autopilot terminal states + +What each terminal state proves, and what it forbids. The delegate skill points here. + +The controller may proceed without a mid-loop prompt only while every eligibility and shipping gate remains objectively proven. Interpret terminal states exactly: + +- `ready-for-human-review`: the workflow branch was pushed, the draft PR was proven for the expected head, configured required checks were green for that head, the PR was marked ready, and runtime cleanup completed. Review the cumulative PR evidence; only the human may merge or otherwise advance `main`. +- `human-decision-required`: ambiguity, a non-waivable finding, ownership mismatch, shipping uncertainty, or another fail-closed condition requires a human decision. Preserve the workflow branch, worktree, and evidence; do not improvise continuation. +- `failed`: the workflow ended without authority to ship. Present the durable reason and evidence. Do not claim the PR is ready or retry under altered policy. +- `cancelled`: cancellation is a durable terminal classification. Present preserved cleanup/evidence and do not resume it as if non-terminal; a human chooses any next action. + +Autopilot is autonomous only up to a PR ready for human review. It never merges, deploys, releases, or deletes the remote feature branch. Successful cleanup removes temporary local workflow resources while retaining durable evidence and recovery records; fail-closed terminals retain what the runtime needs for inspection. diff --git a/docs/decision-authority.md b/docs/decision-authority.md new file mode 100644 index 0000000..3a8546b --- /dev/null +++ b/docs/decision-authority.md @@ -0,0 +1,8 @@ +# Candidate decision authority + +Which decisions the runtime may record without a person, what it refuses, and what +integration accepts. `CLAUDE_ARCHITECT_DECISION_AUTHORITY` selects the authority; +unset or `autonomous` is the shipped default, `human` requires confirmation for every +decision. + +Under the shipped `autonomous` authority, `decideCandidate` records `accepted` as `policy-autonomous` without elicitation for any independently verified candidate carrying no failure and no advisory warnings from a readable archive — either a `delegatePipeline` candidate with a well-formed `pipelineGateCleared` record bound to the same candidate commit and `requiresHumanDecision:false`, or a plain `delegate` candidate, which carries no pipeline evidence at all and is judged on its independent verification result alone. Every other case — including rejection, revision, refusal, incomplete review, malformed or mismatched clearance, and every decision under `human` — raises an MCP elicitation prompt and records nothing unless a person confirms; `elicitation-unavailable`, `decision-not-confirmed`, and `elicitation-failed` all mean no decision was written. Do not treat a refused confirmation as a transient error to retry; report it and stop. The recorded decision carries `decidedBy` and the candidate `manifestHash` it binds to. Integration accepts `human-elicitation` and `policy-autonomous` provenance, while refusing a different artifact and any legacy or caller-asserted acceptance. diff --git a/docs/delegation-monitoring.md b/docs/delegation-monitoring.md new file mode 100644 index 0000000..34644da --- /dev/null +++ b/docs/delegation-monitoring.md @@ -0,0 +1,36 @@ +# Monitoring a backgrounded delegation + +`delegate` and `delegatePipeline` are synchronous, but the host auto-backgrounds +a long call (after roughly 120s) and then surfaces only a generic "1 MCP task +still running" line; the in-band progress phases stop being visible there. A +producer alone almost always runs longer than the background threshold, so most +of a real delegation happens after the collapse. When a call backgrounds, do not +go silent — report a real status line by reading the run's durable artifacts. + +Correlate the run without guessing: + +1. Before dispatch, snapshot the run directories under the state dir + (`CLAUDE_PLUGIN_DATA/runs` on a host; `CLAUDE_ARCHITECT_STATE_DIR`/tmp under + tests). Reading these directories is read-only observation only. +2. After the call backgrounds, take the newly appeared directory whose + `run-start.json` `canonicalCommonDir` equals this checkout's `.git` and that + has no `result.json` yet. If more than one new matching directory appears — + another session may be delegating against the same repository — report the + ambiguity and do not assume which run is yours. +3. Read `runs//pipeline/.json` for the latest stage: `round-N-…`, + `verification`, then `pipeline-result`. No pipeline artifact yet means the + implement attempt (baseline or producer) is still running. `result.json` + appearing means the run finished. + +After backgrounding the host returns control once; emit a single Live status +line (the FleetView-style format above) then. Continuous status requires scheduled wakeups (about 75s apart, each a full +turn) — only do this when the human explicitly asks for live status, tell them it +costs a turn per update, and never poll tighter than the round cadence. + +Prefer the `delegation-lane` subagent path over run-dir polling; polling remains the fallback for direct calls and for lane-report recovery via `specSha256`. + +## What the host's MCP call count means + +One manual run uses a two-call MCP preflight: `validateDelegationSpec` is read-only and starts no Producer; then exactly one `delegate` or `delegatePipeline` execution call may start Producers. Claude Code may group both under “Calling plugin:claude-architect:runtime 2 times”; that count is MCP calls, not Producer attempts. A plain `delegate` execution run starts exactly one Producer attempt (the implementation attempt; edit mode may first launch the same selected Producer in a separate environment-preflight probe that cannot produce candidate bytes), while a `delegatePipeline` run may start multiple fresh Producers for implementation, review, and repair after that probe. Before a direct manual lifecycle, say `Preflight 1/2 · validate only · no Producer` before validation and `Dispatch 2/2 · one execution call · one run` before execution, so “one run” is never presented as “one runtime call.” + +Once the execution call is pending — including while the host shows `producer running` or after it backgrounds — never invoke `delegate` or `delegatePipeline` again, revalidate in parallel, or interpret a heartbeat as permission to retry. Wait for the original result: a second execution call creates a second run. Repair and revalidate only after the original call has returned an explicit pre-start validation or spec-identity error. diff --git a/docs/delegation-presentation.md b/docs/delegation-presentation.md new file mode 100644 index 0000000..f2031c9 --- /dev/null +++ b/docs/delegation-presentation.md @@ -0,0 +1,60 @@ +# Presenting a delegation + +Card and status-line templates for autopilot workflows and direct MCP calls. +Presentation only: a rendered card is not evidence. + +Presentation only. A rendered card is not evidence; it renders the runtime's durable +artifacts and never replaces spec construction, `reviewCandidate`, the recorded decision, +or `integrateCandidate`. Never invent progress, display a Producer self-report as +evidence, or equate policy acceptance with merge. + +Status glyphs, everywhere: `●` running (host-rendered for lane agents) · `◑` decision +pending or `human-decision-required` · `✓` verified, accepted, or +`ready-for-human-review` · `✗` failed, unavailable, cancelled, or rejected. + +## Autopilot workflows + +Surface the workflow in the Claude Code subagent look and feel, but treat the card as presentation rather than evidence: + +```text +▸ Autopilot · codex-implementer workflow-owned branch + Task <3–5 word description> + Model GPT-5.6 Sol · reasoning low + Phase running-task Workflow +``` + +Use one compact status line derived from `autopilotStatus`, for example `● running-task · task 1/2`. Use `◑` for `human-decision-required`, `✓` for `ready-for-human-review`, and `✗` for `failed` or `cancelled`. Never invent progress, display a Producer self-report as evidence, or equate policy acceptance with merge. + +## Direct MCP calls + +When a lane runs through the `delegation-lane` agent, the host renders dispatch and live status natively; the cards below apply only to direct (non-subagent) MCP calls. This is presentation only: it renders the runtime's durable evidence and never replaces spec construction, `reviewCandidate`, the recorded decision, or `integrateCandidate`. A rendered card is not evidence; a Producer self-report is not evidence; acceptance stays gated on independent verification and its provenance is always recorded. + +**Dispatch card** — emit when you call `delegate`/`delegatePipeline`, so the run reads like an `Agent` launch: + +```text +▸ Agent · codex-implementer edit · worktree-isolated + Task <3–5 word description> + Model GPT-5.6 Sol · reasoning low + Mode foreground Pipeline delegatePipeline +``` + +**Live status** — one FleetView-style line while the call runs and after the host collapses it to background. Derive it only from the run's durable artifacts using the rules in *Monitoring a backgrounded delegation*; never invent progress. + +```text +● running · codex-implementer · verification · 4m12s +``` + +Status glyphs: `●` running (host-rendered for lane agents) · `◑` decision pending · `✓` verified/accepted · `✗` failed, unavailable, cancelled, or rejected. The decision line appears only on decision-bearing outcomes. + +**Completion notification** — when the call returns, render one compact box populated from the `reviewCandidate` evidence and verification report (mirrors a background subagent's completion notice): + +```text +┌ ✓ delegation-lane · codex · verified-candidate ───────── +│ lane task1 · 1 file changed · verification 2/2 pass +│ producer self-report conflicts: none +│ manifestHash cebcb2a8… +│ ◑ YOUR DECISION: accept / reject / revise +└────────────────────────────────────────────────────────── +``` + +The box summarizes; it does not decide. Still read the exact unredacted patch, changed-path manifest, and verification evidence before recommending a decision, and present `failed` or `human-decision-required` outcomes verbatim. diff --git a/docs/sliced-pipeline.md b/docs/sliced-pipeline.md new file mode 100644 index 0000000..8c86da9 --- /dev/null +++ b/docs/sliced-pipeline.md @@ -0,0 +1,69 @@ +# Sliced pipeline + +Reference for the `slices` array in a Delegation Spec. The delegate skill +points here; the rules below are the contract the runtime enforces. + +For a task that decomposes into ordered, independently testable steps, add a +top-level `slices` array to the spec. Each slice is a scoped mini-spec with its +own `objective`, `context`, `writeAllowlist`, `forbiddenScope`, +`successCriteria`, and — required — its own `verification`: + +```yaml +slices: + - objective: Add the parser for the new record type. + context: The record grammar lives in docs/format.md. + writeAllowlist: [src/parse/**] + forbiddenScope: [src/emit/**] + successCriteria: + - New record type round-trips through the parser. + verification: + - id: parse-tests + executable: npx + args: [vitest, run, tests/parse] + cwd: "." + timeoutMs: 600000 + network: denied + expectedExitCodes: [0] + - objective: Emit the new record type. + # ...its own scope and verification +``` + +Slice rules and guarantees: + +- Each slice runs **fresh with no context** — a slice implementer sees only its + own mini-spec, never a prior slice's conversation, and is gated only by its + own `verification`. Each slice's `writeAllowlist` must be a subset of the + spec's, and its verification `cwd` must stay inside the candidate root. +- A deterministic wayfinder routes each completed slice **advance / repair / + halt** from objective gate results — the slice's own `verification`, plus its + independent per-slice review findings when `review.perSlice` is enabled — + never from model judgment or a Producer's self-report. A slice that passes + advances; a slice that fails is repaired within its round budget; a slice that + cannot be made to pass halts the run. +- Slices run **sequentially by default**. A slice may declare `dependsOn` — the + 1-based indices of the slices it must observe — and the spec may raise + `sliceConcurrency`. Slices then run together only when their dependencies + allow it *and* their write allowlists are pairwise disjoint, which is what + makes composing their results a conflict-free union. Omitting `dependsOn` + means "after every preceding slice", so an existing spec behaves exactly as + before. +- Declaring `dependsOn` is a claim about what a slice needs to *see*, not only + about what it writes. A slice that reads another slice's output depends on it + even with disjoint allowlists. Nothing detects an under-declared dependency: + a slice that runs too early is verified against a base without the work it + needed, and the error surfaces at the composed verification below. Declare + `dependsOn: []` only when a slice is genuinely independent. +- Review and the advisor judge the **composed candidate** at the end, over the + whole slice branch, and that composed candidate always faces the spec's full + `verification` regardless of how the slices were scheduled. Per-slice results + never substitute for it. Per-slice review is off by default; opt in with + `review.perSlice: true` to review each slice as it lands. +- A mid-run halt **after at least one slice has advanced** yields a **partial** + candidate with `status: "human-decision-required"`, the halted slice index in + `haltedSliceIndex`, and each slice's route in `slices`; the promoted partial + branch (the advanced slices) is a real candidate the human may accept, reject, + or revise, and the halted slice's attempts stay in `slices` as evidence. A + halt on the very first slice, with nothing advanced, is reported `failed` with + the slice evidence retained — there is no partial branch to accept. Present + the completed slices, the halt reason, and the partial candidate to the human; + never accept or continue past a halt on their behalf. diff --git a/docs/verification-preflight.md b/docs/verification-preflight.md new file mode 100644 index 0000000..2220c6c --- /dev/null +++ b/docs/verification-preflight.md @@ -0,0 +1,14 @@ +# Verification preflight and `expectBaselineFailure` + +Reference for the baseline gate the runtime runs before every dispatch. The +delegate skill states the rule; this page states why each part of it exists. + +Set `baselineFailureExitCodes` alongside the flag whenever the runner distinguishes "the test ran and failed" from "the test could not be collected". Without it, any completed non-zero exit satisfies the flag, so a missing test file (pytest exit 4 or 5) proves exactly what a genuine RED assertion proves — nothing. Declaring `[1]` for pytest turns the baseline into a real fail-before/pass-after proof; omit it only when the runner has no such distinction. + +The flag is enforced in both directions. It declares that the command *runs* at clean HEAD and *reports failure*, so the baseline gate rejects a command carrying it that could not run at all — unresolvable executable, timeout, cancellation, or death by signal — and equally rejects one that passes, because a green run contradicts the declaration and leaves no fail-before/pass-after evidence. A command whose baseline behavior surprises you is a spec defect to repair, not a result to reinterpret. + +The flag is all-or-nothing for the command it sits on: a tolerated command proves nothing at baseline. So do not blanket-mark the command set. When a command would cover both a path that already exists and a path the candidate creates, split it in two — one command over the existing paths with the flag absent, one over the new paths with the flag set — so a real lint, type, or test regression at clean HEAD still surfaces. Marking every command tolerant, which is the tempting shortcut when a new test file appears in several of them, silently disables the entire baseline signal for the attempt. + +## Text-search gates + +- A text-search gate must not be able to match prose. An absence check such as `rg "except RuntimeError" ` with `expectedExitCodes: [1]` also matches the phrase inside a comment, a docstring, or a changelog line — so a Producer that writes a comment reading "Deliberately NOT `except RuntimeError`" fails a gate its code actually satisfies, and the attempt is rejected for a comment. Anchor the pattern to the syntax you mean (`^\s*except RuntimeError\b`), exclude comment lines, or assert over a parsed structure instead of raw text. The same trap applies to any grep-style presence check whose pattern is an ordinary English phrase. diff --git a/runtime/schemas/pipeline-gate-cleared.v1.json b/runtime/schemas/pipeline-gate-cleared.v1.json new file mode 100644 index 0000000..6e2e441 --- /dev/null +++ b/runtime/schemas/pipeline-gate-cleared.v1.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "pipeline-gate-cleared.v1.json", + "type": "object", + "additionalProperties": false, + "required": [ + "clearedVersion", + "candidateCommitOid", + "requiresHumanDecision" + ], + "properties": { + "clearedVersion": { + "const": "1" + }, + "candidateCommitOid": { + "type": "string", + "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" + }, + "requiresHumanDecision": { + "type": "boolean" + }, + "clearedAt": { + "type": "string", + "format": "date-time" + } + } +} diff --git a/runtime/server.mjs b/runtime/server.mjs index f486977..564ed1b 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -4352,15 +4352,15 @@ var require_core = __commonJS({ } return metaSchema; } - _removeAllSchemas(schemas6, regex) { - for (const keyRef in schemas6) { - const sch = schemas6[keyRef]; + _removeAllSchemas(schemas7, regex) { + for (const keyRef in schemas7) { + const sch = schemas7[keyRef]; if (!regex || regex.test(keyRef)) { if (typeof sch == "string") { - delete schemas6[keyRef]; + delete schemas7[keyRef]; } else if (sch && !sch.meta) { this._cache.delete(sch.schema); - delete schemas6[keyRef]; + delete schemas7[keyRef]; } } } @@ -10748,12 +10748,12 @@ var ZodTuple = class _ZodTuple extends ZodType { }); } }; -ZodTuple.create = (schemas6, params) => { - if (!Array.isArray(schemas6)) { +ZodTuple.create = (schemas7, params) => { + if (!Array.isArray(schemas7)) { throw new Error("You must pass an array of schemas to z.tuple([ ... ])"); } return new ZodTuple({ - items: schemas6, + items: schemas7, typeName: ZodFirstPartyTypeKind.ZodTuple, rest: null, ...processCreateParams(params) @@ -23736,7 +23736,7 @@ function toJSONSchema(input, params) { const [_, schema] = entry; process2(schema, ctx2); } - const schemas6 = {}; + const schemas7 = {}; const external = { registry: registry3, uri: params?.uri, @@ -23746,15 +23746,15 @@ function toJSONSchema(input, params) { for (const entry of registry3._idmap.entries()) { const [key, schema] = entry; extractDefs(ctx2, schema); - schemas6[key] = finalize(ctx2, schema); + schemas7[key] = finalize(ctx2, schema); } if (Object.keys(defs).length > 0) { const defsSegment = ctx2.target === "draft-2020-12" ? "$defs" : "definitions"; - schemas6.__shared = { + schemas7.__shared = { [defsSegment]: defs }; } - return { schemas: schemas6 }; + return { schemas: schemas7 }; } const ctx = initializeContext({ ...params, processors: allProcessors }); process2(input, ctx); @@ -34922,6 +34922,35 @@ var run_status_v1_default = { ] }; +// runtime/schemas/pipeline-gate-cleared.v1.json +var pipeline_gate_cleared_v1_default = { + $schema: "https://json-schema.org/draft/2020-12/schema", + $id: "pipeline-gate-cleared.v1.json", + type: "object", + additionalProperties: false, + required: [ + "clearedVersion", + "candidateCommitOid", + "requiresHumanDecision" + ], + properties: { + clearedVersion: { + const: "1" + }, + candidateCommitOid: { + type: "string", + pattern: "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" + }, + requiresHumanDecision: { + type: "boolean" + }, + clearedAt: { + type: "string", + format: "date-time" + } + } +}; + // src/protocol/schema-loader.ts var DELEGATION_SPEC_SCHEMA_KEY = "delegation-spec.v1.json"; var ISO_DATE_TIME = /^([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:\.[0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9])$/u; @@ -34958,7 +34987,8 @@ function loadSchemas() { advisorReport: ajv.compile(advisor_report_v1_default), autopilotEligibility: ajv.compile(autopilot_eligibility_v1_default), autopilotWorkflowState: ajv.compile(autopilot_workflow_state_v1_default), - runStatus: ajv.compile(run_status_v1_default) + runStatus: ajv.compile(run_status_v1_default), + pipelineGateCleared: ajv.compile(pipeline_gate_cleared_v1_default) }; } function checkVersionCompat(skillProtocolVersion) { @@ -39408,9 +39438,6 @@ function gitChangedFiles(checkoutPath, deps = {}) { return execute(checkoutPath, CHANGED_FILES_ARGS, deps); } -// src/mcp/tools.ts -import { createHash as createHash15 } from "node:crypto"; - // src/autopilot/autopilot-controller.ts import { randomUUID as randomUUID10 } from "node:crypto"; @@ -40151,39 +40178,11 @@ function evaluateAutopilotEligibility(input) { } // src/autopilot/final-branch-reviewer.ts -import { createHash as createHash11, randomUUID as randomUUID9 } from "node:crypto"; +import { createHash as createHash12, randomUUID as randomUUID9 } from "node:crypto"; import { constants as constants13 } from "node:fs"; import { link as link7, lstat as lstat16, open as open13, readFile as readFile6, rm as rm10 } from "node:fs/promises"; import path25 from "node:path"; -// src/util/glob.ts -function escapeRegex2(character) { - return /[\\^$.*+?()[\]{}|]/.test(character) ? `\\${character}` : character; -} -function globMatches(pattern, candidate, caseInsensitive = false) { - let expression = "^"; - for (let index = 0; index < pattern.length; index += 1) { - const character = pattern[index]; - if (character === void 0) break; - if (character !== "*") { - expression += escapeRegex2(character); - continue; - } - if (pattern[index + 1] !== "*") { - expression += "[^/]*"; - continue; - } - index += 1; - if (pattern[index + 1] === "/") { - expression += "(?:.*/)?"; - index += 1; - } else { - expression += ".*"; - } - } - return new RegExp(`${expression}$`, caseInsensitive ? "i" : void 0).test(candidate); -} - // src/runtime/worktree-manager.ts import { randomUUID as randomUUID6 } from "node:crypto"; import { lstat as lstat11, mkdir as mkdir5, readdir as readdir6, realpath as realpath7, rename as rename5 } from "node:fs/promises"; @@ -42582,6 +42581,10 @@ var WorktreeManager = class { runId; platformServices; dependencies; + /** The repository this manager creates worktrees for. */ + get repositoryRoot() { + return this.repoRoot; + } lockingPlatformServices() { const supplied = this.platformServices; if (typeof supplied.acquireCheckoutLock === "function" && typeof supplied.canonicalizePath === "function") { @@ -43061,6 +43064,41 @@ var WorktreeManager = class { await this.withCheckoutLease(async () => await this.removeUnderLease(worktreePath, expectedIdentity)); } }; +async function cleanupWorktree(worktree) { + try { + await worktree.cleanup(); + return null; + } catch (error51) { + return error51; + } +} +var worktreeCreation = /* @__PURE__ */ new Map(); +function createWorktreeSerially(manager, commit) { + const key = manager.repositoryRoot; + const created = (worktreeCreation.get(key) ?? Promise.resolve()).catch(() => { + }).then(async () => await manager.create(commit)); + const settled = created.catch(() => { + }); + worktreeCreation.set(key, settled); + void settled.then(() => { + if (worktreeCreation.get(key) === settled) worktreeCreation.delete(key); + }); + return created; +} +async function withManagedWorktree(args) { + const worktree = await createWorktreeSerially(args.manager, args.commit); + try { + return await args.run(worktree.path); + } finally { + const cleanupError = await cleanupWorktree(worktree); + if (cleanupError !== null) { + logger.warn(args.cleanupFailureMessage, { + error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)) + }); + args.onCleanupFailure?.(cleanupError); + } + } +} // src/verify/project-verifier.ts import { realpath as realpath8 } from "node:fs/promises"; @@ -43364,8 +43402,63 @@ async function projectVerify(args) { } } +// src/util/glob.ts +function escapeRegex2(character) { + return /[\\^$.*+?()[\]{}|]/.test(character) ? `\\${character}` : character; +} +function globMatches(pattern, candidate, caseInsensitive = false) { + let expression = "^"; + for (let index = 0; index < pattern.length; index += 1) { + const character = pattern[index]; + if (character === void 0) break; + if (character !== "*") { + expression += escapeRegex2(character); + continue; + } + if (pattern[index + 1] !== "*") { + expression += "[^/]*"; + continue; + } + index += 1; + if (pattern[index + 1] === "/") { + expression += "(?:.*/)?"; + index += 1; + } else { + expression += ".*"; + } + } + return new RegExp(`${expression}$`, caseInsensitive ? "i" : void 0).test(candidate); +} + // src/verify/structural-verifier.ts var MAX_DIAGNOSTIC_LENGTH4 = 2e3; +var MODE_STRUCTURAL_FAILURES = { + candidate: [ + "manifest-divergence", + "artifact-divergence", + "out-of-scope-write", + "modified-symlink", + "case-collision", + "empty-candidate", + "artifact-base-mismatch" + ], + "composed-slice": [ + "manifest-divergence", + "out-of-scope-write", + "modified-symlink", + "case-collision", + "empty-candidate", + "artifact-base-mismatch" + ], + "final-branch": [ + "manifest-divergence", + "artifact-divergence", + "out-of-scope-write", + "modified-symlink", + "empty-candidate", + "artifact-base-mismatch" + ] +}; function gitFailure2(action, result) { const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH4); return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); @@ -43451,7 +43544,7 @@ async function recomputeManifest(args) { }); return { changedPaths, manifestHash, rawDiff }; } -async function artifactIdentityMatches(args) { +async function singleCommitIdentityMatches(args) { const [anchorResult, treeResult, parentResult] = await Promise.all([ git(args.repoRoot, ["rev-parse", "--verify", `${args.artifact.anchorRef}^{commit}`]), git(args.repoRoot, [ @@ -43473,61 +43566,90 @@ async function artifactIdentityMatches(args) { const commitAndParents = parentResult.stdout.trim().split(/\s+/); return anchorResult.stdout.trim() === args.artifact.candidateCommitOid && treeResult.stdout.trim() === args.artifact.candidateTreeOid && commitAndParents.length === 2 && commitAndParents[0] === args.artifact.candidateCommitOid && commitAndParents[1] === args.baseCommitOid; } -async function structuralVerify(args) { +async function branchIdentityMatches(args) { + const [sourceHead, materializedHead, candidateTree, sourceStatus, materializedStatus] = await Promise.all([ + checkedGit2(args.repoRoot, ["rev-parse", "--verify", "HEAD^{commit}"]), + checkedGit2(args.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"]), + checkedGit2(args.repoRoot, [ + "rev-parse", + "--verify", + `${args.artifact.candidateCommitOid}^{tree}` + ]), + checkedGit2(args.repoRoot, [ + "status", + "--porcelain=v1", + "-z", + "--untracked-files=all" + ]), + checkedGit2(args.worktreePath, [ + "status", + "--porcelain=v1", + "-z", + "--untracked-files=all" + ]) + ]); + const ancestry = await git(args.repoRoot, [ + "merge-base", + "--is-ancestor", + args.baseCommitOid, + args.artifact.candidateCommitOid + ]); + return sourceHead.trim() === args.artifact.candidateCommitOid && materializedHead.trim() === args.artifact.candidateCommitOid && candidateTree.trim() === args.artifact.candidateTreeOid && ancestry.exitCode === 0 && ancestry.truncated?.stdout !== true && ancestry.truncated?.stderr !== true && sourceStatus === "" && materializedStatus === ""; +} +async function structuralVerify(args, mode = "candidate") { + const applicable = new Set(MODE_STRUCTURAL_FAILURES[mode]); const failures = /* @__PURE__ */ new Set(); + const record2 = (failure3, failed) => { + if (failed && applicable.has(failure3)) failures.add(failure3); + }; + const observesCheckoutDrift = mode !== "final-branch"; const [ manifest, baseTreeOid, currentHead, mainStatus, - artifactIdentityValid, + identityValid, caseCollision ] = await Promise.all([ recomputeManifest(args), checkedGit2(args.repoRoot, ["rev-parse", `${args.baseCommitOid}^{tree}`]), - checkedGit2(args.repoRoot, ["rev-parse", "--verify", "HEAD"]), - checkedGit2(args.repoRoot, [ + observesCheckoutDrift ? checkedGit2(args.repoRoot, ["rev-parse", "--verify", "HEAD"]) : Promise.resolve(""), + observesCheckoutDrift ? checkedGit2(args.repoRoot, [ "status", "--porcelain=v1", "--untracked-files=all", "--ignore-submodules=none" - ]), - artifactIdentityMatches(args), - candidateHasCaseCollision(args) + ]) : Promise.resolve(""), + !applicable.has("artifact-divergence") ? Promise.resolve(true) : mode === "final-branch" ? branchIdentityMatches(args) : singleCommitIdentityMatches(args), + applicable.has("case-collision") ? candidateHasCaseCollision(args) : Promise.resolve(false) ]); - if (caseCollision) failures.add("case-collision"); - if (args.artifact.baseCommitOid !== args.baseCommitOid) { - failures.add("artifact-base-mismatch"); - } - const checkoutDrift = { - headMoved: currentHead.trim() !== args.baseCommitOid, - dirty: mainStatus.length > 0 - }; - if (manifest.manifestHash === null || JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) || args.artifact.manifestHash !== manifest.manifestHash) { - failures.add("manifest-divergence"); - } - if (!artifactIdentityValid) { - failures.add("artifact-divergence"); - } - if (manifest.changedPaths.some((change) => !isAllowed( + record2("case-collision", caseCollision); + record2("artifact-base-mismatch", args.artifact.baseCommitOid !== args.baseCommitOid); + record2( + "manifest-divergence", + manifest.manifestHash === null || JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) || args.artifact.manifestHash !== manifest.manifestHash + ); + record2("artifact-divergence", !identityValid); + record2("out-of-scope-write", manifest.changedPaths.some((change) => !isAllowed( change.path, args.writeAllowlist, args.forbiddenScope, change.mode === "160000" - ))) { - failures.add("out-of-scope-write"); - } - if (manifest.rawDiff.some((entry) => [entry.oldMode, entry.newMode].some((mode) => mode === "120000" || mode === "160000"))) { - failures.add("modified-symlink"); - } - if (manifest.changedPaths.length === 0 || args.artifact.candidateTreeOid === baseTreeOid.trim()) { - failures.add("empty-candidate"); - } + ))); + record2("modified-symlink", manifest.rawDiff.some((entry) => [entry.oldMode, entry.newMode].some((entryMode) => entryMode === "120000" || entryMode === "160000"))); + record2( + "empty-candidate", + manifest.changedPaths.length === 0 || args.artifact.candidateTreeOid === baseTreeOid.trim() + ); + const checkoutDrift = { + headMoved: currentHead.trim() !== args.baseCommitOid, + dirty: mainStatus.length > 0 + }; return { ok: failures.size === 0, failures: [...failures], manifestHash: manifest.manifestHash, - checkoutDrift + ...observesCheckoutDrift ? { checkoutDrift } : {} }; } @@ -43578,21 +43700,25 @@ function outcomesMatchHostCommands(commands, outcomes, evidence, os, arch) { }); } var AcceptanceVerifier = class { + mode; structural; project; constructor(dependencies = {}) { - this.structural = dependencies.structural ?? structuralVerify; + this.mode = dependencies.mode ?? "candidate"; + this.structural = dependencies.structural; this.project = dependencies.project ?? projectVerify; } async verify(args) { - const structural = await this.structural({ + const effectiveMode = args.mode ?? this.mode; + const structuralArgs = { repoRoot: args.repoRoot, worktreePath: args.worktreePath, baseCommitOid: args.baseCommitOid, artifact: args.artifact, writeAllowlist: args.spec.writeAllowlist, forbiddenScope: args.spec.forbiddenScope - }); + }; + const structural = this.structural !== void 0 ? await this.structural(structuralArgs, effectiveMode) : await structuralVerify(structuralArgs, effectiveMode); const structuralEvidence = { manifestHash: structural.manifestHash, failures: [...structural.failures] @@ -43653,6 +43779,49 @@ var AcceptanceVerifier = class { } }; +// src/runtime/run-decision.ts +import { createHash as createHash10 } from "node:crypto"; + +// src/protocol/pipeline-gate-cleared.ts +var GIT_OID2 = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; +function parsePipelineGateCleared(value) { + if (value === null || typeof value !== "object" || Array.isArray(value)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + const record2 = value; + const known = /* @__PURE__ */ new Set([ + "clearedVersion", + "candidateCommitOid", + "requiresHumanDecision", + "clearedAt" + ]); + const candidateCommitOid = record2.candidateCommitOid; + const requiresHumanDecision = record2.requiresHumanDecision; + const clearedVersion = record2.clearedVersion ?? "1"; + const clearedAt = record2.clearedAt; + if (Object.keys(record2).some((key) => !known.has(key)) || clearedVersion !== "1" || typeof candidateCommitOid !== "string" || !GIT_OID2.test(candidateCommitOid) || typeof requiresHumanDecision !== "boolean" || clearedAt !== void 0 && (typeof clearedAt !== "string" || Number.isNaN(Date.parse(clearedAt)))) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return { + clearedVersion: "1", + candidateCommitOid, + requiresHumanDecision, + ...clearedAt === void 0 ? {} : { clearedAt } + }; +} + +// src/mcp/decision-authority.ts +var DECISION_AUTHORITY_ENV = "CLAUDE_ARCHITECT_DECISION_AUTHORITY"; +function decisionAuthority(env = process.env, warn = (message) => console.error(message)) { + const raw = env[DECISION_AUTHORITY_ENV]; + if (raw === void 0 || raw === "") return "autonomous"; + if (raw === "autonomous" || raw === "human") return raw; + warn( + `${DECISION_AUTHORITY_ENV}="${raw}" is not a recognized decision authority; requiring human confirmation. Valid values: "autonomous", "human".` + ); + return "human"; +} + // src/runtime/artifact-store.ts import { randomUUID as randomUUID7 } from "node:crypto"; import { constants as constants11 } from "node:fs"; @@ -43860,6 +44029,7 @@ var candidateDecisionSchema = schemas2.candidateDecision; var advisorReportSchema = schemas2.advisorReport; var autopilotEligibilitySchema = schemas2.autopilotEligibility; var runStatusSchema = schemas2.runStatus; +var pipelineGateClearedSchema = schemas2.pipelineGateCleared; var cleanupJournalTail = Promise.resolve(); function isSafeComponent(value) { const base = value.split(".", 1)[0] ?? value; @@ -44849,6 +45019,33 @@ var ArtifactStore = class _ArtifactStore { async readDecision(runId) { return this.readCandidateDecision(runId); } + async writePipelineGateCleared(cleared) { + const validated = parsePipelineGateCleared(cleared); + if (!pipelineGateClearedSchema(validated)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + await this.writeJson("pipeline-gate-cleared.json", validated); + } + async readPipelineGateCleared(runId) { + validateComponent(runId, "run id"); + const runDirectory = path21.join(this.runsRoot, runId); + const validated = await this.ensureExistingRunDirectory(runDirectory); + if (validated === null) return null; + let value; + try { + value = JSON.parse(await readRegularFile( + path21.join(validated.path, "pipeline-gate-cleared.json"), + validated.identity + )); + } catch (error51) { + if (isMissing3(error51)) return null; + throw error51; + } + if (!pipelineGateClearedSchema(value)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return parsePipelineGateCleared(value); + } async writePipelineActiveMarker(marker) { if (typeof marker !== "object" || marker === null || !Number.isSafeInteger(marker.pid) || marker.pid <= 1 || marker.processToken !== null && typeof marker.processToken !== "string" || typeof marker.startedAt !== "string" || !Number.isFinite(Date.parse(marker.startedAt)) || typeof marker.sliced !== "boolean") { throw new RuntimeError("pipeline-active marker is invalid"); @@ -45318,6 +45515,185 @@ async function pruneRuns(policy = DEFAULT_PRUNE_POLICY, dependencies = {}) { return new ArtifactStore("prune-sweep").prune(policy, dependencies); } +// src/runtime/run-decision.ts +function isRecord7(value) { + return value !== null && typeof value === "object" && !Array.isArray(value); +} +var RunDecision = class { + async readSnapshot(runId, options) { + validateComponent(runId, "run id"); + const store = options?.store ?? (options?.storeFactory ? options.storeFactory(runId) : new ArtifactStore(runId)); + let result = null; + let manifest = null; + let reviewSnapshot = null; + let gateRecord = null; + let gateRecordError = null; + let decision = null; + const coherenceErrors = []; + try { + const readResult = typeof store.readResult === "function" ? store.readResult(runId).catch((err) => { + coherenceErrors.push(`failed to read result: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) : Promise.resolve(null); + const readManifest = typeof store.readManifest === "function" ? store.readManifest(runId).catch((err) => { + coherenceErrors.push(`failed to read manifest: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) : Promise.resolve(null); + const readSnapshot = typeof store.readReviewSnapshot === "function" ? store.readReviewSnapshot(runId).catch(() => null) : Promise.resolve(null); + const readGateRecord = typeof store.readPipelineGateCleared === "function" ? store.readPipelineGateCleared(runId).catch((err) => { + gateRecordError = `the pipeline gate clearance record is malformed: ${err instanceof Error ? err.message : String(err)}`; + return null; + }) : Promise.resolve(null); + const readDecision = typeof store.readCandidateDecision === "function" ? store.readCandidateDecision(runId).catch((err) => { + coherenceErrors.push(`failed to read decision: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) : Promise.resolve(null); + const [r, m, s, g, d] = await Promise.all([ + readResult, + readManifest, + readSnapshot, + readGateRecord, + readDecision + ]); + result = r; + manifest = m; + reviewSnapshot = s; + gateRecord = g; + decision = d; + } catch (err) { + coherenceErrors.push(`failed to load decision snapshot: ${err instanceof Error ? err.message : String(err)}`); + } + if (gateRecord === null && result?.evidence?.pipelineGateCleared !== void 0) { + try { + gateRecord = parsePipelineGateCleared(result.evidence.pipelineGateCleared); + } catch { + gateRecordError = "the pipeline gate clearance record is malformed"; + } + } + if (result !== null && manifest !== null) { + if (result.runId !== runId || manifest.runId !== runId) { + coherenceErrors.push("archived run identity does not match runId"); + } + if (result.candidate !== null) { + if (manifest.baseCommitOid !== result.candidate.baseCommitOid) { + coherenceErrors.push("archived candidate base commit does not match run manifest"); + } + if (manifest.candidateManifestHash !== result.candidate.manifestHash) { + coherenceErrors.push("archived candidate manifest hash does not match run manifest"); + } + const expectedHash = createHash10("sha256").update(JSON.stringify(result.candidate.changedPaths)).digest("hex"); + if (result.candidate.manifestHash !== expectedHash) { + coherenceErrors.push("archived candidate changed paths hash mismatch"); + } + } + } + if (gateRecord !== null && result?.candidate !== null && result?.candidate !== void 0) { + if (gateRecord.candidateCommitOid !== result.candidate.candidateCommitOid) { + gateRecordError = "the pipeline gate clearance record does not match the archived candidate commit"; + } + } + if (decision !== null && result?.candidate !== null && result?.candidate !== void 0) { + if (decision.candidateManifestHash !== void 0 && decision.candidateManifestHash !== null) { + if (decision.candidateManifestHash !== result.candidate.manifestHash) { + coherenceErrors.push("recorded candidate decision does not match candidate manifest hash"); + } + } + if (decision.decisionVersion === "2" && reviewSnapshot !== null) { + if (decision.evidenceHash !== reviewSnapshotHash(reviewSnapshot)) { + coherenceErrors.push("recorded candidate decision does not match review snapshot evidence hash"); + } + } + } + return { + runId, + result, + manifest, + reviewSnapshot, + gateRecord, + gateRecordError, + decision, + coherenceErrors + }; + } + async evaluate(runId, options) { + const snapshot = options?.snapshot ?? await this.readSnapshot(runId, options); + const authority = options?.authority ?? (options?.decisionAuthority ? options.decisionAuthority() : decisionAuthority()); + return this.verdictFor(snapshot, authority); + } + /** + * The whole acceptance rule, over an archive already read. Pure: every caller + * that once re-derived "may this be accepted without a person" from the same + * files now asks this one function. + */ + verdictFor(snapshot, authority) { + if (snapshot.coherenceErrors.length > 0) { + return { state: "invalid", reasons: snapshot.coherenceErrors }; + } + if (snapshot.result === null || snapshot.manifest === null) { + return { state: "invalid", reasons: ["archived run was not found"] }; + } + const incompleteEvidence = snapshot.result.evidence?.pipelineReviewIncomplete; + if (incompleteEvidence !== void 0) { + const reason = isRecord7(incompleteEvidence) && typeof incompleteEvidence.reason === "string" ? incompleteEvidence.reason : "pipeline review is incomplete"; + return { state: "incomplete", reasons: [reason] }; + } + if (snapshot.decision !== null) { + if (snapshot.decision.decision === "rejected") { + return { state: "rejected", reasons: ["candidate decision is rejected"] }; + } + if (snapshot.decision.decision === "revision-requested") { + return { state: "rejected", reasons: ["candidate decision is revision-requested"] }; + } + } + const refusedEvidence = snapshot.result.evidence?.pipelineGateRefused; + if (refusedEvidence !== void 0) { + const reasons = isRecord7(refusedEvidence) && Array.isArray(refusedEvidence.reasons) ? refusedEvidence.reasons.filter((r) => typeof r === "string") : ["the pipeline gate did NOT clear this candidate"]; + return { + state: "rejected", + reasons: reasons.length > 0 ? reasons : ["the pipeline gate did NOT clear this candidate"] + }; + } + if (snapshot.result.status !== "verified-candidate" || snapshot.result.failure !== null) { + const reasons = []; + if (snapshot.result.failure !== null) { + reasons.push(snapshot.result.failure); + } else { + reasons.push(`attempt status is ${snapshot.result.status}`); + } + return { state: "rejected", reasons }; + } + if (snapshot.result.candidate === null) { + return { state: "rejected", reasons: ["no candidate artifact was produced"] }; + } + const candidateCommit = snapshot.result.candidate.candidateCommitOid; + const humanReasons = []; + if (authority !== "autonomous") { + humanReasons.push(`decision authority is "${authority}"`); + } + const isPlainDelegate = snapshot.result.evidence?.plainDelegate === true && refusedEvidence === void 0 && incompleteEvidence === void 0 && snapshot.result.evidence?.pipelineGateCleared === void 0 && snapshot.gateRecord === null; + if (snapshot.gateRecordError) { + humanReasons.push(snapshot.gateRecordError); + } else if (isPlainDelegate) { + } else if (snapshot.gateRecord === null) { + humanReasons.push("the pipeline gate clearance record is missing"); + } else if (snapshot.gateRecord.requiresHumanDecision === true) { + humanReasons.push("the pipeline gate clearance record requires a human decision"); + } + if (humanReasons.length > 0) { + return { state: "human-required", candidateCommit, reasons: humanReasons }; + } + return { state: "accepted", autonomous: true, candidateCommit }; + } + async verify(args) { + const verifier = new AcceptanceVerifier({ mode: args.mode }); + return verifier.verify(args); + } +}; +var runDecision = new RunDecision(); +async function readRunDecisionSnapshot(runId, options) { + return runDecision.readSnapshot(runId, options); +} + // src/pipeline/role-runner.ts import { rm as rm8 } from "node:fs/promises"; @@ -45885,7 +46261,7 @@ async function parseStructuredReport(raw, validate, repair) { } // src/autopilot/branch-manager.ts -import { createHash as createHash10, randomUUID as randomUUID8 } from "node:crypto"; +import { createHash as createHash11, randomUUID as randomUUID8 } from "node:crypto"; import { constants as constants12 } from "node:fs"; import { chmod, link as link6, lstat as lstat15, mkdir as mkdir8, mkdtemp as mkdtemp2, open as open12, realpath as realpath12, rm as rm9 } from "node:fs/promises"; import path24 from "node:path"; @@ -46401,7 +46777,7 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { if (registration === null) { throw new RuntimeError("workflow ownership record is malformed"); } - const ownershipHash = createHash10("sha256").update(registration.workflowId).digest("hex"); + const ownershipHash = createHash11("sha256").update(registration.workflowId).digest("hex"); const expectedOwnershipPath = path24.join( resolveStateDir(), "autopilot-branches", @@ -46428,7 +46804,7 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { const managedName = `workflow-${ownershipHash.slice(0, 32)}`; const candidateName = path24.basename(canonicalWorktreePath); const ownsPrimary = candidateName === managedName && canonicalRegisteredWorktreePath === canonicalWorktreePath; - const legacyFinalName = `final-${createHash10("sha256").update(JSON.stringify(registration.workflowId)).digest("hex").slice(0, 24)}`; + const legacyFinalName = `final-${createHash11("sha256").update(JSON.stringify(registration.workflowId)).digest("hex").slice(0, 24)}`; const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path24.basename(canonicalRegisteredWorktreePath) === managedName && path24.dirname(canonicalRegisteredWorktreePath) === path24.dirname(canonicalWorktreePath); if (canonicalOwnershipPath !== canonicalExpectedOwnershipPath || !ownsPrimary && !ownsFinalMaterialization) { throw new RuntimeError("workflow ownership record names a different worktree"); @@ -46465,7 +46841,7 @@ var WorkflowBranchManager = class { }; } ownershipPath(workflowId) { - const name = createHash10("sha256").update(workflowId).digest("hex"); + const name = createHash11("sha256").update(workflowId).digest("hex"); return path24.join(resolveStateDir(), "autopilot-branches", `${name}.json`); } async readRegistration(workflowId) { @@ -46590,7 +46966,7 @@ var WorkflowBranchManager = class { let fetchedOidForCleanup; let completedIdentity; let operationError; - const workflowHash = createHash10("sha256").update(request.workflowId).digest("hex"); + const workflowHash = createHash11("sha256").update(request.workflowId).digest("hex"); const remoteIdentity = await this.resolveRemote(initial.canonical); const safety = new PlatformSafety(this.platformServices); try { @@ -46671,7 +47047,7 @@ var WorkflowBranchManager = class { refsCreated = true; const worktreeManager = new WorktreeManager( initial.canonical, - `workflow-${createHash10("sha256").update(request.workflowId).digest("hex").slice(0, 32)}`, + `workflow-${createHash11("sha256").update(request.workflowId).digest("hex").slice(0, 32)}`, { os: this.platformServices.os }, { ...this.worktreeManagerDependencies, borrowedCheckoutLease: lock } ); @@ -47026,7 +47402,7 @@ var WorkflowBranchManager = class { } const manager = new WorktreeManager( identity.checkoutPath, - `workflow-${createHash10("sha256").update(identity.workflowId).digest("hex").slice(0, 32)}`, + `workflow-${createHash11("sha256").update(identity.workflowId).digest("hex").slice(0, 32)}`, { os: this.platformServices.os }, { ...this.worktreeManagerDependencies, borrowedCheckoutLease: checkoutLease } ); @@ -47159,14 +47535,15 @@ async function validateArchivedTaskEvidence(task, evidence, context) { let eligibility; let decision; try { - [result, manifest, pipelineResult, snapshot, advisor, eligibility, decision] = await Promise.all([ - store.readResult(evidence.runId), - store.readManifest(evidence.runId), + const decisionSnapshot = await readRunDecisionSnapshot(evidence.runId, { store }); + result = decisionSnapshot.result; + manifest = decisionSnapshot.manifest; + snapshot = decisionSnapshot.reviewSnapshot; + decision = decisionSnapshot.decision; + [pipelineResult, advisor, eligibility] = await Promise.all([ store.readPipelineArtifact(evidence.runId, "pipeline-result"), - store.readReviewSnapshot(evidence.runId), store.readAdvisorReport(evidence.runId), - store.readAutopilotEligibility(evidence.runId), - store.readCandidateDecision(evidence.runId) + store.readAutopilotEligibility(evidence.runId) ]); } catch { fail2("missing-task-evidence", `task evidence archive is invalid: ${task.id}`); @@ -47223,7 +47600,7 @@ function normalizeTaskEvidence(state, supplied) { }); } function evidenceHash(content) { - return createHash11("sha256").update(content, "utf8").digest("hex"); + return createHash12("sha256").update(content, "utf8").digest("hex"); } async function freezeTaskEvidence(evidence, evidenceStore) { return await Promise.all(evidence.map(async (task) => { @@ -47403,68 +47780,6 @@ async function withHeadRevalidation(request) { function uniqueSorted(values) { return [...new Set(values)].sort(); } -function finalPathAllowed(pathname, writeAllowlist, forbiddenScope, opaqueDirectory) { - const candidates = opaqueDirectory ? [pathname, `${pathname}/`] : [pathname]; - return writeAllowlist.some((pattern) => candidates.some((candidate) => globMatches(pattern, candidate))) && !forbiddenScope.some((pattern) => candidates.some((candidate) => globMatches(pattern, candidate, true))); -} -async function structuralVerifyFinalBranch(args, runGit = git) { - const failures = /* @__PURE__ */ new Set(); - const [manifest, baseTree, sourceHead, materializedHead, candidateTree, sourceStatus, materializedStatus] = await Promise.all([ - recomputeManifest(args), - checkedGit3(runGit, args.repoRoot, ["rev-parse", "--verify", `${args.baseCommitOid}^{tree}`]), - checkedGit3(runGit, args.repoRoot, ["rev-parse", "--verify", "HEAD^{commit}"]), - checkedGit3(runGit, args.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"]), - checkedGit3(runGit, args.repoRoot, [ - "rev-parse", - "--verify", - `${args.artifact.candidateCommitOid}^{tree}` - ]), - checkedGit3(runGit, args.repoRoot, [ - "status", - "--porcelain=v1", - "-z", - "--untracked-files=all" - ]), - checkedGit3(runGit, args.worktreePath, [ - "status", - "--porcelain=v1", - "-z", - "--untracked-files=all" - ]) - ]); - const ancestry = await runGit(args.repoRoot, [ - "merge-base", - "--is-ancestor", - args.baseCommitOid, - args.artifact.candidateCommitOid - ]); - if (args.artifact.baseCommitOid !== args.baseCommitOid) failures.add("artifact-base-mismatch"); - if (sourceHead.trim() !== args.artifact.candidateCommitOid || materializedHead.trim() !== args.artifact.candidateCommitOid || candidateTree.trim() !== args.artifact.candidateTreeOid || ancestry.exitCode !== 0 || ancestry.truncated?.stdout === true || ancestry.truncated?.stderr === true || sourceStatus !== "" || materializedStatus !== "") { - failures.add("artifact-divergence"); - } - if (JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) || args.artifact.manifestHash !== manifest.manifestHash) { - failures.add("manifest-divergence"); - } - if (manifest.changedPaths.some((change) => !finalPathAllowed( - change.path, - args.writeAllowlist, - args.forbiddenScope, - change.mode === "160000" - ))) { - failures.add("out-of-scope-write"); - } - if (manifest.rawDiff.some((entry) => [entry.oldMode, entry.newMode].some((mode) => mode === "120000" || mode === "160000"))) { - failures.add("modified-symlink"); - } - if (manifest.changedPaths.length === 0 || args.artifact.candidateTreeOid === baseTree.trim()) { - failures.add("empty-candidate"); - } - return { - ok: failures.size === 0, - failures: [...failures], - manifestHash: manifest.manifestHash - }; -} function finalDelegationSpec(spec) { const template = spec.tasks[0]?.delegation; if (template === void 0) { @@ -47718,7 +48033,7 @@ var FinalBranchReviewer = class { this.branchManager = dependencies.branchManager ?? new WorkflowBranchManager(); this.workflowStore = dependencies.workflowStore ?? ((workflowId) => new WorkflowStore(workflowId)); this.acceptanceVerifier = dependencies.acceptanceVerifier ?? new AcceptanceVerifier({ - structural: async (args) => await structuralVerifyFinalBranch(args, this.runGit) + mode: "final-branch" }); this.roleRunner = dependencies.roleRunner ?? runRole; this.platformServices = dependencies.platformServices ?? getPlatformServices(); @@ -47727,7 +48042,7 @@ var FinalBranchReviewer = class { this.evidenceStore = dependencies.evidenceStore ?? ((runId) => new ArtifactStore(runId)); this.taskEvidenceValidator = dependencies.taskEvidenceValidator ?? validateArchivedTaskEvidence; this.materialize = dependencies.materialize ?? (async (request) => { - const workflowHash = createHash11("sha256").update(request.workflowId).digest("hex"); + const workflowHash = createHash12("sha256").update(request.workflowId).digest("hex"); const manager = new WorktreeManager( request.checkoutPath, `workflow-${workflowHash.slice(0, 32)}-final`, @@ -49300,7 +49615,7 @@ var AutopilotController = class { }; // src/autopilot/candidate-promoter.ts -import { createHash as createHash12 } from "node:crypto"; +import { createHash as createHash13 } from "node:crypto"; // src/integrate/controlled-integrator.ts var CANDIDATE_REF = /^refs\/claude-architect\/candidates\/[A-Za-z0-9][A-Za-z0-9._-]*$/; @@ -49465,7 +49780,7 @@ function rejected(classification) { return { status: "rejected", classification }; } function commitMessageHash(message) { - return createHash12("sha256").update(message, "utf8").digest("hex"); + return createHash13("sha256").update(message, "utf8").digest("hex"); } function workflowStillAuthorizes(workflow, request, taskId, eligibilityHash, expectedWorkflowRef, expectedRepositoryIdentity) { const task = workflow.tasks[workflow.currentTaskIndex]; @@ -49668,11 +49983,12 @@ var CandidatePromoter = class { let advisor; let eligibility; try { - [result, manifest, pipelineResult, snapshot, advisor, eligibility] = await Promise.all([ - artifactStore.readResult(request.runId), - artifactStore.readManifest(request.runId), + const decisionSnapshot = await readRunDecisionSnapshot(request.runId, { store: artifactStore }); + result = decisionSnapshot.result; + manifest = decisionSnapshot.manifest; + snapshot = decisionSnapshot.reviewSnapshot; + [pipelineResult, advisor, eligibility] = await Promise.all([ artifactStore.readPipelineArtifact(request.runId, "pipeline-result"), - artifactStore.readReviewSnapshot(request.runId), artifactStore.readAdvisorReport(request.runId), artifactStore.readAutopilotEligibility(request.runId) ]); @@ -49989,11 +50305,8 @@ var CandidatePromoter = class { } }; -// src/pipeline/pipeline-runtime.ts -import path30 from "node:path"; - // src/protocol/spec-hash.ts -import { createHash as createHash13 } from "node:crypto"; +import { createHash as createHash14 } from "node:crypto"; function canonicalSpecJson(value) { if (Array.isArray(value)) return `[${value.map(canonicalSpecJson).join(",")}]`; if (typeof value === "object" && value !== null) { @@ -50003,7 +50316,7 @@ function canonicalSpecJson(value) { return JSON.stringify(value) ?? "null"; } function specSha256(spec) { - return createHash13("sha256").update(canonicalSpecJson(spec)).digest("hex"); + return createHash14("sha256").update(canonicalSpecJson(spec)).digest("hex"); } // src/runtime/attempt-runtime.ts @@ -51537,88 +51850,6 @@ function evaluateGates(input) { return { decisionReady: reasons.length === 0, requiresHumanDecision, reasons }; } -// src/pipeline/slice-composer.ts -import { mkdtemp as mkdtemp4, rm as rm13 } from "node:fs/promises"; -import { tmpdir as tmpdir7 } from "node:os"; -import path29 from "node:path"; -var NULL_OID = "0000000000000000000000000000000000000000"; -function parseRawDiffEntries(raw) { - const fields = raw.split("\0"); - const changes = []; - for (let index = 0; index < fields.length; index += 1) { - const meta3 = fields[index]; - if (meta3 === void 0 || !meta3.startsWith(":")) continue; - const parts = meta3.slice(1).split(/\s+/u); - const changed = fields[index + 1]; - if (parts.length < 5 || changed === void 0 || changed.length === 0) continue; - index += 1; - const [, dstMode, , dstOid, status] = parts; - changes.push({ - path: changed, - mode: dstMode, - oid: dstOid, - deleted: status.startsWith("D") || dstOid === NULL_OID - }); - } - return changes; -} -function failure2(action, result) { - const diagnostic = (result.stderr || result.stdout).trim(); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checked(cwd, args, options, runGit = git) { - const result = await runGit(cwd, args, options); - if (result.exitCode !== 0) throw failure2(`git ${args[0] ?? ""}`, result); - return result.stdout; -} -async function composeSliceOntoHead(args) { - const runGit = args.git ?? git; - if (args.head === args.base) return args.sliceCommit; - const changes = parseRawDiffEntries(await checked( - args.checkoutPath, - // Raw output abbreviates object ids by default; update-index needs them whole. - ["diff", "--raw", "-z", "--no-abbrev", "--no-renames", `${args.base}..${args.sliceCommit}`], - args.objectReadOptions, - runGit - )); - if (changes.length === 0) return args.head; - const occupied = new Set((await checked( - args.checkoutPath, - ["diff", "--name-only", "-z", "--no-renames", `${args.base}..${args.head}`], - args.objectReadOptions, - runGit - )).split("\0").filter((entry) => entry.length > 0)); - const collisions = changes.filter((change) => occupied.has(change.path)).map((change) => change.path); - if (collisions.length > 0) { - throw new RuntimeError( - `slice ${args.sliceIndex} changed paths already written by its wave: ${collisions.join(", ")}` - ); - } - const indexRoot = await mkdtemp4(path29.join(tmpdir7(), "ca-compose-")); - const indexFile = path29.join(indexRoot, "index"); - try { - const options = { ...args.objectReadOptions, indexFile }; - await checked(args.checkoutPath, ["read-tree", args.head], options, runGit); - const instructions = changes.map((change) => change.deleted ? `0 ${NULL_OID} ${change.path}` : `${change.mode} ${change.oid} ${change.path}`).join("\n"); - await checked( - args.checkoutPath, - ["update-index", "--index-info"], - { ...options, stdin: `${instructions} -` }, - runGit - ); - const tree = (await checked(args.checkoutPath, ["write-tree"], options, runGit)).trim(); - return (await checked( - args.checkoutPath, - ["commit-tree", tree, "-p", args.head, "-m", `slice ${args.sliceIndex} ${args.runId}`], - args.objectReadOptions, - runGit - )).trim(); - } finally { - await rm13(indexRoot, { recursive: true, force: true }); - } -} - // src/pipeline/slice-scheduler.ts function allowlistsOverlap(left, right) { return left.writeAllowlist.some((leftGlob) => right.writeAllowlist.some((rightGlob) => leftGlob === rightGlob || globMatches(leftGlob, literalPrefix(rightGlob)) || globMatches(rightGlob, literalPrefix(leftGlob)) || literalPrefix(leftGlob).startsWith(literalPrefix(rightGlob)) || literalPrefix(rightGlob).startsWith(literalPrefix(leftGlob)))); @@ -51692,384 +51923,90 @@ function routeSlice(input) { return { route: "halt", reasons }; } -// src/pipeline/slice-runner.ts -async function runSliceToCompletion(slice, index, base, deps, initialAttempt) { - let roundsUsed = 0; - const attempts = []; - while (true) { - const sourceAttempt = roundsUsed === 0 && initialAttempt !== void 0 ? initialAttempt : await deps.runSlice(slice, index, base, roundsUsed, attempts.map((e) => structuredClone(e))); - const attempt = structuredClone(sourceAttempt); - const perSliceReview = attempt.perSliceReview ?? null; - const route2 = routeSlice({ - verification: attempt.verification, - perSliceReview, - roundsUsed, - maxRounds: deps.maxRounds, - hardBlocker: attempt.hardBlocker ?? false - }); - const evidence = { - sliceIndex: index, - attempt: roundsUsed, - candidateCommit: attempt.candidateCommit, - verification: attempt.verification, - perSliceReview, - route: route2.route, - reasons: [...route2.reasons], - roleLogRefs: [...attempt.roleLogRefs ?? []] - }; - if (deps.onAttempt) { - await deps.onAttempt(structuredClone(evidence)); - } - attempts.push(evidence); - const pipelineSlice = { - index, - objective: slice.objective, - route: route2.route, - candidateCommit: attempt.candidateCommit, - roundsUsed, - verification: attempt.verification, - perSliceReview, - reasons: [...route2.reasons], - attempts: attempts.map((entry) => ({ - ...entry, - reasons: [...entry.reasons], - roleLogRefs: [...entry.roleLogRefs] - })), - roleLogRefs: attempts.flatMap((entry) => entry.roleLogRefs) - }; - if (route2.route === "repair") { - roundsUsed += 1; - continue; - } - return { slice: pipelineSlice, advanced: route2.route === "advance" }; - } -} -async function runSlicePhase(slices, startCommit, deps) { - let currentCommit = startCommit; - const results = []; - for (const wave of planSliceWaves(slices, deps.concurrency ?? 1)) { - const base = currentCommit; - const outcomes = await Promise.all(wave.indices.map((index) => runSliceToCompletion( - slices[index - 1], - index, - base, - deps, - index === 1 ? deps.initialAttempt : void 0 - ))); - for (const outcome of outcomes) { - const composed = wave.indices.length === 1 || deps.composeSlice === void 0 ? outcome.slice.candidateCommit : await deps.composeSlice({ - head: currentCommit, - base, - sliceCommit: outcome.slice.candidateCommit, - sliceIndex: outcome.slice.index - }); - const recorded = { ...outcome.slice, candidateCommit: composed }; - results.push(recorded); - if (deps.onSlice) { - await deps.onSlice(structuredClone(recorded)); - } - if (!outcome.advanced) { - return { - slices: results, - finalCandidateCommit: currentCommit, - haltedSliceIndex: recorded.index - }; - } - currentCommit = composed; - } +// src/pipeline/slice-composer.ts +import { mkdtemp as mkdtemp4, rm as rm13 } from "node:fs/promises"; +import { tmpdir as tmpdir7 } from "node:os"; +import path29 from "node:path"; +var NULL_OID = "0000000000000000000000000000000000000000"; +function parseRawDiffEntries(raw) { + const fields = raw.split("\0"); + const changes = []; + for (let index = 0; index < fields.length; index += 1) { + const meta3 = fields[index]; + if (meta3 === void 0 || !meta3.startsWith(":")) continue; + const parts = meta3.slice(1).split(/\s+/u); + const changed = fields[index + 1]; + if (parts.length < 5 || changed === void 0 || changed.length === 0) continue; + index += 1; + const [, dstMode, , dstOid, status] = parts; + changes.push({ + path: changed, + mode: dstMode, + oid: dstOid, + deleted: status.startsWith("D") || dstOid === NULL_OID + }); } - return { - slices: results, - finalCandidateCommit: currentCommit, - haltedSliceIndex: null - }; + return changes; } - -// src/pipeline/advisor-stage.ts -var schemas4 = loadSchemas(); -function frozenAdvisorEvidence(spec, pipelineResult, reviewSnapshot) { - const finalRound = pipelineResult.rounds.at(-1) ?? null; - return { - runId: pipelineResult.runId, - specification: { - objective: spec.objective, - successCriteria: [...spec.successCriteria], - writeAllowlist: [...spec.writeAllowlist], - forbiddenScope: [...spec.forbiddenScope] - }, - baselineCommitOid: reviewSnapshot.baseCommitOid, - candidateCommitOid: reviewSnapshot.candidateCommitOid, - candidateTreeOid: reviewSnapshot.candidateTreeOid, - candidateManifestHash: reviewSnapshot.manifestHash, - reviewSnapshot: structuredClone(reviewSnapshot), - finalRound: structuredClone(finalRound), - reviewAndFixHistory: structuredClone(pipelineResult.rounds), - trustedVerification: structuredClone(pipelineResult.verification), - gate: structuredClone(pipelineResult.gate), - pipelineStatus: pipelineResult.status - }; +function failure2(action, result) { + const diagnostic = (result.stderr || result.stdout).trim(); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); } -function failureReport(failure3, failedRoleLogRef) { - return { - reportVersion: "1", - verdict: "human-decision-required", - rationale: `The final advisor did not produce an approving valid report (${failure3}; see ${failedRoleLogRef}).`, - risks: [], - coverageGaps: ["A fresh confined advisor review is unavailable."] - }; +async function checked(cwd, args, options, runGit = git) { + const result = await runGit(cwd, args, options); + if (result.exitCode !== 0) throw failure2(`git ${args[0] ?? ""}`, result); + return result.stdout; } -function assertSameFrozenArtifact(label, providedHash, archivedHash) { - if (providedHash !== archivedHash) { - throw new RuntimeError(`${label} differs from the durable archived artifact`); +async function composeSliceOntoHead(args) { + const runGit = args.git ?? git; + if (args.head === args.base) return args.sliceCommit; + const changes = parseRawDiffEntries(await checked( + args.checkoutPath, + // Raw output abbreviates object ids by default; update-index needs them whole. + ["diff", "--raw", "-z", "--no-abbrev", "--no-renames", `${args.base}..${args.sliceCommit}`], + args.objectReadOptions, + runGit + )); + if (changes.length === 0) return args.head; + const occupied = new Set((await checked( + args.checkoutPath, + ["diff", "--name-only", "-z", "--no-renames", `${args.base}..${args.head}`], + args.objectReadOptions, + runGit + )).split("\0").filter((entry) => entry.length > 0)); + const collisions = changes.filter((change) => occupied.has(change.path)).map((change) => change.path); + if (collisions.length > 0) { + throw new RuntimeError( + `slice ${args.sliceIndex} changed paths already written by its wave: ${collisions.join(", ")}` + ); } -} -function advisorExecutionDiagnostic(error51) { - const detail = error51 instanceof Error ? `${error51.name}: ${error51.message}` : String(error51); - return redact(detail).slice(0, 2e3); -} -async function runAdvisorStage(args) { - const store = args.store ?? new ArtifactStore(args.runId); - const statusStore = new ArtifactStore(args.runId); - await transitionRunStatusSafely(statusStore, args.runId, "advisor", { - round: null, - role: "advisor", - detail: null - }); + const indexRoot = await mkdtemp4(path29.join(tmpdir7(), "ca-compose-")); + const indexFile = path29.join(indexRoot, "index"); try { - const [archivedPipelineResult, archivedReviewSnapshot, archivedSpec] = await Promise.all([ - store.readPipelineArtifact(args.runId, "pipeline-result"), - store.readReviewSnapshot(args.runId), - store.readPipelineArtifact(args.runId, "delegation-spec") - ]); - if (archivedPipelineResult === null) { - throw new RuntimeError("advisor stage requires a durable archived PipelineResult"); - } - if (archivedReviewSnapshot === null) { - throw new RuntimeError("advisor stage requires a durable review snapshot"); - } - if (archivedSpec === null) { - throw new RuntimeError("advisor stage requires a durable archived delegation specification"); - } - if (!schemas4.delegationSpec(archivedSpec)) { - throw new RuntimeError("advisor stage archived delegation specification is invalid"); - } - const suppliedSpec = redactRecord(structuredClone(args.spec)); - if (canonicalArtifactHash(suppliedSpec) !== canonicalArtifactHash(archivedSpec)) { - throw new RuntimeError("advisor stage specification differs from the durable archived specification"); - } - if (archivedPipelineResult.runId !== args.runId || archivedReviewSnapshot.runId !== args.runId) { - throw new RuntimeError("advisor stage run identity does not match its durable evidence"); - } - if (args.pipelineResult !== void 0) { - assertSameFrozenArtifact( - "pipeline result", - pipelineResultHash(args.pipelineResult), - pipelineResultHash(archivedPipelineResult) - ); - } - if (args.reviewSnapshot !== void 0) { - assertSameFrozenArtifact( - "review snapshot", - reviewSnapshotHash(args.reviewSnapshot), - reviewSnapshotHash(archivedReviewSnapshot) - ); - } - const advisorSpec = { - ...structuredClone(archivedSpec), - context: "" - }; - const pkg = { - spec: advisorSpec, - baselineCommit: archivedReviewSnapshot.baseCommitOid, - candidateCommit: archivedReviewSnapshot.candidateCommitOid, - candidateDiff: archivedReviewSnapshot.patch, - testEvidence: JSON.stringify({ - evidence: archivedReviewSnapshot.evidence, - executedVerification: archivedReviewSnapshot.executedVerification, - finalVerification: archivedPipelineResult.verification - }), - advisorEvidence: frozenAdvisorEvidence( - advisorSpec, - archivedPipelineResult, - archivedReviewSnapshot - ) - }; - const advisorEvidenceText = JSON.stringify(pkg.advisorEvidence, null, 2); - let outcome; - if (!canRenderUntrustedBlockExactly(advisorEvidenceText)) { - const failedRoleLogRef = await store.writeLog( - "role-advisor-final", - "advisor was not launched: the exact frozen evidence package exceeds the bounded role input\n" - ); - outcome = { - ok: false, - failure: "invalid-output", - failedRoleLogRef, - roleLogRefs: [failedRoleLogRef] - }; - } else { - try { - outcome = await runStructuredRole({ - role: "advisor", - schema: schemas4.advisorReport, - logName: "role-advisor-final", - spec: advisorSpec, - pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store - }); - } catch (error51) { - const failedRoleLogRef = await store.writeLog( - "role-advisor-final", - `advisor execution failed before producing a classified result: ${advisorExecutionDiagnostic(error51)} -` - ); - outcome = { - ok: false, - failure: "producer-failure", - failedRoleLogRef, - roleLogRefs: [failedRoleLogRef] - }; - } - } - const report = outcome.ok ? redactRecord(outcome.report) : failureReport(outcome.failure, outcome.failedRoleLogRef); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ - pipelineResult: archivedPipelineResult, - reviewSnapshot: archivedReviewSnapshot, - advisor: report, - evaluatedAt: args.evaluatedAt - })); - await transitionRunStatusSafely(statusStore, args.runId, "gating", { - role: "advisor" - }); - await store.writePostPipelineAutopilotArtifacts({ - pipelineResult: archivedPipelineResult, - reviewSnapshot: archivedReviewSnapshot, - advisorReport: report, - eligibility - }); - advisorReportHash(report); - await transitionRunStatusSafely( - statusStore, - args.runId, - outcome.ok ? "done" : "failed", - { - role: "advisor", - detail: outcome.ok ? report.verdict : outcome.failure - } + const options = { ...args.objectReadOptions, indexFile }; + await checked(args.checkoutPath, ["read-tree", args.head], options, runGit); + const instructions = changes.map((change) => change.deleted ? `0 ${NULL_OID} ${change.path}` : `${change.mode} ${change.oid} ${change.path}`).join("\n"); + await checked( + args.checkoutPath, + ["update-index", "--index-info"], + { ...options, stdin: `${instructions} +` }, + runGit ); - return { - report, - eligibility, - failure: outcome.ok ? null : outcome.failure, - roleLogRefs: outcome.roleLogRefs - }; - } catch (error51) { - await transitionRunStatusSafely(statusStore, args.runId, "failed", { - role: "advisor", - detail: error51 instanceof Error ? error51.message : "advisor stage failed unexpectedly" - }); - throw error51; + const tree = (await checked(args.checkoutPath, ["write-tree"], options, runGit)).trim(); + return (await checked( + args.checkoutPath, + ["commit-tree", tree, "-p", args.head, "-m", `slice ${args.sliceIndex} ${args.runId}`], + args.objectReadOptions, + runGit + )).trim(); + } finally { + await rm13(indexRoot, { recursive: true, force: true }); } } -// src/pipeline/pipeline-runtime.ts -var schemas5 = loadSchemas(); -var IGNORED_STRUCTURAL_FAILURES = /* @__PURE__ */ new Set([ - "artifact-divergence" -]); -var CANDIDATE_REF_PREFIX2 = "refs/claude-architect/candidates/"; -var SLICE_REF_PREFIX = "refs/claude-architect/slices/"; -function describePriorAttempts(attempts) { - return attempts.map((entry) => { - const failed = (entry.verification?.commandResults ?? []).filter((command) => !command.ok).map((command) => `${command.id} (exit ${String(command.exitCode)})`); - const blocking = (entry.perSliceReview?.findings ?? []).filter((finding) => finding.severity === "blocker" || finding.severity === "major").map((finding) => `${finding.severity} at ${finding.location}: ${finding.claim}`); - return [ - `attempt ${entry.attempt} -> ${entry.route}`, - ` reasons: ${entry.reasons.join("; ") || "(none recorded)"}`, - ...failed.length === 0 ? [] : [` failing verification: ${failed.join(", ")}`], - ...blocking.length === 0 ? [] : [` blocking findings: - ${blocking.join("\n ")}`] - ].join("\n"); - }).join("\n\n"); -} -function scopeSpecToSlice(spec, slice) { - const scoped = structuredClone({ ...spec, ...slice }); - delete scoped.slices; - return scoped; -} -function gitFailure5(action, result) { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit5(cwd, args, options) { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure5(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} -function temporarySliceRef(runId, index, attempt) { - return `${SLICE_REF_PREFIX}${runId}/slice-${index}-attempt-${attempt}`; -} -async function createTemporarySliceRef(checkoutPath, temporaryRef) { - const result = await git(checkoutPath, [ - "update-ref", - "--no-deref", - temporaryRef.ref, - temporaryRef.oid, - "0".repeat(temporaryRef.oid.length) - ]); - if (result.exitCode !== 0) throw gitFailure5("create temporary slice ref", result); -} -async function cleanupTemporarySliceRefs(checkoutPath, temporaryRefs) { - const errors = []; - for (const temporaryRef of [...temporaryRefs].reverse()) { - try { - const result = await git(checkoutPath, [ - "update-ref", - "--no-deref", - "-d", - temporaryRef.ref, - temporaryRef.oid - ]); - if (result.exitCode !== 0) { - errors.push(gitFailure5("delete temporary slice ref", result)); - } - } catch (error51) { - errors.push(error51); - } - } - return errors; -} -function privateObjectReadOptions(access6) { - return { - env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: access6.privateObjectsDir } - }; -} -async function importPromotedObjects(args) { - const privateObjects = privateObjectReadOptions(args.access); - const packPrefix = path30.join(args.access.sharedObjectsDir, "pack", "pack"); - await checkedGit5( - args.checkoutPath, - ["pack-objects", "--revs", packPrefix], - { - ...privateObjects, - stdin: `${args.promotedCommit} -^${args.baselineCommit} -` - } - ); - await checkedGit5(args.checkoutPath, ["cat-file", "-e", `${args.promotedCommit}^{commit}`]); - await checkedGit5(args.checkoutPath, ["rev-parse", `${args.promotedCommit}^{tree}`]); - await checkedGit5(args.checkoutPath, [ - "rev-list", - "--objects", - args.promotedCommit, - "--not", - args.baselineCommit - ]); -} +// src/pipeline/pipeline-roles.ts +var schemas4 = loadSchemas(); function roleArgs(args) { const ps = args.deps.ps ?? getPlatformServices(); return { @@ -52094,7 +52031,7 @@ async function runArchivedRole(runner, args, store, logName2) { return { result, logRef: logRef2 }; } async function runStructuredRole(args) { - const runner = args.deps.roleRunner ?? runRole; + const runner = args.deps.roleRunner ?? args.deps.runRole ?? runRole; const callArgs = roleArgs({ role: args.role, spec: args.spec, @@ -52129,13 +52066,1094 @@ async function runStructuredRole(args) { return repair.result.ok ? repair.result.rawOutput : ""; } ); - return outcome.ok ? { ok: true, report: outcome.value, roleLogRefs } : { - ok: false, - failure: "invalid-output", - failedRoleLogRef: initial.logRef, - roleLogRefs + if (!outcome.ok) { + return { + ok: false, + // Unparseable structured output is the Producer answering wrongly, not + // failing to answer; collapsing it to producer-failure loses the only + // signal that separates a malformed report from a crashed process. + failure: "invalid-output", + // The rejected output is what a reader needs to see. Pointing at the + // repair attempt hides the report that actually failed validation. + failedRoleLogRef: initial.logRef, + roleLogRefs + }; + } + return { ok: true, report: outcome.value, roleLogRefs }; +} +async function runIncrement(args) { + const logNameNamespace = args.logNameNamespace === void 0 ? "" : `${args.logNameNamespace}-`; + return runStructuredRole({ + role: "implementer", + schema: schemas4.incrementReport, + logName: `role-implementer-${logNameNamespace}increment${args.increment}`, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store: args.store, + ...args.runStart === void 0 ? {} : { runStart: args.runStart }, + gitObjectAccess: args.gitObjectAccess + }); +} +async function runReviews(args) { + const logNameNamespace = args.logNameNamespace === void 0 ? "" : `${args.logNameNamespace}-`; + const outcomes = await Promise.all(args.reviewers.map(async (reviewer) => { + const role = `reviewer-${reviewer}`; + await args.onReviewer?.(role); + const outcome = await runStructuredRole({ + role, + schema: schemas4.reviewReport, + logName: `role-${role}-${logNameNamespace}round${args.round}`, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store: args.store + }); + return { + review: outcome.ok ? { reviewer, report: outcome.report } : null, + initialLogRef: outcome.ok ? null : outcome.failedRoleLogRef, + roleLogRefs: outcome.roleLogRefs + }; + })); + const roleLogRefs = outcomes.flatMap((outcome) => outcome.roleLogRefs); + const reviews = outcomes.map((outcome) => outcome.review); + if (reviews.every((review) => review !== null)) { + return { ok: true, reviews, roleLogRefs }; + } + const failed = outcomes.find((outcome) => outcome.review === null); + if (failed?.initialLogRef === null || failed === void 0) { + throw new Error("unreachable invalid review state"); + } + return { ok: false, failedRoleLogRef: failed.initialLogRef, roleLogRefs }; +} +async function runFix(args) { + const outcome = await runStructuredRole({ + role: "fixer", + schema: schemas4.fixReport, + logName: `role-fixer-round${args.round}`, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store: args.store, + ...args.runStart === void 0 ? {} : { runStart: args.runStart }, + gitObjectAccess: args.gitObjectAccess + }); + return outcome.ok ? { ok: true, fix: outcome.report, roleLogRefs: outcome.roleLogRefs } : outcome; +} + +// src/pipeline/candidate-verifier.ts +function gitFailure5(action, result) { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} +async function checkedGit5(cwd, args, options) { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure5(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} +function analyzeWeakenedTests(diff, allowedTestDeletions = [], deletedPaths) { + let testsDeleted = 0; + let testsSkipped = 0; + const authorizedTestDeletions = []; + let currentFileIsTest = false; + let currentPath = null; + for (const line of diff.split("\n")) { + if (deletedPaths === void 0 && /^deleted file mode/.test(line)) { + if (currentFileIsTest && currentPath !== null) { + const deletedPath = currentPath; + if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { + authorizedTestDeletions.push(deletedPath); + } else { + testsDeleted++; + } + } + } + const diffHeader = /^diff --git a\/(\S+) b\/\S+$/.exec(line); + if (diffHeader !== null) { + currentPath = diffHeader[1] ?? null; + currentFileIsTest = currentPath !== null && /(^|\/)tests?\/|\.test\.|\.spec\./.test(currentPath); + } else if (/^diff --git /.test(line)) { + currentPath = null; + currentFileIsTest = /(^|\/)tests?\/|\.test\.|\.spec\./.test(line); + } + if (currentFileIsTest && /^\+.*\b(it|test|describe)\.(skip|todo)\(/.test(line)) testsSkipped++; + if (currentFileIsTest && /^\+.*\bxit\(|^\+.*\bxdescribe\(/.test(line)) testsSkipped++; + } + for (const deletedPath of deletedPaths ?? []) { + if (!/(^|\/)tests?\/|\.test\.|\.spec\./.test(deletedPath)) continue; + if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { + authorizedTestDeletions.push(deletedPath); + } else { + testsDeleted++; + } + } + return { testsDeleted, testsSkipped, authorizedTestDeletions }; +} +function parseDeletedPaths(nameStatus) { + const fields = nameStatus.split("\0"); + const deletedPaths = []; + for (let index = 0; index < fields.length; index += 1) { + const entry = fields[index] ?? ""; + if (entry === "D") { + const pathname = fields[index + 1]; + if (pathname !== void 0 && pathname !== "") deletedPaths.push(pathname); + index += 1; + continue; + } + const separator = entry.indexOf(" "); + if (separator >= 0 && entry.slice(0, separator) === "D") { + deletedPaths.push(entry.slice(separator + 1)); + } + } + return deletedPaths; +} +async function candidateArtifact(args) { + const artifact = { + baseCommitOid: args.baselineCommit, + candidateTreeOid: (await checkedGit5( + args.worktreePath, + ["rev-parse", `${args.candidateCommit}^{tree}`] + )).trim(), + candidateCommitOid: args.candidateCommit, + anchorRef: args.anchorRef, + manifestHash: "", + changedPaths: [], + patch: args.diffText + }; + const canonical = await recomputeManifest({ + worktreePath: args.worktreePath, + baseCommitOid: args.baselineCommit, + artifact + }); + if (canonical.manifestHash === null) { + throw new RuntimeError("final candidate paths collide under case folding"); + } + return { + ...artifact, + changedPaths: canonical.changedPaths, + manifestHash: canonical.manifestHash + }; +} +async function verifyCandidate(args) { + const ps = args.deps?.ps ?? getPlatformServices(); + const namespace = args.namespace === void 0 ? "" : `${args.namespace}-`; + const manager = new WorktreeManager( + args.checkoutPath, + `${args.attempt.runId}-${namespace}verify`, + ps, + args.deps?.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease } + ); + return await withManagedWorktree({ + manager, + commit: args.candidateCommit, + cleanupFailureMessage: "pipeline verification worktree could not be cleaned up", + run: async (worktreePath) => { + const [diffText, , nameStatus, status, ancestry] = await Promise.all([ + checkedGit5(worktreePath, ["diff", `${args.baselineCommit}..${args.candidateCommit}`]), + checkedGit5(worktreePath, [ + "diff", + "--name-only", + `${args.baselineCommit}..${args.candidateCommit}` + ]), + checkedGit5(worktreePath, [ + "diff", + "--name-status", + "--no-renames", + "-z", + `${args.baselineCommit}..${args.candidateCommit}` + ]), + checkedGit5(worktreePath, ["status", "--porcelain"]), + git(worktreePath, [ + "merge-base", + "--is-ancestor", + args.baselineCommit, + args.candidateCommit + ]) + ]); + const artifact = await candidateArtifact({ + worktreePath, + baselineCommit: args.baselineCommit, + candidateCommit: args.candidateCommit, + anchorRef: args.attempt.candidate?.anchorRef ?? "", + diffText + }); + const verifier = new AcceptanceVerifier({ mode: "composed-slice" }); + const acceptance = await verifier.verify({ + repoRoot: args.checkoutPath, + worktreePath, + baseCommitOid: args.baselineCommit, + artifact, + spec: args.spec, + ps, + artifactStore: args.store, + ...args.deps?.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }, + verificationId: () => `${args.attempt.runId}-${namespace}pipeline`, + logNamePrefix: `${namespace}pipeline-verification` + }); + const scopeViolations = artifact.changedPaths.filter((change) => !isAllowed( + change.path, + args.spec.writeAllowlist, + args.spec.forbiddenScope, + change.mode === "160000" + )).map((change) => change.path); + const weakened = analyzeWeakenedTests( + diffText, + args.spec.allowedTestDeletions, + parseDeletedPaths(nameStatus) + ); + const workspaceClean = status === ""; + const verificationCommands = new Map( + args.spec.verification.map((command) => [command.id, command]) + ); + return { + verification: { + reportVersion: "1", + pass: acceptance.ok && workspaceClean && scopeViolations.length === 0, + commandResults: acceptance.commandOutcomes.map((command) => ({ + id: command.id, + exitCode: command.exitCode ?? -1, + ok: command.exitCode !== null && !command.timedOut && (verificationCommands.get(command.id)?.expectedExitCodes.includes( + command.exitCode + ) ?? false) + })), + workspaceClean, + testsDeleted: weakened.testsDeleted, + testsSkipped: weakened.testsSkipped, + scopeViolations, + evidence: { + failures: [...acceptance.failures], + acceptance: acceptance.evidence, + commandOutcomes: acceptance.commandOutcomes.map((outcome) => ({ + ...outcome, + args: [...outcome.args] + })), + ...args.spec.allowedTestDeletions === void 0 ? {} : { authorizedTestDeletions: [...weakened.authorizedTestDeletions] } + } + }, + baselineDrift: ancestry.exitCode !== 0 + }; + } + }); +} + +// src/pipeline/candidate-provenance.ts +import path30 from "node:path"; +function gitFailure6(action, result) { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} +async function checkedGit6(cwd, args, options) { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure6(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} +function privateObjectReadOptions(access6) { + return { + env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: access6.privateObjectsDir } }; } +async function importPromotedObjects(args) { + const privateObjects = privateObjectReadOptions(args.access); + const packPrefix = path30.join(args.access.sharedObjectsDir, "pack", "pack"); + await checkedGit6( + args.checkoutPath, + ["pack-objects", "--revs", packPrefix], + { + ...privateObjects, + stdin: `${args.promotedCommit} +^${args.baselineCommit} +` + } + ); + await checkedGit6(args.checkoutPath, ["cat-file", "-e", `${args.promotedCommit}^{commit}`]); + await checkedGit6(args.checkoutPath, ["rev-parse", `${args.promotedCommit}^{tree}`]); + await checkedGit6(args.checkoutPath, [ + "rev-list", + "--objects", + args.promotedCommit, + "--not", + args.baselineCommit + ]); +} +async function validateCandidateProvenance(args) { + const phaseLabel = args.phaseLabel ?? "fix phase"; + const privateObjects = privateObjectReadOptions(args.gitObjectAccess); + const candidateObject = await git(args.worktreePath, [ + "cat-file", + "-e", + `${args.candidateCommit}^{commit}` + ], privateObjects); + if (candidateObject.exitCode !== 0) { + return { + failure: "producer-failure", + reason: `${phaseLabel} reported a missing candidate commit` + }; + } + const head = await git( + args.worktreePath, + ["rev-parse", "--verify", "HEAD^{commit}"], + privateObjects + ); + if (head.exitCode !== 0 || head.stdout.trim() !== args.candidateCommit) { + return { + failure: "producer-failure", + reason: `${phaseLabel} reported a candidate commit that does not match its worktree HEAD` + }; + } + const candidateAncestry = await git(args.worktreePath, [ + "merge-base", + "--is-ancestor", + args.previousCandidateCommit, + args.candidateCommit + ], privateObjects); + if (candidateAncestry.exitCode !== 0) { + return { + failure: "sandbox-violation", + reason: `${phaseLabel} candidate commit is not descended from the reviewed candidate` + }; + } + const worktreeStatus = await git(args.worktreePath, [ + "status", + "--porcelain", + "--untracked-files=all" + ], privateObjects); + if (worktreeStatus.exitCode !== 0) { + return { + failure: "sandbox-violation", + reason: `${phaseLabel} candidate worktree cleanliness could not be verified` + }; + } + if (worktreeStatus.stdout.length > 0) { + return { + failure: "sandbox-violation", + reason: `${phaseLabel} candidate worktree contains uncommitted state` + }; + } + return null; +} +async function validateFixProvenance(args) { + const provenanceFailure = await validateCandidateProvenance({ + worktreePath: args.worktreePath, + previousCandidateCommit: args.previousCandidateCommit, + candidateCommit: args.fix.candidateCommit, + gitObjectAccess: args.gitObjectAccess + }); + if (provenanceFailure !== null) return provenanceFailure; + const privateObjects = privateObjectReadOptions(args.gitObjectAccess); + const dispositionCommits = new Set(args.fix.dispositions.flatMap((disposition) => disposition.commit === void 0 ? [] : [disposition.commit])); + for (const dispositionCommit of dispositionCommits) { + const object3 = await git(args.worktreePath, [ + "cat-file", + "-e", + `${dispositionCommit}^{commit}` + ], privateObjects); + if (object3.exitCode !== 0) { + return { + failure: "producer-failure", + reason: "fix phase disposition reported a missing commit object" + }; + } + const [afterPrevious, beforeCandidate] = await Promise.all([ + git(args.worktreePath, [ + "merge-base", + "--is-ancestor", + args.previousCandidateCommit, + dispositionCommit + ], privateObjects), + git(args.worktreePath, [ + "merge-base", + "--is-ancestor", + dispositionCommit, + args.fix.candidateCommit + ], privateObjects) + ]); + if (afterPrevious.exitCode !== 0 || beforeCandidate.exitCode !== 0) { + return { + failure: "producer-failure", + reason: "fix phase disposition commit is outside the produced candidate lineage" + }; + } + } + return null; +} + +// src/git/ref-namespace.ts +var SLICE_REF_PREFIX = "refs/claude-architect/slices/"; + +// src/pipeline/slice-runner.ts +var SliceExecutionError = class extends RuntimeError { + constructor(message, failure3) { + super(message); + this.failure = failure3; + this.name = "SliceExecutionError"; + } + failure; +}; +function findSliceExecutionError(error51) { + if (error51 instanceof SliceExecutionError) return error51; + if (error51 instanceof AggregateError) { + for (const nested of error51.errors) { + const found = findSliceExecutionError(nested); + if (found !== null) return found; + } + } + return null; +} +function scopeSpecToSlice(spec, slice) { + const scoped = structuredClone({ ...spec, ...slice }); + delete scoped.slices; + return scoped; +} +function gitFailure7(action, result) { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} +async function checkedGit7(cwd, args, options) { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure7(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} +function temporarySliceRef(runId, index, attempt) { + return `${SLICE_REF_PREFIX}${runId}/slice-${index}-attempt-${attempt}`; +} +async function createTemporarySliceRef(checkoutPath, temporaryRef) { + const result = await git(checkoutPath, [ + "update-ref", + "--no-deref", + temporaryRef.ref, + temporaryRef.oid, + "0".repeat(temporaryRef.oid.length) + ]); + if (result.exitCode !== 0) throw gitFailure7("create temporary slice ref", result); +} +async function cleanupTemporarySliceRefs(checkoutPath, temporaryRefs) { + const errors = []; + for (const temporaryRef of [...temporaryRefs].reverse()) { + try { + const result = await git(checkoutPath, [ + "update-ref", + "--no-deref", + "-d", + temporaryRef.ref, + temporaryRef.oid + ]); + if (result.exitCode !== 0) { + errors.push(gitFailure7("delete temporary slice ref", result)); + } + } catch (error51) { + errors.push(error51); + } + } + return errors; +} +function describePriorAttempts(attempts) { + return attempts.map((entry) => { + const failed = (entry.verification?.commandResults ?? []).filter((command) => !command.ok).map((command) => `${command.id} (exit ${String(command.exitCode)})`); + const blocking = (entry.perSliceReview?.findings ?? []).filter((finding) => finding.severity === "blocker" || finding.severity === "major").map((finding) => `${finding.severity} at ${finding.location}: ${finding.claim}`); + return [ + `attempt ${entry.attempt} -> ${entry.route}`, + ` reasons: ${entry.reasons.join("; ") || "(none recorded)"}`, + ...failed.length === 0 ? [] : [` failing verification: ${failed.join(", ")}`], + ...blocking.length === 0 ? [] : [` blocking findings: + ${blocking.join("\n ")}`] + ].join("\n"); + }).join("\n\n"); +} +function verificationTestEvidence(verification) { + return { + pass: verification.pass, + commandResults: verification.commandResults.map((command) => ({ ...command })), + workspaceClean: verification.workspaceClean, + testsDeleted: verification.testsDeleted, + testsSkipped: verification.testsSkipped, + scopeViolations: [...verification.scopeViolations] + }; +} +function sliceTestEvidence(slices) { + return JSON.stringify(slices.map((slice) => ({ + sliceIndex: slice.index, + verification: slice.verification === null ? null : verificationTestEvidence(slice.verification), + attempts: slice.attempts.map((attempt) => ({ + attempt: attempt.attempt, + verification: attempt.verification === null ? null : verificationTestEvidence(attempt.verification) + })) + }))); +} +function testEvidence(attempt) { + return JSON.stringify(attempt.executedVerification.map((outcome) => ({ + id: outcome.id, + exitCode: outcome.exitCode, + timedOut: outcome.timedOut + }))); +} +async function runSliceReview(args) { + const ps = args.deps.ps ?? getPlatformServices(); + return withManagedWorktree({ + manager: new WorktreeManager( + args.checkoutPath, + `${args.runId}-${args.namespace}-review`, + ps, + args.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.borrowedCheckoutLease } + ), + commit: args.candidateCommit, + cleanupFailureMessage: "slice review failed and its worktree could not be cleaned up", + run: async (worktreePath) => { + const diffText = await checkedGit7(worktreePath, [ + "diff", + `${args.baselineCommit}..${args.candidateCommit}` + ]); + const reviewRun = await runReviews({ + reviewers: args.reviewers, + spec: args.spec, + pkg: { + spec: args.spec, + baselineCommit: args.baselineCommit, + candidateCommit: args.candidateCommit, + candidateDiff: diffText, + testEvidence: JSON.stringify(verificationTestEvidence(args.verification)) + }, + worktreePath, + deps: args.deps, + runId: args.runId, + round: 1, + store: args.store, + logNameNamespace: args.namespace + }); + if (!reviewRun.ok) { + throw new SliceExecutionError( + `slice review did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, + "producer-failure" + ); + } + return { + review: consolidate(reviewRun.reviews.map((review) => ({ + reviewer: review.reviewer, + report: review.report + }))), + roleLogRefs: reviewRun.roleLogRefs + }; + } + }); +} +var SliceRunner = class { + producerRuntime; + runDecision; + platformSafety; + ps; + runRole; + roleRunner; + constructor(dependencies = {}) { + this.producerRuntime = dependencies.producerRuntime ?? producerRuntime; + this.runDecision = dependencies.runDecision ?? runDecision; + this.platformSafety = dependencies.platformSafety ?? platformSafety; + this.ps = dependencies.ps ?? getPlatformServices(); + this.runRole = dependencies.runRole ?? runRole; + this.roleRunner = dependencies.roleRunner; + } + async run(options) { + const { context, slices, baselineCommit, attempt } = options; + const maxRounds = options.budgets?.maxRounds ?? options.maxRounds ?? 3; + const concurrency = options.concurrency ?? 1; + const temporarySliceRefs2 = []; + const completedSlices = []; + let currentCommit = baselineCommit; + const results = []; + try { + for (const wave of planSliceWaves(slices, concurrency)) { + const base = currentCommit; + const outcomes = await Promise.all(wave.indices.map(async (index) => { + const slice = slices[index - 1]; + let roundsUsed = 0; + const attempts = []; + while (true) { + let sourceAttempt; + if (roundsUsed === 0 && index === 1 && options.initialAttempt !== void 0) { + sourceAttempt = options.initialAttempt; + } else { + const namespace = `slice-${index}-attempt-${roundsUsed}`; + const scopedSpec = scopeSpecToSlice(context.spec, slice); + sourceAttempt = await withManagedWorktree({ + manager: new WorktreeManager( + context.checkoutPath, + `${context.runId}-${namespace}`, + this.ps, + context.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: context.borrowedCheckoutLease } + ), + commit: base, + cleanupFailureMessage: "slice implementation failed and its worktree could not be cleaned up", + run: async (worktreePath) => { + let gitObjectAccess; + try { + gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + throw new SliceExecutionError( + "slice implementer git object isolation could not be established", + "sandbox-violation" + ); + } + await context.emitStatus("implementing", { + sliceIndex: index, + role: "implementer" + }); + const roleDeps = { + ps: this.ps, + runRole: this.runRole, + ...this.roleRunner === void 0 ? {} : { roleRunner: this.roleRunner }, + ...options.registry === void 0 ? {} : { registry: options.registry }, + ...options.abortSignal === void 0 ? {} : { abortSignal: options.abortSignal } + }; + const incrementRun = await runIncrement({ + spec: scopedSpec, + pkg: { + spec: scopedSpec, + baselineCommit: base, + candidateCommit: base, + candidateDiff: "", + testEvidence: completedSlices.length === 0 ? testEvidence(attempt) : sliceTestEvidence(completedSlices), + ...attempts.length === 0 ? {} : { priorAttempts: describePriorAttempts(attempts) } + }, + worktreePath, + deps: roleDeps, + runId: context.runId, + increment: roundsUsed + 1, + store: context.store, + gitObjectAccess, + ...context.runStart === void 0 ? {} : { runStart: context.runStart }, + logNameNamespace: namespace + }); + if (!incrementRun.ok) { + throw new SliceExecutionError( + `slice implementer did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, + incrementRun.failure + ); + } + await context.emitStatus("freezing", { + sliceIndex: index, + role: "implementer" + }); + const candidateCommit = incrementRun.report.candidateCommit; + const provenanceFailure = await validateCandidateProvenance({ + worktreePath, + previousCandidateCommit: base, + candidateCommit, + gitObjectAccess, + phaseLabel: "slice implementer" + }); + if (provenanceFailure !== null) { + throw new SliceExecutionError( + provenanceFailure.reason, + provenanceFailure.failure + ); + } + if (candidateCommit !== base) { + try { + await importPromotedObjects({ + checkoutPath: context.checkoutPath, + baselineCommit: base, + promotedCommit: candidateCommit, + access: gitObjectAccess + }); + } catch { + throw new SliceExecutionError( + "slice candidate objects could not be imported into the shared git object store", + "sandbox-violation" + ); + } + const temporaryRef = { + ref: temporarySliceRef(context.runId, index, roundsUsed), + oid: candidateCommit + }; + try { + await createTemporarySliceRef(context.checkoutPath, temporaryRef); + } catch { + throw new SliceExecutionError( + "slice candidate temporary ref could not be established", + "sandbox-violation" + ); + } + temporarySliceRefs2.push(temporaryRef); + } + await context.emitStatus("verifying", { sliceIndex: index }); + const verified = await verifyCandidate({ + checkoutPath: context.checkoutPath, + spec: scopedSpec, + deps: { + ps: this.ps, + ...context.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: context.borrowedCheckoutLease } + }, + attempt, + baselineCommit: base, + candidateCommit, + store: context.store, + namespace + }); + let perSliceReview2 = null; + const roleLogRefs = [...incrementRun.roleLogRefs]; + if (options.reviewConfig?.perSlice === true) { + const reviewers = (options.reviewers ?? ["reviewer-correctness"]).map((r) => r.startsWith("reviewer-") ? r.replace("reviewer-", "") : r); + const reviewed = await runSliceReview({ + checkoutPath: context.checkoutPath, + spec: scopedSpec, + deps: roleDeps, + runId: context.runId, + baselineCommit: base, + candidateCommit, + namespace, + reviewers, + verification: verified.verification, + store: context.store, + borrowedCheckoutLease: context.borrowedCheckoutLease + }); + perSliceReview2 = reviewed.review; + roleLogRefs.push(...reviewed.roleLogRefs); + } + return { + candidateCommit, + verification: verified.verification, + perSliceReview: perSliceReview2, + roleLogRefs + }; + } + }); + } + const currentAttempt = structuredClone(sourceAttempt); + const perSliceReview = currentAttempt.perSliceReview ?? null; + const route2 = routeSlice({ + verification: currentAttempt.verification, + perSliceReview, + roundsUsed, + maxRounds, + hardBlocker: currentAttempt.hardBlocker ?? false + }); + const evidence = { + sliceIndex: index, + attempt: roundsUsed, + candidateCommit: currentAttempt.candidateCommit, + verification: currentAttempt.verification, + perSliceReview, + route: route2.route, + reasons: [...route2.reasons], + roleLogRefs: [...currentAttempt.roleLogRefs ?? []] + }; + await context.store.writePipelineArtifact( + `slice-${evidence.sliceIndex}-attempt-${evidence.attempt}`, + evidence + ); + if (options.onAttempt) { + await options.onAttempt(structuredClone(evidence)); + } + attempts.push(evidence); + const pipelineSlice = { + index, + objective: slice.objective, + route: route2.route, + candidateCommit: currentAttempt.candidateCommit, + roundsUsed, + verification: currentAttempt.verification, + perSliceReview, + reasons: [...route2.reasons], + attempts: attempts.map((entry) => ({ + ...entry, + reasons: [...entry.reasons], + roleLogRefs: [...entry.roleLogRefs] + })), + roleLogRefs: attempts.flatMap((entry) => entry.roleLogRefs) + }; + if (route2.route === "repair") { + roundsUsed += 1; + continue; + } + return { slice: pipelineSlice, advanced: route2.route === "advance" }; + } + })); + for (const outcome of outcomes) { + const composed = wave.indices.length === 1 ? outcome.slice.candidateCommit : await composeSliceOntoHead({ + checkoutPath: context.checkoutPath, + runId: context.runId, + head: currentCommit, + base, + sliceCommit: outcome.slice.candidateCommit, + sliceIndex: outcome.slice.index + }); + const recorded = { ...outcome.slice, candidateCommit: composed }; + results.push(recorded); + completedSlices.push(structuredClone(recorded)); + await context.store.writePipelineArtifact(`slice-${recorded.index}`, recorded); + if (options.onSlice) { + await options.onSlice(structuredClone(recorded)); + } + if (!outcome.advanced) { + return { + slices: results, + finalCandidateCommit: currentCommit, + haltedSliceIndex: recorded.index, + temporarySliceRefs: [...temporarySliceRefs2] + }; + } + currentCommit = composed; + } + } + return { + slices: results, + finalCandidateCommit: currentCommit, + haltedSliceIndex: null, + temporarySliceRefs: [...temporarySliceRefs2] + }; + } catch (error51) { + await cleanupTemporarySliceRefs(context.checkoutPath, temporarySliceRefs2); + throw error51; + } + } +}; + +// src/pipeline/run-context.ts +function createRunContext(options) { + const { + runId, + checkoutPath, + spec, + store, + ps, + borrowedCheckoutLease, + runStart, + onPhase, + sliceCount + } = options; + return { + runId, + checkoutPath, + spec, + store, + ps, + ...borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease }, + ...runStart === void 0 ? {} : { runStart }, + async emitStatus(phase, fields) { + await transitionRunStatusSafely(store, runId, phase, { + sliceIndex: fields?.sliceIndex ?? null, + sliceCount: fields?.sliceCount ?? sliceCount ?? null, + round: fields?.round ?? null, + role: fields?.role ?? null, + producerId: fields?.producerId ?? null, + detail: fields?.detail ?? null + }); + }, + async notePhase(phase) { + try { + await onPhase?.(phase); + } catch { + } + } + }; +} + +// src/pipeline/advisor-stage.ts +var schemas5 = loadSchemas(); +function frozenAdvisorEvidence(spec, pipelineResult, reviewSnapshot) { + const finalRound = pipelineResult.rounds.at(-1) ?? null; + return { + runId: pipelineResult.runId, + specification: { + objective: spec.objective, + successCriteria: [...spec.successCriteria], + writeAllowlist: [...spec.writeAllowlist], + forbiddenScope: [...spec.forbiddenScope] + }, + baselineCommitOid: reviewSnapshot.baseCommitOid, + candidateCommitOid: reviewSnapshot.candidateCommitOid, + candidateTreeOid: reviewSnapshot.candidateTreeOid, + candidateManifestHash: reviewSnapshot.manifestHash, + reviewSnapshot: structuredClone(reviewSnapshot), + finalRound: structuredClone(finalRound), + reviewAndFixHistory: structuredClone(pipelineResult.rounds), + trustedVerification: structuredClone(pipelineResult.verification), + gate: structuredClone(pipelineResult.gate), + pipelineStatus: pipelineResult.status + }; +} +function failureReport(failure3, failedRoleLogRef) { + return { + reportVersion: "1", + verdict: "human-decision-required", + rationale: `The final advisor did not produce an approving valid report (${failure3}; see ${failedRoleLogRef}).`, + risks: [], + coverageGaps: ["A fresh confined advisor review is unavailable."] + }; +} +function assertSameFrozenArtifact(label, providedHash, archivedHash) { + if (providedHash !== archivedHash) { + throw new RuntimeError(`${label} differs from the durable archived artifact`); + } +} +function advisorExecutionDiagnostic(error51) { + const detail = error51 instanceof Error ? `${error51.name}: ${error51.message}` : String(error51); + return redact(detail).slice(0, 2e3); +} +async function runAdvisorStage(args) { + const store = args.store ?? new ArtifactStore(args.runId); + const statusStore = new ArtifactStore(args.runId); + await transitionRunStatusSafely(statusStore, args.runId, "advisor", { + round: null, + role: "advisor", + detail: null + }); + try { + const [archivedPipelineResult, archivedReviewSnapshot, archivedSpec] = await Promise.all([ + store.readPipelineArtifact(args.runId, "pipeline-result"), + store.readReviewSnapshot(args.runId), + store.readPipelineArtifact(args.runId, "delegation-spec") + ]); + if (archivedPipelineResult === null) { + throw new RuntimeError("advisor stage requires a durable archived PipelineResult"); + } + if (archivedReviewSnapshot === null) { + throw new RuntimeError("advisor stage requires a durable review snapshot"); + } + if (archivedSpec === null) { + throw new RuntimeError("advisor stage requires a durable archived delegation specification"); + } + if (!schemas5.delegationSpec(archivedSpec)) { + throw new RuntimeError("advisor stage archived delegation specification is invalid"); + } + const suppliedSpec = redactRecord(structuredClone(args.spec)); + if (canonicalArtifactHash(suppliedSpec) !== canonicalArtifactHash(archivedSpec)) { + throw new RuntimeError("advisor stage specification differs from the durable archived specification"); + } + if (archivedPipelineResult.runId !== args.runId || archivedReviewSnapshot.runId !== args.runId) { + throw new RuntimeError("advisor stage run identity does not match its durable evidence"); + } + if (args.pipelineResult !== void 0) { + assertSameFrozenArtifact( + "pipeline result", + pipelineResultHash(args.pipelineResult), + pipelineResultHash(archivedPipelineResult) + ); + } + if (args.reviewSnapshot !== void 0) { + assertSameFrozenArtifact( + "review snapshot", + reviewSnapshotHash(args.reviewSnapshot), + reviewSnapshotHash(archivedReviewSnapshot) + ); + } + const advisorSpec = { + ...structuredClone(archivedSpec), + context: "" + }; + const pkg = { + spec: advisorSpec, + baselineCommit: archivedReviewSnapshot.baseCommitOid, + candidateCommit: archivedReviewSnapshot.candidateCommitOid, + candidateDiff: archivedReviewSnapshot.patch, + testEvidence: JSON.stringify({ + evidence: archivedReviewSnapshot.evidence, + executedVerification: archivedReviewSnapshot.executedVerification, + finalVerification: archivedPipelineResult.verification + }), + advisorEvidence: frozenAdvisorEvidence( + advisorSpec, + archivedPipelineResult, + archivedReviewSnapshot + ) + }; + const advisorEvidenceText = JSON.stringify(pkg.advisorEvidence, null, 2); + let outcome; + if (!canRenderUntrustedBlockExactly(advisorEvidenceText)) { + const failedRoleLogRef = await store.writeLog( + "role-advisor-final", + "advisor was not launched: the exact frozen evidence package exceeds the bounded role input\n" + ); + outcome = { + ok: false, + failure: "invalid-output", + failedRoleLogRef, + roleLogRefs: [failedRoleLogRef] + }; + } else { + try { + outcome = await runStructuredRole({ + role: "advisor", + schema: schemas5.advisorReport, + logName: "role-advisor-final", + spec: advisorSpec, + pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store + }); + } catch (error51) { + const failedRoleLogRef = await store.writeLog( + "role-advisor-final", + `advisor execution failed before producing a classified result: ${advisorExecutionDiagnostic(error51)} +` + ); + outcome = { + ok: false, + failure: "producer-failure", + failedRoleLogRef, + roleLogRefs: [failedRoleLogRef] + }; + } + } + const report = outcome.ok ? redactRecord(outcome.report) : failureReport(outcome.failure, outcome.failedRoleLogRef); + const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + pipelineResult: archivedPipelineResult, + reviewSnapshot: archivedReviewSnapshot, + advisor: report, + evaluatedAt: args.evaluatedAt + })); + await transitionRunStatusSafely(statusStore, args.runId, "gating", { + role: "advisor" + }); + await store.writePostPipelineAutopilotArtifacts({ + pipelineResult: archivedPipelineResult, + reviewSnapshot: archivedReviewSnapshot, + advisorReport: report, + eligibility + }); + advisorReportHash(report); + await transitionRunStatusSafely( + statusStore, + args.runId, + outcome.ok ? "done" : "failed", + { + role: "advisor", + detail: outcome.ok ? report.verdict : outcome.failure + } + ); + return { + report, + eligibility, + failure: outcome.ok ? null : outcome.failure, + roleLogRefs: outcome.roleLogRefs + }; + } catch (error51) { + await transitionRunStatusSafely(statusStore, args.runId, "failed", { + role: "advisor", + detail: error51 instanceof Error ? error51.message : "advisor stage failed unexpectedly" + }); + throw error51; + } +} + +// src/pipeline/pipeline-runtime.ts +var schemas6 = loadSchemas(); +var CANDIDATE_REF_PREFIX2 = "refs/claude-architect/candidates/"; +function gitFailure8(action, result) { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} +async function checkedGit8(cwd, args, options) { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure8(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} function failedResult(attempt, rounds, finalCandidateCommit, reason, failure3 = "producer-failure", increments = [], slices = [], haltedSliceIndex = null) { return { runId: attempt.runId, @@ -52172,47 +53190,12 @@ ${nextSteps}`] MAX_PROGRESS_NOTES_LENGTH - PROGRESS_TRUNCATION_NOTE.length )}${PROGRESS_TRUNCATION_NOTE}`; } -function testEvidence(attempt) { - return JSON.stringify(attempt.executedVerification.map((outcome) => ({ - id: outcome.id, - exitCode: outcome.exitCode, - timedOut: outcome.timedOut - }))); -} function attemptLogRefs(attempt) { return [.../* @__PURE__ */ new Set([ attempt.logsRef, ...attempt.executedVerification.flatMap((outcome) => [outcome.stdoutRef, outcome.stderrRef]) ])]; } -function verificationTestEvidence(verification) { - return { - pass: verification.pass, - commandResults: verification.commandResults.map((command) => ({ ...command })), - workspaceClean: verification.workspaceClean, - testsDeleted: verification.testsDeleted, - testsSkipped: verification.testsSkipped, - scopeViolations: [...verification.scopeViolations] - }; -} -function sliceTestEvidence(slices) { - return JSON.stringify(slices.map((slice) => ({ - sliceIndex: slice.index, - verification: slice.verification === null ? null : verificationTestEvidence(slice.verification), - attempts: slice.attempts.map((attempt) => ({ - attempt: attempt.attempt, - verification: attempt.verification === null ? null : verificationTestEvidence(attempt.verification) - })) - }))); -} -var SliceExecutionError = class extends RuntimeError { - constructor(message, failure3) { - super(message); - this.failure = failure3; - this.name = "SliceExecutionError"; - } - failure; -}; var SlicedFailureArchiveError = class extends RuntimeError { constructor(cause) { super(cause instanceof Error ? cause.message : "sliced failure archival failed"); @@ -52221,15 +53204,6 @@ var SlicedFailureArchiveError = class extends RuntimeError { } cause; }; -function findSliceExecutionError(error51) { - if (error51 instanceof SliceExecutionError) return error51; - if (!(error51 instanceof AggregateError)) return null; - for (const nested of error51.errors) { - const found = findSliceExecutionError(nested); - if (found !== null) return found; - } - return null; -} function containsSlicedFailureArchiveError(error51) { if (error51 instanceof SlicedFailureArchiveError) return true; if (!(error51 instanceof AggregateError)) return false; @@ -52260,7 +53234,7 @@ async function archiveSlicedFailure(args) { candidate.anchorRef, candidate.candidateCommitOid ]); - if (deleted.exitCode !== 0) throw gitFailure5("delete sliced candidate anchor", deleted); + if (deleted.exitCode !== 0) throw gitFailure8("delete sliced candidate anchor", deleted); } const failedAttempt = { ...args.attempt, @@ -52302,40 +53276,10 @@ async function archiveSliceExecutionError(args) { ); } } -async function cleanupWorktree(worktree) { - try { - await worktree.cleanup(); - return null; - } catch (error51) { - return error51; - } -} -var worktreeCreation = Promise.resolve(); -function createWorktreeSerially(manager, commit) { - const created = worktreeCreation.catch(() => { - }).then(async () => manager.create(commit)); - worktreeCreation = created.catch(() => { - }); - return created; -} -async function withManagedWorktree(args) { - const worktree = await createWorktreeSerially(args.manager, args.commit); - try { - return await args.run(worktree.path); - } finally { - const cleanupError = await cleanupWorktree(worktree); - if (cleanupError !== null) { - logger.warn(args.cleanupFailureMessage, { - error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)) - }); - args.onCleanupFailure?.(cleanupError); - } - } -} -async function candidateArtifact(args) { +async function candidateArtifact2(args) { const artifact = { baseCommitOid: args.baselineCommit, - candidateTreeOid: (await checkedGit5( + candidateTreeOid: (await checkedGit8( args.worktreePath, ["rev-parse", `${args.candidateCommit}^{tree}`] )).trim(), @@ -52363,12 +53307,12 @@ async function promoteFinalCandidate(args) { let canonicalCommit; try { const objectReadOptions = args.privateObjectAccess === void 0 ? void 0 : privateObjectReadOptions(args.privateObjectAccess); - const finalTree = (await checkedGit5( + const finalTree = (await checkedGit8( args.checkoutPath, ["rev-parse", `${args.candidateCommit}^{tree}`], objectReadOptions )).trim(); - canonicalCommit = (await checkedGit5(args.checkoutPath, [ + canonicalCommit = (await checkedGit8(args.checkoutPath, [ "commit-tree", finalTree, "-p", @@ -52387,17 +53331,17 @@ async function promoteFinalCandidate(args) { } catch { return null; } - await checkedGit5(args.checkoutPath, [ + await checkedGit8(args.checkoutPath, [ "update-ref", args.initialCandidate.anchorRef, canonicalCommit, args.initialCandidate.candidateCommitOid ]); - const diffText = await checkedGit5( + const diffText = await checkedGit8( args.checkoutPath, ["diff", `${args.baselineCommit}..${canonicalCommit}`] ); - const candidate = await candidateArtifact({ + const candidate = await candidateArtifact2({ worktreePath: args.checkoutPath, baselineCommit: args.baselineCommit, candidateCommit: canonicalCommit, @@ -52413,385 +53357,6 @@ async function promoteFinalCandidate(args) { }); return { attempt: finalAttempt, candidateCommit: canonicalCommit }; } -function analyzeWeakenedTests(diff, allowedTestDeletions = [], deletedPaths) { - let testsDeleted = 0; - let testsSkipped = 0; - const authorizedTestDeletions = []; - let currentFileIsTest = false; - let currentPath = null; - for (const line of diff.split("\n")) { - if (deletedPaths === void 0 && /^deleted file mode/.test(line)) { - if (currentFileIsTest && currentPath !== null) { - const deletedPath = currentPath; - if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } - } - } - const diffHeader = /^diff --git a\/(\S+) b\/\S+$/.exec(line); - if (diffHeader !== null) { - currentPath = diffHeader[1] ?? null; - currentFileIsTest = currentPath !== null && /(^|\/)tests?\/|\.test\.|\.spec\./.test(currentPath); - } else if (/^diff --git /.test(line)) { - currentPath = null; - currentFileIsTest = /(^|\/)tests?\/|\.test\.|\.spec\./.test(line); - } - if (currentFileIsTest && /^\+.*\b(it|test|describe)\.(skip|todo)\(/.test(line)) testsSkipped++; - if (currentFileIsTest && /^\+.*\bxit\(|^\+.*\bxdescribe\(/.test(line)) testsSkipped++; - } - for (const deletedPath of deletedPaths ?? []) { - if (!/(^|\/)tests?\/|\.test\.|\.spec\./.test(deletedPath)) continue; - if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } - } - return { testsDeleted, testsSkipped, authorizedTestDeletions }; -} -function parseDeletedPaths(nameStatus) { - const fields = nameStatus.split("\0"); - const deletedPaths = []; - for (let index = 0; index < fields.length; index += 1) { - const entry = fields[index] ?? ""; - if (entry === "D") { - const pathname = fields[index + 1]; - if (pathname !== void 0 && pathname !== "") deletedPaths.push(pathname); - index += 1; - continue; - } - const separator = entry.indexOf(" "); - if (separator >= 0 && entry.slice(0, separator) === "D") { - deletedPaths.push(entry.slice(separator + 1)); - } - } - return deletedPaths; -} -async function runReviews(args) { - const logNameNamespace = args.logNameNamespace === void 0 ? "" : `${args.logNameNamespace}-`; - const outcomes = await Promise.all(args.reviewers.map(async (reviewer) => { - const role = `reviewer-${reviewer}`; - await args.onReviewer?.(role); - const outcome = await runStructuredRole({ - role, - schema: schemas5.reviewReport, - logName: `role-${role}-${logNameNamespace}round${args.round}`, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store: args.store - }); - return { - review: outcome.ok ? { reviewer, report: outcome.report } : null, - initialLogRef: outcome.ok ? null : outcome.failedRoleLogRef, - roleLogRefs: outcome.roleLogRefs - }; - })); - const roleLogRefs = outcomes.flatMap((outcome) => outcome.roleLogRefs); - const reviews = outcomes.map((outcome) => outcome.review); - if (reviews.every((review) => review !== null)) { - return { ok: true, reviews, roleLogRefs }; - } - const failed = outcomes.find((outcome) => outcome.review === null); - if (failed?.initialLogRef === null || failed === void 0) { - throw new Error("unreachable invalid review state"); - } - return { ok: false, failedRoleLogRef: failed.initialLogRef, roleLogRefs }; -} -async function runSliceReview(args) { - const ps = args.deps.ps ?? getPlatformServices(); - return withManagedWorktree({ - manager: new WorktreeManager( - args.checkoutPath, - `${args.runId}-${args.namespace}-review`, - ps, - args.deps.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease } - ), - commit: args.candidateCommit, - cleanupFailureMessage: "slice review failed and its worktree could not be cleaned up", - run: async (worktreePath) => { - const diffText = await checkedGit5(worktreePath, [ - "diff", - `${args.baselineCommit}..${args.candidateCommit}` - ]); - const reviewRun = await runReviews({ - reviewers: args.reviewers, - spec: args.spec, - pkg: { - spec: args.spec, - baselineCommit: args.baselineCommit, - candidateCommit: args.candidateCommit, - candidateDiff: diffText, - testEvidence: JSON.stringify(verificationTestEvidence(args.verification)) - }, - worktreePath, - deps: args.deps, - runId: args.runId, - round: 1, - store: args.store, - logNameNamespace: args.namespace - }); - if (!reviewRun.ok) { - throw new SliceExecutionError( - `slice review did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, - "producer-failure" - ); - } - return { - review: consolidate(reviewRun.reviews.map((review) => ({ - reviewer: review.reviewer, - report: review.report - }))), - roleLogRefs: reviewRun.roleLogRefs - }; - } - }); -} -async function runFix(args) { - const outcome = await runStructuredRole({ - role: "fixer", - schema: schemas5.fixReport, - logName: `role-fixer-round${args.round}`, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store: args.store, - ...args.runStart === void 0 ? {} : { runStart: args.runStart }, - gitObjectAccess: args.gitObjectAccess - }); - return outcome.ok ? { ok: true, fix: outcome.report, roleLogRefs: outcome.roleLogRefs } : outcome; -} -async function runIncrement(args) { - const logNameNamespace = args.logNameNamespace === void 0 ? "" : `${args.logNameNamespace}-`; - return runStructuredRole({ - role: "implementer", - schema: schemas5.incrementReport, - logName: `role-implementer-${logNameNamespace}increment${args.increment}`, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store: args.store, - ...args.runStart === void 0 ? {} : { runStart: args.runStart }, - gitObjectAccess: args.gitObjectAccess - }); -} -async function validateCandidateProvenance(args) { - const phaseLabel = args.phaseLabel ?? "fix phase"; - const privateObjects = privateObjectReadOptions(args.gitObjectAccess); - const candidateObject = await git(args.worktreePath, [ - "cat-file", - "-e", - `${args.candidateCommit}^{commit}` - ], privateObjects); - if (candidateObject.exitCode !== 0) { - return { - failure: "producer-failure", - reason: `${phaseLabel} reported a missing candidate commit` - }; - } - const head = await git( - args.worktreePath, - ["rev-parse", "--verify", "HEAD^{commit}"], - privateObjects - ); - if (head.exitCode !== 0 || head.stdout.trim() !== args.candidateCommit) { - return { - failure: "producer-failure", - reason: `${phaseLabel} reported a candidate commit that does not match its worktree HEAD` - }; - } - const candidateAncestry = await git(args.worktreePath, [ - "merge-base", - "--is-ancestor", - args.previousCandidateCommit, - args.candidateCommit - ], privateObjects); - if (candidateAncestry.exitCode !== 0) { - return { - failure: "sandbox-violation", - reason: `${phaseLabel} candidate commit is not descended from the reviewed candidate` - }; - } - const worktreeStatus = await git(args.worktreePath, [ - "status", - "--porcelain", - "--untracked-files=all" - ], privateObjects); - if (worktreeStatus.exitCode !== 0) { - return { - failure: "sandbox-violation", - reason: `${phaseLabel} candidate worktree cleanliness could not be verified` - }; - } - if (worktreeStatus.stdout.length > 0) { - return { - failure: "sandbox-violation", - reason: `${phaseLabel} candidate worktree contains uncommitted state` - }; - } - return null; -} -async function validateFixProvenance(args) { - const provenanceFailure = await validateCandidateProvenance({ - worktreePath: args.worktreePath, - previousCandidateCommit: args.previousCandidateCommit, - candidateCommit: args.fix.candidateCommit, - gitObjectAccess: args.gitObjectAccess - }); - if (provenanceFailure !== null) return provenanceFailure; - const privateObjects = privateObjectReadOptions(args.gitObjectAccess); - const dispositionCommits = new Set(args.fix.dispositions.flatMap((disposition) => disposition.commit === void 0 ? [] : [disposition.commit])); - for (const dispositionCommit of dispositionCommits) { - const object3 = await git(args.worktreePath, [ - "cat-file", - "-e", - `${dispositionCommit}^{commit}` - ], privateObjects); - if (object3.exitCode !== 0) { - return { - failure: "producer-failure", - reason: "fix phase disposition reported a missing commit object" - }; - } - const [afterPrevious, beforeCandidate] = await Promise.all([ - git(args.worktreePath, [ - "merge-base", - "--is-ancestor", - args.previousCandidateCommit, - dispositionCommit - ], privateObjects), - git(args.worktreePath, [ - "merge-base", - "--is-ancestor", - dispositionCommit, - args.fix.candidateCommit - ], privateObjects) - ]); - if (afterPrevious.exitCode !== 0 || beforeCandidate.exitCode !== 0) { - return { - failure: "producer-failure", - reason: "fix phase disposition commit is outside the produced candidate lineage" - }; - } - } - return null; -} -async function verifyCandidate(args) { - const ps = args.deps.ps ?? getPlatformServices(); - const namespace = args.namespace === void 0 ? "" : `${args.namespace}-`; - const manager = new WorktreeManager( - args.checkoutPath, - `${args.attempt.runId}-${namespace}verify`, - ps, - args.deps.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease } - ); - const fresh = await manager.create(args.candidateCommit); - try { - const [diffText, nameOnly, nameStatus, status, ancestry] = await Promise.all([ - checkedGit5(fresh.path, ["diff", `${args.baselineCommit}..${args.candidateCommit}`]), - checkedGit5(fresh.path, [ - "diff", - "--name-only", - `${args.baselineCommit}..${args.candidateCommit}` - ]), - checkedGit5(fresh.path, [ - "diff", - "--name-status", - "--no-renames", - "-z", - `${args.baselineCommit}..${args.candidateCommit}` - ]), - checkedGit5(fresh.path, ["status", "--porcelain"]), - git(fresh.path, [ - "merge-base", - "--is-ancestor", - args.baselineCommit, - args.candidateCommit - ]) - ]); - const artifact = await candidateArtifact({ - worktreePath: fresh.path, - baselineCommit: args.baselineCommit, - candidateCommit: args.candidateCommit, - anchorRef: args.attempt.candidate?.anchorRef ?? "", - diffText - }); - const verifier = new AcceptanceVerifier({ - structural: async (structuralArgs) => { - const result = await structuralVerify(structuralArgs); - const failures = result.failures.filter( - (failure3) => !IGNORED_STRUCTURAL_FAILURES.has(failure3) - ); - return { ...result, ok: failures.length === 0, failures }; - } - }); - const acceptance = await verifier.verify({ - repoRoot: args.checkoutPath, - worktreePath: fresh.path, - baseCommitOid: args.baselineCommit, - artifact, - spec: args.spec, - ps, - artifactStore: args.store, - ...args.deps.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }, - verificationId: () => `${args.attempt.runId}-${namespace}pipeline`, - logNamePrefix: `${namespace}pipeline-verification` - }); - const changedPaths = nameOnly.split("\n").map((line) => line.trim()).filter(Boolean); - const scopeViolations = changedPaths.filter((pathname) => !args.spec.writeAllowlist.some((pattern) => globMatches(pattern, pathname)) || args.spec.forbiddenScope.some((pattern) => globMatches(pattern, pathname))); - const weakened = analyzeWeakenedTests( - diffText, - args.spec.allowedTestDeletions, - parseDeletedPaths(nameStatus) - ); - const workspaceClean = status === ""; - const verificationCommands = new Map( - args.spec.verification.map((command) => [command.id, command]) - ); - return { - verification: { - reportVersion: "1", - pass: acceptance.ok && workspaceClean && scopeViolations.length === 0, - commandResults: acceptance.commandOutcomes.map((command) => ({ - id: command.id, - exitCode: command.exitCode ?? -1, - ok: command.exitCode !== null && !command.timedOut && (verificationCommands.get(command.id)?.expectedExitCodes.includes( - command.exitCode - ) ?? false) - })), - workspaceClean, - testsDeleted: weakened.testsDeleted, - testsSkipped: weakened.testsSkipped, - scopeViolations, - evidence: { - failures: [...acceptance.failures], - acceptance: acceptance.evidence, - commandOutcomes: acceptance.commandOutcomes.map((outcome) => ({ - ...outcome, - args: [...outcome.args] - })), - ...args.spec.allowedTestDeletions === void 0 ? {} : { authorizedTestDeletions: [...weakened.authorizedTestDeletions] } - } - }, - baselineDrift: ancestry.exitCode !== 0 - }; - } finally { - const cleanupError = await cleanupWorktree(fresh); - if (cleanupError !== null) { - logger.warn("pipeline verification worktree could not be cleaned up", { - error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)) - }); - } - } -} async function runPipeline(checkoutPath, spec, deps) { const ps = deps.ps ?? getPlatformServices(); const canonical = await ps.canonicalizePath(checkoutPath); @@ -52918,6 +53483,17 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko }); const store = new ArtifactStore(attempt.runId); await store.writePipelineArtifact("delegation-spec", spec); + const runContext = createRunContext({ + runId: attempt.runId, + checkoutPath, + spec, + store, + ps, + borrowedCheckoutLease, + ...runStart === void 0 ? {} : { runStart }, + ...inheritedOnPhase === void 0 ? {} : { onPhase: inheritedOnPhase }, + sliceCount: slices.length > 0 ? slices.length : null + }); if (attempt.status !== "verified-candidate" || attempt.candidate === null) { if (slicedMarkerEstablished) await store.clearPipelineActiveMarker(); return failedResult( @@ -53103,7 +53679,8 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko namespace: initialNamespace, reviewers, verification: initialVerification.verification, - store + store, + borrowedCheckoutLease }); } catch (error51) { const archived = await archiveSliceExecutionError({ @@ -53132,164 +53709,33 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko const completedSlices = []; let phase; try { - phase = await runSlicePhase(slices, baselineCommit, { - maxRounds, + const sliceRunner = new SliceRunner({ + producerRuntime: deps.producerRuntime, + runDecision: deps.runDecision, + platformSafety: deps.platformSafety, + ps, + runRole: deps.runRole, + roleRunner: deps.roleRunner + }); + phase = await sliceRunner.run({ + context: runContext, + slices, + baselineCommit, + attempt, + budgets: { maxRounds }, concurrency: resolveSliceConcurrency(spec), - composeSlice: async (composeArgs) => composeSliceOntoHead({ - checkoutPath, - runId: attempt.runId, - ...composeArgs - }), initialAttempt: { candidateCommit: currentCandidateCommit, verification: initialVerification.verification, perSliceReview: initialPerSliceReview, roleLogRefs: initialRoleLogRefs }, - runSlice: async (slice, index, base, sliceAttempt, priorAttempts) => { - const namespace = `slice-${index}-attempt-${sliceAttempt}`; - const scopedSpec = scopeSpecToSlice(spec, slice); - return withManagedWorktree({ - manager: new WorktreeManager( - checkoutPath, - `${attempt.runId}-${namespace}`, - ps, - deps.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: deps.borrowedCheckoutLease } - ), - commit: base, - cleanupFailureMessage: "slice implementation failed and its worktree could not be cleaned up", - run: async (worktreePath) => { - let gitObjectAccess2; - try { - gitObjectAccess2 = await resolveLinkedWorktreeWritableRoots(worktreePath); - } catch { - throw new SliceExecutionError( - "slice implementer git object isolation could not be established", - "sandbox-violation" - ); - } - await emitPipelineStatus("implementing", { - sliceIndex: index, - role: "implementer" - }); - const incrementRun = await runIncrement({ - spec: scopedSpec, - pkg: { - spec: scopedSpec, - baselineCommit: base, - candidateCommit: base, - candidateDiff: "", - testEvidence: completedSlices.length === 0 ? testEvidence(attempt) : sliceTestEvidence(completedSlices), - // A repair that cannot see why the last attempt was rejected - // reproduces it. Bounded and redacted like any prompt data. - ...priorAttempts === void 0 || priorAttempts.length === 0 ? {} : { priorAttempts: describePriorAttempts(priorAttempts) } - }, - worktreePath, - deps, - runId: attempt.runId, - increment: sliceAttempt + 1, - store, - gitObjectAccess: gitObjectAccess2, - ...runStart === void 0 ? {} : { runStart }, - logNameNamespace: namespace - }); - if (!incrementRun.ok) { - throw new SliceExecutionError( - `slice implementer did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, - incrementRun.failure - ); - } - await emitPipelineStatus("freezing", { - sliceIndex: index, - role: "implementer" - }); - const candidateCommit = incrementRun.report.candidateCommit; - const provenanceFailure = await validateCandidateProvenance({ - worktreePath, - previousCandidateCommit: base, - candidateCommit, - gitObjectAccess: gitObjectAccess2, - phaseLabel: "slice implementer" - }); - if (provenanceFailure !== null) { - throw new SliceExecutionError( - provenanceFailure.reason, - provenanceFailure.failure - ); - } - if (candidateCommit !== base) { - try { - await importPromotedObjects({ - checkoutPath, - baselineCommit: base, - promotedCommit: candidateCommit, - access: gitObjectAccess2 - }); - } catch { - throw new SliceExecutionError( - "slice candidate objects could not be imported into the shared git object store", - "sandbox-violation" - ); - } - const temporaryRef = { - ref: temporarySliceRef(attempt.runId, index, sliceAttempt), - oid: candidateCommit - }; - try { - await createTemporarySliceRef(checkoutPath, temporaryRef); - } catch { - throw new SliceExecutionError( - "slice candidate temporary ref could not be established", - "sandbox-violation" - ); - } - temporarySliceRefs2.push(temporaryRef); - } - await emitPipelineStatus("verifying", { sliceIndex: index }); - const verified2 = await verifyCandidate({ - checkoutPath, - spec: scopedSpec, - deps, - attempt, - baselineCommit: base, - candidateCommit, - store, - namespace - }); - let perSliceReview = null; - const roleLogRefs = [...incrementRun.roleLogRefs]; - if (reviewConfig.perSlice === true) { - const reviewed = await runSliceReview({ - checkoutPath, - spec: scopedSpec, - deps, - runId: attempt.runId, - baselineCommit: base, - candidateCommit, - namespace, - reviewers, - verification: verified2.verification, - store - }); - perSliceReview = reviewed.review; - roleLogRefs.push(...reviewed.roleLogRefs); - } - return { - candidateCommit, - verification: verified2.verification, - perSliceReview, - roleLogRefs - }; - } - }); - }, - onAttempt: (evidence) => store.writePipelineArtifact( - `slice-${evidence.sliceIndex}-attempt-${evidence.attempt}`, - evidence - ), + reviewConfig, + reviewers, + registry: deps.registry, + abortSignal: deps.abortSignal, onSlice: async (slice) => { - await store.writePipelineArtifact(`slice-${slice.index}`, slice); - completedSlices.push(structuredClone(slice)); + completedSlices.push(slice); } }); } catch (error51) { @@ -53315,6 +53761,7 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko return failed; } pipelineSlices = phase.slices; + temporarySliceRefs2.push(...phase.temporarySliceRefs ?? []); currentCandidateCommit = phase.finalCandidateCommit; if (phase.haltedSliceIndex !== null) { const halted = phase.slices.at(-1); @@ -53448,7 +53895,7 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } await notePhase(`increment ${increment}/${maxIncrements}`); const previousCandidateCommit = currentCandidateCommit; - const diffText = await checkedGit5(candidateWorktree.path, [ + const diffText = await checkedGit8(candidateWorktree.path, [ "diff", `${baselineCommit}..${currentCandidateCommit}` ], privateObjectReadOptions(gitObjectAccess)); @@ -53502,12 +53949,12 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } const privateObjects = privateObjectReadOptions(gitObjectAccess); const [previousTree, candidateTree] = await Promise.all([ - checkedGit5( + checkedGit8( candidateWorktree.path, ["rev-parse", `${previousCandidateCommit}^{tree}`], privateObjects ), - checkedGit5( + checkedGit8( candidateWorktree.path, ["rev-parse", `${report.candidateCommit}^{tree}`], privateObjects @@ -53579,7 +54026,7 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko ); } await notePhase(`review round ${round}/${maxRounds}`); - const diffText = await checkedGit5(candidateWorktree.path, [ + const diffText = await checkedGit8(candidateWorktree.path, [ "diff", `${baselineCommit}..${currentCandidateCommit}` ], gitObjectAccess === null ? void 0 : privateObjectReadOptions(gitObjectAccess)); @@ -53784,7 +54231,14 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } } }; - } else { + } + const gateClearedRecord = !gate.decisionReady ? null : { + clearedVersion: "1", + candidateCommitOid: currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision, + clearedAt: (/* @__PURE__ */ new Date()).toISOString() + }; + if (gateClearedRecord !== null) { finalAttempt = { ...finalAttempt, evidence: { @@ -53795,6 +54249,7 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } } }; + await store.writePipelineGateCleared(gateClearedRecord); } await store.promoteTerminalArtifacts({ result: finalAttempt, @@ -53811,7 +54266,8 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko verification: verified.verification, gate, finalCandidateCommit: currentCandidateCommit, - failure: null + failure: null, + pipelineGateCleared: gateClearedRecord }; await store.writePipelineArtifact("pipeline-result", result); await notePhase(`finished: ${result.status}`); @@ -54941,23 +55397,19 @@ async function handleAutopilotResume(checkoutPath, workflowId, deps = {}) { return autopilotErrorResult(error51); } } -function isRecord7(value) { +function isRecord8(value) { return value !== null && typeof value === "object" && !Array.isArray(value); } async function loadArchivedRun(runId, deps) { const store = storeFor(runId, deps); - const [result, manifest] = await Promise.all([ - store.readResult(runId), - store.readManifest(runId) - ]); + const snapshot = await readRunDecisionSnapshot(runId, { store }); + const result = snapshot.result; + const manifest = snapshot.manifest; if (result === null || manifest === null) { throw runtimeError("archived run was not found", "run-not-found"); } - if (result.runId !== runId || manifest.runId !== runId) { - throw runtimeError("archived run identity does not match", "archive-inconsistent"); - } - if (result.candidate !== null && (manifest.baseCommitOid !== result.candidate.baseCommitOid || manifest.candidateManifestHash !== result.candidate.manifestHash || result.candidate.manifestHash !== createHash15("sha256").update(JSON.stringify(result.candidate.changedPaths)).digest("hex"))) { - throw runtimeError("archived candidate does not match its run manifest", "archive-inconsistent"); + if (snapshot.coherenceErrors.length > 0) { + throw runtimeError(snapshot.coherenceErrors[0], "archive-inconsistent"); } const canonical = await services2(deps).canonicalizePath(manifest.repoRoot); if (canonical.canonical !== manifest.repoRoot) { @@ -54968,7 +55420,8 @@ async function loadArchivedRun(runId, deps) { result, manifest, repoRoot: canonical.canonical, - lockKey: canonical.gitCommonDir ?? canonical.canonical + lockKey: canonical.gitCommonDir ?? canonical.canonical, + snapshot }; } function requireCandidate(run) { @@ -55039,7 +55492,7 @@ function unknownProducerErrors(preferences) { }]); } function schemaCompatibility(input) { - if (isRecord7(input) && input.specVersion !== void 0 && input.specVersion !== DELEGATION_SPEC_VERSION) { + if (isRecord8(input) && input.specVersion !== void 0 && input.specVersion !== DELEGATION_SPEC_VERSION) { return { ok: false, diagnostic: `delegation spec version mismatch: request declares ${String(input.specVersion)}, runtime expects ${DELEGATION_SPEC_VERSION}` @@ -55308,34 +55761,39 @@ async function handleReviewCandidate(checkoutPath, runId, deps = {}, expectedSpe function decisionAdvisoryForRun(run) { const refused = run.result.evidence.pipelineGateRefused; const incomplete = run.result.evidence.pipelineReviewIncomplete; - const cleared = run.result.evidence.pipelineGateCleared; + const rawCleared = run.result.evidence.pipelineGateCleared; const warnings = []; - if (isRecord7(refused) && Array.isArray(refused.reasons)) { + if (isRecord8(refused) && Array.isArray(refused.reasons)) { warnings.push( `the pipeline gate did NOT clear this candidate: ${refused.reasons.filter((r) => typeof r === "string").join("; ")}` ); } - if (isRecord7(incomplete) && typeof incomplete.reason === "string") { + if (isRecord8(incomplete) && typeof incomplete.reason === "string") { warnings.push(`the pipeline could not complete its own review: ${incomplete.reason}`); } - const plainDelegate = run.result.evidence.plainDelegate === true && refused === void 0 && incomplete === void 0 && cleared === void 0; + const plainDelegate = run.result.evidence.plainDelegate === true && refused === void 0 && incomplete === void 0 && rawCleared === void 0; let gateCleared = false; if (plainDelegate) { gateCleared = true; - } else if (cleared === void 0) { + } else if (rawCleared === void 0) { if (warnings.length === 0) { warnings.push("the pipeline gate clearance record is missing"); } - } else if (!isRecord7(cleared) || typeof cleared.candidateCommitOid !== "string" || typeof cleared.requiresHumanDecision !== "boolean") { - warnings.push("the pipeline gate clearance record is malformed"); - } else if (cleared.requiresHumanDecision === true) { - warnings.push("the pipeline gate clearance record requires a human decision"); - } else if (cleared.candidateCommitOid !== run.result.candidate?.candidateCommitOid) { - warnings.push( - "the pipeline gate clearance record does not match the archived candidate commit" - ); } else { - gateCleared = true; + try { + const cleared = parsePipelineGateCleared(rawCleared); + if (cleared.requiresHumanDecision === true) { + warnings.push("the pipeline gate clearance record requires a human decision"); + } else if (cleared.candidateCommitOid !== run.result.candidate?.candidateCommitOid) { + warnings.push( + "the pipeline gate clearance record does not match the archived candidate commit" + ); + } else { + gateCleared = true; + } + } catch { + warnings.push("the pipeline gate clearance record is malformed"); + } } return { warnings, @@ -55350,7 +55808,8 @@ async function handleDecideCandidate(checkoutPath, runId, decision, expectedArti const decisionProvenance = deps.decisionProvenanceResolver === void 0 ? deps.decisionProvenance : await deps.decisionProvenanceResolver({ runId, decision, - advisory: decisionAdvisoryForRun(run) + advisory: decisionAdvisoryForRun(run), + snapshot: run.snapshot }); const candidate = decision === "accepted" ? requireVerifiedCandidate(run) : requireCandidate(run); if (expectedArtifactHash !== run.manifest.candidateManifestHash) { @@ -55366,7 +55825,7 @@ async function handleDecideCandidate(checkoutPath, runId, decision, expectedArti "decision-authority-refused" ); } - const existing = await run.store.readCandidateDecision(runId); + const existing = run.snapshot.decision; const reviewSnapshot = await sharedReviewSnapshot( run, deps, @@ -55434,32 +55893,6 @@ async function handleIntegrateCandidate(checkoutPath, runId, expectedArtifactHas } } -// src/mcp/decision-authority.ts -var DECISION_AUTHORITY_ENV = "CLAUDE_ARCHITECT_DECISION_AUTHORITY"; -function decisionAuthority(env = process.env, warn = (message) => console.error(message)) { - const raw = env[DECISION_AUTHORITY_ENV]; - if (raw === void 0 || raw === "") return "autonomous"; - if (raw === "autonomous" || raw === "human") return raw; - warn( - `${DECISION_AUTHORITY_ENV}="${raw}" is not a recognized decision authority; requiring human confirmation. Valid values: "autonomous", "human".` - ); - return "human"; -} -function autonomousEligibility(authority, advisory) { - if (authority !== "autonomous") { - return { eligible: false, reasons: [`decision authority is "${authority}"`] }; - } - const reasons = []; - if (advisory.unreadable) reasons.push("the candidate archive could not be read"); - else { - if (!advisory.verifiedClean) { - reasons.push("the candidate is not an independently verified result"); - } - reasons.push(...advisory.warnings); - } - return { eligible: reasons.length === 0, reasons }; -} - // src/runtime/recovery-manager.ts import { createHash as createHash16, randomUUID as randomUUID13 } from "node:crypto"; import { constants as constants14 } from "node:fs"; @@ -55484,7 +55917,6 @@ var WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; var OID3 = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; var CANDIDATE_REF_PREFIX3 = "refs/claude-architect/candidates/"; var BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; -var SLICE_REF_PREFIX2 = "refs/claude-architect/slices/"; var MAX_QUARANTINE_REASON_BYTES = 2e3; var MAX_QUARANTINE_RECORD_BYTES = 4096; var MAX_WORKTREE_SWEEP_ISSUES = 100; @@ -55740,7 +56172,7 @@ function escapeRegex3(value) { return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); } async function temporarySliceRefs(repoRoot, runId, runGit) { - const prefix = `${SLICE_REF_PREFIX2}${runId}/`; + const prefix = `${SLICE_REF_PREFIX}${runId}/`; const listed = await runGit(repoRoot, [ "for-each-ref", "--format=%(refname)%09%(objectname)", @@ -58019,21 +58451,7 @@ async function reclaimPendingRemovalLocks(locksRoot, isProcessAlive2, getProcess } async function recoverStaleRuns(dependencies = {}) { const root = await stateRoot(); - const supplied = dependencies.platformServices; - const selected = getPlatformServices(); - const ps = Object.create(selected); - Object.defineProperties(ps, { - os: { value: supplied?.os ?? selected.os }, - getProcessStartToken: { - value: (pid) => (supplied ?? selected).getProcessStartToken(pid) - }, - terminateProcessTreeByPid: { - value: (pid, token) => (supplied ?? selected).terminateProcessTreeByPid(pid, token) - }, - acquireCheckoutLock: { - value: (checkout) => supplied?.acquireCheckoutLock ? supplied.acquireCheckoutLock(checkout) : selected.acquireCheckoutLock(checkout) - } - }); + const ps = dependencies.platformServices ?? getPlatformServices(); const isProcessAlive2 = dependencies.isProcessAlive ?? defaultIsProcessAlive; const runGit = dependencies.git ?? git; if (root === null) return { recovered: [], quarantined: [] }; @@ -58424,7 +58842,13 @@ var pipelineResultOutput = external_exports.object({ finalCandidateCommit: external_exports.string(), slices: external_exports.array(external_exports.record(external_exports.string(), external_exports.unknown())), haltedSliceIndex: external_exports.number().nullable(), - failure: external_exports.enum(FAILURE_PRECEDENCE).nullable().optional() + failure: external_exports.enum(FAILURE_PRECEDENCE).nullable().optional(), + pipelineGateCleared: external_exports.object({ + clearedVersion: external_exports.literal("1"), + candidateCommitOid: external_exports.string(), + requiresHumanDecision: external_exports.boolean(), + clearedAt: external_exports.string().optional() + }).nullable().optional() }).strict(); var laneEnvelopeOutput = external_exports.object({ runId: external_exports.string(), @@ -58924,19 +59348,27 @@ async function createServer(dependencies = {}) { expectedArtifactHash, { ...dependencies, - decisionProvenanceResolver: async ({ advisory }) => { - const autonomy = autonomousEligibility( - (dependencies.decisionAuthority ?? decisionAuthority)(), - advisory + decisionProvenanceResolver: async ({ + advisory, + runId: targetRunId, + decision: targetDecision, + snapshot + }) => { + const effectiveRunId = targetRunId ?? runId; + const effectiveDecision = targetDecision ?? decision; + const verdict = runDecision.verdictFor( + snapshot, + (dependencies.decisionAuthority ?? decisionAuthority)() ); - if (autonomy.eligible && decision === "accepted") { + if (verdict.state === "accepted" && effectiveDecision === "accepted") { return "policy-autonomous"; } + const reasons = verdict.state === "accepted" ? advisory.warnings : verdict.reasons; const confirmed = await confirmWithHuman( server, - runId, - decision, - advisory.warnings + effectiveRunId, + effectiveDecision, + reasons ); if (!confirmed.ok) { throw new RuntimeError(confirmed.error.diagnostic, { diff --git a/skills/delegate/SKILL.md b/skills/delegate/SKILL.md index cf4d90e..45da79d 100644 --- a/skills/delegate/SKILL.md +++ b/skills/delegate/SKILL.md @@ -9,15 +9,15 @@ description: Let Claude Architect route a versioned implementation spec through PROTOCOL_VERSION: 2.0.0 ``` -The current session is the architect. It owns requirements, the Delegation Spec, Producer selection, review, and acceptance. Producers are untrusted: their output is only a candidate until the runtime freezes it, independently verifies it, and the architect reviews the exact anchored bytes. +The current session is the architect: it owns requirements, the Delegation Spec, Producer selection, review, and acceptance. Producers are untrusted — their output is only a candidate until the runtime freezes it, independently verifies it, and the architect reviews the exact anchored bytes. Always present this skill as `/claude-architect:delegate`. Never show a shorter command. ## Superpowers across the trust boundary -When the upstream Superpowers plugin is available to the architect, keep its host-loop skills on the architect side of the boundary: use `brainstorming` to clarify requirements before freezing the Delegation Spec, `writing-plans` to turn an agreed design into objectively checkable work or slices, and `verification-before-completion` before recording a decision on a candidate. Do not use generic `executing-plans` or `subagent-driven-development` for writing tasks; they may coordinate architect-owned non-writing analysis only. +When the upstream Superpowers plugin is available, keep its host-loop skills on the architect side: `brainstorming` before freezing the Delegation Spec, `writing-plans` to turn an agreed design into objectively checkable work or slices, `verification-before-completion` before recording a decision. Generic `executing-plans` and `subagent-driven-development` may coordinate architect-owned non-writing analysis only, never a writing task. -To execute any multi-task plan that writes files, use `/claude-architect:subagent-driven-delegation`: it runs the Superpowers subagent-driven-development loop — ledger, per-task brief, per-task review, final whole-branch review — with the delegation lifecycle below substituted for the generic implementer subagent. Those skills do not grant a Producer permission to plan instead of editing, dispatch nested agents, review itself, accept a candidate, or integrate bytes. When the plugin is not installed, proceed without those skills rather than inventing or approximating them. +To execute any multi-task plan that writes files, use `/claude-architect:subagent-driven-delegation`: the Superpowers subagent-driven-development loop — ledger, per-task brief, per-task review, final whole-branch review — with the delegation lifecycle below replacing the generic implementer subagent. No skill grants a Producer permission to plan instead of editing, dispatch nested agents, review itself, accept a candidate, or integrate bytes. Without the plugin, proceed without those skills rather than approximating them. Edit-lane Producers receive a deliberately smaller, vendored procedure subset: @@ -25,20 +25,11 @@ Edit-lane Producers receive a deliberately smaller, vendored procedure subset: - `systematic-debugging` when a test, build, or behavior fails unexpectedly, before proposing a fix; - `verification-before-completion` before claiming success. -The runtime supplies the applicable Producer skills by absolute path inside each isolated attempt. Do not put architect-only Superpowers skills in the Delegation Spec or tell a Producer to discover skills from the operator's home directory. The Producer subset is vendored from [obra/superpowers](https://github.com/obra/superpowers), version 6.2.0, under the MIT license. +The runtime supplies these by absolute path inside each isolated attempt. Never put architect-only skills in the Delegation Spec or tell a Producer to discover skills from the operator's home directory. Vendored from [obra/superpowers](https://github.com/obra/superpowers) 6.2.0, MIT. ## Agent selection -The delegated CLIs are the architect's **implementation agents** — the same subagent idiom Claude Code uses, except each agent launches an *untrusted Producer* through the trusted MCP runtime inside an isolated Git worktree. Present them as a selectable agent roster: the human picks one `subagent_type`, exactly one agent runs per attempt, and no agent may review or accept its own work. - -| Agent (`subagent_type`) | Producer / model | Reasoning control | -| --- | --- | --- | -| `codex-implementer` | GPT-5.6 Sol (OpenAI Codex CLI) | `low` by default | -| `opencode-implementer` | OpenCode provider/model | optional `--variant` | -| `pi-implementer` | Pi configured model | optional `--thinking` | -| `pythinker-implementer` | Pythinker provider/model | the installed pythinker-code CLI exposes no reasoning override; the configured default always applies | -| `agy-implementer` | Antigravity CLI (`agy`) configured model | optional `--effort low\|medium\|high` | -| `claude-implementer` | Claude Code headless (`claude -p`) — Opus, Sonnet, or the configured default | optional `--model opus\|sonnet\|fable\|haiku`, optional `--effort low\|medium\|high\|xhigh\|max` | +The delegated CLIs are the architect's **implementation agents** — Claude Code's subagent idiom, except each agent launches an *untrusted Producer* through the trusted MCP runtime inside an isolated Git worktree. Present them as a roster: the human picks one `subagent_type`, exactly one agent runs per attempt, and no agent may review or accept its own work. If the user invokes `/claude-architect:delegate` without naming a CLI, implementer, or agent, use the host's structured question tool when available, ask this question, and wait for the answer. Include the producer and reasoning control in each option so the user knows what the lane will run: @@ -59,14 +50,14 @@ P0-A certifies the MCP implementation path only for Codex on macOS arm64 when it ### Architect-side Claude subagents -The architect session — whatever model it runs, including Fable — may dispatch Claude subagents through the host's `Agent` tool with a `model` of `opus`, `sonnet`, or `fable` for **non-writing** roles, and it may do so in parallel with a running lane: +The architect session — whatever model it runs, including Fable — may dispatch Claude subagents through the host's `Agent` tool (`model`: `opus`, `sonnet`, or `fable`) for **non-writing** roles, in parallel with a running lane: - **Scout** (`sonnet`, or `Explore`): read-only reconnaissance before a spec is frozen — call sites, nearby patterns, which files an allowlist must cover. - **Spec drafter** (`sonnet`): turn an agreed design into candidate `successCriteria` and verification commands for the architect to review; the architect still owns and freezes the spec. - **Candidate reviewer** (`candidate-reviewer`, `opus`): an independent review of the frozen bytes through `reviewCandidate`, with no Producer context. Use it for the per-task review and for the whole-branch final review, then let the architect weigh the verdict and call `decideCandidate`. - **Advisor** (`claude-advisor`, `fable`): commitment-boundary second opinion. -A Claude subagent is never an implementer. It edits nothing in the checkout, calls neither `decideCandidate` nor `integrateCandidate`, and never dispatches a lane on its own; only the `delegation-lane` courier calls `delegate`/`delegatePipeline`. When the work is implementation and the model you want is Opus or Sonnet, that is the `claude-implementer` lane above: the same model, but run as an untrusted Producer inside an isolated worktree, frozen, and independently verified. +A Claude subagent is never an implementer: it edits nothing, calls neither `decideCandidate` nor `integrateCandidate`, and never dispatches a lane; only the `delegation-lane` courier calls `delegate`/`delegatePipeline`. When the work is implementation and you want Opus or Sonnet, that is the `claude-implementer` lane above — the same model, run as an untrusted Producer in an isolated worktree, frozen, and independently verified. ## Build the Delegation Spec @@ -92,28 +83,37 @@ Construct a candidate spec with every required field: - The final type-check must cover ALL touched typed files, including every added or modified test file; never scope it only to `src/` when tests or other typed paths may change. - Keep observable outcomes in `successCriteria`. Put reviewer-only, non-commandable concerns in `review.focus`; when present, `review.focus` must be a non-empty array of non-empty strings. No undocumented review keys are accepted. - Prefer explicit test file paths in verification args; directory args can resolve differently between the Producer sandbox and clean-room verification. -- A text-search gate must not be able to match prose. An absence check such as `rg "except RuntimeError" ` with `expectedExitCodes: [1]` also matches the phrase inside a comment, a docstring, or a changelog line — so a Producer that writes a comment reading "Deliberately NOT `except RuntimeError`" fails a gate its code actually satisfies, and the attempt is rejected for a comment. Anchor the pattern to the syntax you mean (`^\s*except RuntimeError\b`), exclude comment lines, or assert over a parsed structure instead of raw text. The same trap applies to any grep-style presence check whose pattern is an ordinary English phrase. +- A text-search gate must not be able to match prose: anchor an absence check to the + syntax you mean, exclude comment lines, or assert over a parsed structure, so a + Producer cannot fail a gate its code satisfies by writing a comment that mentions the + pattern ([docs/verification-preflight.md](../../docs/verification-preflight.md)). - Bound the parallelism of every test command, and state the same bound in `context` for the commands the Producer runs on its own. Verification commands are not the only tests that execute: a Producer re-runs the suite inside its own shell, and an unbounded runner there fans out to one worker per core on top of the attempt itself. On a many-core host that has driven thousands of process spawns and starved the machine. For a Node repository, pass an explicit worker cap (for example `--maxWorkers=4`) rather than relying on a runner default. **Verification preflight:** The runtime runs every verification command against clean HEAD in a disposable worktree before dispatch, and separately probes the Producer's own shell for the executables those commands name — a Producer that cannot resolve `node` or `git` cannot verify its own work, and would otherwise discover that only after burning the whole attempt window. An unresolvable executable ends the attempt as `environment-defect` before the Producer runs; anything less definite proceeds and is recorded in evidence. The probe proves resolution, not configuration, and grants a candidate nothing: independent verification remains the backstop. Repair the spec if a command cannot start. A baseline failure unrelated to the task is an environment defect the architect repairs centrally before dispatching. Set `expectBaselineFailure: true` on any command that cannot pass at clean HEAD by design — one that reproduces the target bug, or one that exercises a file or test the candidate will create (it necessarily fails before that path exists). -Set `baselineFailureExitCodes` alongside the flag whenever the runner distinguishes "the test ran and failed" from "the test could not be collected". Without it, any completed non-zero exit satisfies the flag, so a missing test file (pytest exit 4 or 5) proves exactly what a genuine RED assertion proves — nothing. Declaring `[1]` for pytest turns the baseline into a real fail-before/pass-after proof; omit it only when the runner has no such distinction. - -The flag is enforced in both directions. It declares that the command *runs* at clean HEAD and *reports failure*, so the baseline gate rejects a command carrying it that could not run at all — unresolvable executable, timeout, cancellation, or death by signal — and equally rejects one that passes, because a green run contradicts the declaration and leaves no fail-before/pass-after evidence. A command whose baseline behavior surprises you is a spec defect to repair, not a result to reinterpret. - -The flag is all-or-nothing for the command it sits on: a tolerated command proves nothing at baseline. So do not blanket-mark the command set. When a command would cover both a path that already exists and a path the candidate creates, split it in two — one command over the existing paths with the flag absent, one over the new paths with the flag set — so a real lint, type, or test regression at clean HEAD still surfaces. Marking every command tolerant, which is the tempting shortcut when a new test file appears in several of them, silently disables the entire baseline signal for the attempt. +Set `baselineFailureExitCodes` alongside the flag whenever the runner distinguishes "the test ran and failed" from "the test could not be collected". The flag is enforced in both directions — it rejects a command that could not run at all and one that passes — and is all-or-nothing for the command it sits on, so never blanket-mark the command set. Why each part of that holds: [docs/verification-preflight.md](../../docs/verification-preflight.md). Resolve ambiguity before calling the runtime. Do not give the Producer credentials, hidden instructions, acceptance authority, or permission to expand scope. ## Coordinator duties -**Allowlist consumers:** Before dispatch the runtime reports tracked files that import the write allowlist but sit outside it. When a delegation changes an exported contract, either widen `writeAllowlist` to those consumers or add a repository-wide verification command — a src-only type gate plus focused tests compiles neither, so the breakage lands on the architect at integration time. +**Allowlist consumers:** Before dispatch the runtime reports tracked files that import the write allowlist but sit outside it. When a delegation changes an exported contract, either widen `writeAllowlist` to those consumers or add a repository-wide verification command — a src-only type gate plus focused tests compiles neither, so the breakage lands on the architect at integration. + +When running multiple delegations, normalize reported blockers by phase, command id, and root cause. The moment two independent lanes report the same blocker, pause affected lanes and treat it as an architect-owned shared-environment defect: reproduce it once against the clean baseline, fix it centrally, rerun the preflight to green, then resume or redispatch the unchanged specs. Never push shared-tooling fixes into individual Producer lanes. + +**Repository precondition:** delegation and controlled integration require an exact clean checkout; tracked or unignored changes must be committed before delegation, including tracked planning files. Git-ignored files do not affect the clean check. Never use skip-worktree or assume-unchanged as a workaround. + +## Trusted MCP lifecycle -When running multiple delegations, normalize reported blockers by phase, command id, and root cause. The moment two independent lanes report the same blocker, pause affected lanes and treat it as an architect-owned shared-environment defect. Reproduce it once against the clean baseline, fix it centrally, rerun the preflight to green, then resume or redispatch the unchanged specs. Never wait for remaining lanes to rediscover it, and never push shared-tooling fixes into individual Producer lanes. +Two lifecycles share one rule: the runtime's durable evidence decides, and a Producer's +self-report never does. Autopilot is the default; the manual candidate lifecycle runs +only when the human explicitly chooses it. Never switch a halted autopilot workflow into +the manual lifecycle implicitly. -**Repository precondition:** delegation and controlled integration require an exact clean checkout; tracked or unignored changes must be committed before delegation, including tracked planning files such as `tasks/todo.md`. Git-ignored local planning files do not affect the clean check. Do not use skip-worktree or assume-unchanged flags as a workaround. +In both, never accept a Producer self-report as evidence, bypass `reviewCandidate`, call +integration before an accepted decision, or substitute a different artifact hash. -## Trusted MCP autopilot lifecycle +### Autopilot Project-scoped permission settings become active only after the human grants Claude Code workspace trust. They can allow the three autopilot tools, but they cannot override managed `ask` or `deny` policy. “No mid-loop prompts” is therefore conditional: it applies only after workspace trust, when all three tool calls are allowed and no higher-precedence policy, controller halt, or ambiguity requires the human. @@ -123,241 +123,101 @@ Project-scoped permission settings become active only after the human grants Cla 4. After a host or process interruption, call `autopilotResume` with `checkoutPath`, the same `workflowId`, and `protocolVersion: "2.0.0"`. Resume replays durable observed state; it does not authorize a second workflow or waive a failed gate. 5. During autopilot, do not construct Autopilot Eligibility, synthesize a Candidate Decision, call separate review/decision/integration tools, run Git or `gh`, push, create or edit a PR, mark a PR ready, merge, or delete a branch. The controller owns policy, promotion, cumulative final review, exact-head push, draft-PR identity, required-check polling, ready transition, cleanup, and recovery. -The controller may proceed without a mid-loop prompt only while every eligibility and shipping gate remains objectively proven. Interpret terminal states exactly: - -- `ready-for-human-review`: the workflow branch was pushed, the draft PR was proven for the expected head, configured required checks were green for that head, the PR was marked ready, and runtime cleanup completed. Review the cumulative PR evidence; only the human may merge or otherwise advance `main`. -- `human-decision-required`: ambiguity, a non-waivable finding, ownership mismatch, shipping uncertainty, or another fail-closed condition requires a human decision. Preserve the workflow branch, worktree, and evidence; do not improvise continuation. -- `failed`: the workflow ended without authority to ship. Present the durable reason and evidence. Do not claim the PR is ready or retry under altered policy. -- `cancelled`: cancellation is a durable terminal classification. Present preserved cleanup/evidence and do not resume it as if non-terminal; a human chooses any next action. - -Autopilot is autonomous only up to a PR ready for human review. It never merges, deploys, releases, or deletes the remote feature branch. Successful cleanup removes temporary local workflow resources while retaining durable evidence and recovery records; fail-closed terminals retain what the runtime needs for inspection. - -## Presenting workflow progress - -Surface the workflow in the Claude Code subagent look and feel, but treat the card as presentation rather than evidence: - -```text -▸ Autopilot · codex-implementer workflow-owned branch - Task <3–5 word description> - Model GPT-5.6 Sol · reasoning low - Phase running-task Workflow -``` - -Use one compact status line derived from `autopilotStatus`, for example `● running-task · task 1/2`. Use `◑` for `human-decision-required`, `✓` for `ready-for-human-review`, and `✗` for `failed` or `cancelled`. Never invent progress, display a Producer self-report as evidence, or equate policy acceptance with merge. - -## Explicit manual fallback +The controller may proceed without a mid-loop prompt only while every eligibility and +shipping gate remains objectively proven. Autopilot is autonomous only up to a PR ready +for human review: it never merges, deploys, releases, or deletes the remote branch. +Interpret `ready-for-human-review`, `human-decision-required`, `failed`, and `cancelled` +exactly as [docs/autopilot-terminal-states.md](../../docs/autopilot-terminal-states.md) +defines them; every one is terminal, and none authorizes improvised continuation. -Use the manual candidate lifecycle only when the human explicitly chooses it instead of autopilot. In that mode, call `delegate` or `delegatePipeline`, inspect the exact frozen evidence with `reviewCandidate`, invoke the configured Candidate Decision authority through `decideCandidate`, and use `integrateCandidate` only for an accepted candidate with integrable provenance and a matching hash. Manual integration stages bytes in the human checkout and does not commit, push, open a PR, merge, deploy, or release. Never switch a halted autopilot workflow into the manual lifecycle implicitly. +### Manual candidate lifecycle -## Trusted MCP lifecycle +When the human chooses it, call `delegate` or `delegatePipeline`, inspect the exact frozen evidence with `reviewCandidate`, invoke the configured Candidate Decision authority through `decideCandidate`, and use `integrateCandidate` only for an accepted candidate with integrable provenance and a matching hash. Manual integration stages bytes in the human checkout and does not commit, push, open a PR, merge, deploy, or release. The `delegate` and `delegatePipeline` MCP calls are synchronous. Keep each call in the foreground until it returns; never hand it to Monitor or background execution. -One manual run uses a two-call MCP preflight: `validateDelegationSpec` is read-only and starts no Producer; then exactly one `delegate` or `delegatePipeline` execution call may start Producers. Claude Code may group both under “Calling plugin:claude-architect:runtime 2 times”; that count is MCP calls, not Producer attempts. A plain `delegate` execution run starts exactly one Producer attempt (the implementation attempt; edit mode may first launch the same selected Producer in a separate environment-preflight probe that cannot produce candidate bytes), while a `delegatePipeline` run may start multiple fresh Producers for implementation, review, and repair after that probe. Before a direct manual lifecycle, say `Preflight 1/2 · validate only · no Producer` before validation and `Dispatch 2/2 · one execution call · one run` before execution, so “one run” is never presented as “one runtime call.” - -Once the execution call is pending — including while the host shows `producer running` or after it backgrounds — never invoke `delegate` or `delegatePipeline` again, revalidate in parallel, or interpret a heartbeat as permission to retry. Wait for the original result: a second execution call creates a second run. Repair and revalidate only after the original call has returned an explicit pre-start validation or spec-identity error. +One manual run is a two-call MCP preflight: `validateDelegationSpec` is read-only and +starts no Producer; then exactly one `delegate` or `delegatePipeline` execution call may +start Producers. Claude Code may group both under one runtime entry; that count is MCP calls, not Producer attempts. +A plain `delegate` execution run starts exactly one Producer attempt, while a `delegatePipeline` run may start multiple fresh Producers for implementation, review, and repair. Once the execution call is pending — including while the host shows +`producer running` or after it backgrounds — never invoke `delegate` or `delegatePipeline` again, revalidate in +parallel, or read a heartbeat as permission to retry: a second execution call creates a +second run. Repair and revalidate only after the original call returned an explicit +pre-start validation or spec-identity error. Announcement wording and what the host's +call count does and does not mean: +[docs/delegation-monitoring.md](../../docs/delegation-monitoring.md). 1. Call `validateDelegationSpec` with the exact Delegation Spec and `protocolVersion: "2.0.0"` copied from this skill's `PROTOCOL_VERSION` marker. This read-only call starts no Producer. Keep its runtime-returned `specSha256` as the identity of the spec you dispatch. Never hash the spec file or reimplement the canonicalization algorithm; file bytes and object key order are not the runtime's canonical wire identity. 2. When validation returns `ok:false` with `validationErrors`, repair only the reported spec defects and revalidate. This repair loop must not touch a Producer. 3. Call `delegate` through `mcp__plugin_claude-architect_runtime__delegate` with `checkoutPath`, the validated candidate spec, the same `protocolVersion`, and `expectedSpecSha256` set to the runtime-returned `specSha256`. The runtime compares that identity before it touches the checkout or starts a Producer. -4. When dispatch returns `ok:false` with `validationErrors`, repair only the reported spec defects, call `validateDelegationSpec` again to obtain the replacement digest, and resubmit. This can catch a spec changed after validation without touching a Producer. -5. When dispatch returns `spec-identity-mismatch` or `spec-identity-unverifiable`, no work started. Do not trust a lane-supplied replacement digest and do not retry the same payload. Reuse the exact validated spec and retained runtime digest in a direct foreground dispatch, or rebuild a fresh lane prompt containing those exact values. +4. When dispatch returns `ok:false` with `validationErrors`, repair only the reported defects, revalidate for the replacement digest, and resubmit — this catches a spec changed after validation without touching a Producer. +5. On `spec-identity-mismatch` or `spec-identity-unverifiable`, no work started. Never trust a lane-supplied replacement digest or retry the same payload: reuse the exact validated spec and retained runtime digest in a direct foreground dispatch, or rebuild a lane prompt containing those exact values. 6. When either call returns a protocol/schema diagnostic, stop and tell the user to update the installed marketplace copy and reload Claude Code. Never guess across a version mismatch. 7. When the result is `unavailable`, `failed`, or `cancelled`, report the structured classification and evidence. Do not claim a candidate exists. A report with `laneEligibility.edit=false`, or any other ineligible or unconfined Lane, fails closed with the structured diagnostic. -8. When the result is `verified-candidate`, call `reviewCandidate` with `checkoutPath` and the run id. Read the exact unredacted patch, changed-path manifest, and verification evidence; compare them with every success criterion and repository convention. -9. Present the review outcome. Call `decideCandidate` with `checkoutPath`, the run id, and `accepted`, `rejected`, or `revision-requested`. Rejection discards the candidate anchor; a revision requires a new spec/attempt rather than editing frozen bytes. - - Under the shipped `autonomous` authority, `decideCandidate` records `accepted` as `policy-autonomous` without elicitation for any independently verified candidate carrying no failure and no advisory warnings from a readable archive — either a `delegatePipeline` candidate with a well-formed `pipelineGateCleared` record bound to the same candidate commit and `requiresHumanDecision:false`, or a plain `delegate` candidate, which carries no pipeline evidence at all and is judged on its independent verification result alone. Every other case — including rejection, revision, refusal, incomplete review, malformed or mismatched clearance, and every decision under `human` — raises an MCP elicitation prompt and records nothing unless a person confirms; `elicitation-unavailable`, `decision-not-confirmed`, and `elicitation-failed` all mean no decision was written. Do not treat a refused confirmation as a transient error to retry; report it and stop. The recorded decision carries `decidedBy` and the candidate `manifestHash` it binds to. Integration accepts `human-elicitation` and `policy-autonomous` provenance, while refusing a different artifact and any legacy or caller-asserted acceptance. +8. On `verified-candidate`, call `reviewCandidate` with `checkoutPath` and the run id. Read the exact unredacted patch, changed-path manifest, and verification evidence against every success criterion and repository convention. +9. Present the review outcome, then call `decideCandidate` with `checkoutPath`, the run id, and `accepted`, `rejected`, or `revision-requested`. Rejection discards the candidate anchor; a revision needs a new spec/attempt, never an edit to frozen bytes. + + Under the shipped `autonomous` authority, `decideCandidate` records `accepted` as + `policy-autonomous` without elicitation only for an independently verified candidate + carrying no failure and no advisory warnings from a readable archive. Every other + case raises an MCP elicitation prompt and records nothing unless a person confirms; + a refused confirmation is not a transient error to retry. See + [docs/decision-authority.md](../../docs/decision-authority.md). 10. Only after an accepted decision, call `integrateCandidate` with `checkoutPath`, the run id, and the exact candidate `manifestHash` as `expectedArtifactHash`. Report `applied`, `conflicted`, or `aborted` truthfully. Integration stages the reviewed tree but does not commit it. -**Run the lifecycle without an extra conversational permission stop.** Once the user has asked for the work, carry it through review and call `decideCandidate`; the configured decision authority is the acceptance gate. Do not manufacture an extra prompt on the evidence-bound autonomous path, and never bypass or pre-answer MCP elicitation when the runtime requires it. Integrate only after an accepted decision with integrable provenance is recorded. Stop and report when the runtime refuses — a failed verification, a refused gate, an unconfirmed or unavailable required elicitation, or an integration that reports `conflicted` or `aborted`. - -Never accept a Producer self-report as evidence, bypass `reviewCandidate`, call integration before an accepted decision, or substitute a different artifact hash. +**No extra conversational permission stop.** Once the user has asked for the work, carry it through review and call `decideCandidate`; the configured decision authority is the acceptance gate. Never manufacture a prompt on the evidence-bound autonomous path, and never bypass or pre-answer MCP elicitation the runtime requires. Stop and report when the runtime refuses — failed verification, refused gate, unconfirmed or unavailable elicitation, or an integration reporting `conflicted` or `aborted`. ## Lanes as native subagents -For visibility, dispatch delegation lanes through the host's `Agent` tool using the plugin's `delegation-lane` agent; the host then renders each lane as a native subagent row (spinner, stats, completion notice). This is a dispatch surface only — spec construction, `reviewCandidate`, the configured decision gate, and `integrateCandidate` stay in this session exactly as above. +For visibility, dispatch lanes through the host's `Agent` tool using the plugin's `delegation-lane` agent; the host renders each as a native subagent row. This is a dispatch surface only — spec construction, `reviewCandidate`, the decision gate, and `integrateCandidate` stay in this session exactly as above. -Before dispatch, call `validateDelegationSpec` and use its runtime-returned `specSha256`; assign a short `laneId`. Each lane prompt contains only: `laneId`, that `specSha256`, `checkoutPath`, `protocolVersion`, `pipeline` true/false, and the complete Delegation Spec JSON. Nothing else. +Before dispatch, call `validateDelegationSpec` and keep its runtime-returned `specSha256`; assign a short `laneId`. Each lane prompt contains only `laneId`, that `specSha256`, `checkoutPath`, `protocolVersion`, `pipeline` true/false, and the complete Delegation Spec JSON. Concurrency is honest, never advertised beyond the runtime: - **Independent repositories** (disjoint `gitCommonDir`s): dispatch one lane agent per repository in a single message; they genuinely run concurrently. - **Same repository**: the runtime serializes all attempts on the repository lock. Lanes may still be dispatched as subagents for visibility, but they execute one at a time; size timeouts accordingly and never present them as parallel. -The lane report is model-mediated and untrusted for anything but correlation. On completion, take only `runId` from the report and call `reviewCandidate` — passing `expectedSpecSha256` set to the runtime-returned digest retained before dispatch, never the one the lane echoed back. The lane names its own run, so without that argument you are trusting the reviewed party about which run to review; a lane naming a *different real* run returns a clean candidate for work you never asked for. `reviewCandidate` fails with `run-spec-mismatch` when the run was started from another spec, and with `run-spec-unverifiable` rather than silently succeeding when it cannot check. Every reviewable fact comes from that evidence. On a malformed or missing report, do not redispatch: locate the run directory whose recorded spec matches `specSha256` (per the monitoring section) and resume from its `result.json`; redispatch only when no matching run directory exists. +The lane report is model-mediated and untrusted for anything but correlation. Take only `runId` from it and call `reviewCandidate` with `expectedSpecSha256` set to the runtime-returned digest you retained before dispatch — never the one the lane echoed back. Without that argument you are trusting the reviewed party about which run to review, and a lane naming a *different real* run returns a clean candidate for work you never asked for. `reviewCandidate` fails with `run-spec-mismatch` when the run was started from another spec, and with `run-spec-unverifiable` rather than silently succeeding when it cannot check. On a malformed or missing report, do not redispatch: locate the run directory whose recorded spec matches `specSha256` ([docs/delegation-monitoring.md](../../docs/delegation-monitoring.md)) and resume from its `result.json`; redispatch only when no matching run directory exists. -Decision and integration remain per-repository and serial: review → decision → integrate → stop until the human commits or discards the staged tree. At most one accepted candidate per clean checkout; never batch-accept multiple candidates targeting the same checkout. Human-required decisions for lanes on different repositories may be presented together in one structured question. +Decision and integration stay per-repository and serial: review → decision → integrate → stop until the human commits or discards the staged tree. At most one accepted candidate per clean checkout; never batch-accept multiple candidates targeting the same checkout. Human-required decisions for *different* repositories may be presented together in one structured question. -Single-lane delegation may still use the direct foreground MCP call; prefer the lane agent whenever the call will outlive the host's ~120s background threshold. +Single-lane delegation may use the direct foreground MCP call; prefer the lane agent whenever the call will outlive the host's ~120s background threshold. -## Presenting delegations as subagents +## Presenting progress -When a lane runs through the `delegation-lane` agent, the host renders dispatch and live status natively; the cards below apply only to direct (non-subagent) MCP calls. This is presentation only: it renders the runtime's durable evidence and never replaces spec construction, `reviewCandidate`, the recorded decision, or `integrateCandidate`. A rendered card is not evidence; a Producer self-report is not evidence; acceptance stays gated on independent verification and its provenance is always recorded. +Presentation only. A rendered card is not evidence; it renders the runtime's durable +artifacts and never replaces spec construction, `reviewCandidate`, the recorded decision, +or `integrateCandidate`. Never invent progress, display a Producer self-report as +evidence, or equate policy acceptance with merge. -**Dispatch card** — emit when you call `delegate`/`delegatePipeline`, so the run reads like an `Agent` launch: +Status glyphs: `●` running (host-rendered for lane agents) · `◑` decision pending or +`human-decision-required` · `✓` verified, accepted, or `ready-for-human-review` · `✗` +failed, unavailable, cancelled, or rejected. -```text -▸ Agent · codex-implementer edit · worktree-isolated - Task <3–5 word description> - Model GPT-5.6 Sol · reasoning low - Mode foreground Pipeline delegatePipeline -``` +Card and status-line templates for both autopilot workflows and direct MCP calls: +[docs/delegation-presentation.md](../../docs/delegation-presentation.md). +## delegatePipeline -**Live status** — one FleetView-style line while the call runs and after the host collapses it to background. Derive it only from the run's durable artifacts using the rules in *Monitoring a backgrounded delegation*; never invent progress. +Use `delegatePipeline` by default for non-trivial tasks — anything with meaningful +correctness or systems risk (multiple files, state, concurrency, security surface, or +behavior existing code depends on). Use plain `delegate` only for trivial tasks +(typo-level fixes, single obvious one-liners, doc-only edits). -```text -● running · codex-implementer · verification · 4m12s -``` - -Status glyphs: `●` running (host-rendered for lane agents) · `◑` decision pending · `✓` verified/accepted · `✗` failed, unavailable, cancelled, or rejected. The decision line appears only on decision-bearing outcomes. - -**Completion notification** — when the call returns, render one compact box populated from the `reviewCandidate` evidence and verification report (mirrors a background subagent's completion notice): +Build the spec exactly as for `delegate`, optionally adding `review` (`reviewers` +defaults to `[correctness, systems]`, `maxRounds` to `2`, and `focus` is reviewer-only +guidance). Call it with `checkoutPath`, `spec`, `protocolVersion: "2.0.0"`, and +`expectedSpecSha256` set to the runtime-returned digest, then read the returned evidence +bundle: attempt result, per-round review reports and consolidated findings, fix +dispositions, verification report, and gate reasons. -```text -┌ ✓ delegation-lane · codex · verified-candidate ───────── -│ lane task1 · 1 file changed · verification 2/2 pass -│ producer self-report conflicts: none -│ manifestHash cebcb2a8… -│ ◑ YOUR DECISION: accept / reject / revise -└────────────────────────────────────────────────────────── -``` - -The box summarizes; it does not decide. Still read the exact unredacted patch, changed-path manifest, and verification evidence before recommending a decision, and present `failed` or `human-decision-required` outcomes verbatim. - -## Choosing delegate vs delegatePipeline - -Use `delegatePipeline` by default for non-trivial tasks — anything with -meaningful correctness or systems risk (multiple files, state, concurrency, -security surface, or behavior existing code depends on). Use plain `delegate` -only for trivial tasks (typo-level fixes, single obvious one-liners, doc-only -edits). - -## Pipeline lifecycle - -1. Build the Delegation Spec exactly as for `delegate`. Optionally add: - - ```yaml - review: - reviewers: [correctness, systems] # default - maxRounds: 2 # default - focus: - - Check platform-specific process cleanup. - ``` - -2. Call `mcp__plugin_claude-architect_runtime__delegatePipeline` with - `checkoutPath`, `spec`, `protocolVersion: "2.0.0"`, and - `expectedSpecSha256` set to the runtime-returned digest. -3. Read the returned evidence bundle: attempt result, per-round review - reports and consolidated findings, fix dispositions, verification report, - and gate reasons. - - `status: "decision-ready"` — review the evidence yourself, then call - `decideCandidate` with `checkoutPath` and the run id and, if accepted, - `integrateCandidate` with `checkoutPath`, the run id, and the candidate - `manifestHash` as `expectedArtifactHash`. - - `status: "human-decision-required"` — present the gate reasons, - unresolved findings, and dispositions to the human verbatim. Never - accept on their behalf. - - `status: "failed"` — report the failure classification; retry or - re-scope per the normal delegate failure guidance. -4. The pipeline never merges and never waives findings; acceptance remains with - `decideCandidate` under the configured runtime authority and, where required, - the human. - -## Sliced pipeline - -For a task that decomposes into ordered, independently testable steps, add a -top-level `slices` array to the spec. Each slice is a scoped mini-spec with its -own `objective`, `context`, `writeAllowlist`, `forbiddenScope`, -`successCriteria`, and — required — its own `verification`: - -```yaml -slices: - - objective: Add the parser for the new record type. - context: The record grammar lives in docs/format.md. - writeAllowlist: [src/parse/**] - forbiddenScope: [src/emit/**] - successCriteria: - - New record type round-trips through the parser. - verification: - - id: parse-tests - executable: npx - args: [vitest, run, tests/parse] - cwd: "." - timeoutMs: 600000 - network: denied - expectedExitCodes: [0] - - objective: Emit the new record type. - # ...its own scope and verification -``` +Statuses map onto the manual lifecycle above: `decision-ready` proceeds to +`decideCandidate` and, if accepted, `integrateCandidate`; `human-decision-required` +presents the gate reasons, unresolved findings, and dispositions verbatim and never +accepts on the human's behalf; `failed` reports the failure classification. The pipeline +never merges and never waives findings. -Slice rules and guarantees: - -- Each slice runs **fresh with no context** — a slice implementer sees only its - own mini-spec, never a prior slice's conversation, and is gated only by its - own `verification`. Each slice's `writeAllowlist` must be a subset of the - spec's, and its verification `cwd` must stay inside the candidate root. -- A deterministic wayfinder routes each completed slice **advance / repair / - halt** from objective gate results — the slice's own `verification`, plus its - independent per-slice review findings when `review.perSlice` is enabled — - never from model judgment or a Producer's self-report. A slice that passes - advances; a slice that fails is repaired within its round budget; a slice that - cannot be made to pass halts the run. -- Slices run **sequentially by default**. A slice may declare `dependsOn` — the - 1-based indices of the slices it must observe — and the spec may raise - `sliceConcurrency`. Slices then run together only when their dependencies - allow it *and* their write allowlists are pairwise disjoint, which is what - makes composing their results a conflict-free union. Omitting `dependsOn` - means "after every preceding slice", so an existing spec behaves exactly as - before. -- Declaring `dependsOn` is a claim about what a slice needs to *see*, not only - about what it writes. A slice that reads another slice's output depends on it - even with disjoint allowlists. Nothing detects an under-declared dependency: - a slice that runs too early is verified against a base without the work it - needed, and the error surfaces at the composed verification below. Declare - `dependsOn: []` only when a slice is genuinely independent. -- Review and the advisor judge the **composed candidate** at the end, over the - whole slice branch, and that composed candidate always faces the spec's full - `verification` regardless of how the slices were scheduled. Per-slice results - never substitute for it. Per-slice review is off by default; opt in with - `review.perSlice: true` to review each slice as it lands. -- A mid-run halt **after at least one slice has advanced** yields a **partial** - candidate with `status: "human-decision-required"`, the halted slice index in - `haltedSliceIndex`, and each slice's route in `slices`; the promoted partial - branch (the advanced slices) is a real candidate the human may accept, reject, - or revise, and the halted slice's attempts stay in `slices` as evidence. A - halt on the very first slice, with nothing advanced, is reported `failed` with - the slice evidence retained — there is no partial branch to accept. Present - the completed slices, the halt reason, and the partial candidate to the human; - never accept or continue past a halt on their behalf. - -## Monitoring a backgrounded delegation - -`delegate` and `delegatePipeline` are synchronous, but the host auto-backgrounds -a long call (after roughly 120s) and then surfaces only a generic "1 MCP task -still running" line; the in-band progress phases stop being visible there. A -producer alone almost always runs longer than the background threshold, so most -of a real delegation happens after the collapse. When a call backgrounds, do not -go silent — report a real status line by reading the run's durable artifacts. - -Correlate the run without guessing: - -1. Before dispatch, snapshot the run directories under the state dir - (`CLAUDE_PLUGIN_DATA/runs` on a host; `CLAUDE_ARCHITECT_STATE_DIR`/tmp under - tests). Reading these directories is read-only observation only. -2. After the call backgrounds, take the newly appeared directory whose - `run-start.json` `canonicalCommonDir` equals this checkout's `.git` and that - has no `result.json` yet. If more than one new matching directory appears — - another session may be delegating against the same repository — report the - ambiguity and do not assume which run is yours. -3. Read `runs//pipeline/.json` for the latest stage: `round-N-…`, - `verification`, then `pipeline-result`. No pipeline artifact yet means the - implement attempt (baseline or producer) is still running. `result.json` - appearing means the run finished. - -After backgrounding the host returns control once; emit a single Live status -line (the FleetView-style format above) then. Continuous status requires scheduled wakeups (about 75s apart, each a full -turn) — only do this when the human explicitly asks for live status, tell them it -costs a turn per update, and never poll tighter than the round cadence. - -Prefer the `delegation-lane` subagent path over run-dir polling; polling remains the fallback for direct calls and for lane-report recovery via `specSha256`. +For a task that decomposes into ordered, independently testable steps, add a top-level +`slices` array — each a scoped mini-spec with its own required `verification`, run fresh +with no context and routed advance/repair/halt by a deterministic wayfinder: +[docs/sliced-pipeline.md](../../docs/sliced-pipeline.md). diff --git a/skills/subagent-driven-delegation/SKILL.md b/skills/subagent-driven-delegation/SKILL.md index 266354f..a4bddbe 100644 --- a/skills/subagent-driven-delegation/SKILL.md +++ b/skills/subagent-driven-delegation/SKILL.md @@ -55,7 +55,7 @@ Two upstream assumptions do not survive the trust boundary, and the table above ## Setup 1. **Isolated workspace.** Delegation already isolates each attempt, but the *branch* still needs a home. Use `superpowers:using-git-worktrees`, or confirm the current branch is not `main`/`master` without the user's explicit consent. This is the architect-owned integration workspace only: pass it as `checkoutPath`, but never dispatch a generic implementer to edit it. The runtime gives every implementation or repair attempt fresh context in its own isolated worktree. A repository delivery gate may later create another managed worktree; never reuse or expose one layer's worktree as another layer's workspace. -2. **Clean checkout.** Delegation and controlled integration require an exact clean checkout: commit or stash tracked changes first, including tracked planning files such as `tasks/todo.md`. Git-ignored planning files are fine. Never use skip-worktree or assume-unchanged as a workaround. +2. **Clean checkout.** The repository precondition in `/claude-architect:delegate` applies unchanged to every task in this loop. 3. **Workspace and ledger.** When Superpowers is installed, run its `scripts/sdd-workspace PLAN_FILE` and use the directory it prints. Otherwise use `/.claude-architect/sdd//`. Create `progress.md` whose first line is `# SDD ledger — plan: `. A ledger naming a different plan belongs to that plan: leave it alone and start your own. 4. **Resume, don't redo.** A task with a `Task : complete` line is done. Re-dispatching completed tasks is the most expensive recoverable failure in this loop, and delegation makes it costly in Producer time as well. Trust the ledger and `git log` over your own recollection. 5. **Plan conflict scan.** Read the plan once. Batch every contradiction — between tasks, against Global Constraints, or a mandate that the review rubric treats as a defect — into one question before Task 1. Add one delegation-specific check: any task whose success criteria are not objectively checkable cannot become a Delegation Spec. Sharpen those criteria with the user now, because a Producer cannot be verified against a vague goal. @@ -72,18 +72,16 @@ Run Superpowers' `scripts/task-brief PLAN_FILE N` (or extract the task's full te Translate the brief into a spec per `/claude-architect:delegate` — success criteria, `writeAllowlist`, and verification commands. Two rules matter more here than in single delegation: -- **Verification commands carry the task's acceptance.** Whatever the brief calls "done" must be an executable check, because the runtime — not the Producer — decides whether it passed. -- **Widen `writeAllowlist` to allowlist consumers** when the task changes an exported contract, or add a repository-wide verification command. A src-only gate plus focused tests compiles neither, and the breakage lands on you at integration. +- **Verification commands carry the task's acceptance.** Whatever the brief calls "done" must be an executable check, because the runtime — not the Producer — decides whether it passed. A brief's acceptance criterion that cannot become a command is a plan defect to raise, not a criterion to review by eye. +- **A task's scope is narrower than the plan's.** Each task's `writeAllowlist` covers that task and its allowlist consumers, never the whole plan; a later task must not be able to reach back into an earlier task's files unannounced. -Set `expectBaselineFailure: true` only on a command that cannot pass at clean HEAD *by design*. It is all-or-nothing per command: split a command that mixes existing and to-be-created paths, or you disable the baseline signal for the whole command. The gate enforces the declaration both ways — a command carrying the flag that cannot run, or that passes, fails the baseline. - -Watch the brief for acceptance criteria phrased as an absence ("no bare `except`", "the legacy label is gone"). The obvious gate is a text search expecting no match, and that gate matches the phrase in comments and docstrings too — so a Producer that documents *why* it avoided the pattern fails a check its code satisfies. Anchor such patterns to syntax, or assert over parsed structure. +Every other spec-authoring rule — allowlist consumers, `expectBaselineFailure`, text-search gates, test-parallelism bounds — is stated once in `/claude-architect:delegate` § Build the Delegation Spec and applies here unchanged. ### 3. Dispatch Dispatch through the host's `Agent` tool using the `delegation-lane` agent so the task renders as a native subagent row, or call `delegate`/`delegatePipeline` directly in the foreground for short attempts. Never dispatch two implementation lanes against the same repository as if they were parallel — the runtime serializes them on the repository lock. -Take only `runId` from the lane report. On a malformed report, locate the run directory matching `specSha256` rather than redispatching. +Correlate the lane report exactly as `/claude-architect:delegate` § Lanes as native subagents requires; a lane report is never evidence for a task's completion. ### 4. Review the task @@ -108,9 +106,7 @@ Five rounds maximum per task. Each round is one new attempt plus one scoped re-r ### 6. Close the task -Present the review outcome and your recommendation, then call `decideCandidate`. Under the shipped `autonomous` authority, only an independently verified `delegatePipeline` candidate with durable, commit-bound gate clearance and no warnings may be accepted as `policy-autonomous`; every other case requires the human through MCP elicitation. - -Only when `decideCandidate` records `accepted` with integrable provenance, call `integrateCandidate` with the exact candidate `manifestHash` as `expectedArtifactHash`, and report `applied`, `conflicted`, or `aborted` truthfully. Integration stages the reviewed tree; it does not commit. One accepted candidate per clean checkout — never batch-accept against the same checkout. +Present the review outcome and your recommendation, then run `decideCandidate` and — only on an accepted decision with integrable provenance — `integrateCandidate` with the exact candidate `manifestHash` as `expectedArtifactHash`, exactly as `/claude-architect:delegate` § Manual candidate lifecycle steps 9–10 specify. Nothing about the decision gate changes because a task is part of a plan. Then append `Task : complete (run , manifest , review clean)` — or `…, parked` after a tripped breaker. diff --git a/src/autopilot/candidate-promoter.ts b/src/autopilot/candidate-promoter.ts index 26f8f55..87d0e5c 100644 --- a/src/autopilot/candidate-promoter.ts +++ b/src/autopilot/candidate-promoter.ts @@ -13,6 +13,7 @@ import { ArtifactStore } from "../runtime/artifact-store.js"; import { PlatformSafety } from "../platform/platform-safety.js"; import { redact } from "../runtime/redaction.js"; import { reviewSnapshotHash } from "../runtime/review-snapshot.js"; +import { readRunDecisionSnapshot } from "../runtime/run-decision.js"; import { logger } from "../util/logger.js"; import { WorkflowBranchManager, @@ -370,11 +371,12 @@ export class CandidatePromoter { let advisor; let eligibility: AutopilotEligibilityRecord | null; try { - [result, manifest, pipelineResult, snapshot, advisor, eligibility] = await Promise.all([ - artifactStore.readResult(request.runId), - artifactStore.readManifest(request.runId), + const decisionSnapshot = await readRunDecisionSnapshot(request.runId, { store: artifactStore }); + result = decisionSnapshot.result; + manifest = decisionSnapshot.manifest; + snapshot = decisionSnapshot.reviewSnapshot; + [pipelineResult, advisor, eligibility] = await Promise.all([ artifactStore.readPipelineArtifact(request.runId, "pipeline-result"), - artifactStore.readReviewSnapshot(request.runId), artifactStore.readAdvisorReport(request.runId), artifactStore.readAutopilotEligibility(request.runId), ]); diff --git a/src/autopilot/final-branch-reviewer.ts b/src/autopilot/final-branch-reviewer.ts index fa9dbfb..f36099a 100644 --- a/src/autopilot/final-branch-reviewer.ts +++ b/src/autopilot/final-branch-reviewer.ts @@ -17,12 +17,7 @@ import type { CheckoutLock, PlatformServices } from "../platform/platform-servic import { getPlatformServices } from "../platform/select-platform.js"; import type { AcceptanceVerifyResult } from "../verify/acceptance-verifier.js"; import { AcceptanceVerifier } from "../verify/acceptance-verifier.js"; -import { - recomputeManifest, - type StructuralFailure, - type StructuralVerifyArgs, - type StructuralVerifyResult, -} from "../verify/structural-verifier.js"; +import { readRunDecisionSnapshot } from "../runtime/run-decision.js"; import type { CandidateArtifact, ChangedPath } from "../protocol/attempt-result.js"; import type { AutopilotSpec } from "../protocol/autopilot-spec.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; @@ -272,14 +267,15 @@ async function validateArchivedTaskEvidence( let eligibility; let decision; try { - [result, manifest, pipelineResult, snapshot, advisor, eligibility, decision] = await Promise.all([ - store.readResult(evidence.runId), - store.readManifest(evidence.runId), + const decisionSnapshot = await readRunDecisionSnapshot(evidence.runId, { store }); + result = decisionSnapshot.result; + manifest = decisionSnapshot.manifest; + snapshot = decisionSnapshot.reviewSnapshot; + decision = decisionSnapshot.decision; + [pipelineResult, advisor, eligibility] = await Promise.all([ store.readPipelineArtifact(evidence.runId, "pipeline-result"), - store.readReviewSnapshot(evidence.runId), store.readAdvisorReport(evidence.runId), store.readAutopilotEligibility(evidence.runId), - store.readCandidateDecision(evidence.runId), ]); } catch { fail("missing-task-evidence", `task evidence archive is invalid: ${task.id}`); @@ -612,82 +608,6 @@ function uniqueSorted(values: string[]): string[] { return [...new Set(values)].sort(); } -function finalPathAllowed( - pathname: string, - writeAllowlist: string[], - forbiddenScope: string[], - opaqueDirectory: boolean, -): boolean { - const candidates = opaqueDirectory ? [pathname, `${pathname}/`] : [pathname]; - return writeAllowlist.some(pattern => candidates.some(candidate => globMatches(pattern, candidate))) - && !forbiddenScope.some(pattern => - candidates.some(candidate => globMatches(pattern, candidate, true))); -} - -/** Structural proof adapted to a linear, multi-commit base-to-head artifact. */ -async function structuralVerifyFinalBranch( - args: StructuralVerifyArgs, - runGit: typeof git = git, -): Promise { - const failures = new Set(); - const [manifest, baseTree, sourceHead, materializedHead, candidateTree, sourceStatus, materializedStatus] = - await Promise.all([ - recomputeManifest(args), - checkedGit(runGit, args.repoRoot, ["rev-parse", "--verify", `${args.baseCommitOid}^{tree}`]), - checkedGit(runGit, args.repoRoot, ["rev-parse", "--verify", "HEAD^{commit}"]), - checkedGit(runGit, args.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"]), - checkedGit(runGit, args.repoRoot, [ - "rev-parse", "--verify", `${args.artifact.candidateCommitOid}^{tree}`, - ]), - checkedGit(runGit, args.repoRoot, [ - "status", "--porcelain=v1", "-z", "--untracked-files=all", - ]), - checkedGit(runGit, args.worktreePath, [ - "status", "--porcelain=v1", "-z", "--untracked-files=all", - ]), - ]); - const ancestry = await runGit(args.repoRoot, [ - "merge-base", "--is-ancestor", args.baseCommitOid, args.artifact.candidateCommitOid, - ]); - - if (args.artifact.baseCommitOid !== args.baseCommitOid) failures.add("artifact-base-mismatch"); - if (sourceHead.trim() !== args.artifact.candidateCommitOid - || materializedHead.trim() !== args.artifact.candidateCommitOid - || candidateTree.trim() !== args.artifact.candidateTreeOid - || ancestry.exitCode !== 0 - || ancestry.truncated?.stdout === true - || ancestry.truncated?.stderr === true - || sourceStatus !== "" - || materializedStatus !== "") { - failures.add("artifact-divergence"); - } - if (JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) - || args.artifact.manifestHash !== manifest.manifestHash) { - failures.add("manifest-divergence"); - } - if (manifest.changedPaths.some(change => !finalPathAllowed( - change.path, - args.writeAllowlist, - args.forbiddenScope, - change.mode === "160000", - ))) { - failures.add("out-of-scope-write"); - } - if (manifest.rawDiff.some(entry => - [entry.oldMode, entry.newMode].some(mode => mode === "120000" || mode === "160000"))) { - failures.add("modified-symlink"); - } - if (manifest.changedPaths.length === 0 - || args.artifact.candidateTreeOid === baseTree.trim()) { - failures.add("empty-candidate"); - } - return { - ok: failures.size === 0, - failures: [...failures], - manifestHash: manifest.manifestHash, - }; -} - function finalDelegationSpec(spec: AutopilotSpec): DelegationSpec { const template = spec.tasks[0]?.delegation; if (template === undefined) { @@ -1004,7 +924,7 @@ export class FinalBranchReviewer { this.branchManager = dependencies.branchManager ?? new WorkflowBranchManager(); this.workflowStore = dependencies.workflowStore ?? (workflowId => new WorkflowStore(workflowId)); this.acceptanceVerifier = dependencies.acceptanceVerifier ?? new AcceptanceVerifier({ - structural: async args => await structuralVerifyFinalBranch(args, this.runGit), + mode: "final-branch", }); this.roleRunner = dependencies.roleRunner ?? runRole; this.platformServices = dependencies.platformServices ?? getPlatformServices(); diff --git a/src/git/ref-namespace.ts b/src/git/ref-namespace.ts new file mode 100644 index 0000000..b828ac3 --- /dev/null +++ b/src/git/ref-namespace.ts @@ -0,0 +1,9 @@ +/** + * Ref namespaces that more than one subsystem must agree on. + * + * The slice namespace is written by the pipeline and swept by recovery. When + * each declared its own copy of the literal they drifted apart, and the sweep + * silently stopped reaching the refs the pipeline was creating: nothing failed, + * the refs just accumulated. One declaration removes that failure mode. + */ +export const SLICE_REF_PREFIX = "refs/claude-architect/slices/"; diff --git a/src/mcp/server.ts b/src/mcp/server.ts index 7bd54ef..0b7ba0c 100644 --- a/src/mcp/server.ts +++ b/src/mcp/server.ts @@ -33,6 +33,7 @@ import { DECISION_AUTHORITY_ENV, type DecisionAuthority, } from "./decision-authority.js"; +import { runDecision } from "../runtime/run-decision.js"; import { recoverStaleRuns, type WorktreeSweepIssue } from "../runtime/recovery-manager.js"; import { pruneRuns } from "../runtime/artifact-store.js"; import { boundedRedactedDiagnostic, redact } from "../runtime/redaction.js"; @@ -88,6 +89,12 @@ const pipelineResultOutput = z.object({ slices: z.array(z.record(z.string(), z.unknown())), haltedSliceIndex: z.number().nullable(), failure: z.enum(FAILURE_PRECEDENCE).nullable().optional(), + pipelineGateCleared: z.object({ + clearedVersion: z.literal("1"), + candidateCommitOid: z.string(), + requiresHumanDecision: z.boolean(), + clearedAt: z.string().optional(), + }).nullable().optional(), }).strict(); // Lane mode returns the correlation envelope instead of the full result; both // shapes are part of the advertised contract. @@ -687,22 +694,30 @@ export async function createServer( expectedArtifactHash, { ...dependencies, - decisionProvenanceResolver: async ({ advisory }) => { - const autonomy = autonomousEligibility( + decisionProvenanceResolver: async ({ + advisory, + runId: targetRunId, + decision: targetDecision, + snapshot, + }) => { + const effectiveRunId = targetRunId ?? runId; + const effectiveDecision = targetDecision ?? decision; + const verdict = runDecision.verdictFor( + snapshot, (dependencies.decisionAuthority ?? decisionAuthority)(), - advisory, ); // Eligibility says the runtime proved everything it can prove about // the candidate; it says nothing about the verdict. The policy may // only accept, so every other verdict is a human override. - if (autonomy.eligible && decision === "accepted") { + if (verdict.state === "accepted" && effectiveDecision === "accepted") { return "policy-autonomous"; } + const reasons = verdict.state === "accepted" ? advisory.warnings : verdict.reasons; const confirmed = await confirmWithHuman( server, - runId, - decision, - advisory.warnings, + effectiveRunId, + effectiveDecision, + reasons, ); if (!confirmed.ok) { throw new RuntimeError(confirmed.error.diagnostic, { diff --git a/src/mcp/tools.ts b/src/mcp/tools.ts index 57c03f7..ea69bd7 100644 --- a/src/mcp/tools.ts +++ b/src/mcp/tools.ts @@ -26,6 +26,10 @@ import { type CandidateDecisionV2, type HumanCandidateDecisionV2, } from "../protocol/candidate-decision.js"; +import { + type PipelineGateCleared, + parsePipelineGateCleared, +} from "../protocol/pipeline-gate-cleared.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { checkVersionCompat } from "../protocol/schema-loader.js"; import { specSha256 } from "../protocol/spec-hash.js"; @@ -50,6 +54,10 @@ import { type ReviewSnapshot, } from "../runtime/review-snapshot.js"; import type { RunManifest } from "../runtime/run-manifest.js"; +import { + readRunDecisionSnapshot, + type RunDecisionSnapshot, +} from "../runtime/run-decision.js"; import { PlatformSafety } from "../platform/platform-safety.js"; import { redact } from "../runtime/redaction.js"; import { NestedDelegationError, RuntimeError } from "../util/errors.js"; @@ -87,6 +95,7 @@ export interface ToolArtifactStore { /** Persist a decision whose authority the lifecycle already resolved. */ writeCandidateDecisionRecord(record: CandidateDecisionV2): Promise; readCandidateDecision(runId: string): Promise; + readPipelineGateCleared?(runId: string): Promise; readPipelineActiveMarker(runId: string): Promise; /** * The spec hash recorded when the run started. Required, not optional: a store @@ -134,6 +143,8 @@ export interface ToolDependencies { runId: string; decision: RunDecisionValue; advisory: DecisionAdvisory; + /** The already-loaded archive, so the resolver never re-reads it. */ + snapshot: RunDecisionSnapshot; }) => Promise; /** Injectable controller seam for hermetic MCP protocol tests. */ autopilotControllerFactory?: (context: { @@ -154,6 +165,13 @@ interface ArchivedRun { manifest: RunManifest; repoRoot: string; lockKey: string; + /** + * The one decision snapshot this run was loaded from. Every consumer on the + * decide path reads it instead of re-reading the archive: `loadArchivedRun`, + * the provenance resolver, and the decision write used to perform three + * independent five-file reads of the same immutable archive. + */ + snapshot: RunDecisionSnapshot; } function services(deps: ToolDependencies): PlatformServices { @@ -408,23 +426,14 @@ function isRecord(value: unknown): value is Record { async function loadArchivedRun(runId: string, deps: ToolDependencies): Promise { const store = storeFor(runId, deps); - const [result, manifest] = await Promise.all([ - store.readResult(runId), - store.readManifest(runId), - ]); + const snapshot = await readRunDecisionSnapshot(runId, { store }); + const result = snapshot.result; + const manifest = snapshot.manifest; if (result === null || manifest === null) { throw runtimeError("archived run was not found", "run-not-found"); } - if (result.runId !== runId || manifest.runId !== runId) { - throw runtimeError("archived run identity does not match", "archive-inconsistent"); - } - if (result.candidate !== null - && (manifest.baseCommitOid !== result.candidate.baseCommitOid - || manifest.candidateManifestHash !== result.candidate.manifestHash - || result.candidate.manifestHash !== createHash("sha256") - .update(JSON.stringify(result.candidate.changedPaths)) - .digest("hex"))) { - throw runtimeError("archived candidate does not match its run manifest", "archive-inconsistent"); + if (snapshot.coherenceErrors.length > 0) { + throw runtimeError(snapshot.coherenceErrors[0]!, "archive-inconsistent"); } const canonical = await services(deps).canonicalizePath(manifest.repoRoot); if (canonical.canonical !== manifest.repoRoot) { @@ -436,6 +445,7 @@ async function loadArchivedRun(runId: string, deps: ToolDependencies): Promise { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} + +export function privateObjectReadOptions(access: LinkedWorktreeGitAccess): { + env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: string }; +} { + return { + env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: access.privateObjectsDir }, + }; +} + +export async function importPromotedObjects(args: { + checkoutPath: string; + baselineCommit: string; + promotedCommit: string; + access: LinkedWorktreeGitAccess; +}): Promise { + const privateObjects = privateObjectReadOptions(args.access); + const packPrefix = path.join(args.access.sharedObjectsDir, "pack", "pack"); + await checkedGit( + args.checkoutPath, + ["pack-objects", "--revs", packPrefix], + { + ...privateObjects, + stdin: `${args.promotedCommit}\n^${args.baselineCommit}\n`, + }, + ); + + await checkedGit(args.checkoutPath, ["cat-file", "-e", `${args.promotedCommit}^{commit}`]); + await checkedGit(args.checkoutPath, ["rev-parse", `${args.promotedCommit}^{tree}`]); + await checkedGit(args.checkoutPath, [ + "rev-list", + "--objects", + args.promotedCommit, + "--not", + args.baselineCommit, + ]); +} + +export interface CandidateProvenanceFailure { + failure: FailureClassification; + reason: string; +} + +export async function validateCandidateProvenance(args: { + worktreePath: string; + previousCandidateCommit: string; + candidateCommit: string; + gitObjectAccess: LinkedWorktreeGitAccess; + phaseLabel?: string; +}): Promise { + const phaseLabel = args.phaseLabel ?? "fix phase"; + const privateObjects = privateObjectReadOptions(args.gitObjectAccess); + const candidateObject = await git(args.worktreePath, [ + "cat-file", + "-e", + `${args.candidateCommit}^{commit}`, + ], privateObjects); + if (candidateObject.exitCode !== 0) { + return { + failure: "producer-failure", + reason: `${phaseLabel} reported a missing candidate commit`, + }; + } + + const head = await git( + args.worktreePath, + ["rev-parse", "--verify", "HEAD^{commit}"], + privateObjects, + ); + if (head.exitCode !== 0 || head.stdout.trim() !== args.candidateCommit) { + return { + failure: "producer-failure", + reason: `${phaseLabel} reported a candidate commit that does not match its worktree HEAD`, + }; + } + + const candidateAncestry = await git(args.worktreePath, [ + "merge-base", + "--is-ancestor", + args.previousCandidateCommit, + args.candidateCommit, + ], privateObjects); + if (candidateAncestry.exitCode !== 0) { + return { + failure: "sandbox-violation", + reason: `${phaseLabel} candidate commit is not descended from the reviewed candidate`, + }; + } + + const worktreeStatus = await git(args.worktreePath, [ + "status", + "--porcelain", + "--untracked-files=all", + ], privateObjects); + if (worktreeStatus.exitCode !== 0) { + return { + failure: "sandbox-violation", + reason: `${phaseLabel} candidate worktree cleanliness could not be verified`, + }; + } + if (worktreeStatus.stdout.length > 0) { + return { + failure: "sandbox-violation", + reason: `${phaseLabel} candidate worktree contains uncommitted state`, + }; + } + + return null; +} + +export async function validateFixProvenance(args: { + worktreePath: string; + previousCandidateCommit: string; + fix: FixReport; + gitObjectAccess: LinkedWorktreeGitAccess; +}): Promise { + const provenanceFailure = await validateCandidateProvenance({ + worktreePath: args.worktreePath, + previousCandidateCommit: args.previousCandidateCommit, + candidateCommit: args.fix.candidateCommit, + gitObjectAccess: args.gitObjectAccess, + }); + if (provenanceFailure !== null) return provenanceFailure; + + const privateObjects = privateObjectReadOptions(args.gitObjectAccess); + const dispositionCommits = new Set(args.fix.dispositions.flatMap(disposition => + disposition.commit === undefined ? [] : [disposition.commit])); + for (const dispositionCommit of dispositionCommits) { + const object = await git(args.worktreePath, [ + "cat-file", + "-e", + `${dispositionCommit}^{commit}`, + ], privateObjects); + if (object.exitCode !== 0) { + return { + failure: "producer-failure", + reason: "fix phase disposition reported a missing commit object", + }; + } + const [afterPrevious, beforeCandidate] = await Promise.all([ + git(args.worktreePath, [ + "merge-base", + "--is-ancestor", + args.previousCandidateCommit, + dispositionCommit, + ], privateObjects), + git(args.worktreePath, [ + "merge-base", + "--is-ancestor", + dispositionCommit, + args.fix.candidateCommit, + ], privateObjects), + ]); + if (afterPrevious.exitCode !== 0 || beforeCandidate.exitCode !== 0) { + return { + failure: "producer-failure", + reason: "fix phase disposition commit is outside the produced candidate lineage", + }; + } + } + return null; +} diff --git a/src/pipeline/candidate-verifier.ts b/src/pipeline/candidate-verifier.ts new file mode 100644 index 0000000..456d724 --- /dev/null +++ b/src/pipeline/candidate-verifier.ts @@ -0,0 +1,275 @@ +import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; +import { RuntimeError } from "../util/errors.js"; +import { globMatches } from "../util/glob.js"; +import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import type { AttemptResult, CandidateArtifact } from "../protocol/attempt-result.js"; +import type { ArtifactStore } from "../runtime/artifact-store.js"; +import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; +import { getPlatformServices } from "../platform/select-platform.js"; +import type { PipelineVerificationReport } from "./pipeline-runtime.js"; +import { WorktreeManager, withManagedWorktree } from "../runtime/worktree-manager.js"; +import { + isAllowed, + recomputeManifest, +} from "../verify/structural-verifier.js"; +import { AcceptanceVerifier } from "../verify/acceptance-verifier.js"; +import type { VerificationReport } from "./report-types.js"; + +export interface WeakenedTestEvidence { + testsDeleted: number; + testsSkipped: number; + authorizedTestDeletions: string[]; +} + +function gitFailure(action: string, result: GitResult): RuntimeError { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} + +async function checkedGit( + cwd: string, + args: string[], + options?: GitExecOptions, +): Promise { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} + +export function analyzeWeakenedTests( + diff: string, + allowedTestDeletions: string[] = [], + deletedPaths?: string[], +): WeakenedTestEvidence { + let testsDeleted = 0; + let testsSkipped = 0; + const authorizedTestDeletions: string[] = []; + let currentFileIsTest = false; + let currentPath: string | null = null; + for (const line of diff.split("\n")) { + if (deletedPaths === undefined && /^deleted file mode/.test(line)) { + if (currentFileIsTest && currentPath !== null) { + const deletedPath = currentPath; + if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { + authorizedTestDeletions.push(deletedPath); + } else { + testsDeleted++; + } + } + } + const diffHeader = /^diff --git a\/(\S+) b\/\S+$/.exec(line); + if (diffHeader !== null) { + currentPath = diffHeader[1] ?? null; + currentFileIsTest = currentPath !== null + && /(^|\/)tests?\/|\.test\.|\.spec\./.test(currentPath); + } else if (/^diff --git /.test(line)) { + currentPath = null; + currentFileIsTest = /(^|\/)tests?\/|\.test\.|\.spec\./.test(line); + } + if (currentFileIsTest && /^\+.*\b(it|test|describe)\.(skip|todo)\(/.test(line)) testsSkipped++; + if (currentFileIsTest && /^\+.*\bxit\(|^\+.*\bxdescribe\(/.test(line)) testsSkipped++; + } + for (const deletedPath of deletedPaths ?? []) { + if (!/(^|\/)tests?\/|\.test\.|\.spec\./.test(deletedPath)) continue; + if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { + authorizedTestDeletions.push(deletedPath); + } else { + testsDeleted++; + } + } + return { testsDeleted, testsSkipped, authorizedTestDeletions }; +} + +export function detectWeakenedTests( + diff: string, + allowedTestDeletions: string[] = [], + deletedPaths?: string[], +): { testsDeleted: number; testsSkipped: number } { + const { testsDeleted, testsSkipped } = analyzeWeakenedTests( + diff, + allowedTestDeletions, + deletedPaths, + ); + return { testsDeleted, testsSkipped }; +} + +export function parseDeletedPaths(nameStatus: string): string[] { + const fields = nameStatus.split("\0"); + const deletedPaths: string[] = []; + for (let index = 0; index < fields.length; index += 1) { + const entry = fields[index] ?? ""; + if (entry === "D") { + const pathname = fields[index + 1]; + if (pathname !== undefined && pathname !== "") deletedPaths.push(pathname); + index += 1; + continue; + } + const separator = entry.indexOf("\t"); + if (separator >= 0 && entry.slice(0, separator) === "D") { + deletedPaths.push(entry.slice(separator + 1)); + } + } + return deletedPaths; +} + +async function candidateArtifact(args: { + worktreePath: string; + baselineCommit: string; + candidateCommit: string; + anchorRef: string; + diffText: string; +}): Promise { + const artifact: CandidateArtifact = { + baseCommitOid: args.baselineCommit, + candidateTreeOid: (await checkedGit( + args.worktreePath, + ["rev-parse", `${args.candidateCommit}^{tree}`], + )).trim(), + candidateCommitOid: args.candidateCommit, + anchorRef: args.anchorRef, + manifestHash: "", + changedPaths: [], + patch: args.diffText, + }; + const canonical = await recomputeManifest({ + worktreePath: args.worktreePath, + baseCommitOid: args.baselineCommit, + artifact, + }); + if (canonical.manifestHash === null) { + throw new RuntimeError("final candidate paths collide under case folding"); + } + return { + ...artifact, + changedPaths: canonical.changedPaths, + manifestHash: canonical.manifestHash, + }; +} + +export interface VerifyCandidateDependencies { + ps?: PlatformServices | undefined; + borrowedCheckoutLease?: CheckoutLock | undefined; +} + +export async function verifyCandidate(args: { + checkoutPath: string; + spec: DelegationSpec; + deps?: VerifyCandidateDependencies | undefined; + attempt: AttemptResult; + baselineCommit: string; + candidateCommit: string; + store: ArtifactStore; + namespace?: string | undefined; +}): Promise<{ verification: PipelineVerificationReport; baselineDrift: boolean }> { + const ps = args.deps?.ps ?? getPlatformServices(); + const namespace = args.namespace === undefined ? "" : `${args.namespace}-`; + const manager = new WorktreeManager( + args.checkoutPath, + `${args.attempt.runId}-${namespace}verify`, + ps, + args.deps?.borrowedCheckoutLease === undefined + ? {} + : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }, + ); + return await withManagedWorktree({ + manager, + commit: args.candidateCommit, + cleanupFailureMessage: "pipeline verification worktree could not be cleaned up", + run: async worktreePath => { + const [diffText, , nameStatus, status, ancestry] = await Promise.all([ + checkedGit(worktreePath, ["diff", `${args.baselineCommit}..${args.candidateCommit}`]), + checkedGit(worktreePath, [ + "diff", + "--name-only", + `${args.baselineCommit}..${args.candidateCommit}`, + ]), + checkedGit(worktreePath, [ + "diff", + "--name-status", + "--no-renames", + "-z", + `${args.baselineCommit}..${args.candidateCommit}`, + ]), + checkedGit(worktreePath, ["status", "--porcelain"]), + git(worktreePath, [ + "merge-base", + "--is-ancestor", + args.baselineCommit, + args.candidateCommit, + ]), + ]); + const artifact = await candidateArtifact({ + worktreePath: worktreePath, + baselineCommit: args.baselineCommit, + candidateCommit: args.candidateCommit, + anchorRef: args.attempt.candidate?.anchorRef ?? "", + diffText, + }); + const verifier = new AcceptanceVerifier({ mode: "composed-slice" }); + const acceptance = await verifier.verify({ + repoRoot: args.checkoutPath, + worktreePath: worktreePath, + baseCommitOid: args.baselineCommit, + artifact, + spec: args.spec, + ps, + artifactStore: args.store, + ...(args.deps?.borrowedCheckoutLease === undefined + ? {} + : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }), + verificationId: () => `${args.attempt.runId}-${namespace}pipeline`, + logNamePrefix: `${namespace}pipeline-verification`, + }); + const scopeViolations = artifact.changedPaths + .filter((change: { path: string; mode: string }) => !isAllowed( + change.path, + args.spec.writeAllowlist, + args.spec.forbiddenScope, + change.mode === "160000", + )) + .map((change: { path: string }) => change.path); + const weakened = analyzeWeakenedTests( + diffText, + args.spec.allowedTestDeletions, + parseDeletedPaths(nameStatus), + ); + const workspaceClean = status === ""; + const verificationCommands = new Map( + args.spec.verification.map(command => [command.id, command]), + ); + return { + verification: { + reportVersion: "1", + pass: acceptance.ok + && workspaceClean + && scopeViolations.length === 0, + commandResults: acceptance.commandOutcomes.map(command => ({ + id: command.id, + exitCode: command.exitCode ?? -1, + ok: command.exitCode !== null + && !command.timedOut + && (verificationCommands.get(command.id)?.expectedExitCodes.includes( + command.exitCode, + ) ?? false), + })), + workspaceClean, + testsDeleted: weakened.testsDeleted, + testsSkipped: weakened.testsSkipped, + scopeViolations, + evidence: { + failures: [...acceptance.failures], + acceptance: acceptance.evidence, + commandOutcomes: acceptance.commandOutcomes.map(outcome => ({ + ...outcome, + args: [...outcome.args], + })), + ...(args.spec.allowedTestDeletions === undefined + ? {} + : { authorizedTestDeletions: [...weakened.authorizedTestDeletions] }), + }, + }, + baselineDrift: ancestry.exitCode !== 0, + }; + }, + }); +} diff --git a/src/pipeline/pipeline-roles.ts b/src/pipeline/pipeline-roles.ts new file mode 100644 index 0000000..c691ae7 --- /dev/null +++ b/src/pipeline/pipeline-roles.ts @@ -0,0 +1,272 @@ +import type { DelegationSpec, ReviewerKind } from "../protocol/delegation-spec.js"; +import type { ArtifactStore } from "../runtime/artifact-store.js"; +import type { RunStartContext } from "../runtime/run-start.js"; +import type { LinkedWorktreeGitAccess } from "./git-writable-roots.js"; +import type { PipelineRole, RolePackage } from "./role-prompts.js"; +import { + runRole as defaultRunRole, + type RoleRunArgs, + type RoleRunResult, +} from "./role-runner.js"; +import { parseStructuredReport } from "./structured-output.js"; +import { loadSchemas } from "../protocol/schema-loader.js"; +import type { + FixReport, + IncrementReport, + ReviewReport, +} from "./report-types.js"; +import type { FailureClassification } from "../protocol/attempt-result.js"; +import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; +import { getPlatformServices } from "../platform/select-platform.js"; +import type { ProducerRegistry } from "../producers/producer-registry.js"; + +const schemas = loadSchemas(); + +export interface StructuredRoleRunFailure { + ok: false; + failure: FailureClassification; + failedRoleLogRef: string; + roleLogRefs: string[]; +} + +export interface StructuredRoleRunSuccess { + ok: true; + report: T; + roleLogRefs: string[]; +} + +export type StructuredRoleRunResult = + | StructuredRoleRunFailure + | StructuredRoleRunSuccess; + +export interface RoleExecutionDependencies { + ps?: PlatformServices | undefined; + registry?: ProducerRegistry | undefined; + env?: Record | undefined; + abortSignal?: AbortSignal | undefined; + roleRunner?: ((args: RoleRunArgs) => Promise) | undefined; + runRole?: ((args: RoleRunArgs) => Promise) | undefined; +} + +export function roleArgs(args: { + role: PipelineRole; + spec: DelegationSpec; + pkg: RolePackage; + worktreePath: string; + deps: RoleExecutionDependencies; + runId: string; + runStart?: RunStartContext | undefined; + gitObjectAccess?: LinkedWorktreeGitAccess | undefined; +}): RoleRunArgs { + const ps = args.deps.ps ?? getPlatformServices(); + return { + role: args.role, + baseSpec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + ps, + registry: args.deps.registry!, + runId: args.runId, + ...(args.runStart === undefined ? {} : { runStart: args.runStart }), + ...(args.gitObjectAccess === undefined ? {} : { gitObjectAccess: args.gitObjectAccess }), + ...(args.deps.env === undefined ? {} : { env: args.deps.env }), + ...(args.deps.abortSignal === undefined ? {} : { abortSignal: args.deps.abortSignal }), + }; +} + +export async function runArchivedRole( + runner: (args: RoleRunArgs) => Promise, + args: RoleRunArgs, + store: Pick, + logName: string, +): Promise<{ result: RoleRunResult; logRef: string }> { + const result = await runner(args); + const output = result.rawOutput === "" + ? `role produced no stdout; failure: ${result.failure ?? "none"}\n` + : result.archiveSafeRawOutput ?? result.rawOutput; + const logRef = await store.writeLog(logName, output); + return { result, logRef }; +} + +export async function runStructuredRole(args: { + role: PipelineRole; + schema: Parameters[1]; + logName: string; + spec: DelegationSpec; + pkg: RolePackage; + worktreePath: string; + deps: RoleExecutionDependencies; + runId: string; + store: Pick; + runStart?: RunStartContext | undefined; + gitObjectAccess?: LinkedWorktreeGitAccess | undefined; +}): Promise> { + const runner = args.deps.roleRunner ?? args.deps.runRole ?? defaultRunRole; + const callArgs = roleArgs({ + role: args.role, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + ...(args.runStart === undefined ? {} : { runStart: args.runStart }), + ...(args.gitObjectAccess === undefined ? {} : { gitObjectAccess: args.gitObjectAccess }), + }); + const initial = await runArchivedRole(runner, callArgs, args.store, args.logName); + const roleLogRefs = [initial.logRef]; + if (!initial.result.ok) { + return { + ok: false, + failure: initial.result.failure ?? "producer-failure", + failedRoleLogRef: initial.logRef, + roleLogRefs, + }; + } + const outcome = await parseStructuredReport( + initial.result.rawOutput, + args.schema, + async validationErrors => { + // Re-running with the identical arguments is a blind retry: the Producer + // cannot see why its reply was rejected, so it reproduces the defect and + // the round is spent for nothing. Carry the errors into the retry. + const repair = await runArchivedRole( + runner, + { ...callArgs, pkg: { ...callArgs.pkg, outputRepair: validationErrors } }, + args.store, + `${args.logName}-repair`, + ); + roleLogRefs.push(repair.logRef); + return repair.result.ok ? repair.result.rawOutput : ""; + }, + ); + if (!outcome.ok) { + return { + ok: false, + // Unparseable structured output is the Producer answering wrongly, not + // failing to answer; collapsing it to producer-failure loses the only + // signal that separates a malformed report from a crashed process. + failure: "invalid-output", + // The rejected output is what a reader needs to see. Pointing at the + // repair attempt hides the report that actually failed validation. + failedRoleLogRef: initial.logRef, + roleLogRefs, + }; + } + return { ok: true, report: outcome.value, roleLogRefs }; +} + +export async function runIncrement(args: { + spec: DelegationSpec; + pkg: RolePackage; + worktreePath: string; + deps: RoleExecutionDependencies; + runId: string; + increment: number; + store: ArtifactStore; + gitObjectAccess: LinkedWorktreeGitAccess; + runStart?: RunStartContext | undefined; + logNameNamespace?: string | undefined; +}): Promise> { + const logNameNamespace = args.logNameNamespace === undefined + ? "" + : `${args.logNameNamespace}-`; + return runStructuredRole({ + role: "implementer", + schema: schemas.incrementReport, + logName: `role-implementer-${logNameNamespace}increment${args.increment}`, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store: args.store, + ...(args.runStart === undefined ? {} : { runStart: args.runStart }), + gitObjectAccess: args.gitObjectAccess, + }); +} + +export type ParsedReview = { reviewer: ReviewerKind; report: ReviewReport }; + +export type ReviewRunResult = + | { ok: true; reviews: ParsedReview[]; roleLogRefs: string[] } + | { ok: false; failedRoleLogRef: string; roleLogRefs: string[] }; + +export async function runReviews(args: { + reviewers: ReviewerKind[]; + spec: DelegationSpec; + pkg: RolePackage; + worktreePath: string; + deps: RoleExecutionDependencies; + runId: string; + round: number; + store: ArtifactStore; + logNameNamespace?: string | undefined; + onReviewer?: ((role: `reviewer-${ReviewerKind}`) => Promise) | undefined; +}): Promise { + const logNameNamespace = args.logNameNamespace === undefined + ? "" + : `${args.logNameNamespace}-`; + const outcomes = await Promise.all(args.reviewers.map(async reviewer => { + const role: PipelineRole = `reviewer-${reviewer}`; + await args.onReviewer?.(role as `reviewer-${ReviewerKind}`); + const outcome = await runStructuredRole({ + role, + schema: schemas.reviewReport, + logName: `role-${role}-${logNameNamespace}round${args.round}`, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store: args.store, + }); + return { + review: outcome.ok ? { reviewer, report: outcome.report } : null, + initialLogRef: outcome.ok ? null : outcome.failedRoleLogRef, + roleLogRefs: outcome.roleLogRefs, + }; + })); + const roleLogRefs = outcomes.flatMap(outcome => outcome.roleLogRefs); + const reviews = outcomes.map(outcome => outcome.review); + if (reviews.every((review): review is ParsedReview => review !== null)) { + return { ok: true, reviews, roleLogRefs }; + } + const failed = outcomes.find(outcome => outcome.review === null); + if (failed?.initialLogRef === null || failed === undefined) { + throw new Error("unreachable invalid review state"); + } + return { ok: false, failedRoleLogRef: failed.initialLogRef, roleLogRefs }; +} + +export type FixRunResult = + | { ok: true; fix: FixReport; roleLogRefs: string[] } + | StructuredRoleRunFailure; + +export async function runFix(args: { + spec: DelegationSpec; + pkg: RolePackage; + worktreePath: string; + deps: RoleExecutionDependencies; + runId: string; + round: number; + store: ArtifactStore; + gitObjectAccess: LinkedWorktreeGitAccess; + runStart?: RunStartContext | undefined; +}): Promise { + const outcome = await runStructuredRole({ + role: "fixer", + schema: schemas.fixReport, + logName: `role-fixer-round${args.round}`, + spec: args.spec, + pkg: args.pkg, + worktreePath: args.worktreePath, + deps: args.deps, + runId: args.runId, + store: args.store, + ...(args.runStart === undefined ? {} : { runStart: args.runStart }), + gitObjectAccess: args.gitObjectAccess, + }); + return outcome.ok + ? { ok: true, fix: outcome.report, roleLogRefs: outcome.roleLogRefs } + : outcome; +} diff --git a/src/pipeline/pipeline-runtime.ts b/src/pipeline/pipeline-runtime.ts index adcd427..686fd61 100644 --- a/src/pipeline/pipeline-runtime.ts +++ b/src/pipeline/pipeline-runtime.ts @@ -1,7 +1,9 @@ import path from "node:path"; import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; -import { WorktreeManager } from "../runtime/worktree-manager.js"; +import { WorktreeManager, cleanupWorktree } from "../runtime/worktree-manager.js"; import { PlatformSafety } from "../platform/platform-safety.js"; +import type { ProducerRuntime } from "../producers/producer-runtime.js"; +import type { RunDecision } from "../runtime/run-decision.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; import type { @@ -10,6 +12,7 @@ import type { CommandOutcome, FailureClassification, } from "../protocol/attempt-result.js"; +import type { PipelineGateCleared } from "../protocol/pipeline-gate-cleared.js"; import { resolveImplementationConfig, resolveReviewConfig, @@ -40,16 +43,14 @@ import { type RunStatusPhase, } from "../runtime/run-status.js"; import { RuntimeError } from "../util/errors.js"; -import { globMatches } from "../util/glob.js"; -import { AcceptanceVerifier } from "../verify/acceptance-verifier.js"; import { + isAllowed, recomputeManifest, structuralVerify, type StructuralFailure, } from "../verify/structural-verifier.js"; import { consolidate, detectNonConvergence, type ConsolidationResult } from "./consolidator.js"; import { evaluateGates, type GateResult, type IncrementOutcome } from "./gates.js"; -import { composeSliceOntoHead } from "./slice-composer.js"; import type { FixReport, IncrementReport, @@ -57,23 +58,64 @@ import type { VerificationReport, } from "./report-types.js"; import type { PipelineRole, RolePackage } from "./role-prompts.js"; +import type { RoleRunArgs, RoleRunResult } from "./role-runner.js"; import { - runSlicePhase, + SliceRunner, + SliceExecutionError, + findSliceExecutionError, + scopeSpecToSlice, + temporarySliceRef, + createTemporarySliceRef, + cleanupTemporarySliceRefs, + describePriorAttempts, + sliceTestEvidence, + testEvidence, + runSliceReview, type PipelineSlice, type SliceAttemptEvidence, + type SlicePhaseResult, + type TemporarySliceRef, + type ReviewConfig, } from "./slice-runner.js"; import { - runRole as defaultRunRole, - type RoleRunArgs, - type RoleRunResult, -} from "./role-runner.js"; -import { parseStructuredReport } from "./structured-output.js"; + verifyCandidate, + detectWeakenedTests, + analyzeWeakenedTests, + parseDeletedPaths, +} from "./candidate-verifier.js"; +import { + importPromotedObjects, + validateCandidateProvenance, + validateFixProvenance, + privateObjectReadOptions, +} from "./candidate-provenance.js"; +import { + runStructuredRole, + runIncrement, + runReviews, + runFix, + roleArgs, +} from "./pipeline-roles.js"; +import { + createRunContext, + type RunContext, +} from "./run-context.js"; import { resolveLinkedWorktreeWritableRoots, type LinkedWorktreeGitAccess, } from "./git-writable-roots.js"; import { runAdvisorStage as bundledAdvisorStage } from "./advisor-stage.js"; +export { + scopeSpecToSlice, + runIncrement, + runReviews, + verifyCandidate, + detectWeakenedTests, + SliceRunner, + type ReviewConfig, +}; + export interface PipelineRound { round: number; reviews: { reviewer: string; report: ReviewReport }[]; @@ -100,6 +142,7 @@ export interface PipelineResult { gate: GateResult; finalCandidateCommit: string; failure?: FailureClassification | null; + pipelineGateCleared?: PipelineGateCleared | null; } export interface PipelineVerificationEvidence { @@ -116,6 +159,13 @@ export interface PipelineVerificationReport extends VerificationReport { export interface PipelineDependencies extends AttemptRuntimeDependencies { registry: ProducerRegistry; roleRunner?: (args: RoleRunArgs) => Promise; + // SliceRunner seams. Every production caller omits them so the runner binds + // its own singletons; a test supplies one to observe a single subsystem + // without standing up the rest. + producerRuntime?: ProducerRuntime | undefined; + runDecision?: RunDecision | undefined; + platformSafety?: PlatformSafety | undefined; + runRole?: ((args: RoleRunArgs) => Promise) | undefined; runAttempt?: ( checkoutPath: string, spec: DelegationSpec, @@ -123,79 +173,10 @@ export interface PipelineDependencies extends AttemptRuntimeDependencies { ) => Promise; } -interface ParsedReview { - reviewer: ReviewerKind; - report: ReviewReport; -} - -type ReviewRunResult = - | { ok: true; reviews: ParsedReview[]; roleLogRefs: string[] } - | { ok: false; failedRoleLogRef: string; roleLogRefs: string[] }; - -type FixRunResult = - | { ok: true; fix: FixReport; roleLogRefs: string[] } - | { - ok: false; - failure: FailureClassification; - failedRoleLogRef: string; - roleLogRefs: string[]; - }; - -export type StructuredRoleRunResult = - | { ok: true; report: T; roleLogRefs: string[] } - | { - ok: false; - failure: FailureClassification; - failedRoleLogRef: string; - roleLogRefs: string[]; - }; - const schemas = loadSchemas(); -// `base-changed` used to be ignored here because it fired on shared-checkout -// drift that a slice cannot control — but that also suppressed the same code's -// legitimate half, an artifact not matching its own base. Drift is no longer a -// failure at all, so only the genuinely slice-specific exemption remains. -const IGNORED_STRUCTURAL_FAILURES = new Set([ - "artifact-divergence", -]); const CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; -const SLICE_REF_PREFIX = "refs/claude-architect/slices/"; - -interface TemporarySliceRef { - ref: string; - oid: string; -} -/** - * Bounded, human-readable summary of earlier slice attempts for the next - * implementer. Carries the routing reason and the failing verification command - * ids — enough to avoid repeating the approach — without replaying whole logs. - */ -function describePriorAttempts( - attempts: readonly SliceAttemptEvidence[], -): string { - return attempts.map(entry => { - const failed = (entry.verification?.commandResults ?? []) - .filter(command => !command.ok) - .map(command => `${command.id} (exit ${String(command.exitCode)})`); - const blocking = (entry.perSliceReview?.findings ?? []) - .filter(finding => finding.severity === "blocker" || finding.severity === "major") - .map(finding => `${finding.severity} at ${finding.location}: ${finding.claim}`); - return [ - `attempt ${entry.attempt} -> ${entry.route}`, - ` reasons: ${entry.reasons.join("; ") || "(none recorded)"}`, - ...(failed.length === 0 ? [] : [` failing verification: ${failed.join(", ")}`]), - ...(blocking.length === 0 ? [] : [` blocking findings:\n ${blocking.join("\n ")}`]), - ].join("\n"); - }).join("\n\n"); -} - -export function scopeSpecToSlice(spec: DelegationSpec, slice: Slice): DelegationSpec { - const scoped = structuredClone({ ...spec, ...slice }); - delete scoped.slices; - return scoped; -} function gitFailure(action: string, result: GitResult): RuntimeError { const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); @@ -212,182 +193,7 @@ async function checkedGit( return result.stdout; } -function temporarySliceRef(runId: string, index: number, attempt: number): string { - return `${SLICE_REF_PREFIX}${runId}/slice-${index}-attempt-${attempt}`; -} - -async function createTemporarySliceRef( - checkoutPath: string, - temporaryRef: TemporarySliceRef, -): Promise { - const result = await git(checkoutPath, [ - "update-ref", - "--no-deref", - temporaryRef.ref, - temporaryRef.oid, - "0".repeat(temporaryRef.oid.length), - ]); - if (result.exitCode !== 0) throw gitFailure("create temporary slice ref", result); -} - -async function cleanupTemporarySliceRefs( - checkoutPath: string, - temporaryRefs: TemporarySliceRef[], -): Promise { - const errors: unknown[] = []; - for (const temporaryRef of [...temporaryRefs].reverse()) { - try { - const result = await git(checkoutPath, [ - "update-ref", - "--no-deref", - "-d", - temporaryRef.ref, - temporaryRef.oid, - ]); - if (result.exitCode !== 0) { - errors.push(gitFailure("delete temporary slice ref", result)); - } - } catch (error) { - errors.push(error); - } - } - return errors; -} - -function privateObjectReadOptions(access: LinkedWorktreeGitAccess): GitExecOptions { - return { - env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: access.privateObjectsDir }, - }; -} -async function importPromotedObjects(args: { - checkoutPath: string; - baselineCommit: string; - promotedCommit: string; - access: LinkedWorktreeGitAccess; -}): Promise { - const privateObjects = privateObjectReadOptions(args.access); - const packPrefix = path.join(args.access.sharedObjectsDir, "pack", "pack"); - await checkedGit( - args.checkoutPath, - ["pack-objects", "--revs", packPrefix], - { - ...privateObjects, - stdin: `${args.promotedCommit}\n^${args.baselineCommit}\n`, - }, - ); - - await checkedGit(args.checkoutPath, ["cat-file", "-e", `${args.promotedCommit}^{commit}`]); - await checkedGit(args.checkoutPath, ["rev-parse", `${args.promotedCommit}^{tree}`]); - await checkedGit(args.checkoutPath, [ - "rev-list", - "--objects", - args.promotedCommit, - "--not", - args.baselineCommit, - ]); -} - -function roleArgs(args: { - role: PipelineRole; - spec: DelegationSpec; - pkg: RolePackage; - worktreePath: string; - deps: PipelineDependencies; - runId: string; - runStart?: RunStartContext; - gitObjectAccess?: LinkedWorktreeGitAccess; -}): RoleRunArgs { - const ps = args.deps.ps ?? getPlatformServices(); - return { - role: args.role, - baseSpec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - ps, - registry: args.deps.registry, - runId: args.runId, - ...(args.runStart === undefined ? {} : { runStart: args.runStart }), - ...(args.gitObjectAccess === undefined ? {} : { gitObjectAccess: args.gitObjectAccess }), - ...(args.deps.env === undefined ? {} : { env: args.deps.env }), - ...(args.deps.abortSignal === undefined ? {} : { abortSignal: args.deps.abortSignal }), - }; -} - -async function runArchivedRole( - runner: (args: RoleRunArgs) => Promise, - args: RoleRunArgs, - store: Pick, - logName: string, -): Promise<{ result: RoleRunResult; logRef: string }> { - const result = await runner(args); - const output = result.rawOutput === "" - ? `role produced no stdout; failure: ${result.failure ?? "none"}\n` - : result.archiveSafeRawOutput ?? result.rawOutput; - const logRef = await store.writeLog(logName, output); - return { result, logRef }; -} - -export async function runStructuredRole(args: { - role: PipelineRole; - schema: Parameters[1]; - logName: string; - spec: DelegationSpec; - pkg: RolePackage; - worktreePath: string; - deps: PipelineDependencies; - runId: string; - store: Pick; - runStart?: RunStartContext; - gitObjectAccess?: LinkedWorktreeGitAccess; -}): Promise> { - const runner = args.deps.roleRunner ?? defaultRunRole; - const callArgs = roleArgs({ - role: args.role, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - ...(args.runStart === undefined ? {} : { runStart: args.runStart }), - ...(args.gitObjectAccess === undefined ? {} : { gitObjectAccess: args.gitObjectAccess }), - }); - const initial = await runArchivedRole(runner, callArgs, args.store, args.logName); - const roleLogRefs = [initial.logRef]; - if (!initial.result.ok) { - return { - ok: false, - failure: initial.result.failure ?? "producer-failure", - failedRoleLogRef: initial.logRef, - roleLogRefs, - }; - } - const outcome = await parseStructuredReport( - initial.result.rawOutput, - args.schema, - async validationErrors => { - // Re-running with the identical arguments is a blind retry: the Producer - // cannot see why its reply was rejected, so it reproduces the defect and - // the round is spent for nothing. Carry the errors into the retry. - const repair = await runArchivedRole( - runner, - { ...callArgs, pkg: { ...callArgs.pkg, outputRepair: validationErrors } }, - args.store, - `${args.logName}-repair`, - ); - roleLogRefs.push(repair.logRef); - return repair.result.ok ? repair.result.rawOutput : ""; - }, - ); - return outcome.ok - ? { ok: true, report: outcome.value, roleLogRefs } - : { - ok: false, - failure: "invalid-output", - failedRoleLogRef: initial.logRef, - roleLogRefs, - }; -} function failedResult( attempt: AttemptResult, @@ -439,13 +245,6 @@ export function composeProgressNotes( )}${PROGRESS_TRUNCATION_NOTE}`; } -function testEvidence(attempt: AttemptResult): string { - return JSON.stringify(attempt.executedVerification.map(outcome => ({ - id: outcome.id, - exitCode: outcome.exitCode, - timedOut: outcome.timedOut, - }))); -} function attemptLogRefs(attempt: AttemptResult): string[] { return [...new Set([ @@ -454,39 +253,6 @@ function attemptLogRefs(attempt: AttemptResult): string[] { ])]; } -function verificationTestEvidence(verification: VerificationReport): Record { - return { - pass: verification.pass, - commandResults: verification.commandResults.map(command => ({ ...command })), - workspaceClean: verification.workspaceClean, - testsDeleted: verification.testsDeleted, - testsSkipped: verification.testsSkipped, - scopeViolations: [...verification.scopeViolations], - }; -} - -function sliceTestEvidence(slices: PipelineSlice[]): string { - return JSON.stringify(slices.map(slice => ({ - sliceIndex: slice.index, - verification: slice.verification === null - ? null - : verificationTestEvidence(slice.verification), - attempts: slice.attempts.map(attempt => ({ - attempt: attempt.attempt, - verification: attempt.verification === null - ? null - : verificationTestEvidence(attempt.verification), - })), - }))); -} - -class SliceExecutionError extends RuntimeError { - constructor(message: string, readonly failure: FailureClassification) { - super(message); - this.name = "SliceExecutionError"; - } -} - class SlicedFailureArchiveError extends RuntimeError { constructor(readonly cause: unknown) { super(cause instanceof Error ? cause.message : "sliced failure archival failed"); @@ -494,15 +260,6 @@ class SlicedFailureArchiveError extends RuntimeError { } } -function findSliceExecutionError(error: unknown): SliceExecutionError | null { - if (error instanceof SliceExecutionError) return error; - if (!(error instanceof AggregateError)) return null; - for (const nested of error.errors) { - const found = findSliceExecutionError(nested); - if (found !== null) return found; - } - return null; -} function containsSlicedFailureArchiveError(error: unknown): boolean { if (error instanceof SlicedFailureArchiveError) return true; @@ -591,68 +348,6 @@ async function archiveSliceExecutionError(args: { } } -/** - * Removal itself retries and falls back inside WorktreeManager. What matters - * here is the disposition: a worktree that still cannot be removed is reported, - * never substituted for the outcome of the work it held. The Producer's process - * tree is already terminated by `supervise` before this runs. - */ -async function cleanupWorktree( - worktree: { path: string; cleanup(): Promise }, -): Promise { - try { - await worktree.cleanup(); - return null; - } catch (error) { - return error; - } -} - -/** - * `git worktree add` mutates shared repository state, so concurrent slices are - * given their worktrees one at a time even though their Producers then run in - * parallel. Creation is a fraction of a slice's runtime; a lock collision costs - * the whole attempt. - */ -let worktreeCreation: Promise = Promise.resolve(); - -function createWorktreeSerially( - manager: WorktreeManager, - commit: string, -): Promise<{ path: string; cleanup(): Promise }> { - const created = worktreeCreation - .catch(() => {}) - .then(async () => manager.create(commit)); - worktreeCreation = created.catch(() => {}); - return created; -} - -async function withManagedWorktree(args: { - manager: WorktreeManager; - commit: string; - cleanupFailureMessage: string; - run: (worktreePath: string) => Promise; - onCleanupFailure?: (error: unknown) => void; -}): Promise { - const worktree = await createWorktreeSerially(args.manager, args.commit); - try { - return await args.run(worktree.path); - } finally { - // A cleanup failure must stay visible without erasing the primary outcome. - // Replacing a graceful slice timeout with a hard runtime error loses the - // whole slice result and the salvage that goes with it. - const cleanupError = await cleanupWorktree(worktree); - if (cleanupError !== null) { - logger.warn(args.cleanupFailureMessage, { - error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)), - }); - args.onCleanupFailure?.(cleanupError); - } - } -} - - - async function candidateArtifact(args: { worktreePath: string; baselineCommit: string; @@ -752,511 +447,7 @@ async function promoteFinalCandidate(args: { return { attempt: finalAttempt, candidateCommit: canonicalCommit }; } -interface WeakenedTestEvidence { - testsDeleted: number; - testsSkipped: number; - authorizedTestDeletions: string[]; -} - -function analyzeWeakenedTests( - diff: string, - allowedTestDeletions: string[] = [], - deletedPaths?: string[], -): WeakenedTestEvidence { - let testsDeleted = 0; - let testsSkipped = 0; - const authorizedTestDeletions: string[] = []; - let currentFileIsTest = false; - let currentPath: string | null = null; - for (const line of diff.split("\n")) { - if (deletedPaths === undefined && /^deleted file mode/.test(line)) { - if (currentFileIsTest && currentPath !== null) { - const deletedPath = currentPath; - if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } - } - } - const diffHeader = /^diff --git a\/(\S+) b\/\S+$/.exec(line); - if (diffHeader !== null) { - currentPath = diffHeader[1] ?? null; - currentFileIsTest = currentPath !== null - && /(^|\/)tests?\/|\.test\.|\.spec\./.test(currentPath); - } else if (/^diff --git /.test(line)) { - currentPath = null; - currentFileIsTest = /(^|\/)tests?\/|\.test\.|\.spec\./.test(line); - } - if (currentFileIsTest && /^\+.*\b(it|test|describe)\.(skip|todo)\(/.test(line)) testsSkipped++; - if (currentFileIsTest && /^\+.*\bxit\(|^\+.*\bxdescribe\(/.test(line)) testsSkipped++; - } - for (const deletedPath of deletedPaths ?? []) { - if (!/(^|\/)tests?\/|\.test\.|\.spec\./.test(deletedPath)) continue; - if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } - } - return { testsDeleted, testsSkipped, authorizedTestDeletions }; -} - -export function detectWeakenedTests( - diff: string, - allowedTestDeletions: string[] = [], - deletedPaths?: string[], -): { testsDeleted: number; testsSkipped: number } { - const { testsDeleted, testsSkipped } = analyzeWeakenedTests( - diff, - allowedTestDeletions, - deletedPaths, - ); - return { testsDeleted, testsSkipped }; -} - -function parseDeletedPaths(nameStatus: string): string[] { - const fields = nameStatus.split("\0"); - const deletedPaths: string[] = []; - for (let index = 0; index < fields.length; index += 1) { - const entry = fields[index] ?? ""; - if (entry === "D") { - const pathname = fields[index + 1]; - if (pathname !== undefined && pathname !== "") deletedPaths.push(pathname); - index += 1; - continue; - } - const separator = entry.indexOf("\t"); - if (separator >= 0 && entry.slice(0, separator) === "D") { - deletedPaths.push(entry.slice(separator + 1)); - } - } - return deletedPaths; -} -export async function runReviews(args: { - reviewers: ReviewerKind[]; - spec: DelegationSpec; - pkg: RolePackage; - worktreePath: string; - deps: PipelineDependencies; - runId: string; - round: number; - store: ArtifactStore; - logNameNamespace?: string; - onReviewer?: (role: `reviewer-${ReviewerKind}`) => Promise; -}): Promise { - const logNameNamespace = args.logNameNamespace === undefined - ? "" - : `${args.logNameNamespace}-`; - const outcomes = await Promise.all(args.reviewers.map(async reviewer => { - const role = `reviewer-${reviewer}` as const; - await args.onReviewer?.(role); - const outcome = await runStructuredRole({ - role, - schema: schemas.reviewReport, - logName: `role-${role}-${logNameNamespace}round${args.round}`, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store: args.store, - }); - return { - review: outcome.ok ? { reviewer, report: outcome.report } : null, - initialLogRef: outcome.ok ? null : outcome.failedRoleLogRef, - roleLogRefs: outcome.roleLogRefs, - }; - })); - const roleLogRefs = outcomes.flatMap(outcome => outcome.roleLogRefs); - const reviews = outcomes.map(outcome => outcome.review); - if (reviews.every((review): review is ParsedReview => review !== null)) { - return { ok: true, reviews, roleLogRefs }; - } - const failed = outcomes.find(outcome => outcome.review === null); - if (failed?.initialLogRef === null || failed === undefined) { - throw new Error("unreachable invalid review state"); - } - return { ok: false, failedRoleLogRef: failed.initialLogRef, roleLogRefs }; -} - -async function runSliceReview(args: { - checkoutPath: string; - spec: DelegationSpec; - deps: PipelineDependencies; - runId: string; - baselineCommit: string; - candidateCommit: string; - namespace: string; - reviewers: ReviewerKind[]; - verification: PipelineVerificationReport; - store: ArtifactStore; -}): Promise<{ review: ConsolidationResult; roleLogRefs: string[] }> { - const ps = args.deps.ps ?? getPlatformServices(); - return withManagedWorktree({ - manager: new WorktreeManager( - args.checkoutPath, - `${args.runId}-${args.namespace}-review`, - ps, - args.deps.borrowedCheckoutLease === undefined - ? {} - : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }, - ), - commit: args.candidateCommit, - cleanupFailureMessage: "slice review failed and its worktree could not be cleaned up", - run: async worktreePath => { - const diffText = await checkedGit(worktreePath, [ - "diff", - `${args.baselineCommit}..${args.candidateCommit}`, - ]); - const reviewRun = await runReviews({ - reviewers: args.reviewers, - spec: args.spec, - pkg: { - spec: args.spec, - baselineCommit: args.baselineCommit, - candidateCommit: args.candidateCommit, - candidateDiff: diffText, - testEvidence: JSON.stringify(verificationTestEvidence(args.verification)), - }, - worktreePath, - deps: args.deps, - runId: args.runId, - round: 1, - store: args.store, - logNameNamespace: args.namespace, - }); - if (!reviewRun.ok) { - throw new SliceExecutionError( - `slice review did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, - "producer-failure", - ); - } - return { - review: consolidate(reviewRun.reviews.map(review => ({ - reviewer: review.reviewer, - report: review.report, - }))), - roleLogRefs: reviewRun.roleLogRefs, - }; - }, - }); -} - -async function runFix(args: { - spec: DelegationSpec; - pkg: RolePackage; - worktreePath: string; - deps: PipelineDependencies; - runId: string; - round: number; - store: ArtifactStore; - gitObjectAccess: LinkedWorktreeGitAccess; - runStart?: RunStartContext; -}): Promise { - const outcome = await runStructuredRole({ - role: "fixer", - schema: schemas.fixReport, - logName: `role-fixer-round${args.round}`, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store: args.store, - ...(args.runStart === undefined ? {} : { runStart: args.runStart }), - gitObjectAccess: args.gitObjectAccess, - }); - return outcome.ok - ? { ok: true, fix: outcome.report, roleLogRefs: outcome.roleLogRefs } - : outcome; -} - -export async function runIncrement(args: { - spec: DelegationSpec; - pkg: RolePackage; - worktreePath: string; - deps: PipelineDependencies; - runId: string; - increment: number; - store: ArtifactStore; - gitObjectAccess: LinkedWorktreeGitAccess; - runStart?: RunStartContext; - logNameNamespace?: string; -}): Promise> { - const logNameNamespace = args.logNameNamespace === undefined - ? "" - : `${args.logNameNamespace}-`; - return runStructuredRole({ - role: "implementer", - schema: schemas.incrementReport, - logName: `role-implementer-${logNameNamespace}increment${args.increment}`, - spec: args.spec, - pkg: args.pkg, - worktreePath: args.worktreePath, - deps: args.deps, - runId: args.runId, - store: args.store, - ...(args.runStart === undefined ? {} : { runStart: args.runStart }), - gitObjectAccess: args.gitObjectAccess, - }); -} - -interface CandidateProvenanceFailure { - failure: FailureClassification; - reason: string; -} - -async function validateCandidateProvenance(args: { - worktreePath: string; - previousCandidateCommit: string; - candidateCommit: string; - gitObjectAccess: LinkedWorktreeGitAccess; - phaseLabel?: string; -}): Promise { - const phaseLabel = args.phaseLabel ?? "fix phase"; - const privateObjects = privateObjectReadOptions(args.gitObjectAccess); - const candidateObject = await git(args.worktreePath, [ - "cat-file", - "-e", - `${args.candidateCommit}^{commit}`, - ], privateObjects); - if (candidateObject.exitCode !== 0) { - return { - failure: "producer-failure", - reason: `${phaseLabel} reported a missing candidate commit`, - }; - } - - const head = await git( - args.worktreePath, - ["rev-parse", "--verify", "HEAD^{commit}"], - privateObjects, - ); - if (head.exitCode !== 0 || head.stdout.trim() !== args.candidateCommit) { - return { - failure: "producer-failure", - reason: `${phaseLabel} reported a candidate commit that does not match its worktree HEAD`, - }; - } - - const candidateAncestry = await git(args.worktreePath, [ - "merge-base", - "--is-ancestor", - args.previousCandidateCommit, - args.candidateCommit, - ], privateObjects); - if (candidateAncestry.exitCode !== 0) { - return { - failure: "sandbox-violation", - reason: `${phaseLabel} candidate commit is not descended from the reviewed candidate`, - }; - } - - const worktreeStatus = await git(args.worktreePath, [ - "status", - "--porcelain", - "--untracked-files=all", - ], privateObjects); - if (worktreeStatus.exitCode !== 0) { - return { - failure: "sandbox-violation", - reason: `${phaseLabel} candidate worktree cleanliness could not be verified`, - }; - } - if (worktreeStatus.stdout.length > 0) { - return { - failure: "sandbox-violation", - reason: `${phaseLabel} candidate worktree contains uncommitted state`, - }; - } - - return null; -} - -async function validateFixProvenance(args: { - worktreePath: string; - previousCandidateCommit: string; - fix: FixReport; - gitObjectAccess: LinkedWorktreeGitAccess; -}): Promise { - const provenanceFailure = await validateCandidateProvenance({ - worktreePath: args.worktreePath, - previousCandidateCommit: args.previousCandidateCommit, - candidateCommit: args.fix.candidateCommit, - gitObjectAccess: args.gitObjectAccess, - }); - if (provenanceFailure !== null) return provenanceFailure; - - const privateObjects = privateObjectReadOptions(args.gitObjectAccess); - const dispositionCommits = new Set(args.fix.dispositions.flatMap(disposition => - disposition.commit === undefined ? [] : [disposition.commit])); - for (const dispositionCommit of dispositionCommits) { - const object = await git(args.worktreePath, [ - "cat-file", - "-e", - `${dispositionCommit}^{commit}`, - ], privateObjects); - if (object.exitCode !== 0) { - return { - failure: "producer-failure", - reason: "fix phase disposition reported a missing commit object", - }; - } - const [afterPrevious, beforeCandidate] = await Promise.all([ - git(args.worktreePath, [ - "merge-base", - "--is-ancestor", - args.previousCandidateCommit, - dispositionCommit, - ], privateObjects), - git(args.worktreePath, [ - "merge-base", - "--is-ancestor", - dispositionCommit, - args.fix.candidateCommit, - ], privateObjects), - ]); - if (afterPrevious.exitCode !== 0 || beforeCandidate.exitCode !== 0) { - return { - failure: "producer-failure", - reason: "fix phase disposition commit is outside the produced candidate lineage", - }; - } - } - return null; -} - -export async function verifyCandidate(args: { - checkoutPath: string; - spec: DelegationSpec; - deps: PipelineDependencies; - attempt: AttemptResult; - baselineCommit: string; - candidateCommit: string; - store: ArtifactStore; - namespace?: string; -}): Promise<{ verification: PipelineVerificationReport; baselineDrift: boolean }> { - const ps = args.deps.ps ?? getPlatformServices(); - const namespace = args.namespace === undefined ? "" : `${args.namespace}-`; - const manager = new WorktreeManager( - args.checkoutPath, - `${args.attempt.runId}-${namespace}verify`, - ps, - args.deps.borrowedCheckoutLease === undefined - ? {} - : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }, - ); - const fresh = await manager.create(args.candidateCommit); - try { - const [diffText, nameOnly, nameStatus, status, ancestry] = await Promise.all([ - checkedGit(fresh.path, ["diff", `${args.baselineCommit}..${args.candidateCommit}`]), - checkedGit(fresh.path, [ - "diff", - "--name-only", - `${args.baselineCommit}..${args.candidateCommit}`, - ]), - checkedGit(fresh.path, [ - "diff", - "--name-status", - "--no-renames", - "-z", - `${args.baselineCommit}..${args.candidateCommit}`, - ]), - checkedGit(fresh.path, ["status", "--porcelain"]), - git(fresh.path, [ - "merge-base", - "--is-ancestor", - args.baselineCommit, - args.candidateCommit, - ]), - ]); - const artifact = await candidateArtifact({ - worktreePath: fresh.path, - baselineCommit: args.baselineCommit, - candidateCommit: args.candidateCommit, - anchorRef: args.attempt.candidate?.anchorRef ?? "", - diffText, - }); - const verifier = new AcceptanceVerifier({ - structural: async structuralArgs => { - const result = await structuralVerify(structuralArgs); - const failures = result.failures.filter( - failure => !IGNORED_STRUCTURAL_FAILURES.has(failure), - ); - return { ...result, ok: failures.length === 0, failures }; - }, - }); - const acceptance = await verifier.verify({ - repoRoot: args.checkoutPath, - worktreePath: fresh.path, - baseCommitOid: args.baselineCommit, - artifact, - spec: args.spec, - ps, - artifactStore: args.store, - ...(args.deps.borrowedCheckoutLease === undefined - ? {} - : { borrowedCheckoutLease: args.deps.borrowedCheckoutLease }), - verificationId: () => `${args.attempt.runId}-${namespace}pipeline`, - logNamePrefix: `${namespace}pipeline-verification`, - }); - const changedPaths = nameOnly.split("\n").map(line => line.trim()).filter(Boolean); - const scopeViolations = changedPaths.filter(pathname => - !args.spec.writeAllowlist.some(pattern => globMatches(pattern, pathname)) - || args.spec.forbiddenScope.some(pattern => globMatches(pattern, pathname))); - const weakened = analyzeWeakenedTests( - diffText, - args.spec.allowedTestDeletions, - parseDeletedPaths(nameStatus), - ); - const workspaceClean = status === ""; - const verificationCommands = new Map( - args.spec.verification.map(command => [command.id, command]), - ); - return { - verification: { - reportVersion: "1", - pass: acceptance.ok - && workspaceClean - && scopeViolations.length === 0, - commandResults: acceptance.commandOutcomes.map(command => ({ - id: command.id, - exitCode: command.exitCode ?? -1, - ok: command.exitCode !== null - && !command.timedOut - && (verificationCommands.get(command.id)?.expectedExitCodes.includes( - command.exitCode, - ) ?? false), - })), - workspaceClean, - testsDeleted: weakened.testsDeleted, - testsSkipped: weakened.testsSkipped, - scopeViolations, - evidence: { - failures: [...acceptance.failures], - acceptance: acceptance.evidence, - commandOutcomes: acceptance.commandOutcomes.map(outcome => ({ - ...outcome, - args: [...outcome.args], - })), - ...(args.spec.allowedTestDeletions === undefined - ? {} - : { authorizedTestDeletions: [...weakened.authorizedTestDeletions] }), - }, - }, - baselineDrift: ancestry.exitCode !== 0, - }; - } finally { - const cleanupError = await cleanupWorktree(fresh); - if (cleanupError !== null) { - logger.warn("pipeline verification worktree could not be cleaned up", { - error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)), - }); - } - } -} export async function runPipeline( checkoutPath: string, @@ -1406,6 +597,19 @@ async function runPipelineWithLease( }); const store = new ArtifactStore(attempt.runId); await store.writePipelineArtifact("delegation-spec", spec); + // Run-scoped facts travel as one value from here down, so no slice reaches + // back into this function's closure for them. + const runContext: RunContext = createRunContext({ + runId: attempt.runId, + checkoutPath, + spec, + store, + ps, + borrowedCheckoutLease, + ...(runStart === undefined ? {} : { runStart }), + ...(inheritedOnPhase === undefined ? {} : { onPhase: inheritedOnPhase }), + sliceCount: slices.length > 0 ? slices.length : null, + }); if (attempt.status !== "verified-candidate" || attempt.candidate === null) { if (slicedMarkerEstablished) await store.clearPipelineActiveMarker(); // Propagate the attempt's own classification (e.g. verification-failure for a @@ -1636,6 +840,7 @@ async function runPipelineWithLease( reviewers, verification: initialVerification.verification, store, + borrowedCheckoutLease, }); } catch (error) { const archived = await archiveSliceExecutionError({ @@ -1663,175 +868,35 @@ async function runPipelineWithLease( } const completedSlices: PipelineSlice[] = []; - let phase: Awaited>; + let phase: SlicePhaseResult; try { - phase = await runSlicePhase(slices, baselineCommit, { - maxRounds, + const sliceRunner = new SliceRunner({ + producerRuntime: deps.producerRuntime, + runDecision: deps.runDecision, + platformSafety: deps.platformSafety, + ps, + runRole: deps.runRole, + roleRunner: deps.roleRunner, + }); + phase = await sliceRunner.run({ + context: runContext, + slices, + baselineCommit, + attempt, + budgets: { maxRounds }, concurrency: resolveSliceConcurrency(spec), - composeSlice: async composeArgs => composeSliceOntoHead({ - checkoutPath, - runId: attempt.runId, - ...composeArgs, - }), initialAttempt: { candidateCommit: currentCandidateCommit, verification: initialVerification.verification, perSliceReview: initialPerSliceReview, roleLogRefs: initialRoleLogRefs, }, - runSlice: async (slice, index, base, sliceAttempt, priorAttempts) => { - const namespace = `slice-${index}-attempt-${sliceAttempt}`; - const scopedSpec = scopeSpecToSlice(spec, slice); - return withManagedWorktree({ - manager: new WorktreeManager( - checkoutPath, - `${attempt.runId}-${namespace}`, - ps, - deps.borrowedCheckoutLease === undefined - ? {} - : { borrowedCheckoutLease: deps.borrowedCheckoutLease }, - ), - commit: base, - cleanupFailureMessage: - "slice implementation failed and its worktree could not be cleaned up", - run: async worktreePath => { - let gitObjectAccess: LinkedWorktreeGitAccess; - try { - gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); - } catch { - throw new SliceExecutionError( - "slice implementer git object isolation could not be established", - "sandbox-violation", - ); - } - await emitPipelineStatus("implementing", { - sliceIndex: index, - role: "implementer", - }); - const incrementRun = await runIncrement({ - spec: scopedSpec, - pkg: { - spec: scopedSpec, - baselineCommit: base, - candidateCommit: base, - candidateDiff: "", - testEvidence: completedSlices.length === 0 - ? testEvidence(attempt) - : sliceTestEvidence(completedSlices), - // A repair that cannot see why the last attempt was rejected - // reproduces it. Bounded and redacted like any prompt data. - ...(priorAttempts === undefined || priorAttempts.length === 0 - ? {} - : { priorAttempts: describePriorAttempts(priorAttempts) }), - }, - worktreePath, - deps, - runId: attempt.runId, - increment: sliceAttempt + 1, - store, - gitObjectAccess, - ...(runStart === undefined ? {} : { runStart }), - logNameNamespace: namespace, - }); - if (!incrementRun.ok) { - throw new SliceExecutionError( - `slice implementer did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, - incrementRun.failure, - ); - } - - await emitPipelineStatus("freezing", { - sliceIndex: index, - role: "implementer", - }); - const candidateCommit = incrementRun.report.candidateCommit; - const provenanceFailure = await validateCandidateProvenance({ - worktreePath, - previousCandidateCommit: base, - candidateCommit, - gitObjectAccess, - phaseLabel: "slice implementer", - }); - if (provenanceFailure !== null) { - throw new SliceExecutionError( - provenanceFailure.reason, - provenanceFailure.failure, - ); - } - if (candidateCommit !== base) { - try { - await importPromotedObjects({ - checkoutPath, - baselineCommit: base, - promotedCommit: candidateCommit, - access: gitObjectAccess, - }); - } catch { - throw new SliceExecutionError( - "slice candidate objects could not be imported into the shared git object store", - "sandbox-violation", - ); - } - const temporaryRef = { - ref: temporarySliceRef(attempt.runId, index, sliceAttempt), - oid: candidateCommit, - }; - try { - await createTemporarySliceRef(checkoutPath, temporaryRef); - } catch { - throw new SliceExecutionError( - "slice candidate temporary ref could not be established", - "sandbox-violation", - ); - } - temporarySliceRefs.push(temporaryRef); - } - - await emitPipelineStatus("verifying", { sliceIndex: index }); - const verified = await verifyCandidate({ - checkoutPath, - spec: scopedSpec, - deps, - attempt, - baselineCommit: base, - candidateCommit, - store, - namespace, - }); - let perSliceReview: ConsolidationResult | null = null; - const roleLogRefs = [...incrementRun.roleLogRefs]; - if (reviewConfig.perSlice === true) { - const reviewed = await runSliceReview({ - checkoutPath, - spec: scopedSpec, - deps, - runId: attempt.runId, - baselineCommit: base, - candidateCommit, - namespace, - reviewers, - verification: verified.verification, - store, - }); - perSliceReview = reviewed.review; - roleLogRefs.push(...reviewed.roleLogRefs); - } - return { - candidateCommit, - verification: verified.verification, - perSliceReview, - roleLogRefs, - }; - }, - }); - }, - onAttempt: evidence => store.writePipelineArtifact( - `slice-${evidence.sliceIndex}-attempt-${evidence.attempt}`, - evidence, - ), + reviewConfig, + reviewers, + registry: deps.registry, + abortSignal: deps.abortSignal, onSlice: async slice => { - await store.writePipelineArtifact(`slice-${slice.index}`, slice); - completedSlices.push(structuredClone(slice)); + completedSlices.push(slice); }, }); } catch (error) { @@ -1857,6 +922,10 @@ async function runPipelineWithLease( return failed; } pipelineSlices = phase.slices; + // The runner hands its refs over rather than dropping them: the final + // review round still resolves them, and this function's `finally` is the + // single place they are deleted. + temporarySliceRefs.push(...(phase.temporarySliceRefs ?? [])); currentCandidateCommit = phase.finalCandidateCommit; if (phase.haltedSliceIndex !== null) { const halted = phase.slices.at(-1); @@ -2366,7 +1435,17 @@ async function runPipelineWithLease( }, }, }; - } else { + } + // One clearance record, built once. Constructing it a second time for the + // returned result gave the archive and the caller two different `clearedAt` + // values for the same clearance, which no reader of only one could detect. + const gateClearedRecord: PipelineGateCleared | null = !gate.decisionReady ? null : { + clearedVersion: "1", + candidateCommitOid: currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision, + clearedAt: new Date().toISOString(), + }; + if (gateClearedRecord !== null) { finalAttempt = { ...finalAttempt, evidence: { @@ -2377,6 +1456,7 @@ async function runPipelineWithLease( }, }, }; + await store.writePipelineGateCleared(gateClearedRecord); } await store.promoteTerminalArtifacts({ result: finalAttempt, @@ -2394,6 +1474,7 @@ async function runPipelineWithLease( gate, finalCandidateCommit: currentCandidateCommit, failure: null, + pipelineGateCleared: gateClearedRecord, }; await store.writePipelineArtifact("pipeline-result", result); // The terminal done/failed status is written by `runPipeline` while it still diff --git a/src/pipeline/run-context.ts b/src/pipeline/run-context.ts new file mode 100644 index 0000000..10de2bd --- /dev/null +++ b/src/pipeline/run-context.ts @@ -0,0 +1,82 @@ +import type { DelegationSpec } from "../protocol/delegation-spec.js"; +import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; +import type { ArtifactStore } from "../runtime/artifact-store.js"; +import type { RunStartContext } from "../runtime/run-start.js"; +import { + transitionRunStatusSafely, + type RunStatusPhase, +} from "../runtime/run-status.js"; + +export interface RunStatusFields { + sliceIndex?: number | null | undefined; + sliceCount?: number | null | undefined; + round?: number | null | undefined; + role?: string | null | undefined; + producerId?: string | null | undefined; + detail?: string | null | undefined; +} + +export interface RunContext { + readonly runId: string; + readonly checkoutPath: string; + readonly spec: DelegationSpec; + readonly store: ArtifactStore; + readonly ps: PlatformServices; + readonly borrowedCheckoutLease?: CheckoutLock | undefined; + readonly runStart?: RunStartContext | undefined; + emitStatus(phase: RunStatusPhase, fields?: RunStatusFields): Promise; + notePhase(phase: string): Promise; +} + +export interface CreateRunContextOptions { + runId: string; + checkoutPath: string; + spec: DelegationSpec; + store: ArtifactStore; + ps: PlatformServices; + borrowedCheckoutLease?: CheckoutLock | undefined; + runStart?: RunStartContext | undefined; + onPhase?: ((phase: string) => Promise | void) | undefined; + sliceCount?: number | null | undefined; +} + +export function createRunContext(options: CreateRunContextOptions): RunContext { + const { + runId, + checkoutPath, + spec, + store, + ps, + borrowedCheckoutLease, + runStart, + onPhase, + sliceCount, + } = options; + + return { + runId, + checkoutPath, + spec, + store, + ps, + ...(borrowedCheckoutLease === undefined ? {} : { borrowedCheckoutLease }), + ...(runStart === undefined ? {} : { runStart }), + async emitStatus(phase: RunStatusPhase, fields?: RunStatusFields): Promise { + await transitionRunStatusSafely(store, runId, phase, { + sliceIndex: fields?.sliceIndex ?? null, + sliceCount: fields?.sliceCount ?? sliceCount ?? null, + round: fields?.round ?? null, + role: fields?.role ?? null, + producerId: fields?.producerId ?? null, + detail: fields?.detail ?? null, + }); + }, + async notePhase(phase: string): Promise { + try { + await onPhase?.(phase); + } catch { + // Advisory progress must never break pipeline execution. + } + }, + }; +} diff --git a/src/pipeline/slice-runner.ts b/src/pipeline/slice-runner.ts index 25eca39..1e9e5fd 100644 --- a/src/pipeline/slice-runner.ts +++ b/src/pipeline/slice-runner.ts @@ -1,8 +1,262 @@ -import type { Slice } from '../protocol/delegation-spec.js'; -import type { ConsolidationResult } from './consolidator.js'; -import type { VerificationReport } from './report-types.js'; -import { planSliceWaves } from './slice-scheduler.js'; -import { routeSlice, type SliceRoute } from './wayfinder.js'; +import path from "node:path"; +import type { Slice, DelegationSpec } from "../protocol/delegation-spec.js"; +import type { AttemptResult, FailureClassification } from "../protocol/attempt-result.js"; +import { consolidate, type ConsolidationResult } from "./consolidator.js"; +import type { VerificationReport } from "./report-types.js"; +import { planSliceWaves } from "./slice-scheduler.js"; +import { routeSlice, type SliceRoute } from "./wayfinder.js"; +import { composeSliceOntoHead } from "./slice-composer.js"; +import type { PlatformServices } from "../platform/platform-services.js"; +import { getPlatformServices } from "../platform/select-platform.js"; +import type { RunContext } from "./run-context.js"; +import type { PipelineRole } from "./role-prompts.js"; +import type { ReviewerKind } from "../protocol/delegation-spec.js"; +import { WorktreeManager, withManagedWorktree } from "../runtime/worktree-manager.js"; +import { + resolveLinkedWorktreeWritableRoots, + type LinkedWorktreeGitAccess, +} from "./git-writable-roots.js"; +import { + ProducerRuntime, + producerRuntime as defaultProducerRuntime, +} from "../producers/producer-runtime.js"; +import { + RunDecision, + runDecision as defaultRunDecision, +} from "../runtime/run-decision.js"; +import { + PlatformSafety, + platformSafety as defaultPlatformSafety, +} from "../platform/platform-safety.js"; +import { + runRole as defaultRunRole, + type RoleRunArgs, + type RoleRunResult, +} from "./role-runner.js"; +import { + runIncrement, + runReviews, + type RoleExecutionDependencies, +} from "./pipeline-roles.js"; +import { + verifyCandidate, +} from "./candidate-verifier.js"; +import { + importPromotedObjects, + validateCandidateProvenance, +} from "./candidate-provenance.js"; +import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; +import { SLICE_REF_PREFIX } from "../git/ref-namespace.js"; +import { RuntimeError } from "../util/errors.js"; +import type { ArtifactStore } from "../runtime/artifact-store.js"; +import type { CheckoutLock } from "../platform/platform-services.js"; +import type { ProducerRegistry } from "../producers/producer-registry.js"; + + +export interface TemporarySliceRef { + ref: string; + oid: string; +} + +export class SliceExecutionError extends RuntimeError { + constructor(message: string, readonly failure: FailureClassification) { + super(message); + this.name = "SliceExecutionError"; + } +} + +export function findSliceExecutionError(error: unknown): SliceExecutionError | null { + if (error instanceof SliceExecutionError) return error; + if (error instanceof AggregateError) { + for (const nested of error.errors) { + const found = findSliceExecutionError(nested); + if (found !== null) return found; + } + } + return null; +} + +export function scopeSpecToSlice(spec: DelegationSpec, slice: Slice): DelegationSpec { + const scoped = structuredClone({ ...spec, ...slice }); + delete scoped.slices; + return scoped; +} + +function gitFailure(action: string, result: GitResult): RuntimeError { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} + +async function checkedGit( + cwd: string, + args: string[], + options?: GitExecOptions, +): Promise { + const result = await git(cwd, args, options); + if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); + return result.stdout; +} + +export function temporarySliceRef(runId: string, index: number, attempt: number): string { + return `${SLICE_REF_PREFIX}${runId}/slice-${index}-attempt-${attempt}`; +} + +export async function createTemporarySliceRef( + checkoutPath: string, + temporaryRef: TemporarySliceRef, +): Promise { + const result = await git(checkoutPath, [ + "update-ref", + "--no-deref", + temporaryRef.ref, + temporaryRef.oid, + "0".repeat(temporaryRef.oid.length), + ]); + if (result.exitCode !== 0) throw gitFailure("create temporary slice ref", result); +} + +export async function cleanupTemporarySliceRefs( + checkoutPath: string, + temporaryRefs: TemporarySliceRef[], +): Promise { + const errors: unknown[] = []; + for (const temporaryRef of [...temporaryRefs].reverse()) { + try { + const result = await git(checkoutPath, [ + "update-ref", + "--no-deref", + "-d", + temporaryRef.ref, + temporaryRef.oid, + ]); + if (result.exitCode !== 0) { + errors.push(gitFailure("delete temporary slice ref", result)); + } + } catch (error) { + errors.push(error); + } + } + return errors; +} + +export function describePriorAttempts( + attempts: readonly SliceAttemptEvidence[], +): string { + return attempts.map(entry => { + const failed = (entry.verification?.commandResults ?? []) + .filter(command => !command.ok) + .map(command => `${command.id} (exit ${String(command.exitCode)})`); + const blocking = (entry.perSliceReview?.findings ?? []) + .filter(finding => finding.severity === "blocker" || finding.severity === "major") + .map(finding => `${finding.severity} at ${finding.location}: ${finding.claim}`); + return [ + `attempt ${entry.attempt} -> ${entry.route}`, + ` reasons: ${entry.reasons.join("; ") || "(none recorded)"}`, + ...(failed.length === 0 ? [] : [` failing verification: ${failed.join(", ")}`]), + ...(blocking.length === 0 ? [] : [` blocking findings:\n ${blocking.join("\n ")}`]), + ].join("\n"); + }).join("\n\n"); +} + +function verificationTestEvidence(verification: VerificationReport): Record { + return { + pass: verification.pass, + commandResults: verification.commandResults.map(command => ({ ...command })), + workspaceClean: verification.workspaceClean, + testsDeleted: verification.testsDeleted, + testsSkipped: verification.testsSkipped, + scopeViolations: [...verification.scopeViolations], + }; +} + +export function sliceTestEvidence(slices: PipelineSlice[]): string { + return JSON.stringify(slices.map(slice => ({ + sliceIndex: slice.index, + verification: slice.verification === null + ? null + : verificationTestEvidence(slice.verification), + attempts: slice.attempts.map(attempt => ({ + attempt: attempt.attempt, + verification: attempt.verification === null + ? null + : verificationTestEvidence(attempt.verification), + })), + }))); +} + +export function testEvidence(attempt: AttemptResult): string { + return JSON.stringify(attempt.executedVerification.map(outcome => ({ + id: outcome.id, + exitCode: outcome.exitCode, + timedOut: outcome.timedOut, + }))); +} + +export async function runSliceReview(args: { + checkoutPath: string; + spec: DelegationSpec; + deps: RoleExecutionDependencies; + runId: string; + baselineCommit: string; + candidateCommit: string; + namespace: string; + reviewers: ReviewerKind[]; + verification: VerificationReport; + store: ArtifactStore; + // Required, not optional: a review worktree created without the run's + // borrowed lease blocks on the lock this same process already holds. + borrowedCheckoutLease: CheckoutLock | undefined; +}): Promise<{ review: ConsolidationResult; roleLogRefs: string[] }> { + const ps = args.deps.ps ?? getPlatformServices(); + return withManagedWorktree({ + manager: new WorktreeManager( + args.checkoutPath, + `${args.runId}-${args.namespace}-review`, + ps, + args.borrowedCheckoutLease === undefined + ? {} + : { borrowedCheckoutLease: args.borrowedCheckoutLease }, + ), + commit: args.candidateCommit, + cleanupFailureMessage: "slice review failed and its worktree could not be cleaned up", + run: async worktreePath => { + const diffText = await checkedGit(worktreePath, [ + "diff", + `${args.baselineCommit}..${args.candidateCommit}`, + ]); + const reviewRun = await runReviews({ + reviewers: args.reviewers, + spec: args.spec, + pkg: { + spec: args.spec, + baselineCommit: args.baselineCommit, + candidateCommit: args.candidateCommit, + candidateDiff: diffText, + testEvidence: JSON.stringify(verificationTestEvidence(args.verification)), + }, + worktreePath, + deps: args.deps, + runId: args.runId, + round: 1, + store: args.store, + logNameNamespace: args.namespace, + }); + if (!reviewRun.ok) { + throw new SliceExecutionError( + `slice review did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, + "producer-failure", + ); + } + return { + review: consolidate(reviewRun.reviews.map(review => ({ + reviewer: review.reviewer, + report: review.report, + }))), + roleLogRefs: reviewRun.roleLogRefs, + }; + }, + }); +} export interface SliceAttemptEvidence { sliceIndex: number; @@ -31,52 +285,16 @@ export interface PipelineSlice { export interface SliceAttempt { candidateCommit: string; verification: VerificationReport | null; - perSliceReview?: ConsolidationResult | null; - roleLogRefs?: string[]; - hardBlocker?: boolean; -} - -export interface SlicePhaseDeps { - runSlice: ( - slice: Slice, - index: number, - base: string, - attempt: number, - /** - * What every earlier attempt on this slice produced and why it was routed - * to repair. A repair used to receive only a round number, so a - * fresh-context implementer could not see the failure it was meant to fix - * and reproduced it until the budget ran out. - */ - priorAttempts?: readonly SliceAttemptEvidence[], - ) => Promise; - maxRounds: number; - initialAttempt?: SliceAttempt; - onAttempt?: (evidence: SliceAttemptEvidence) => Promise; - onSlice?: (result: PipelineSlice) => Promise; - /** - * Maximum slices executed at once. Slices only share a wave when their - * declared dependencies allow it and their write allowlists are pairwise - * disjoint, so the default of one reproduces sequential execution. - */ - concurrency?: number; - /** - * Replays a slice's changes onto the wave's composed head. Only called when a - * wave produced more than one slice: with a single slice the composed head is - * already that slice's commit, so sequential runs keep today's exact chain. - */ - composeSlice?: (args: { - head: string; - base: string; - sliceCommit: string; - sliceIndex: number; - }) => Promise; + perSliceReview?: ConsolidationResult | null | undefined; + roleLogRefs?: string[] | undefined; + hardBlocker?: boolean | undefined; } export interface SlicePhaseResult { slices: PipelineSlice[]; finalCandidateCommit: string; haltedSliceIndex: number | null; + temporarySliceRefs?: TemporarySliceRef[] | undefined; } interface SliceOutcome { @@ -84,118 +302,353 @@ interface SliceOutcome { advanced: boolean; } -async function runSliceToCompletion( - slice: Slice, - index: number, - base: string, - deps: SlicePhaseDeps, - initialAttempt: SliceAttempt | undefined, -): Promise { - let roundsUsed = 0; - const attempts: SliceAttemptEvidence[] = []; - - while (true) { - const sourceAttempt = roundsUsed === 0 && initialAttempt !== undefined - ? initialAttempt - : await deps.runSlice(slice, index, base, roundsUsed, attempts.map(e => structuredClone(e))); - const attempt = structuredClone(sourceAttempt); - const perSliceReview = attempt.perSliceReview ?? null; - const route = routeSlice({ - verification: attempt.verification, - perSliceReview, - roundsUsed, - maxRounds: deps.maxRounds, - hardBlocker: attempt.hardBlocker ?? false, - }); - const evidence: SliceAttemptEvidence = { - sliceIndex: index, - attempt: roundsUsed, - candidateCommit: attempt.candidateCommit, - verification: attempt.verification, - perSliceReview, - route: route.route, - reasons: [...route.reasons], - roleLogRefs: [...(attempt.roleLogRefs ?? [])], - }; - - if (deps.onAttempt) { - await deps.onAttempt(structuredClone(evidence)); - } - attempts.push(evidence); - - const pipelineSlice: PipelineSlice = { - index, - objective: slice.objective, - route: route.route, - candidateCommit: attempt.candidateCommit, - roundsUsed, - verification: attempt.verification, - perSliceReview, - reasons: [...route.reasons], - attempts: attempts.map(entry => ({ - ...entry, - reasons: [...entry.reasons], - roleLogRefs: [...entry.roleLogRefs], - })), - roleLogRefs: attempts.flatMap(entry => entry.roleLogRefs), - }; - - if (route.route === 'repair') { - roundsUsed += 1; - continue; - } - return { slice: pipelineSlice, advanced: route.route === 'advance' }; - } + +export interface ReviewConfig { + perSlice?: boolean | undefined; + final?: boolean | undefined; + reviewers?: ReviewerKind[] | undefined; } -export async function runSlicePhase( - slices: Slice[], - startCommit: string, - deps: SlicePhaseDeps, -): Promise { - let currentCommit = startCommit; - const results: PipelineSlice[] = []; - - for (const wave of planSliceWaves(slices, deps.concurrency ?? 1)) { - const base = currentCommit; - const outcomes = await Promise.all(wave.indices.map(index => runSliceToCompletion( - slices[index - 1]!, - index, - base, - deps, - index === 1 ? deps.initialAttempt : undefined, - ))); - - // Compose in slice order so the candidate chain reads the way the spec was - // written, whatever order the wave happened to finish in. - for (const outcome of outcomes) { - const composed = wave.indices.length === 1 || deps.composeSlice === undefined - ? outcome.slice.candidateCommit - : await deps.composeSlice({ - head: currentCommit, - base, - sliceCommit: outcome.slice.candidateCommit, - sliceIndex: outcome.slice.index, - }); - const recorded: PipelineSlice = { ...outcome.slice, candidateCommit: composed }; - results.push(recorded); - if (deps.onSlice) { - await deps.onSlice(structuredClone(recorded)); - } - if (!outcome.advanced) { - return { - slices: results, - finalCandidateCommit: currentCommit, - haltedSliceIndex: recorded.index, - }; +export interface SliceRunnerDependencies { + producerRuntime?: ProducerRuntime | undefined; + runDecision?: RunDecision | undefined; + platformSafety?: PlatformSafety | undefined; + ps?: PlatformServices | undefined; + runRole?: typeof defaultRunRole | undefined; + roleRunner?: ((args: RoleRunArgs) => Promise) | undefined; +} + +export interface SliceRunnerBudgets { + maxRounds?: number | undefined; +} + +export interface SliceRunnerRunOptions { + context: RunContext; + slices: Slice[]; + baselineCommit: string; + attempt: AttemptResult; + budgets?: SliceRunnerBudgets | undefined; + maxRounds?: number | undefined; + concurrency?: number | undefined; + initialAttempt?: SliceAttempt | undefined; + initialPerSliceReview?: ConsolidationResult | null | undefined; + initialRoleLogRefs?: string[] | undefined; + reviewConfig?: ReviewConfig | undefined; + reviewers?: ReviewerKind[] | undefined; + registry?: ProducerRegistry | undefined; + abortSignal?: AbortSignal | undefined; + onAttempt?: ((evidence: SliceAttemptEvidence) => Promise) | undefined; + onSlice?: ((slice: PipelineSlice) => Promise) | undefined; +} + +export class SliceRunner { + readonly producerRuntime: ProducerRuntime; + readonly runDecision: RunDecision; + readonly platformSafety: PlatformSafety; + readonly ps: PlatformServices; + readonly runRole: typeof defaultRunRole; + readonly roleRunner?: ((args: RoleRunArgs) => Promise) | undefined; + + constructor(dependencies: SliceRunnerDependencies = {}) { + this.producerRuntime = dependencies.producerRuntime ?? defaultProducerRuntime; + this.runDecision = dependencies.runDecision ?? defaultRunDecision; + this.platformSafety = dependencies.platformSafety ?? defaultPlatformSafety; + this.ps = dependencies.ps ?? getPlatformServices(); + this.runRole = dependencies.runRole ?? defaultRunRole; + this.roleRunner = dependencies.roleRunner; + } + + async run(options: SliceRunnerRunOptions): Promise { + const { context, slices, baselineCommit, attempt } = options; + const maxRounds = options.budgets?.maxRounds ?? options.maxRounds ?? 3; + const concurrency = options.concurrency ?? 1; + const temporarySliceRefs: TemporarySliceRef[] = []; + const completedSlices: PipelineSlice[] = []; + let currentCommit = baselineCommit; + const results: PipelineSlice[] = []; + + try { + for (const wave of planSliceWaves(slices, concurrency)) { + const base = currentCommit; + const outcomes = await Promise.all(wave.indices.map(async index => { + const slice = slices[index - 1]!; + let roundsUsed = 0; + const attempts: SliceAttemptEvidence[] = []; + + while (true) { + let sourceAttempt: SliceAttempt; + if (roundsUsed === 0 && index === 1 && options.initialAttempt !== undefined) { + sourceAttempt = options.initialAttempt; + } else { + const namespace = `slice-${index}-attempt-${roundsUsed}`; + const scopedSpec = scopeSpecToSlice(context.spec, slice); + + sourceAttempt = await withManagedWorktree({ + manager: new WorktreeManager( + context.checkoutPath, + `${context.runId}-${namespace}`, + this.ps, + context.borrowedCheckoutLease === undefined + ? {} + : { borrowedCheckoutLease: context.borrowedCheckoutLease }, + ), + commit: base, + cleanupFailureMessage: + "slice implementation failed and its worktree could not be cleaned up", + run: async worktreePath => { + let gitObjectAccess: LinkedWorktreeGitAccess; + try { + gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + throw new SliceExecutionError( + "slice implementer git object isolation could not be established", + "sandbox-violation", + ); + } + + await context.emitStatus("implementing", { + sliceIndex: index, + role: "implementer", + }); + + const roleDeps: RoleExecutionDependencies = { + ps: this.ps, + runRole: this.runRole, + ...(this.roleRunner === undefined ? {} : { roleRunner: this.roleRunner }), + ...(options.registry === undefined ? {} : { registry: options.registry }), + ...(options.abortSignal === undefined ? {} : { abortSignal: options.abortSignal }), + }; + + const incrementRun = await runIncrement({ + spec: scopedSpec, + pkg: { + spec: scopedSpec, + baselineCommit: base, + candidateCommit: base, + candidateDiff: "", + testEvidence: completedSlices.length === 0 + ? testEvidence(attempt) + : sliceTestEvidence(completedSlices), + ...(attempts.length === 0 + ? {} + : { priorAttempts: describePriorAttempts(attempts) }), + }, + worktreePath, + deps: roleDeps, + runId: context.runId, + increment: roundsUsed + 1, + store: context.store, + gitObjectAccess, + ...(context.runStart === undefined ? {} : { runStart: context.runStart }), + logNameNamespace: namespace, + }); + + if (!incrementRun.ok) { + throw new SliceExecutionError( + `slice implementer did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, + incrementRun.failure, + ); + } + + await context.emitStatus("freezing", { + sliceIndex: index, + role: "implementer", + }); + + const candidateCommit = incrementRun.report.candidateCommit; + const provenanceFailure = await validateCandidateProvenance({ + worktreePath, + previousCandidateCommit: base, + candidateCommit, + gitObjectAccess, + phaseLabel: "slice implementer", + }); + + if (provenanceFailure !== null) { + throw new SliceExecutionError( + provenanceFailure.reason, + provenanceFailure.failure, + ); + } + + if (candidateCommit !== base) { + try { + await importPromotedObjects({ + checkoutPath: context.checkoutPath, + baselineCommit: base, + promotedCommit: candidateCommit, + access: gitObjectAccess, + }); + } catch { + throw new SliceExecutionError( + "slice candidate objects could not be imported into the shared git object store", + "sandbox-violation", + ); + } + const temporaryRef = { + ref: temporarySliceRef(context.runId, index, roundsUsed), + oid: candidateCommit, + }; + try { + await createTemporarySliceRef(context.checkoutPath, temporaryRef); + } catch { + throw new SliceExecutionError( + "slice candidate temporary ref could not be established", + "sandbox-violation", + ); + } + temporarySliceRefs.push(temporaryRef); + } + + await context.emitStatus("verifying", { sliceIndex: index }); + const verified = await verifyCandidate({ + checkoutPath: context.checkoutPath, + spec: scopedSpec, + deps: { + ps: this.ps, + ...(context.borrowedCheckoutLease === undefined + ? {} + : { borrowedCheckoutLease: context.borrowedCheckoutLease }), + }, + attempt, + baselineCommit: base, + candidateCommit, + store: context.store, + namespace, + }); + + let perSliceReview: ConsolidationResult | null = null; + const roleLogRefs = [...incrementRun.roleLogRefs]; + if (options.reviewConfig?.perSlice === true) { + const reviewers = (options.reviewers ?? ["reviewer-correctness"]) + .map(r => r.startsWith("reviewer-") ? r.replace("reviewer-", "") : r) as ReviewerKind[]; + const reviewed = await runSliceReview({ + checkoutPath: context.checkoutPath, + spec: scopedSpec, + deps: roleDeps, + runId: context.runId, + baselineCommit: base, + candidateCommit, + namespace, + reviewers, + verification: verified.verification, + store: context.store, + borrowedCheckoutLease: context.borrowedCheckoutLease, + }); + perSliceReview = reviewed.review; + roleLogRefs.push(...reviewed.roleLogRefs); + } + + return { + candidateCommit, + verification: verified.verification, + perSliceReview, + roleLogRefs, + }; + }, + }); + } + + const currentAttempt = structuredClone(sourceAttempt); + const perSliceReview = currentAttempt.perSliceReview ?? null; + const route = routeSlice({ + verification: currentAttempt.verification, + perSliceReview, + roundsUsed, + maxRounds, + hardBlocker: currentAttempt.hardBlocker ?? false, + }); + + const evidence: SliceAttemptEvidence = { + sliceIndex: index, + attempt: roundsUsed, + candidateCommit: currentAttempt.candidateCommit, + verification: currentAttempt.verification, + perSliceReview, + route: route.route, + reasons: [...route.reasons], + roleLogRefs: [...(currentAttempt.roleLogRefs ?? [])], + }; + + await context.store.writePipelineArtifact( + `slice-${evidence.sliceIndex}-attempt-${evidence.attempt}`, + evidence, + ); + if (options.onAttempt) { + await options.onAttempt(structuredClone(evidence)); + } + attempts.push(evidence); + + const pipelineSlice: PipelineSlice = { + index, + objective: slice.objective, + route: route.route, + candidateCommit: currentAttempt.candidateCommit, + roundsUsed, + verification: currentAttempt.verification, + perSliceReview, + reasons: [...route.reasons], + attempts: attempts.map(entry => ({ + ...entry, + reasons: [...entry.reasons], + roleLogRefs: [...entry.roleLogRefs], + })), + roleLogRefs: attempts.flatMap(entry => entry.roleLogRefs), + }; + + if (route.route === "repair") { + roundsUsed += 1; + continue; + } + return { slice: pipelineSlice, advanced: route.route === "advance" }; + } + })); + + for (const outcome of outcomes) { + const composed = wave.indices.length === 1 + ? outcome.slice.candidateCommit + : await composeSliceOntoHead({ + checkoutPath: context.checkoutPath, + runId: context.runId, + head: currentCommit, + base, + sliceCommit: outcome.slice.candidateCommit, + sliceIndex: outcome.slice.index, + }); + + const recorded: PipelineSlice = { ...outcome.slice, candidateCommit: composed }; + results.push(recorded); + completedSlices.push(structuredClone(recorded)); + + await context.store.writePipelineArtifact(`slice-${recorded.index}`, recorded); + if (options.onSlice) { + await options.onSlice(structuredClone(recorded)); + } + + if (!outcome.advanced) { + return { + slices: results, + finalCandidateCommit: currentCommit, + haltedSliceIndex: recorded.index, + temporarySliceRefs: [...temporarySliceRefs], + }; + } + currentCommit = composed; + } } - currentCommit = composed; + + return { + slices: results, + finalCandidateCommit: currentCommit, + haltedSliceIndex: null, + temporarySliceRefs: [...temporarySliceRefs], + }; + } catch (error) { + // Only the abandoned path cleans up here. On every returning path the + // refs are handed to the caller, which still needs them reachable for + // the final review round and disposes of them under its own lifecycle. + await cleanupTemporarySliceRefs(context.checkoutPath, temporarySliceRefs); + throw error; } } - - return { - slices: results, - finalCandidateCommit: currentCommit, - haltedSliceIndex: null, - }; } diff --git a/src/protocol/pipeline-gate-cleared.ts b/src/protocol/pipeline-gate-cleared.ts new file mode 100644 index 0000000..0abdabf --- /dev/null +++ b/src/protocol/pipeline-gate-cleared.ts @@ -0,0 +1,61 @@ +import { RuntimeError } from "../util/errors.js"; + +/** + * The pipeline's durable statement that its gate cleared a candidate. Versioned + * next to `CandidateDecisionV2` because integration reads it to decide whether a + * decision may be recorded without a human, so its shape is an external + * contract, not an internal detail. + * + * `runtime/schemas/pipeline-gate-cleared.v1.json` is the canonical shape; + * `parsePipelineGateCleared` is the only way a record enters the runtime. + */ +export interface PipelineGateCleared { + clearedVersion: "1"; + candidateCommitOid: string; + requiresHumanDecision: boolean; + clearedAt?: string; +} + +const GIT_OID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; + +/** + * Accepts only a record matching the canonical schema. `clearedVersion` defaults + * to `"1"` so a record embedded in `AttemptResult.evidence` before the artifact + * was versioned still parses; every other field is required, and an unknown + * field is a malformed record rather than a field to ignore. + */ +export function parsePipelineGateCleared(value: unknown): PipelineGateCleared { + if (value === null || typeof value !== "object" || Array.isArray(value)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + const record = value as Record; + const known = new Set([ + "clearedVersion", + "candidateCommitOid", + "requiresHumanDecision", + "clearedAt", + ]); + const candidateCommitOid = record.candidateCommitOid; + const requiresHumanDecision = record.requiresHumanDecision; + const clearedVersion = record.clearedVersion ?? "1"; + const clearedAt = record.clearedAt; + + if ( + Object.keys(record).some(key => !known.has(key)) + || clearedVersion !== "1" + || typeof candidateCommitOid !== "string" + || !GIT_OID.test(candidateCommitOid) + || typeof requiresHumanDecision !== "boolean" + || (clearedAt !== undefined + && (typeof clearedAt !== "string" || Number.isNaN(Date.parse(clearedAt)))) + ) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + + return { + clearedVersion: "1", + candidateCommitOid, + requiresHumanDecision, + ...(clearedAt === undefined ? {} : { clearedAt }), + }; +} diff --git a/src/protocol/schema-loader.ts b/src/protocol/schema-loader.ts index 76194d8..5aaf181 100644 --- a/src/protocol/schema-loader.ts +++ b/src/protocol/schema-loader.ts @@ -11,6 +11,7 @@ import advisorSchema from "../../runtime/schemas/advisor-report.v1.json" with { import autopilotEligibilitySchema from "../../runtime/schemas/autopilot-eligibility.v1.json" with { type: "json" }; import autopilotWorkflowStateSchema from "../../runtime/schemas/autopilot-workflow-state.v1.json" with { type: "json" }; import runStatusSchema from "../../runtime/schemas/run-status.v1.json" with { type: "json" }; +import pipelineGateClearedSchema from "../../runtime/schemas/pipeline-gate-cleared.v1.json" with { type: "json" }; import { PROTOCOL_VERSION } from "./versions.js"; @@ -41,6 +42,7 @@ export interface CompiledSchemas { autopilotEligibility: ValidateFunction; autopilotWorkflowState: ValidateFunction; runStatus: ValidateFunction; + pipelineGateCleared: ValidateFunction; } export function loadSchemas(): CompiledSchemas { @@ -67,6 +69,7 @@ export function loadSchemas(): CompiledSchemas { autopilotEligibility: ajv.compile(autopilotEligibilitySchema as object), autopilotWorkflowState: ajv.compile(autopilotWorkflowStateSchema as object), runStatus: ajv.compile(runStatusSchema as object), + pipelineGateCleared: ajv.compile(pipelineGateClearedSchema as object), }; } diff --git a/src/runtime/artifact-store.ts b/src/runtime/artifact-store.ts index d3a6ac6..ed8491d 100644 --- a/src/runtime/artifact-store.ts +++ b/src/runtime/artifact-store.ts @@ -28,6 +28,10 @@ import type { HumanCandidateDecisionV2, LegacyDecisionAuthority, } from "../protocol/candidate-decision.js"; +import { + type PipelineGateCleared, + parsePipelineGateCleared, +} from "../protocol/pipeline-gate-cleared.js"; import type { VerificationCommand } from "../protocol/delegation-spec.js"; import { loadSchemas } from "../protocol/schema-loader.js"; import { RuntimeError } from "../util/errors.js"; @@ -79,6 +83,7 @@ const candidateDecisionSchema = schemas.candidateDecision; const advisorReportSchema = schemas.advisorReport; const autopilotEligibilitySchema = schemas.autopilotEligibility; const runStatusSchema = schemas.runStatus; +const pipelineGateClearedSchema = schemas.pipelineGateCleared; export interface PrunePolicy { maxAgeMs: number; @@ -189,7 +194,7 @@ function isSafeComponent(value: string): boolean { const STORE_TEMPORARY_RESIDUE = /^\..+\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.tmp$/u; -function validateComponent(value: string, kind: "run id" | "log name"): void { +export function validateComponent(value: string, kind: "run id" | "log name"): void { if (!isSafeComponent(value) || (kind === "run id" && value !== value.toLowerCase())) { throw new RuntimeError(`invalid ${kind}: ${JSON.stringify(value)}`); } @@ -1371,6 +1376,37 @@ export class ArtifactStore { return this.readCandidateDecision(runId); } + async writePipelineGateCleared(cleared: PipelineGateCleared): Promise { + const validated = parsePipelineGateCleared(cleared); + if (!pipelineGateClearedSchema(validated)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + await this.writeJson("pipeline-gate-cleared.json", validated); + } + + async readPipelineGateCleared(runId: string): Promise { + validateComponent(runId, "run id"); + const runDirectory = path.join(this.runsRoot, runId); + const validated = await this.ensureExistingRunDirectory(runDirectory); + if (validated === null) return null; + let value: unknown; + try { + value = JSON.parse(await readRegularFile( + path.join(validated.path, "pipeline-gate-cleared.json"), + validated.identity, + )); + } catch (error) { + if (isMissing(error)) return null; + throw error; + } + // The canonical schema decides the shape; the parser narrows it to the type. + // A record that reached disk malformed must not read back as "absent". + if (!pipelineGateClearedSchema(value)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return parsePipelineGateCleared(value); + } + async writePipelineActiveMarker(marker: PipelineActiveMarker): Promise { if (typeof marker !== "object" || marker === null diff --git a/src/runtime/recovery-manager.ts b/src/runtime/recovery-manager.ts index bd9c4c2..1ba6a23 100644 --- a/src/runtime/recovery-manager.ts +++ b/src/runtime/recovery-manager.ts @@ -29,6 +29,7 @@ import { type WorkflowOwnerRecord, } from "../autopilot/workflow-store.js"; import { git, type GitResult } from "../git/git-exec.js"; +import { SLICE_REF_PREFIX } from "../git/ref-namespace.js"; import { gitNulRecords, gitPathOutput } from "../git/git-output.js"; import { canonicalizeWorktreePath, @@ -103,7 +104,6 @@ const WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; const OID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; const CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; const BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; -const SLICE_REF_PREFIX = "refs/claude-architect/slices/"; const MAX_QUARANTINE_REASON_BYTES = 2_000; const MAX_QUARANTINE_RECORD_BYTES = 4_096; const MAX_WORKTREE_SWEEP_ISSUES = 100; @@ -160,15 +160,16 @@ interface RecoveryQuarantineSnapshot { } export interface RecoveryDependencies { - platformServices?: Pick - & Partial>; + /** + * The platform, whole. Recovery hands it to bound-directory cleanup, which + * spawns a native helper on Windows, so a partial value cannot serve. It used + * to be a three-method `Pick` and production grafted the missing members onto + * the real services at every call -- a full `PlatformServices` built solely so + * an incomplete test double would type-check. Recovery never takes a checkout + * lease through it: leases come from `platformSafety.withRecoveryLease`. + */ + platformServices?: PlatformServices; isProcessAlive?: (pid: number) => boolean; - /** Retained for input compatibility; verified or unverifiable live owners are preserved. */ - requestCooperativeTermination?: (pid: number) => void | Promise; - /** Retained for input compatibility; startup recovery no longer signals live owners. */ - delayMs?: (ms: number) => Promise; - /** Retained for input compatibility; startup recovery no longer signals live owners. */ - graceMs?: number; git?: typeof git; } @@ -3570,27 +3571,7 @@ export async function recoverStaleRuns( dependencies: RecoveryDependencies = {}, ): Promise { const root = await stateRoot(); - // Recovery replays interrupted prunes under a checkout lease. Injected test - // doubles may omit acquireCheckoutLock, so fall back to the selected platform - // for that one capability while honoring every capability the caller supplied. - const supplied = dependencies.platformServices; - const selected = getPlatformServices(); - const ps = Object.create(selected) as PlatformServices; - Object.defineProperties(ps, { - os: { value: supplied?.os ?? selected.os }, - getProcessStartToken: { - value: (pid: number) => (supplied ?? selected).getProcessStartToken(pid), - }, - terminateProcessTreeByPid: { - value: (pid: number, token: string) => - (supplied ?? selected).terminateProcessTreeByPid(pid, token), - }, - acquireCheckoutLock: { - value: (checkout: string) => supplied?.acquireCheckoutLock - ? supplied.acquireCheckoutLock(checkout) - : selected.acquireCheckoutLock(checkout), - }, - }); + const ps = dependencies.platformServices ?? getPlatformServices(); const isProcessAlive = dependencies.isProcessAlive ?? defaultIsProcessAlive; const runGit = dependencies.git ?? git; if (root === null) return { recovered: [], quarantined: [] }; diff --git a/src/runtime/review-snapshot.ts b/src/runtime/review-snapshot.ts index edefbc9..54f3bb4 100644 --- a/src/runtime/review-snapshot.ts +++ b/src/runtime/review-snapshot.ts @@ -221,6 +221,10 @@ function requireCoherentCandidate( } export async function createReviewSnapshot(run: ReviewSnapshotRun): Promise { + // Deliberately not the run-decision snapshot: this function *produces* the + // review snapshot that snapshot reads, and it needs neither the gate record + // nor the decision. Reading them here would cost three extra files and invert + // the dependency between an artifact and the policy that judges it. const [result, manifest] = await Promise.all([ run.store.readResult(run.runId), run.store.readManifest(run.runId), diff --git a/src/runtime/run-decision.ts b/src/runtime/run-decision.ts new file mode 100644 index 0000000..0472aae --- /dev/null +++ b/src/runtime/run-decision.ts @@ -0,0 +1,304 @@ +import { createHash } from "node:crypto"; +import { type AttemptResult, type CandidateArtifact } from "../protocol/attempt-result.js"; +import { type CandidateDecision } from "../protocol/candidate-decision.js"; +import { + type PipelineGateCleared, + parsePipelineGateCleared, +} from "../protocol/pipeline-gate-cleared.js"; +import type { PlatformServices } from "../platform/platform-services.js"; +import { + type DecisionAuthority, + decisionAuthority, +} from "../mcp/decision-authority.js"; +import { + AcceptanceVerifier, + type AcceptanceVerifyArgs, + type AcceptanceVerifyResult, +} from "../verify/acceptance-verifier.js"; +import { type VerificationMode } from "../verify/structural-verifier.js"; +import { ArtifactStore, validateComponent } from "./artifact-store.js"; +import { + type ReviewSnapshot, + reviewSnapshotHash, +} from "./review-snapshot.js"; +import type { RunManifest } from "./run-manifest.js"; + +export type Reason = string; + +export type RunVerdict = + | { state: "accepted"; autonomous: true; candidateCommit: string } + | { state: "human-required"; candidateCommit: string; reasons: Reason[] } + | { state: "rejected"; reasons: Reason[] } + | { state: "incomplete"; reasons: Reason[] } + | { state: "invalid"; reasons: Reason[] }; + +export interface RunDecisionStore { + readResult(runId: string): Promise; + readManifest(runId: string): Promise; + readReviewSnapshot(runId: string): Promise; + readCandidateDecision(runId: string): Promise; + readPipelineGateCleared?(runId: string): Promise; +} + +export interface RunDecisionSnapshot { + runId: string; + result: AttemptResult | null; + manifest: RunManifest | null; + reviewSnapshot: ReviewSnapshot | null; + gateRecord: PipelineGateCleared | null; + gateRecordError?: string | null; + decision: CandidateDecision | null; + coherenceErrors: string[]; +} + +export interface EvaluateRunOptions { + authority?: DecisionAuthority | undefined; + decisionAuthority?: (() => DecisionAuthority) | undefined; + store?: (RunDecisionStore | ArtifactStore) | undefined; + storeFactory?: ((runId: string) => RunDecisionStore | ArtifactStore) | undefined; + platformServices?: PlatformServices | undefined; + ps?: PlatformServices | undefined; + /** + * An archive already read by this caller. The archive of a finished run is + * immutable, so a caller holding one must pass it rather than paying for a + * second five-file read; without it `evaluate` reads the archive itself. + */ + snapshot?: RunDecisionSnapshot | undefined; +} + +export interface RunDecisionVerifyArgs extends AcceptanceVerifyArgs { + mode: VerificationMode; +} + +function isRecord(value: unknown): value is Record { + return value !== null && typeof value === "object" && !Array.isArray(value); +} + +export class RunDecision { + async readSnapshot( + runId: string, + options?: EvaluateRunOptions, + ): Promise { + validateComponent(runId, "run id"); + const store = options?.store + ?? (options?.storeFactory ? options.storeFactory(runId) : new ArtifactStore(runId)); + + let result: AttemptResult | null = null; + let manifest: RunManifest | null = null; + let reviewSnapshot: ReviewSnapshot | null = null; + let gateRecord: PipelineGateCleared | null = null; + let gateRecordError: string | null = null; + let decision: CandidateDecision | null = null; + const coherenceErrors: string[] = []; + + try { + const readResult = typeof store.readResult === "function" + ? store.readResult(runId).catch(err => { + coherenceErrors.push(`failed to read result: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) + : Promise.resolve(null); + const readManifest = typeof store.readManifest === "function" + ? store.readManifest(runId).catch(err => { + coherenceErrors.push(`failed to read manifest: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) + : Promise.resolve(null); + const readSnapshot = typeof store.readReviewSnapshot === "function" + ? store.readReviewSnapshot(runId).catch(() => null) + : Promise.resolve(null); + const readGateRecord = typeof store.readPipelineGateCleared === "function" + ? store.readPipelineGateCleared(runId).catch(err => { + gateRecordError = `the pipeline gate clearance record is malformed: ${err instanceof Error ? err.message : String(err)}`; + return null; + }) + : Promise.resolve(null); + const readDecision = typeof store.readCandidateDecision === "function" + ? store.readCandidateDecision(runId).catch(err => { + coherenceErrors.push(`failed to read decision: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) + : Promise.resolve(null); + + const [r, m, s, g, d] = await Promise.all([ + readResult, + readManifest, + readSnapshot, + readGateRecord, + readDecision, + ]); + result = r; + manifest = m; + reviewSnapshot = s; + gateRecord = g; + decision = d; + } catch (err) { + coherenceErrors.push(`failed to load decision snapshot: ${err instanceof Error ? err.message : String(err)}`); + } + + if (gateRecord === null && result?.evidence?.pipelineGateCleared !== undefined) { + try { + gateRecord = parsePipelineGateCleared(result.evidence.pipelineGateCleared); + } catch { + gateRecordError = "the pipeline gate clearance record is malformed"; + } + } + + if (result !== null && manifest !== null) { + if (result.runId !== runId || manifest.runId !== runId) { + coherenceErrors.push("archived run identity does not match runId"); + } + if (result.candidate !== null) { + if (manifest.baseCommitOid !== result.candidate.baseCommitOid) { + coherenceErrors.push("archived candidate base commit does not match run manifest"); + } + if (manifest.candidateManifestHash !== result.candidate.manifestHash) { + coherenceErrors.push("archived candidate manifest hash does not match run manifest"); + } + const expectedHash = createHash("sha256") + .update(JSON.stringify(result.candidate.changedPaths)) + .digest("hex"); + if (result.candidate.manifestHash !== expectedHash) { + coherenceErrors.push("archived candidate changed paths hash mismatch"); + } + } + } + + if (gateRecord !== null && result?.candidate !== null && result?.candidate !== undefined) { + if (gateRecord.candidateCommitOid !== result.candidate.candidateCommitOid) { + gateRecordError = "the pipeline gate clearance record does not match the archived candidate commit"; + } + } + + if (decision !== null && result?.candidate !== null && result?.candidate !== undefined) { + if (decision.candidateManifestHash !== undefined && decision.candidateManifestHash !== null) { + if (decision.candidateManifestHash !== result.candidate.manifestHash) { + coherenceErrors.push("recorded candidate decision does not match candidate manifest hash"); + } + } + if (decision.decisionVersion === "2" && reviewSnapshot !== null) { + if (decision.evidenceHash !== reviewSnapshotHash(reviewSnapshot)) { + coherenceErrors.push("recorded candidate decision does not match review snapshot evidence hash"); + } + } + } + + return { + runId, + result, + manifest, + reviewSnapshot, + gateRecord, + gateRecordError, + decision, + coherenceErrors, + }; + } + + async evaluate(runId: string, options?: EvaluateRunOptions): Promise { + const snapshot = options?.snapshot ?? await this.readSnapshot(runId, options); + const authority = options?.authority + ?? (options?.decisionAuthority ? options.decisionAuthority() : decisionAuthority()); + return this.verdictFor(snapshot, authority); + } + + /** + * The whole acceptance rule, over an archive already read. Pure: every caller + * that once re-derived "may this be accepted without a person" from the same + * files now asks this one function. + */ + verdictFor(snapshot: RunDecisionSnapshot, authority: DecisionAuthority): RunVerdict { + if (snapshot.coherenceErrors.length > 0) { + return { state: "invalid", reasons: snapshot.coherenceErrors }; + } + if (snapshot.result === null || snapshot.manifest === null) { + return { state: "invalid", reasons: ["archived run was not found"] }; + } + + const incompleteEvidence = snapshot.result.evidence?.pipelineReviewIncomplete; + if (incompleteEvidence !== undefined) { + const reason = isRecord(incompleteEvidence) && typeof incompleteEvidence.reason === "string" + ? incompleteEvidence.reason + : "pipeline review is incomplete"; + return { state: "incomplete", reasons: [reason] }; + } + + if (snapshot.decision !== null) { + if (snapshot.decision.decision === "rejected") { + return { state: "rejected", reasons: ["candidate decision is rejected"] }; + } + if (snapshot.decision.decision === "revision-requested") { + return { state: "rejected", reasons: ["candidate decision is revision-requested"] }; + } + } + + const refusedEvidence = snapshot.result.evidence?.pipelineGateRefused; + if (refusedEvidence !== undefined) { + const reasons = isRecord(refusedEvidence) && Array.isArray(refusedEvidence.reasons) + ? refusedEvidence.reasons.filter((r): r is string => typeof r === "string") + : ["the pipeline gate did NOT clear this candidate"]; + return { + state: "rejected", + reasons: reasons.length > 0 ? reasons : ["the pipeline gate did NOT clear this candidate"], + }; + } + + if (snapshot.result.status !== "verified-candidate" || snapshot.result.failure !== null) { + const reasons: string[] = []; + if (snapshot.result.failure !== null) { + reasons.push(snapshot.result.failure); + } else { + reasons.push(`attempt status is ${snapshot.result.status}`); + } + return { state: "rejected", reasons }; + } + + if (snapshot.result.candidate === null) { + return { state: "rejected", reasons: ["no candidate artifact was produced"] }; + } + + const candidateCommit = snapshot.result.candidate.candidateCommitOid; + + const humanReasons: string[] = []; + + if (authority !== "autonomous") { + humanReasons.push(`decision authority is "${authority}"`); + } + + const isPlainDelegate = snapshot.result.evidence?.plainDelegate === true + && refusedEvidence === undefined + && incompleteEvidence === undefined + && snapshot.result.evidence?.pipelineGateCleared === undefined + && snapshot.gateRecord === null; + + if (snapshot.gateRecordError) { + humanReasons.push(snapshot.gateRecordError); + } else if (isPlainDelegate) { + // Plain delegate is judged on verification result alone. + } else if (snapshot.gateRecord === null) { + humanReasons.push("the pipeline gate clearance record is missing"); + } else if (snapshot.gateRecord.requiresHumanDecision === true) { + humanReasons.push("the pipeline gate clearance record requires a human decision"); + } + + if (humanReasons.length > 0) { + return { state: "human-required", candidateCommit, reasons: humanReasons }; + } + + return { state: "accepted", autonomous: true, candidateCommit }; + } + + async verify(args: RunDecisionVerifyArgs): Promise { + const verifier = new AcceptanceVerifier({ mode: args.mode }); + return verifier.verify(args); + } +} + +export const runDecision = new RunDecision(); + +export async function readRunDecisionSnapshot( + runId: string, + options?: EvaluateRunOptions, +): Promise { + return runDecision.readSnapshot(runId, options); +} diff --git a/src/runtime/worktree-manager.ts b/src/runtime/worktree-manager.ts index 3b036d9..9bd1d43 100644 --- a/src/runtime/worktree-manager.ts +++ b/src/runtime/worktree-manager.ts @@ -9,7 +9,7 @@ import { } from "../platform/bound-directory-cleanup.js"; import { getPlatformServices } from "../platform/select-platform.js"; import { PlatformSafety } from "../platform/platform-safety.js"; -import { boundedRedactedDiagnostic } from "./redaction.js"; +import { boundedRedactedDiagnostic, redact } from "./redaction.js"; import { resolveStateDir } from "./state-dir.js"; import { coordinateWorktreeRemoval, @@ -29,6 +29,7 @@ import { syncDirectoryTreeMetadata, } from "../platform/durable-directory.js"; import { RuntimeError } from "../util/errors.js"; +import { logger } from "../util/logger.js"; import { platformPathsEqual } from "../util/platform-path.js"; import { readStableRegularFile } from "../util/stable-file.js"; import { git, type GitResult } from "../git/git-exec.js"; @@ -1220,6 +1221,11 @@ export class WorktreeManager { private readonly dependencies: WorktreeManagerDependencies = {}, ) {} + /** The repository this manager creates worktrees for. */ + get repositoryRoot(): string { + return this.repoRoot; + } + private lockingPlatformServices(): PlatformServices { const supplied = this.platformServices as Partial; if (typeof supplied.acquireCheckoutLock === "function" @@ -1785,3 +1791,87 @@ export class WorktreeManager { await this.removeUnderLease(worktreePath, expectedIdentity)); } } + +/** + * A worktree handed out by {@link WorktreeManager.create}: a path plus the only + * supported way to give it back. + */ +export interface ManagedWorktree { + path: string; + cleanup(): Promise; +} + +/** + * Removal itself retries and falls back inside WorktreeManager. What matters + * here is the disposition: a worktree that still cannot be removed is reported, + * never substituted for the outcome of the work it held. The Producer's process + * tree is already terminated by `supervise` before this runs. + */ +export async function cleanupWorktree(worktree: ManagedWorktree): Promise { + try { + await worktree.cleanup(); + return null; + } catch (error) { + return error; + } +} + +/** + * `git worktree add` mutates shared repository state, so concurrent slices are + * given their worktrees one at a time even though their Producers then run in + * parallel. Creation is a fraction of a slice's runtime; a lock collision costs + * the whole attempt. + * + * The queue is per repository. One process-wide queue would make an unrelated + * repository's creation wait behind this one — head-of-line blocking that buys + * nothing, because the contention being avoided is over a single repository's + * worktree state. + */ +const worktreeCreation = new Map>(); + +function createWorktreeSerially( + manager: WorktreeManager, + commit: string, +): Promise { + const key = manager.repositoryRoot; + const created = (worktreeCreation.get(key) ?? Promise.resolve()) + .catch(() => {}) + .then(async () => await manager.create(commit)); + const settled = created.catch(() => {}); + worktreeCreation.set(key, settled); + // Drop the entry once it is the tail, so a long-lived process does not + // accumulate one resolved promise per repository it ever touched. + void settled.then(() => { + if (worktreeCreation.get(key) === settled) worktreeCreation.delete(key); + }); + return created; +} + +/** + * Borrow a managed worktree for the duration of `run`. Every caller in the + * pipeline goes through here so that creation serialization and the + * cleanup-failure disposition have exactly one implementation. + */ +export async function withManagedWorktree(args: { + manager: WorktreeManager; + commit: string; + cleanupFailureMessage: string; + run: (worktreePath: string) => Promise; + onCleanupFailure?: (error: unknown) => void; +}): Promise { + const worktree = await createWorktreeSerially(args.manager, args.commit); + try { + return await args.run(worktree.path); + } finally { + // A cleanup failure must stay visible without erasing the primary outcome. + // Replacing a graceful slice timeout with a hard runtime error loses the + // whole slice result and the salvage that goes with it. + const cleanupError = await cleanupWorktree(worktree); + if (cleanupError !== null) { + logger.warn(args.cleanupFailureMessage, { + error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)), + }); + args.onCleanupFailure?.(cleanupError); + } + } +} diff --git a/src/verify/acceptance-verifier.ts b/src/verify/acceptance-verifier.ts index e4fb6ee..988eae8 100644 --- a/src/verify/acceptance-verifier.ts +++ b/src/verify/acceptance-verifier.ts @@ -13,9 +13,11 @@ import { structuralVerify, type StructuralVerifyArgs, type StructuralVerifyResult, + type VerificationMode, } from "./structural-verifier.js"; export interface AcceptanceVerifyArgs { + mode?: VerificationMode; repoRoot: string; worktreePath: string; baseCommitOid: string; @@ -36,7 +38,8 @@ export interface AcceptanceVerifyResult { } export interface AcceptanceVerifierDependencies { - structural?: (args: StructuralVerifyArgs) => Promise; + mode?: VerificationMode; + structural?: (args: StructuralVerifyArgs, mode?: VerificationMode) => Promise; project?: (args: ProjectVerifyArgs) => Promise; } @@ -123,23 +126,29 @@ function outcomesMatchHostCommands( } export class AcceptanceVerifier { - private readonly structural: (args: StructuralVerifyArgs) => Promise; + private readonly mode: VerificationMode; + private readonly structural: ((args: StructuralVerifyArgs, mode?: VerificationMode) => Promise) | undefined; private readonly project: (args: ProjectVerifyArgs) => Promise; constructor(dependencies: AcceptanceVerifierDependencies = {}) { - this.structural = dependencies.structural ?? structuralVerify; + this.mode = dependencies.mode ?? "candidate"; + this.structural = dependencies.structural; this.project = dependencies.project ?? projectVerify; } async verify(args: AcceptanceVerifyArgs): Promise { - const structural = await this.structural({ + const effectiveMode = args.mode ?? this.mode; + const structuralArgs: StructuralVerifyArgs = { repoRoot: args.repoRoot, worktreePath: args.worktreePath, baseCommitOid: args.baseCommitOid, artifact: args.artifact, writeAllowlist: args.spec.writeAllowlist, forbiddenScope: args.spec.forbiddenScope, - }); + }; + const structural = this.structural !== undefined + ? await this.structural(structuralArgs, effectiveMode) + : await structuralVerify(structuralArgs, effectiveMode); const structuralEvidence = { manifestHash: structural.manifestHash, failures: [...structural.failures], diff --git a/src/verify/structural-verifier.ts b/src/verify/structural-verifier.ts index 9bbba67..c85f95f 100644 --- a/src/verify/structural-verifier.ts +++ b/src/verify/structural-verifier.ts @@ -33,6 +33,49 @@ export type StructuralFailure = */ | "artifact-base-mismatch"; +export type VerificationMode = "candidate" | "composed-slice" | "final-branch"; + +/** + * The failure classes each mode may report. A mode never reports a class absent + * from its list, and `structuralVerify` skips the work that proves one. This + * table is the only place a mode's scope is written down: an omission here is + * the whole difference between the modes, so two modes cannot drift apart in + * one branch and agree in another. + * + * `composed-slice` omits `artifact-divergence` because a composed slice's + * commit is replayed onto the wave head and no longer has the base as its + * parent. `final-branch` omits `case-collision` because the branch is proven + * against a materialized worktree the host already checked out, and proves + * `artifact-divergence` over a multi-commit range instead of a single parent. + */ +export const MODE_STRUCTURAL_FAILURES: Record = { + candidate: [ + "manifest-divergence", + "artifact-divergence", + "out-of-scope-write", + "modified-symlink", + "case-collision", + "empty-candidate", + "artifact-base-mismatch", + ], + "composed-slice": [ + "manifest-divergence", + "out-of-scope-write", + "modified-symlink", + "case-collision", + "empty-candidate", + "artifact-base-mismatch", + ], + "final-branch": [ + "manifest-divergence", + "artifact-divergence", + "out-of-scope-write", + "modified-symlink", + "empty-candidate", + "artifact-base-mismatch", + ], +} as const; + /** Observed state of the shared checkout. Never a verification failure. */ export interface CheckoutDrift { headMoved: boolean; @@ -80,7 +123,7 @@ async function checkedGit(cwd: string, args: string[]): Promise { -function isAllowed( +export function isAllowed( pathname: string, writeAllowlist: string[], forbiddenScope: string[], @@ -164,7 +207,11 @@ export async function recomputeManifest(args: Pick< return { changedPaths, manifestHash, rawDiff }; } -async function artifactIdentityMatches(args: StructuralVerifyArgs): Promise { +/** + * Proves the candidate commit is exactly the artifact the run froze, for a + * single-commit candidate whose parent must be the base. + */ +async function singleCommitIdentityMatches(args: StructuralVerifyArgs): Promise { const [anchorResult, treeResult, parentResult] = await Promise.all([ git(args.repoRoot, ["rev-parse", "--verify", `${args.artifact.anchorRef}^{commit}`]), git(args.repoRoot, [ @@ -191,67 +238,124 @@ async function artifactIdentityMatches(args: StructuralVerifyArgs): Promise { +/** + * The same proof for a linear, multi-commit base-to-head branch: the branch has + * no single parent commit to compare, so identity rests on both the source + * repository and the materialized worktree standing at the candidate commit + * with clean trees, and on the base being an ancestor of it. + */ +async function branchIdentityMatches(args: StructuralVerifyArgs): Promise { + const [sourceHead, materializedHead, candidateTree, sourceStatus, materializedStatus] = + await Promise.all([ + checkedGit(args.repoRoot, ["rev-parse", "--verify", "HEAD^{commit}"]), + checkedGit(args.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"]), + checkedGit(args.repoRoot, [ + "rev-parse", "--verify", `${args.artifact.candidateCommitOid}^{tree}`, + ]), + checkedGit(args.repoRoot, [ + "status", "--porcelain=v1", "-z", "--untracked-files=all", + ]), + checkedGit(args.worktreePath, [ + "status", "--porcelain=v1", "-z", "--untracked-files=all", + ]), + ]); + const ancestry = await git(args.repoRoot, [ + "merge-base", "--is-ancestor", args.baseCommitOid, args.artifact.candidateCommitOid, + ]); + return sourceHead.trim() === args.artifact.candidateCommitOid + && materializedHead.trim() === args.artifact.candidateCommitOid + && candidateTree.trim() === args.artifact.candidateTreeOid + && ancestry.exitCode === 0 + && ancestry.truncated?.stdout !== true + && ancestry.truncated?.stderr !== true + && sourceStatus === "" + && materializedStatus === ""; +} + +/** + * Independent structural proof of a frozen candidate. `mode` selects which + * failure classes apply (see `MODE_STRUCTURAL_FAILURES`) and which identity + * proof the artifact shape calls for; every mode shares one manifest + * recomputation, one scope rule, and one symlink rule, so no two modes can + * disagree about what "out of scope" or "modified symlink" means. + */ +export async function structuralVerify( + args: StructuralVerifyArgs, + mode: VerificationMode = "candidate", +): Promise { + const applicable = new Set(MODE_STRUCTURAL_FAILURES[mode]); const failures = new Set(); + const record = (failure: StructuralFailure, failed: boolean): void => { + if (failed && applicable.has(failure)) failures.add(failure); + }; + // A branch candidate stands at its own HEAD by construction, so shared-checkout + // drift is neither observable nor meaningful for it. + const observesCheckoutDrift = mode !== "final-branch"; + const [ manifest, baseTreeOid, currentHead, mainStatus, - artifactIdentityValid, + identityValid, caseCollision, ] = await Promise.all([ recomputeManifest(args), checkedGit(args.repoRoot, ["rev-parse", `${args.baseCommitOid}^{tree}`]), - checkedGit(args.repoRoot, ["rev-parse", "--verify", "HEAD"]), - checkedGit(args.repoRoot, [ - "status", - "--porcelain=v1", - "--untracked-files=all", - "--ignore-submodules=none", - ]), - artifactIdentityMatches(args), - candidateHasCaseCollision(args), + observesCheckoutDrift + ? checkedGit(args.repoRoot, ["rev-parse", "--verify", "HEAD"]) + : Promise.resolve(""), + observesCheckoutDrift + ? checkedGit(args.repoRoot, [ + "status", + "--porcelain=v1", + "--untracked-files=all", + "--ignore-submodules=none", + ]) + : Promise.resolve(""), + !applicable.has("artifact-divergence") + ? Promise.resolve(true) + : mode === "final-branch" + ? branchIdentityMatches(args) + : singleCommitIdentityMatches(args), + applicable.has("case-collision") + ? candidateHasCaseCollision(args) + : Promise.resolve(false), ]); - if (caseCollision) failures.add("case-collision"); - if (args.artifact.baseCommitOid !== args.baseCommitOid) { - failures.add("artifact-base-mismatch"); - } - const checkoutDrift: CheckoutDrift = { - headMoved: currentHead.trim() !== args.baseCommitOid, - dirty: mainStatus.length > 0, - }; - if (manifest.manifestHash === null - || JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) - || args.artifact.manifestHash !== manifest.manifestHash) { - failures.add("manifest-divergence"); - } - if (!artifactIdentityValid) { - failures.add("artifact-divergence"); - } - if (manifest.changedPaths.some(change => + record("case-collision", caseCollision); + record("artifact-base-mismatch", args.artifact.baseCommitOid !== args.baseCommitOid); + record( + "manifest-divergence", + manifest.manifestHash === null + || JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) + || args.artifact.manifestHash !== manifest.manifestHash, + ); + record("artifact-divergence", !identityValid); + record("out-of-scope-write", manifest.changedPaths.some(change => !isAllowed( change.path, args.writeAllowlist, args.forbiddenScope, change.mode === "160000", - ))) { - failures.add("out-of-scope-write"); - } - if (manifest.rawDiff.some(entry => - [entry.oldMode, entry.newMode].some(mode => mode === "120000" || mode === "160000"))) { - failures.add("modified-symlink"); - } - if (manifest.changedPaths.length === 0 - || args.artifact.candidateTreeOid === baseTreeOid.trim()) { - failures.add("empty-candidate"); - } + ))); + record("modified-symlink", manifest.rawDiff.some(entry => + [entry.oldMode, entry.newMode].some(entryMode => + entryMode === "120000" || entryMode === "160000"))); + record( + "empty-candidate", + manifest.changedPaths.length === 0 + || args.artifact.candidateTreeOid === baseTreeOid.trim(), + ); + const checkoutDrift: CheckoutDrift = { + headMoved: currentHead.trim() !== args.baseCommitOid, + dirty: mainStatus.length > 0, + }; return { ok: failures.size === 0, failures: [...failures], manifestHash: manifest.manifestHash, - checkoutDrift, + ...(observesCheckoutDrift ? { checkoutDrift } : {}), }; } diff --git a/tests/helpers/platform-services-double.ts b/tests/helpers/platform-services-double.ts new file mode 100644 index 0000000..5b1ab9d --- /dev/null +++ b/tests/helpers/platform-services-double.ts @@ -0,0 +1,24 @@ +import type { PlatformServices } from "../../src/platform/platform-services.js"; +import { getPlatformServices } from "../../src/platform/select-platform.js"; + +/** + * A complete `PlatformServices` whose named members are the test's and whose + * remaining members are the real platform's. + * + * Recovery takes the platform whole because bound-directory cleanup spawns a + * native helper on Windows. Recovery used to declare a three-method `Pick` and + * then rebuild a full service object at `recoverStaleRuns`, grafting the + * caller's members onto the selected platform -- production code whose only + * purpose was to complete an incomplete test double. Completing the double is + * the test's job, so it happens here. + */ +export function platformServicesDouble( + overrides: Partial, +): PlatformServices { + // Prototype delegation, not a spread: the platform services are class + // instances, so their methods are not own properties. + return Object.assign( + Object.create(getPlatformServices()) as PlatformServices, + overrides, + ); +} diff --git a/tests/runtime/acceptance-verifier.test.ts b/tests/runtime/acceptance-verifier.test.ts index 8630610..88130a8 100644 --- a/tests/runtime/acceptance-verifier.test.ts +++ b/tests/runtime/acceptance-verifier.test.ts @@ -153,7 +153,7 @@ describe("AcceptanceVerifier", () => { expect(structural).toHaveBeenCalledWith(expect.objectContaining({ writeAllowlist: spec.writeAllowlist, forbiddenScope: spec.forbiddenScope, - })); + }), "candidate"); expect(project).toHaveBeenCalledWith(expect.objectContaining({ commands: spec.verification, })); diff --git a/tests/runtime/pipeline/slice-runner.test.ts b/tests/runtime/pipeline/slice-runner.test.ts index fd8bcfa..2df9915 100644 --- a/tests/runtime/pipeline/slice-runner.test.ts +++ b/tests/runtime/pipeline/slice-runner.test.ts @@ -1,12 +1,21 @@ -import { describe, expect, it, vi } from 'vitest'; +import { mkdtemp, rm } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import path from 'node:path'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import type { ConsolidationResult } from '../../../src/pipeline/consolidator.js'; import type { VerificationReport } from '../../../src/pipeline/report-types.js'; import { - runSlicePhase, + SliceRunner, + type PipelineSlice, type SliceAttempt, type SliceAttemptEvidence, } from '../../../src/pipeline/slice-runner.js'; +import { createRunContext } from '../../../src/pipeline/run-context.js'; +import { ArtifactStore } from '../../../src/runtime/artifact-store.js'; +import type { AttemptResult } from '../../../src/protocol/attempt-result.js'; +import type { DelegationSpec } from '../../../src/protocol/delegation-spec.js'; +import { getPlatformServices } from '../../../src/platform/select-platform.js'; import type { Slice } from '../../../src/protocol/delegation-spec.js'; function slice(objective: string): Slice { @@ -90,264 +99,86 @@ function expectObjectiveEvidence( expect(evidence.perSliceReview).toEqual(review(severity)); } -describe('runSlicePhase', () => { - it('advances through all green slices', async () => { - const runSlice = vi - .fn() - .mockResolvedValueOnce(attempt('slice-1-commit', true)) - .mockResolvedValueOnce(attempt('slice-2-commit', true)); +// These drive the real `SliceRunner`, not a stand-in for it. A slice whose +// first attempt is supplied as `initialAttempt` is routed without launching a +// Producer or creating a worktree, which is what lets the routing and evidence- +// isolation rules be exercised here rather than through a whole pipeline. - const result = await runSlicePhase([slice('first'), slice('second')], 'start', { - runSlice, - maxRounds: 1, - }); - - expect(result).toMatchObject({ - finalCandidateCommit: 'slice-2-commit', - haltedSliceIndex: null, - }); - expect(result.slices).toEqual([ - expect.objectContaining({ index: 1, route: 'advance', roundsUsed: 0 }), - expect.objectContaining({ index: 2, route: 'advance', roundsUsed: 0 }), - ]); - expect(runSlice).toHaveBeenNthCalledWith(1, expect.anything(), 1, 'start', 0, []); - expect(runSlice).toHaveBeenNthCalledWith(2, expect.anything(), 2, 'slice-1-commit', 0, []); - }); +const temporaryRoots: string[] = []; +let previousPluginData: string | undefined; - it('consumes a green initial attempt before running slice 2 from its commit', async () => { - const slices = [slice('seeded'), slice('second')]; - const runSlice = vi.fn().mockResolvedValue(attempt('slice-2-commit', true)); - - const result = await runSlicePhase(slices, 'start', { - runSlice, - maxRounds: 1, - initialAttempt: attempt('seed-commit', true), - }); +beforeEach(async () => { + previousPluginData = process.env.CLAUDE_PLUGIN_DATA; + const root = await mkdtemp(path.join(tmpdir(), 'ca-slice-runner-')); + temporaryRoots.push(root); + process.env.CLAUDE_PLUGIN_DATA = root; +}); - expect(runSlice).toHaveBeenCalledTimes(1); - expect(runSlice).toHaveBeenCalledWith(slices[1], 2, 'seed-commit', 0, []); - expect(result.slices.map(({ index, candidateCommit }) => ({ index, candidateCommit }))).toEqual([ - { index: 1, candidateCommit: 'seed-commit' }, - { index: 2, candidateCommit: 'slice-2-commit' }, - ]); - expect(result.slices[0]?.attempts).toEqual([ - expect.objectContaining({ sliceIndex: 1, attempt: 0, route: 'advance' }), - ]); - }); +afterEach(async () => { + if (previousPluginData === undefined) delete process.env.CLAUDE_PLUGIN_DATA; + else process.env.CLAUDE_PLUGIN_DATA = previousPluginData; + await Promise.all(temporaryRoots.splice(0).map(async root => + await rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 }))); +}); - it('repairs a red initial attempt from the original base at attempt 1', async () => { - const seededSlice = slice('seeded repair'); - const runSlice = vi.fn().mockResolvedValue(attempt('repaired-commit', true)); +const RUN_ID = 'slice-runner-unit'; - const result = await runSlicePhase([seededSlice], 'start', { - runSlice, - maxRounds: 1, - initialAttempt: attempt('red-seed-commit', false), - }); +function spec(): DelegationSpec { + return { + specVersion: '1', + objective: 'slice runner unit', + context: '', + writeAllowlist: [], + forbiddenScope: [], + successCriteria: [], + verification: [], + } as unknown as DelegationSpec; +} - expect(runSlice).toHaveBeenCalledTimes(1); - expect(runSlice).toHaveBeenCalledWith(seededSlice, 1, 'start', 1, expect.any(Array)); - expect(result.slices[0]?.attempts).toEqual([ - expect.objectContaining({ attempt: 0, candidateCommit: 'red-seed-commit', route: 'repair' }), - expect.objectContaining({ attempt: 1, candidateCommit: 'repaired-commit', route: 'advance' }), - ]); +function runnerContext(): ReturnType { + return createRunContext({ + runId: RUN_ID, + checkoutPath: temporaryRoots.at(-1)!, + spec: spec(), + store: new ArtifactStore(RUN_ID), + ps: getPlatformServices(), }); +} - it.each(['blocker', 'major'] as const)( - 'routes a green verification with a %s review finding to halt', - async severity => { - const perSliceReview = review(severity); - const runSlice = vi.fn().mockResolvedValue({ - ...attempt('reviewed-commit', true), - perSliceReview, - }); - - const result = await runSlicePhase([slice('reviewed')], 'start', { - runSlice, - maxRounds: 0, - }); - - expect(result).toMatchObject({ - finalCandidateCommit: 'start', - haltedSliceIndex: 1, - }); - expect(result.slices[0]).toMatchObject({ - route: 'halt', - perSliceReview, - reasons: ['per-slice review found blocking findings'], - }); - expect(result.slices[0]?.attempts[0]).toMatchObject({ - perSliceReview, - route: 'halt', - }); +async function runOneSlice(args: { + objective: string; + initialAttempt: SliceAttempt; + maxRounds?: number; + onAttempt?: (evidence: SliceAttemptEvidence) => Promise; + onSlice?: (recorded: PipelineSlice) => Promise; +}) { + const runner = new SliceRunner({ + // A Producer must never be reachable from these cases: every one of them + // is satisfied by the supplied initial attempt, so a launch would mean the + // routing rule under test did not hold. + roleRunner: async () => { + throw new Error('SliceRunner launched a Producer for an already-attempted slice'); }, - ); - - it('repairs a green verification with a major review finding when a round remains', async () => { - const runSlice = vi - .fn() - .mockResolvedValueOnce({ - ...attempt('reviewed-commit', true), - perSliceReview: review('major'), - }) - .mockResolvedValueOnce(attempt('clean-commit', true)); - - const result = await runSlicePhase([slice('review repair')], 'start', { - runSlice, - maxRounds: 1, - }); - - expect(result).toMatchObject({ - finalCandidateCommit: 'clean-commit', - haltedSliceIndex: null, - }); - expect(result.slices[0]).toMatchObject({ perSliceReview: null, route: 'advance' }); - expect(result.slices[0]?.attempts).toEqual([ - expect.objectContaining({ - attempt: 0, - route: 'repair', - reasons: ['per-slice review found blocking findings'], - }), - expect.objectContaining({ attempt: 1, route: 'advance', reasons: [] }), - ]); }); - - it.each([undefined, null])( - 'preserves verification-only routing when review evidence is %s', - async perSliceReview => { - const runSlice = vi.fn().mockResolvedValue({ - ...attempt('verified-commit', true), - ...(perSliceReview === undefined ? {} : { perSliceReview }), - }); - - const result = await runSlicePhase([slice('verification only')], 'start', { - runSlice, - maxRounds: 0, - }); - - expect(result).toMatchObject({ - finalCandidateCommit: 'verified-commit', - haltedSliceIndex: null, - }); - expect(result.slices[0]).toMatchObject({ - route: 'advance', - perSliceReview: null, - reasons: [], - }); - }, - ); - - it('halts a slice that stays red past the maximum rounds', async () => { - const runSlice = vi - .fn() - .mockResolvedValueOnce(attempt('slice-1-commit', true)) - .mockResolvedValueOnce(attempt('slice-2-attempt-0', false)) - .mockResolvedValueOnce(attempt('slice-2-attempt-1', false)); - - const result = await runSlicePhase( - [slice('first'), slice('second'), slice('not run')], - 'start', - { runSlice, maxRounds: 1 }, - ); - - expect(result).toMatchObject({ - finalCandidateCommit: 'slice-1-commit', - haltedSliceIndex: 2, - }); - expect(result.slices).toEqual([ - expect.objectContaining({ index: 1, route: 'advance', roundsUsed: 0 }), - expect.objectContaining({ - index: 2, - route: 'halt', - candidateCommit: 'slice-2-attempt-1', - roundsUsed: 1, - }), - ]); - expect(runSlice).toHaveBeenCalledTimes(3); - }); - - it('retries a red slice and advances a later green attempt', async () => { - const firstRoleLogRefs = ['logs/attempt-0.log']; - const secondRoleLogRefs = ['logs/attempt-1.log']; - const runSlice = vi - .fn() - .mockResolvedValueOnce({ - ...attempt('failed-attempt', false), - roleLogRefs: firstRoleLogRefs, - }) - .mockResolvedValueOnce({ - ...attempt('repaired-commit', true), - roleLogRefs: secondRoleLogRefs, - }); - const observed: SliceAttemptEvidence[] = []; - - const result = await runSlicePhase([slice('repairable')], 'start', { - runSlice, - maxRounds: 2, - onAttempt: async evidence => { - observed.push({ - ...evidence, - reasons: [...evidence.reasons], - roleLogRefs: [...evidence.roleLogRefs], - }); - evidence.reasons.push('callback mutation'); - evidence.roleLogRefs.push('logs/callback-mutation.log'); - }, - }); - - expect(result).toMatchObject({ - finalCandidateCommit: 'repaired-commit', - haltedSliceIndex: null, - }); - expect(observed).toEqual([ - expect.objectContaining({ - sliceIndex: 1, - attempt: 0, - candidateCommit: 'failed-attempt', - route: 'repair', - reasons: ['slice verification failed'], - roleLogRefs: ['logs/attempt-0.log'], - }), - expect.objectContaining({ - sliceIndex: 1, - attempt: 1, - candidateCommit: 'repaired-commit', - route: 'advance', - reasons: [], - roleLogRefs: ['logs/attempt-1.log'], - }), - ]); - expect(result.slices).toEqual([ - expect.objectContaining({ - route: 'advance', - candidateCommit: 'repaired-commit', - roundsUsed: 1, - perSliceReview: null, - reasons: [], - roleLogRefs: ['logs/attempt-0.log', 'logs/attempt-1.log'], - attempts: observed, - }), - ]); - firstRoleLogRefs.push('logs/caller-mutation.log'); - secondRoleLogRefs.length = 0; - expect(result.slices[0]?.attempts.map(entry => entry.roleLogRefs)).toEqual([ - ['logs/attempt-0.log'], - ['logs/attempt-1.log'], - ]); - expect(result.slices[0]?.roleLogRefs).toEqual([ - 'logs/attempt-0.log', - 'logs/attempt-1.log', - ]); - expect(result.slices[0]?.reasons).not.toBe(result.slices[0]?.attempts[1]?.reasons); - expect(runSlice).toHaveBeenNthCalledWith(2, expect.anything(), 1, 'start', 1, expect.any(Array)); + return await runner.run({ + context: runnerContext(), + slices: [slice(args.objective)], + baselineCommit: 'start', + attempt: { runId: RUN_ID, candidate: null } as unknown as AttemptResult, + initialAttempt: args.initialAttempt, + maxRounds: args.maxRounds ?? 0, + ...(args.onAttempt === undefined ? {} : { onAttempt: args.onAttempt }), + ...(args.onSlice === undefined ? {} : { onSlice: args.onSlice }), }); +} +describe('SliceRunner evidence isolation', () => { it('snapshots the source attempt before onAttempt can mutate it', async () => { const sourceAttempt = evidencedAttempt('source-commit'); - const result = await runSlicePhase([slice('source isolation')], 'start', { - runSlice: vi.fn().mockResolvedValue(sourceAttempt), - maxRounds: 0, + const result = await runOneSlice({ + objective: 'source isolation', + initialAttempt: sourceAttempt, onAttempt: async () => { sourceAttempt.candidateCommit = 'mutated-source-commit'; sourceAttempt.hardBlocker = true; @@ -364,22 +195,15 @@ describe('runSlicePhase', () => { candidateCommit: 'source-commit', route: 'advance', reasons: [], - roleLogRefs: ['logs/objective.log'], }); expectObjectiveEvidence(result.slices[0]!); - expect(result.slices[0]?.attempts[0]).toMatchObject({ - candidateCommit: 'source-commit', - route: 'advance', - reasons: [], - roleLogRefs: ['logs/objective.log'], - }); expectObjectiveEvidence(result.slices[0]!.attempts[0]!); }); it('isolates retained evidence from nested onAttempt mutations', async () => { - const result = await runSlicePhase([slice('attempt callback isolation')], 'start', { - runSlice: vi.fn().mockResolvedValue(evidencedAttempt('callback-commit')), - maxRounds: 0, + const result = await runOneSlice({ + objective: 'attempt callback isolation', + initialAttempt: evidencedAttempt('callback-commit'), onAttempt: async evidence => { evidence.candidateCommit = 'mutated-callback-commit'; evidence.reasons.push('mutated callback reason'); @@ -388,55 +212,24 @@ describe('runSlicePhase', () => { }, }); - expect(result).toMatchObject({ - finalCandidateCommit: 'callback-commit', - haltedSliceIndex: null, - }); expect(result.slices[0]).toMatchObject({ candidateCommit: 'callback-commit', route: 'advance', reasons: [], - roleLogRefs: ['logs/objective.log'], }); expectObjectiveEvidence(result.slices[0]!); - expect(result.slices[0]?.attempts[0]).toMatchObject({ - candidateCommit: 'callback-commit', - reasons: [], - roleLogRefs: ['logs/objective.log'], - }); expectObjectiveEvidence(result.slices[0]!.attempts[0]!); }); - it('rejects failed attempt persistence before onSlice or another slice starts', async () => { - const runSlice = vi.fn().mockResolvedValue(attempt('candidate', true)); - const onAttempt = vi.fn().mockRejectedValue(new Error('attempt persistence failed')); - const onSlice = vi.fn().mockResolvedValue(undefined); - - await expect(runSlicePhase([slice('first'), slice('not run')], 'start', { - runSlice, - maxRounds: 1, - onAttempt, - onSlice, - })).rejects.toThrow('attempt persistence failed'); - - expect(runSlice).toHaveBeenCalledTimes(1); - expect(onAttempt).toHaveBeenCalledTimes(1); - expect(onSlice).not.toHaveBeenCalled(); - }); - it('isolates an advanced result from nested onSlice mutations', async () => { - const result = await runSlicePhase([slice('advance callback isolation')], 'start', { - runSlice: vi.fn().mockResolvedValue(evidencedAttempt('advanced-commit')), - maxRounds: 0, - onSlice: async terminal => { - terminal.candidateCommit = 'mutated-advanced-commit'; - terminal.route = 'halt'; - terminal.reasons.push('mutated callback reason'); - terminal.roleLogRefs.push('logs/mutated-callback.log'); - mutateNestedEvidence(terminal); - terminal.attempts[0]!.candidateCommit = 'mutated-attempt-commit'; - mutateNestedEvidence(terminal.attempts[0]!); - terminal.attempts.length = 0; + const result = await runOneSlice({ + objective: 'slice callback isolation', + initialAttempt: evidencedAttempt('advanced-commit'), + onSlice: async recorded => { + recorded.candidateCommit = 'mutated-advanced-commit'; + recorded.reasons.push('mutated slice reason'); + recorded.attempts[0]!.candidateCommit = 'mutated-nested-commit'; + mutateNestedEvidence(recorded); }, }); @@ -448,104 +241,36 @@ describe('runSlicePhase', () => { candidateCommit: 'advanced-commit', route: 'advance', reasons: [], - roleLogRefs: ['logs/objective.log'], }); expectObjectiveEvidence(result.slices[0]!); - expect(result.slices[0]?.attempts).toHaveLength(1); - expect(result.slices[0]?.attempts[0]).toMatchObject({ - candidateCommit: 'advanced-commit', - route: 'advance', - }); - expectObjectiveEvidence(result.slices[0]!.attempts[0]!); + expect(result.slices[0]!.attempts[0]!.candidateCommit).toBe('advanced-commit'); }); it('isolates a halted result from nested onSlice mutations', async () => { - const result = await runSlicePhase([slice('halt callback isolation')], 'start', { - runSlice: vi.fn().mockResolvedValue(evidencedAttempt('halted-commit', 'major')), - maxRounds: 0, - onSlice: async terminal => { - terminal.candidateCommit = 'mutated-halted-commit'; - terminal.route = 'advance'; - terminal.reasons.length = 0; - terminal.roleLogRefs.push('logs/mutated-callback.log'); - mutateNestedEvidence(terminal); - terminal.attempts.length = 0; + const halting = attempt('halted-commit', false); + + const result = await runOneSlice({ + objective: 'halted callback isolation', + initialAttempt: halting, + onSlice: async recorded => { + recorded.candidateCommit = 'mutated-halted-commit'; + recorded.reasons.push('mutated halt reason'); }, }); - expect(result).toMatchObject({ - finalCandidateCommit: 'start', - haltedSliceIndex: 1, - }); - expect(result.slices[0]).toMatchObject({ - candidateCommit: 'halted-commit', - route: 'halt', - reasons: ['per-slice review found blocking findings'], - roleLogRefs: ['logs/objective.log'], - }); - expectObjectiveEvidence(result.slices[0]!, 'major'); - expect(result.slices[0]?.attempts).toHaveLength(1); - expect(result.slices[0]?.attempts[0]).toMatchObject({ - candidateCommit: 'halted-commit', - route: 'halt', - }); - expectObjectiveEvidence(result.slices[0]!.attempts[0]!, 'major'); + expect(result.haltedSliceIndex).toBe(1); + expect(result.slices[0]).toMatchObject({ candidateCommit: 'halted-commit' }); + expect(result.slices[0]!.reasons).not.toContain('mutated halt reason'); }); it('halts immediately on a hard blocker', async () => { - const runSlice = vi.fn().mockResolvedValue(attempt('blocked-commit', true, true)); - const onAttempt = vi.fn().mockResolvedValue(undefined); - - const result = await runSlicePhase([slice('blocked'), slice('not run')], 'start', { - runSlice, - maxRounds: 2, - onAttempt, - }); - - expect(result).toMatchObject({ - finalCandidateCommit: 'start', - haltedSliceIndex: 1, + const result = await runOneSlice({ + objective: 'hard blocker', + initialAttempt: attempt('blocked-commit', true, true), + maxRounds: 3, }); - expect(result.slices).toEqual([ - expect.objectContaining({ - index: 1, - route: 'halt', - candidateCommit: 'blocked-commit', - roundsUsed: 0, - reasons: ['unrecoverable blocker'], - }), - ]); - expect(runSlice).toHaveBeenCalledTimes(1); - expect(onAttempt).toHaveBeenCalledOnce(); - expect(onAttempt).toHaveBeenCalledWith(expect.objectContaining({ - sliceIndex: 1, - attempt: 0, - route: 'halt', - reasons: ['unrecoverable blocker'], - })); - }); -}); - -describe('repair attempts receive prior-attempt evidence', () => { - it('hands each repair the evidence from every earlier attempt', async () => { - // Repairs used to receive only a round number. A fresh-context implementer - // cannot see why the last attempt failed, so it reproduces the same defect - // until the round budget is gone — observed live as three repair attempts - // repeating one gate failure. - const seen: Array = []; - const runSlice = vi.fn(async (_slice, _index, _base, round, prior) => { - seen.push((prior ?? []).map(entry => structuredClone(entry))); - return attempt(`commit-${round}`, round === 2); - }); - - await runSlicePhase([slice('one')], 'base', { runSlice, maxRounds: 3 }); - expect(seen[0]).toEqual([]); - expect(seen[1]).toHaveLength(1); - expect(seen[1]?.[0]).toMatchObject({ attempt: 0, route: 'repair' }); - expect(seen[2]).toHaveLength(2); - // The failing verification must be in what the repair sees, not merely - // recorded in the report a human reads afterwards. - expect(seen[2]?.[0]?.verification?.pass).toBe(false); + expect(result.haltedSliceIndex).toBe(1); + expect(result.slices[0]?.roundsUsed).toBe(0); }); }); diff --git a/tests/runtime/recovery-manager.test.ts b/tests/runtime/recovery-manager.test.ts index df415bb..8636459 100644 --- a/tests/runtime/recovery-manager.test.ts +++ b/tests/runtime/recovery-manager.test.ts @@ -24,6 +24,7 @@ import { ArtifactStore } from "../../src/runtime/artifact-store.js"; import { recoverStaleRuns } from "../../src/runtime/recovery-manager.js"; import { buildRunManifest } from "../../src/runtime/run-manifest.js"; import { logger } from "../../src/util/logger.js"; +import { platformServicesDouble } from "../helpers/platform-services-double.js"; const serverEvents = vi.hoisted(() => [] as string[]); @@ -283,13 +284,13 @@ describe("recoverStaleRuns", () => { await writeFile(recoveryLockPath, JSON.stringify(owner)); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === owner.pid ? owner.processToken : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === owner.pid, })).resolves.toEqual({ recovered: [], @@ -326,14 +327,14 @@ describe("recoverStaleRuns", () => { await writeFile(recoveryLockPath, lockBytes); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === owner.pid) tokenProbes.push(pid); return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === owner.pid, })).resolves.toEqual({ recovered: [], @@ -365,13 +366,13 @@ describe("recoverStaleRuns", () => { let thrown: unknown; try { await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 4242 ? "darwin:replacement" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => true, async git() { await rm(locksRoot, { recursive: true }); @@ -406,11 +407,11 @@ describe("recoverStaleRuns", () => { })); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); @@ -441,11 +442,11 @@ describe("recoverStaleRuns", () => { await link(recoveryLockPath, aliasPath); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], @@ -479,11 +480,11 @@ describe("recoverStaleRuns", () => { let ownerChecks = 0; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 9103 ? "owner-9103" : null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive(pid) { if (pid !== 9103) return false; ownerChecks += 1; @@ -512,7 +513,7 @@ describe("recoverStaleRuns", () => { })); await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid !== 9201) return "darwin:self"; @@ -521,7 +522,7 @@ describe("recoverStaleRuns", () => { return "darwin:replacement"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => true, }); @@ -549,7 +550,7 @@ describe("recoverStaleRuns", () => { let ownerProbes = 0; const result = await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === checkoutOwner.pid) { @@ -581,7 +582,7 @@ describe("recoverStaleRuns", () => { return "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === checkoutOwner.pid, }); @@ -667,13 +668,13 @@ describe("recoverStaleRuns", () => { ]); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 9301 ? "darwin:live-checkout" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => ownerIsLive && pid === 9301, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -740,7 +741,7 @@ describe("recoverStaleRuns", () => { let worktreesPresentDuringCheckoutProbe: boolean | undefined; let replacementMarkerBytes: Buffer | undefined; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === checkoutOwner.pid) { @@ -762,7 +763,7 @@ describe("recoverStaleRuns", () => { return "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === checkoutOwner.pid || pid === livePipelineOwner.pid, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -817,11 +818,11 @@ describe("recoverStaleRuns", () => { }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -872,11 +873,11 @@ describe("recoverStaleRuns", () => { }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => true, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -927,11 +928,11 @@ describe("recoverStaleRuns", () => { const terminated: number[] = []; const result = await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid(pid) { terminated.push(pid); }, - }, + }), isProcessAlive: () => false, }); @@ -956,11 +957,11 @@ describe("recoverStaleRuns", () => { }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid(pid) { terminated.push(pid); }, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); expect(terminated).toEqual([]); @@ -985,7 +986,7 @@ describe("recoverStaleRuns", () => { const liveToken = "darwin:live-start"; const result = await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return liveToken; }, async terminateProcessTreeByPid(pid, expectedToken) { @@ -994,7 +995,7 @@ describe("recoverStaleRuns", () => { throw new Error("test would have killed the live process"); } }, - }, + }), isProcessAlive: () => true, }); @@ -1018,11 +1019,11 @@ describe("recoverStaleRuns", () => { try { now.mockReturnValue(Date.parse("2026-07-15T12:00:00.000Z")); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); const firstResult = await readFile(resultPath); @@ -1030,11 +1031,11 @@ describe("recoverStaleRuns", () => { await rm(resultPath); now.mockReturnValue(Date.parse("2026-07-18T12:00:00.000Z")); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); const secondResult = await readFile(resultPath); @@ -1054,25 +1055,23 @@ describe("recoverStaleRuns", () => { const worktree = await new WorktreeManager(repo.directory, runId).create(repo.head); const anchorRef = `refs/claude-architect/candidates/${runId}`; await runGit(repo.directory, ["update-ref", anchorRef, repo.head]); - const cooperative = vi.fn(); const forced = vi.fn(); const tokenProbes: number[] = []; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(probedPid) { tokenProbes.push(probedPid); return "darwin:live"; }, async terminateProcessTreeByPid(...args) { forced(...args); }, - }, + }), isProcessAlive: probedPid => probedPid === pid, - requestCooperativeTermination: cooperative, - async delayMs() {}, })).resolves.toEqual({ recovered: [], quarantined: [] }); - expect(cooperative).not.toHaveBeenCalled(); + // Startup recovery preserves a verified live owner: it neither signals it + // nor reaps its process tree. expect(forced).not.toHaveBeenCalled(); expect(tokenProbes).not.toContain(pid); await expect(lstat(worktree.path)).resolves.toBeDefined(); @@ -1089,11 +1088,11 @@ describe("recoverStaleRuns", () => { await writeFile(lockPath, lockBytes); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === process.pid ? "current-process" : null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => true, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -1123,11 +1122,11 @@ describe("recoverStaleRuns", () => { const terminated: number[] = []; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 7777 ? "live-7777" : null; }, async terminateProcessTreeByPid(pid) { terminated.push(pid); }, - }, + }), isProcessAlive: pid => pid === 7777, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -1182,11 +1181,11 @@ describe("recoverStaleRuns", () => { })}\n`); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), })).resolves.toEqual({ recovered: [], quarantined: [runId] }); await expectQuarantinedRun(runId, runDirectory); }); @@ -1207,11 +1206,11 @@ describe("recoverStaleRuns", () => { })}\n`); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), // The recorded pid is fabricated; without injection the default liveness // probe asks the real OS, and a colliding live pid preserves the run. isProcessAlive: () => false, @@ -1241,11 +1240,11 @@ describe("recoverStaleRuns", () => { const warn = vi.spyOn(logger, "warn").mockImplementation(() => {}); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid(pid) { terminated.push(pid); }, - }, + }), // Same fabricated-pid hazard as above: pid 5252 was live on a CI runner // once, which correctly preserved the "live" run and failed the test. isProcessAlive: () => false, @@ -1278,11 +1277,11 @@ describe("recoverStaleRuns", () => { ); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [healthyRunId], @@ -1304,7 +1303,7 @@ describe("recoverStaleRuns", () => { let thrown: unknown; try { await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === 4242 && !injected) { @@ -1314,7 +1313,7 @@ describe("recoverStaleRuns", () => { return pid === 4242 ? "darwin:replacement" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4242, }); } catch (error) { @@ -1344,7 +1343,7 @@ describe("recoverStaleRuns", () => { let thrown: unknown; try { await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === 4242 && !injected) { @@ -1354,7 +1353,7 @@ describe("recoverStaleRuns", () => { return pid === 4242 ? "darwin:replacement" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4242, }); } catch (error) { @@ -1396,7 +1395,7 @@ describe("recoverStaleRuns", () => { let thrown: unknown; try { await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === 4242 && !injected) { @@ -1406,7 +1405,7 @@ describe("recoverStaleRuns", () => { return pid === 4242 ? "darwin:replacement" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4242, }); } catch (error) { @@ -1460,7 +1459,7 @@ describe("recoverStaleRuns", () => { let thrown: unknown; try { await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === 4242 && !injected) { @@ -1480,7 +1479,7 @@ describe("recoverStaleRuns", () => { return pid === 4242 ? "darwin:replacement" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4242, }); } catch (error) { @@ -1619,13 +1618,13 @@ describe("recoverStaleRuns", () => { const warn = vi.spyOn(logger, "warn").mockImplementation(() => {}); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 4242 ? "darwin:replacement" : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4242, async git() { throw new Error(`callback failed at ${rootedPath}`); }, })).resolves.toEqual({ recovered: [], quarantined: [runId] }); @@ -1671,11 +1670,11 @@ describe("recoverStaleRuns", () => { await rm(path.join(pipelineWorktree.path, ".git")); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return "darwin:recovery"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); @@ -1695,13 +1694,13 @@ describe("recoverStaleRuns", () => { const terminate = vi.fn(); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 4242 ? "darwin:start" : "darwin:recovery"; }, async terminateProcessTreeByPid(...args) { terminate(...args); }, - }, + }), isProcessAlive: pid => pid === 4242, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -1717,13 +1716,13 @@ describe("recoverStaleRuns", () => { const terminate = vi.fn(); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { return pid === 4343 ? null : "darwin:recovery"; }, async terminateProcessTreeByPid(...args) { terminate(...args); }, - }, + }), isProcessAlive: pid => pid === 4343, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -1743,7 +1742,7 @@ describe("recoverStaleRuns", () => { const warn = vi.spyOn(logger, "warn").mockImplementation(() => {}); await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === 7001) return "new"; @@ -1751,7 +1750,7 @@ describe("recoverStaleRuns", () => { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => true, }); @@ -1788,11 +1787,11 @@ describe("recoverStaleRuns", () => { const warn = vi.spyOn(logger, "warn").mockImplementation(() => {}); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return "irrelevant"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 8002, })).resolves.toEqual({ recovered: [healthyRunId], quarantined: [] }); @@ -1831,11 +1830,11 @@ describe("recoverStaleRuns", () => { const store = await createUnfinishedRun(runId, repo.commonDir, null); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); @@ -1940,11 +1939,11 @@ describe("recoverStaleRuns", () => { })}\n{"event":"prune-cleanup-com`); await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: hostOs, async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, }); @@ -1993,11 +1992,11 @@ describe("recoverStaleRuns", () => { await rm(repo.directory, { recursive: true, force: true }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: hostOs, async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -2013,11 +2012,11 @@ describe("recoverStaleRuns", () => { // (non-null anchor fields + anchorCleanup "already-absent") and converges rather than // rejecting the journal as malformed. await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: hostOs, async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); }); @@ -2052,11 +2051,11 @@ describe("recoverStaleRuns", () => { await rm(repo.directory, { recursive: true, force: true }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -2070,11 +2069,11 @@ describe("recoverStaleRuns", () => { // Rerunnable: a second pass re-parses the repo-absent rollback and converges. await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); }); @@ -2104,11 +2103,11 @@ describe("recoverStaleRuns", () => { // the absoluteness guard, realpath resolves it against the CWD, reports absence, and // recovery wrongly reconciles the run as repo-gone. await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).rejects.toThrow(/not absolute/i); }); @@ -2155,11 +2154,11 @@ describe("recoverStaleRuns", () => { })); await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: hostOs, async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, }); @@ -2200,11 +2199,11 @@ describe("recoverStaleRuns", () => { })}\n`); await recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, }); @@ -2229,11 +2228,11 @@ describe("recoverStaleRuns", () => { }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -2262,11 +2261,11 @@ describe("recoverStaleRuns", () => { }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -2289,11 +2288,11 @@ describe("recoverStaleRuns", () => { })}\n`); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [runId] }); @@ -2327,11 +2326,11 @@ describe("recoverStaleRuns", () => { }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -2344,11 +2343,11 @@ describe("recoverStaleRuns", () => { expect(await runGit(repo.directory, ["rev-parse", neighborRef])).toBe(repo.head); await expectMissing(path.join(store.runDirectory, "pipeline-active.json")); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); await expectMissing(neighborWorktree.path); @@ -2368,11 +2367,11 @@ describe("recoverStaleRuns", () => { let worktreesGoneBeforeRefCleanup = false; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, git: async (cwd, args, options) => { if (args[0] === "update-ref" && args.includes("-d")) { @@ -2394,11 +2393,11 @@ describe("recoverStaleRuns", () => { } await expect(store.readResult(runId)).resolves.toMatchObject({ status: "cancelled" }); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); }, 120_000); @@ -2411,11 +2410,11 @@ describe("recoverStaleRuns", () => { await runGit(repo.directory, ["update-ref", malformedRef, repo.head]); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [runId] }); @@ -2434,11 +2433,11 @@ describe("recoverStaleRuns", () => { await runGit(repo.directory, ["update-ref", sliceRef, tagOid]); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [runId] }); @@ -2458,11 +2457,11 @@ describe("recoverStaleRuns", () => { expect(await runGit(repo.directory, ["cat-file", "-t", treeOid])).toBe("commit"); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [runId] }); @@ -2480,11 +2479,11 @@ describe("recoverStaleRuns", () => { const observed: Array<{ command: string; noReplace: string | undefined }> = []; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, git: async (cwd, args, options) => { observed.push({ @@ -2521,11 +2520,11 @@ describe("recoverStaleRuns", () => { let moved = false; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: () => false, git: async (cwd, args, options) => { const result = await git(cwd, args, options); diff --git a/tests/runtime/review-manifest-echo.test.ts b/tests/runtime/review-manifest-echo.test.ts index 9ae7a62..886c0f9 100644 --- a/tests/runtime/review-manifest-echo.test.ts +++ b/tests/runtime/review-manifest-echo.test.ts @@ -139,10 +139,13 @@ describe("reviewCandidate manifest hash contract", () => { dependencies(runManifest("f".repeat(64))), ); + // The snapshot's coherence pass reaches this divergence before review does + // and names the field that diverged. Same classification, same fail-closed + // outcome, a diagnostic a reader can act on. expect(output).toEqual({ ok: false, error: "archive-inconsistent", - diagnostic: "archived candidate does not match its run manifest", + diagnostic: "archived candidate manifest hash does not match run manifest", }); expect(output).not.toHaveProperty("manifestHash"); }); diff --git a/tests/runtime/run-decision.test.ts b/tests/runtime/run-decision.test.ts new file mode 100644 index 0000000..664809e --- /dev/null +++ b/tests/runtime/run-decision.test.ts @@ -0,0 +1,431 @@ +import { createHash } from "node:crypto"; +import { describe, expect, it } from "vitest"; +import type { AttemptResult, CandidateArtifact } from "../../src/protocol/attempt-result.js"; +import type { RunManifest } from "../../src/runtime/run-manifest.js"; +import { type ReviewSnapshot, reviewSnapshotHash } from "../../src/runtime/review-snapshot.js"; +import type { PipelineGateCleared } from "../../src/protocol/pipeline-gate-cleared.js"; +import type { CandidateDecisionV2 } from "../../src/protocol/candidate-decision.js"; +import { + RunDecision, + readRunDecisionSnapshot, + runDecision, + type RunDecisionStore, +} from "../../src/runtime/run-decision.js"; + +const BASE_COMMIT = "1111111111111111111111111111111111111111"; +const CANDIDATE_COMMIT = "2222222222222222222222222222222222222222"; +const CANDIDATE_TREE = "3333333333333333333333333333333333333333"; +const MANIFEST_HASH = createHash("sha256").update("[]").digest("hex"); + +function makeArtifact(): CandidateArtifact { + return { + baseCommitOid: BASE_COMMIT, + candidateCommitOid: CANDIDATE_COMMIT, + candidateTreeOid: CANDIDATE_TREE, + anchorRef: "refs/claude-architect/candidates/test-run", + manifestHash: MANIFEST_HASH, + changedPaths: [], + patchRef: "patch.diff", + }; +} + +function makeManifest(runId: string): RunManifest { + return { + manifestVersion: "1", + runId, + repoRoot: "/test/repo", + baseCommitOid: BASE_COMMIT, + candidateManifestHash: MANIFEST_HASH, + producer: { + name: "codex", + version: "1.0.0", + model: "test-model", + }, + effectiveConfig: {}, + policy: { + confinement: "none", + writeScope: ["."], + forbiddenScope: [], + networkAccess: "none", + budget: {}, + }, + instructionPaths: [], + instructionHashes: [], + promptHash: "prompt-hash", + environmentSanitized: true, + runtimeVersion: "1.0.0", + startedAt: new Date().toISOString(), + }; +} + +function makeResult(runId: string, overrides: Partial = {}): AttemptResult { + return { + runId, + status: "verified-candidate", + failure: null, + candidate: makeArtifact(), + unresolvedIssues: [], + summary: "Candidate verified successfully.", + stdoutRef: "logs/stdout.log", + stderrRef: "logs/stderr.log", + timing: { start: 0, finish: 1000 }, + commandOutcomes: [], + executedVerification: [], + evidence: { + pipelineGateCleared: { + candidateCommitOid: CANDIDATE_COMMIT, + requiresHumanDecision: false, + }, + }, + ...overrides, + }; +} + +function makeReviewSnapshot(runId: string): ReviewSnapshot { + return { + runId, + baseCommitOid: BASE_COMMIT, + candidateCommitOid: CANDIDATE_COMMIT, + candidateTreeOid: CANDIDATE_TREE, + manifestHash: MANIFEST_HASH, + patch: "", + changedPaths: [], + evidence: {}, + executedVerification: [], + }; +} + +function makeGateCleared(): PipelineGateCleared { + return { + clearedVersion: "1", + candidateCommitOid: CANDIDATE_COMMIT, + requiresHumanDecision: false, + clearedAt: new Date().toISOString(), + }; +} + +function createMockStore(runId: string, overrides: Partial = {}): RunDecisionStore { + let result: AttemptResult | null = makeResult(runId); + let manifest: RunManifest | null = makeManifest(runId); + let snapshot: ReviewSnapshot | null = makeReviewSnapshot(runId); + let gateCleared: PipelineGateCleared | null = makeGateCleared(); + let decision: CandidateDecisionV2 | null = null; + + return { + readResult: async (id: string) => (id === runId ? result : null), + readManifest: async (id: string) => (id === runId ? manifest : null), + readReviewSnapshot: async (id: string) => (id === runId ? snapshot : null), + readPipelineGateCleared: async (id: string) => (id === runId ? gateCleared : null), + readCandidateDecision: async (id: string) => (id === runId ? decision : null), + ...overrides, + }; +} + +describe("RunDecision", () => { + describe("readRunDecisionSnapshot", () => { + it("loads all artifacts concurrently and confirms coherence", async () => { + const runId = "coherent-run"; + const store = createMockStore(runId); + const snapshot = await readRunDecisionSnapshot(runId, { store }); + + expect(snapshot.runId).toBe(runId); + expect(snapshot.result).not.toBeNull(); + expect(snapshot.manifest).not.toBeNull(); + expect(snapshot.reviewSnapshot).not.toBeNull(); + expect(snapshot.gateRecord).not.toBeNull(); + expect(snapshot.coherenceErrors).toEqual([]); + }); + + it("falls back to result.evidence.pipelineGateCleared when file is absent", async () => { + const runId = "fallback-gate-run"; + const store = createMockStore(runId, { + readPipelineGateCleared: async () => null, + }); + const snapshot = await readRunDecisionSnapshot(runId, { store }); + + expect(snapshot.gateRecord).toEqual({ + clearedVersion: "1", + candidateCommitOid: CANDIDATE_COMMIT, + requiresHumanDecision: false, + }); + expect(snapshot.coherenceErrors).toEqual([]); + }); + + it("detects cross-file identity and manifest hash mismatch", async () => { + const runId = "incoherent-run"; + const result = makeResult(runId); + result.candidate!.manifestHash = "different-hash"; + const store = createMockStore(runId, { + readResult: async () => result, + }); + const snapshot = await readRunDecisionSnapshot(runId, { store }); + + expect(snapshot.coherenceErrors.length).toBeGreaterThan(0); + expect(snapshot.coherenceErrors).toContainEqual( + expect.stringContaining("manifest hash does not match"), + ); + }); + + it("detects malformed gate record", async () => { + const runId = "malformed-gate-run"; + const result = makeResult(runId, { + evidence: { + pipelineGateCleared: { + candidateCommitOid: 12345, // invalid + }, + }, + }); + const store = createMockStore(runId, { + readResult: async () => result, + readPipelineGateCleared: async () => null, + }); + const snapshot = await readRunDecisionSnapshot(runId, { store }); + + expect(snapshot.gateRecordError).toContain("the pipeline gate clearance record is malformed"); + }); + }); + + describe("evaluate - 5 RunVerdict states", () => { + it("1. state: accepted (autonomous: true) on clean verified gate-cleared candidate", async () => { + const runId = "accepted-run"; + const store = createMockStore(runId); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict).toEqual({ + state: "accepted", + autonomous: true, + candidateCommit: CANDIDATE_COMMIT, + }); + }); + + it("1b. state: accepted on clean verified plain-delegate run without gate record", async () => { + const runId = "plain-delegate-run"; + const result = makeResult(runId, { + evidence: { plainDelegate: true }, + }); + const store = createMockStore(runId, { + readResult: async () => result, + readPipelineGateCleared: async () => null, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict).toEqual({ + state: "accepted", + autonomous: true, + candidateCommit: CANDIDATE_COMMIT, + }); + }); + + it("2. state: human-required when authority is human", async () => { + const runId = "human-auth-run"; + const store = createMockStore(runId); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "human", + }); + + expect(verdict.state).toBe("human-required"); + if (verdict.state === "human-required") { + expect(verdict.candidateCommit).toBe(CANDIDATE_COMMIT); + expect(verdict.reasons).toContainEqual( + expect.stringContaining('decision authority is "human"'), + ); + } + }); + + it("2b. state: human-required when pipeline gate requires human decision", async () => { + const runId = "human-gate-run"; + const gateCleared: PipelineGateCleared = { + clearedVersion: "1", + candidateCommitOid: CANDIDATE_COMMIT, + requiresHumanDecision: true, + clearedAt: new Date().toISOString(), + }; + const store = createMockStore(runId, { + readPipelineGateCleared: async () => gateCleared, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("human-required"); + if (verdict.state === "human-required") { + expect(verdict.reasons).toContainEqual( + expect.stringContaining("requires a human decision"), + ); + } + }); + + it("2c. state: human-required when gate clearance commit does not match candidate commit", async () => { + const runId = "commit-mismatch-run"; + const gateCleared: PipelineGateCleared = { + clearedVersion: "1", + candidateCommitOid: "9999999999999999999999999999999999999999", + requiresHumanDecision: false, + clearedAt: new Date().toISOString(), + }; + const store = createMockStore(runId, { + readPipelineGateCleared: async () => gateCleared, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("human-required"); + if (verdict.state === "human-required") { + expect(verdict.reasons).toContainEqual( + expect.stringContaining("does not match"), + ); + } + }); + + it("2d. state: rejected when pipeline gate was refused", async () => { + const runId = "refused-gate-run"; + const result = makeResult(runId, { + evidence: { + pipelineGateRefused: { + reasons: ["non-convergent blocker surviving"], + requiresHumanDecision: true, + }, + }, + }); + const store = createMockStore(runId, { + readResult: async () => result, + readPipelineGateCleared: async () => null, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("rejected"); + if (verdict.state === "rejected") { + expect(verdict.reasons).toContainEqual( + expect.stringContaining("non-convergent blocker surviving"), + ); + } + }); + + it("3. state: rejected when attempt failed", async () => { + const runId = "failed-run"; + const result = makeResult(runId, { + status: "failed", + failure: "verification-failure", + candidate: null, + }); + const store = createMockStore(runId, { + readResult: async () => result, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("rejected"); + if (verdict.state === "rejected") { + expect(verdict.reasons).toContainEqual( + expect.stringContaining("verification-failure"), + ); + } + }); + + it("3b. state: rejected when candidate decision is rejected or revision-requested", async () => { + const runId = "decision-rejected-run"; + const snapshot = makeReviewSnapshot(runId); + const decision: CandidateDecisionV2 = { + decisionVersion: "2", + authority: "human", + decision: "rejected", + candidateManifestHash: MANIFEST_HASH, + evidenceHash: reviewSnapshotHash(snapshot), + policyVersion: "1", + recordedAt: new Date().toISOString(), + }; + const store = createMockStore(runId, { + readReviewSnapshot: async () => snapshot, + readCandidateDecision: async () => decision, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("rejected"); + if (verdict.state === "rejected") { + expect(verdict.reasons).toContainEqual( + expect.stringContaining("candidate decision is rejected"), + ); + } + }); + + it("4. state: incomplete when pipeline review is incomplete", async () => { + const runId = "incomplete-run"; + const result = makeResult(runId, { + evidence: { + pipelineReviewIncomplete: { + reason: "budget exhausted before review converged", + }, + }, + }); + const store = createMockStore(runId, { + readResult: async () => result, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("incomplete"); + if (verdict.state === "incomplete") { + expect(verdict.reasons).toContainEqual( + expect.stringContaining("budget exhausted before review converged"), + ); + } + }); + + it("5. state: invalid when run artifacts are not found", async () => { + const runId = "missing-run"; + const store: RunDecisionStore = { + readResult: async () => null, + readManifest: async () => null, + readReviewSnapshot: async () => null, + readCandidateDecision: async () => null, + }; + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("invalid"); + if (verdict.state === "invalid") { + expect(verdict.reasons).toContain("archived run was not found"); + } + }); + + it("5b. state: invalid when cross-file coherence fails", async () => { + const runId = "incoherent-eval-run"; + const result = makeResult(runId); + result.candidate!.manifestHash = "mismatched-hash"; + const store = createMockStore(runId, { + readResult: async () => result, + }); + const verdict = await runDecision.evaluate(runId, { + store, + authority: "autonomous", + }); + + expect(verdict.state).toBe("invalid"); + if (verdict.state === "invalid") { + expect(verdict.reasons.length).toBeGreaterThan(0); + } + }); + }); +}); diff --git a/tests/runtime/structural-verifier.test.ts b/tests/runtime/structural-verifier.test.ts index a6fd592..1d1630d 100644 --- a/tests/runtime/structural-verifier.test.ts +++ b/tests/runtime/structural-verifier.test.ts @@ -8,8 +8,10 @@ import { git } from "../../src/git/git-exec.js"; import type { CandidateArtifact } from "../../src/protocol/attempt-result.js"; import { isWithinScope } from "../../src/verify/project-verifier.js"; import { + MODE_STRUCTURAL_FAILURES, pathsCaseCollide, structuralVerify, + type VerificationMode, } from "../../src/verify/structural-verifier.js"; interface Fixture { @@ -65,6 +67,7 @@ function verify( writeAllowlist: ["a.txt"], forbiddenScope: [], }, + mode: VerificationMode = "candidate", ) { return structuralVerify({ repoRoot: fixture.repoRoot, @@ -72,7 +75,7 @@ function verify( baseCommitOid: fixture.baseCommitOid, artifact, ...scope, - }); + }, mode); } async function candidateWithAddedPaths( @@ -475,3 +478,66 @@ describe("structuralVerify", () => { expect(result.failures).toContain("artifact-base-mismatch"); }); }); + +describe("verification modes", () => { + const modes: VerificationMode[] = ["candidate", "composed-slice", "final-branch"]; + + // The declared table is only a contract if the implementation cannot report + // outside it. Asserting the table's contents alone passes even when + // `structuralVerify` ignores the table entirely. + it.each(modes)("mode %s reports no failure class outside its declared set", async mode => { + const fixture = await frozenFixture(); + const artifact = await candidateWithAddedPaths(fixture, ["Case.txt", "case.txt"]); + + const result = await verify( + fixture, + artifact, + { writeAllowlist: ["elsewhere/**"], forbiddenScope: [] }, + mode, + ); + + const declared = new Set(MODE_STRUCTURAL_FAILURES[mode]); + expect(result.failures.filter(failure => !declared.has(failure))).toEqual([]); + }); + + it("mode candidate reports a case collision that mode final-branch does not", async () => { + const fixture = await frozenFixture(); + const artifact = await candidateWithAddedPaths(fixture, ["Case.txt", "case.txt"]); + const scope = { writeAllowlist: ["**"], forbiddenScope: [] }; + + const asCandidate = await verify(fixture, artifact, scope, "candidate"); + const asFinalBranch = await verify(fixture, artifact, scope, "final-branch"); + + expect(asCandidate.failures).toContain("case-collision"); + expect(asFinalBranch.failures).not.toContain("case-collision"); + }); + + it("mode composed-slice accepts a replayed commit that mode candidate rejects", async () => { + const fixture = await frozenFixture(); + // A composed slice's commit has been replayed onto the wave head, so its + // parent is no longer the base -- the single-commit identity proof that + // `candidate` mode applies cannot hold for it. + const replayed = await runGit(fixture.repoRoot, [ + "commit-tree", fixture.artifact.candidateTreeOid, + "-p", fixture.artifact.candidateCommitOid, + "-m", "replayed", + ]); + const artifact = { ...fixture.artifact, candidateCommitOid: replayed }; + + const asCandidate = await verify(fixture, artifact, undefined, "candidate"); + const asComposedSlice = await verify(fixture, artifact, undefined, "composed-slice"); + + expect(asCandidate.failures).toContain("artifact-divergence"); + expect(asComposedSlice.failures).not.toContain("artifact-divergence"); + }); + + it("mode final-branch omits checkout drift, which it cannot observe", async () => { + const fixture = await frozenFixture(); + + const asCandidate = await verify(fixture, undefined, undefined, "candidate"); + const asFinalBranch = await verify(fixture, undefined, undefined, "final-branch"); + + expect(asCandidate.checkoutDrift).toEqual({ headMoved: false, dirty: false }); + expect(asFinalBranch.checkoutDrift).toBeUndefined(); + }); +}); diff --git a/tests/runtime/verification-mode.test.ts b/tests/runtime/verification-mode.test.ts new file mode 100644 index 0000000..2fd35d3 --- /dev/null +++ b/tests/runtime/verification-mode.test.ts @@ -0,0 +1,195 @@ +import { describe, expect, it } from "vitest"; +import { + MODE_STRUCTURAL_FAILURES, + isAllowed, + type StructuralFailure, + type VerificationMode, +} from "../../src/verify/structural-verifier.js"; +import { AcceptanceVerifier } from "../../src/verify/acceptance-verifier.js"; + +describe("VerificationMode", () => { + describe("mode failure classes contract", () => { + it("mode candidate includes all 7 structural failure classes", () => { + const expected: StructuralFailure[] = [ + "manifest-divergence", + "artifact-divergence", + "out-of-scope-write", + "modified-symlink", + "case-collision", + "empty-candidate", + "artifact-base-mismatch", + ]; + expect([...MODE_STRUCTURAL_FAILURES.candidate]).toEqual(expected); + expect(MODE_STRUCTURAL_FAILURES.candidate).toContain("artifact-divergence"); + expect(MODE_STRUCTURAL_FAILURES.candidate).toContain("case-collision"); + }); + + it("mode composed-slice replaces IGNORED_STRUCTURAL_FAILURES by omitting artifact-divergence", () => { + const expected: StructuralFailure[] = [ + "manifest-divergence", + "out-of-scope-write", + "modified-symlink", + "case-collision", + "empty-candidate", + "artifact-base-mismatch", + ]; + expect([...MODE_STRUCTURAL_FAILURES["composed-slice"]]).toEqual(expected); + expect(MODE_STRUCTURAL_FAILURES["composed-slice"]).not.toContain("artifact-divergence"); + expect(MODE_STRUCTURAL_FAILURES["composed-slice"]).toContain("out-of-scope-write"); + }); + + it("mode final-branch checks branch ancestry and head coherence without case-collision", () => { + const expected: StructuralFailure[] = [ + "manifest-divergence", + "artifact-divergence", + "out-of-scope-write", + "modified-symlink", + "empty-candidate", + "artifact-base-mismatch", + ]; + expect([...MODE_STRUCTURAL_FAILURES["final-branch"]]).toEqual(expected); + expect(MODE_STRUCTURAL_FAILURES["final-branch"]).toContain("artifact-divergence"); + expect(MODE_STRUCTURAL_FAILURES["final-branch"]).not.toContain("case-collision"); + }); + }); + + describe("unified scope checking", () => { + it("allows paths matching writeAllowlist", () => { + expect(isAllowed("src/index.ts", ["src/**"], [])).toBe(true); + expect(isAllowed("package.json", ["package.json"], [])).toBe(true); + expect(isAllowed("src/deep/nested/file.ts", ["src/**"], [])).toBe(true); + }); + + it("forbids paths outside writeAllowlist", () => { + expect(isAllowed("secret.key", ["src/**"], [])).toBe(false); + expect(isAllowed("tests/foo.ts", ["src/**"], [])).toBe(false); + }); + + it("forbids paths matching forbiddenScope even if within writeAllowlist", () => { + expect(isAllowed("src/secret.key", ["src/**"], ["**/*.key"])).toBe(false); + expect(isAllowed(".git/config", ["**"], [".git/**"])).toBe(false); + }); + + it("handles opaque directory mode for submodules or directories", () => { + expect(isAllowed("vendor/submodule", ["vendor/**"], [], true)).toBe(true); + expect(isAllowed("vendor/forbidden_sub", ["vendor/**"], ["vendor/forbidden_sub/**"], true)).toBe(false); + }); + }); + + describe("AcceptanceVerifier mode configuration", () => { + it("defaults to candidate mode", () => { + let observedMode: VerificationMode | undefined; + const verifier = new AcceptanceVerifier({ + structural: async (_args, mode) => { + observedMode = mode; + return { ok: true, failures: [], manifestHash: "hash" }; + }, + project: async () => ({ + ok: true, + failures: [], + evidence: { commands: [] }, + commandOutcomes: [], + outputLogs: [], + }), + }); + + expect(verifier).toBeDefined(); + }); + + it("propagates composed-slice mode to structural verification", async () => { + let observedMode: VerificationMode | undefined; + const verifier = new AcceptanceVerifier({ + mode: "composed-slice", + structural: async (_args, mode) => { + observedMode = mode; + return { ok: true, failures: [], manifestHash: "hash" }; + }, + project: async () => ({ + ok: true, + failures: [], + evidence: { commands: [] }, + commandOutcomes: [], + outputLogs: [], + }), + }); + + await verifier.verify({ + repoRoot: "/test/repo", + worktreePath: "/test/worktree", + baseCommitOid: "1111111111111111111111111111111111111111", + artifact: { + baseCommitOid: "1111111111111111111111111111111111111111", + candidateCommitOid: "2222222222222222222222222222222222222222", + candidateTreeOid: "3333333333333333333333333333333333333333", + anchorRef: "refs/test", + manifestHash: "hash", + changedPaths: [], + patchRef: "patch.diff", + }, + spec: { + id: "test", + protocolVersion: "1", + targetRepo: { path: "/test/repo", head: "1111111111111111111111111111111111111111" }, + producer: { name: "codex" }, + policy: { writeScope: ["."], forbiddenScope: [], networkAccess: "none" }, + writeAllowlist: ["."], + forbiddenScope: [], + instructions: { goal: "test" }, + verification: [], + }, + ps: {} as any, + artifactStore: { writeLog: async () => "logs/test.log" }, + }); + + expect(observedMode).toBe("composed-slice"); + }); + + it("propagates final-branch mode to structural verification", async () => { + let observedMode: VerificationMode | undefined; + const verifier = new AcceptanceVerifier({ + mode: "final-branch", + structural: async (_args, mode) => { + observedMode = mode; + return { ok: true, failures: [], manifestHash: "hash" }; + }, + project: async () => ({ + ok: true, + failures: [], + evidence: { commands: [] }, + commandOutcomes: [], + outputLogs: [], + }), + }); + + await verifier.verify({ + repoRoot: "/test/repo", + worktreePath: "/test/worktree", + baseCommitOid: "1111111111111111111111111111111111111111", + artifact: { + baseCommitOid: "1111111111111111111111111111111111111111", + candidateCommitOid: "2222222222222222222222222222222222222222", + candidateTreeOid: "3333333333333333333333333333333333333333", + anchorRef: "refs/test", + manifestHash: "hash", + changedPaths: [], + patchRef: "patch.diff", + }, + spec: { + id: "test", + protocolVersion: "1", + targetRepo: { path: "/test/repo", head: "1111111111111111111111111111111111111111" }, + producer: { name: "codex" }, + policy: { writeScope: ["."], forbiddenScope: [], networkAccess: "none" }, + writeAllowlist: ["."], + forbiddenScope: [], + instructions: { goal: "test" }, + verification: [], + }, + ps: {} as any, + artifactStore: { writeLog: async () => "logs/test.log" }, + }); + + expect(observedMode).toBe("final-branch"); + }); + }); +}); diff --git a/tests/runtime/worktree-sweep.test.ts b/tests/runtime/worktree-sweep.test.ts index 9e9b953..c4261e4 100644 --- a/tests/runtime/worktree-sweep.test.ts +++ b/tests/runtime/worktree-sweep.test.ts @@ -22,6 +22,7 @@ import { WorkflowStore } from "../../src/autopilot/workflow-store.js"; import { WorktreeManager } from "../../src/runtime/worktree-manager.js"; import { getPlatformServices } from "../../src/platform/select-platform.js"; import { ArtifactStore } from "../../src/runtime/artifact-store.js"; +import { platformServicesDouble } from "../helpers/platform-services-double.js"; import { recoverStaleRuns, type RecoveryDependencies, @@ -538,13 +539,13 @@ describe("startup worktree sweep", () => { })); try { await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: getPlatformServices().os, async getProcessStartToken(pid) { return pid === process.pid ? "live-checkout-owner" : null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === process.pid, })).resolves.toEqual({ recovered: [], quarantined: [] }); await expect(access(worktree.path)).resolves.toBeUndefined(); @@ -724,11 +725,11 @@ describe("startup worktree sweep", () => { try { await expect(recoverStaleRuns({ isProcessAlive: pid => pid === process.pid, - platformServices: { + platformServices: platformServicesDouble({ os: process.platform, getProcessStartToken: async () => null, async terminateProcessTreeByPid() {}, - }, + }), })).resolves.toEqual({ recovered: [], quarantined: [], @@ -993,7 +994,7 @@ describe("startup worktree sweep", () => { await writeCheckoutOwner(repo, JSON.stringify(owner)); let published = false; dependencies = { - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === owner.pid) { @@ -1006,7 +1007,7 @@ describe("startup worktree sweep", () => { return "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === owner.pid, }; } else if (state === "terminal-cleanup-deferred-by-empty-owner") { @@ -1029,7 +1030,7 @@ describe("startup worktree sweep", () => { const liveOwner = { pid: 9402, processToken: "darwin:live-pipeline" }; await writeCheckoutOwner(repo, JSON.stringify(checkoutOwner)); dependencies = { - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(pid) { if (pid === checkoutOwner.pid) { @@ -1043,7 +1044,7 @@ describe("startup worktree sweep", () => { return pid === liveOwner.pid ? liveOwner.processToken : "darwin:self"; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === checkoutOwner.pid || pid === liveOwner.pid, }; } else if (state === "terminal-live-owner") { @@ -1054,11 +1055,11 @@ describe("startup worktree sweep", () => { sliced: false, }); dependencies = { - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4243, }; } else { @@ -1093,13 +1094,13 @@ describe("startup worktree sweep", () => { let terminated = false; await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken(observedPid) { return observedPid === pid ? processToken : "darwin:recovery-token"; }, async terminateProcessTreeByPid() { terminated = true; }, - }, + }), isProcessAlive: observedPid => observedPid === pid, })).resolves.toEqual({ recovered: [], quarantined: [] }); @@ -1127,11 +1128,11 @@ describe("startup worktree sweep", () => { ).create(repo.head); await expect(recoverStaleRuns({ - platformServices: { + platformServices: platformServicesDouble({ os: "darwin", async getProcessStartToken() { return null; }, async terminateProcessTreeByPid() {}, - }, + }), isProcessAlive: pid => pid === 4243, })).resolves.toEqual({ recovered: ["run"], quarantined: [] }); @@ -1196,6 +1197,17 @@ describe("worktree lease coverage", () => { const source = await readFile(filename, "utf8"); if (!source.includes("worktree-manager.js")) continue; for (const line of source.split("\n")) { + // `withManagedWorktree` creates a worktree on its caller's behalf, so a + // call to it is a creation site too. Without this the helper would hide + // creations from the very inventory that exists to name them. + const borrows = /\bwithManagedWorktree\s*\(/u.test(line) + && !/\bfunction\s+withManagedWorktree/u.test(line); + if (borrows) { + calls.push( + `${path.relative(repositoryRoot, filename).replaceAll(path.sep, "/")}#withManagedWorktree`, + ); + continue; + } if (!/\.create(?:Attached)?\s*\(/u.test(line) || line.includes("Object.create(")) continue; const method = line.match(/\.create(Attached)?\s*\(/u)?.[1] === "Attached" ? "createAttached" @@ -1211,13 +1223,14 @@ describe("worktree lease coverage", () => { // leases in branch-manager tests. const instructions = "A new WorktreeManager create call needs a behavioral lease-lifetime " + "test for its ownership model, then must be added to this audited inventory."; - expect(calls, instructions).toHaveLength(9); + expect(calls, instructions).toHaveLength(10); expect(calls, instructions).toEqual([ "src/autopilot/branch-manager.ts#createAttached", "src/autopilot/final-branch-reviewer.ts#create", + "src/pipeline/candidate-verifier.ts#withManagedWorktree", "src/pipeline/pipeline-runtime.ts#create", - "src/pipeline/pipeline-runtime.ts#create", - "src/pipeline/pipeline-runtime.ts#create", + "src/pipeline/slice-runner.ts#withManagedWorktree", + "src/pipeline/slice-runner.ts#withManagedWorktree", "src/runtime/attempt-runtime.ts#create", "src/runtime/producer-preflight.ts#create", "src/verify/baseline-verifier.ts#create", From ac03d68dc96bd3338320e9387a32d45baf33dcda Mon Sep 17 00:00:00 2001 From: elkaix Date: Wed, 2 Sep 2026 22:03:21 -0400 Subject: [PATCH 11/12] Close Phases 5 and 6: phase functions, descriptor-driven store, run-bound reads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit runPipelineWithLease is 345 lines, down from 1048. Increments, review rounds, candidate promotion, the halted-slice path, salvage and archive, and the final gate are named functions over one explicit PipelineRunState value; each phase returns continue or a terminal PipelineResult instead of writing into a shared closure. RunContext gains a default sliceIndex so post-wave status lines no longer need a pipeline-local emitter. ArtifactStore is descriptor-driven: one ArtifactDescriptor per archived kind names the file, the read validator, the write-side redaction and validation, and the write mode. Every typed façade is one line over readArtifact and writeArtifact, reads share readEvidence's traversal and identity guards, and writes sit on PlatformSafety.writeAtomic. artifact-store-bytes.test.ts pins hashes recorded from the hand-written façades, so the rewrite is proven byte-identical. The store is bound to its run once. Read façades take no run id; the tool, review-snapshot, run-decision, and advisor-stage store interfaces follow, and prune reads each candidate run through a store bound to that run rather than through the caller's. tests/README.md maps every test file to the interface it crosses and records a verdict for each site that reaches past one. All fifteen call through to the real implementation and only observe or inject a fault, so nothing moved. --- CHANGELOG.md | 4 + CONTEXT.md | 7 +- runtime/server.mjs | 1974 ++++++++--------- src/autopilot/candidate-promoter.ts | 10 +- src/autopilot/final-branch-reviewer.ts | 6 +- src/mcp/tools.ts | 24 +- src/pipeline/advisor-stage.ts | 10 +- src/pipeline/pipeline-runtime.ts | 1651 +++++++------- src/pipeline/run-context.ts | 5 +- src/runtime/artifact-store.ts | 546 +++-- src/runtime/recovery-manager.ts | 12 +- src/runtime/review-snapshot.ts | 8 +- src/runtime/run-decision.ts | 20 +- src/runtime/run-status.ts | 2 +- tests/README.md | 188 ++ tests/runtime/artifact-store-bytes.test.ts | 150 ++ tests/runtime/artifact-store.test.ts | 90 +- tests/runtime/attempt-runtime.test.ts | 2 +- .../autopilot/autopilot-adversarial.test.ts | 2 +- .../autopilot/autopilot-windows.test.ts | 6 +- tests/runtime/decision-authority.test.ts | 2 +- tests/runtime/e2e-pipeline.test.ts | 4 +- .../legacy-decision-provenance.test.ts | 14 +- tests/runtime/mcp-decision-gate.test.ts | 6 +- tests/runtime/pipeline-runtime.test.ts | 94 +- tests/runtime/pipeline/advisor-stage.test.ts | 18 +- tests/runtime/recovery-manager.test.ts | 40 +- tests/runtime/review-snapshot.test.ts | 2 +- tests/runtime/run-decision.test.ts | 10 +- tests/runtime/run-status.test.ts | 12 +- tests/runtime/tools.test.ts | 4 +- tests/runtime/worktree-sweep.test.ts | 4 +- 32 files changed, 2580 insertions(+), 2347 deletions(-) create mode 100644 tests/README.md create mode 100644 tests/runtime/artifact-store-bytes.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index bbb39af..e7dbca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,14 @@ All notable changes to Claude Architect are recorded here. The format follows - Unified candidate evaluation into `RunDecision` (`src/runtime/run-decision.ts`). `readRunDecisionSnapshot` loads a run's result, manifest, review snapshot, gate clearance, and decision once and checks their cross-file coherence in one place; `evaluate` returns a typed `RunVerdict` — `accepted` (autonomous), `human-required`, `rejected`, `incomplete`, or `invalid` — replacing the accept-only rule that was written twice, in `mcp/server.ts` and `mcp/tools.ts`. The decide path now reads the archive once: `loadArchivedRun` carries the snapshot it read, and the provenance resolver judges that snapshot through the pure `verdictFor` rather than re-reading five files per caller. - `pipelineGateCleared` is a versioned artifact next to `CandidateDecisionV2`, with its own canonical schema at `runtime/schemas/pipeline-gate-cleared.v1.json`. The artifact store validates every durable record against that schema on both read and write, so a malformed clearance is an `invalid` verdict with a reason rather than a shape-sniffed warning string, and a record that reached disk malformed never reads back as "absent". - Acceptance verification takes a named `mode` — `candidate`, `composed-slice`, or `final-branch` — instead of an injected structural verifier. `MODE_STRUCTURAL_FAILURES` declares the failure classes each mode may report and now drives `structuralVerify`, which skips the work that proves a class the mode cannot report. The pipeline's `IGNORED_STRUCTURAL_FAILURES` filter, the final branch reviewer's substitute verifier and its private `finalPathAllowed` copy, and the second scope-violation glob in `verifyCandidate` are all gone: one scope rule, one symlink rule, one manifest recomputation across every mode. +- `runPipelineWithLease` is 345 lines, down from 1048. The increment loop, the review rounds, candidate promotion, the halted-slice path, the salvage and archive paths, and the final gate are named functions over one explicit `PipelineRunState` value, and each phase returns `continue` or a terminal `PipelineResult` instead of writing into a shared closure. Status lines after the slice wave default to the last slice index through `RunContext` rather than a pipeline-local emitter. +- `ArtifactStore` is descriptor-driven. One `ArtifactDescriptor` per archived kind names the file, the read validator, the write-side redaction and validation, and the write mode; every typed façade is one line over a shared `readArtifact`/`writeArtifact` pair, and `writeArtifact` is built on `PlatformSafety.writeAtomic`. Reads go through the same traversal and identity guards as `readEvidence`, so no façade carries its own copy of them. `tests/runtime/artifact-store-bytes.test.ts` pins the archive bytes with hashes recorded from the hand-written façades, so the rewrite is proven byte-identical. +- The store is bound to its run once. `ArtifactStore` validated the run id at construction and then took it again on every read; the read façades (`readManifest()`, `readResult()`, `readDecision()`, …) now take no run id, and the `ToolArtifactStore`, `ReviewSnapshotStore`, `RunDecisionStore`, and advisor-stage store interfaces follow. Prune reads each candidate run through a store bound to that run rather than through the caller's. - `RecoveryDependencies` drops `requestCooperativeTermination`, `delayMs`, and `graceMs`, which were retained for input compatibility and did nothing, and takes `platformServices` whole. `recoverStaleRuns` no longer rebuilds a `PlatformServices` by grafting a caller's three methods onto the selected platform — production code that existed only to complete an incomplete test double. Recovery never took a checkout lease through that object; leases come from `platformSafety.withRecoveryLease`. ### Documentation +- `tests/README.md` maps every test file to the module and exported interface it crosses and lists the tests that reach past an interface, with the disposition of each. - `docs/README.md` indexes every document under `docs/` as current, historical, or superseded, naming the superseding document where one exists. - `docs/ARCHITECTURE.md` maps each `AGENTS.md` trust invariant to exactly one owning subsystem and file; `SECURITY_MODEL.md`, `TRUST_BOUNDARIES.md`, and `THREAT_MODEL.md` point at that mapping. - `docs/MARKETPLACE_REVIEW.md` states edit-lane confinement evidence per lane and platform, and says plainly that no lane has native Windows edit evidence and none is claimed — five of the six lanes are unsupported for editing off macOS because `macos-seatbelt` declares no Linux or Windows platform at all. diff --git a/CONTEXT.md b/CONTEXT.md index bb34ed6..cddbc73 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -78,6 +78,10 @@ A machine-readable observation of a Producer's availability, version, authentica The reproducibility record for a Delegation Attempt. It identifies the base commit, Producer version and model, effective configuration policy, repository instruction paths and hashes, prompt hash, execution policy, and runtime version. +### Artifact Descriptor + +The data record behind one kind of archived artifact in the Artifact Store: its file under the run directory, the validator that proves archived bytes are that kind on the way out, and, for kinds the store writes, the redaction-and-validation step on the way in plus the write mode (immutable, replace, or replace-if-present). Every typed store façade (`readManifest()`, `readDecision()`, …) is one line over the shared `readArtifact`/`writeArtifact` pair. A store is bound to one run at construction; its façades name no run id. + ### Routing Policy Host-owned rules that order Producer preferences and required capabilities. Routing Policy is distinct from the Producer registry, which contains machine facts rather than preferences. @@ -212,6 +216,7 @@ Claude Code | `-- LaunchPlanner & Supervisor |-- PipelineRuntime | |-- RunContext (run-scoped facts; no shared mutable closure) + | |-- PipelineRunState -> increments -> review rounds -> promote -> gate | `-- SliceRunner | |-- plan wave -> worktree -> launch -> freeze -> verify -> review | `-- compose -> release anchor @@ -219,7 +224,7 @@ Claude Code | |-- WorktreeManager | |-- EnvironmentPolicy | |-- ProcessSupervisor - | |-- ArtifactStore + | |-- ArtifactStore (run-bound; one ArtifactDescriptor per kind) | `-- RecoveryManager |-- RunDecision | |-- RunDecisionSnapshot (one read per decision) diff --git a/runtime/server.mjs b/runtime/server.mjs index 564ed1b..f917931 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -8012,8 +8012,8 @@ var ZodError = class _ZodError extends Error { let i = 0; while (i < issue2.path.length) { const el = issue2.path[i]; - const terminal = i === issue2.path.length - 1; - if (!terminal) { + const terminal2 = i === issue2.path.length - 1; + if (!terminal2) { curr[el] = curr[el] || { _errors: [] }; } else { curr[el] = curr[el] || { _errors: [] }; @@ -12796,8 +12796,8 @@ function formatError(error51, mapper = (issue2) => issue2.message) { let i = 0; while (i < fullpath.length) { const el = fullpath[i]; - const terminal = i === fullpath.length - 1; - if (!terminal) { + const terminal2 = i === fullpath.length - 1; + if (!terminal2) { curr[el] = curr[el] || { _errors: [] }; } else { curr[el] = curr[el] || { _errors: [] }; @@ -12834,7 +12834,7 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) { let i = 0; while (i < fullpath.length) { const el = fullpath[i]; - const terminal = i === fullpath.length - 1; + const terminal2 = i === fullpath.length - 1; if (typeof el === "string") { curr.properties ?? (curr.properties = {}); (_a3 = curr.properties)[el] ?? (_a3[el] = { errors: [] }); @@ -12844,7 +12844,7 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) { (_b = curr.items)[el] ?? (_b[el] = { errors: [] }); curr = curr.items[el]; } - if (terminal) { + if (terminal2) { curr.errors.push(mapper(issue2)); } i++; @@ -35166,8 +35166,8 @@ function assertSemanticState(state, workflowId) { if (taskIds.size !== state.tasks.length) { throw workflowError("workflow task ids must be unique", "invalid-workflow-state"); } - const terminal = TERMINAL_PHASES.has(state.phase); - if (terminal !== (state.terminal !== null) || state.terminal !== null && state.terminal.classification !== state.phase) { + const terminal2 = TERMINAL_PHASES.has(state.phase); + if (terminal2 !== (state.terminal !== null) || state.terminal !== null && state.terminal.classification !== state.phase) { throw workflowError( "workflow terminal record must match the terminal phase", "invalid-workflow-state" @@ -39911,8 +39911,8 @@ function requireCoherentCandidate(runId, result, manifest) { } async function createReviewSnapshot(run) { const [result, manifest] = await Promise.all([ - run.store.readResult(run.runId), - run.store.readManifest(run.runId) + run.store.readResult(), + run.store.readManifest() ]); if (result === null || manifest === null) { throw reviewError("archived run was not found", "run-not-found"); @@ -43224,8 +43224,8 @@ async function executeCommand(args) { const stdout = boundText(redact(exit?.stdout ?? "")); const stderr = boundText(redact(exit === null ? failureText : [exit.stderr, exit.spawnError === void 0 ? "" : errorMessage(exit.spawnError)].filter(Boolean).join("\n"))); const exitCode = exit?.exitCode ?? null; - const terminal = exit === null || exit.spawnError !== void 0 ? "spawn-error" : exit.cancelled === true ? "cancelled" : exit.timedOut === true ? "timeout" : exit.exitCode === null ? "signal" : "exited"; - const failed = terminal !== "exited" || exitCode === null || !command.expectedExitCodes.includes(exitCode); + const terminal2 = exit === null || exit.spawnError !== void 0 ? "spawn-error" : exit.cancelled === true ? "cancelled" : exit.timedOut === true ? "timeout" : exit.exitCode === null ? "signal" : "exited"; + const failed = terminal2 !== "exited" || exitCode === null || !command.expectedExitCodes.includes(exitCode); return { outcome: { id: redact(command.id), @@ -43255,7 +43255,7 @@ async function executeCommand(args) { { name: stderrName, text: stderr.text } ], failed, - terminal + terminal: terminal2 }; } finally { registration.dispose(); @@ -44464,6 +44464,113 @@ function validatePostPipelineAutopilotArtifacts(value, runId) { eligibilityRecordHash: expectedEligibilityHash }; } +function validatePipelineActiveMarker(value, message) { + const marker = value; + if (typeof marker !== "object" || marker === null || typeof marker.pid !== "number" || !Number.isSafeInteger(marker.pid) || marker.pid <= 1 || marker.processToken !== null && typeof marker.processToken !== "string" || typeof marker.startedAt !== "string" || !Number.isFinite(Date.parse(marker.startedAt)) || typeof marker.sliced !== "boolean") { + throw new RuntimeError(message); + } + return marker; +} +var RUN_STATUS = { + relativePath: "status.json", + parse(value) { + if (!runStatusSchema(value)) throw new RuntimeError("archived run status is malformed"); + return value; + }, + write: { + mode: "replace-if-present", + prepare(status) { + const sanitized = { + ...structuredClone(status), + detail: status.detail === null ? null : redact(status.detail).slice(0, 200) + }; + if (!runStatusSchema(sanitized)) throw new RuntimeError("run status is invalid"); + return sanitized; + } + } +}; +var RESULT = { + relativePath: "result.json", + parse: verifyAttemptResult, + write: { + mode: "immutable", + prepare: (result, runId) => verifyAttemptResult(sanitizeAttemptResult(result), runId) + } +}; +var MANIFEST = { + relativePath: "manifest.json", + parse: verifyRunManifest, + write: { + mode: "immutable", + prepare: (manifest, runId) => verifyRunManifest(sanitizeRunManifest(manifest), runId) + } +}; +var RUN_START_SPEC_SHA256 = { + relativePath: "run-start.json", + parse(record2) { + if (typeof record2 !== "object" || record2 === null) return null; + const value = record2.specSha256; + return typeof value === "string" && /^[0-9a-f]{64}$/u.test(value) ? value : null; + } +}; +var REVIEW_SNAPSHOT = { + relativePath: "review-snapshot.json", + parse(value, runId) { + const snapshot = validateReviewSnapshot(value, runId); + reviewSnapshotHash(snapshot); + return snapshot; + }, + write: { mode: "immutable", prepare: validateReviewSnapshot } +}; +var DECISION = { + relativePath: "decision.json", + parse: parsePersistedDecision, + write: { mode: "immutable", prepare: (decision) => decision } +}; +var PIPELINE_GATE_CLEARED = { + relativePath: "pipeline-gate-cleared.json", + parse(value) { + if (!pipelineGateClearedSchema(value)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return parsePipelineGateCleared(value); + }, + write: { + mode: "immutable", + prepare(cleared) { + const validated = parsePipelineGateCleared(cleared); + if (!pipelineGateClearedSchema(validated)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return validated; + } + } +}; +var PIPELINE_ACTIVE_MARKER = { + relativePath: "pipeline-active.json", + parse: (value) => validatePipelineActiveMarker(value, "archived pipeline-active marker is malformed"), + write: { + mode: "replace", + prepare: (marker) => validatePipelineActiveMarker(marker, "pipeline-active marker is invalid") + } +}; +var POST_PIPELINE_AUTOPILOT = { + relativePath: "pipeline/post-pipeline-autopilot.json", + parse: validatePostPipelineAutopilotArtifacts, + write: { mode: "immutable", prepare: (artifacts) => artifacts } +}; +function pipelineArtifact(name) { + validateComponent(name, "log name"); + return { + relativePath: path21.posix.join("pipeline", `${name}.json`), + parse: (value) => value, + write: { mode: "immutable", prepare: (value) => redactRecord(value) } + }; +} +function logReference(name) { + validateComponent(name, "log name"); + return path21.posix.join("logs", `${name}.log`); +} var ArtifactStore = class _ArtifactStore { runDirectory; runsRoot; @@ -44532,94 +44639,66 @@ var ArtifactStore = class _ArtifactStore { await session.close(); } } - async writeJson(relativePath, value) { - const serialized = `${serializeJson(value, 2)} -`; - await this.writeArchiveFile(relativePath, serialized); + /** + * Read one archived artifact of this run. Traversal, symlinks, and directory + * identity are policed by `readEvidence`; the descriptor proves the bytes are + * the kind it names. Absent artifacts read as null; malformed ones throw. + */ + async readArtifact(descriptor) { + const text = await this.readEvidence(descriptor.relativePath); + if (text === null) return null; + return descriptor.parse(JSON.parse(text), this.runId); } - async replaceJson(relativePath, value) { - if (path21.isAbsolute(relativePath) || path21.dirname(relativePath) !== "." || path21.basename(relativePath) !== relativePath || !isSafeComponent(relativePath)) { + /** + * Write one archived artifact of this run. The descriptor's `prepare` step + * redacts and validates the value; the write mode decides whether a second + * write is refused (`immutable`), replaces the file (`replace`), or is + * skipped when the run archive is gone (`replace-if-present`). A caller may + * name `replace` explicitly for the one documented promotion path. + */ + async writeArtifact(descriptor, value, mode = descriptor.write.mode) { + const serialized = `${serializeJson(descriptor.write.prepare(value, this.runId), 2)} +`; + if (mode === "immutable") { + await this.writeArchiveFile(descriptor.relativePath, serialized); + return; + } + const leaf = descriptor.relativePath; + if (path21.posix.dirname(leaf) !== "." || !isSafeComponent(leaf)) { throw new RuntimeError("replacement archive path must be a safe relative leaf"); } const directory = await this.ensureRunDirectory(false); - if (directory === null) throw new RuntimeError("run archive does not exist"); + if (directory === null) { + if (mode === "replace-if-present") return; + throw new RuntimeError("run archive does not exist"); + } const session = await openDurableDirectorySession(directory); try { - const serialized = `${serializeJson(value, 2)} -`; - await platformSafety.writeAtomic(session, relativePath, serialized, "replace"); + await platformSafety.writeAtomic(session, leaf, serialized, "replace"); } finally { await session.close(); } } + assertOwned(runId, what) { + if (runId !== this.runId) throw new RuntimeError(`${what} does not match artifact store`); + } async writeRunStatus(status) { - if (status.runId !== this.runId) { - throw new RuntimeError("run status id does not match artifact store"); - } - const sanitized = { - ...structuredClone(status), - detail: status.detail === null ? null : redact(status.detail).slice(0, 200) - }; - if (!runStatusSchema(sanitized)) { - throw new RuntimeError("run status is invalid"); - } - const directory = await this.ensureRunDirectory(false); - if (directory === null) return; - await this.replaceJson("status.json", sanitized); + this.assertOwned(status.runId, "run status id"); + await this.writeArtifact(RUN_STATUS, status); } - async readRunStatus(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const value = JSON.parse(await readRegularFile( - path21.join(validated.path, "status.json"), - validated.identity - )); - if (!runStatusSchema(value)) throw new RuntimeError("archived run status is malformed"); - return value; - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readRunStatus() { + return this.readArtifact(RUN_STATUS); } async writeLog(name, text) { - validateComponent(name, "log name"); - const ref = path21.posix.join("logs", `${name}.log`); + const ref = logReference(name); await this.writeArchiveFile(ref, redact(text)); return ref; } async writePipelineArtifact(name, value) { - validateComponent(name, "log name"); - await this.writeJson( - path21.posix.join("pipeline", `${name}.json`), - redactRecord(value) - ); + await this.writeArtifact(pipelineArtifact(name), value); } - async readPipelineArtifact(runId, name) { - validateComponent(runId, "run id"); - validateComponent(name, "log name"); - const runDirectory = path21.join(this.runsRoot, runId); - const validatedRun = await this.ensureExistingRunDirectory(runDirectory); - if (validatedRun === null) return null; - const validated = await this.ensureExistingRunDirectory(path21.join(runDirectory, "pipeline")); - if (validated === null) return null; - if (!isWithin(validatedRun.path, validated.path)) { - throw new RuntimeError("pipeline archive directory escapes run directory"); - } - await assertDirectoryIdentity5(validatedRun.path, validatedRun.identity); - try { - const value = JSON.parse(await readRegularFile( - path21.join(validated.path, `${name}.json`), - validated.identity - )); - await assertDirectoryIdentity5(validatedRun.path, validatedRun.identity); - return value; - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readPipelineArtifact(name) { + return this.readArtifact(pipelineArtifact(name)); } /** * Read immutable evidence bytes from this run without permitting traversal or @@ -44723,55 +44802,30 @@ var ArtifactStore = class _ArtifactStore { return references.sort(); } async writeResult(result) { - if (result.runId !== this.runId) { - throw new RuntimeError("attempt result run id does not match artifact store"); - } - const sanitized = sanitizeAttemptResult(result); - verifyAttemptResult(sanitized, this.runId); - await this.writeJson("result.json", sanitized); + this.assertOwned(result.runId, "attempt result run id"); + await this.writeArtifact(RESULT, result); } async writeManifest(manifest) { - if (manifest.runId !== this.runId) { - throw new RuntimeError("run manifest id does not match artifact store"); - } - const sanitized = sanitizeRunManifest(manifest); - verifyRunManifest(sanitized, this.runId); - await this.writeJson("manifest.json", sanitized); + this.assertOwned(manifest.runId, "run manifest id"); + await this.writeArtifact(MANIFEST, manifest); } + /** + * Replace the terminal result and manifest in place. This is the one path + * that rewrites an immutable artifact: the pipeline promotes the reviewed + * branch over the initial attempt's record. It is refused once a decision + * exists, because the decision was made about the earlier bytes. + */ async promoteTerminalArtifacts(args) { - if (args.result.runId !== this.runId) { - throw new RuntimeError("attempt result run id does not match artifact store"); - } - if (args.manifest.runId !== this.runId) { - throw new RuntimeError("run manifest id does not match artifact store"); - } - if (await this.readCandidateDecision(this.runId) !== null) { + this.assertOwned(args.result.runId, "attempt result run id"); + this.assertOwned(args.manifest.runId, "run manifest id"); + if (await this.readCandidateDecision() !== null) { throw new RuntimeError("terminal artifacts cannot be promoted after a decision"); } - const result = sanitizeAttemptResult(args.result); - verifyAttemptResult(result, this.runId); - const manifest = sanitizeRunManifest(args.manifest); - verifyRunManifest(manifest, this.runId); - await this.replaceJson("result.json", result); - await this.replaceJson("manifest.json", manifest); + await this.writeArtifact(RESULT, args.result, "replace"); + await this.writeArtifact(MANIFEST, args.manifest, "replace"); } - async readResult(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - return verifyAttemptResult( - JSON.parse(await readRegularFile( - path21.join(validated.path, "result.json"), - validated.identity - )), - runId - ); - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readResult() { + return this.readArtifact(RESULT); } async ensureExistingRunDirectory(directory) { const canonicalRunsRoot = await this.ensureRunsRoot(); @@ -44792,54 +44846,24 @@ var ArtifactStore = class _ArtifactStore { throw error51; } } - async readManifest(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - return verifyRunManifest( - JSON.parse(await readRegularFile( - path21.join(validated.path, "manifest.json"), - validated.identity - )), - runId - ); - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readManifest() { + return this.readArtifact(MANIFEST); } /** * The spec hash recorded when this run started, or null when the run or the * record is absent. Lets a caller prove a reported run id actually belongs to * the spec it dispatched, rather than trusting the reporter's echo of it. */ - async readRunStartSpecSha256(runId) { - validateComponent(runId, "run id"); - const validated = await this.ensureExistingRunDirectory(path21.join(this.runsRoot, runId)); - if (validated === null) return null; - try { - const record2 = JSON.parse(await readRegularFile( - path21.join(validated.path, "run-start.json"), - validated.identity - )); - if (typeof record2 !== "object" || record2 === null) return null; - const value = record2.specSha256; - return typeof value === "string" && /^[0-9a-f]{64}$/u.test(value) ? value : null; - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readRunStartSpecSha256() { + return this.readArtifact(RUN_START_SPEC_SHA256); } async writeReviewSnapshot(snapshot) { - const validated = validateReviewSnapshot(snapshot, this.runId); - const attemptedHash = reviewSnapshotHash(validated); + const attemptedHash = reviewSnapshotHash(validateReviewSnapshot(snapshot, this.runId)); try { - await this.writeJson("review-snapshot.json", validated); + await this.writeArtifact(REVIEW_SNAPSHOT, snapshot); return; } catch (error51) { - const existing = await this.readReviewSnapshot(this.runId); + const existing = await this.readReviewSnapshot(); if (existing === null) throw error51; if (reviewSnapshotHash(existing) === attemptedHash) return; throw new RuntimeError( @@ -44848,35 +44872,17 @@ var ArtifactStore = class _ArtifactStore { ); } } - async readReviewSnapshot(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const snapshot = validateReviewSnapshot( - JSON.parse(await readRegularFile( - path21.join(validated.path, "review-snapshot.json"), - validated.identity - )), - runId - ); - reviewSnapshotHash(snapshot); - return snapshot; - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readReviewSnapshot() { + return this.readArtifact(REVIEW_SNAPSHOT); } - async readAdvisorReport(runId) { - const value = await this.readPipelineArtifact(runId, "post-pipeline-autopilot"); - return value === null ? null : validatePostPipelineAutopilotArtifacts(value, runId).advisorReport; + async readAdvisorReport() { + return (await this.readArtifact(POST_PIPELINE_AUTOPILOT))?.advisorReport ?? null; } async recomputeArchivedEligibility(record2) { const [pipelineResult, reviewSnapshot, advisorReport] = await Promise.all([ - this.readPipelineArtifact(this.runId, "pipeline-result"), - this.readReviewSnapshot(this.runId), - this.readAdvisorReport(this.runId) + this.readPipelineArtifact("pipeline-result"), + this.readReviewSnapshot(), + this.readAdvisorReport() ]); if (pipelineResult === null || reviewSnapshot === null || advisorReport === null) return null; return evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ @@ -44886,14 +44892,14 @@ var ArtifactStore = class _ArtifactStore { evaluatedAt: record2.evaluatedAt })); } - async readAutopilotEligibility(runId) { - validateComponent(runId, "run id"); - const value = await this.readPipelineArtifact(runId, "post-pipeline-autopilot"); - if (value === null) return null; - const record2 = validatePostPipelineAutopilotArtifacts(value, runId).eligibility; - if (runId !== this.runId) { - return new _ArtifactStore(runId).readAutopilotEligibility(runId); - } + /** + * The archived eligibility record, re-derived from the archived evidence it + * claims to summarize. A record that no longer matches its evidence is an + * error, not a value. + */ + async readAutopilotEligibility() { + const record2 = (await this.readArtifact(POST_PIPELINE_AUTOPILOT))?.eligibility ?? null; + if (record2 === null) return null; const expected = await this.recomputeArchivedEligibility(record2); if (expected === null) return null; if (canonicalArtifactHash(expected) !== canonicalArtifactHash(record2)) { @@ -44903,8 +44909,8 @@ var ArtifactStore = class _ArtifactStore { } async writePostPipelineAutopilotArtifacts(args) { const [archivedPipelineResult, archivedReviewSnapshot] = await Promise.all([ - this.readPipelineArtifact(this.runId, "pipeline-result"), - this.readReviewSnapshot(this.runId) + this.readPipelineArtifact("pipeline-result"), + this.readReviewSnapshot() ]); if (archivedPipelineResult === null || archivedReviewSnapshot === null) { throw new RuntimeError("post-pipeline artifacts require a durable pipeline result and review snapshot"); @@ -44936,10 +44942,7 @@ var ArtifactStore = class _ArtifactStore { advisorReportHash: persistedAdvisorHash, eligibilityRecordHash }; - await this.writeJson( - path21.posix.join("pipeline", "post-pipeline-autopilot.json"), - artifacts - ); + await this.writeArtifact(POST_PIPELINE_AUTOPILOT, artifacts); return { advisorReportHash: persistedAdvisorHash, eligibilityRecordHash }; } async writeHumanDecision(record2) { @@ -44970,7 +44973,7 @@ var ArtifactStore = class _ArtifactStore { } catch { throw new RuntimeError("autopilot decision eligibility is invalid"); } - const archived = await this.readAutopilotEligibility(this.runId); + const archived = await this.readAutopilotEligibility(); if (archived === null || canonicalArtifactHash(archived) !== canonicalArtifactHash(validated) || candidate.baseCommitOid !== validated.baseCommitOid || candidate.candidateCommitOid !== validated.candidateCommitOid || candidate.candidateTreeOid !== validated.candidateTreeOid || candidate.manifestHash !== validated.candidateManifestHash || candidate.manifestHash !== manifestHashOf(candidate.changedPaths)) { throw new RuntimeError("autopilot decision eligibility is invalid"); } @@ -44988,10 +44991,10 @@ var ArtifactStore = class _ArtifactStore { } async writeCandidateDecision(persisted, normalized) { try { - await this.writeJson("decision.json", persisted); + await this.writeArtifact(DECISION, persisted); return; } catch (error51) { - const existing = await this.readCandidateDecision(this.runId); + const existing = await this.readCandidateDecision(); if (existing === null) throw error51; if (hasIdenticalDecisionProvenance(existing, normalized)) return; throw new RuntimeError( @@ -45000,81 +45003,28 @@ var ArtifactStore = class _ArtifactStore { ); } } - async readCandidateDecision(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const value = JSON.parse(await readRegularFile( - path21.join(validated.path, "decision.json"), - validated.identity - )); - return parsePersistedDecision(value); - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readCandidateDecision() { + return this.readArtifact(DECISION); } - async readDecision(runId) { - return this.readCandidateDecision(runId); + async readDecision() { + return this.readCandidateDecision(); } async writePipelineGateCleared(cleared) { - const validated = parsePipelineGateCleared(cleared); - if (!pipelineGateClearedSchema(validated)) { - throw new RuntimeError("the pipeline gate clearance record is malformed"); - } - await this.writeJson("pipeline-gate-cleared.json", validated); + await this.writeArtifact(PIPELINE_GATE_CLEARED, cleared); } - async readPipelineGateCleared(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - let value; - try { - value = JSON.parse(await readRegularFile( - path21.join(validated.path, "pipeline-gate-cleared.json"), - validated.identity - )); - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } - if (!pipelineGateClearedSchema(value)) { - throw new RuntimeError("the pipeline gate clearance record is malformed"); - } - return parsePipelineGateCleared(value); + async readPipelineGateCleared() { + return this.readArtifact(PIPELINE_GATE_CLEARED); } async writePipelineActiveMarker(marker) { - if (typeof marker !== "object" || marker === null || !Number.isSafeInteger(marker.pid) || marker.pid <= 1 || marker.processToken !== null && typeof marker.processToken !== "string" || typeof marker.startedAt !== "string" || !Number.isFinite(Date.parse(marker.startedAt)) || typeof marker.sliced !== "boolean") { - throw new RuntimeError("pipeline-active marker is invalid"); - } - await this.replaceJson("pipeline-active.json", marker); + await this.writeArtifact(PIPELINE_ACTIVE_MARKER, marker); } - async readPipelineActiveMarker(runId) { - validateComponent(runId, "run id"); - const runDirectory = path21.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const value = JSON.parse(await readRegularFile( - path21.join(validated.path, "pipeline-active.json"), - validated.identity - )); - if (typeof value !== "object" || value === null || typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 1 || value.processToken !== null && typeof value.processToken !== "string" || typeof value.startedAt !== "string" || !Number.isFinite(Date.parse(value.startedAt)) || typeof value.sliced !== "boolean") { - throw new RuntimeError("archived pipeline-active marker is malformed"); - } - return value; - } catch (error51) { - if (isMissing3(error51)) return null; - throw error51; - } + async readPipelineActiveMarker() { + return this.readArtifact(PIPELINE_ACTIVE_MARKER); } async clearPipelineActiveMarker() { const directory = await this.ensureRunDirectory(false); if (directory === null) return; - await rm7(path21.join(directory, "pipeline-active.json"), { force: true }); + await rm7(path21.join(directory, PIPELINE_ACTIVE_MARKER.relativePath), { force: true }); } async list() { await this.ensureRunsRoot(); @@ -45326,22 +45276,23 @@ var ArtifactStore = class _ArtifactStore { attempted.add(entry.runId); const quarantineName = `.prune-${entry.runId}-${randomUUID7()}`; const quarantinePath = path21.join(this.runsRoot, quarantineName); + const runStore = new _ArtifactStore(entry.runId); let prepared = null; let transaction = null; let runsRootIdentity = null; let archiveRemovalCommitted = false; let lease = null; try { - if (await this.readPipelineActiveMarker(entry.runId) !== null) { + if (await runStore.readPipelineActiveMarker() !== null) { retained.push({ runId: entry.runId, reason: "active-run" }); return; } - const initialManifest = await this.readManifest(entry.runId); + const initialManifest = await runStore.readManifest(); if (initialManifest === null) { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; } - const initialResult = await this.readResult(entry.runId); + const initialResult = await runStore.readResult(); if (initialResult === null) { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; @@ -45367,16 +45318,16 @@ var ArtifactStore = class _ArtifactStore { await safety.withCheckoutLease(canonical.canonical, async (acquiredLease) => { lease = acquiredLease; await assertDirectoryIdentity5(entry.directory, entry.identity); - const currentManifest = await this.readManifest(entry.runId); + const currentManifest = await runStore.readManifest(); if (currentManifest === null || serializeJson(currentManifest) !== serializeJson(initialManifest)) { retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); return; } - if (await this.readPipelineActiveMarker(entry.runId) !== null) { + if (await runStore.readPipelineActiveMarker() !== null) { retained.push({ runId: entry.runId, reason: "active-run" }); return; } - const result = await this.readResult(entry.runId); + const result = await runStore.readResult(); if (result === null) { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; @@ -45531,20 +45482,20 @@ var RunDecision = class { let decision = null; const coherenceErrors = []; try { - const readResult = typeof store.readResult === "function" ? store.readResult(runId).catch((err) => { + const readResult = typeof store.readResult === "function" ? store.readResult().catch((err) => { coherenceErrors.push(`failed to read result: ${err instanceof Error ? err.message : String(err)}`); return null; }) : Promise.resolve(null); - const readManifest = typeof store.readManifest === "function" ? store.readManifest(runId).catch((err) => { + const readManifest = typeof store.readManifest === "function" ? store.readManifest().catch((err) => { coherenceErrors.push(`failed to read manifest: ${err instanceof Error ? err.message : String(err)}`); return null; }) : Promise.resolve(null); - const readSnapshot = typeof store.readReviewSnapshot === "function" ? store.readReviewSnapshot(runId).catch(() => null) : Promise.resolve(null); - const readGateRecord = typeof store.readPipelineGateCleared === "function" ? store.readPipelineGateCleared(runId).catch((err) => { + const readSnapshot = typeof store.readReviewSnapshot === "function" ? store.readReviewSnapshot().catch(() => null) : Promise.resolve(null); + const readGateRecord = typeof store.readPipelineGateCleared === "function" ? store.readPipelineGateCleared().catch((err) => { gateRecordError = `the pipeline gate clearance record is malformed: ${err instanceof Error ? err.message : String(err)}`; return null; }) : Promise.resolve(null); - const readDecision = typeof store.readCandidateDecision === "function" ? store.readCandidateDecision(runId).catch((err) => { + const readDecision = typeof store.readCandidateDecision === "function" ? store.readCandidateDecision().catch((err) => { coherenceErrors.push(`failed to read decision: ${err instanceof Error ? err.message : String(err)}`); return null; }) : Promise.resolve(null); @@ -47541,9 +47492,9 @@ async function validateArchivedTaskEvidence(task, evidence, context) { snapshot = decisionSnapshot.reviewSnapshot; decision = decisionSnapshot.decision; [pipelineResult, advisor, eligibility] = await Promise.all([ - store.readPipelineArtifact(evidence.runId, "pipeline-result"), - store.readAdvisorReport(evidence.runId), - store.readAutopilotEligibility(evidence.runId) + store.readPipelineArtifact("pipeline-result"), + store.readAdvisorReport(), + store.readAutopilotEligibility() ]); } catch { fail2("missing-task-evidence", `task evidence archive is invalid: ${task.id}`); @@ -49918,10 +49869,10 @@ var CandidatePromoter = class { } async ensureAcceptedDecision(artifactStore, runId, artifact, eligibility, eligibilityHash) { try { - let decision = await artifactStore.readCandidateDecision(runId); + let decision = await artifactStore.readCandidateDecision(); if (decision === null) { await artifactStore.writeAutopilotDecision(artifact, eligibility, this.now()); - decision = await artifactStore.readCandidateDecision(runId); + decision = await artifactStore.readCandidateDecision(); } return decision?.decisionVersion === "2" && decision.authority === "autopilot-policy" && decision.decision === "accepted" && decision.candidateManifestHash === artifact.manifestHash && decision.evidenceHash === eligibilityHash; } catch { @@ -49988,9 +49939,9 @@ var CandidatePromoter = class { manifest = decisionSnapshot.manifest; snapshot = decisionSnapshot.reviewSnapshot; [pipelineResult, advisor, eligibility] = await Promise.all([ - artifactStore.readPipelineArtifact(request.runId, "pipeline-result"), - artifactStore.readAdvisorReport(request.runId), - artifactStore.readAutopilotEligibility(request.runId) + artifactStore.readPipelineArtifact("pipeline-result"), + artifactStore.readAdvisorReport(), + artifactStore.readAutopilotEligibility() ]); } catch { return finishFailure("evidence-mismatch"); @@ -50018,7 +49969,7 @@ var CandidatePromoter = class { } const safety = new PlatformSafety(this.platformServices); let enteredLease = false; - let terminal; + let terminal2; try { await safety.withCheckoutLease(request.workflowCheckoutPath, async (lock) => { enteredLease = true; @@ -50271,7 +50222,7 @@ var CandidatePromoter = class { }; } if (lockedOutcome.kind === "rejected") { - terminal = lockedOutcome.journalFailure ? await finishFailure(lockedOutcome.classification) : rejected(lockedOutcome.classification); + terminal2 = lockedOutcome.journalFailure ? await finishFailure(lockedOutcome.classification) : rejected(lockedOutcome.classification); } else { let journaled = !lockedOutcome.needsJournal; if (!journaled) { @@ -50285,11 +50236,11 @@ var CandidatePromoter = class { journaled = false; } } - terminal = !journaled ? rejected("journal-failed") : await this.deleteAnchor(request.workflowCheckoutPath, artifact) ? { status: "committed", commitOid: lockedOutcome.commitOid } : rejected("anchor-deletion-failed"); + terminal2 = !journaled ? rejected("journal-failed") : await this.deleteAnchor(request.workflowCheckoutPath, artifact) ? { status: "committed", commitOid: lockedOutcome.commitOid } : rejected("anchor-deletion-failed"); } }); } catch (error51) { - if (terminal?.status === "committed") { + if (terminal2?.status === "committed") { logger.warn("checkout lock release failed after candidate promotion", { event: "checkout-lock-release-failed", workflowId: request.workflowId, @@ -50301,7 +50252,7 @@ var CandidatePromoter = class { throw error51; } } - return terminal; + return terminal2; } }; @@ -51053,7 +51004,7 @@ async function writeRunStatusSafely(store, status) { } async function transitionRunStatusSafely(store, runId, phase, fields = {}) { try { - const current = await store.readRunStatus(runId); + const current = await store.readRunStatus(); if (current === null) return; await store.writeRunStatus({ ...current, @@ -52923,7 +52874,8 @@ function createRunContext(options) { borrowedCheckoutLease, runStart, onPhase, - sliceCount + sliceCount, + sliceIndex } = options; return { runId, @@ -52935,7 +52887,7 @@ function createRunContext(options) { ...runStart === void 0 ? {} : { runStart }, async emitStatus(phase, fields) { await transitionRunStatusSafely(store, runId, phase, { - sliceIndex: fields?.sliceIndex ?? null, + sliceIndex: fields?.sliceIndex ?? sliceIndex ?? null, sliceCount: fields?.sliceCount ?? sliceCount ?? null, round: fields?.round ?? null, role: fields?.role ?? null, @@ -53004,9 +52956,9 @@ async function runAdvisorStage(args) { }); try { const [archivedPipelineResult, archivedReviewSnapshot, archivedSpec] = await Promise.all([ - store.readPipelineArtifact(args.runId, "pipeline-result"), - store.readReviewSnapshot(args.runId), - store.readPipelineArtifact(args.runId, "delegation-spec") + store.readPipelineArtifact("pipeline-result"), + store.readReviewSnapshot(), + store.readPipelineArtifact("delegation-spec") ]); if (archivedPipelineResult === null) { throw new RuntimeError("advisor stage requires a durable archived PipelineResult"); @@ -53216,7 +53168,7 @@ function failedAttemptStatus(failure3) { } async function archiveSlicedFailure(args) { try { - const manifest = await args.store.readManifest(args.attempt.runId); + const manifest = await args.store.readManifest(); if (manifest === null) { throw new RuntimeError("run manifest is missing while archiving sliced failure"); } @@ -53348,7 +53300,7 @@ async function promoteFinalCandidate(args) { anchorRef: args.initialCandidate.anchorRef, diffText }); - const manifest = await args.store.readManifest(args.attempt.runId); + const manifest = await args.store.readManifest(); if (manifest === null) throw new RuntimeError("run manifest is missing during promotion"); const finalAttempt = { ...args.attempt, candidate }; await args.store.promoteTerminalArtifacts({ @@ -53394,35 +53346,587 @@ Object.defineProperty(runPipeline, "advisorStage", { configurable: false, writable: false }); +var CONTINUE = { state: "continue" }; +function terminal(result) { + return { state: "terminal", result }; +} +function failedAtCurrentCandidate(state, reason, failure3) { + return failedResult( + state.attempt, + state.rounds, + state.currentCandidateCommit, + reason, + failure3, + state.increments, + state.pipelineSlices + ); +} +async function archivePipelineFailure(context, state, args) { + const failedAttempt = state.sliced ? await archiveSlicedFailure({ + checkoutPath: context.checkoutPath, + attempt: state.attempt, + failure: args.failure, + reason: args.reason, + store: context.store + }) : state.attempt; + if (state.sliced) state.authoritySafeToRelease = true; + state.finalAttempt = failedAttempt; + return failedResult( + failedAttempt, + state.rounds, + state.currentCandidateCommit, + args.reason, + args.failure, + state.increments, + args.slices ?? state.pipelineSlices, + args.haltedSliceIndex ?? null + ); +} +async function salvagePipelineFailure(context, deps, state, args) { + const { checkoutPath, spec, store } = context; + const fallback = async () => archivePipelineFailure(context, state, args); + if (state.finalAttempt.candidate === null) return await fallback(); + let salvagedAttempt = state.finalAttempt; + let salvagedCommit = state.currentCandidateCommit; + if (salvagedCommit !== state.finalAttempt.candidate.candidateCommitOid) { + const promoted = await promoteFinalCandidate({ + checkoutPath, + attempt: state.finalAttempt, + initialCandidate: state.finalAttempt.candidate, + baselineCommit: state.baselineCommit, + candidateCommit: salvagedCommit, + store, + ...state.gitObjectAccess === null ? {} : { privateObjectAccess: state.gitObjectAccess } + }); + if (promoted === null) return await fallback(); + salvagedAttempt = promoted.attempt; + salvagedCommit = promoted.candidateCommit; + } + if (state.sliced) state.authoritySafeToRelease = true; + let verified; + try { + verified = await verifyCandidate({ + checkoutPath, + spec, + deps, + attempt: salvagedAttempt, + baselineCommit: state.baselineCommit, + candidateCommit: salvagedCommit, + store, + namespace: "salvage" + }); + } catch { + return await fallback(); + } + const manifestForArchive = await store.readManifest(); + if (manifestForArchive === null) return await fallback(); + if (!verified.verification.pass) { + const demoted = { + ...salvagedAttempt, + status: "failed", + failure: "verification-failure", + summary: args.reason, + unresolvedIssues: [ + ...salvagedAttempt.unresolvedIssues, + args.reason, + "salvage re-verification failed" + ], + evidence: { + ...salvagedAttempt.evidence, + pipelineFailure: { failure: args.failure, reason: args.reason } + } + }; + await store.promoteTerminalArtifacts({ result: demoted, manifest: manifestForArchive }); + state.finalAttempt = demoted; + await store.writePipelineArtifact("verification", verified.verification); + const failed = failedResult( + demoted, + state.rounds, + salvagedCommit, + args.reason, + args.failure, + state.increments, + state.pipelineSlices + ); + await store.writePipelineArtifact("pipeline-result", failed); + return failed; + } + salvagedAttempt = { + ...salvagedAttempt, + evidence: { + ...salvagedAttempt.evidence, + pipelineReviewIncomplete: { failure: args.failure, reason: args.reason } + } + }; + await store.promoteTerminalArtifacts({ + result: salvagedAttempt, + manifest: manifestForArchive + }); + state.finalAttempt = salvagedAttempt; + await store.writePipelineArtifact("verification", verified.verification); + const salvaged = { + runId: state.attempt.runId, + status: "human-decision-required", + attempt: salvagedAttempt, + increments: state.increments, + slices: state.pipelineSlices, + haltedSliceIndex: null, + rounds: state.rounds, + verification: verified.verification, + gate: { + decisionReady: false, + requiresHumanDecision: true, + reasons: [ + args.reason, + "the candidate passed independent verification; the pipeline could not complete its own review, so the whole-branch review is the human's" + ] + }, + finalCandidateCommit: salvagedCommit, + failure: null + }; + await store.writePipelineArtifact("pipeline-result", salvaged); + return salvaged; +} +async function resolveHaltedSlicePhase(context, deps, state, phase) { + const { checkoutPath, spec, store } = context; + const halted = phase.slices.at(-1); + const reason = `slice phase halted at slice ${phase.haltedSliceIndex}: ${halted?.reasons.join("; ") ?? "objective gate failed"}`; + const archiveHalt = async (haltReason, failure3) => { + const failed = await archivePipelineFailure(context, state, { + reason: haltReason, + failure: failure3, + slices: phase.slices, + haltedSliceIndex: phase.haltedSliceIndex + }); + await store.writePipelineArtifact("pipeline-result", failed); + return failed; + }; + if (state.currentCandidateCommit === state.baselineCommit) { + return await archiveHalt(reason, "verification-failure"); + } + const promoted = await promoteFinalCandidate({ + checkoutPath, + attempt: state.attempt, + initialCandidate: state.initialCandidate, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store + }); + if (promoted === null) { + return await archiveHalt( + "partial halt candidate could not be promoted from the git object store", + "sandbox-violation" + ); + } + state.finalAttempt = promoted.attempt; + state.currentCandidateCommit = promoted.candidateCommit; + state.authoritySafeToRelease = true; + await context.notePhase("partial halt verification"); + const verified = await verifyCandidate({ + checkoutPath, + spec, + deps, + attempt: state.finalAttempt, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store, + namespace: "final" + }); + await store.writePipelineArtifact("verification", verified.verification); + const haltResult = { + runId: state.attempt.runId, + status: "human-decision-required", + attempt: state.finalAttempt, + increments: state.increments, + slices: phase.slices, + haltedSliceIndex: phase.haltedSliceIndex, + rounds: state.rounds, + verification: verified.verification, + gate: { + decisionReady: false, + requiresHumanDecision: true, + reasons: [reason] + }, + finalCandidateCommit: state.currentCandidateCommit, + failure: null + }; + await store.writePipelineArtifact("pipeline-result", haltResult); + return haltResult; +} +async function runIncrementPhase(context, deps, state, worktreePath, maxIncrements) { + const { checkoutPath, spec, store } = context; + try { + state.gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment git object isolation could not be established", + "sandbox-violation" + )); + } + const gitObjectAccess = state.gitObjectAccess; + const privateObjects = privateObjectReadOptions(gitObjectAccess); + try { + for (let increment = 2; increment <= maxIncrements; increment += 1) { + if (deps.abortSignal?.aborted === true) { + return terminal(failedAtCurrentCandidate( + state, + `cancelled before increment ${increment}`, + "cancelled" + )); + } + await context.notePhase(`increment ${increment}/${maxIncrements}`); + const previousCandidateCommit = state.currentCandidateCommit; + const diffText = await checkedGit8(worktreePath, [ + "diff", + `${state.baselineCommit}..${state.currentCandidateCommit}` + ], privateObjects); + const incrementRun = await runIncrement({ + spec, + pkg: { + spec, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + candidateDiff: diffText, + testEvidence: state.frozenTestEvidence, + progress: composeProgressNotes(state.increments.at(-1)?.report ?? state.attempt) + }, + worktreePath, + deps, + runId: state.attempt.runId, + increment, + store, + gitObjectAccess, + ...context.runStart === void 0 ? {} : { runStart: context.runStart } + }); + if (!incrementRun.ok) { + return terminal(failedAtCurrentCandidate( + state, + `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, + incrementRun.failure + )); + } + const report = redactRecord(incrementRun.report); + await store.writePipelineArtifact(`increment-${increment}`, report); + const provenanceFailure = await validateCandidateProvenance({ + worktreePath, + previousCandidateCommit, + candidateCommit: report.candidateCommit, + gitObjectAccess + }); + if (provenanceFailure !== null) { + return terminal(failedAtCurrentCandidate( + state, + provenanceFailure.reason, + provenanceFailure.failure + )); + } + const [previousTree, candidateTree] = await Promise.all([ + checkedGit8(worktreePath, ["rev-parse", `${previousCandidateCommit}^{tree}`], privateObjects), + checkedGit8(worktreePath, ["rev-parse", `${report.candidateCommit}^{tree}`], privateObjects) + ]); + const progressed = previousTree.trim() !== candidateTree.trim(); + if (report.candidateCommit !== previousCandidateCommit) { + try { + await importPromotedObjects({ + checkoutPath, + baselineCommit: previousCandidateCommit, + promotedCommit: report.candidateCommit, + access: gitObjectAccess + }); + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment objects could not be imported into the shared git object store", + "sandbox-violation" + )); + } + } + state.currentCandidateCommit = report.candidateCommit; + state.increments.push({ + increment, + report, + roleLogRefs: incrementRun.roleLogRefs + }); + if (report.status === "complete") { + state.incrementOutcome = "complete"; + break; + } + if (report.status === "blocked") { + state.incrementOutcome = "blocked"; + break; + } + if (!progressed) { + state.incrementOutcome = "stalled"; + break; + } + } + state.incrementOutcome ??= "budget-exhausted"; + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment phase failed unexpectedly", + "producer-failure" + )); + } + return CONTINUE; +} +async function runReviewRounds(context, deps, state, worktreePath, reviewers, maxRounds) { + const { spec, store } = context; + for (let round = 1; round <= maxRounds; round += 1) { + if (deps.abortSignal?.aborted === true) { + return terminal(failedAtCurrentCandidate( + state, + `cancelled before review round ${round}`, + "cancelled" + )); + } + await context.notePhase(`review round ${round}/${maxRounds}`); + const diffText = await checkedGit8(worktreePath, [ + "diff", + `${state.baselineCommit}..${state.currentCandidateCommit}` + ], state.gitObjectAccess === null ? void 0 : privateObjectReadOptions(state.gitObjectAccess)); + const pkg = { + spec, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + candidateDiff: diffText, + testEvidence: state.frozenTestEvidence + }; + const reviewRun = await runReviews({ + reviewers, + spec, + pkg, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + onReviewer: (role) => context.emitStatus("reviewing", { round, role }) + }); + if (!reviewRun.ok) { + return terminal(await salvagePipelineFailure(context, deps, state, { + reason: `review phase did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, + failure: "producer-failure" + })); + } + const reviews = reviewRun.reviews.map((review) => ({ + reviewer: review.reviewer, + report: review.report + })); + const consolidated = consolidate(reviews); + await Promise.all(reviewRun.reviews.map((review) => store.writePipelineArtifact( + `round-${round}-review-${review.reviewer}`, + review.report + ))); + await store.writePipelineArtifact(`round-${round}-consolidated`, consolidated); + const blocking = consolidated.findings.some( + (finding) => finding.severity === "blocker" || finding.severity === "major" + ); + const approved = reviewRun.reviews.every((review) => review.report.verdict === "approve"); + const roundRecord = { + round, + reviews, + consolidated, + fix: null, + roleLogRefs: reviewRun.roleLogRefs + }; + state.rounds.push(roundRecord); + if (!blocking && approved) break; + try { + state.gitObjectAccess ??= await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + return terminal(await archivePipelineFailure(context, state, { + reason: "fixer git object isolation could not be established", + failure: "sandbox-violation" + })); + } + await context.emitStatus("fixing", { round, role: "fixer" }); + await context.notePhase(`round ${round}: applying fixes`); + const fixRun = await runFix({ + spec, + pkg: { ...pkg, findings: consolidated.findings }, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + gitObjectAccess: state.gitObjectAccess, + ...context.runStart === void 0 ? {} : { runStart: context.runStart } + }); + if (!fixRun.ok) { + return terminal(await salvagePipelineFailure(context, deps, state, { + reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, + failure: fixRun.failure + })); + } + const { fix } = fixRun; + await store.writePipelineArtifact(`round-${round}-fix`, fix); + const provenanceFailure = await validateFixProvenance({ + worktreePath, + previousCandidateCommit: state.currentCandidateCommit, + fix, + gitObjectAccess: state.gitObjectAccess + }); + if (provenanceFailure !== null) { + return terminal(await archivePipelineFailure(context, state, { + reason: provenanceFailure.reason, + failure: provenanceFailure.failure + })); + } + state.currentCandidateCommit = fix.candidateCommit; + roundRecord.fix = fix; + roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; + } + return CONTINUE; +} +async function promoteReviewedCandidate(context, state) { + if (state.currentCandidateCommit === state.initialCandidate.candidateCommitOid) return CONTINUE; + if (state.gitObjectAccess === null && !state.sliced) { + return terminal(failedAtCurrentCandidate( + state, + "fixer git object isolation state is missing during promotion", + "sandbox-violation" + )); + } + const promoted = await promoteFinalCandidate({ + checkoutPath: context.checkoutPath, + attempt: state.attempt, + initialCandidate: state.initialCandidate, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store: context.store, + ...state.gitObjectAccess === null ? {} : { privateObjectAccess: state.gitObjectAccess } + }); + if (promoted === null) { + return terminal(await archivePipelineFailure(context, state, { + reason: state.sliced ? "sliced candidate could not be promoted from the shared git object store" : "fixer objects could not be imported into the shared git object store", + failure: "sandbox-violation" + })); + } + state.finalAttempt = promoted.attempt; + state.currentCandidateCommit = promoted.candidateCommit; + return CONTINUE; +} +async function finalizePipelineGate(context, deps, state, maxRounds) { + const { checkoutPath, spec, store } = context; + await context.emitStatus("verifying"); + await context.notePhase("final verification"); + const verified = await verifyCandidate({ + checkoutPath, + spec, + deps, + attempt: state.finalAttempt, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store, + ...state.sliced ? { namespace: "final" } : {} + }); + await store.writePipelineArtifact("verification", verified.verification); + const lastRound = state.rounds.at(-1); + await context.emitStatus("gating"); + await context.notePhase("evaluating gate"); + const gate = evaluateGates({ + findings: lastRound?.consolidated.findings ?? [], + dispositions: lastRound?.fix?.dispositions ?? [], + verification: verified.verification, + roundsUsed: state.rounds.length, + maxRounds, + finalRoundReviewed: (lastRound?.fix ?? null) === null, + artifactsValid: true, + baselineDrift: verified.baselineDrift, + // Computed over the whole round history, not one round's prose. + nonConvergence: detectNonConvergence(state.rounds.map((round) => ({ + round: round.round, + findings: round.consolidated.findings, + fixAttempted: round.fix !== null + }))), + ...state.incrementOutcome === void 0 ? {} : { incrementOutcome: state.incrementOutcome } + }); + const manifestForArchive = await store.readManifest(); + if (manifestForArchive === null) { + if (!gate.decisionReady) { + throw new RuntimeError( + "pipeline gate refused the candidate and the refusal could not be archived", + { reasons: gate.reasons } + ); + } + throw new RuntimeError( + "pipeline gate cleared the candidate and the clearance could not be archived", + { + candidateCommitOid: state.currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision + } + ); + } + if (!gate.decisionReady) { + state.finalAttempt = { + ...state.finalAttempt, + evidence: { + ...state.finalAttempt.evidence, + pipelineGateRefused: { + reasons: gate.reasons, + requiresHumanDecision: gate.requiresHumanDecision + } + } + }; + } + const gateClearedRecord = !gate.decisionReady ? null : { + clearedVersion: "1", + candidateCommitOid: state.currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision, + clearedAt: (/* @__PURE__ */ new Date()).toISOString() + }; + if (gateClearedRecord !== null) { + state.finalAttempt = { + ...state.finalAttempt, + evidence: { + ...state.finalAttempt.evidence, + pipelineGateCleared: { + candidateCommitOid: state.currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision + } + } + }; + await store.writePipelineGateCleared(gateClearedRecord); + } + await store.promoteTerminalArtifacts({ + result: state.finalAttempt, + manifest: manifestForArchive + }); + const result = { + runId: state.attempt.runId, + status: gate.decisionReady ? "decision-ready" : "human-decision-required", + attempt: state.finalAttempt, + increments: state.increments, + slices: state.pipelineSlices, + haltedSliceIndex: null, + rounds: state.rounds, + verification: verified.verification, + gate, + finalCandidateCommit: state.currentCandidateCommit, + failure: null, + pipelineGateCleared: gateClearedRecord + }; + await store.writePipelineArtifact("pipeline-result", result); + await context.notePhase(`finished: ${result.status}`); + state.authoritySafeToRelease = true; + return result; +} async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedCheckoutLease) { const runAttemptFn = deps.runAttempt ?? runAttempt; const slices = resolveSlices(spec); - const initialSpec = slices.length === 0 ? spec : scopeSpecToSlice(spec, slices[0]); + const sliced = slices.length > 0; + const sliceCount = sliced ? slices.length : null; + const initialSpec = sliced ? scopeSpecToSlice(spec, slices[0]) : spec; const activeOwner = { pid: process.pid, processToken: await ps.getProcessStartToken(process.pid).catch(() => null), startedAt: (/* @__PURE__ */ new Date()).toISOString(), - sliced: slices.length > 0 + sliced }; let statusStore = null; let statusRunId = null; - const emitPipelineStatus = async (phase, fields = {}) => { - if (statusStore === null || statusRunId === null) return; - await transitionRunStatusSafely(statusStore, statusRunId, phase, { - sliceIndex: fields.sliceIndex ?? (slices.length > 0 ? slices.length : null), - sliceCount: fields.sliceCount ?? (slices.length > 0 ? slices.length : null), - round: fields.round ?? null, - role: fields.role ?? null, - producerId: fields.producerId ?? null, - detail: fields.detail ?? null - }); - }; - const notePhase = async (phase) => { - try { - await deps.onPhase?.(phase); - } catch { - } - }; let runStart; let slicedMarkerEstablished = false; const inheritedOnRunStart = deps.onRunStart; @@ -53435,16 +53939,21 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko dispatchedSpecSha256: specSha256(spec), borrowedCheckoutLease, runStatus: { - mode: slices.length > 0 ? "sliced" : "single", - sliceIndex: slices.length > 0 ? 1 : null, - sliceCount: slices.length > 0 ? slices.length : null, + mode: sliced ? "sliced" : "single", + sliceIndex: sliced ? 1 : null, + sliceCount, pipelineManaged: true }, async onPhase(phase) { const mapped = phase === "producer running" ? "implementing" : phase === "freezing candidate" ? "freezing" : phase === "verifying candidate" ? "verifying" : null; - if (mapped !== null) { - await emitPipelineStatus(mapped, { - sliceIndex: slices.length > 0 ? 1 : null + if (mapped !== null && statusStore !== null && statusRunId !== null) { + await transitionRunStatusSafely(statusStore, statusRunId, mapped, { + sliceIndex: sliced ? 1 : null, + sliceCount, + round: null, + role: null, + producerId: null, + detail: null }); } try { @@ -53452,38 +53961,42 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } catch { } }, - async onRunStart(context) { - runStart = context; - statusRunId = context.record.runId; - statusStore = new ArtifactStore(context.record.runId); - if (slices.length > 0) { + async onRunStart(context2) { + runStart = context2; + statusRunId = context2.record.runId; + statusStore = new ArtifactStore(context2.record.runId); + if (sliced) { await statusStore.writePipelineActiveMarker(activeOwner); slicedMarkerEstablished = true; } await writeRunStatusSafely(statusStore, { statusVersion: "1", - runId: context.record.runId, - mode: slices.length > 0 ? "sliced" : "single", + runId: context2.record.runId, + mode: sliced ? "sliced" : "single", phase: "preflight", - sliceIndex: slices.length > 0 ? 1 : null, - sliceCount: slices.length > 0 ? slices.length : null, + sliceIndex: sliced ? 1 : null, + sliceCount, round: null, role: null, producerId: null, - startedAt: context.record.startedAt, + startedAt: context2.record.startedAt, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), detail: null }); - await emitPipelineStatus("baseline-verify", { - sliceIndex: slices.length > 0 ? 1 : null, + await transitionRunStatusSafely(statusStore, context2.record.runId, "baseline-verify", { + sliceIndex: sliced ? 1 : null, + sliceCount, + round: null, + role: null, + producerId: null, detail: spec.executionMode === "edit" ? null : "skipped for read-only execution" }); - await inheritedOnRunStart?.(context); + await inheritedOnRunStart?.(context2); } }); const store = new ArtifactStore(attempt.runId); await store.writePipelineArtifact("delegation-spec", spec); - const runContext = createRunContext({ + const context = createRunContext({ runId: attempt.runId, checkoutPath, spec, @@ -53492,7 +54005,10 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko borrowedCheckoutLease, ...runStart === void 0 ? {} : { runStart }, ...inheritedOnPhase === void 0 ? {} : { onPhase: inheritedOnPhase }, - sliceCount: slices.length > 0 ? slices.length : null + sliceCount, + // Once the slice wave is over, status lines describe the whole branch; + // the last slice index is the honest position for them. + sliceIndex: sliceCount }); if (attempt.status !== "verified-candidate" || attempt.candidate === null) { if (slicedMarkerEstablished) await store.clearPipelineActiveMarker(); @@ -53504,163 +54020,55 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko attempt.failure ?? "producer-failure" ); } - if (slices.length === 0) await store.writePipelineActiveMarker(activeOwner); + if (!sliced) await store.writePipelineActiveMarker(activeOwner); const temporarySliceRefs2 = []; - let finalAttempt = attempt; - let authoritySafeToRelease = slices.length === 0; + const state = { + attempt, + initialCandidate: attempt.candidate, + baselineCommit: attempt.candidate.baseCommitOid, + sliced, + rounds: [], + increments: [], + finalAttempt: attempt, + currentCandidateCommit: attempt.candidate.candidateCommitOid, + pipelineSlices: [], + incrementOutcome: void 0, + gitObjectAccess: null, + frozenTestEvidence: testEvidence(attempt), + authoritySafeToRelease: !sliced + }; let pipelinePrimaryError; try { const reviewConfig = resolveReviewConfig(spec); const { reviewers, maxRounds } = reviewConfig; - const maxIncrements = slices.length === 0 ? resolveImplementationConfig(spec).maxIncrements : 1; - const increments = []; - let incrementOutcome; - const rounds = []; - const baselineCommit = attempt.candidate.baseCommitOid; - let currentCandidateCommit = attempt.candidate.candidateCommitOid; - let frozenTestEvidence = testEvidence(attempt); - let pipelineSlices = []; - const archivePipelineFailure = async (args) => { - const failedAttempt = slices.length === 0 ? attempt : await archiveSlicedFailure({ - checkoutPath, - attempt, - failure: args.failure, - reason: args.reason, - store - }); - if (slices.length > 0) authoritySafeToRelease = true; - finalAttempt = failedAttempt; - return failedResult( - failedAttempt, - rounds, - args.finalCandidateCommit, - args.reason, - args.failure, - increments, - args.slices ?? pipelineSlices, - args.haltedSliceIndex ?? null + const maxIncrements = sliced ? 1 : resolveImplementationConfig(spec).maxIncrements; + const failSliceExecution = async (error51, completedSlices) => { + const archived = await archiveSliceExecutionError({ checkoutPath, error: error51, attempt, store }); + state.authoritySafeToRelease = true; + state.finalAttempt = archived.failedAttempt; + if (error51 !== archived.sliceError) throw error51; + const failed = failedResult( + archived.failedAttempt, + state.rounds, + completedSlices.at(-1)?.candidateCommit ?? state.baselineCommit, + archived.sliceError.message, + archived.sliceError.failure, + state.increments, + completedSlices ); + await store.writePipelineArtifact("pipeline-result", failed); + return failed; }; - const salvagePipelineFailure = async (args) => { - const fallback = async () => archivePipelineFailure({ - finalCandidateCommit: args.finalCandidateCommit, - reason: args.reason, - failure: args.failure - }); - if (finalAttempt.candidate === null) return await fallback(); - let salvagedAttempt = finalAttempt; - let salvagedCommit = args.finalCandidateCommit; - if (salvagedCommit !== finalAttempt.candidate.candidateCommitOid) { - const promoted = await promoteFinalCandidate({ - checkoutPath, - attempt: finalAttempt, - initialCandidate: finalAttempt.candidate, - baselineCommit, - candidateCommit: salvagedCommit, - store, - ...args.gitObjectAccess === null ? {} : { privateObjectAccess: args.gitObjectAccess } - }); - if (promoted === null) return await fallback(); - salvagedAttempt = promoted.attempt; - salvagedCommit = promoted.candidateCommit; - } - if (slices.length > 0) authoritySafeToRelease = true; - let verified2; - try { - verified2 = await verifyCandidate({ - checkoutPath, - spec, - deps, - attempt: salvagedAttempt, - baselineCommit, - candidateCommit: salvagedCommit, - store, - namespace: "salvage" - }); - } catch { - return await fallback(); - } - const manifestForArchive2 = await store.readManifest(attempt.runId); - if (!verified2.verification.pass) { - if (manifestForArchive2 === null) return await fallback(); - const demoted = { - ...salvagedAttempt, - status: "failed", - failure: "verification-failure", - summary: args.reason, - unresolvedIssues: [ - ...salvagedAttempt.unresolvedIssues, - args.reason, - "salvage re-verification failed" - ], - evidence: { - ...salvagedAttempt.evidence, - pipelineFailure: { failure: args.failure, reason: args.reason } - } - }; - await store.promoteTerminalArtifacts({ result: demoted, manifest: manifestForArchive2 }); - if (slices.length > 0) authoritySafeToRelease = true; - finalAttempt = demoted; - await store.writePipelineArtifact("verification", verified2.verification); - const failed = failedResult( - demoted, - rounds, - salvagedCommit, - args.reason, - args.failure, - increments, - pipelineSlices - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; - } - if (manifestForArchive2 === null) return await fallback(); - salvagedAttempt = { - ...salvagedAttempt, - evidence: { - ...salvagedAttempt.evidence, - pipelineReviewIncomplete: { failure: args.failure, reason: args.reason } - } - }; - await store.promoteTerminalArtifacts({ - result: salvagedAttempt, - manifest: manifestForArchive2 - }); - finalAttempt = salvagedAttempt; - await store.writePipelineArtifact("verification", verified2.verification); - const salvaged = { - runId: attempt.runId, - status: "human-decision-required", - attempt: salvagedAttempt, - increments, - slices: pipelineSlices, - haltedSliceIndex: null, - rounds, - verification: verified2.verification, - gate: { - decisionReady: false, - requiresHumanDecision: true, - reasons: [ - args.reason, - "the candidate passed independent verification; the pipeline could not complete its own review, so the whole-branch review is the human's" - ] - }, - finalCandidateCommit: salvagedCommit, - failure: null - }; - await store.writePipelineArtifact("pipeline-result", salvaged); - return salvaged; - }; - if (slices.length > 0) { + if (sliced) { const initialNamespace = "slice-1-attempt-0"; - await emitPipelineStatus("verifying", { sliceIndex: 1 }); + await context.emitStatus("verifying", { sliceIndex: 1 }); const initialVerification = await verifyCandidate({ checkoutPath, spec: initialSpec, deps, attempt, - baselineCommit, - candidateCommit: currentCandidateCommit, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, store, namespace: initialNamespace }); @@ -53674,8 +54082,8 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko spec: initialSpec, deps, runId: attempt.runId, - baselineCommit, - candidateCommit: currentCandidateCommit, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, namespace: initialNamespace, reviewers, verification: initialVerification.verification, @@ -53683,25 +54091,7 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko borrowedCheckoutLease }); } catch (error51) { - const archived = await archiveSliceExecutionError({ - checkoutPath, - error: error51, - attempt, - store - }); - authoritySafeToRelease = true; - finalAttempt = archived.failedAttempt; - if (error51 !== archived.sliceError) throw error51; - const failed = failedResult( - archived.failedAttempt, - rounds, - baselineCommit, - archived.sliceError.message, - archived.sliceError.failure, - increments - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; + return await failSliceExecution(error51, []); } initialPerSliceReview = reviewed.review; initialRoleLogRefs.push(...reviewed.roleLogRefs); @@ -53718,14 +54108,14 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko roleRunner: deps.roleRunner }); phase = await sliceRunner.run({ - context: runContext, + context, slices, - baselineCommit, + baselineCommit: state.baselineCommit, attempt, budgets: { maxRounds }, concurrency: resolveSliceConcurrency(spec), initialAttempt: { - candidateCommit: currentCandidateCommit, + candidateCommit: state.currentCandidateCommit, verification: initialVerification.verification, perSliceReview: initialPerSliceReview, roleLogRefs: initialRoleLogRefs @@ -53739,430 +54129,31 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } }); } catch (error51) { - const archived = await archiveSliceExecutionError({ - checkoutPath, - error: error51, - attempt, - store - }); - authoritySafeToRelease = true; - finalAttempt = archived.failedAttempt; - if (error51 !== archived.sliceError) throw error51; - const failed = failedResult( - archived.failedAttempt, - rounds, - completedSlices.at(-1)?.candidateCommit ?? baselineCommit, - archived.sliceError.message, - archived.sliceError.failure, - increments, - completedSlices - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; + return await failSliceExecution(error51, completedSlices); } - pipelineSlices = phase.slices; + state.pipelineSlices = phase.slices; temporarySliceRefs2.push(...phase.temporarySliceRefs ?? []); - currentCandidateCommit = phase.finalCandidateCommit; + state.currentCandidateCommit = phase.finalCandidateCommit; if (phase.haltedSliceIndex !== null) { - const halted = phase.slices.at(-1); - const reason = `slice phase halted at slice ${phase.haltedSliceIndex}: ${halted?.reasons.join("; ") ?? "objective gate failed"}`; - if (currentCandidateCommit === baselineCommit) { - const failedAttempt = await archiveSlicedFailure({ - checkoutPath, - attempt, - failure: "verification-failure", - reason, - store - }); - authoritySafeToRelease = true; - finalAttempt = failedAttempt; - const failed = failedResult( - failedAttempt, - rounds, - currentCandidateCommit, - reason, - "verification-failure", - increments, - phase.slices, - phase.haltedSliceIndex - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; - } - const promoted = await promoteFinalCandidate({ - checkoutPath, - attempt, - initialCandidate: attempt.candidate, - baselineCommit, - candidateCommit: currentCandidateCommit, - store - }); - if (promoted === null) { - const promotionReason = "partial halt candidate could not be promoted from the git object store"; - const failedAttempt = await archiveSlicedFailure({ - checkoutPath, - attempt, - failure: "sandbox-violation", - reason: promotionReason, - store - }); - authoritySafeToRelease = true; - finalAttempt = failedAttempt; - const failed = failedResult( - failedAttempt, - rounds, - currentCandidateCommit, - promotionReason, - "sandbox-violation", - increments, - phase.slices, - phase.haltedSliceIndex - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; - } - finalAttempt = promoted.attempt; - currentCandidateCommit = promoted.candidateCommit; - authoritySafeToRelease = true; - await notePhase("partial halt verification"); - const verified2 = await verifyCandidate({ - checkoutPath, - spec, - deps, - attempt: finalAttempt, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - namespace: "final" - }); - await store.writePipelineArtifact("verification", verified2.verification); - const haltResult = { - runId: attempt.runId, - status: "human-decision-required", - attempt: finalAttempt, - increments, - slices: phase.slices, - haltedSliceIndex: phase.haltedSliceIndex, - rounds, - verification: verified2.verification, - gate: { - decisionReady: false, - requiresHumanDecision: true, - reasons: [reason] - }, - finalCandidateCommit: currentCandidateCommit, - failure: null - }; - await store.writePipelineArtifact("pipeline-result", haltResult); - return haltResult; + return await resolveHaltedSlicePhase(context, deps, state, phase); } - frozenTestEvidence = sliceTestEvidence(phase.slices); + state.frozenTestEvidence = sliceTestEvidence(phase.slices); } const candidateWorktree = await new WorktreeManager( checkoutPath, - slices.length === 0 ? `${attempt.runId}-pipeline` : `${attempt.runId}-composed-review`, + sliced ? `${attempt.runId}-composed-review` : `${attempt.runId}-pipeline`, ps, deps.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: deps.borrowedCheckoutLease } - ).create(currentCandidateCommit); - let gitObjectAccess = null; + ).create(state.currentCandidateCommit); try { if (maxIncrements > 1) { - try { - gitObjectAccess = await resolveLinkedWorktreeWritableRoots(candidateWorktree.path); - } catch { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "increment git object isolation could not be established", - "sandbox-violation", - increments, - pipelineSlices - ); - } - try { - for (let increment = 2; increment <= maxIncrements; increment += 1) { - if (deps.abortSignal?.aborted === true) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - `cancelled before increment ${increment}`, - "cancelled", - increments, - pipelineSlices - ); - } - await notePhase(`increment ${increment}/${maxIncrements}`); - const previousCandidateCommit = currentCandidateCommit; - const diffText = await checkedGit8(candidateWorktree.path, [ - "diff", - `${baselineCommit}..${currentCandidateCommit}` - ], privateObjectReadOptions(gitObjectAccess)); - const incrementRun = await runIncrement({ - spec, - pkg: { - spec, - baselineCommit, - candidateCommit: currentCandidateCommit, - candidateDiff: diffText, - testEvidence: frozenTestEvidence, - progress: composeProgressNotes(increments.at(-1)?.report ?? attempt) - }, - worktreePath: candidateWorktree.path, - deps, - runId: attempt.runId, - increment, - store, - gitObjectAccess, - ...runStart === void 0 ? {} : { runStart } - }); - if (!incrementRun.ok) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, - incrementRun.failure, - increments, - pipelineSlices - ); - } - const report = redactRecord(incrementRun.report); - await store.writePipelineArtifact(`increment-${increment}`, report); - const provenanceFailure = await validateCandidateProvenance({ - worktreePath: candidateWorktree.path, - previousCandidateCommit, - candidateCommit: report.candidateCommit, - gitObjectAccess - }); - if (provenanceFailure !== null) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - provenanceFailure.reason, - provenanceFailure.failure, - increments, - pipelineSlices - ); - } - const privateObjects = privateObjectReadOptions(gitObjectAccess); - const [previousTree, candidateTree] = await Promise.all([ - checkedGit8( - candidateWorktree.path, - ["rev-parse", `${previousCandidateCommit}^{tree}`], - privateObjects - ), - checkedGit8( - candidateWorktree.path, - ["rev-parse", `${report.candidateCommit}^{tree}`], - privateObjects - ) - ]); - const progressed = previousTree.trim() !== candidateTree.trim(); - if (report.candidateCommit !== previousCandidateCommit) { - try { - await importPromotedObjects({ - checkoutPath, - baselineCommit: previousCandidateCommit, - promotedCommit: report.candidateCommit, - access: gitObjectAccess - }); - } catch { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "increment objects could not be imported into the shared git object store", - "sandbox-violation", - increments, - pipelineSlices - ); - } - } - currentCandidateCommit = report.candidateCommit; - increments.push({ - increment, - report, - roleLogRefs: incrementRun.roleLogRefs - }); - if (report.status === "complete") { - incrementOutcome = "complete"; - break; - } - if (report.status === "blocked") { - incrementOutcome = "blocked"; - break; - } - if (!progressed) { - incrementOutcome = "stalled"; - break; - } - } - incrementOutcome ??= "budget-exhausted"; - } catch { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "increment phase failed unexpectedly", - "producer-failure", - increments, - pipelineSlices - ); - } - } - for (let round = 1; round <= maxRounds; round += 1) { - if (deps.abortSignal?.aborted === true) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - `cancelled before review round ${round}`, - "cancelled", - increments, - pipelineSlices - ); - } - await notePhase(`review round ${round}/${maxRounds}`); - const diffText = await checkedGit8(candidateWorktree.path, [ - "diff", - `${baselineCommit}..${currentCandidateCommit}` - ], gitObjectAccess === null ? void 0 : privateObjectReadOptions(gitObjectAccess)); - const pkg = { - spec, - baselineCommit, - candidateCommit: currentCandidateCommit, - candidateDiff: diffText, - testEvidence: frozenTestEvidence - }; - const reviewRun = await runReviews({ - reviewers, - spec, - pkg, - worktreePath: candidateWorktree.path, - deps, - runId: attempt.runId, - round, - store, - onReviewer: (role) => emitPipelineStatus("reviewing", { - round, - role - }) - }); - if (!reviewRun.ok) { - const reason = `review phase did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`; - return await salvagePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason, - failure: "producer-failure", - gitObjectAccess - }); - } - const reviews = reviewRun.reviews.map((review) => ({ - reviewer: review.reviewer, - report: review.report - })); - const consolidated = consolidate(reviews); - await Promise.all(reviewRun.reviews.map((review) => store.writePipelineArtifact( - `round-${round}-review-${review.reviewer}`, - review.report - ))); - await store.writePipelineArtifact(`round-${round}-consolidated`, consolidated); - const blocking = consolidated.findings.some( - (finding) => finding.severity === "blocker" || finding.severity === "major" - ); - const approved = reviewRun.reviews.every((review) => review.report.verdict === "approve"); - const roundRecord = { - round, - reviews, - consolidated, - fix: null, - roleLogRefs: reviewRun.roleLogRefs - }; - rounds.push(roundRecord); - if (!blocking && approved) break; - try { - gitObjectAccess ??= await resolveLinkedWorktreeWritableRoots(candidateWorktree.path); - } catch { - return await archivePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: "fixer git object isolation could not be established", - failure: "sandbox-violation" - }); - } - await emitPipelineStatus("fixing", { round, role: "fixer" }); - await notePhase(`round ${round}: applying fixes`); - const fixRun = await runFix({ - spec, - pkg: { ...pkg, findings: consolidated.findings }, - worktreePath: candidateWorktree.path, - deps, - runId: attempt.runId, - round, - store, - gitObjectAccess, - ...runStart === void 0 ? {} : { runStart } - }); - if (!fixRun.ok) { - return await salvagePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, - failure: fixRun.failure, - gitObjectAccess - }); - } - const { fix } = fixRun; - await store.writePipelineArtifact(`round-${round}-fix`, fix); - const provenanceFailure = await validateFixProvenance({ - worktreePath: candidateWorktree.path, - previousCandidateCommit: currentCandidateCommit, - fix, - gitObjectAccess - }); - if (provenanceFailure !== null) { - return await archivePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: provenanceFailure.reason, - failure: provenanceFailure.failure - }); - } - currentCandidateCommit = fix.candidateCommit; - roundRecord.fix = fix; - roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; - } - if (currentCandidateCommit !== attempt.candidate.candidateCommitOid) { - if (gitObjectAccess === null && slices.length === 0) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "fixer git object isolation state is missing during promotion", - "sandbox-violation", - increments, - pipelineSlices - ); - } - const promoted = await promoteFinalCandidate({ - checkoutPath, - attempt, - initialCandidate: attempt.candidate, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - ...gitObjectAccess === null ? {} : { privateObjectAccess: gitObjectAccess } - }); - if (promoted === null) { - return await archivePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: slices.length === 0 ? "fixer objects could not be imported into the shared git object store" : "sliced candidate could not be promoted from the shared git object store", - failure: "sandbox-violation" - }); - } - finalAttempt = promoted.attempt; - currentCandidateCommit = promoted.candidateCommit; + const outcome = await runIncrementPhase(context, deps, state, candidateWorktree.path, maxIncrements); + if (outcome.state === "terminal") return outcome.result; } + const reviewed = await runReviewRounds(context, deps, state, candidateWorktree.path, reviewers, maxRounds); + if (reviewed.state === "terminal") return reviewed.result; + const promoted = await promoteReviewedCandidate(context, state); + if (promoted.state === "terminal") return promoted.result; } finally { const cleanupError = await cleanupWorktree(candidateWorktree); if (cleanupError !== null) { @@ -54171,120 +54162,19 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko }); } } - await emitPipelineStatus("verifying"); - await notePhase("final verification"); - const verified = await verifyCandidate({ - checkoutPath, - spec, - deps, - attempt: finalAttempt, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - ...slices.length === 0 ? {} : { namespace: "final" } - }); - await store.writePipelineArtifact("verification", verified.verification); - const lastRound = rounds.at(-1); - await emitPipelineStatus("gating"); - await notePhase("evaluating gate"); - const gate = evaluateGates({ - findings: lastRound?.consolidated.findings ?? [], - dispositions: lastRound?.fix?.dispositions ?? [], - verification: verified.verification, - roundsUsed: rounds.length, - maxRounds, - finalRoundReviewed: (lastRound?.fix ?? null) === null, - artifactsValid: true, - baselineDrift: verified.baselineDrift, - // Computed over the whole round history, not one round's prose. - nonConvergence: detectNonConvergence(rounds.map((round) => ({ - round: round.round, - findings: round.consolidated.findings, - fixAttempted: round.fix !== null - }))), - ...incrementOutcome === void 0 ? {} : { incrementOutcome } - }); - const manifestForArchive = await store.readManifest(attempt.runId); - if (manifestForArchive === null) { - if (!gate.decisionReady) { - throw new RuntimeError( - "pipeline gate refused the candidate and the refusal could not be archived", - { reasons: gate.reasons } - ); - } - throw new RuntimeError( - "pipeline gate cleared the candidate and the clearance could not be archived", - { - candidateCommitOid: currentCandidateCommit, - requiresHumanDecision: gate.requiresHumanDecision - } - ); - } - if (!gate.decisionReady) { - finalAttempt = { - ...finalAttempt, - evidence: { - ...finalAttempt.evidence, - pipelineGateRefused: { - reasons: gate.reasons, - requiresHumanDecision: gate.requiresHumanDecision - } - } - }; - } - const gateClearedRecord = !gate.decisionReady ? null : { - clearedVersion: "1", - candidateCommitOid: currentCandidateCommit, - requiresHumanDecision: gate.requiresHumanDecision, - clearedAt: (/* @__PURE__ */ new Date()).toISOString() - }; - if (gateClearedRecord !== null) { - finalAttempt = { - ...finalAttempt, - evidence: { - ...finalAttempt.evidence, - pipelineGateCleared: { - candidateCommitOid: currentCandidateCommit, - requiresHumanDecision: gate.requiresHumanDecision - } - } - }; - await store.writePipelineGateCleared(gateClearedRecord); - } - await store.promoteTerminalArtifacts({ - result: finalAttempt, - manifest: manifestForArchive - }); - const result = { - runId: attempt.runId, - status: gate.decisionReady ? "decision-ready" : "human-decision-required", - attempt: finalAttempt, - increments, - slices: pipelineSlices, - haltedSliceIndex: null, - rounds, - verification: verified.verification, - gate, - finalCandidateCommit: currentCandidateCommit, - failure: null, - pipelineGateCleared: gateClearedRecord - }; - await store.writePipelineArtifact("pipeline-result", result); - await notePhase(`finished: ${result.status}`); - authoritySafeToRelease = true; - return result; + return await finalizePipelineGate(context, deps, state, maxRounds); } catch (error51) { let terminalError = error51; - if (slices.length > 0 && finalAttempt.status === "verified-candidate" && !containsSlicedFailureArchiveError(error51)) { + if (sliced && state.finalAttempt.status === "verified-candidate" && !containsSlicedFailureArchiveError(error51)) { try { - finalAttempt = await archiveSlicedFailure({ + state.finalAttempt = await archiveSlicedFailure({ checkoutPath, - attempt: finalAttempt, + attempt: state.finalAttempt, failure: "verification-failure", reason: "sliced pipeline terminated before completing trusted gates", store }); - authoritySafeToRelease = true; + state.authoritySafeToRelease = true; } catch (archiveError) { terminalError = new AggregateError( [error51, archiveError], @@ -54292,28 +54182,28 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko ); } } - await emitPipelineStatus("failed", { + await context.emitStatus("failed", { detail: terminalError instanceof Error ? terminalError.message : "pipeline failed unexpectedly" }); pipelinePrimaryError = terminalError; throw terminalError; } finally { const cleanupErrors = await cleanupTemporarySliceRefs(checkoutPath, temporarySliceRefs2); - if (cleanupErrors.length > 0 && slices.length > 0 && finalAttempt.status === "verified-candidate" && !containsSlicedFailureArchiveError(pipelinePrimaryError)) { + if (cleanupErrors.length > 0 && sliced && state.finalAttempt.status === "verified-candidate" && !containsSlicedFailureArchiveError(pipelinePrimaryError)) { try { - finalAttempt = await archiveSlicedFailure({ + state.finalAttempt = await archiveSlicedFailure({ checkoutPath, - attempt: finalAttempt, + attempt: state.finalAttempt, failure: "verification-failure", reason: "temporary slice ref cleanup did not complete", store }); - authoritySafeToRelease = true; + state.authoritySafeToRelease = true; } catch (archiveError) { cleanupErrors.push(archiveError); } } - if (cleanupErrors.length === 0 && authoritySafeToRelease) { + if (cleanupErrors.length === 0 && state.authoritySafeToRelease) { try { await store.clearPipelineActiveMarker(); } catch (cleanupError) { @@ -55477,7 +55367,7 @@ async function withCurrentArchivedRun(checkoutPath, runId, deps, fn, preserveRes }); } async function requireInactivePipeline(run, runId) { - if (await run.store.readPipelineActiveMarker(runId) !== null) { + if (await run.store.readPipelineActiveMarker() !== null) { throw runtimeError( "the delegation pipeline for this run is still active", "pipeline-active" @@ -55660,7 +55550,7 @@ async function requireSpecCorrespondence(run, runId, expectedSpecSha256) { if (!/^[0-9a-f]{64}$/u.test(expectedSpecSha256)) { throw runtimeError("expectedSpecSha256 is not a sha-256 digest", "run-spec-unverifiable"); } - const recorded = await run.store.readRunStartSpecSha256(runId); + const recorded = await run.store.readRunStartSpecSha256(); if (recorded === null) { throw runtimeError( "this run recorded no spec hash, so it cannot be matched to the dispatched spec", @@ -55693,13 +55583,13 @@ async function sharedReviewSnapshot(run, deps, allowMissingAnchor = false) { git: deps.git ?? git, allowMissingAnchor }); - const persisted = await run.store.readReviewSnapshot(run.result.runId); + const persisted = await run.store.readReviewSnapshot(); if (persisted !== null) { requireMatchingSnapshotBytes(regenerated, persisted); return persisted; } await run.store.writeReviewSnapshot(regenerated); - const newlyPersisted = await run.store.readReviewSnapshot(run.result.runId); + const newlyPersisted = await run.store.readReviewSnapshot(); if (newlyPersisted === null) { throw runtimeError( "review snapshot could not be persisted", @@ -55866,7 +55756,7 @@ async function handleIntegrateCandidate(checkoutPath, runId, expectedArtifactHas try { return await withCurrentArchivedRun(checkoutPath, runId, deps, async (run, lock, ps) => { await requireInactivePipeline(run, runId); - const decision = await run.store.readCandidateDecision(runId); + const decision = await run.store.readCandidateDecision(); if (decision?.decision !== "accepted") { return { integration: "aborted", detail: "no-accepted-decision" }; } @@ -56148,7 +56038,7 @@ async function removeStaleCandidateAnchor(repoRoot, runId) { } async function archiveInterruptedPipeline(store, result) { if (result.status !== "verified-candidate") return; - const manifest = await store.readManifest(result.runId); + const manifest = await store.readManifest(); if (manifest === null) { throw new RuntimeError("run manifest is missing while recovering interrupted pipeline"); } @@ -58535,10 +58425,10 @@ async function recoverStaleRuns(dependencies = {}) { } const record2 = parseRunStart(runStartText, entry.name); const store = new ArtifactStore(entry.name); - const result2 = await store.readResult(entry.name); + const result2 = await store.readResult(); if (result2 !== null) { validateTerminalResult(result2, entry.name); - const marker = await store.readPipelineActiveMarker(entry.name); + const marker = await store.readPipelineActiveMarker(); if (marker !== null) { const markerStatus = await lockOwnerStatus( { pid: marker.pid, processToken: marker.processToken }, @@ -58578,12 +58468,12 @@ async function recoverStaleRuns(dependencies = {}) { if (lockedRunStartText !== runStartText || lockedRecord.runId !== record2.runId || lockedRecord.lockKey !== record2.lockKey || lockedRecord.canonicalCommonDir !== record2.canonicalCommonDir || lockedRecord.pid !== record2.pid || lockedRecord.processToken !== record2.processToken || lockedRecord.startedAt !== record2.startedAt) { throw new RuntimeError("run-start recovery record changed during recovery"); } - const lockedResult = await store.readResult(entry.name); + const lockedResult = await store.readResult(); if (lockedResult === null) { throw new RuntimeError("terminal attempt result disappeared during recovery"); } validateTerminalResult(lockedResult, entry.name); - const lockedMarker = await store.readPipelineActiveMarker(entry.name); + const lockedMarker = await store.readPipelineActiveMarker(); const commonDir = await validateGitCommonDir(lockedRecord.canonicalCommonDir); if (lockedMarker === null) { await cleanupRunWorktreesUnderLease( @@ -58700,7 +58590,7 @@ async function recoverStaleRuns(dependencies = {}) { if (lockedRunStartText !== runStartText) { throw new RuntimeError("run-start recovery record changed before stale recovery"); } - const lockedResult = await new ArtifactStore(record2.runId).readResult(record2.runId); + const lockedResult = await new ArtifactStore(record2.runId).readResult(); if (lockedResult !== null) { validateTerminalResult(lockedResult, record2.runId); becameTerminal = true; diff --git a/src/autopilot/candidate-promoter.ts b/src/autopilot/candidate-promoter.ts index 87d0e5c..aed9e40 100644 --- a/src/autopilot/candidate-promoter.ts +++ b/src/autopilot/candidate-promoter.ts @@ -290,10 +290,10 @@ export class CandidatePromoter { eligibilityHash: string, ): Promise { try { - let decision = await artifactStore.readCandidateDecision(runId); + let decision = await artifactStore.readCandidateDecision(); if (decision === null) { await artifactStore.writeAutopilotDecision(artifact, eligibility, this.now()); - decision = await artifactStore.readCandidateDecision(runId); + decision = await artifactStore.readCandidateDecision(); } return decision?.decisionVersion === "2" && decision.authority === "autopilot-policy" @@ -376,9 +376,9 @@ export class CandidatePromoter { manifest = decisionSnapshot.manifest; snapshot = decisionSnapshot.reviewSnapshot; [pipelineResult, advisor, eligibility] = await Promise.all([ - artifactStore.readPipelineArtifact(request.runId, "pipeline-result"), - artifactStore.readAdvisorReport(request.runId), - artifactStore.readAutopilotEligibility(request.runId), + artifactStore.readPipelineArtifact("pipeline-result"), + artifactStore.readAdvisorReport(), + artifactStore.readAutopilotEligibility(), ]); } catch { return finishFailure("evidence-mismatch"); diff --git a/src/autopilot/final-branch-reviewer.ts b/src/autopilot/final-branch-reviewer.ts index f36099a..25c4651 100644 --- a/src/autopilot/final-branch-reviewer.ts +++ b/src/autopilot/final-branch-reviewer.ts @@ -273,9 +273,9 @@ async function validateArchivedTaskEvidence( snapshot = decisionSnapshot.reviewSnapshot; decision = decisionSnapshot.decision; [pipelineResult, advisor, eligibility] = await Promise.all([ - store.readPipelineArtifact(evidence.runId, "pipeline-result"), - store.readAdvisorReport(evidence.runId), - store.readAutopilotEligibility(evidence.runId), + store.readPipelineArtifact("pipeline-result"), + store.readAdvisorReport(), + store.readAutopilotEligibility(), ]); } catch { fail("missing-task-evidence", `task evidence archive is invalid: ${task.id}`); diff --git a/src/mcp/tools.ts b/src/mcp/tools.ts index ea69bd7..aa3f3a9 100644 --- a/src/mcp/tools.ts +++ b/src/mcp/tools.ts @@ -80,8 +80,8 @@ export type HumanDecisionRecord = Omit< >; export interface ToolArtifactStore { - readResult(runId: string): Promise; - readManifest(runId: string): Promise; + readResult(): Promise; + readManifest(): Promise; /** * Required, not optional, for the same reason as `readRunStartSpecSha256` * below: when these could be omitted, `sharedReviewSnapshot` would no-op the @@ -90,19 +90,19 @@ export interface ToolArtifactStore { * persisted, which no later audit could re-verify. */ writeReviewSnapshot(snapshot: ReviewSnapshot): Promise; - readReviewSnapshot(runId: string): Promise; + readReviewSnapshot(): Promise; writeHumanDecision(record: HumanDecisionRecord): Promise; /** Persist a decision whose authority the lifecycle already resolved. */ writeCandidateDecisionRecord(record: CandidateDecisionV2): Promise; - readCandidateDecision(runId: string): Promise; - readPipelineGateCleared?(runId: string): Promise; - readPipelineActiveMarker(runId: string): Promise; + readCandidateDecision(): Promise; + readPipelineGateCleared?(): Promise; + readPipelineActiveMarker(): Promise; /** * The spec hash recorded when the run started. Required, not optional: a store * that cannot answer must say so explicitly, because a caller asking to verify * a run id against a spec must never be told "verified" by omission. */ - readRunStartSpecSha256(runId: string): Promise; + readRunStartSpecSha256(): Promise; } export interface ToolDependencies { @@ -516,7 +516,7 @@ async function withCurrentArchivedRun( async function requireInactivePipeline(run: ArchivedRun, runId: string): Promise { - if (await run.store.readPipelineActiveMarker(runId) !== null) { + if (await run.store.readPipelineActiveMarker() !== null) { throw runtimeError( "the delegation pipeline for this run is still active", "pipeline-active", @@ -826,7 +826,7 @@ async function requireSpecCorrespondence( if (!/^[0-9a-f]{64}$/u.test(expectedSpecSha256)) { throw runtimeError("expectedSpecSha256 is not a sha-256 digest", "run-spec-unverifiable"); } - const recorded = await run.store.readRunStartSpecSha256(runId); + const recorded = await run.store.readRunStartSpecSha256(); if (recorded === null) { throw runtimeError( "this run recorded no spec hash, so it cannot be matched to the dispatched spec", @@ -872,14 +872,14 @@ async function sharedReviewSnapshot( git: deps.git ?? runGit, allowMissingAnchor, }); - const persisted = await run.store.readReviewSnapshot(run.result.runId); + const persisted = await run.store.readReviewSnapshot(); if (persisted !== null) { requireMatchingSnapshotBytes(regenerated, persisted); return persisted; } await run.store.writeReviewSnapshot(regenerated); - const newlyPersisted = await run.store.readReviewSnapshot(run.result.runId); + const newlyPersisted = await run.store.readReviewSnapshot(); if (newlyPersisted === null) { // The snapshot is what a decision's evidenceHash binds to. If it did not // survive the write, fail closed rather than hashing bytes that only ever @@ -1171,7 +1171,7 @@ export async function handleIntegrateCandidate( try { return await withCurrentArchivedRun(checkoutPath, runId, deps, async (run, lock, ps) => { await requireInactivePipeline(run, runId); - const decision = await run.store.readCandidateDecision(runId); + const decision = await run.store.readCandidateDecision(); if (decision?.decision !== "accepted") { return { integration: "aborted", detail: "no-accepted-decision" }; } diff --git a/src/pipeline/advisor-stage.ts b/src/pipeline/advisor-stage.ts index 7ea393e..e4acd71 100644 --- a/src/pipeline/advisor-stage.ts +++ b/src/pipeline/advisor-stage.ts @@ -34,8 +34,8 @@ import { const schemas = loadSchemas(); export interface AdvisorStageStore { - readPipelineArtifact(runId: string, name: string): Promise; - readReviewSnapshot(runId: string): Promise; + readPipelineArtifact(name: string): Promise; + readReviewSnapshot(): Promise; writePostPipelineAutopilotArtifacts(args: { pipelineResult: PipelineResult; reviewSnapshot: ReviewSnapshot; @@ -133,9 +133,9 @@ export async function runAdvisorStage(args: RunAdvisorStageArgs): Promise(args.runId, "pipeline-result"), - store.readReviewSnapshot(args.runId), - store.readPipelineArtifact(args.runId, "delegation-spec"), + store.readPipelineArtifact("pipeline-result"), + store.readReviewSnapshot(), + store.readPipelineArtifact("delegation-spec"), ]); if (archivedPipelineResult === null) { throw new RuntimeError("advisor stage requires a durable archived PipelineResult"); diff --git a/src/pipeline/pipeline-runtime.ts b/src/pipeline/pipeline-runtime.ts index 686fd61..ae166bb 100644 --- a/src/pipeline/pipeline-runtime.ts +++ b/src/pipeline/pipeline-runtime.ts @@ -20,7 +20,6 @@ import { resolveSlices, type DelegationSpec, type ReviewerKind, - type Slice, } from "../protocol/delegation-spec.js"; import { specSha256 } from "../protocol/spec-hash.js"; import { loadSchemas } from "../protocol/schema-loader.js"; @@ -39,15 +38,10 @@ import type { RunStartContext } from "../runtime/run-start.js"; import { transitionRunStatusSafely, writeRunStatusSafely, - type RunStatus, - type RunStatusPhase, } from "../runtime/run-status.js"; import { RuntimeError } from "../util/errors.js"; import { - isAllowed, recomputeManifest, - structuralVerify, - type StructuralFailure, } from "../verify/structural-verifier.js"; import { consolidate, detectNonConvergence, type ConsolidationResult } from "./consolidator.js"; import { evaluateGates, type GateResult, type IncrementOutcome } from "./gates.js"; @@ -57,22 +51,18 @@ import type { ReviewReport, VerificationReport, } from "./report-types.js"; -import type { PipelineRole, RolePackage } from "./role-prompts.js"; +import type { RolePackage } from "./role-prompts.js"; import type { RoleRunArgs, RoleRunResult } from "./role-runner.js"; import { SliceRunner, SliceExecutionError, findSliceExecutionError, scopeSpecToSlice, - temporarySliceRef, - createTemporarySliceRef, cleanupTemporarySliceRefs, - describePriorAttempts, sliceTestEvidence, testEvidence, runSliceReview, type PipelineSlice, - type SliceAttemptEvidence, type SlicePhaseResult, type TemporarySliceRef, type ReviewConfig, @@ -80,8 +70,6 @@ import { import { verifyCandidate, detectWeakenedTests, - analyzeWeakenedTests, - parseDeletedPaths, } from "./candidate-verifier.js"; import { importPromotedObjects, @@ -90,11 +78,9 @@ import { privateObjectReadOptions, } from "./candidate-provenance.js"; import { - runStructuredRole, runIncrement, runReviews, runFix, - roleArgs, } from "./pipeline-roles.js"; import { createRunContext, @@ -281,7 +267,7 @@ async function archiveSlicedFailure(args: { store: ArtifactStore; }): Promise { try { - const manifest = await args.store.readManifest(args.attempt.runId); + const manifest = await args.store.readManifest(); if (manifest === null) { throw new RuntimeError("run manifest is missing while archiving sliced failure"); } @@ -437,7 +423,7 @@ async function promoteFinalCandidate(args: { anchorRef: args.initialCandidate.anchorRef, diffText, }); - const manifest = await args.store.readManifest(args.attempt.runId); + const manifest = await args.store.readManifest(); if (manifest === null) throw new RuntimeError("run manifest is missing during promotion"); const finalAttempt = { ...args.attempt, candidate }; await args.store.promoteTerminalArtifacts({ @@ -495,6 +481,721 @@ Object.defineProperty(runPipeline, "advisorStage", { writable: false, }); +/** + * Everything a pipeline run accumulates once its initial attempt has verified. + * One explicit value travels through the phase functions below, so no phase + * reads or writes another phase's closure, and `finally` sees the same facts + * the phases left behind. + */ +interface PipelineRunState { + readonly attempt: AttemptResult; + readonly initialCandidate: CandidateArtifact; + readonly baselineCommit: string; + readonly sliced: boolean; + readonly rounds: PipelineRound[]; + readonly increments: PipelineIncrement[]; + finalAttempt: AttemptResult; + currentCandidateCommit: string; + pipelineSlices: PipelineSlice[]; + incrementOutcome: IncrementOutcome | undefined; + gitObjectAccess: LinkedWorktreeGitAccess | null; + frozenTestEvidence: string; + authoritySafeToRelease: boolean; +} + +type PhaseOutcome = + | { state: "continue" } + | { state: "terminal"; result: PipelineResult }; + +const CONTINUE: PhaseOutcome = { state: "continue" }; + +function terminal(result: PipelineResult): PhaseOutcome { + return { state: "terminal", result }; +} + +/** A failure recorded against the initial attempt at the current candidate. */ +function failedAtCurrentCandidate( + state: PipelineRunState, + reason: string, + failure: FailureClassification, +): PipelineResult { + return failedResult( + state.attempt, + state.rounds, + state.currentCandidateCommit, + reason, + failure, + state.increments, + state.pipelineSlices, + ); +} + +async function archivePipelineFailure( + context: RunContext, + state: PipelineRunState, + args: { + reason: string; + failure: FailureClassification; + slices?: PipelineSlice[]; + haltedSliceIndex?: number | null; + }, +): Promise { + const failedAttempt = state.sliced + ? await archiveSlicedFailure({ + checkoutPath: context.checkoutPath, + attempt: state.attempt, + failure: args.failure, + reason: args.reason, + store: context.store, + }) + : state.attempt; + if (state.sliced) state.authoritySafeToRelease = true; + state.finalAttempt = failedAttempt; + return failedResult( + failedAttempt, + state.rounds, + state.currentCandidateCommit, + args.reason, + args.failure, + state.increments, + args.slices ?? state.pipelineSlices, + args.haltedSliceIndex ?? null, + ); +} + +/** + * A role that cannot produce parseable structured output is an orchestration + * failure, not a verdict on the candidate. Discarding independently verified + * bytes for it forces a full re-dispatch of work that already passed — the + * single most expensive recurring loss in the delegation loop. Promote and + * re-verify what exists; present it for the human decision the pipeline could + * not complete itself. Only a candidate that fails verification is discarded. + */ +async function salvagePipelineFailure( + context: RunContext, + deps: PipelineDependencies, + state: PipelineRunState, + args: { reason: string; failure: FailureClassification }, +): Promise { + const { checkoutPath, spec, store } = context; + const fallback = async (): Promise => archivePipelineFailure(context, state, args); + if (state.finalAttempt.candidate === null) return await fallback(); + + let salvagedAttempt = state.finalAttempt; + let salvagedCommit = state.currentCandidateCommit; + if (salvagedCommit !== state.finalAttempt.candidate.candidateCommitOid) { + const promoted = await promoteFinalCandidate({ + checkoutPath, + attempt: state.finalAttempt, + initialCandidate: state.finalAttempt.candidate, + baselineCommit: state.baselineCommit, + candidateCommit: salvagedCommit, + store, + ...(state.gitObjectAccess === null + ? {} + : { privateObjectAccess: state.gitObjectAccess }), + }); + if (promoted === null) return await fallback(); + salvagedAttempt = promoted.attempt; + salvagedCommit = promoted.candidateCommit; + } + if (state.sliced) state.authoritySafeToRelease = true; + + let verified; + try { + verified = await verifyCandidate({ + checkoutPath, + spec, + deps, + attempt: salvagedAttempt, + baselineCommit: state.baselineCommit, + candidateCommit: salvagedCommit, + store, + namespace: "salvage", + }); + } catch { + return await fallback(); + } + const manifestForArchive = await store.readManifest(); + if (manifestForArchive === null) return await fallback(); + if (!verified.verification.pass) { + // The freshest evidence says these bytes do not verify. Record that where + // the accept gate reads it, or the archived run keeps advertising the + // stale verified-candidate status and stays acceptable. The bytes are + // retained; only their acceptability is withdrawn. + const demoted: AttemptResult = { + ...salvagedAttempt, + status: "failed", + failure: "verification-failure", + summary: args.reason, + unresolvedIssues: [ + ...salvagedAttempt.unresolvedIssues, + args.reason, + "salvage re-verification failed", + ], + evidence: { + ...salvagedAttempt.evidence, + pipelineFailure: { failure: args.failure, reason: args.reason }, + }, + }; + await store.promoteTerminalArtifacts({ result: demoted, manifest: manifestForArchive }); + state.finalAttempt = demoted; + await store.writePipelineArtifact("verification", verified.verification); + const failed = failedResult( + demoted, + state.rounds, + salvagedCommit, + args.reason, + args.failure, + state.increments, + state.pipelineSlices, + ); + await store.writePipelineArtifact("pipeline-result", failed); + return failed; + } + + // A human reading the archived run later must be able to see that the + // pipeline never reviewed this candidate. Record that durably in the + // result the accept path reads, not only in the transient gate. + salvagedAttempt = { + ...salvagedAttempt, + evidence: { + ...salvagedAttempt.evidence, + pipelineReviewIncomplete: { failure: args.failure, reason: args.reason }, + }, + }; + await store.promoteTerminalArtifacts({ + result: salvagedAttempt, + manifest: manifestForArchive, + }); + + state.finalAttempt = salvagedAttempt; + await store.writePipelineArtifact("verification", verified.verification); + const salvaged: PipelineResult = { + runId: state.attempt.runId, + status: "human-decision-required", + attempt: salvagedAttempt, + increments: state.increments, + slices: state.pipelineSlices, + haltedSliceIndex: null, + rounds: state.rounds, + verification: verified.verification, + gate: { + decisionReady: false, + requiresHumanDecision: true, + reasons: [ + args.reason, + "the candidate passed independent verification; the pipeline could not" + + " complete its own review, so the whole-branch review is the human's", + ], + }, + finalCandidateCommit: salvagedCommit, + failure: null, + }; + await store.writePipelineArtifact("pipeline-result", salvaged); + return salvaged; +} + +/** + * A slice wave that halted before every slice landed. With nothing past the + * baseline there is no partial branch to offer, so the halt is a failure; + * otherwise the advanced slices are promoted to a frozen candidate and the + * halt is handed to the human. Review rounds are skipped; final verification + * runs so the human sees an honest report on the exact partial branch. + */ +async function resolveHaltedSlicePhase( + context: RunContext, + deps: PipelineDependencies, + state: PipelineRunState, + phase: SlicePhaseResult, +): Promise { + const { checkoutPath, spec, store } = context; + const halted = phase.slices.at(-1); + const reason = `slice phase halted at slice ${phase.haltedSliceIndex}: ${halted?.reasons.join("; ") ?? "objective gate failed"}`; + const archiveHalt = async ( + haltReason: string, + failure: FailureClassification, + ): Promise => { + const failed = await archivePipelineFailure(context, state, { + reason: haltReason, + failure, + slices: phase.slices, + haltedSliceIndex: phase.haltedSliceIndex, + }); + await store.writePipelineArtifact("pipeline-result", failed); + return failed; + }; + if (state.currentCandidateCommit === state.baselineCommit) { + return await archiveHalt(reason, "verification-failure"); + } + const promoted = await promoteFinalCandidate({ + checkoutPath, + attempt: state.attempt, + initialCandidate: state.initialCandidate, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store, + }); + if (promoted === null) { + return await archiveHalt( + "partial halt candidate could not be promoted from the git object store", + "sandbox-violation", + ); + } + state.finalAttempt = promoted.attempt; + state.currentCandidateCommit = promoted.candidateCommit; + state.authoritySafeToRelease = true; + await context.notePhase("partial halt verification"); + const verified = await verifyCandidate({ + checkoutPath, + spec, + deps, + attempt: state.finalAttempt, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store, + namespace: "final", + }); + await store.writePipelineArtifact("verification", verified.verification); + const haltResult: PipelineResult = { + runId: state.attempt.runId, + status: "human-decision-required", + attempt: state.finalAttempt, + increments: state.increments, + slices: phase.slices, + haltedSliceIndex: phase.haltedSliceIndex, + rounds: state.rounds, + verification: verified.verification, + gate: { + decisionReady: false, + requiresHumanDecision: true, + reasons: [reason], + }, + finalCandidateCommit: state.currentCandidateCommit, + failure: null, + }; + await store.writePipelineArtifact("pipeline-result", haltResult); + return haltResult; +} + +/** Increments two through `maxIncrements`, each continuing the previous candidate. */ +async function runIncrementPhase( + context: RunContext, + deps: PipelineDependencies, + state: PipelineRunState, + worktreePath: string, + maxIncrements: number, +): Promise { + const { checkoutPath, spec, store } = context; + try { + state.gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment git object isolation could not be established", + "sandbox-violation", + )); + } + const gitObjectAccess = state.gitObjectAccess; + const privateObjects = privateObjectReadOptions(gitObjectAccess); + + try { + for (let increment = 2; increment <= maxIncrements; increment += 1) { + // A cancellation that lands between Producer runs must stop the + // pipeline here. Otherwise the loop keeps launching Producers even + // though the caller has already given up on the run. + if (deps.abortSignal?.aborted === true) { + return terminal(failedAtCurrentCandidate( + state, + `cancelled before increment ${increment}`, + "cancelled", + )); + } + await context.notePhase(`increment ${increment}/${maxIncrements}`); + const previousCandidateCommit = state.currentCandidateCommit; + const diffText = await checkedGit(worktreePath, [ + "diff", + `${state.baselineCommit}..${state.currentCandidateCommit}`, + ], privateObjects); + const incrementRun = await runIncrement({ + spec, + pkg: { + spec, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + candidateDiff: diffText, + testEvidence: state.frozenTestEvidence, + progress: composeProgressNotes(state.increments.at(-1)?.report ?? state.attempt), + }, + worktreePath, + deps, + runId: state.attempt.runId, + increment, + store, + gitObjectAccess, + ...(context.runStart === undefined ? {} : { runStart: context.runStart }), + }); + if (!incrementRun.ok) { + return terminal(failedAtCurrentCandidate( + state, + `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, + incrementRun.failure, + )); + } + + const report = redactRecord(incrementRun.report); + await store.writePipelineArtifact(`increment-${increment}`, report); + const provenanceFailure = await validateCandidateProvenance({ + worktreePath, + previousCandidateCommit, + candidateCommit: report.candidateCommit, + gitObjectAccess, + }); + if (provenanceFailure !== null) { + return terminal(failedAtCurrentCandidate( + state, + provenanceFailure.reason, + provenanceFailure.failure, + )); + } + + const [previousTree, candidateTree] = await Promise.all([ + checkedGit(worktreePath, ["rev-parse", `${previousCandidateCommit}^{tree}`], privateObjects), + checkedGit(worktreePath, ["rev-parse", `${report.candidateCommit}^{tree}`], privateObjects), + ]); + const progressed = previousTree.trim() !== candidateTree.trim(); + if (report.candidateCommit !== previousCandidateCommit) { + try { + await importPromotedObjects({ + checkoutPath, + baselineCommit: previousCandidateCommit, + promotedCommit: report.candidateCommit, + access: gitObjectAccess, + }); + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment objects could not be imported into the shared git object store", + "sandbox-violation", + )); + } + } + state.currentCandidateCommit = report.candidateCommit; + state.increments.push({ + increment, + report, + roleLogRefs: incrementRun.roleLogRefs, + }); + + if (report.status === "complete") { + state.incrementOutcome = "complete"; + break; + } + if (report.status === "blocked") { + state.incrementOutcome = "blocked"; + break; + } + if (!progressed) { + state.incrementOutcome = "stalled"; + break; + } + } + state.incrementOutcome ??= "budget-exhausted"; + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment phase failed unexpectedly", + "producer-failure", + )); + } + return CONTINUE; +} + +/** Review rounds over the whole candidate branch, each followed by a fix when findings block. */ +async function runReviewRounds( + context: RunContext, + deps: PipelineDependencies, + state: PipelineRunState, + worktreePath: string, + reviewers: ReviewerKind[], + maxRounds: number, +): Promise { + const { spec, store } = context; + for (let round = 1; round <= maxRounds; round += 1) { + if (deps.abortSignal?.aborted === true) { + return terminal(failedAtCurrentCandidate( + state, + `cancelled before review round ${round}`, + "cancelled", + )); + } + await context.notePhase(`review round ${round}/${maxRounds}`); + const diffText = await checkedGit(worktreePath, [ + "diff", + `${state.baselineCommit}..${state.currentCandidateCommit}`, + ], state.gitObjectAccess === null ? undefined : privateObjectReadOptions(state.gitObjectAccess)); + const pkg: RolePackage = { + spec, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + candidateDiff: diffText, + testEvidence: state.frozenTestEvidence, + }; + const reviewRun = await runReviews({ + reviewers, + spec, + pkg, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + onReviewer: role => context.emitStatus("reviewing", { round, role }), + }); + if (!reviewRun.ok) { + return terminal(await salvagePipelineFailure(context, deps, state, { + reason: `review phase did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, + failure: "producer-failure", + })); + } + + const reviews = reviewRun.reviews.map(review => ({ + reviewer: review.reviewer, + report: review.report, + })); + const consolidated = consolidate(reviews); + await Promise.all(reviewRun.reviews.map(review => store.writePipelineArtifact( + `round-${round}-review-${review.reviewer}`, + review.report, + ))); + await store.writePipelineArtifact(`round-${round}-consolidated`, consolidated); + + const blocking = consolidated.findings.some( + finding => finding.severity === "blocker" || finding.severity === "major", + ); + const approved = reviewRun.reviews.every(review => review.report.verdict === "approve"); + // Record the round as soon as its reviews are consolidated. A later fix + // failure must not erase review work that is already on disk; the entry + // is completed in place once a fix lands. + const roundRecord: PipelineRound = { + round, + reviews, + consolidated, + fix: null, + roleLogRefs: reviewRun.roleLogRefs, + }; + state.rounds.push(roundRecord); + if (!blocking && approved) break; + + try { + state.gitObjectAccess ??= await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + return terminal(await archivePipelineFailure(context, state, { + reason: "fixer git object isolation could not be established", + failure: "sandbox-violation", + })); + } + + await context.emitStatus("fixing", { round, role: "fixer" }); + await context.notePhase(`round ${round}: applying fixes`); + const fixRun = await runFix({ + spec, + pkg: { ...pkg, findings: consolidated.findings }, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + gitObjectAccess: state.gitObjectAccess, + ...(context.runStart === undefined ? {} : { runStart: context.runStart }), + }); + if (!fixRun.ok) { + // The fix never landed, so the bytes here are the last reviewed + // candidate — salvage them rather than losing the whole round. + return terminal(await salvagePipelineFailure(context, deps, state, { + reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, + failure: fixRun.failure, + })); + } + const { fix } = fixRun; + await store.writePipelineArtifact(`round-${round}-fix`, fix); + const provenanceFailure = await validateFixProvenance({ + worktreePath, + previousCandidateCommit: state.currentCandidateCommit, + fix, + gitObjectAccess: state.gitObjectAccess, + }); + if (provenanceFailure !== null) { + return terminal(await archivePipelineFailure(context, state, { + reason: provenanceFailure.reason, + failure: provenanceFailure.failure, + })); + } + state.currentCandidateCommit = fix.candidateCommit; + roundRecord.fix = fix; + roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; + } + return CONTINUE; +} + +/** Re-anchor the reviewed branch as the run's candidate when a fix or slice moved it. */ +async function promoteReviewedCandidate( + context: RunContext, + state: PipelineRunState, +): Promise { + if (state.currentCandidateCommit === state.initialCandidate.candidateCommitOid) return CONTINUE; + if (state.gitObjectAccess === null && !state.sliced) { + return terminal(failedAtCurrentCandidate( + state, + "fixer git object isolation state is missing during promotion", + "sandbox-violation", + )); + } + const promoted = await promoteFinalCandidate({ + checkoutPath: context.checkoutPath, + attempt: state.attempt, + initialCandidate: state.initialCandidate, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store: context.store, + ...(state.gitObjectAccess === null ? {} : { privateObjectAccess: state.gitObjectAccess }), + }); + if (promoted === null) { + return terminal(await archivePipelineFailure(context, state, { + reason: state.sliced + ? "sliced candidate could not be promoted from the shared git object store" + : "fixer objects could not be imported into the shared git object store", + failure: "sandbox-violation", + })); + } + state.finalAttempt = promoted.attempt; + state.currentCandidateCommit = promoted.candidateCommit; + return CONTINUE; +} + +/** Final verification, the objective gate, and the durable record of its verdict. */ +async function finalizePipelineGate( + context: RunContext, + deps: PipelineDependencies, + state: PipelineRunState, + maxRounds: number, +): Promise { + const { checkoutPath, spec, store } = context; + await context.emitStatus("verifying"); + await context.notePhase("final verification"); + const verified = await verifyCandidate({ + checkoutPath, + spec, + deps, + attempt: state.finalAttempt, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, + store, + ...(state.sliced ? { namespace: "final" } : {}), + }); + await store.writePipelineArtifact("verification", verified.verification); + const lastRound = state.rounds.at(-1); + await context.emitStatus("gating"); + await context.notePhase("evaluating gate"); + const gate = evaluateGates({ + findings: lastRound?.consolidated.findings ?? [], + dispositions: lastRound?.fix?.dispositions ?? [], + verification: verified.verification, + roundsUsed: state.rounds.length, + maxRounds, + finalRoundReviewed: (lastRound?.fix ?? null) === null, + artifactsValid: true, + baselineDrift: verified.baselineDrift, + // Computed over the whole round history, not one round's prose. + nonConvergence: detectNonConvergence(state.rounds.map(round => ({ + round: round.round, + findings: round.consolidated.findings, + fixAttempted: round.fix !== null, + }))), + ...(state.incrementOutcome === undefined ? {} : { incrementOutcome: state.incrementOutcome }), + }); + // A refusing gate lived only in the pipeline-result artifact, which the + // accept path never reads: it loads the archived attempt, sees + // verified-candidate with no failure, and offers the candidate as clean. + // `archiveSlicedFailure` already records incompleteness in evidence for + // exactly this reason; a gate that completed and said no needs the same + // durability, or "blocking findings survived" is invisible at decision time. + const manifestForArchive = await store.readManifest(); + if (manifestForArchive === null) { + if (!gate.decisionReady) { + throw new RuntimeError( + "pipeline gate refused the candidate and the refusal could not be archived", + { reasons: gate.reasons }, + ); + } + throw new RuntimeError( + "pipeline gate cleared the candidate and the clearance could not be archived", + { + candidateCommitOid: state.currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision, + }, + ); + } + if (!gate.decisionReady) { + state.finalAttempt = { + ...state.finalAttempt, + evidence: { + ...state.finalAttempt.evidence, + pipelineGateRefused: { + reasons: gate.reasons, + requiresHumanDecision: gate.requiresHumanDecision, + }, + }, + }; + } + // One clearance record, built once. Constructing it a second time for the + // returned result gave the archive and the caller two different `clearedAt` + // values for the same clearance, which no reader of only one could detect. + const gateClearedRecord: PipelineGateCleared | null = !gate.decisionReady ? null : { + clearedVersion: "1", + candidateCommitOid: state.currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision, + clearedAt: new Date().toISOString(), + }; + if (gateClearedRecord !== null) { + state.finalAttempt = { + ...state.finalAttempt, + evidence: { + ...state.finalAttempt.evidence, + pipelineGateCleared: { + candidateCommitOid: state.currentCandidateCommit, + requiresHumanDecision: gate.requiresHumanDecision, + }, + }, + }; + await store.writePipelineGateCleared(gateClearedRecord); + } + await store.promoteTerminalArtifacts({ + result: state.finalAttempt, + manifest: manifestForArchive, + }); + const result: PipelineResult = { + runId: state.attempt.runId, + status: gate.decisionReady ? "decision-ready" : "human-decision-required", + attempt: state.finalAttempt, + increments: state.increments, + slices: state.pipelineSlices, + haltedSliceIndex: null, + rounds: state.rounds, + verification: verified.verification, + gate, + finalCandidateCommit: state.currentCandidateCommit, + failure: null, + pipelineGateCleared: gateClearedRecord, + }; + await store.writePipelineArtifact("pipeline-result", result); + // The terminal done/failed status is written by `runPipeline` while it still + // holds the lease, before `finally` releases it, so it is not repeated here. + await context.notePhase(`finished: ${result.status}`); + state.authoritySafeToRelease = true; + return result; +} + async function runPipelineWithLease( checkoutPath: string, spec: DelegationSpec, @@ -504,36 +1205,20 @@ async function runPipelineWithLease( ): Promise { const runAttemptFn = deps.runAttempt ?? defaultRunAttempt; const slices = resolveSlices(spec); - const initialSpec = slices.length === 0 ? spec : scopeSpecToSlice(spec, slices[0]!); + const sliced = slices.length > 0; + const sliceCount = sliced ? slices.length : null; + const initialSpec = sliced ? scopeSpecToSlice(spec, slices[0]!) : spec; const activeOwner: PipelineActiveMarker = { pid: process.pid, processToken: await ps.getProcessStartToken(process.pid).catch(() => null), startedAt: new Date().toISOString(), - sliced: slices.length > 0, + sliced, }; + // Until the attempt reports its run id there is no store to write status + // to; these two fields bridge the attempt's callbacks to the run context + // that is built once the id is known. let statusStore: ArtifactStore | null = null; let statusRunId: string | null = null; - const emitPipelineStatus = async ( - phase: RunStatusPhase, - fields: Partial> = {}, - ): Promise => { - if (statusStore === null || statusRunId === null) return; - await transitionRunStatusSafely(statusStore, statusRunId, phase, { - sliceIndex: fields.sliceIndex ?? (slices.length > 0 ? slices.length : null), - sliceCount: fields.sliceCount ?? (slices.length > 0 ? slices.length : null), - round: fields.round ?? null, - role: fields.role ?? null, - producerId: fields.producerId ?? null, - detail: fields.detail ?? null, - }); - }; - const notePhase = async (phase: string): Promise => { - // Best-effort progress; must never affect pipeline control flow. - try { await deps.onPhase?.(phase); } catch { /* progress reporting is advisory */ } - }; let runStart: RunStartContext | undefined; let slicedMarkerEstablished = false; const inheritedOnRunStart = deps.onRunStart; @@ -546,9 +1231,9 @@ async function runPipelineWithLease( dispatchedSpecSha256: specSha256(spec), borrowedCheckoutLease, runStatus: { - mode: slices.length > 0 ? "sliced" : "single", - sliceIndex: slices.length > 0 ? 1 : null, - sliceCount: slices.length > 0 ? slices.length : null, + mode: sliced ? "sliced" : "single", + sliceIndex: sliced ? 1 : null, + sliceCount, pipelineManaged: true, }, async onPhase(phase) { @@ -559,9 +1244,14 @@ async function runPipelineWithLease( : phase === "verifying candidate" ? "verifying" : null; - if (mapped !== null) { - await emitPipelineStatus(mapped, { - sliceIndex: slices.length > 0 ? 1 : null, + if (mapped !== null && statusStore !== null && statusRunId !== null) { + await transitionRunStatusSafely(statusStore, statusRunId, mapped, { + sliceIndex: sliced ? 1 : null, + sliceCount, + round: null, + role: null, + producerId: null, + detail: null, }); } try { await inheritedOnPhase?.(phase); } catch { /* host progress is advisory */ } @@ -570,17 +1260,17 @@ async function runPipelineWithLease( runStart = context; statusRunId = context.record.runId; statusStore = new ArtifactStore(context.record.runId); - if (slices.length > 0) { + if (sliced) { await statusStore.writePipelineActiveMarker(activeOwner); slicedMarkerEstablished = true; } await writeRunStatusSafely(statusStore, { statusVersion: "1", runId: context.record.runId, - mode: slices.length > 0 ? "sliced" : "single", + mode: sliced ? "sliced" : "single", phase: "preflight", - sliceIndex: slices.length > 0 ? 1 : null, - sliceCount: slices.length > 0 ? slices.length : null, + sliceIndex: sliced ? 1 : null, + sliceCount, round: null, role: null, producerId: null, @@ -588,8 +1278,12 @@ async function runPipelineWithLease( updatedAt: new Date().toISOString(), detail: null, }); - await emitPipelineStatus("baseline-verify", { - sliceIndex: slices.length > 0 ? 1 : null, + await transitionRunStatusSafely(statusStore, context.record.runId, "baseline-verify", { + sliceIndex: sliced ? 1 : null, + sliceCount, + round: null, + role: null, + producerId: null, detail: spec.executionMode === "edit" ? null : "skipped for read-only execution", }); await inheritedOnRunStart?.(context); @@ -597,9 +1291,9 @@ async function runPipelineWithLease( }); const store = new ArtifactStore(attempt.runId); await store.writePipelineArtifact("delegation-spec", spec); - // Run-scoped facts travel as one value from here down, so no slice reaches + // Run-scoped facts travel as one value from here down, so no phase reaches // back into this function's closure for them. - const runContext: RunContext = createRunContext({ + const context: RunContext = createRunContext({ runId: attempt.runId, checkoutPath, spec, @@ -608,7 +1302,10 @@ async function runPipelineWithLease( borrowedCheckoutLease, ...(runStart === undefined ? {} : { runStart }), ...(inheritedOnPhase === undefined ? {} : { onPhase: inheritedOnPhase }), - sliceCount: slices.length > 0 ? slices.length : null, + sliceCount, + // Once the slice wave is over, status lines describe the whole branch; + // the last slice index is the honest position for them. + sliceIndex: sliceCount, }); if (attempt.status !== "verified-candidate" || attempt.candidate === null) { if (slicedMarkerEstablished) await store.clearPipelineActiveMarker(); @@ -625,202 +1322,59 @@ async function runPipelineWithLease( ); } - if (slices.length === 0) await store.writePipelineActiveMarker(activeOwner); + if (!sliced) await store.writePipelineActiveMarker(activeOwner); const temporarySliceRefs: TemporarySliceRef[] = []; - let finalAttempt = attempt; - let authoritySafeToRelease = slices.length === 0; + const state: PipelineRunState = { + attempt, + initialCandidate: attempt.candidate, + baselineCommit: attempt.candidate.baseCommitOid, + sliced, + rounds: [], + increments: [], + finalAttempt: attempt, + currentCandidateCommit: attempt.candidate.candidateCommitOid, + pipelineSlices: [], + incrementOutcome: undefined, + gitObjectAccess: null, + frozenTestEvidence: testEvidence(attempt), + authoritySafeToRelease: !sliced, + }; let pipelinePrimaryError: unknown; try { const reviewConfig = resolveReviewConfig(spec); const { reviewers, maxRounds } = reviewConfig; - const maxIncrements = slices.length === 0 - ? resolveImplementationConfig(spec).maxIncrements - : 1; - const increments: PipelineIncrement[] = []; - let incrementOutcome: IncrementOutcome | undefined; - const rounds: PipelineRound[] = []; - const baselineCommit = attempt.candidate.baseCommitOid; - let currentCandidateCommit = attempt.candidate.candidateCommitOid; - let frozenTestEvidence = testEvidence(attempt); - let pipelineSlices: PipelineSlice[] = []; - const archivePipelineFailure = async (args: { - finalCandidateCommit: string; - reason: string; - failure: FailureClassification; - slices?: PipelineSlice[]; - haltedSliceIndex?: number | null; - }): Promise => { - const failedAttempt = slices.length === 0 - ? attempt - : await archiveSlicedFailure({ - checkoutPath, - attempt, - failure: args.failure, - reason: args.reason, - store, - }); - if (slices.length > 0) authoritySafeToRelease = true; - finalAttempt = failedAttempt; - return failedResult( - failedAttempt, - rounds, - args.finalCandidateCommit, - args.reason, - args.failure, - increments, - args.slices ?? pipelineSlices, - args.haltedSliceIndex ?? null, + const maxIncrements = sliced ? 1 : resolveImplementationConfig(spec).maxIncrements; + const failSliceExecution = async ( + error: unknown, + completedSlices: PipelineSlice[], + ): Promise => { + const archived = await archiveSliceExecutionError({ checkoutPath, error, attempt, store }); + state.authoritySafeToRelease = true; + state.finalAttempt = archived.failedAttempt; + if (error !== archived.sliceError) throw error; + const failed = failedResult( + archived.failedAttempt, + state.rounds, + completedSlices.at(-1)?.candidateCommit ?? state.baselineCommit, + archived.sliceError.message, + archived.sliceError.failure, + state.increments, + completedSlices, ); + await store.writePipelineArtifact("pipeline-result", failed); + return failed; }; - /** - * A role that cannot produce parseable structured output is an orchestration - * failure, not a verdict on the candidate. Discarding independently verified - * bytes for it forces a full re-dispatch of work that already passed — the - * single most expensive recurring loss in the delegation loop. Promote and - * re-verify what exists; present it for the human decision the pipeline could - * not complete itself. Only a candidate that fails verification is discarded. - */ - const salvagePipelineFailure = async (args: { - finalCandidateCommit: string; - reason: string; - failure: FailureClassification; - gitObjectAccess: LinkedWorktreeGitAccess | null; - }): Promise => { - const fallback = async (): Promise => archivePipelineFailure({ - finalCandidateCommit: args.finalCandidateCommit, - reason: args.reason, - failure: args.failure, - }); - if (finalAttempt.candidate === null) return await fallback(); - - let salvagedAttempt = finalAttempt; - let salvagedCommit = args.finalCandidateCommit; - if (salvagedCommit !== finalAttempt.candidate.candidateCommitOid) { - const promoted = await promoteFinalCandidate({ - checkoutPath, - attempt: finalAttempt, - initialCandidate: finalAttempt.candidate, - baselineCommit, - candidateCommit: salvagedCommit, - store, - ...(args.gitObjectAccess === null - ? {} - : { privateObjectAccess: args.gitObjectAccess }), - }); - if (promoted === null) return await fallback(); - salvagedAttempt = promoted.attempt; - salvagedCommit = promoted.candidateCommit; - } - if (slices.length > 0) authoritySafeToRelease = true; - - let verified; - try { - verified = await verifyCandidate({ - checkoutPath, - spec, - deps, - attempt: salvagedAttempt, - baselineCommit, - candidateCommit: salvagedCommit, - store, - namespace: "salvage", - }); - } catch { - return await fallback(); - } - const manifestForArchive = await store.readManifest(attempt.runId); - if (!verified.verification.pass) { - // The freshest evidence says these bytes do not verify. Record that where - // the accept gate reads it, or the archived run keeps advertising the - // stale verified-candidate status and stays acceptable. The bytes are - // retained; only their acceptability is withdrawn. - if (manifestForArchive === null) return await fallback(); - const demoted: AttemptResult = { - ...salvagedAttempt, - status: "failed", - failure: "verification-failure", - summary: args.reason, - unresolvedIssues: [ - ...salvagedAttempt.unresolvedIssues, - args.reason, - "salvage re-verification failed", - ], - evidence: { - ...salvagedAttempt.evidence, - pipelineFailure: { failure: args.failure, reason: args.reason }, - }, - }; - await store.promoteTerminalArtifacts({ result: demoted, manifest: manifestForArchive }); - if (slices.length > 0) authoritySafeToRelease = true; - finalAttempt = demoted; - await store.writePipelineArtifact("verification", verified.verification); - const failed = failedResult( - demoted, - rounds, - salvagedCommit, - args.reason, - args.failure, - increments, - pipelineSlices, - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; - } - - // A human reading the archived run later must be able to see that the - // pipeline never reviewed this candidate. Record that durably in the - // result the accept path reads, not only in the transient gate. - if (manifestForArchive === null) return await fallback(); - salvagedAttempt = { - ...salvagedAttempt, - evidence: { - ...salvagedAttempt.evidence, - pipelineReviewIncomplete: { failure: args.failure, reason: args.reason }, - }, - }; - await store.promoteTerminalArtifacts({ - result: salvagedAttempt, - manifest: manifestForArchive, - }); - - finalAttempt = salvagedAttempt; - await store.writePipelineArtifact("verification", verified.verification); - const salvaged: PipelineResult = { - runId: attempt.runId, - status: "human-decision-required", - attempt: salvagedAttempt, - increments, - slices: pipelineSlices, - haltedSliceIndex: null, - rounds, - verification: verified.verification, - gate: { - decisionReady: false, - requiresHumanDecision: true, - reasons: [ - args.reason, - "the candidate passed independent verification; the pipeline could not" - + " complete its own review, so the whole-branch review is the human's", - ], - }, - finalCandidateCommit: salvagedCommit, - failure: null, - }; - await store.writePipelineArtifact("pipeline-result", salvaged); - return salvaged; - }; - - if (slices.length > 0) { + if (sliced) { const initialNamespace = "slice-1-attempt-0"; - await emitPipelineStatus("verifying", { sliceIndex: 1 }); + await context.emitStatus("verifying", { sliceIndex: 1 }); const initialVerification = await verifyCandidate({ checkoutPath, spec: initialSpec, deps, attempt, - baselineCommit, - candidateCommit: currentCandidateCommit, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, store, namespace: initialNamespace, }); @@ -834,8 +1388,8 @@ async function runPipelineWithLease( spec: initialSpec, deps, runId: attempt.runId, - baselineCommit, - candidateCommit: currentCandidateCommit, + baselineCommit: state.baselineCommit, + candidateCommit: state.currentCandidateCommit, namespace: initialNamespace, reviewers, verification: initialVerification.verification, @@ -843,25 +1397,7 @@ async function runPipelineWithLease( borrowedCheckoutLease, }); } catch (error) { - const archived = await archiveSliceExecutionError({ - checkoutPath, - error, - attempt, - store, - }); - authoritySafeToRelease = true; - finalAttempt = archived.failedAttempt; - if (error !== archived.sliceError) throw error; - const failed = failedResult( - archived.failedAttempt, - rounds, - baselineCommit, - archived.sliceError.message, - archived.sliceError.failure, - increments, - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; + return await failSliceExecution(error, []); } initialPerSliceReview = reviewed.review; initialRoleLogRefs.push(...reviewed.roleLogRefs); @@ -879,14 +1415,14 @@ async function runPipelineWithLease( roleRunner: deps.roleRunner, }); phase = await sliceRunner.run({ - context: runContext, + context, slices, - baselineCommit, + baselineCommit: state.baselineCommit, attempt, budgets: { maxRounds }, concurrency: resolveSliceConcurrency(spec), initialAttempt: { - candidateCommit: currentCandidateCommit, + candidateCommit: state.currentCandidateCommit, verification: initialVerification.verification, perSliceReview: initialPerSliceReview, roleLogRefs: initialRoleLogRefs, @@ -900,466 +1436,37 @@ async function runPipelineWithLease( }, }); } catch (error) { - const archived = await archiveSliceExecutionError({ - checkoutPath, - error, - attempt, - store, - }); - authoritySafeToRelease = true; - finalAttempt = archived.failedAttempt; - if (error !== archived.sliceError) throw error; - const failed = failedResult( - archived.failedAttempt, - rounds, - completedSlices.at(-1)?.candidateCommit ?? baselineCommit, - archived.sliceError.message, - archived.sliceError.failure, - increments, - completedSlices, - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; + return await failSliceExecution(error, completedSlices); } - pipelineSlices = phase.slices; + state.pipelineSlices = phase.slices; // The runner hands its refs over rather than dropping them: the final // review round still resolves them, and this function's `finally` is the // single place they are deleted. temporarySliceRefs.push(...(phase.temporarySliceRefs ?? [])); - currentCandidateCommit = phase.finalCandidateCommit; + state.currentCandidateCommit = phase.finalCandidateCommit; if (phase.haltedSliceIndex !== null) { - const halted = phase.slices.at(-1); - const reason = `slice phase halted at slice ${phase.haltedSliceIndex}: ${halted?.reasons.join("; ") ?? "objective gate failed"}`; - if (currentCandidateCommit === baselineCommit) { - // No slice advanced past the baseline, so there is no partial branch - // for the human to accept. Retain the slice evidence and report the - // halt as a failure. - const failedAttempt = await archiveSlicedFailure({ - checkoutPath, - attempt, - failure: "verification-failure", - reason, - store, - }); - authoritySafeToRelease = true; - finalAttempt = failedAttempt; - const failed = failedResult( - failedAttempt, - rounds, - currentCandidateCommit, - reason, - "verification-failure", - increments, - phase.slices, - phase.haltedSliceIndex, - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; - } - // At least one slice advanced. Promote the partial branch (the advanced - // slices) to a frozen, acceptable candidate and hand the halt to the - // human — the design routes a mid-run halt to human-decision-required so - // the human can accept, reject, or revise the partial branch. The failed - // slice's attempts stay in `slices` as evidence. Review rounds are - // skipped; final verification runs so the human sees an honest report on - // the exact partial branch. - const promoted = await promoteFinalCandidate({ - checkoutPath, - attempt, - initialCandidate: attempt.candidate, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - }); - if (promoted === null) { - const promotionReason = "partial halt candidate could not be promoted from the git object store"; - const failedAttempt = await archiveSlicedFailure({ - checkoutPath, - attempt, - failure: "sandbox-violation", - reason: promotionReason, - store, - }); - authoritySafeToRelease = true; - finalAttempt = failedAttempt; - const failed = failedResult( - failedAttempt, - rounds, - currentCandidateCommit, - promotionReason, - "sandbox-violation", - increments, - phase.slices, - phase.haltedSliceIndex, - ); - await store.writePipelineArtifact("pipeline-result", failed); - return failed; - } - finalAttempt = promoted.attempt; - currentCandidateCommit = promoted.candidateCommit; - authoritySafeToRelease = true; - await notePhase("partial halt verification"); - const verified = await verifyCandidate({ - checkoutPath, - spec, - deps, - attempt: finalAttempt, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - namespace: "final", - }); - await store.writePipelineArtifact("verification", verified.verification); - const haltResult: PipelineResult = { - runId: attempt.runId, - status: "human-decision-required", - attempt: finalAttempt, - increments, - slices: phase.slices, - haltedSliceIndex: phase.haltedSliceIndex, - rounds, - verification: verified.verification, - gate: { - decisionReady: false, - requiresHumanDecision: true, - reasons: [reason], - }, - finalCandidateCommit: currentCandidateCommit, - failure: null, - }; - await store.writePipelineArtifact("pipeline-result", haltResult); - return haltResult; + return await resolveHaltedSlicePhase(context, deps, state, phase); } - frozenTestEvidence = sliceTestEvidence(phase.slices); + state.frozenTestEvidence = sliceTestEvidence(phase.slices); } const candidateWorktree = await new WorktreeManager( checkoutPath, - slices.length === 0 ? `${attempt.runId}-pipeline` : `${attempt.runId}-composed-review`, + sliced ? `${attempt.runId}-composed-review` : `${attempt.runId}-pipeline`, ps, deps.borrowedCheckoutLease === undefined ? {} : { borrowedCheckoutLease: deps.borrowedCheckoutLease }, - ).create(currentCandidateCommit); - let gitObjectAccess: LinkedWorktreeGitAccess | null = null; + ).create(state.currentCandidateCommit); try { if (maxIncrements > 1) { - try { - gitObjectAccess = await resolveLinkedWorktreeWritableRoots(candidateWorktree.path); - } catch { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "increment git object isolation could not be established", - "sandbox-violation", - increments, - pipelineSlices, - ); - } - - try { - for (let increment = 2; increment <= maxIncrements; increment += 1) { - // A cancellation that lands between Producer runs must stop the - // pipeline here. Otherwise the loop keeps launching Producers even - // though the caller has already given up on the run. - if (deps.abortSignal?.aborted === true) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - `cancelled before increment ${increment}`, - "cancelled", - increments, - pipelineSlices, - ); - } - await notePhase(`increment ${increment}/${maxIncrements}`); - const previousCandidateCommit = currentCandidateCommit; - const diffText = await checkedGit(candidateWorktree.path, [ - "diff", - `${baselineCommit}..${currentCandidateCommit}`, - ], privateObjectReadOptions(gitObjectAccess)); - const incrementRun = await runIncrement({ - spec, - pkg: { - spec, - baselineCommit, - candidateCommit: currentCandidateCommit, - candidateDiff: diffText, - testEvidence: frozenTestEvidence, - progress: composeProgressNotes(increments.at(-1)?.report ?? attempt), - }, - worktreePath: candidateWorktree.path, - deps, - runId: attempt.runId, - increment, - store, - gitObjectAccess, - ...(runStart === undefined ? {} : { runStart }), - }); - if (!incrementRun.ok) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, - incrementRun.failure, - increments, - pipelineSlices, - ); - } - - const report = redactRecord(incrementRun.report); - await store.writePipelineArtifact(`increment-${increment}`, report); - const provenanceFailure = await validateCandidateProvenance({ - worktreePath: candidateWorktree.path, - previousCandidateCommit, - candidateCommit: report.candidateCommit, - gitObjectAccess, - }); - if (provenanceFailure !== null) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - provenanceFailure.reason, - provenanceFailure.failure, - increments, - pipelineSlices, - ); - } - - const privateObjects = privateObjectReadOptions(gitObjectAccess); - const [previousTree, candidateTree] = await Promise.all([ - checkedGit( - candidateWorktree.path, - ["rev-parse", `${previousCandidateCommit}^{tree}`], - privateObjects, - ), - checkedGit( - candidateWorktree.path, - ["rev-parse", `${report.candidateCommit}^{tree}`], - privateObjects, - ), - ]); - const progressed = previousTree.trim() !== candidateTree.trim(); - if (report.candidateCommit !== previousCandidateCommit) { - try { - await importPromotedObjects({ - checkoutPath, - baselineCommit: previousCandidateCommit, - promotedCommit: report.candidateCommit, - access: gitObjectAccess, - }); - } catch { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "increment objects could not be imported into the shared git object store", - "sandbox-violation", - increments, - pipelineSlices, - ); - } - } - currentCandidateCommit = report.candidateCommit; - increments.push({ - increment, - report, - roleLogRefs: incrementRun.roleLogRefs, - }); - - if (report.status === "complete") { - incrementOutcome = "complete"; - break; - } - if (report.status === "blocked") { - incrementOutcome = "blocked"; - break; - } - if (!progressed) { - incrementOutcome = "stalled"; - break; - } - } - incrementOutcome ??= "budget-exhausted"; - } catch { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "increment phase failed unexpectedly", - "producer-failure", - increments, - pipelineSlices, - ); - } - } - - for (let round = 1; round <= maxRounds; round += 1) { - if (deps.abortSignal?.aborted === true) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - `cancelled before review round ${round}`, - "cancelled", - increments, - pipelineSlices, - ); - } - await notePhase(`review round ${round}/${maxRounds}`); - const diffText = await checkedGit(candidateWorktree.path, [ - "diff", - `${baselineCommit}..${currentCandidateCommit}`, - ], gitObjectAccess === null ? undefined : privateObjectReadOptions(gitObjectAccess)); - const pkg: RolePackage = { - spec, - baselineCommit, - candidateCommit: currentCandidateCommit, - candidateDiff: diffText, - testEvidence: frozenTestEvidence, - }; - const reviewRun = await runReviews({ - reviewers, - spec, - pkg, - worktreePath: candidateWorktree.path, - deps, - runId: attempt.runId, - round, - store, - onReviewer: role => emitPipelineStatus("reviewing", { - round, - role, - }), - }); - if (!reviewRun.ok) { - const reason = `review phase did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`; - return await salvagePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason, - failure: "producer-failure", - gitObjectAccess, - }); - } - - const reviews = reviewRun.reviews.map(review => ({ - reviewer: review.reviewer, - report: review.report, - })); - const consolidated = consolidate(reviews); - await Promise.all(reviewRun.reviews.map(review => store.writePipelineArtifact( - `round-${round}-review-${review.reviewer}`, - review.report, - ))); - await store.writePipelineArtifact(`round-${round}-consolidated`, consolidated); - - const blocking = consolidated.findings.some( - finding => finding.severity === "blocker" || finding.severity === "major", - ); - const approved = reviewRun.reviews.every(review => review.report.verdict === "approve"); - // Record the round as soon as its reviews are consolidated. A later fix - // failure must not erase review work that is already on disk; the entry - // is completed in place once a fix lands. - const roundRecord: PipelineRound = { - round, - reviews, - consolidated, - fix: null, - roleLogRefs: reviewRun.roleLogRefs, - }; - rounds.push(roundRecord); - if (!blocking && approved) break; - - try { - gitObjectAccess ??= await resolveLinkedWorktreeWritableRoots(candidateWorktree.path); - } catch { - return await archivePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: "fixer git object isolation could not be established", - failure: "sandbox-violation", - }); - } - - await emitPipelineStatus("fixing", { round, role: "fixer" }); - await notePhase(`round ${round}: applying fixes`); - const fixRun = await runFix({ - spec, - pkg: { ...pkg, findings: consolidated.findings }, - worktreePath: candidateWorktree.path, - deps, - runId: attempt.runId, - round, - store, - gitObjectAccess, - ...(runStart === undefined ? {} : { runStart }), - }); - if (!fixRun.ok) { - // The fix never landed, so the bytes here are the last reviewed - // candidate — salvage them rather than losing the whole round. - return await salvagePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, - failure: fixRun.failure, - gitObjectAccess, - }); - } - const { fix } = fixRun; - await store.writePipelineArtifact(`round-${round}-fix`, fix); - const provenanceFailure = await validateFixProvenance({ - worktreePath: candidateWorktree.path, - previousCandidateCommit: currentCandidateCommit, - fix, - gitObjectAccess, - }); - if (provenanceFailure !== null) { - return await archivePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: provenanceFailure.reason, - failure: provenanceFailure.failure, - }); - } - currentCandidateCommit = fix.candidateCommit; - roundRecord.fix = fix; - roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; - } - - if (currentCandidateCommit !== attempt.candidate.candidateCommitOid) { - if (gitObjectAccess === null && slices.length === 0) { - return failedResult( - attempt, - rounds, - currentCandidateCommit, - "fixer git object isolation state is missing during promotion", - "sandbox-violation", - increments, - pipelineSlices, - ); - } - const promoted = await promoteFinalCandidate({ - checkoutPath, - attempt, - initialCandidate: attempt.candidate, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - ...(gitObjectAccess === null ? {} : { privateObjectAccess: gitObjectAccess }), - }); - if (promoted === null) { - return await archivePipelineFailure({ - finalCandidateCommit: currentCandidateCommit, - reason: slices.length === 0 - ? "fixer objects could not be imported into the shared git object store" - : "sliced candidate could not be promoted from the shared git object store", - failure: "sandbox-violation", - }); - } - finalAttempt = promoted.attempt; - currentCandidateCommit = promoted.candidateCommit; + const outcome = await runIncrementPhase(context, deps, state, candidateWorktree.path, maxIncrements); + if (outcome.state === "terminal") return outcome.result; } + const reviewed = await runReviewRounds(context, deps, state, candidateWorktree.path, reviewers, maxRounds); + if (reviewed.state === "terminal") return reviewed.result; + const promoted = await promoteReviewedCandidate(context, state); + if (promoted.state === "terminal") return promoted.result; } finally { const cleanupError = await cleanupWorktree(candidateWorktree); if (cleanupError !== null) { @@ -1369,133 +1476,21 @@ async function runPipelineWithLease( } } - await emitPipelineStatus("verifying"); - await notePhase("final verification"); - const verified = await verifyCandidate({ - checkoutPath, - spec, - deps, - attempt: finalAttempt, - baselineCommit, - candidateCommit: currentCandidateCommit, - store, - ...(slices.length === 0 ? {} : { namespace: "final" }), - }); - await store.writePipelineArtifact("verification", verified.verification); - const lastRound = rounds.at(-1); - await emitPipelineStatus("gating"); - await notePhase("evaluating gate"); - const gate = evaluateGates({ - findings: lastRound?.consolidated.findings ?? [], - dispositions: lastRound?.fix?.dispositions ?? [], - verification: verified.verification, - roundsUsed: rounds.length, - maxRounds, - finalRoundReviewed: (lastRound?.fix ?? null) === null, - artifactsValid: true, - baselineDrift: verified.baselineDrift, - // Computed over the whole round history, not one round's prose. - nonConvergence: detectNonConvergence(rounds.map(round => ({ - round: round.round, - findings: round.consolidated.findings, - fixAttempted: round.fix !== null, - }))), - ...(incrementOutcome === undefined ? {} : { incrementOutcome }), - }); - // A refusing gate lived only in the pipeline-result artifact, which the - // accept path never reads: it loads the archived attempt, sees - // verified-candidate with no failure, and offers the candidate as clean. - // `archiveSlicedFailure` already records incompleteness in evidence for - // exactly this reason; a gate that completed and said no needs the same - // durability, or "blocking findings survived" is invisible at decision time. - const manifestForArchive = await store.readManifest(attempt.runId); - if (manifestForArchive === null) { - if (!gate.decisionReady) { - throw new RuntimeError( - "pipeline gate refused the candidate and the refusal could not be archived", - { reasons: gate.reasons }, - ); - } - throw new RuntimeError( - "pipeline gate cleared the candidate and the clearance could not be archived", - { - candidateCommitOid: currentCandidateCommit, - requiresHumanDecision: gate.requiresHumanDecision, - }, - ); - } - if (!gate.decisionReady) { - finalAttempt = { - ...finalAttempt, - evidence: { - ...finalAttempt.evidence, - pipelineGateRefused: { - reasons: gate.reasons, - requiresHumanDecision: gate.requiresHumanDecision, - }, - }, - }; - } - // One clearance record, built once. Constructing it a second time for the - // returned result gave the archive and the caller two different `clearedAt` - // values for the same clearance, which no reader of only one could detect. - const gateClearedRecord: PipelineGateCleared | null = !gate.decisionReady ? null : { - clearedVersion: "1", - candidateCommitOid: currentCandidateCommit, - requiresHumanDecision: gate.requiresHumanDecision, - clearedAt: new Date().toISOString(), - }; - if (gateClearedRecord !== null) { - finalAttempt = { - ...finalAttempt, - evidence: { - ...finalAttempt.evidence, - pipelineGateCleared: { - candidateCommitOid: currentCandidateCommit, - requiresHumanDecision: gate.requiresHumanDecision, - }, - }, - }; - await store.writePipelineGateCleared(gateClearedRecord); - } - await store.promoteTerminalArtifacts({ - result: finalAttempt, - manifest: manifestForArchive, - }); - const result: PipelineResult = { - runId: attempt.runId, - status: gate.decisionReady ? "decision-ready" : "human-decision-required", - attempt: finalAttempt, - increments, - slices: pipelineSlices, - haltedSliceIndex: null, - rounds, - verification: verified.verification, - gate, - finalCandidateCommit: currentCandidateCommit, - failure: null, - pipelineGateCleared: gateClearedRecord, - }; - await store.writePipelineArtifact("pipeline-result", result); - // The terminal done/failed status is written by `runPipeline` while it still - // holds the lease, before `finally` releases it, so it is not repeated here. - await notePhase(`finished: ${result.status}`); - authoritySafeToRelease = true; - return result; + return await finalizePipelineGate(context, deps, state, maxRounds); } catch (error) { let terminalError = error; - if (slices.length > 0 - && finalAttempt.status === "verified-candidate" + if (sliced + && state.finalAttempt.status === "verified-candidate" && !containsSlicedFailureArchiveError(error)) { try { - finalAttempt = await archiveSlicedFailure({ + state.finalAttempt = await archiveSlicedFailure({ checkoutPath, - attempt: finalAttempt, + attempt: state.finalAttempt, failure: "verification-failure", reason: "sliced pipeline terminated before completing trusted gates", store, }); - authoritySafeToRelease = true; + state.authoritySafeToRelease = true; } catch (archiveError) { terminalError = new AggregateError( [error, archiveError], @@ -1503,7 +1498,7 @@ async function runPipelineWithLease( ); } } - await emitPipelineStatus("failed", { + await context.emitStatus("failed", { detail: terminalError instanceof Error ? terminalError.message : "pipeline failed unexpectedly", }); pipelinePrimaryError = terminalError; @@ -1511,23 +1506,23 @@ async function runPipelineWithLease( } finally { const cleanupErrors = await cleanupTemporarySliceRefs(checkoutPath, temporarySliceRefs); if (cleanupErrors.length > 0 - && slices.length > 0 - && finalAttempt.status === "verified-candidate" + && sliced + && state.finalAttempt.status === "verified-candidate" && !containsSlicedFailureArchiveError(pipelinePrimaryError)) { try { - finalAttempt = await archiveSlicedFailure({ + state.finalAttempt = await archiveSlicedFailure({ checkoutPath, - attempt: finalAttempt, + attempt: state.finalAttempt, failure: "verification-failure", reason: "temporary slice ref cleanup did not complete", store, }); - authoritySafeToRelease = true; + state.authoritySafeToRelease = true; } catch (archiveError) { cleanupErrors.push(archiveError); } } - if (cleanupErrors.length === 0 && authoritySafeToRelease) { + if (cleanupErrors.length === 0 && state.authoritySafeToRelease) { try { await store.clearPipelineActiveMarker(); } catch (cleanupError) { diff --git a/src/pipeline/run-context.ts b/src/pipeline/run-context.ts index 10de2bd..007e9b4 100644 --- a/src/pipeline/run-context.ts +++ b/src/pipeline/run-context.ts @@ -38,6 +38,8 @@ export interface CreateRunContextOptions { runStart?: RunStartContext | undefined; onPhase?: ((phase: string) => Promise | void) | undefined; sliceCount?: number | null | undefined; + /** Default `sliceIndex` for status lines that name no slice of their own. */ + sliceIndex?: number | null | undefined; } export function createRunContext(options: CreateRunContextOptions): RunContext { @@ -51,6 +53,7 @@ export function createRunContext(options: CreateRunContextOptions): RunContext { runStart, onPhase, sliceCount, + sliceIndex, } = options; return { @@ -63,7 +66,7 @@ export function createRunContext(options: CreateRunContextOptions): RunContext { ...(runStart === undefined ? {} : { runStart }), async emitStatus(phase: RunStatusPhase, fields?: RunStatusFields): Promise { await transitionRunStatusSafely(store, runId, phase, { - sliceIndex: fields?.sliceIndex ?? null, + sliceIndex: fields?.sliceIndex ?? sliceIndex ?? null, sliceCount: fields?.sliceCount ?? sliceCount ?? null, round: fields?.round ?? null, role: fields?.role ?? null, diff --git a/src/runtime/artifact-store.ts b/src/runtime/artifact-store.ts index ed8491d..b21928b 100644 --- a/src/runtime/artifact-store.ts +++ b/src/runtime/artifact-store.ts @@ -739,6 +739,160 @@ function validatePostPipelineAutopilotArtifacts( }; } +type ArtifactWriteMode = "immutable" | "replace" | "replace-if-present"; + +/** + * One archived artifact kind: where it lives under the run directory, how + * archived bytes are proven to be this kind on the way out (`parse`), and — + * for kinds the store writes — how a value is redacted and proven valid on + * the way in (`prepare`) and whether a second write is refused, replaces the + * file, or is skipped for a vanished run. Adding an artifact kind is one + * descriptor plus one façade. + */ +interface ArtifactDescriptor { + readonly relativePath: string; + readonly parse: (value: unknown, runId: string) => Read; + readonly write?: { + readonly mode: ArtifactWriteMode; + readonly prepare: (value: Write, runId: string) => Write; + }; +} + +type WritableArtifactDescriptor = + ArtifactDescriptor & Required, "write">>; + +function validatePipelineActiveMarker(value: unknown, message: string): PipelineActiveMarker { + const marker = value as Partial | null; + if (typeof marker !== "object" + || marker === null + || typeof marker.pid !== "number" + || !Number.isSafeInteger(marker.pid) + || marker.pid <= 1 + || (marker.processToken !== null && typeof marker.processToken !== "string") + || typeof marker.startedAt !== "string" + || !Number.isFinite(Date.parse(marker.startedAt)) + || typeof marker.sliced !== "boolean") { + throw new RuntimeError(message); + } + return marker as PipelineActiveMarker; +} + +const RUN_STATUS: WritableArtifactDescriptor = { + relativePath: "status.json", + parse(value) { + if (!runStatusSchema(value)) throw new RuntimeError("archived run status is malformed"); + return value as RunStatus; + }, + write: { + mode: "replace-if-present", + prepare(status) { + const sanitized: RunStatus = { + ...structuredClone(status), + detail: status.detail === null ? null : redact(status.detail).slice(0, 200), + }; + if (!runStatusSchema(sanitized)) throw new RuntimeError("run status is invalid"); + return sanitized; + }, + }, +}; + +const RESULT: WritableArtifactDescriptor = { + relativePath: "result.json", + parse: verifyAttemptResult, + write: { + mode: "immutable", + prepare: (result, runId) => verifyAttemptResult(sanitizeAttemptResult(result), runId), + }, +}; + +const MANIFEST: WritableArtifactDescriptor = { + relativePath: "manifest.json", + parse: verifyRunManifest, + write: { + mode: "immutable", + prepare: (manifest, runId) => verifyRunManifest(sanitizeRunManifest(manifest), runId), + }, +}; + +/** Written by run start, never by the store; only the spec hash is read back. */ +const RUN_START_SPEC_SHA256: ArtifactDescriptor = { + relativePath: "run-start.json", + parse(record) { + if (typeof record !== "object" || record === null) return null; + const value = (record as { specSha256?: unknown }).specSha256; + return typeof value === "string" && /^[0-9a-f]{64}$/u.test(value) ? value : null; + }, +}; + +const REVIEW_SNAPSHOT: WritableArtifactDescriptor = { + relativePath: "review-snapshot.json", + parse(value, runId) { + const snapshot = validateReviewSnapshot(value, runId); + reviewSnapshotHash(snapshot); + return snapshot; + }, + write: { mode: "immutable", prepare: validateReviewSnapshot }, +}; + +const DECISION: WritableArtifactDescriptor = { + relativePath: "decision.json", + parse: parsePersistedDecision, + write: { mode: "immutable", prepare: decision => decision }, +}; + +const PIPELINE_GATE_CLEARED: WritableArtifactDescriptor = { + relativePath: "pipeline-gate-cleared.json", + parse(value) { + // The canonical schema decides the shape; the parser narrows it to the type. + // A record that reached disk malformed must not read back as "absent". + if (!pipelineGateClearedSchema(value)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return parsePipelineGateCleared(value); + }, + write: { + mode: "immutable", + prepare(cleared) { + const validated = parsePipelineGateCleared(cleared); + if (!pipelineGateClearedSchema(validated)) { + throw new RuntimeError("the pipeline gate clearance record is malformed"); + } + return validated; + }, + }, +}; + +const PIPELINE_ACTIVE_MARKER: WritableArtifactDescriptor = { + relativePath: "pipeline-active.json", + parse: value => validatePipelineActiveMarker(value, "archived pipeline-active marker is malformed"), + write: { + mode: "replace", + prepare: marker => validatePipelineActiveMarker(marker, "pipeline-active marker is invalid"), + }, +}; + +const POST_PIPELINE_AUTOPILOT: WritableArtifactDescriptor = { + relativePath: "pipeline/post-pipeline-autopilot.json", + parse: validatePostPipelineAutopilotArtifacts, + write: { mode: "immutable", prepare: artifacts => artifacts }, +}; + +/** Any pipeline stage record: redacted on the way in, trusted as `T` on the way out. */ +function pipelineArtifact(name: string): WritableArtifactDescriptor { + validateComponent(name, "log name"); + return { + relativePath: path.posix.join("pipeline", `${name}.json`), + parse: value => value as T, + write: { mode: "immutable", prepare: value => redactRecord(value) as T }, + }; +} + +function logReference(name: string): string { + validateComponent(name, "log name"); + return path.posix.join("logs", `${name}.log`); +} + + export class ArtifactStore { readonly runDirectory: string; private readonly runsRoot: string; @@ -815,102 +969,78 @@ export class ArtifactStore { } } - private async writeJson(relativePath: string, value: unknown): Promise { - const serialized = `${serializeJson(value, 2)}\n`; - await this.writeArchiveFile(relativePath, serialized); + /** + * Read one archived artifact of this run. Traversal, symlinks, and directory + * identity are policed by `readEvidence`; the descriptor proves the bytes are + * the kind it names. Absent artifacts read as null; malformed ones throw. + */ + private async readArtifact( + descriptor: ArtifactDescriptor, + ): Promise { + const text = await this.readEvidence(descriptor.relativePath); + if (text === null) return null; + return descriptor.parse(JSON.parse(text), this.runId); } - private async replaceJson(relativePath: string, value: unknown): Promise { - if (path.isAbsolute(relativePath) - || path.dirname(relativePath) !== "." - || path.basename(relativePath) !== relativePath - || !isSafeComponent(relativePath)) { + /** + * Write one archived artifact of this run. The descriptor's `prepare` step + * redacts and validates the value; the write mode decides whether a second + * write is refused (`immutable`), replaces the file (`replace`), or is + * skipped when the run archive is gone (`replace-if-present`). A caller may + * name `replace` explicitly for the one documented promotion path. + */ + private async writeArtifact( + descriptor: WritableArtifactDescriptor, + value: NoInfer, + mode: ArtifactWriteMode = descriptor.write.mode, + ): Promise { + const serialized = `${serializeJson(descriptor.write.prepare(value, this.runId), 2)}\n`; + if (mode === "immutable") { + await this.writeArchiveFile(descriptor.relativePath, serialized); + return; + } + const leaf = descriptor.relativePath; + if (path.posix.dirname(leaf) !== "." || !isSafeComponent(leaf)) { throw new RuntimeError("replacement archive path must be a safe relative leaf"); } const directory = await this.ensureRunDirectory(false); - if (directory === null) throw new RuntimeError("run archive does not exist"); + if (directory === null) { + if (mode === "replace-if-present") return; + throw new RuntimeError("run archive does not exist"); + } const session = await openDurableDirectorySession(directory); try { - const serialized = `${serializeJson(value, 2)}\n`; - await platformSafety.writeAtomic(session, relativePath, serialized, "replace"); + await platformSafety.writeAtomic(session, leaf, serialized, "replace"); } finally { await session.close(); } } + private assertOwned(runId: string, what: string): void { + if (runId !== this.runId) throw new RuntimeError(`${what} does not match artifact store`); + } async writeRunStatus(status: RunStatus): Promise { - if (status.runId !== this.runId) { - throw new RuntimeError("run status id does not match artifact store"); - } - const sanitized: RunStatus = { - ...structuredClone(status), - detail: status.detail === null ? null : redact(status.detail).slice(0, 200), - }; - if (!runStatusSchema(sanitized)) { - throw new RuntimeError("run status is invalid"); - } - const directory = await this.ensureRunDirectory(false); - if (directory === null) return; - await this.replaceJson("status.json", sanitized); + this.assertOwned(status.runId, "run status id"); + await this.writeArtifact(RUN_STATUS, status); } - async readRunStatus(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const value: unknown = JSON.parse(await readRegularFile( - path.join(validated.path, "status.json"), - validated.identity, - )); - if (!runStatusSchema(value)) throw new RuntimeError("archived run status is malformed"); - return value as RunStatus; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readRunStatus(): Promise { + return this.readArtifact(RUN_STATUS); } async writeLog(name: string, text: string): Promise { - validateComponent(name, "log name"); - const ref = path.posix.join("logs", `${name}.log`); + const ref = logReference(name); await this.writeArchiveFile(ref, redact(text)); return ref; } async writePipelineArtifact(name: string, value: unknown): Promise { - validateComponent(name, "log name"); - await this.writeJson( - path.posix.join("pipeline", `${name}.json`), - redactRecord(value), - ); + await this.writeArtifact(pipelineArtifact(name), value); } - async readPipelineArtifact(runId: string, name: string): Promise { - validateComponent(runId, "run id"); - validateComponent(name, "log name"); - const runDirectory = path.join(this.runsRoot, runId); - const validatedRun = await this.ensureExistingRunDirectory(runDirectory); - if (validatedRun === null) return null; - const validated = await this.ensureExistingRunDirectory(path.join(runDirectory, "pipeline")); - if (validated === null) return null; - if (!isWithin(validatedRun.path, validated.path)) { - throw new RuntimeError("pipeline archive directory escapes run directory"); - } - await assertDirectoryIdentity(validatedRun.path, validatedRun.identity); - try { - const value = JSON.parse(await readRegularFile( - path.join(validated.path, `${name}.json`), - validated.identity, - )) as T; - await assertDirectoryIdentity(validatedRun.path, validatedRun.identity); - return value; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readPipelineArtifact(name: string): Promise { + return this.readArtifact(pipelineArtifact(name)); } /** @@ -1033,61 +1163,36 @@ export class ArtifactStore { } async writeResult(result: AttemptResult): Promise { - if (result.runId !== this.runId) { - throw new RuntimeError("attempt result run id does not match artifact store"); - } - const sanitized = sanitizeAttemptResult(result); - verifyAttemptResult(sanitized, this.runId); - await this.writeJson("result.json", sanitized); + this.assertOwned(result.runId, "attempt result run id"); + await this.writeArtifact(RESULT, result); } async writeManifest(manifest: RunManifest): Promise { - if (manifest.runId !== this.runId) { - throw new RuntimeError("run manifest id does not match artifact store"); - } - const sanitized = sanitizeRunManifest(manifest); - verifyRunManifest(sanitized, this.runId); - await this.writeJson("manifest.json", sanitized); + this.assertOwned(manifest.runId, "run manifest id"); + await this.writeArtifact(MANIFEST, manifest); } + /** + * Replace the terminal result and manifest in place. This is the one path + * that rewrites an immutable artifact: the pipeline promotes the reviewed + * branch over the initial attempt's record. It is refused once a decision + * exists, because the decision was made about the earlier bytes. + */ async promoteTerminalArtifacts(args: { result: AttemptResult; manifest: RunManifest; }): Promise { - if (args.result.runId !== this.runId) { - throw new RuntimeError("attempt result run id does not match artifact store"); - } - if (args.manifest.runId !== this.runId) { - throw new RuntimeError("run manifest id does not match artifact store"); - } - if (await this.readCandidateDecision(this.runId) !== null) { + this.assertOwned(args.result.runId, "attempt result run id"); + this.assertOwned(args.manifest.runId, "run manifest id"); + if (await this.readCandidateDecision() !== null) { throw new RuntimeError("terminal artifacts cannot be promoted after a decision"); } - const result = sanitizeAttemptResult(args.result); - verifyAttemptResult(result, this.runId); - const manifest = sanitizeRunManifest(args.manifest); - verifyRunManifest(manifest, this.runId); - await this.replaceJson("result.json", result); - await this.replaceJson("manifest.json", manifest); + await this.writeArtifact(RESULT, args.result, "replace"); + await this.writeArtifact(MANIFEST, args.manifest, "replace"); } - async readResult(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - return verifyAttemptResult( - JSON.parse(await readRegularFile( - path.join(validated.path, "result.json"), - validated.identity, - )), - runId, - ); - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readResult(): Promise { + return this.readArtifact(RESULT); } private async ensureExistingRunDirectory(directory: string): Promise { @@ -1110,23 +1215,8 @@ export class ArtifactStore { } } - async readManifest(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - return verifyRunManifest( - JSON.parse(await readRegularFile( - path.join(validated.path, "manifest.json"), - validated.identity, - )), - runId, - ); - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readManifest(): Promise { + return this.readArtifact(MANIFEST); } /** @@ -1134,32 +1224,17 @@ export class ArtifactStore { * record is absent. Lets a caller prove a reported run id actually belongs to * the spec it dispatched, rather than trusting the reporter's echo of it. */ - async readRunStartSpecSha256(runId: string): Promise { - validateComponent(runId, "run id"); - const validated = await this.ensureExistingRunDirectory(path.join(this.runsRoot, runId)); - if (validated === null) return null; - try { - const record: unknown = JSON.parse(await readRegularFile( - path.join(validated.path, "run-start.json"), - validated.identity, - )); - if (typeof record !== "object" || record === null) return null; - const value = (record as { specSha256?: unknown }).specSha256; - return typeof value === "string" && /^[0-9a-f]{64}$/u.test(value) ? value : null; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readRunStartSpecSha256(): Promise { + return this.readArtifact(RUN_START_SPEC_SHA256); } async writeReviewSnapshot(snapshot: ReviewSnapshot): Promise { - const validated = validateReviewSnapshot(snapshot, this.runId); - const attemptedHash = reviewSnapshotHash(validated); + const attemptedHash = reviewSnapshotHash(validateReviewSnapshot(snapshot, this.runId)); try { - await this.writeJson("review-snapshot.json", validated); + await this.writeArtifact(REVIEW_SNAPSHOT, snapshot); return; } catch (error) { - const existing = await this.readReviewSnapshot(this.runId); + const existing = await this.readReviewSnapshot(); if (existing === null) throw error; if (reviewSnapshotHash(existing) === attemptedHash) return; throw new RuntimeError( @@ -1169,41 +1244,21 @@ export class ArtifactStore { } } - async readReviewSnapshot(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const snapshot = validateReviewSnapshot( - JSON.parse(await readRegularFile( - path.join(validated.path, "review-snapshot.json"), - validated.identity, - )), - runId, - ); - reviewSnapshotHash(snapshot); - return snapshot; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readReviewSnapshot(): Promise { + return this.readArtifact(REVIEW_SNAPSHOT); } - async readAdvisorReport(runId: string): Promise { - const value = await this.readPipelineArtifact(runId, "post-pipeline-autopilot"); - return value === null - ? null - : validatePostPipelineAutopilotArtifacts(value, runId).advisorReport; + async readAdvisorReport(): Promise { + return (await this.readArtifact(POST_PIPELINE_AUTOPILOT))?.advisorReport ?? null; } private async recomputeArchivedEligibility( record: AutopilotEligibilityRecord, ): Promise { const [pipelineResult, reviewSnapshot, advisorReport] = await Promise.all([ - this.readPipelineArtifact(this.runId, "pipeline-result"), - this.readReviewSnapshot(this.runId), - this.readAdvisorReport(this.runId), + this.readPipelineArtifact("pipeline-result"), + this.readReviewSnapshot(), + this.readAdvisorReport(), ]); if (pipelineResult === null || reviewSnapshot === null || advisorReport === null) return null; return evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ @@ -1214,14 +1269,14 @@ export class ArtifactStore { })); } - async readAutopilotEligibility(runId: string): Promise { - validateComponent(runId, "run id"); - const value = await this.readPipelineArtifact(runId, "post-pipeline-autopilot"); - if (value === null) return null; - const record = validatePostPipelineAutopilotArtifacts(value, runId).eligibility; - if (runId !== this.runId) { - return new ArtifactStore(runId).readAutopilotEligibility(runId); - } + /** + * The archived eligibility record, re-derived from the archived evidence it + * claims to summarize. A record that no longer matches its evidence is an + * error, not a value. + */ + async readAutopilotEligibility(): Promise { + const record = (await this.readArtifact(POST_PIPELINE_AUTOPILOT))?.eligibility ?? null; + if (record === null) return null; const expected = await this.recomputeArchivedEligibility(record); if (expected === null) return null; if (canonicalArtifactHash(expected) !== canonicalArtifactHash(record)) { @@ -1237,8 +1292,8 @@ export class ArtifactStore { eligibility: AutopilotEligibilityRecord; }): Promise<{ advisorReportHash: string; eligibilityRecordHash: string }> { const [archivedPipelineResult, archivedReviewSnapshot] = await Promise.all([ - this.readPipelineArtifact(this.runId, "pipeline-result"), - this.readReviewSnapshot(this.runId), + this.readPipelineArtifact("pipeline-result"), + this.readReviewSnapshot(), ]); if (archivedPipelineResult === null || archivedReviewSnapshot === null) { throw new RuntimeError("post-pipeline artifacts require a durable pipeline result and review snapshot"); @@ -1272,10 +1327,7 @@ export class ArtifactStore { advisorReportHash: persistedAdvisorHash, eligibilityRecordHash, }; - await this.writeJson( - path.posix.join("pipeline", "post-pipeline-autopilot.json"), - artifacts, - ); + await this.writeArtifact(POST_PIPELINE_AUTOPILOT, artifacts); return { advisorReportHash: persistedAdvisorHash, eligibilityRecordHash }; } @@ -1313,7 +1365,7 @@ export class ArtifactStore { } catch { throw new RuntimeError("autopilot decision eligibility is invalid"); } - const archived = await this.readAutopilotEligibility(this.runId); + const archived = await this.readAutopilotEligibility(); if (archived === null || canonicalArtifactHash(archived) !== canonicalArtifactHash(validated) || candidate.baseCommitOid !== validated.baseCommitOid @@ -1341,10 +1393,10 @@ export class ArtifactStore { normalized: CandidateDecision, ): Promise { try { - await this.writeJson("decision.json", persisted); + await this.writeArtifact(DECISION, persisted); return; } catch (error) { - const existing = await this.readCandidateDecision(this.runId); + const existing = await this.readCandidateDecision(); if (existing === null) throw error; if (hasIdenticalDecisionProvenance(existing, normalized)) return; throw new RuntimeError( @@ -1354,107 +1406,37 @@ export class ArtifactStore { } } - async readCandidateDecision(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const value: unknown = JSON.parse(await readRegularFile( - path.join(validated.path, "decision.json"), - validated.identity, - )); - return parsePersistedDecision(value); - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readCandidateDecision(): Promise { + return this.readArtifact(DECISION); } - - async readDecision(runId: string): Promise { - return this.readCandidateDecision(runId); + async readDecision(): Promise { + return this.readCandidateDecision(); } async writePipelineGateCleared(cleared: PipelineGateCleared): Promise { - const validated = parsePipelineGateCleared(cleared); - if (!pipelineGateClearedSchema(validated)) { - throw new RuntimeError("the pipeline gate clearance record is malformed"); - } - await this.writeJson("pipeline-gate-cleared.json", validated); + await this.writeArtifact(PIPELINE_GATE_CLEARED, cleared); } - async readPipelineGateCleared(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - let value: unknown; - try { - value = JSON.parse(await readRegularFile( - path.join(validated.path, "pipeline-gate-cleared.json"), - validated.identity, - )); - } catch (error) { - if (isMissing(error)) return null; - throw error; - } - // The canonical schema decides the shape; the parser narrows it to the type. - // A record that reached disk malformed must not read back as "absent". - if (!pipelineGateClearedSchema(value)) { - throw new RuntimeError("the pipeline gate clearance record is malformed"); - } - return parsePipelineGateCleared(value); + async readPipelineGateCleared(): Promise { + return this.readArtifact(PIPELINE_GATE_CLEARED); } async writePipelineActiveMarker(marker: PipelineActiveMarker): Promise { - if (typeof marker !== "object" - || marker === null - || !Number.isSafeInteger(marker.pid) - || marker.pid <= 1 - || (marker.processToken !== null && typeof marker.processToken !== "string") - || typeof marker.startedAt !== "string" - || !Number.isFinite(Date.parse(marker.startedAt)) - || typeof marker.sliced !== "boolean") { - throw new RuntimeError("pipeline-active marker is invalid"); - } - await this.replaceJson("pipeline-active.json", marker); + await this.writeArtifact(PIPELINE_ACTIVE_MARKER, marker); } - async readPipelineActiveMarker(runId: string): Promise { - validateComponent(runId, "run id"); - const runDirectory = path.join(this.runsRoot, runId); - const validated = await this.ensureExistingRunDirectory(runDirectory); - if (validated === null) return null; - try { - const value = JSON.parse(await readRegularFile( - path.join(validated.path, "pipeline-active.json"), - validated.identity, - )) as Partial; - if (typeof value !== "object" - || value === null - || typeof value.pid !== "number" - || !Number.isSafeInteger(value.pid) - || value.pid <= 1 - || (value.processToken !== null && typeof value.processToken !== "string") - || typeof value.startedAt !== "string" - || !Number.isFinite(Date.parse(value.startedAt)) - || typeof value.sliced !== "boolean") { - throw new RuntimeError("archived pipeline-active marker is malformed"); - } - return value as PipelineActiveMarker; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } + async readPipelineActiveMarker(): Promise { + return this.readArtifact(PIPELINE_ACTIVE_MARKER); } async clearPipelineActiveMarker(): Promise { const directory = await this.ensureRunDirectory(false); if (directory === null) return; - await rm(path.join(directory, "pipeline-active.json"), { force: true }); + await rm(path.join(directory, PIPELINE_ACTIVE_MARKER.relativePath), { force: true }); } + async list(): Promise { await this.ensureRunsRoot(); const entries = await readdir(this.runsRoot, { withFileTypes: true }); @@ -1742,6 +1724,8 @@ export class ArtifactStore { attempted.add(entry.runId); const quarantineName = `.prune-${entry.runId}-${randomUUID()}`; const quarantinePath = path.join(this.runsRoot, quarantineName); + // Every archive read below is about `entry`'s run, not this store's. + const runStore = new ArtifactStore(entry.runId); let prepared: PreparedAnchorCleanup | null = null; let transaction: AnchorCleanupTransaction | null = null; let runsRootIdentity: DirectoryIdentity | null = null; @@ -1750,16 +1734,16 @@ export class ArtifactStore { try { // Fast path: never wait on a checkout lease for a run that still // advertises a live pipeline. Refuse before canonicalizing or locking. - if (await this.readPipelineActiveMarker(entry.runId) !== null) { + if (await runStore.readPipelineActiveMarker() !== null) { retained.push({ runId: entry.runId, reason: "active-run" }); return; } - const initialManifest = await this.readManifest(entry.runId); + const initialManifest = await runStore.readManifest(); if (initialManifest === null) { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; } - const initialResult = await this.readResult(entry.runId); + const initialResult = await runStore.readResult(); if (initialResult === null) { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; @@ -1786,17 +1770,17 @@ export class ArtifactStore { await assertDirectoryIdentity(entry.directory, entry.identity); // Re-establish authority under the lease: the manifest, terminal // result, and active marker may all have changed while we waited. - const currentManifest = await this.readManifest(entry.runId); + const currentManifest = await runStore.readManifest(); if (currentManifest === null || serializeJson(currentManifest) !== serializeJson(initialManifest)) { retained.push({ runId: entry.runId, reason: "run identity changed while waiting" }); return; } - if (await this.readPipelineActiveMarker(entry.runId) !== null) { + if (await runStore.readPipelineActiveMarker() !== null) { retained.push({ runId: entry.runId, reason: "active-run" }); return; } - const result = await this.readResult(entry.runId); + const result = await runStore.readResult(); if (result === null) { retained.push({ runId: entry.runId, reason: "incomplete-run" }); return; diff --git a/src/runtime/recovery-manager.ts b/src/runtime/recovery-manager.ts index 1ba6a23..733e20d 100644 --- a/src/runtime/recovery-manager.ts +++ b/src/runtime/recovery-manager.ts @@ -522,7 +522,7 @@ async function archiveInterruptedPipeline( result: AttemptResult, ): Promise { if (result.status !== "verified-candidate") return; - const manifest = await store.readManifest(result.runId); + const manifest = await store.readManifest(); if (manifest === null) { throw new RuntimeError("run manifest is missing while recovering interrupted pipeline"); } @@ -3677,10 +3677,10 @@ export async function recoverStaleRuns( } const record = parseRunStart(runStartText, entry.name); const store = new ArtifactStore(entry.name); - const result = await store.readResult(entry.name); + const result = await store.readResult(); if (result !== null) { validateTerminalResult(result, entry.name); - const marker = await store.readPipelineActiveMarker(entry.name); + const marker = await store.readPipelineActiveMarker(); if (marker !== null) { const markerStatus = await lockOwnerStatus( { pid: marker.pid, processToken: marker.processToken }, @@ -3726,12 +3726,12 @@ export async function recoverStaleRuns( || lockedRecord.startedAt !== record.startedAt) { throw new RuntimeError("run-start recovery record changed during recovery"); } - const lockedResult = await store.readResult(entry.name); + const lockedResult = await store.readResult(); if (lockedResult === null) { throw new RuntimeError("terminal attempt result disappeared during recovery"); } validateTerminalResult(lockedResult, entry.name); - const lockedMarker = await store.readPipelineActiveMarker(entry.name); + const lockedMarker = await store.readPipelineActiveMarker(); const commonDir = await validateGitCommonDir(lockedRecord.canonicalCommonDir); if (lockedMarker === null) { await cleanupRunWorktreesUnderLease( @@ -3849,7 +3849,7 @@ export async function recoverStaleRuns( if (lockedRunStartText !== runStartText) { throw new RuntimeError("run-start recovery record changed before stale recovery"); } - const lockedResult = await new ArtifactStore(record.runId).readResult(record.runId); + const lockedResult = await new ArtifactStore(record.runId).readResult(); if (lockedResult !== null) { validateTerminalResult(lockedResult, record.runId); becameTerminal = true; diff --git a/src/runtime/review-snapshot.ts b/src/runtime/review-snapshot.ts index 54f3bb4..e73cea1 100644 --- a/src/runtime/review-snapshot.ts +++ b/src/runtime/review-snapshot.ts @@ -30,8 +30,8 @@ export interface ReviewSnapshot { } export interface ReviewSnapshotStore { - readResult(runId: string): Promise; - readManifest(runId: string): Promise; + readResult(): Promise; + readManifest(): Promise; } export interface ReviewSnapshotRun { @@ -226,8 +226,8 @@ export async function createReviewSnapshot(run: ReviewSnapshotRun): Promise; - readManifest(runId: string): Promise; - readReviewSnapshot(runId: string): Promise; - readCandidateDecision(runId: string): Promise; - readPipelineGateCleared?(runId: string): Promise; + readResult(): Promise; + readManifest(): Promise; + readReviewSnapshot(): Promise; + readCandidateDecision(): Promise; + readPipelineGateCleared?(): Promise; } export interface RunDecisionSnapshot { @@ -93,28 +93,28 @@ export class RunDecision { try { const readResult = typeof store.readResult === "function" - ? store.readResult(runId).catch(err => { + ? store.readResult().catch(err => { coherenceErrors.push(`failed to read result: ${err instanceof Error ? err.message : String(err)}`); return null; }) : Promise.resolve(null); const readManifest = typeof store.readManifest === "function" - ? store.readManifest(runId).catch(err => { + ? store.readManifest().catch(err => { coherenceErrors.push(`failed to read manifest: ${err instanceof Error ? err.message : String(err)}`); return null; }) : Promise.resolve(null); const readSnapshot = typeof store.readReviewSnapshot === "function" - ? store.readReviewSnapshot(runId).catch(() => null) + ? store.readReviewSnapshot().catch(() => null) : Promise.resolve(null); const readGateRecord = typeof store.readPipelineGateCleared === "function" - ? store.readPipelineGateCleared(runId).catch(err => { + ? store.readPipelineGateCleared().catch(err => { gateRecordError = `the pipeline gate clearance record is malformed: ${err instanceof Error ? err.message : String(err)}`; return null; }) : Promise.resolve(null); const readDecision = typeof store.readCandidateDecision === "function" - ? store.readCandidateDecision(runId).catch(err => { + ? store.readCandidateDecision().catch(err => { coherenceErrors.push(`failed to read decision: ${err instanceof Error ? err.message : String(err)}`); return null; }) diff --git a/src/runtime/run-status.ts b/src/runtime/run-status.ts index 33e4291..c047505 100644 --- a/src/runtime/run-status.ts +++ b/src/runtime/run-status.ts @@ -67,7 +67,7 @@ export async function transitionRunStatusSafely( >> = {}, ): Promise { try { - const current = await store.readRunStatus(runId); + const current = await store.readRunStatus(); if (current === null) return; await store.writeRunStatus({ ...current, diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..52e4286 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,188 @@ +# Test surface + +Each row names the test file, the primary `src/` module (or script) it exercises, the 1-4 exported +symbols that make up the interface being crossed, its layer per AGENTS.md's testing taxonomy (unit / +contract / integration / adversarial / smoke), and whether it reaches past that public interface. The +rule: a test names one module and crosses only that module's exported surface — direct calls to its +exported functions/classes, or (for shell tests) its documented CLI contract. Anything else — mocking a +Node builtin, mocking/spying an internal `src/` module to replace its behavior, importing a symbol the +named module doesn't actually export, reaching into another module's internals instead of its public +surface, or hand-building an evidence bag/manifest that only the real runtime should produce — is a +boundary violation, listed under "Past the interface" below, and should be moved onto the real +interface or deleted (unless it is a deliberate, justified adversarial fault-injection test, per +AGENTS.md's own carve-out, which never mocks the component whose security property it is proving). + +## Map + +| File | Module under test | Interface crossed | Layer | Past the interface | +|---|---|---|---|---| +| tests/claude-runtime-resolver.test.sh | agents/, runtime/bootstrap.mjs, runtime/server.mjs | file presence (CLI contract) | contract | no | +| tests/delegate-routing.test.mjs | skills/delegate/SKILL.md | doc-text assertions | contract | no | +| tests/install-opencode.test.sh | scripts/install-opencode.sh | installer script behavior | integration | no | +| tests/lane-launchers.test.sh | scripts/, agents/, src/mcp/server.ts, src/producers/*-adapter.ts, skills/delegate/SKILL.md | file-presence/grep checks | contract | no | +| tests/plugin-manifest.test.mjs | .claude-plugin/plugin.json, marketplace.json | JSON field assertions | contract | no | +| tests/runtime/acceptance-verifier.test.ts | src/verify/acceptance-verifier.ts | AcceptanceVerifier | unit | no | +| tests/runtime/agy-adapter.test.ts | src/producers/agy-adapter.ts | AgyAdapter, renderProducerPrompt, producerRuntime, renderSkillBootstrap | contract | no | +| tests/runtime/allowlist-sufficiency.test.ts | src/mcp/allowlist-sufficiency.ts | resolveImport, checkAllowlistSufficiency, allowlistSufficiencyDiagnostic | unit | no | +| tests/runtime/artifact-store-bytes.test.ts | src/runtime/artifact-store.ts, src/runtime/run-manifest.ts | ArtifactStore, buildRunManifest | contract | no | +| tests/runtime/artifact-store.test.ts | src/runtime/artifact-store.ts | ArtifactStore, pruneRuns, buildRunManifest, sanitizeRunManifest | adversarial | YES — `vi.mock("node:fs/promises", ...)` wraps `open` to inject write failures | +| tests/runtime/attempt-result.test.ts | src/protocol/attempt-result.ts | classifyFailure | unit | no | +| tests/runtime/attempt-runtime.test.ts | src/runtime/attempt-runtime.ts | runAttempt | integration | YES — `vi.spyOn(WorktreeManager.prototype, "create")` (L582) replaces internal worktree creation | +| tests/runtime/autopilot/autopilot-adversarial.test.ts | src/autopilot/autopilot-controller.ts, branch-manager.ts, candidate-promoter.ts, final-branch-reviewer.ts | AutopilotController, WorkflowBranchManager, CandidatePromoter, FinalBranchReviewer | adversarial | no | +| tests/runtime/autopilot/autopilot-controller.test.ts | src/autopilot/autopilot-controller.ts | AutopilotController, AutopilotControllerDependencies | unit | no | +| tests/runtime/autopilot/autopilot-doctor.test.ts | src/mcp/doctor.ts | doctor | integration | no | +| tests/runtime/autopilot/autopilot-e2e.test.ts | src/autopilot/autopilot-controller.ts, src/pipeline/pipeline-runtime.ts | AutopilotController, runPipeline | integration | no | +| tests/runtime/autopilot/autopilot-mcp.test.ts | src/mcp/server.ts | createServer (via MCP Client/InMemoryTransport) | contract | no | +| tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns | adversarial | no | +| tests/runtime/autopilot/autopilot-recovery.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns | integration | no | +| tests/runtime/autopilot/autopilot-windows.test.ts | src/autopilot/autopilot-controller.ts, src/pipeline/pipeline-runtime.ts | AutopilotController, runPipeline | integration | no | +| tests/runtime/autopilot/branch-manager.test.ts | src/autopilot/branch-manager.ts | WorkflowBranchManager | integration | YES (minor) — `vi.spyOn(logger, "warn")` (L911) silences internal logger | +| tests/runtime/autopilot/candidate-promoter.integration.test.ts | src/autopilot/candidate-promoter.ts | CandidatePromoter | integration | no | +| tests/runtime/autopilot/candidate-promoter.test.ts | src/autopilot/candidate-promoter.ts | CandidatePromoter | unit | YES (minor) — `vi.spyOn(logger, "warn")` (L447) | +| tests/runtime/autopilot/final-branch-reviewer.test.ts | src/autopilot/final-branch-reviewer.ts | FinalBranchReviewer, WorkflowStore, WorkflowBranchManager | adversarial | YES — `vi.spyOn(branchManager, "revalidateUnderLock").mockImplementation(...)` (L637) replaces the real revalidation path | +| tests/runtime/autopilot/workflow-state-schema.test.ts | src/protocol/schema-loader.ts, src/autopilot/types.ts | loadSchemas, AutopilotWorkflowState | contract | no | +| tests/runtime/autopilot/workflow-store.test.ts | src/autopilot/workflow-store.ts | WorkflowStore, LEGAL_WORKFLOW_PHASE_EDGES | integration | no | +| tests/runtime/baseline-verifier.test.ts | src/verify/baseline-verifier.ts | verifyBaseline, WorktreeManager | integration | no | +| tests/runtime/bootstrap-check.test.ts | src/mcp/bootstrap-check.ts | isNodeSupported, formatMissingNodeDiagnostic | unit | no | +| tests/runtime/bootstrap.smoke.test.ts | runtime/bootstrap.mjs | spawned CLI process | smoke | no | +| tests/runtime/bound-directory-cleanup.test.ts | src/platform/bound-directory-cleanup.ts | resolveEmptyDirectoryTimeoutMs | unit | no | +| tests/runtime/candidate-decision.test.ts | src/protocol/candidate-decision.ts, src/protocol/schema-loader.ts | loadSchemas, CandidateDecision types | contract | no | +| tests/runtime/candidate-tree.test.ts | src/git/candidate-tree.ts | freezeCandidate | integration | YES — `vi.mock("../../src/git/git-exec.js", ...)` (L439) wraps `git()` to inject failures | +| tests/runtime/capability-probe.test.ts | src/producers/capability-probe.ts | probeAll, CodexAdapter, ProducerRegistry | contract | no | +| tests/runtime/changed-path-manifest.test.ts | src/git/changed-path-manifest.ts | computeChangedPathManifest, parseRawDiff, manifestHashOf | unit | no | +| tests/runtime/claude-adapter.test.ts | src/producers/claude-adapter.ts | ClaudeAdapter, renderProducerPrompt | contract | no | +| tests/runtime/codex-adapter.test.ts | src/producers/codex-adapter.ts | CodexAdapter, codexDescriptor, sandboxSupportWritableRoots | contract | no | +| tests/runtime/consolidator.test.ts | src/pipeline/consolidator.ts | consolidate, detectNonConvergence | unit | no | +| tests/runtime/controlled-integrator.test.ts | src/integrate/controlled-integrator.ts | applyCandidateTree, stageCandidateTreeUnderLock | integration | YES — `vi.mock("../../src/git/git-exec.js", ...)` (L797) injects mid-operation git failures | +| tests/runtime/crlf-events.test.ts | src/producers/codex-adapter.ts | CodexAdapter.normalizeEvents | unit | no | +| tests/runtime/cross-lane-launch.test.ts | src/producers/producer-runtime.ts, producer-registry.ts | producerRuntime, registry | contract | no | +| tests/runtime/cross-lane-probe.test.ts | src/producers/*-adapter.ts (6 adapters) | probe() on each ProducerAdapter | contract | no | +| tests/runtime/cross-lane-prompt.test.ts | src/producers/prompt-renderer.ts | renderProducerPrompt, renderList, DescriptorAdapter | unit | no | +| tests/runtime/decision-authority.test.ts | src/mcp/decision-authority.ts, src/mcp/server.ts | decisionAuthority, autonomousEligibility, start | integration | no | +| tests/runtime/dependency-link.test.ts | src/verify/dependency-link.ts | linkPrimaryDependencies, probeCowSupport | integration | no | +| tests/runtime/doctor.test.ts | src/mcp/doctor.ts | doctor | contract | no | +| tests/runtime/durable-directory.test.ts | src/platform/durable-directory.ts | ensurePrivateDirectory, syncDirectoryMetadata | integration | no | +| tests/runtime/durable-write.test.ts | src/platform/durable-write.ts | openDurableDirectorySession, writeAtomic | integration | no | +| tests/runtime/e2e-pipeline.test.ts | src/pipeline/pipeline-runtime.ts, src/mcp/tools.ts | runPipeline, handleDelegatePipeline, handleDecideCandidate | integration | no | +| tests/runtime/e2e-vertical-slice.test.ts | src/mcp/tools.ts | handleDelegate, handleReviewCandidate, handleIntegrateCandidate | integration | no | +| tests/runtime/environment-policy.test.ts | src/runtime/environment-policy.ts | buildEnvironment, registerSensitiveEnvironment | unit | no | +| tests/runtime/gates.test.ts | src/pipeline/gates.ts | evaluateGates | unit | no | +| tests/runtime/git-exec.test.ts | src/git/git-exec.ts | git, getPlatformServices | integration | YES — `vi.spyOn(services, "resolveExecutable")` (L118) mocks an internal PlatformServices method to observe caching | +| tests/runtime/git-read-tools.test.ts | src/mcp/git-read-tools.ts | gitLog, gitStatus, gitDiff, gitChangedFiles | integration | no | +| tests/runtime/git-writable-roots.test.ts | src/pipeline/git-writable-roots.ts | resolveLinkedWorktreeWritableRoots | integration | no | +| tests/runtime/handshake.smoke.test.ts | src/mcp/server.ts (via runtime/server.mjs) | createServer, MCP handshake | smoke | no | +| tests/runtime/human-decision-gate.test.ts | src/mcp/server.ts | confirmWithHuman | unit | no | +| tests/runtime/legacy-decision-provenance.test.ts | src/runtime/artifact-store.ts | ArtifactStore | integration | YES — hand-writes `decision.json` bytes in a prior release's shape (~L498-816) instead of via a real decision flow | +| tests/runtime/live-bundle.test.ts | src/mcp/live-bundle.ts | checkLiveBundle, liveBundleDiagnostic | unit | no | +| tests/runtime/lock-contention.test.ts | src/platform/select-platform.ts | getPlatformServices, acquireCheckoutLock | integration | no | +| tests/runtime/lock-ownership.test.ts | src/platform/lock-ownership.ts | formatLockRecord, parseLockRecord, reclaimDeadLock, lockOwnerStatus | unit/contract | YES — `vi.spyOn(logger, "warn")` (L690-691) mocks internal logger | +| tests/runtime/mcp-cancellation.test.ts | src/mcp/server.ts | start (MCP server) | integration | no | +| tests/runtime/mcp-decision-gate.test.ts | src/mcp/server.ts, src/runtime/artifact-store.ts | start, ArtifactStore | integration | no | +| tests/runtime/mcp-input-schema.test.ts | src/mcp/server.ts | delegateInputSchema, delegatePipelineInputSchema | contract | no | +| tests/runtime/mcp-output-schema.test.ts | src/mcp/server.ts, src/mcp/doctor.ts | delegatePipelineOutput, doctorOutput, doctor | contract | no | +| tests/runtime/opencode-adapter.test.ts | src/producers/opencode-adapter.ts | OpenCodeAdapter | integration | no | +| tests/runtime/pi-adapter.test.ts | src/producers/pi-adapter.ts | PiAdapter | integration | no | +| tests/runtime/pipeline-runtime.test.ts | src/pipeline/pipeline-runtime.ts | runPipeline, runIncrement, runReviews, verifyCandidate | integration | YES — extensive `vi.spyOn(AcceptanceVerifier.prototype, "verify")`, `ArtifactStore.prototype.*`, `WorktreeManager.prototype.create` (L792,927,933,1010,1180,1239,1378,1483,2076,3345,3424) replace internal src behavior | +| tests/runtime/pipeline/advisor-stage.test.ts | src/pipeline/advisor-stage.ts | runAdvisorStage | integration | no | +| tests/runtime/pipeline/autopilot-eligibility.test.ts | src/autopilot/autopilot-eligibility.ts | evaluateAutopilotEligibility, eligibilityInputFromArtifacts | unit | no | +| tests/runtime/pipeline/slice-runner.test.ts | src/pipeline/slice-runner.ts | SliceRunner, PipelineSlice, SliceAttempt | integration | no | +| tests/runtime/pipeline/wayfinder.test.ts | src/pipeline/wayfinder.ts | routeSlice | unit | no | +| tests/runtime/platform-path.test.ts | src/util/platform-path.ts | platformPathsEqual | unit | no | +| tests/runtime/plugin-wiring.test.mjs | .mcp.json, runtime/bootstrap.mjs, runtime/server.mjs, agents/advisor.md | file/wiring assertions | contract | no | +| tests/runtime/posix-platform-services.test.ts | src/platform/posix-platform-services.ts | PosixPlatformServices, CLEANUP_JOURNAL_LOCK_KEY | integration | no | +| tests/runtime/pre-push-hook.test.ts | .githooks/pre-push | shell script source assertions | contract | no | +| tests/runtime/probe-cache.test.ts | src/producers/producer-runtime.ts, producer-registry.ts | ProducerRuntime, ProducerRegistry, ProducerAdapter | unit | no | +| tests/runtime/process-supervisor.test.ts | src/platform/process-supervisor.ts | supervise | integration | no | +| tests/runtime/process-token.test.ts | src/platform/posix-platform-services.ts | getProcessStartToken, terminateProcessTreeByPid | integration | no | +| tests/runtime/producer-adapter.test.ts | src/producers/producer-adapter.ts | detectEnvironmentType, DescriptorAdapter, ProducerAdapter | unit | no | +| tests/runtime/producer-preflight.test.ts | src/runtime/producer-preflight.ts | preflightExecutables, preflightProbeCommand, readProbe, runProducerPreflight | integration | no | +| tests/runtime/project-verifier.test.ts | src/verify/project-verifier.ts | projectVerify | integration | no | +| tests/runtime/protocol/autopilot-schema.test.ts | src/protocol/spec-validator.ts | validateAutopilotSpec | contract | no | +| tests/runtime/protocol/slice-schema.test.ts | src/protocol/schema-loader.ts | loadSchemas().delegationSpec | contract | no | +| tests/runtime/protocol/slice-types.test.ts | src/protocol/delegation-spec.ts | resolveSlices | unit | no | +| tests/runtime/protocol/slice-validation.test.ts | src/protocol/spec-validator.ts | validateSpec | unit | no | +| tests/runtime/pythinker-adapter.test.ts | src/producers/pythinker-adapter.ts | PythinkerAdapter, producerRuntime, renderProducerPrompt | integration | no | +| tests/runtime/recovery-manager.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns | integration | YES — `vi.spyOn(logger, "warn")`/`console.error` on internal logger (L897-903); also mocks external `@modelcontextprotocol/sdk` (L864/870, not src) | +| tests/runtime/redaction.test.ts | src/runtime/redaction.ts | redact, redactRecord, registerSecretValue | unit | no | +| tests/runtime/repo-preconditions.test.ts | src/git/repo-preconditions.ts | checkPreconditions | adversarial | YES — `vi.mock("node:fs/promises")` (L982) injects access/opendir/realpath failures | +| tests/runtime/report-schemas.test.ts | src/protocol/schema-loader.ts | loadSchemas() report validators | contract | no | +| tests/runtime/reproducibility.test.ts | src/runtime/reproducibility.ts | collectReproducibilityInputs | integration | no | +| tests/runtime/review-manifest-echo.test.ts | src/mcp/tools.ts, src/mcp/server.ts | handleReviewCandidate, reviewCandidateOutputSchema | contract | no | +| tests/runtime/review-snapshot.test.ts | src/runtime/review-snapshot.ts | createReviewSnapshot, reviewSnapshotHash | unit | no | +| tests/runtime/role-prompts.test.ts | src/pipeline/role-prompts.ts | buildRoleSpec, renderRolePrompt | unit | no | +| tests/runtime/role-runner.test.ts | src/pipeline/role-runner.ts | runRole | integration | no | +| tests/runtime/routing-policy.test.ts | src/producers/routing-policy.ts | route | unit | no | +| tests/runtime/run-decision.test.ts | src/runtime/run-decision.ts | RunDecision, runDecision, readRunDecisionSnapshot | unit | no | +| tests/runtime/run-manifest.test.ts | src/runtime/run-manifest.ts | buildRunManifest, verifyRunManifest | unit | no | +| tests/runtime/run-status.test.ts | src/runtime/run-status.ts, src/runtime/attempt-runtime.ts | StatusEmitter, runAttempt, initializeRunStart | integration | YES — `vi.spyOn(ArtifactStore.prototype, "writeRunStatus")` + `vi.spyOn(logger, "warn")` (L1661-1663) force failure paths mid-run | +| tests/runtime/sandbox-backends.test.ts | src/platform/sandbox/backends.ts | selectSandboxBackend, SANDBOX_BACKENDS | unit | no | +| tests/runtime/scaffold.test.ts | src/util/logger.ts | logger | unit | no | +| tests/runtime/schema-loader.test.ts | src/protocol/schema-loader.ts | loadSchemas, checkVersionCompat | contract | no | +| tests/runtime/seatbelt.test.ts | src/platform/sandbox/seatbelt.ts | buildSeatbeltProfile, buildReadOnlySeatbeltPolicy, wrapInvocationWithSeatbelt | unit | no | +| tests/runtime/serialize.test.ts | src/mcp/serialize.ts | withRepoLock | unit | no | +| tests/runtime/shipping/github-cli-adapter-red-paths.test.ts | src/ship/github-cli-adapter.ts | GitHubCliAdapter, HostingAdapterError, InMemoryHostingAdapter | adversarial | YES — mocks internal src/platform/select-platform.js (L53), src/platform/process-supervisor.js (L60), node:fs/promises (L71) to fake process execution | +| tests/runtime/shipping/github-cli-adapter.test.ts | src/ship/github-cli-adapter.ts | GitHubCliAdapter, HostingAdapterError, InMemoryHostingAdapter | contract | YES — same mocking pattern (L54, L61, L72) | +| tests/runtime/skill-bootstrap.test.ts | src/producers/skill-bootstrap.ts | renderSkillBootstrap | unit | YES — `vi.doMock("node:fs")` (~L59) stubs `existsSync` to force a fail-closed branch | +| tests/runtime/slice-composer.test.ts | src/pipeline/slice-composer.ts | composeSliceOntoHead, parseRawDiffEntries | integration | no | +| tests/runtime/slice-scheduler.test.ts | src/pipeline/slice-scheduler.ts | planSliceWaves | unit | no | +| tests/runtime/spec-hash.test.ts | src/protocol/spec-hash.ts | canonicalSpecJson, specSha256 | unit | no | +| tests/runtime/spec-validator-review.test.ts | src/protocol/spec-validator.ts | validateSpec, resolveImplementationConfig, resolveReviewConfig | contract | no | +| tests/runtime/spec-validator.test.ts | src/protocol/spec-validator.ts | validateSpec | contract | no | +| tests/runtime/stable-file.test.ts | src/runtime (stable-file reader) | readStableRegularFile | adversarial | no | +| tests/runtime/structural-verifier.test.ts | src/verify/structural-verifier.ts | structuralVerify, isWithinScope, pathsCaseCollide | integration | no | +| tests/runtime/structured-output.test.ts | src/pipeline/structured-output.ts | extractJson, parseStructuredReport | unit | no | +| tests/runtime/tools.test.ts | src/mcp/tools.ts | handleDelegate, handleDelegatePipeline, handleReviewCandidate, handleIntegrateCandidate | contract | no | +| tests/runtime/verification-mode.test.ts | src/verify/structural-verifier.ts, src/verify/acceptance-verifier.ts | MODE_STRUCTURAL_FAILURES, isAllowed, AcceptanceVerifier | unit | no | +| tests/runtime/watchdog.test.ts | runtime/watchdog.mjs | spawned process | integration | no | +| tests/runtime/windows-filesystem-helper.test.ts | src/platform/windows-filesystem-helper.ts | resolveWindowsFilesystemHelper, removeBoundEmptyDirectory | smoke | no | +| tests/runtime/windows-helper-resolve.test.ts | src/platform/windows-platform-services.ts | resolveJobKillHelper, WindowsPlatformServices, resolveWindowsFilesystemHelper | unit | no | +| tests/runtime/windows-job-kill.test.ts | src/platform/windows-platform-services.ts | resolveJobKillHelper, WindowsPlatformServices | smoke | no | +| tests/runtime/windows-platform.test.ts | src/platform/windows-platform-services.ts | canonicalizeForScope, acquireWxFileLock, WindowsPlatformServices | unit | no | +| tests/runtime/windows-resolve.test.ts | src/platform/windows-env.ts, src/platform/windows-platform-services.ts | normalizeWindowsEnv, resolveWindowsExecutable | unit | no | +| tests/runtime/worktree-manager.test.ts | src/runtime/worktree-manager.ts | WorktreeManager, managedWorktreeDirectoryIdentity, removeManagedWorktreeDirectory | integration | no | +| tests/runtime/worktree-registration.test.ts | src/git/worktree-registration.ts | findWorktreeRegistration | unit | no | +| tests/runtime/worktree-removal-manifest.test.ts | src/runtime/worktree-removal-manifest.ts | persistWorktreeRemovalManifest, readPendingWorktreeRemovalManifests, replaceWorktreeRemovalManifest, assertNoPendingWorktreeRemovalForRepository | integration | no | +| tests/runtime/worktree-sweep.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns, WorktreeManager | integration | no | +| tests/validate-release.test.sh | scripts/validate-release.sh | validate-release CLI contract | integration | no | + +## Past the interface + +Rule applied: a spy that calls through to the real implementation and only +observes (lease held, call count) or injects one fault the real system cannot +produce deterministically (disk write failure, git dying mid-sequence, a +cleanup that throws) stays. A mock that replaces the component whose property +the test claims to prove is forbidden by AGENTS.md and must move or go. Every +site below was read; each verdict names the reason. + +| Site | What it does | Verdict | +| --- | --- | --- | +| `tests/runtime/artifact-store.test.ts` (`vi.mock("node:fs/promises")`) | wraps `open` to fail a write | keep: OS fault injection; the store's durability is what is being proven, and it is real | +| `tests/runtime/attempt-runtime.test.ts:582` | `WorktreeManager.prototype.create` calls through, then makes `cleanup` throw | keep: fault injection on a real worktree; proves the outcome survives cleanup failure | +| `tests/runtime/autopilot/final-branch-reviewer.test.ts:637` | `revalidateUnderLock` replaced to assert the lock is held and count calls after cleanup | keep: observes ordering of a real lock; the property proven is the caller's sequencing, not revalidation itself | +| `tests/runtime/candidate-tree.test.ts:439`, `tests/runtime/controlled-integrator.test.ts:797` | `git-exec` wrapped to fail one call mid-sequence | keep: a real repository cannot make git die at step N deterministically; every other call is real git | +| `tests/runtime/git-exec.test.ts:118` | spies `resolveExecutable` to count resolutions | keep: the cache is the unit under test and its contract is "resolve once" | +| `tests/runtime/legacy-decision-provenance.test.ts` | hand-writes legacy `decision.json` bytes | keep: the current runtime no longer produces that shape; reading it is the contract | +| `tests/runtime/pipeline-runtime.test.ts` (11 sites) | `AcceptanceVerifier.prototype.verify`, `ArtifactStore.prototype.*`, `WorktreeManager.prototype.create` spied; each calls through and either asserts the lease is held, counts calls, or fails once | keep: every spy runs the real method; the pipeline, store, verifier, and worktrees are real. Sites that never call through (`1180`, `1483`) reject a single durable write to prove the failure is reported, not swallowed | +| `tests/runtime/run-status.test.ts:1661` | `writeRunStatus` rejected once; `logger.warn` observed | keep: proves status is advisory and never breaks control flow | +| `tests/runtime/repo-preconditions.test.ts:982`, `tests/runtime/skill-bootstrap.test.ts:59` | `node:fs` failures forced | keep: fail-closed branches unreachable without an injected fault | +| `tests/runtime/shipping/github-cli-adapter*.test.ts` | `select-platform`, `process-supervisor`, `node:fs/promises` mocked to fake `gh` | keep: the adapter's designed seam; the real CLI is covered by the opt-in smoke path | +| `branch-manager.test.ts:911`, `candidate-promoter.test.ts:447`, `lock-ownership.test.ts:690`, `recovery-manager.test.ts:897` | `logger.warn` / `console.error` spied | keep: log observation, no behaviour substituted | + +Nothing was moved or deleted: no test replaces the component whose property it +proves. Any future entry here must carry a verdict in this table. + +## Helpers + +- `tests/helpers/platform-services-double.ts` — builds a complete `PlatformServices` test double (real platform + per-test overrides) via prototype delegation, used by recovery/platform tests. +- `tests/runtime/helpers/git-fixture-env.ts` — `scrubbedGitEnv()` strips `GIT_*` location env vars so fixture repos don't inherit the outer repo's git context. +- `tests/runtime/pipeline/autopilot-fixtures.ts` — shared autopilot fixture builders (manifest hashes, dead-owner mutation helpers) used across autopilot recovery/branch tests. +- `tests/runtime/fixtures/codex-garbage.txt` — malformed fixture input for Codex adapter parsing tests. +- `tests/runtime/fixtures/codex-success.json` — well-formed Codex event fixture. +- `tests/runtime/fixtures/echo-sleep.mjs` — spawnable helper process used by process-supervisor/watchdog tests. +- `tests/runtime/fixtures/edit-file.mjs` — spawnable helper process that mutates a file, used by worktree/producer tests. + +## Symbol audit + +Every named import from a src module resolves to an export of that module. No "symbol not exported" +violations were found across the full test suite (135 files, 5 independent batch audits, each verifying +its flagged imports against `export` declarations via grep). diff --git a/tests/runtime/artifact-store-bytes.test.ts b/tests/runtime/artifact-store-bytes.test.ts new file mode 100644 index 0000000..bca3e88 --- /dev/null +++ b/tests/runtime/artifact-store-bytes.test.ts @@ -0,0 +1,150 @@ +import { createHash } from "node:crypto"; +import { mkdtemp, readdir, readFile, rm, stat } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { join, relative } from "node:path"; +import { afterEach, beforeEach, describe, expect, it } from "vitest"; +import type { AttemptResult } from "../../src/protocol/attempt-result.js"; +import { ArtifactStore } from "../../src/runtime/artifact-store.js"; +import { buildRunManifest } from "../../src/runtime/run-manifest.js"; + +/** + * The archive is a public contract: other sessions, the MCP surface, and + * recovery all read these bytes back. The descriptor-driven store rewrite must + * therefore produce byte-identical files for identical inputs. These hashes + * were recorded from the hand-written façades before the rewrite; a change + * here is a change to the on-disk format and needs its own decision. + */ +const RUN_ID = "bytes-golden-run"; +const REPO_ROOT = "/repo"; + +const GOLDEN: Record = { + "decision.json": "4cef15d87869d4ece959d5bad7ebd0c005ae089144c90c808b84c9729f1d26bb", + "logs/producer.log": "e9024f1a07d29d52ad3aa5e1a18e94db1f3a9fd32b89e39d47c472cd99071e13", + "manifest.json": "9345893b4a64416898871a61fc65133a43371dcd50f51c472fe9f8060cec00bf", + "pipeline-active.json": "3c1c0c3ff953ec85e6b52da6a0dd124d41e29ba6f3394f545d2ef636dc20edce", + "pipeline-gate-cleared.json": "a53c3367231380c176a4fc0e03f6f5056b1446452923dca40e1cb80e1a391c46", + "pipeline/delegation-spec.json": "475e0a1730837fefbf663e3cec5923326087e80da856a60e4c21004c7e2351a3", + "result.json": "fd4e6dbc3cd1f580b8aeed3ae8c4e8527c8878017b6cd2c0e159a9b7db028b71", + "status.json": "fa36578b174e1986f9e2aa865d90f0eaa5da29601d13d163c9a49ac0a11ca213", +}; + +function sampleResult(): AttemptResult { + return { + resultVersion: "1", + runId: RUN_ID, + status: "failed", + failure: "producer-failure", + summary: "producer exited non-zero", + producerSummary: null, + candidate: null, + requestedVerification: [], + executedVerification: [], + unresolvedIssues: [], + evidence: {}, + logsRef: "logs/producer.log", + producerId: "codex", + producerVersion: "1.2.3", + producerModel: null, + durationMs: 42, + sessionId: null, + }; +} + +async function hashTree(root: string): Promise> { + const hashes: Record = {}; + const walk = async (directory: string): Promise => { + for (const name of (await readdir(directory)).sort()) { + const full = join(directory, name); + if ((await stat(full)).isDirectory()) { + await walk(full); + continue; + } + hashes[relative(root, full).split("\\").join("/")] = createHash("sha256") + .update(await readFile(full)) + .digest("hex"); + } + }; + await walk(root); + return hashes; +} + +describe("artifact store archive bytes", () => { + let stateRoot: string; + let previousPluginData: string | undefined; + + beforeEach(async () => { + previousPluginData = process.env.CLAUDE_PLUGIN_DATA; + stateRoot = await mkdtemp(join(tmpdir(), "claude-architect-bytes-")); + process.env.CLAUDE_PLUGIN_DATA = stateRoot; + }); + + afterEach(async () => { + if (previousPluginData === undefined) delete process.env.CLAUDE_PLUGIN_DATA; + else process.env.CLAUDE_PLUGIN_DATA = previousPluginData; + await rm(stateRoot, { recursive: true, force: true }); + }); + + it("writes byte-identical artifacts for identical inputs", async () => { + const store = new ArtifactStore(RUN_ID); + const result = sampleResult(); + const manifest = buildRunManifest({ + runId: RUN_ID, + repoRoot: REPO_ROOT, + baseCommitOid: "a".repeat(40), + candidateManifestHash: null, + producer: { id: "codex", version: "1.2.3", model: null }, + effectivePolicy: { isolation: "temporary-home", retries: 0 }, + repositoryInstructions: [{ path: "AGENTS.md", content: "follow the repository rules\n" }], + prompt: "Implement the requested change", + executionPolicy: { network: "denied", writeAllowlist: ["src/**"] }, + environment: [{ name: "PATH", source: "platform" }], + packagedVerifier: { version: "1", content: "trusted verifier bytes" }, + }); + + await store.writeLog("producer", "line one\nline two\n"); + await store.writePipelineArtifact("delegation-spec", { specVersion: "x", title: "golden" }); + await store.writeResult(result); + await store.writeManifest(manifest); + await store.promoteTerminalArtifacts({ + result: { ...result, summary: "promoted" }, + manifest, + }); + await store.writePipelineGateCleared({ + clearedVersion: "1", + candidateCommitOid: "b".repeat(40), + requiresHumanDecision: false, + clearedAt: "2026-07-14T12:00:00.000Z", + }); + await store.writePipelineActiveMarker({ + pid: 4242, + processToken: "token", + startedAt: "2026-07-14T12:00:00.000Z", + sliced: false, + }); + await store.writeHumanDecision({ + decision: "accepted", + candidateManifestHash: "a".repeat(64), + evidenceHash: "b".repeat(64), + policyVersion: "1", + recordedAt: "2026-07-14T12:01:00.000Z", + }); + // status.json exists only after run-start; the store replaces it in place. + await store.writeRunStatus({ + statusVersion: "1", + runId: RUN_ID, + mode: "single", + phase: "done", + sliceIndex: null, + sliceCount: null, + round: null, + role: null, + producerId: "codex", + startedAt: "2026-07-14T12:00:00.000Z", + updatedAt: "2026-07-14T12:02:00.000Z", + detail: "done", + }); + + const actual = await hashTree(store.runDirectory); + expect(actual).toEqual(GOLDEN); + }); +}); diff --git a/tests/runtime/artifact-store.test.ts b/tests/runtime/artifact-store.test.ts index 0326199..80a127e 100644 --- a/tests/runtime/artifact-store.test.ts +++ b/tests/runtime/artifact-store.test.ts @@ -272,8 +272,8 @@ describe("ArtifactStore", () => { expect(hashes.advisorReportHash).toBe(eligibility.advisorReportHash); expect(hashes.eligibilityRecordHash).toMatch(/^[0-9a-f]{64}$/u); - await expect(store.readAdvisorReport(runId)).resolves.toEqual(advisorReport); - await expect(store.readAutopilotEligibility(runId)).resolves.toEqual(eligibility); + await expect(store.readAdvisorReport()).resolves.toEqual(advisorReport); + await expect(store.readAutopilotEligibility()).resolves.toEqual(eligibility); expect(await readFile(pipelinePath, "utf8")).toBe(pipelineBefore); const candidate = pipeline.attempt.candidate!; @@ -282,15 +282,15 @@ describe("ArtifactStore", () => { eligibility, "2026-07-20T12:01:00.000Z", ); - await expect(store.readCandidateDecision(runId)).resolves.toMatchObject({ + await expect(store.readCandidateDecision()).resolves.toMatchObject({ authority: "autopilot-policy", candidateManifestHash: candidate.manifestHash, evidenceHash: hashes.eligibilityRecordHash, }); await rm(join(store.runDirectory, "pipeline", "post-pipeline-autopilot.json")); - await expect(store.readAdvisorReport(runId)).resolves.toBeNull(); - await expect(store.readAutopilotEligibility(runId)).resolves.toBeNull(); + await expect(store.readAdvisorReport()).resolves.toBeNull(); + await expect(store.readAutopilotEligibility()).resolves.toBeNull(); }); it("publishes neither post-pipeline record when the single atomic publication fails", async () => { @@ -323,8 +323,8 @@ describe("ArtifactStore", () => { })).rejects.toThrow(/injected atomic publication failure/u); filesystemHooks.beforeLink = undefined; - await expect(store.readAdvisorReport(runId)).resolves.toBeNull(); - await expect(store.readAutopilotEligibility(runId)).resolves.toBeNull(); + await expect(store.readAdvisorReport()).resolves.toBeNull(); + await expect(store.readAutopilotEligibility()).resolves.toBeNull(); expect(await readFile(pipelinePath, "utf8")).toBe(pipelineBefore); }); @@ -337,8 +337,8 @@ describe("ArtifactStore", () => { advisorReportHash: "f".repeat(64), }); - await expect(store.readAdvisorReport(runId)).rejects.toThrow(/artifacts are invalid/u); - await expect(store.readAutopilotEligibility(runId)).rejects.toThrow(/artifacts are invalid/u); + await expect(store.readAdvisorReport()).rejects.toThrow(/artifacts are invalid/u); + await expect(store.readAutopilotEligibility()).rejects.toThrow(/artifacts are invalid/u); }); it("rejects caller-forged or non-strict post-pipeline eligibility", async () => { @@ -391,7 +391,7 @@ describe("ArtifactStore", () => { ), "utf8"); expect(persisted).not.toContain(secret); expect(persisted).not.toContain("bearer-secret-value"); - await expect(store.readPipelineArtifact(runId, "round-1-review")).resolves.toEqual({ + await expect(store.readPipelineArtifact("round-1-review")).resolves.toEqual({ nested: { rawOutput: "Bearer [b] and [k]" }, summary: "provider returned [k]", }); @@ -409,8 +409,8 @@ describe("ArtifactStore", () => { await store.promoteTerminalArtifacts({ result: promoted, manifest: promotedManifest }); - await expect(store.readResult(runId)).resolves.toEqual(promoted); - await expect(store.readManifest(runId)).resolves.toEqual(sanitizeRunManifest(promotedManifest)); + await expect(store.readResult()).resolves.toEqual(promoted); + await expect(store.readManifest()).resolves.toEqual(sanitizeRunManifest(promotedManifest)); }); it("rejects terminal promotion across run ids or after a decision", async () => { @@ -475,7 +475,7 @@ describe("ArtifactStore", () => { await store.writeResult(result); - const archived = await store.readResult("run-allowed-mutations"); + const archived = await store.readResult(); expect(archived?.requestedVerification[0]?.allowedMutations).toBe("ignored-paths"); expect(archived?.requestedVerification[0]?.expectBaselineFailure).toBe(true); }); @@ -486,7 +486,7 @@ describe("ArtifactStore", () => { await store.writeResult(result); - await expect(store.readResult("run-round-trip")).resolves.toEqual(result); + await expect(store.readResult()).resolves.toEqual(result); await expect(store.list()).resolves.toContain("run-round-trip"); await expect(access(join( process.env.CLAUDE_PLUGIN_DATA!, @@ -504,7 +504,7 @@ describe("ArtifactStore", () => { const malformedStore = new ArtifactStore(malformedRunId); await malformedStore.writeLog("producer", "create run directory\n"); await writeFile(join(malformedStore.runDirectory, "result.json"), "{}\n"); - await expect(malformedStore.readResult(malformedRunId)).rejects.toThrow( + await expect(malformedStore.readResult()).rejects.toThrow( /attempt result.*invalid|run id/i, ); @@ -515,7 +515,7 @@ describe("ArtifactStore", () => { join(crossStore.runDirectory, "result.json"), `${JSON.stringify(sampleResult("different-run"))}\n`, ); - await expect(crossStore.readResult(crossRunId)).rejects.toThrow(/attempt result.*run id/i); + await expect(crossStore.readResult()).rejects.toThrow(/attempt result.*run id/i); }); it("rejects case-colliding changed paths consumed from archived pipeline bytes", async () => { @@ -561,10 +561,24 @@ describe("ArtifactStore", () => { await expect(store.writeResult(invalid)).rejects.toThrow(/attempt result.*invalid/i); }); - it("validates run ids before reading manifests", async () => { - const store = new ArtifactStore("run-manifest-id-check"); + it("validates the run id once, at construction, before any read", () => { + expect(() => new ArtifactStore("../run-manifest-id-check")).toThrow(/invalid run id/i); + }); + + it("binds every read façade to the run it was constructed for", async () => { + const bound = new ArtifactStore("run-bound-a"); + const other = new ArtifactStore("run-bound-b"); + await bound.writeResult(sampleResult("run-bound-a")); - await expect(store.readManifest("../outside")).rejects.toThrow(/invalid run id/i); + await expect(bound.readResult()).resolves.toMatchObject({ runId: "run-bound-a" }); + await expect(other.readResult()).resolves.toBeNull(); + for (const facade of [ + "readResult", "readManifest", "readRunStatus", "readReviewSnapshot", "readCandidateDecision", + "readDecision", "readPipelineGateCleared", "readPipelineActiveMarker", "readAdvisorReport", + "readAutopilotEligibility", "readRunStartSpecSha256", + ] as const) { + expect(ArtifactStore.prototype[facade].length, facade).toBe(0); + } }); it("treats an archived runtime version as provenance", async () => { @@ -577,7 +591,7 @@ describe("ArtifactStore", () => { await store.writeManifest(manifest); - await expect(store.readManifest(runId)).resolves.toMatchObject({ + await expect(store.readManifest()).resolves.toMatchObject({ runId, runtimeVersion: "0.16.0", }); @@ -617,7 +631,7 @@ describe("ArtifactStore", () => { await store.writeResult(sampleResult(runId)); await truncate(join(store.runDirectory, "result.json"), 8_000_001); - await expect(store.readResult(runId)).rejects.toThrow(/archive entry.*large|byte limit/i); + await expect(store.readResult()).rejects.toThrow(/archive entry.*large|byte limit/i); }); it("rejects a hardlinked archive entry", async () => { @@ -633,7 +647,7 @@ describe("ArtifactStore", () => { await rm(destination); await link(external, destination); - await expect(store.readResult(runId)).rejects.toThrow(/hardlink|link count/i); + await expect(store.readResult()).rejects.toThrow(/hardlink|link count/i); }); it("fails size accounting when a run directory is swapped for a symlink", async () => { @@ -742,7 +756,7 @@ describe("ArtifactStore", () => { detail: { toolError: "decision-conflict" }, }); - await expect(store.readCandidateDecision(runId)).resolves.toEqual({ + await expect(store.readCandidateDecision()).resolves.toEqual({ ...first, decisionVersion: "2", authority: "human", @@ -770,7 +784,7 @@ describe("ArtifactStore", () => { // "unknown", not "human": the record predates provenance, so it says a // decision happened and nothing about who made it. Reporting a person would // invent evidence and hand it the one authority integration accepts. - await expect(store.readCandidateDecision(runId)).resolves.toEqual({ + await expect(store.readCandidateDecision()).resolves.toEqual({ decisionVersion: "1", decision: "accepted", authority: "unknown", @@ -819,7 +833,7 @@ describe("ArtifactStore", () => { decisionVersion: "2", authority: "human", }; - await expect(store.readCandidateDecision(runId)).resolves.toEqual(expected); + await expect(store.readCandidateDecision()).resolves.toEqual(expected); expect(JSON.parse(await readFile(join(store.runDirectory, "decision.json"), "utf8"))) .toEqual(expected); }); @@ -861,7 +875,7 @@ describe("ArtifactStore", () => { "2026-07-14T12:01:00.000Z", ); - await expect(store.readCandidateDecision(runId)).resolves.toEqual(persisted); + await expect(store.readCandidateDecision()).resolves.toEqual(persisted); expect(JSON.parse(await readFile(join(store.runDirectory, "decision.json"), "utf8"))) .toEqual(persisted); @@ -924,7 +938,7 @@ describe("ArtifactStore", () => { eligible: false, }, "2026-07-14T12:00:00.000Z")) .rejects.toThrow(/eligibility is invalid/u); - await expect(store.readCandidateDecision(runId)).resolves.toBeNull(); + await expect(store.readCandidateDecision()).resolves.toBeNull(); }); it("requires idempotent decision retries to match authority and candidate binding", async () => { @@ -956,7 +970,7 @@ describe("ArtifactStore", () => { detail: { toolError: "decision-conflict" }, }); } - await expect(store.readCandidateDecision(runId)).resolves.toEqual(original); + await expect(store.readCandidateDecision()).resolves.toEqual(original); }); it("atomically preserves one decision when conflicting writers race", async () => { @@ -1003,7 +1017,7 @@ describe("ArtifactStore", () => { expect(rejected).toMatchObject({ reason: { detail: { toolError: "decision-conflict" } }, }); - await expect(firstStore.readCandidateDecision(runId)).resolves.toEqual({ + await expect(firstStore.readCandidateDecision()).resolves.toEqual({ decisionVersion: "2", ...records[winnerIndex], authority: "human", @@ -1023,7 +1037,7 @@ describe("ArtifactStore", () => { await store.writePipelineActiveMarker(marker); - await expect(store.readPipelineActiveMarker(runId)).resolves.toEqual(marker); + await expect(store.readPipelineActiveMarker()).resolves.toEqual(marker); }); it("rejects a legacy pipeline marker without sliced", async () => { @@ -1036,7 +1050,7 @@ describe("ArtifactStore", () => { startedAt: "2026-07-19T12:00:00.000Z", })}\n`); - await expect(store.readPipelineActiveMarker(runId)).rejects.toThrow( + await expect(store.readPipelineActiveMarker()).rejects.toThrow( /pipeline-active marker is malformed/i, ); }); @@ -1054,7 +1068,7 @@ describe("ArtifactStore", () => { sliced, })}\n`); - await expect(store.readPipelineActiveMarker(runId)).rejects.toThrow( + await expect(store.readPipelineActiveMarker()).rejects.toThrow( /pipeline-active marker is malformed/i, ); }, @@ -1089,7 +1103,7 @@ describe("ArtifactStore", () => { })}\n`); }; - const result = await store.readResult(runId).catch(() => null); + const result = await store.readResult().catch(() => null); expect(swapped).toBe(true); expect(result?.summary).not.toBe("forged result"); @@ -1105,7 +1119,7 @@ describe("ArtifactStore", () => { const stored = await readFile(join(store.runDirectory, "result.json"), "utf8"); expect(() => JSON.parse(stored)).not.toThrow(); expect(stored).not.toContain('"runId"'); - await expect(store.readResult("run-json-syntax")).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ runId: "run-json-syntax", }); registration.dispose(); @@ -1119,7 +1133,7 @@ describe("ArtifactStore", () => { const stored = await readFile(join(store.runDirectory, "result.json"), "utf8"); expect(stored).not.toContain("ummary"); - await expect(store.readResult("run-required-key")).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ summary: "producer exited non-zero", }); registration.dispose(); @@ -1294,7 +1308,7 @@ describe("ArtifactStore", () => { ...original, summary: "conflicting terminal result", })).rejects.toThrow(/already exists with different content/); - await expect(store.readResult("run-create-once")).resolves.toEqual(original); + await expect(store.readResult()).resolves.toEqual(original); }); it("allows only one conflicting concurrent terminal write", async () => { @@ -1308,7 +1322,7 @@ describe("ArtifactStore", () => { ]); expect(outcomes.filter(outcome => outcome.status === "fulfilled")).toHaveLength(1); - const stored = await store.readResult("run-concurrent"); + const stored = await store.readResult(); expect([first.summary, second.summary]).toContain(stored?.summary); }); @@ -1468,7 +1482,7 @@ describe("ArtifactStore", () => { expect(result.removed).not.toContain(runId); expect(result.retained.some(entry => entry.reason.includes("authority changed"))).toBe(true); - await expect(store.readResult(runId)).resolves.toEqual(replacement); + await expect(store.readResult()).resolves.toEqual(replacement); }); it("records repository identity for candidate-null cleanup intents", async () => { diff --git a/tests/runtime/attempt-runtime.test.ts b/tests/runtime/attempt-runtime.test.ts index 7d938ca..61e472f 100644 --- a/tests/runtime/attempt-runtime.test.ts +++ b/tests/runtime/attempt-runtime.test.ts @@ -618,7 +618,7 @@ describe("runAttempt", () => { "utf8", )).resolves.toContain("attempt worktree cleanup failed"); const archived = await new ArtifactStore("run-borrowed-lock-cleanup-failure") - .readResult("run-borrowed-lock-cleanup-failure"); + .readResult(); expect(archived?.status).toBe("verified-candidate"); expect(fixture.acquireCalls()).toBe(0); expect(fixture.releaseCalls()).toBe(0); diff --git a/tests/runtime/autopilot/autopilot-adversarial.test.ts b/tests/runtime/autopilot/autopilot-adversarial.test.ts index d76c5f1..bd5790a 100644 --- a/tests/runtime/autopilot/autopilot-adversarial.test.ts +++ b/tests/runtime/autopilot/autopilot-adversarial.test.ts @@ -594,7 +594,7 @@ describe("autopilot adversarial trust boundaries", () => { const result = await harness.controller.start(harness.fixture.checkout, autopilotSpec()); const runId = result.tasks[0]!.runId!; await writeFile(path.join(new ArtifactStore(runId).runDirectory, "decision.json"), "{}\n"); - await expect(new ArtifactStore(runId).readDecision(runId)).rejects.toBeDefined(); + await expect(new ArtifactStore(runId).readDecision()).rejects.toBeDefined(); await writeFile(harness.store.statePath, "{}\n"); await expect(harness.store.read()).rejects.toBeDefined(); }, 120_000); diff --git a/tests/runtime/autopilot/autopilot-windows.test.ts b/tests/runtime/autopilot/autopilot-windows.test.ts index 7e4f6e1..4147d06 100644 --- a/tests/runtime/autopilot/autopilot-windows.test.ts +++ b/tests/runtime/autopilot/autopilot-windows.test.ts @@ -423,7 +423,7 @@ describe("AutopilotController platform-neutral forced-red gate", () => { await expect(lstat(store.ownerPath)).rejects.toMatchObject({ code: "ENOENT" }); const runStore = new ArtifactStore(RUN_ID); - const attempt = await runStore.readResult(RUN_ID); + const attempt = await runStore.readResult(); expect(attempt).toMatchObject({ runId: RUN_ID, status: "failed", @@ -434,8 +434,8 @@ describe("AutopilotController platform-neutral forced-red gate", () => { }, }, }); - expect(await runStore.readAutopilotEligibility(RUN_ID)).toBeNull(); - expect(await runStore.readCandidateDecision(RUN_ID)).toBeNull(); + expect(await runStore.readAutopilotEligibility()).toBeNull(); + expect(await runStore.readCandidateDecision()).toBeNull(); await expect(lstat(path.join(store.workflowDirectory, FINAL_BRANCH_ARTIFACT_REF))) .rejects.toMatchObject({ code: "ENOENT" }); diff --git a/tests/runtime/decision-authority.test.ts b/tests/runtime/decision-authority.test.ts index 9e5139d..e556960 100644 --- a/tests/runtime/decision-authority.test.ts +++ b/tests/runtime/decision-authority.test.ts @@ -142,7 +142,7 @@ describe("policy-autonomous decisions survive the archive", () => { recordedAt: new Date().toISOString(), }; await store.writeCandidateDecisionRecord(record); - await expect(store.readCandidateDecision("decision-authority-roundtrip")) + await expect(store.readCandidateDecision()) .resolves.toMatchObject({ authority: "policy-autonomous" }); }); }); diff --git a/tests/runtime/e2e-pipeline.test.ts b/tests/runtime/e2e-pipeline.test.ts index 0fbed49..0816b24 100644 --- a/tests/runtime/e2e-pipeline.test.ts +++ b/tests/runtime/e2e-pipeline.test.ts @@ -392,7 +392,7 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = expect(candidateHash).toBeDefined(); await expect(handleDecideCandidate(repo, runId, "accepted", candidateHash!, lifecycleDeps)) .resolves.toEqual({ recorded: true }); - const manifest = await new ArtifactStore(runId).readManifest(runId); + const manifest = await new ArtifactStore(runId).readManifest(); expect(manifest).not.toBeNull(); expect(manifest?.candidateManifestHash).not.toBeNull(); // decideCandidate compares the caller's hash against the ARCHIVED manifest, @@ -454,7 +454,7 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = // The gate's refusal used to live only in the pipeline-result artifact. The // accept path loads the archived attempt, so a candidate the gate rejected // was indistinguishable there from one it cleared. - const archived = await new ArtifactStore(runId).readResult(runId); + const archived = await new ArtifactStore(runId).readResult(); expect(archived?.evidence.pipelineGateRefused).toMatchObject({ reasons: expect.arrayContaining([expect.any(String)]), }); diff --git a/tests/runtime/legacy-decision-provenance.test.ts b/tests/runtime/legacy-decision-provenance.test.ts index 6cee7a1..4469fae 100644 --- a/tests/runtime/legacy-decision-provenance.test.ts +++ b/tests/runtime/legacy-decision-provenance.test.ts @@ -79,7 +79,7 @@ describe("legacy decision archives written before decisionVersion existed", () = candidateManifestHash: "a".repeat(64), }); - const decision = await store.readCandidateDecision("run-legacy-human"); + const decision = await store.readCandidateDecision(); expect(decision).toEqual({ decisionVersion: "1", @@ -99,7 +99,7 @@ describe("legacy decision archives written before decisionVersion existed", () = candidateManifestHash: "b".repeat(64), }); - const decision = await store.readCandidateDecision("run-legacy-policy"); + const decision = await store.readCandidateDecision(); expect(decision?.authority).toBe("policy-autonomous"); expect(INTEGRABLE_DECISION_AUTHORITIES).toContain(decision!.authority); @@ -114,7 +114,7 @@ describe("legacy decision archives written before decisionVersion existed", () = recordedAt: "2026-07-20T09:00:00.000Z", }); - const decision = await store.readCandidateDecision("run-legacy-bare"); + const decision = await store.readCandidateDecision(); expect(decision?.authority).toBe("unknown"); expect(INTEGRABLE_DECISION_AUTHORITIES).not.toContain(decision!.authority); @@ -128,7 +128,7 @@ describe("legacy decision archives written before decisionVersion existed", () = candidateManifestHash: null, }); - const decision = await store.readCandidateDecision("run-legacy-caller"); + const decision = await store.readCandidateDecision(); expect(decision?.authority).toBe("caller-asserted"); expect(INTEGRABLE_DECISION_AUTHORITIES).not.toContain(decision!.authority); @@ -142,7 +142,7 @@ describe("legacy decision archives written before decisionVersion existed", () = approvedBy: "someone", }); - await expect(store.readCandidateDecision("run-legacy-extra")) + await expect(store.readCandidateDecision()) .rejects.toThrow("archived run decision is malformed"); }); @@ -154,7 +154,7 @@ describe("legacy decision archives written before decisionVersion existed", () = candidateManifestHash: "not-a-hash", }); - await expect(store.readCandidateDecision("run-legacy-badhash")) + await expect(store.readCandidateDecision()) .rejects.toThrow("archived run decision is malformed"); }); @@ -167,7 +167,7 @@ describe("legacy decision archives written before decisionVersion existed", () = }; const store = await archiveDecisionBytes("run-legacy-immutable", original); - await store.readCandidateDecision("run-legacy-immutable"); + await store.readCandidateDecision(); const onDisk: unknown = JSON.parse( await readFile(join(store.runDirectory, "decision.json"), "utf8"), diff --git a/tests/runtime/mcp-decision-gate.test.ts b/tests/runtime/mcp-decision-gate.test.ts index 8c0cb56..9b53180 100644 --- a/tests/runtime/mcp-decision-gate.test.ts +++ b/tests/runtime/mcp-decision-gate.test.ts @@ -59,7 +59,7 @@ describe("legacy decision provenance", () => { }), "utf8", ); - await expect(store.readCandidateDecision("decision-authority-roundtrip")) + await expect(store.readCandidateDecision()) .resolves.toMatchObject({ authority: "policy-autonomous" }); } finally { if (previousStateRoot === undefined) { @@ -296,7 +296,7 @@ describe("decideCandidate authority", () => { writeCandidateDecisionRecord: async (record: CandidateDecisionV2) => { await persistentStore.writeCandidateDecisionRecord(record); }, - readCandidateDecision: async () => persistentStore.readCandidateDecision("decide-authority"), + readCandidateDecision: async () => persistentStore.readCandidateDecision(), writeReviewSnapshot: async snapshot => { persistedSnapshot = snapshot; }, readReviewSnapshot: async () => persistedSnapshot, readRunStartSpecSha256: async () => null, @@ -340,7 +340,7 @@ describe("decideCandidate authority", () => { // The archived decision must survive the refused write unchanged, with // the authority its recorded provenance maps to. An absent decidedBy is // "unknown": the record cannot say a person decided. - await expect(persistentStore.readCandidateDecision("decide-authority")) + await expect(persistentStore.readCandidateDecision()) .resolves.toMatchObject({ decision: "accepted", authority: decidedBy ?? "unknown", diff --git a/tests/runtime/pipeline-runtime.test.ts b/tests/runtime/pipeline-runtime.test.ts index 2134d5b..650c93b 100644 --- a/tests/runtime/pipeline-runtime.test.ts +++ b/tests/runtime/pipeline-runtime.test.ts @@ -878,8 +878,8 @@ describe("runPipeline", () => { lease = await checkoutLeaseHarness(repo, { onRelease: async () => { expect(lease.held()).toBe(true); - await expect(store.readPipelineActiveMarker(runId)).resolves.toBeNull(); - await expect(store.readPipelineArtifact(runId, "pipeline-result")) + await expect(store.readPipelineActiveMarker()).resolves.toBeNull(); + await expect(store.readPipelineArtifact("pipeline-result")) .resolves.toMatchObject({ status: "decision-ready" }); releaseObservedLast = true; }, @@ -960,8 +960,8 @@ describe("runPipeline", () => { onRelease: async () => { expect(lease.held()).toBe(true); await expectRefMissing(repo, temporaryRef); - await expect(store.readPipelineActiveMarker(runId)).resolves.toBeNull(); - await expect(store.readPipelineArtifact(runId, "pipeline-result")) + await expect(store.readPipelineActiveMarker()).resolves.toBeNull(); + await expect(store.readPipelineArtifact("pipeline-result")) .resolves.toMatchObject({ status: "decision-ready" }); releaseObservedLast = true; }, @@ -970,7 +970,7 @@ describe("runPipeline", () => { runId, edit: async checkout => { expect(lease.held()).toBe(true); - await expect(store.readPipelineActiveMarker(runId)).resolves.toMatchObject({ + await expect(store.readPipelineActiveMarker()).resolves.toMatchObject({ sliced: true, }); await writeFile(path.join(checkout, "slice-one.txt"), "slice one candidate\n"); @@ -1147,7 +1147,7 @@ describe("runPipeline", () => { const result = await runPipeline(repo, slicedSpec(), dependencies({ runId, edit: async checkout => { - markerBeforeEdit = await new ArtifactStore(runId).readPipelineActiveMarker(runId); + markerBeforeEdit = await new ArtifactStore(runId).readPipelineActiveMarker(); await writeFile(path.join(checkout, "slice-one.txt"), "slice one candidate\n"); }, roleRunner: async args => { @@ -1190,7 +1190,7 @@ describe("runPipeline", () => { }))).rejects.toThrow("pipeline marker write failed"); expect(editCalled).toBe(false); - await expect(new ArtifactStore(runId).readResult(runId)).resolves.toBeNull(); + await expect(new ArtifactStore(runId).readResult()).resolves.toBeNull(); }); it("advances disjoint slices through private provenance and composed gates", async () => { @@ -1318,16 +1318,16 @@ describe("runPipeline", () => { ...nestedWorktrees, ]).size).toBe(8); - await expect(store.readPipelineArtifact(runId, "slice-1-attempt-0")) + await expect(store.readPipelineArtifact("slice-1-attempt-0")) .resolves.toMatchObject({ sliceIndex: 1, attempt: 0, route: "advance" }); - await expect(store.readPipelineArtifact(runId, "slice-1")) + await expect(store.readPipelineArtifact("slice-1")) .resolves.toMatchObject({ index: 1, route: "advance" }); - await expect(store.readPipelineArtifact(runId, "slice-2-attempt-0")) + await expect(store.readPipelineArtifact("slice-2-attempt-0")) .resolves.toMatchObject({ sliceIndex: 2, attempt: 0, route: "advance" }); - await expect(store.readPipelineArtifact(runId, "slice-2")) + await expect(store.readPipelineArtifact("slice-2")) .resolves.toMatchObject({ index: 2, route: "advance" }); expect(result.attempt.candidate?.candidateCommitOid).toBe(result.finalCandidateCommit); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ candidate: { candidateCommitOid: result.finalCandidateCommit }, }); expect(await runGit(repo, ["rev-parse", result.attempt.candidate!.anchorRef])) @@ -1394,7 +1394,7 @@ describe("runPipeline", () => { expect(messages).toContain("primary composed-review failure"); expect(messages.some(message => message.includes("delete temporary slice ref"))).toBe(true); expect(markerCleanup).not.toHaveBeenCalled(); - await expect(new ArtifactStore(runId).readPipelineActiveMarker(runId)).resolves.toMatchObject({ + await expect(new ArtifactStore(runId).readPipelineActiveMarker()).resolves.toMatchObject({ sliced: true, }); expect(await runGit(repo, ["rev-parse", "--verify", temporarySliceRef])) @@ -1443,13 +1443,13 @@ describe("runPipeline", () => { .rejects.toThrow("delete temporary slice ref"); const store = new ArtifactStore(runId); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ status: "failed", failure: "verification-failure", candidate: expect.any(Object), }); - await expect(store.readPipelineActiveMarker(runId)).resolves.toMatchObject({ sliced: true }); - const archived = await store.readResult(runId); + await expect(store.readPipelineActiveMarker()).resolves.toMatchObject({ sliced: true }); + const archived = await store.readResult(); await expectPipelineAuthorityBlocksTools( repo, runId, @@ -1489,8 +1489,8 @@ describe("runPipeline", () => { const store = new ArtifactStore(runId); expect(promotion).toHaveBeenCalledOnce(); - await expect(store.readPipelineActiveMarker(runId)).resolves.toMatchObject({ sliced: true }); - const archived = await store.readResult(runId); + await expect(store.readPipelineActiveMarker()).resolves.toMatchObject({ sliced: true }); + const archived = await store.readResult(); expect(archived).toMatchObject({ status: "verified-candidate" }); await expectRefMissing(repo, archived!.candidate!.anchorRef); await expectPipelineAuthorityBlocksTools( @@ -1509,12 +1509,12 @@ describe("runPipeline", () => { isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ status: "failed", failure: "verification-failure", candidate: expect.any(Object), }); - await expect(store.readPipelineActiveMarker(runId)).resolves.toBeNull(); + await expect(store.readPipelineActiveMarker()).resolves.toBeNull(); await expectRefMissing(repo, archived!.candidate!.anchorRef); const oldTime = new Date(Date.now() - 60_000); await utimes(store.runDirectory, oldTime, oldTime); @@ -1522,7 +1522,7 @@ describe("runPipeline", () => { maxAgeMs: 1_000, maxBytes: Number.MAX_SAFE_INTEGER, })).resolves.toMatchObject({ removed: [runId] }); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }, 120_000); it("refuses candidate-null archival when the exact run anchor moved", async () => { @@ -1568,9 +1568,9 @@ describe("runPipeline", () => { expect(messages.some(message => message.includes("delete sliced candidate anchor"))).toBe(true); expect(await runGit(repo, ["rev-parse", anchorRef])).toBe(movedOid); const store = new ArtifactStore(runId); - const archived = await store.readResult(runId); + const archived = await store.readResult(); expect(archived).toMatchObject({ status: "verified-candidate" }); - await expect(store.readPipelineActiveMarker(runId)).resolves.toMatchObject({ sliced: true }); + await expect(store.readPipelineActiveMarker()).resolves.toMatchObject({ sliced: true }); await expectPipelineAuthorityBlocksTools( repo, runId, @@ -1628,8 +1628,8 @@ describe("runPipeline", () => { const canonicalOid = await runGit(repo, ["rev-parse", canonicalRef]); expect(await runGit(repo, ["rev-parse", foreignRef])).toBe(canonicalOid); const store = new ArtifactStore(runId); - await expect(store.readResult(runId)).resolves.toMatchObject({ status: "verified-candidate" }); - await expect(store.readPipelineActiveMarker(runId)).resolves.toMatchObject({ sliced: true }); + await expect(store.readResult()).resolves.toMatchObject({ status: "verified-candidate" }); + await expect(store.readPipelineActiveMarker()).resolves.toMatchObject({ sliced: true }); }, 120_000); it("runs independent per-slice reviewers with slice-local evidence and logs", async () => { @@ -1753,13 +1753,13 @@ describe("runPipeline", () => { expect(reviewerCalls).toBe(0); expect(result.attempt.candidate?.candidateCommitOid).not.toBe(result.finalCandidateCommit); const store = new ArtifactStore(runId); - await expect(store.readPipelineArtifact(runId, "slice-1-attempt-0")) + await expect(store.readPipelineArtifact("slice-1-attempt-0")) .resolves.toMatchObject({ route: "repair" }); - await expect(store.readPipelineArtifact(runId, "slice-1-attempt-1")) + await expect(store.readPipelineArtifact("slice-1-attempt-1")) .resolves.toMatchObject({ route: "halt" }); - await expect(store.readPipelineArtifact(runId, "slice-1")) + await expect(store.readPipelineArtifact("slice-1")) .resolves.toMatchObject({ route: "halt" }); - const archived = await store.readResult(runId); + const archived = await store.readResult(); expect(archived).toMatchObject({ status: "failed", failure: "verification-failure", @@ -1846,7 +1846,7 @@ describe("runPipeline", () => { // The promoted partial is a real verified-candidate anchored at the partial // branch, so the human can accept it — the crux of a human-decision halt. const store = new ArtifactStore(runId); - const archivedResult = await store.readResult(runId); + const archivedResult = await store.readResult(); expect(archivedResult).toMatchObject({ status: "verified-candidate", failure: null, @@ -1898,7 +1898,7 @@ describe("runPipeline", () => { }, }); const store = new ArtifactStore(runId); - await expect(store.readResult(runId)).resolves.toEqual(result.attempt); + await expect(store.readResult()).resolves.toEqual(result.attempt); await expectRefMissing(repo, `refs/claude-architect/candidates/${runId}`); await expect(readFile( path.join(store.runDirectory, "pipeline-active.json"), @@ -1969,7 +1969,7 @@ describe("runPipeline", () => { candidate: null, }, }); - await expect(new ArtifactStore(runId).readResult(runId)).resolves.toEqual(result.attempt); + await expect(new ArtifactStore(runId).readResult()).resolves.toEqual(result.attempt); await expectRefMissing(repo, `refs/claude-architect/candidates/${runId}`); }, 120_000); @@ -2026,10 +2026,10 @@ describe("runPipeline", () => { // Salvage is only worth anything if the trusted accept path can load these // bytes: the archived result — not the in-memory one — is what it reads. - const archived = await new ArtifactStore(runId).readResult(runId); + const archived = await new ArtifactStore(runId).readResult(); expect(archived).toMatchObject({ status: "verified-candidate", failure: null }); expect(archived?.candidate?.candidateCommitOid).toBe(result.finalCandidateCommit); - const archivedManifest = await new ArtifactStore(runId).readManifest(runId); + const archivedManifest = await new ArtifactStore(runId).readManifest(); expect(archivedManifest?.candidateManifestHash).toBe(archived?.candidate?.manifestHash); expect(archived?.evidence.pipelineReviewIncomplete).toMatchObject({ failure: "producer-failure", @@ -2085,7 +2085,7 @@ describe("runPipeline", () => { .rejects.toThrow("final verification infrastructure failed"); const store = new ArtifactStore(runId); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ status: "failed", failure: "verification-failure", candidate: expect.any(Object), @@ -2185,7 +2185,7 @@ describe("runPipeline", () => { }); expect(reviewedDiff).toContain("increment complete"); const store = new ArtifactStore("pipeline-increment-complete"); - await expect(store.readPipelineArtifact("pipeline-increment-complete", "increment-2")) + await expect(store.readPipelineArtifact("increment-2")) .resolves.toMatchObject({ status: "complete", summary: "completed with [s]" }); expect(delegatePipelineOutput.parse({ ok: true, result })).toMatchObject({ result: { increments: [{ increment: 2, report: { status: "complete" } }] }, @@ -2303,9 +2303,9 @@ describe("runPipeline", () => { reasons: ["increment loop ended 'stalled' without completion"], }); const store = new ArtifactStore("pipeline-increment-stalled"); - await expect(store.readPipelineArtifact("pipeline-increment-stalled", "increment-2")) + await expect(store.readPipelineArtifact("increment-2")) .resolves.toMatchObject({ summary: "increment 1" }); - await expect(store.readPipelineArtifact("pipeline-increment-stalled", "increment-3")) + await expect(store.readPipelineArtifact("increment-3")) .resolves.toMatchObject({ summary: "increment 2" }); }, 120_000); @@ -2633,7 +2633,7 @@ describe("runPipeline", () => { ); const store = new ArtifactStore(runId); - const archived = await store.readPipelineArtifact(runId, "increment-2"); + const archived = await store.readPipelineArtifact("increment-2"); expect(archived?.summary).not.toContain(secret); expect(archived?.summary).toContain("[s]"); expect(incrementThreeProgress).not.toContain(secret); @@ -2738,7 +2738,7 @@ describe("runPipeline", () => { expect(recovery).toEqual({ recovered: [], quarantined: [] }); expect(terminated).toEqual([]); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ status: "verified-candidate", }); const anchor = await git(repo, [ @@ -2749,7 +2749,7 @@ describe("runPipeline", () => { ]); expect(anchor.exitCode, anchor.stderr).toBe(0); expect(anchor.stdout.trim()).toBe(candidateCommit); - await expect(store.readPipelineArtifact(runId, "increment-2")) + await expect(store.readPipelineArtifact("increment-2")) .resolves.toMatchObject({ summary: "increment two" }); }, 120_000); @@ -2792,7 +2792,7 @@ describe("runPipeline", () => { "logs/role-reviewer-correctness-round1.log", "logs/role-reviewer-systems-round1.log", ]); - await expect(store.readPipelineArtifact(runId, "delegation-spec")).resolves.toEqual(spec); + await expect(store.readPipelineArtifact("delegation-spec")).resolves.toEqual(spec); await expect(readFile( path.join(store.runDirectory, "logs", "role-reviewer-correctness-round1.log"), "utf8", @@ -3560,13 +3560,13 @@ describe("runPipeline", () => { expect(result.verification?.evidence).not.toHaveProperty("authorizedTestDeletions"); const store = new ArtifactStore(runId); - await expect(store.readPipelineArtifact(runId, "round-1-review-correctness")) + await expect(store.readPipelineArtifact("round-1-review-correctness")) .resolves.toEqual(approve); - await expect(store.readPipelineArtifact(runId, "round-1-review-systems")) + await expect(store.readPipelineArtifact("round-1-review-systems")) .resolves.toEqual(approve); - await expect(store.readPipelineArtifact(runId, "round-1-consolidated")) + await expect(store.readPipelineArtifact("round-1-consolidated")) .resolves.toMatchObject({ findings: [] }); - const persistedVerification = await store.readPipelineArtifact(runId, "verification"); + const persistedVerification = await store.readPipelineArtifact("verification"); expect(persistedVerification.evidence).not.toHaveProperty("authorizedTestDeletions"); expect(persistedVerification) .toMatchObject({ @@ -3588,7 +3588,7 @@ describe("runPipeline", () => { path.join(store.runDirectory, "logs", "pipeline-verification-0-stderr.log"), "utf8", )).resolves.toBe(""); - await expect(store.readPipelineArtifact(runId, "pipeline-result")) + await expect(store.readPipelineArtifact("pipeline-result")) .resolves.toMatchObject({ status: "decision-ready", runId }); }); diff --git a/tests/runtime/pipeline/advisor-stage.test.ts b/tests/runtime/pipeline/advisor-stage.test.ts index 98c60b9..45668f6 100644 --- a/tests/runtime/pipeline/advisor-stage.test.ts +++ b/tests/runtime/pipeline/advisor-stage.test.ts @@ -35,7 +35,7 @@ describe("runAdvisorStage", () => { const roleCalls: RoleRunArgs[] = []; const persisted: unknown[] = []; const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? spec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, @@ -115,7 +115,7 @@ describe("runAdvisorStage", () => { }]; let capturedHistory: unknown; const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? spec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, @@ -161,7 +161,7 @@ describe("runAdvisorStage", () => { const spec = autopilotSpec(); let persisted: Parameters[0] | null = null; const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? spec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, @@ -204,7 +204,7 @@ describe("runAdvisorStage", () => { let persisted: Parameters[0] | null = null; let failureLog: { name: string; text: string } | null = null; const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? spec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, @@ -250,7 +250,7 @@ describe("runAdvisorStage", () => { const snapshot = reviewSnapshot(); const spec = autopilotSpec(); const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? spec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, @@ -308,7 +308,7 @@ describe("runAdvisorStage", () => { detail: null, }); const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? archivedSpec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(reviewSnapshot()); }, @@ -325,7 +325,7 @@ describe("runAdvisorStage", () => { store, })).rejects.toThrow(/differs from the durable archived specification/u); - await expect(statusStore.readRunStatus(pipeline.runId)) + await expect(statusStore.readRunStatus()) .resolves.toMatchObject({ phase: "failed", role: "advisor" }); }); @@ -334,7 +334,7 @@ describe("runAdvisorStage", () => { const snapshot = reviewSnapshot(); const archivedSpec = autopilotSpec(); const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? archivedSpec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, @@ -359,7 +359,7 @@ describe("runAdvisorStage", () => { let launched = false; let persisted: Parameters[0] | null = null; const store: AdvisorStageStore = { - async readPipelineArtifact(_runId: string, name: string) { + async readPipelineArtifact(name: string) { return structuredClone(name === "delegation-spec" ? spec : pipeline) as T; }, async readReviewSnapshot() { return structuredClone(snapshot); }, diff --git a/tests/runtime/recovery-manager.test.ts b/tests/runtime/recovery-manager.test.ts index 8636459..55acc14 100644 --- a/tests/runtime/recovery-manager.test.ts +++ b/tests/runtime/recovery-manager.test.ts @@ -301,7 +301,7 @@ describe("recoverStaleRuns", () => { }], }); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); await expect(access(worktree.path)).resolves.toBeUndefined(); expect(await runGit(repo.directory, ["rev-parse", anchorRef])).toBe(repo.head); await expect(readFile(recoveryLockPath, "utf8")) @@ -349,7 +349,7 @@ describe("recoverStaleRuns", () => { await expect(readFile(recoveryLockPath)).resolves.toEqual(lockBytes); await expect(access(worktree.path)).resolves.toBeUndefined(); expect(await runGit(repo.directory, ["rev-parse", anchorRef])).toBe(repo.head); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }, 120_000); // POSIX-only: the release failure is forced by rm-ing the locks directory while @@ -415,7 +415,7 @@ describe("recoverStaleRuns", () => { isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); - await expect(store.readResult(runId)) + await expect(store.readResult()) .resolves.toMatchObject({ status: "cancelled" }); await expectMissing(recoveryLockPath); }, 120_000); @@ -461,7 +461,7 @@ describe("recoverStaleRuns", () => { await expect(readFile(aliasPath)).resolves.toEqual(lockBytes); await expect(access(worktree.path)).resolves.toBeUndefined(); expect(await runGit(repo.directory, ["rev-parse", anchorRef])).toBe(repo.head); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }, 120_000); it("defers recovery when checkout ownership becomes live before mutation", async () => { @@ -493,7 +493,7 @@ describe("recoverStaleRuns", () => { })).resolves.toEqual({ recovered: [], quarantined: [] }); expect(ownerChecks).toBeGreaterThanOrEqual(2); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); await expect(readFile(lockPath, "utf8")).resolves.toBe(lockBytes); }, 120_000); @@ -949,7 +949,7 @@ describe("recoverStaleRuns", () => { .not.toBe(0); expect(await readFile(path.join(store.runDirectory, "logs", "recovery.log"), "utf8")) .toBe("startup recovery reclaimed unfinished run\n"); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ runId, status: "cancelled", failure: "cancelled", @@ -1002,7 +1002,7 @@ describe("recoverStaleRuns", () => { expect(result).toEqual({ recovered: [runId], quarantined: [] }); expect(calls).toEqual([]); await expectMissing(worktree.path); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ runId, status: "cancelled", evidence: { recovery: "startup-stale-run" }, @@ -1077,7 +1077,7 @@ describe("recoverStaleRuns", () => { await expect(lstat(worktree.path)).resolves.toBeDefined(); expect((await git(repo.directory, ["rev-parse", "--verify", "--quiet", anchorRef])).exitCode) .toBe(0); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }); it("preserves a checkout lock whose recorded owner pid is still alive", async () => { @@ -1134,7 +1134,7 @@ describe("recoverStaleRuns", () => { await expect(access(worktree.path)).resolves.toBeUndefined(); expect(await runGit(repo.directory, ["rev-parse", anchorRef])).toBe(repo.head); await expect(readFile(lockPath, "utf8")).resolves.toBe(lockBytes); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }); it("defers recovery when the checkout lock owner is empty", async () => { @@ -1155,7 +1155,7 @@ describe("recoverStaleRuns", () => { await expect(recoverStaleRuns()).resolves.toEqual({ recovered: [], quarantined: [] }); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); await expect(access(worktree.path)).resolves.toBeUndefined(); expect(await runGit(repo.directory, ["rev-parse", anchorRef])).toBe(repo.head); await expect(readFile(lockPath, "utf8")).resolves.toBe(""); @@ -1288,7 +1288,7 @@ describe("recoverStaleRuns", () => { quarantined: [poisonedRunId], }); - await expect(healthyStore.readResult(healthyRunId)) + await expect(healthyStore.readResult()) .resolves.toMatchObject({ status: "cancelled" }); await expectQuarantinedRun(poisonedRunId, poisonedStore.runDirectory, [missingCommonDir]); }, 120_000); @@ -1706,7 +1706,7 @@ describe("recoverStaleRuns", () => { expect(terminate).not.toHaveBeenCalled(); await expect(lstat(pipelineWorktree.path)).resolves.toBeDefined(); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }); it("preserves a live run whose process token cannot be verified", async () => { @@ -1727,7 +1727,7 @@ describe("recoverStaleRuns", () => { })).resolves.toEqual({ recovered: [], quarantined: [] }); expect(terminate).not.toHaveBeenCalled(); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); }); it("reclaims token-mismatched live locks and preserves matching live locks", async () => { @@ -1799,8 +1799,8 @@ describe("recoverStaleRuns", () => { await expect(readFile(livePath, "utf8")).resolves.toBe("8002"); await expect(readFile(nullTokenPath, "utf8")) .resolves.toBe(JSON.stringify({ pid: 8003, processToken: null })); - await expect(blockedStore.readResult(blockedRunId)).resolves.toBeNull(); - await expect(healthyStore.readResult(healthyRunId)).resolves.toMatchObject({ + await expect(blockedStore.readResult()).resolves.toBeNull(); + await expect(healthyStore.readResult()).resolves.toMatchObject({ status: "cancelled", }); expect(warn.mock.calls).toEqual(expect.arrayContaining([ @@ -1838,7 +1838,7 @@ describe("recoverStaleRuns", () => { isProcessAlive: () => false, })).resolves.toEqual({ recovered: [runId], quarantined: [] }); - await expect(store.readResult(runId)).resolves.toMatchObject({ status: "cancelled" }); + await expect(store.readResult()).resolves.toMatchObject({ status: "cancelled" }); }); it("rejects a malformed complete cleanup record before torn-tail deferral", async () => { @@ -1908,7 +1908,7 @@ describe("recoverStaleRuns", () => { expect(recoveryResult).toEqual({ recovered: [runId], quarantined: [] }); expect(warnCalls).toEqual([]); - await expect(store.readResult(runId)).resolves.toMatchObject({ status: "cancelled" }); + await expect(store.readResult()).resolves.toMatchObject({ status: "cancelled" }); }); it("finishes an interrupted prune after the archive was quarantined", async () => { @@ -2236,7 +2236,7 @@ describe("recoverStaleRuns", () => { isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ status: "failed", failure: "verification-failure", candidate: expect.any(Object), @@ -2269,7 +2269,7 @@ describe("recoverStaleRuns", () => { isProcessAlive: () => false, })).resolves.toEqual({ recovered: [], quarantined: [] }); - await expect(store.readResult(runId)).resolves.toMatchObject({ + await expect(store.readResult()).resolves.toMatchObject({ status: "verified-candidate", failure: null, }); @@ -2391,7 +2391,7 @@ describe("recoverStaleRuns", () => { expect((await git(repo.directory, ["rev-parse", "--verify", "--quiet", ref])).exitCode) .not.toBe(0); } - await expect(store.readResult(runId)).resolves.toMatchObject({ status: "cancelled" }); + await expect(store.readResult()).resolves.toMatchObject({ status: "cancelled" }); await expect(recoverStaleRuns({ platformServices: platformServicesDouble({ os: "darwin", diff --git a/tests/runtime/review-snapshot.test.ts b/tests/runtime/review-snapshot.test.ts index 1e5b6e0..281a03f 100644 --- a/tests/runtime/review-snapshot.test.ts +++ b/tests/runtime/review-snapshot.test.ts @@ -201,7 +201,7 @@ describe("review snapshots", () => { ...snapshot, evidence: { nested: { x: 3, y: 2 }, z: 1 }, }); - await expect(store.readReviewSnapshot(runId)).resolves.toEqual(snapshot); + await expect(store.readReviewSnapshot()).resolves.toEqual(snapshot); await expect(store.writeReviewSnapshot({ ...snapshot, diff --git a/tests/runtime/run-decision.test.ts b/tests/runtime/run-decision.test.ts index 664809e..7ef957d 100644 --- a/tests/runtime/run-decision.test.ts +++ b/tests/runtime/run-decision.test.ts @@ -112,11 +112,11 @@ function createMockStore(runId: string, overrides: Partial = { let decision: CandidateDecisionV2 | null = null; return { - readResult: async (id: string) => (id === runId ? result : null), - readManifest: async (id: string) => (id === runId ? manifest : null), - readReviewSnapshot: async (id: string) => (id === runId ? snapshot : null), - readPipelineGateCleared: async (id: string) => (id === runId ? gateCleared : null), - readCandidateDecision: async (id: string) => (id === runId ? decision : null), + readResult: async () => result, + readManifest: async () => manifest, + readReviewSnapshot: async () => snapshot, + readPipelineGateCleared: async () => gateCleared, + readCandidateDecision: async () => decision, ...overrides, }; } diff --git a/tests/runtime/run-status.test.ts b/tests/runtime/run-status.test.ts index 530322c..6d251eb 100644 --- a/tests/runtime/run-status.test.ts +++ b/tests/runtime/run-status.test.ts @@ -481,7 +481,7 @@ describe("trusted run status", () => { runId: "status-redacted", detail: `status-secret-value ${"x".repeat(250)}`, }); - const persisted = await store.readRunStatus("status-redacted"); + const persisted = await store.readRunStatus(); expect(persisted?.detail).not.toContain("status-secret-value"); expect(persisted?.detail?.length).toBeLessThanOrEqual(200); await expect(store.writeRunStatus({ ...base, runId: "status-redacted", phase: "unknown" as RunStatus["phase"] })) @@ -624,13 +624,13 @@ describe("trusted run status", () => { }); const stale = new Date(Date.now() - 16 * 60 * 1000).toISOString(); await store.writeRunStatus({ - ...(await store.readRunStatus("statusline-live"))!, + ...(await store.readRunStatus())!, updatedAt: stale, }); await expect(run()).resolves.toBe(""); await store.writeRunStatus({ - ...(await store.readRunStatus("statusline-live"))!, + ...(await store.readRunStatus())!, updatedAt: now, }); await store.writePipelineActiveMarker({ @@ -686,7 +686,7 @@ describe("trusted run status", () => { // Durable transition 1: implementing await emitter.transition("implementing", { role: "implementer", producerId: "codex" }); expect(writeCount).toBe(1); - expect((await store.readRunStatus("status-emitter-test"))?.phase).toBe("implementing"); + expect((await store.readRunStatus())?.phase).toBe("implementing"); // Ephemeral progress reports do NOT perform durable disk writes await emitter.ephemeral("running tests: 1/5 passed"); @@ -702,7 +702,7 @@ describe("trusted run status", () => { // Durable transition 2: verifying await emitter.transition("verifying"); expect(writeCount).toBe(2); - expect((await store.readRunStatus("status-emitter-test"))?.phase).toBe("verifying"); + expect((await store.readRunStatus())?.phase).toBe("verifying"); // Ephemeral progress await emitter.ephemeral("verifying candidate tree"); @@ -712,6 +712,6 @@ describe("trusted run status", () => { // Durable transition 3: done await emitter.transition("done"); expect(writeCount).toBe(3); - expect((await store.readRunStatus("status-emitter-test"))?.phase).toBe("done"); + expect((await store.readRunStatus())?.phase).toBe("done"); }); }); diff --git a/tests/runtime/tools.test.ts b/tests/runtime/tools.test.ts index 73661d2..02f2279 100644 --- a/tests/runtime/tools.test.ts +++ b/tests/runtime/tools.test.ts @@ -1008,7 +1008,7 @@ describe("MCP tool handlers", () => { await expect(handleDecideCandidate(repoRoot, "run-tools", "accepted", candidate.manifestHash, deps)) .resolves.toEqual({ recorded: true }); - const recorded = await store.readCandidateDecision("run-tools"); + const recorded = await store.readCandidateDecision(); expect(recorded).toMatchObject({ decision: "accepted", authority: "caller-asserted", @@ -1026,7 +1026,7 @@ describe("MCP tool handlers", () => { await handleDecideCandidate(repoRoot, "run-tools", "accepted", candidate.manifestHash, deps); - expect(await store.readCandidateDecision("run-tools")) + expect(await store.readCandidateDecision()) .toMatchObject({ authority: "human" }); }); diff --git a/tests/runtime/worktree-sweep.test.ts b/tests/runtime/worktree-sweep.test.ts index c4261e4..f42141d 100644 --- a/tests/runtime/worktree-sweep.test.ts +++ b/tests/runtime/worktree-sweep.test.ts @@ -963,7 +963,7 @@ describe("startup worktree sweep", () => { }], }); await expect(access(worktree.path)).resolves.toBeUndefined(); - await expect(store.readResult(runId)).resolves.toBeNull(); + await expect(store.readResult()).resolves.toBeNull(); } finally { await rm(manifestPath, { force: true }); try { await recoverStaleRuns({ isProcessAlive: () => false }); } catch { /* fixture cleanup */ } @@ -1138,7 +1138,7 @@ describe("startup worktree sweep", () => { await expect(access(protectedWorktree.path)).resolves.toBeUndefined(); await expect(access(staleWorktree.path)).rejects.toMatchObject({ code: "ENOENT" }); - await expect(protectedStore.readPipelineActiveMarker("run-repair")).resolves.not.toBeNull(); + await expect(protectedStore.readPipelineActiveMarker()).resolves.not.toBeNull(); }); it("claims a run missing its start record and preserves its worktree", async () => { From d5b530f2779c754e718c015c7ab579b5d2634985 Mon Sep 17 00:00:00 2001 From: elkaix Date: Thu, 24 Sep 2026 21:04:06 -0400 Subject: [PATCH 12/12] Harden and simplify delegation, Autopilot, and recovery Apply the principal review: close trust gaps, cut the Autopilot shipping half, and remove duplicated or dead machinery. - Protocol 2.0.0 -> 3.0.0: autopilotStart drops pullRequest; Autopilot spec/state v2 and Final Branch Report v2 (status ready-for-human-review). Older versions are refused with explicit diagnostics. - Autopilot ends at a final-reviewed local branch handed to the delivery gate; promotions carry the user's Git identity; one state machine owns resume and cleanup; the remote is read only at create; it refuses to run under the human decision authority. - Managed worktrees live under /.worktrees/claude-architect/. - Opt-in Jev screen can only withdraw autonomous acceptance. - Integration refuses acceptances without an artifact hash. - Split recovery-manager.ts (3,880 lines) into one module per concern; declarations moved verbatim. - Shared error, directory-flush, identity, and Git helpers replace copies. - CI pins every action to a commit and the Claude Code CLI to a version. - Tests: per-file isolated state dir, serialized worktree cleanups, and explicit e2e budgets remove cross-file flakiness. --- .github/workflows/ci.yml | 18 +- .github/workflows/codeql.yml | 6 +- AGENTS.md | 8 +- CHANGELOG.md | 39 + README.md | 5 +- docs/ARCHITECTURE.md | 4 +- docs/PLUGIN_COMPONENTS.md | 2 +- docs/PRIVACY.md | 4 +- docs/SECURITY_MODEL.md | 6 +- docs/THREAT_MODEL.md | 2 +- docs/autopilot-terminal-states.md | 10 +- docs/decision-authority.md | 2 +- runtime/bootstrap.mjs | 4 +- ...ot-spec.v1.json => autopilot-spec.v2.json} | 45 +- .../schemas/autopilot-workflow-state.v1.json | 257 - .../schemas/autopilot-workflow-state.v2.json | 344 + runtime/schemas/delegation-spec.v1.json | 19 + ...rt.v1.json => final-branch-report.v2.json} | 4 +- runtime/server.mjs | 9463 ++++++++--------- runtime/watchdog.mjs | 41 +- skills/delegate/SKILL.md | 23 +- skills/subagent-driven-delegation/SKILL.md | 2 +- src/autopilot/autopilot-controller.ts | 707 +- src/autopilot/autopilot-eligibility.ts | 232 +- src/autopilot/branch-manager.ts | 116 +- src/autopilot/candidate-promoter.ts | 47 +- src/autopilot/final-branch-reviewer.ts | 204 +- src/autopilot/types.ts | 25 +- src/autopilot/workflow-store.ts | 237 +- src/git/candidate-tree.ts | 53 +- src/git/checked-git.ts | 69 + src/git/git-exec.ts | 171 +- src/git/repo-preconditions.ts | 6 +- src/git/worktree-registration.ts | 8 +- src/integrate/controlled-integrator.ts | 31 +- src/mcp/allowlist-sufficiency.ts | 4 +- src/mcp/decision-authority.ts | 32 - src/mcp/doctor.ts | 26 +- src/mcp/jev-screen.ts | 95 + src/mcp/server.ts | 38 +- src/mcp/tools.ts | 105 +- src/pipeline/advisor-stage.ts | 5 +- src/pipeline/candidate-provenance.ts | 17 +- src/pipeline/candidate-verifier.ts | 100 +- src/pipeline/gates.ts | 7 +- src/pipeline/pipeline-roles.ts | 2 +- src/pipeline/pipeline-runtime.ts | 585 +- src/pipeline/role-runner.ts | 12 - src/pipeline/slice-runner.ts | 28 +- src/platform/bound-directory-cleanup.ts | 74 +- src/platform/durable-directory.ts | 31 +- src/platform/durable-write.ts | 7 + src/platform/lock-ownership.ts | 43 +- src/platform/platform-safety.ts | 35 +- src/platform/posix-platform-services.ts | 8 +- src/platform/sandbox/seatbelt.ts | 55 +- src/producers/claude-adapter.ts | 2 +- src/producers/codex-adapter.ts | 1 - src/producers/plain-text.ts | 1 - src/protocol/autopilot-spec.ts | 12 +- src/protocol/schema-loader.ts | 4 +- src/protocol/spec-validator.ts | 10 + src/protocol/versions.ts | 4 +- src/runtime/artifact-store.ts | 55 +- src/runtime/attempt-runtime.ts | 25 +- src/runtime/environment-policy.ts | 15 + src/runtime/managed-worktree-root.ts | 212 + src/runtime/recovery-autopilot.ts | 515 + src/runtime/recovery-manager.ts | 3539 +----- src/runtime/recovery-prune-journal.ts | 534 + src/runtime/recovery-quarantine.ts | 513 + src/runtime/recovery-runs.ts | 341 + src/runtime/recovery-shared.ts | 306 + src/runtime/recovery-worktree-removals.ts | 899 ++ src/runtime/recovery-worktree-sweep.ts | 449 + src/runtime/reproducibility.ts | 4 +- src/runtime/review-snapshot.ts | 20 +- src/runtime/run-decision.ts | 56 +- src/runtime/run-start.ts | 23 +- src/runtime/run-status.ts | 3 - src/runtime/worktree-manager.ts | 107 +- src/runtime/worktree-removal-manifest.ts | 8 +- src/ship/github-cli-adapter.ts | 1112 -- src/ship/hosting-adapter.ts | 79 - src/util/errors.ts | 17 +- src/verify/baseline-verifier.ts | 6 +- src/verify/dependency-link.ts | 27 +- src/verify/project-verifier.ts | 81 +- src/verify/structural-verifier.ts | 21 +- src/verify/verification-inputs.ts | 43 + tests/README.md | 14 +- tests/runtime/artifact-store-bytes.test.ts | 2 +- tests/runtime/artifact-store.test.ts | 25 +- .../autopilot/autopilot-adversarial.test.ts | 200 +- .../autopilot/autopilot-controller.test.ts | 772 +- .../autopilot/autopilot-doctor.test.ts | 59 +- tests/runtime/autopilot/autopilot-e2e.test.ts | 94 +- tests/runtime/autopilot/autopilot-mcp.test.ts | 40 +- .../autopilot-recovery-cutpoints.test.ts | 145 +- .../autopilot/autopilot-recovery.test.ts | 99 +- .../autopilot/autopilot-windows.test.ts | 58 +- .../runtime/autopilot/branch-manager.test.ts | 116 +- .../autopilot/candidate-promoter.test.ts | 88 +- .../autopilot/final-branch-reviewer.test.ts | 82 +- .../autopilot/workflow-state-schema.test.ts | 38 +- .../runtime/autopilot/workflow-store.test.ts | 82 +- tests/runtime/bootstrap.smoke.test.ts | 22 + tests/runtime/candidate-tree.test.ts | 8 +- tests/runtime/checked-git.test.ts | 73 + tests/runtime/decision-authority.test.ts | 118 +- tests/runtime/dependency-link.test.ts | 2 +- tests/runtime/doctor.test.ts | 19 + tests/runtime/durable-write.test.ts | 19 +- tests/runtime/e2e-pipeline.test.ts | 37 +- tests/runtime/environment-policy.test.ts | 22 + tests/runtime/gates.test.ts | 7 +- tests/runtime/git-exec.test.ts | 161 +- tests/runtime/handshake.smoke.test.ts | 6 +- tests/runtime/jev-screen.test.ts | 65 + tests/runtime/lock-contention.test.ts | 9 + tests/runtime/mcp-decision-gate.test.ts | 27 + tests/runtime/mcp-input-schema.test.ts | 8 +- tests/runtime/pipeline-runtime.test.ts | 71 +- .../pipeline/autopilot-eligibility.test.ts | 124 +- tests/runtime/platform-safety.test.ts | 55 + tests/runtime/plugin-wiring.test.mjs | 30 +- tests/runtime/project-verifier.test.ts | 88 +- .../runtime/protocol/autopilot-schema.test.ts | 44 +- tests/runtime/recovery-manager.test.ts | 2 +- tests/runtime/review-manifest-echo.test.ts | 2 +- tests/runtime/review-snapshot.test.ts | 2 +- tests/runtime/run-decision.test.ts | 29 + tests/runtime/run-manifest.test.ts | 6 +- tests/runtime/schema-loader.test.ts | 8 +- .../github-cli-adapter-red-paths.test.ts | 848 -- .../shipping/github-cli-adapter.test.ts | 1047 -- tests/runtime/spec-validator.test.ts | 11 + tests/runtime/tools.test.ts | 26 +- tests/runtime/watchdog.test.ts | 24 +- tests/runtime/worktree-manager.test.ts | 163 +- .../runtime/worktree-removal-manifest.test.ts | 6 +- tests/runtime/worktree-sweep.test.ts | 57 +- tests/support/isolated-state-dir.ts | 17 + tsconfig.json | 1 + vitest.config.ts | 1 + 145 files changed, 11766 insertions(+), 15980 deletions(-) rename runtime/schemas/{autopilot-spec.v1.json => autopilot-spec.v2.json} (61%) delete mode 100644 runtime/schemas/autopilot-workflow-state.v1.json create mode 100644 runtime/schemas/autopilot-workflow-state.v2.json rename runtime/schemas/{final-branch-report.v1.json => final-branch-report.v2.json} (91%) create mode 100644 src/git/checked-git.ts create mode 100644 src/mcp/jev-screen.ts create mode 100644 src/runtime/managed-worktree-root.ts create mode 100644 src/runtime/recovery-autopilot.ts create mode 100644 src/runtime/recovery-prune-journal.ts create mode 100644 src/runtime/recovery-quarantine.ts create mode 100644 src/runtime/recovery-runs.ts create mode 100644 src/runtime/recovery-shared.ts create mode 100644 src/runtime/recovery-worktree-removals.ts create mode 100644 src/runtime/recovery-worktree-sweep.ts delete mode 100644 src/ship/github-cli-adapter.ts delete mode 100644 src/ship/hosting-adapter.ts create mode 100644 src/verify/verification-inputs.ts create mode 100644 tests/runtime/checked-git.test.ts create mode 100644 tests/runtime/jev-screen.test.ts create mode 100644 tests/runtime/platform-safety.test.ts delete mode 100644 tests/runtime/shipping/github-cli-adapter-red-paths.test.ts delete mode 100644 tests/runtime/shipping/github-cli-adapter.test.ts create mode 100644 tests/support/isolated-state-dir.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27d68b1..0491fb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,15 +10,15 @@ jobs: os: [macos-15, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v7 - - uses: actions/setup-node@v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: { node-version: 22 } - run: node scripts/verify-native-helpers.mjs - if: runner.os == 'Windows' - uses: mlugg/setup-zig@v2 + uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1 with: { version: 0.15.2 } - if: runner.os == 'Windows' - uses: ilammy/msvc-dev-cmd@v1 + uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 # Build the Job Object helper so the win32-gated suites exercise the # real fail-closed spawn path; the committed binary ships separately. - if: runner.os == 'Windows' @@ -36,11 +36,11 @@ jobs: # validate-release runs `claude plugin validate`; the CLI is not on # hosted runners, so install it for the POSIX legs. - if: runner.os != 'Windows' - run: npm install -g @anthropic-ai/claude-code + run: npm install -g @anthropic-ai/claude-code@2.1.282 - if: runner.os != 'Windows' run: bash scripts/validate-release.sh - if: runner.os == 'Windows' - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: win32-job-kill-x64 path: native/bin/win32-job-kill-x64.exe @@ -49,11 +49,11 @@ jobs: windows-arm64-filesystem: runs-on: windows-11-arm steps: - - uses: actions/checkout@v7 - - uses: actions/setup-node@v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: { node-version: 22 } - run: node scripts/verify-native-helpers.mjs - - uses: mlugg/setup-zig@v2 + - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1 with: { version: 0.15.2 } - shell: cmd run: | diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a40b904..c0f6cca 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -18,8 +18,8 @@ jobs: analyze: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v7 - - uses: github/codeql-action/init@v4.37.7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7 with: languages: javascript-typescript - - uses: github/codeql-action/analyze@v4.37.7 + - uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7 diff --git a/AGENTS.md b/AGENTS.md index 624f61e..1e18e16 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -57,7 +57,7 @@ Before invoking **dynamic workflows**, **ultra code**, or any equivalent harness - Read-only roles cannot mutate files, Git state, processes, or external systems. - Roles communicate through versioned specs, manifests, patches, findings, and other durable artifacts—not hidden conversational state. - Verification is objective, recorded, and rerunnable; Producer claims are never evidence. -- Candidate acceptance is governed by a configured decision authority, and the provenance of every decision is recorded (`human-elicitation`, `policy-autonomous`, or `caller-asserted`). The shipped default (`CLAUDE_ARCHITECT_DECISION_AUTHORITY` unset, or `autonomous`) records a decision without prompting **only** for an independently verified candidate carrying no failure, no advisory warnings, and a readable archive; every other case still requires a human through MCP elicitation and fails closed without it. `human` requires confirmation for every decision. Integration refuses any acceptance whose provenance is unknown (`caller-asserted`, or absent on a pre-provenance archive). Do not "restore" unconditional human acceptance — the autonomous default is deliberate, so a delegation does not stop to ask permission on the path where the runtime has already proven everything it can prove. Human control is retained where it is load-bearing: verification gates what may be accepted at all, and integration still refuses a moved `HEAD`, a dirty tree, or a hash that does not match the reviewed artifact. +- Candidate acceptance is governed by a configured decision authority, and the provenance of every decision is recorded (`human-elicitation`, `policy-autonomous`, or `caller-asserted`). The shipped default (`CLAUDE_ARCHITECT_DECISION_AUTHORITY` unset, or `autonomous`) records a decision without prompting **only** for an independently verified candidate whose project verification ran under an OS confinement backend, carrying no failure, no advisory warnings, and a readable archive; a plain `delegate` candidate that changes verification inputs (tests, test or build configuration, dependency manifests) also needs a person, because its verification can no longer prove anything about it. Off macOS no OS backend exists, so every decision there requires a human. Every other case still requires a human through MCP elicitation and fails closed without it. The opt-in Jev screen (`CLAUDE_ARCHITECT_JEV=on` with `TYPESAFE_API_KEY`) can only withdraw autonomy, never grant it; an outage leaves the deterministic verdict unchanged. `human` requires confirmation for every decision, and Autopilot, whose promotions record `autopilot-policy` provenance, refuses to start or promote under it. Integration refuses any acceptance that does not name the exact artifact it is spent on, and any acceptance whose provenance is unknown (`caller-asserted`, or absent on a pre-provenance archive). Do not "restore" unconditional human acceptance — the autonomous default is deliberate, so a delegation does not stop to ask permission on the path where the runtime has already proven everything it can prove. Human control is retained where it is load-bearing: verification gates what may be accepted at all, and integration still refuses a moved `HEAD`, a dirty tree, or a hash that does not match the reviewed artifact. - Workflow state, decisions, evidence, and recovery data remain durable across process failure. - Final review covers the entire candidate branch and cumulative interactions across attempts, not only the latest patch. @@ -79,7 +79,7 @@ Do not collapse these boundaries to simplify a test. Generated `runtime/` output Treat every external agent as an untrusted Producer. - Give each Producer only the bounded spec and capabilities required for one attempt. -- Isolate concurrent writers in separate worktrees. +- Isolate concurrent writers in separate worktrees. Managed worktrees live only under `
/.worktrees/claude-architect/`, a self-ignoring namespace the runtime owns; `.worktrees/` itself stays the user's. Every pipeline writer, including each fixer, starts in a fresh worktree at the current candidate. - Prevent nested delegation and sanitize inherited configuration. - Terminate complete process trees on cancellation or timeout. - If confinement or eligibility cannot be proven, make the edit lane unavailable. Never fall back to a less isolated path. @@ -195,7 +195,7 @@ Agents must not change Git configuration unless the user explicitly requests it. ## No Mistakes delivery gate -Use No Mistakes as the default delivery path for non-release feature branches produced through manual implementation or SDD. Release commits and tags remain governed by the release rules above. Claude Architect Autopilot is a separate trusted delivery controller and follows its own lifecycle. +Use No Mistakes as the default delivery path for non-release feature branches produced through manual implementation or SDD. Release commits and tags remain governed by the release rules above. Claude Architect Autopilot ends at a final-reviewed local branch; it never pushes, opens a PR, or polls checks. That branch is handed to No Mistakes like any other feature branch. - Do not initialize or launch the gate implicitly. Run `no-mistakes init` only on explicit user request because it changes clone-local Git wiring and installs or refreshes user-level agent skills. A user invocation of `/no-mistakes` is explicit approval for that run. - After manual SDD's cumulative final review, require the feature branch to be committed and clean, then obtain explicit approval for bare `/no-mistakes` validate-only mode. Do not use the generic `superpowers:finishing-a-development-branch` merge/push path while this gate applies. Preserve the SDD ledger and branch workspace until the gate's live state permits cleanup and branch custody has returned. @@ -204,7 +204,7 @@ Use No Mistakes as the default delivery path for non-release feature branches pr - Drive agent-run validation through `no-mistakes axi`, not a raw push. For a manual gated submission, use `git push no-mistakes `; `git push origin ` bypasses the feature-branch gate and requires explicit user instruction. - While a run is active, the pipeline owns its branch and fixes. Relay every `ask-user` finding verbatim, respect `branch_sync.next_action`, and never improvise a reset, stash, merge, rebase, force operation, branch replacement, or direct edit around the pipeline. - Treat `checks-passed` as the stopping point: report the PR as ready and ask the user to review and merge it. Do not poll for merge or hand-rebase an actively monitored PR. -- Never start or stack No Mistakes while Autopilot is active or after it reaches `ready-for-human-review`: Autopilot already owns exact-head push, PR identity, required-check polling, and cleanup. Never start Autopilot while No Mistakes is active or still retains branch custody. Starting either controller after the other reports `failed` or `cancelled` requires an explicit user decision and recovered branch custody. +- Never start No Mistakes while Autopilot is active on the branch. Once Autopilot reaches `ready-for-human-review` it has released the branch, and a user-approved No Mistakes run delivers it. Never start Autopilot while No Mistakes is active or still retains branch custody. Starting either controller after the other reports `failed` or `cancelled` requires an explicit user decision and recovered branch custody. ## Git safety diff --git a/CHANGELOG.md b/CHANGELOG.md index e7dbca1..5d99d51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,38 @@ All notable changes to Claude Architect are recorded here. The format follows ## [Unreleased] +### Security + +- Producer-authored bytes can no longer steer Git. Diff-family commands always run with `--no-textconv` and `--no-ext-diff`; review diffs read attributes from the trusted base with `--attr-source=` (Git 2.40+, reported by `doctor` as `git-too-old` below that), so a committed `.gitattributes` cannot hide source as binary; Git calls inside a managed worktree pin `GIT_DIR`, `GIT_COMMON_DIR`, and `GIT_WORK_TREE`, so a rewritten `.git` pointer is ignored; and truncated Git output is a failure everywhere through one `gitChecked`/`gitSucceeded` pair. +- On macOS, project verification runs under Seatbelt with a private scratch `TMPDIR`, and its evidence records `confinement: "macos-seatbelt"`. The Seatbelt profile denies reads of credential stores under `$HOME` (`.ssh`, `.aws`, `.gnupg`, `.kube`, `.docker`, `.netrc`, `.git-credentials`, `.config/gh`, `.config/gcloud`, `.azure`). +- Autonomous acceptance is stricter. It requires every executed verification command to have run under a known OS confinement backend (a missing policy record fails closed, so off macOS every decision needs a person), and a plain `delegate` candidate that changes verification inputs — tests, test or build configuration, dependency manifests and lockfiles, `.gitattributes`/`.gitignore`/`.gitmodules` — needs a person too. The decision advisory shown to a human is now exactly the autonomous verdict's reasons. +- `integrateCandidate` refuses an acceptance that names no artifact (a legacy record without `candidateManifestHash`) with `decision-artifact-mismatch` instead of falling through. +- Autopilot honors `CLAUDE_ARCHITECT_DECISION_AUTHORITY=human`: it refuses to start (`decision-authority-human`), refuses to resume a workflow that still promotes, and the promoter records no `autopilot-policy` acceptance under it. The acceptance is written only after the exact bytes are staged. +- A spec's `environment` can no longer override variables the platform sets (`HOME`, `PATH`, `TMPDIR`, …), and every adapter- or spec-supplied value except absolute paths is redacted from output. +- The watchdog keeps the Producer in its process group and escalates SIGTERM to SIGKILL on the whole group when the supervisor dies or the child exits, so grandchildren cannot outlive a run. `bootstrap.mjs` ignores relative `PATH` entries when locating Node. +- Dependency inheritance runs `cp` by absolute path and treats lockfiles over 64 MiB or of different sizes as non-matching. +- `delegation-spec.v1.json` bounds every array (`maxItems`), so an oversized spec is rejected at validation. +- Review patches in the review snapshot are sanitized (binary payload omitted, redacted), and Git stderr in pipeline errors is redacted. + ### Changed +- **Protocol 2.0.0 → 3.0.0.** `autopilotStart` no longer accepts `pullRequest`, and Autopilot specs and workflow states are v2. Callers pinned to 2.0.0 get an explicit `protocol version mismatch` diagnostic. Run archives are bound to the protocol major, so runs recorded under 2.x are refused as incompatible; decide and integrate them before upgrading. +- Final Branch Report v2: the passing status is `ready-for-human-review`, matching the terminal state, instead of `ready-to-ship`. A v1 report is refused on resume with an explicit version diagnostic. +- **Autopilot ends at a final-reviewed local branch.** It no longer pushes, opens a draft PR, polls required checks, or marks a PR ready; that belongs to the repository's delivery gate (No Mistakes here). Autopilot Spec v2 drops `shipping`, and Workflow State v2 replaces `shipping`/`ciObservations` with `branch` and drops the `pushing`, `creating-draft-pr`, `waiting-required-checks`, and `marking-ready` phases; v1 specs and states are refused with explicit version diagnostics. Cleanup keeps the reviewed branch and removes only the worktree and the private base ref. +- Promotion commits carry the user's own Git author and committer, dated now, instead of a fixed runtime identity dated 2000-01-01. Autopilot refuses to start without a configured identity (`git-identity-missing`). +- One state machine owns an Autopilot workflow: `start` bootstraps and then runs the same resume path, and startup recovery reports an abandoned `cleaning-up` workflow as `resume` (the `finalize` disposition is gone) instead of finishing it with a second proof of the same crash window. Finish it with `autopilotResume`. +- Autopilot reads the remote only at create. Revalidation before each promotion and the final review no longer runs `ls-remote` or re-resolves the remote URL, so a busy upstream `main` no longer fails a workflow (`remote-base-changed` and `remote-identity-changed` are gone), and the workflow runs offline after create. The local base ref still pins the base. +- Managed worktrees live in each repository's main checkout under `.worktrees/claude-architect/`, a self-ignoring namespace recorded in the plugin data root so recovery finds it; the legacy state-directory location is still swept. +- Every pipeline writer, each fixer included, starts in a fresh worktree at the current candidate; its commits are validated and imported into the shared object store before the worktree is removed. A failed promotion now distinguishes a missing candidate commit (`sandbox-violation`) from a host failure (`environment-defect`). +- Optional Jev screen: with `CLAUDE_ARCHITECT_JEV=on` and `TYPESAFE_API_KEY`, an otherwise autonomous acceptance is screened by the TypeSafe API over the redacted patch and changed paths. A concern routes the decision to a person; an outage or clear result leaves the deterministic verdict unchanged. It never grants autonomy. +- Minor and nit findings never block the pipeline gate; every undispositioned blocker or major still requires a human. +- Weakened-test detection covers Python, Go, Rust, JVM, .NET, and RSpec path conventions and skip markers. +- Autopilot eligibility is derived directly from the pipeline result, review snapshot, and advisor report, so no self-derived projection is re-checked against itself; a missing candidate is reported as `pipeline result has no candidate`. +- The final branch review freezes only the refs it needs (task `logs/` transcripts excluded), embeds verification once, and is crash-resumable: evidence files are replaceable, the report is immutable, and a report already published for the same artifact is returned on resume. +- Lock contention during promotion reports `checkout-busy` instead of `branch-identity-changed`. +- The `ls-files` output bound is 512 MiB; other Git output stays bounded at 8 MB. +- macOS bound-directory cleanup removes directories in batches of 64 with one `lsof` per batch (a 2,040-directory tree went from over 120 s to about 26 s). +- A checkout-lease release failure after a finished integration keeps the result and appends `; checkout lock release failed` instead of discarding it. - The slice lifecycle moved out of `runPipelineWithLease` into `SliceRunner` (`src/pipeline/slice-runner.ts`): plan wave, create worktree, launch Producer, freeze, verify, review, compose, release anchor. Run-scoped facts travel as a `RunContext` value instead of a shared closure, so `pipeline-runtime.ts` fell from 2464 to ~1540 lines and slice behaviour can be exercised without driving a whole pipeline. - One implementation of the slice phase. `SliceRunner.run` superseded the callback-driven `runSlicePhase`/`SlicePhaseDeps` pair, which stayed behind as a second routing loop that nothing called but a test suite still exercised — so the suite proved nothing about the code that runs. The superseded loop is deleted and its evidence-isolation and hard-blocker cases now drive the real runner. - One implementation of the managed-worktree lifecycle. `withManagedWorktree` lives beside `WorktreeManager` in `src/runtime/worktree-manager.ts`, and the pipeline, the slice runner, and candidate verification all borrow through it — so creation serialization and the cleanup-failure disposition cannot drift apart, and verification worktrees gain the `git worktree add` serialization they previously lacked. @@ -20,8 +50,17 @@ All notable changes to Claude Architect are recorded here. The format follows - The store is bound to its run once. `ArtifactStore` validated the run id at construction and then took it again on every read; the read façades (`readManifest()`, `readResult()`, `readDecision()`, …) now take no run id, and the `ToolArtifactStore`, `ReviewSnapshotStore`, `RunDecisionStore`, and advisor-stage store interfaces follow. Prune reads each candidate run through a store bound to that run rather than through the caller's. - `RecoveryDependencies` drops `requestCooperativeTermination`, `delayMs`, and `graceMs`, which were retained for input compatibility and did nothing, and takes `platformServices` whole. `recoverStaleRuns` no longer rebuilds a `PlatformServices` by grafting a caller's three methods onto the selected platform — production code that existed only to complete an incomplete test double. Recovery never took a checkout lease through that object; leases come from `platformSafety.withRecoveryLease`. +- `src/runtime/recovery-manager.ts` (3,880 lines, nine concerns) is split into one module per concern: `recovery-runs`, `recovery-prune-journal`, `recovery-quarantine`, `recovery-worktree-removals`, `recovery-worktree-sweep`, and `recovery-autopilot`, over a `recovery-shared` leaf. `recovery-manager` keeps only `recoverStaleRuns`, which sequences them. The declarations moved verbatim, and the modules import in one direction. +- CI pins every GitHub Action to a commit SHA with its version as a comment, and pins the Claude Code CLI it installs. A wiring test enforces both. + +### Removed + +- The GitHub shipping adapter (`src/ship/`, about 1,190 lines), the Autopilot v1 spec and workflow-state schemas, and the `doctor` checks `autopilot-remote-recovery-required` and `autopilot-pr-recovery-required`. +- Duplicate primitives: ten `errorCode`/`isMissing` copies (now `src/util/errors.ts`), three hot-path directory flushes (now `flushDirectory`), strict identity comparisons (now `sameDirectoryIdentity`), three workflow-store stable-read copies (now `readSingleLinkFile`), about a dozen per-file Git success helpers (now `src/git/checked-git.ts`), the `LOCK_NAME`/`reclaimLocks` aliases, the last six `NodeJS.ErrnoException` casts, and the unused `SpecInvalidError`, `SpawnFailureError`, and `workflowOwnershipClaimsWorktree`. + ### Documentation +- `AGENTS.md`, `README.md`, `docs/SECURITY_MODEL.md`, `docs/THREAT_MODEL.md`, `docs/decision-authority.md`, the delegate skill, and `docs/autopilot-terminal-states.md` describe the confinement and verification-input rules for autonomy, the opt-in Jev screen, the `.worktrees/` layout, the Git 2.40 floor, and Autopilot ending at a local branch handed to No Mistakes. - `tests/README.md` maps every test file to the module and exported interface it crosses and lists the tests that reach past an interface, with the disposition of each. - `docs/README.md` indexes every document under `docs/` as current, historical, or superseded, naming the superseding document where one exists. - `docs/ARCHITECTURE.md` maps each `AGENTS.md` trust invariant to exactly one owning subsystem and file; `SECURITY_MODEL.md`, `TRUST_BOUNDARIES.md`, and `THREAT_MODEL.md` point at that mapping. diff --git a/README.md b/README.md index 7d15554..d623877 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ All agent output is an untrusted candidate. A candidate that fails independent v ## Installation -Claude Code requires Node.js 22 or newer. +Claude Code requires Node.js 22 or newer. The runtime needs Git 2.40 or newer: review diffs read attributes from the trusted base with `--attr-source`, and `doctor` reports `git-too-old` below that. ```bash claude plugin marketplace add PyModel/claude-architect @@ -87,7 +87,7 @@ Dispatch a delegation through the `delegation-lane` agent to watch it as a nativ ## Decision authority -By default, `decideCandidate` records `accepted` without prompting for an independently verified candidate that produces no advisory warnings from a readable archive: either a `delegatePipeline` candidate carrying a durable `pipelineGateCleared` record that names the archived candidate commit and does not require a human, or a plain `delegate` result judged on its independent verification alone. Gate-refused, review-incomplete, malformed, commit-mismatched, human-required, unverified, or unreadable cases still require a human, as does every non-accept verdict. Set `CLAUDE_ARCHITECT_DECISION_AUTHORITY=human` to require confirmation for every decision; an unrecognized value fails closed to `human` with a warning. +By default, `decideCandidate` records `accepted` without prompting for an independently verified candidate that produces no advisory warnings from a readable archive: either a `delegatePipeline` candidate carrying a durable `pipelineGateCleared` record that names the archived candidate commit and does not require a human, or a plain `delegate` result judged on its independent verification alone. Autonomy also requires that project verification ran under an OS confinement backend, so off macOS every decision needs a human, and a plain `delegate` candidate that edits its own verification inputs (tests, test or build configuration, dependency manifests) needs one too. Setting `CLAUDE_ARCHITECT_JEV=on` with a `TYPESAFE_API_KEY` adds an opt-in Jev screen of the patch that can route an otherwise autonomous acceptance to a human, never the reverse. Gate-refused, review-incomplete, malformed, commit-mismatched, human-required, unverified, or unreadable cases still require a human, as does every non-accept verdict. Set `CLAUDE_ARCHITECT_DECISION_AUTHORITY=human` to require confirmation for every decision; an unrecognized value fails closed to `human` with a warning. This never relaxes the gates themselves: independent verification decides what may be accepted at all, integration refuses any acceptance whose provenance is unknown, and it aborts on a moved `HEAD`, a dirty tree, or a hash that does not match the reviewed artifact. Every decision records its provenance. @@ -136,6 +136,7 @@ Logs and MCP evidence are bounded and redacted; prompt and argument values are n - An unavailable requested Producer is reported and fails closed; the runtime never substitutes another Producer or bypasses a denied edit lane. - Verification commands are evidence, not automatically sandboxed build infrastructure. - Integration stages an accepted candidate but never commits, pushes, opens a pull request, or deploys it. +- Autopilot ends at a final-reviewed local branch committed under your Git identity. It never pushes or opens a pull request; deliver that branch through your normal gate (No Mistakes in this repository). ## Development diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 6b825a0..22718a9 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -32,7 +32,7 @@ with it. | Roles communicate only through versioned durable artifacts | The protocol types and their canonical schemas | `src/protocol/`, `runtime/schemas/` | | Verification is objective, recorded, and rerunnable; Producer claims are never evidence | AcceptanceVerifier, under the verification mode RunDecision selects | `src/verify/acceptance-verifier.ts`, `src/verify/structural-verifier.ts` | | Acceptance is governed by a configured decision authority, and every decision's provenance is recorded | RunDecision computes the verdict; ControlledIntegrator refuses unknown provenance | `src/runtime/run-decision.ts`, `src/integrate/controlled-integrator.ts` | -| Workflow state, decisions, evidence, and recovery data survive process failure | PlatformSafety owns durable writes, lease and lock ownership; ArtifactStore and RecoveryManager own the archive and its replay | `src/platform/platform-safety.ts`, `src/runtime/artifact-store.ts`, `src/runtime/recovery-manager.ts` | +| Workflow state, decisions, evidence, and recovery data survive process failure | PlatformSafety owns durable writes, lease and lock ownership; ArtifactStore and RecoveryManager own the archive and its replay | `src/platform/platform-safety.ts`, `src/runtime/artifact-store.ts`, `src/runtime/recovery-*.ts` | | Final review covers the whole candidate branch and every attempt, not the latest patch | FinalBranchReviewer for autopilot; PipelineRuntime's final round otherwise | `src/autopilot/final-branch-reviewer.ts`, `src/pipeline/pipeline-runtime.ts` | Four subsystems carry most of this weight, and each has one job: @@ -58,6 +58,6 @@ OpenCode, Pi, Pythinker, Antigravity CLI (`agy`), and headless Claude Code (`cla ## State and recovery -`CLAUDE_PLUGIN_DATA` is mandatory outside tests. It contains `runs/`, `worktrees/`, and lock/recovery state. Archives use restrictive file modes, no-follow checks, bounded reads, atomic create/link or rename patterns, and integrity hashes. Startup recovery in `src/runtime/recovery-manager.ts` validates directory identity and process start tokens before terminating or reclaiming stale work. Git candidate refs keep frozen commits reachable until rejection, successful integration, or pruning. +`CLAUDE_PLUGIN_DATA` is mandatory outside tests. It contains `runs/`, the records of every managed worktree namespace, and lock/recovery state; the worktrees themselves live in each repository's main checkout under `.worktrees/claude-architect/`. Archives use restrictive file modes, no-follow checks, bounded reads, atomic create/link or rename patterns, and integrity hashes. Startup recovery (`src/runtime/recovery-manager.ts`, which sequences one module per concern: `recovery-runs`, `recovery-prune-journal`, `recovery-quarantine`, `recovery-worktree-removals`, `recovery-worktree-sweep`, and `recovery-autopilot`, over `recovery-shared`) validates directory identity and process start tokens before terminating or reclaiming stale work. Git candidate refs keep frozen commits reachable until rejection, successful integration, or pruning. The architecture reduces the authority of a Producer; it does not make generated code trustworthy. Human review and the final integration boundary remain essential. diff --git a/docs/PLUGIN_COMPONENTS.md b/docs/PLUGIN_COMPONENTS.md index 165013c..312b01e 100644 --- a/docs/PLUGIN_COMPONENTS.md +++ b/docs/PLUGIN_COMPONENTS.md @@ -39,7 +39,7 @@ The MCP server has no generic command-execution endpoint. Verification execution - `src/git/worktree-manager.ts` and `candidate-tree.ts`: detached worktrees, change inventory, scope enforcement, candidate Git objects/refs, and manifest hash. - `src/verify/*`: structural and project verification in a separate worktree. - `src/pipeline/*`: fresh role invocations, adversarial review/fix reports, consolidation, gates, and final verification. -- `src/runtime/artifact-store.ts`, `run-manifest.ts`, and `recovery-manager.ts`: bounded/redacted archives, provenance hashes, pruning, and crash recovery. +- `src/runtime/artifact-store.ts`, `run-manifest.ts`, and `recovery-*.ts`: bounded/redacted archives, provenance hashes, pruning, and crash recovery. - `src/integrate/controlled-integrator.ts`: locked, hash-gated candidate tree application. - `runtime/bootstrap.mjs` and `runtime/server.mjs`: packaged executable JavaScript loaded by Claude Code. diff --git a/docs/PRIVACY.md b/docs/PRIVACY.md index cc45f1d..77b81cb 100644 --- a/docs/PRIVACY.md +++ b/docs/PRIVACY.md @@ -7,7 +7,7 @@ Claude Architect is primarily a local orchestration and evidence system, but it The plugin stores run state below the Claude Code-provided `$CLAUDE_PLUGIN_DATA` directory. `src/runtime/state-dir.ts` refuses to select an implicit production fallback. Typical contents include: - `runs//manifest.json`, `result.json`, an optional decision record, redacted bounded stdout/stderr logs, and pipeline review/fix/verification JSON; -- `worktrees//` and short-lived verification worktrees; +- records of each repository's managed worktree namespace; the worktrees themselves, including short-lived verification worktrees, live in that repository's main checkout under `.worktrees/claude-architect/`; - lock, recovery, cleanup-journal, and quarantine/pruning state; - Git objects and `refs/claude-architect/candidates/` in the delegated repository, used to keep frozen candidate commits reachable. @@ -23,6 +23,8 @@ Codex normally contacts the OpenAI service configured by the Codex CLI. OpenCode Verification commands run locally in a clean worktree. A command whose spec allows network may transmit repository or test data to destinations chosen by that command. Network-denied commands are only as private as the effective platform enforcement reported in verification evidence. +The opt-in Jev screen is off by default. With `CLAUDE_ARCHITECT_JEV=on` and a `TYPESAFE_API_KEY`, each otherwise autonomous acceptance sends the redacted candidate patch (first 50,000 characters) and up to 200 changed paths to `api.typesafe.ai`; retention there is governed by TypeSafe. Leave it off for code that must not reach that service. + ## Environment and credentials `src/runtime/environment-policy.ts` constructs a minimal environment from platform essentials, adapter allowlists, and explicit spec additions. Sensitive host and delegated environment values are registered with the redactor. The certified Codex invocation further configures an include-only shell environment. The design seeks to avoid forwarding credentials by default, but CLI authentication configuration under the user's home/config directories may necessarily be available to the selected CLI. diff --git a/docs/SECURITY_MODEL.md b/docs/SECURITY_MODEL.md index f927742..d54028e 100644 --- a/docs/SECURITY_MODEL.md +++ b/docs/SECURITY_MODEL.md @@ -29,7 +29,7 @@ Writes are limited to the isolated worktree, plugin data state, Git candidate re ## Workflow state and artifacts -Outside tests, state resolves only from `$CLAUDE_PLUGIN_DATA`. Runs are archived at `$CLAUDE_PLUGIN_DATA/runs//`; managed worktrees are under `$CLAUDE_PLUGIN_DATA/worktrees/`; locks and recovery records are also beneath the plugin data root. A run contains a sanitized `manifest.json`, `result.json`, decision record when present, bounded redacted logs, and pipeline JSON. Candidate commits are anchored under `refs/claude-architect/candidates/` in the repository. The run manifest hashes its canonical body, prompt, repository instructions, packaged verifier, execution policy, environment provenance, and candidate manifest association. The candidate manifest hash is SHA-256 over the normalized changed-path records; content hashes and Git object identities provide additional anchoring. +Outside tests, state resolves only from `$CLAUDE_PLUGIN_DATA`. Runs are archived at `$CLAUDE_PLUGIN_DATA/runs//`; managed worktrees are under `
/.worktrees/claude-architect/`, a self-ignoring namespace recorded in the plugin data root so recovery can find it; locks and recovery records are also beneath the plugin data root. A run contains a sanitized `manifest.json`, `result.json`, decision record when present, bounded redacted logs, and pipeline JSON. Candidate commits are anchored under `refs/claude-architect/candidates/` in the repository. The run manifest hashes its canonical body, prompt, repository instructions, packaged verifier, execution policy, environment provenance, and candidate manifest association. The candidate manifest hash is SHA-256 over the normalized changed-path records; content hashes and Git object identities provide additional anchoring. ## Fresh-context isolation and reviewers @@ -39,9 +39,9 @@ Pipeline roles are separate one-shot Producer invocations. Reviewer prompts expl `decideCandidate` is an MCP tool available to the controlling Claude session. The runtime refuses acceptance unless the result is a verified candidate, and records how every decision was reached as `decidedBy`. -Whether a person is prompted is governed by `CLAUDE_ARCHITECT_DECISION_AUTHORITY`. Unset or `autonomous` (the shipped default) records `accepted` without prompting only for an independently verified `delegatePipeline` candidate carrying a well-formed `pipelineGateCleared` record bound to the archived candidate commit, with `requiresHumanDecision:false`, no failure or advisory warnings, and a readable archive, marking it `policy-autonomous`. Plain `delegate`, refusal, incomplete review, malformed or mismatched clearance, non-accept verdicts, and every decision under `human` open an MCP elicitation request and write the decision only when the response both accepts the request and explicitly confirms it; a client without elicitation support, an unconfirmed response, or an elicitation failure leaves the candidate undecided. An unrecognized value for the variable fails closed to `human` with a warning. +Whether a person is prompted is governed by `CLAUDE_ARCHITECT_DECISION_AUTHORITY`. Unset or `autonomous` (the shipped default) records `accepted` without prompting only for an independently verified `delegatePipeline` candidate carrying a well-formed `pipelineGateCleared` record bound to the archived candidate commit, with `requiresHumanDecision:false`, no failure or advisory warnings, and a readable archive, marking it `policy-autonomous`. Autonomy additionally requires that every executed verification command ran under an OS confinement backend (so off macOS every decision needs a person), and a plain `delegate` candidate qualifies only when it leaves verification inputs untouched. The opt-in Jev screen (`CLAUDE_ARCHITECT_JEV=on`) sends the redacted patch and changed paths to the TypeSafe API and can only turn an autonomous acceptance into a human prompt. Plain `delegate` that changes verification inputs, refusal, incomplete review, malformed or mismatched clearance, non-accept verdicts, and every decision under `human` open an MCP elicitation request and write the decision only when the response both accepts the request and explicitly confirms it; a client without elicitation support, an unconfirmed response, or an elicitation failure leaves the candidate undecided. An unrecognized value for the variable fails closed to `human` with a warning. -Integration accepts `human-elicitation` and `policy-autonomous` provenance. It refuses provenance the runtime cannot vouch for: `caller-asserted` records, and provenance-less records predating the field. Decision records are immutable: a confirmation whose provenance or candidate binding differs from an existing record returns `decision-conflict` rather than claiming it replaced the older one. +Integration accepts `human-elicitation` and `policy-autonomous` provenance. It refuses provenance the runtime cannot vouch for: `caller-asserted` records, and provenance-less records predating the field. It also refuses any acceptance that does not name the exact manifest hash it is spent on. Autopilot promotions record `autopilot-policy` provenance and are refused outright under the `human` authority. Decision records are immutable: a confirmation whose provenance or candidate binding differs from an existing record returns `decision-conflict` rather than claiming it replaced the older one. Elicitation, where it applies, is an enforced channel boundary, not cryptographic human identity. The plugin does not implement a separate login, signature, or hardware confirmation, and it relies on the MCP host to present elicitation faithfully. A compromised or modified host/client could synthesize a confirmation, so control of that trusted client remains equivalent to decision authority. diff --git a/docs/THREAT_MODEL.md b/docs/THREAT_MODEL.md index 261f4c0..155853d 100644 --- a/docs/THREAT_MODEL.md +++ b/docs/THREAT_MODEL.md @@ -29,7 +29,7 @@ Assets include the integrity and confidentiality of the user's repository and Gi | Forged success claims | Producer self-report is not acceptance evidence; structural verification and Host-run commands in `src/verify/acceptance-verifier.ts`; separate verification worktree in `src/verify/project-verifier.ts` | Tests can be incomplete, malicious, nondeterministic, or dependent on unavailable services | | Candidate substitution | Runtime-issued `specSha256` can be bound at dispatch before work starts; candidate tree/commit/ref anchors, changed-path content hashes, candidate manifest hash, and hashed run manifest; `reviewCandidate` regenerates patch from anchored objects | Legacy callers may omit the additive dispatch digest; SHA-256/Git integrity does not establish code safety; local users with repository write access can disrupt refs | | Review/fix pipeline | New role invocation per round; reviewers/verifier use empty write allowlist and all-path forbidden scope; only fixer may edit; adversarial gates in `src/pipeline/gates.ts` | Provider-side context retention is outside plugin control; reviewer and implementer may share a vulnerable model family | -| Acceptance/integration | Policy acceptance requires independent verification plus durable, commit-bound `pipelineGateCleared` evidence with no human requirement or advisory warning; every other decision requires positive MCP elicitation; integration requires accepted, integrable provenance and the exact manifest hash, then rechecks base/ref/tree/status under locks | Policy evidence is not proof of safety; MCP elicitation is not cryptographic human identity; a compromised trusted host/client could synthesize confirmation | +| Acceptance/integration | Policy acceptance requires independent, OS-confined verification plus durable, commit-bound `pipelineGateCleared` evidence with no human requirement or advisory warning, or, for a plain `delegate`, a candidate that leaves verification inputs untouched; the opt-in Jev screen can only withdraw autonomy; every other decision requires positive MCP elicitation; integration requires accepted, integrable provenance and the exact manifest hash, then rechecks base/ref/tree/status under locks | Policy evidence is not proof of safety; MCP elicitation is not cryptographic human identity; a compromised trusted host/client could synthesize confirmation | | State tampering/races | Plain-directory/no-follow checks, bounded reads, restrictive modes, exclusive writes, hashes, repository and checkout locks in `src/runtime/artifact-store.ts` and platform services | Same-user malware may still deny service or tamper between operations not covered by OS guarantees | | Crash/PID reuse | Startup recovery validates canonical paths and process start tokens before termination/reclamation in `src/runtime/recovery-manager.ts` | Platform process metadata can be unavailable; abrupt failure may leave artifacts requiring manual inspection | | Sensitive logs | Bounded buffers, registered sensitive environment values, pattern/field redaction, refusal to persist known secrets | Unknown, encoded, transformed, or source-level secrets may remain | diff --git a/docs/autopilot-terminal-states.md b/docs/autopilot-terminal-states.md index 374ee48..62adeac 100644 --- a/docs/autopilot-terminal-states.md +++ b/docs/autopilot-terminal-states.md @@ -2,11 +2,11 @@ What each terminal state proves, and what it forbids. The delegate skill points here. -The controller may proceed without a mid-loop prompt only while every eligibility and shipping gate remains objectively proven. Interpret terminal states exactly: +The controller may proceed without a mid-loop prompt only while every eligibility gate remains objectively proven. Interpret terminal states exactly: -- `ready-for-human-review`: the workflow branch was pushed, the draft PR was proven for the expected head, configured required checks were green for that head, the PR was marked ready, and runtime cleanup completed. Review the cumulative PR evidence; only the human may merge or otherwise advance `main`. -- `human-decision-required`: ambiguity, a non-waivable finding, ownership mismatch, shipping uncertainty, or another fail-closed condition requires a human decision. Preserve the workflow branch, worktree, and evidence; do not improvise continuation. -- `failed`: the workflow ended without authority to ship. Present the durable reason and evidence. Do not claim the PR is ready or retry under altered policy. +- `ready-for-human-review`: every task was promoted onto the workflow branch under the user's Git identity, the cumulative final review passed for the exact head, the workflow worktree and private base ref were removed, and the branch was kept at that head. Nothing was pushed. Review the branch and its final-review evidence; deliver it through the repository's gate (No Mistakes here) only with the human's approval. +- `human-decision-required`: ambiguity, a non-waivable finding, ownership mismatch, or another fail-closed condition requires a human decision. Preserve the workflow branch, worktree, and evidence; do not improvise continuation. +- `failed`: the workflow ended without a reviewed branch to hand off. Present the durable reason and evidence. Do not claim the branch is ready or retry under altered policy. - `cancelled`: cancellation is a durable terminal classification. Present preserved cleanup/evidence and do not resume it as if non-terminal; a human chooses any next action. -Autopilot is autonomous only up to a PR ready for human review. It never merges, deploys, releases, or deletes the remote feature branch. Successful cleanup removes temporary local workflow resources while retaining durable evidence and recovery records; fail-closed terminals retain what the runtime needs for inspection. +Autopilot is autonomous only up to a final-reviewed local branch. It never pushes, opens a pull request, merges, deploys, or releases. It reads the remote once, at create, to fetch the base; after that it works offline. A crash during cleanup is finished by `autopilotResume`: startup recovery reports such a workflow as `resume` instead of finalizing it itself, so one state machine owns the transition. Successful cleanup removes temporary local workflow resources while retaining durable evidence and recovery records; fail-closed terminals retain what the runtime needs for inspection. diff --git a/docs/decision-authority.md b/docs/decision-authority.md index 3a8546b..1f3a6fd 100644 --- a/docs/decision-authority.md +++ b/docs/decision-authority.md @@ -5,4 +5,4 @@ integration accepts. `CLAUDE_ARCHITECT_DECISION_AUTHORITY` selects the authority unset or `autonomous` is the shipped default, `human` requires confirmation for every decision. -Under the shipped `autonomous` authority, `decideCandidate` records `accepted` as `policy-autonomous` without elicitation for any independently verified candidate carrying no failure and no advisory warnings from a readable archive — either a `delegatePipeline` candidate with a well-formed `pipelineGateCleared` record bound to the same candidate commit and `requiresHumanDecision:false`, or a plain `delegate` candidate, which carries no pipeline evidence at all and is judged on its independent verification result alone. Every other case — including rejection, revision, refusal, incomplete review, malformed or mismatched clearance, and every decision under `human` — raises an MCP elicitation prompt and records nothing unless a person confirms; `elicitation-unavailable`, `decision-not-confirmed`, and `elicitation-failed` all mean no decision was written. Do not treat a refused confirmation as a transient error to retry; report it and stop. The recorded decision carries `decidedBy` and the candidate `manifestHash` it binds to. Integration accepts `human-elicitation` and `policy-autonomous` provenance, while refusing a different artifact and any legacy or caller-asserted acceptance. +Under the shipped `autonomous` authority, `decideCandidate` records `accepted` as `policy-autonomous` without elicitation for any independently verified candidate carrying no failure and no advisory warnings from a readable archive — either a `delegatePipeline` candidate with a well-formed `pipelineGateCleared` record bound to the same candidate commit and `requiresHumanDecision:false`, or a plain `delegate` candidate, which carries no pipeline evidence at all and is judged on its independent verification result alone. Two further conditions apply to both: every executed verification command must have run under an OS confinement backend (none exists off macOS, so there every decision needs a person), and a plain `delegate` candidate must not change verification inputs — tests, test or build configuration, or dependency manifests — since then its verification proves nothing about it. With `CLAUDE_ARCHITECT_JEV=on` and a `TYPESAFE_API_KEY`, a Jev screen of the redacted patch runs before an autonomous acceptance; a concern routes the decision to a person, and an outage or clear result leaves the verdict unchanged. Every other case — including rejection, revision, refusal, incomplete review, malformed or mismatched clearance, and every decision under `human` — raises an MCP elicitation prompt and records nothing unless a person confirms; `elicitation-unavailable`, `decision-not-confirmed`, and `elicitation-failed` all mean no decision was written. Do not treat a refused confirmation as a transient error to retry; report it and stop. The recorded decision carries `decidedBy` and the candidate `manifestHash` it binds to. Integration accepts `human-elicitation` and `policy-autonomous` provenance, while refusing a different artifact, an acceptance that names no artifact, and any legacy or caller-asserted acceptance. Autopilot records `autopilot-policy` acceptances and refuses to start or promote under `human`. diff --git a/runtime/bootstrap.mjs b/runtime/bootstrap.mjs index 84daec2..6973553 100644 --- a/runtime/bootstrap.mjs +++ b/runtime/bootstrap.mjs @@ -52,7 +52,9 @@ function findSupportedNode() { const searchPath = process.env.PATH ?? ""; const visited = new Set(); for (const directory of searchPath.split(path.delimiter)) { - if (directory.length === 0) continue; + // A relative entry resolves against the current directory, which is the + // user's checkout — never execute a `node` a repository can plant. + if (!path.isAbsolute(directory)) continue; for (const name of nodeNames()) { const candidate = path.resolve(directory, name); if (visited.has(candidate)) continue; diff --git a/runtime/schemas/autopilot-spec.v1.json b/runtime/schemas/autopilot-spec.v2.json similarity index 61% rename from runtime/schemas/autopilot-spec.v1.json rename to runtime/schemas/autopilot-spec.v2.json index 239533a..1578bb3 100644 --- a/runtime/schemas/autopilot-spec.v1.json +++ b/runtime/schemas/autopilot-spec.v2.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "autopilot-spec.v1.json", + "$id": "autopilot-spec.v2.json", "type": "object", "additionalProperties": false, "required": [ @@ -9,12 +9,11 @@ "base", "tasks", "finalSuccessCriteria", - "finalVerification", - "shipping" + "finalVerification" ], "properties": { "specVersion": { - "const": "1" + "const": "2" }, "topic": { "type": "string", @@ -76,44 +75,6 @@ }, "finalVerification": { "$ref": "delegation-spec.v1.json#/properties/verification" - }, - "shipping": { - "type": "object", - "additionalProperties": false, - "required": [ - "provider", - "draft", - "markReadyWhenRequiredChecksPass", - "requiredChecksTimeoutMs", - "pullRequestTitle", - "pullRequestBody" - ], - "properties": { - "provider": { - "const": "github" - }, - "draft": { - "const": true - }, - "markReadyWhenRequiredChecksPass": { - "const": true - }, - "requiredChecksTimeoutMs": { - "type": "integer", - "minimum": 600000, - "maximum": 3600000 - }, - "pullRequestTitle": { - "type": "string", - "minLength": 1, - "maxLength": 256 - }, - "pullRequestBody": { - "type": "string", - "minLength": 1, - "maxLength": 4000 - } - } } } } diff --git a/runtime/schemas/autopilot-workflow-state.v1.json b/runtime/schemas/autopilot-workflow-state.v1.json deleted file mode 100644 index d3cb3bf..0000000 --- a/runtime/schemas/autopilot-workflow-state.v1.json +++ /dev/null @@ -1,257 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "autopilot-workflow-state.v1.json", - "type": "object", - "additionalProperties": false, - "required": [ - "stateVersion", - "workflowId", - "repositoryIdentity", - "baseCommitOid", - "workflowRef", - "worktreePath", - "autopilotSpecHash", - "revision", - "phase", - "currentTaskIndex", - "tasks", - "intentJournal", - "finalGate", - "shipping", - "ciObservations", - "cleanup", - "terminal", - "createdAt", - "updatedAt" - ], - "properties": { - "stateVersion": { "const": "1" }, - "workflowId": { "type": "string", "minLength": 1, "maxLength": 128 }, - "repositoryIdentity": { "type": "string", "minLength": 1, "maxLength": 4096 }, - "baseCommitOid": { "$ref": "#/$defs/commitOid" }, - "workflowRef": { - "type": "string", - "pattern": "^refs/heads/[^\\u0000-\\u0020~^:?*\\\\[\\]]+$", - "maxLength": 1024 - }, - "worktreePath": { "type": "string", "minLength": 1, "maxLength": 4096 }, - "autopilotSpecHash": { "$ref": "#/$defs/hash" }, - "revision": { "type": "integer", "minimum": 0 }, - "phase": { "$ref": "#/$defs/phase" }, - "currentTaskIndex": { "type": "integer", "minimum": 0 }, - "tasks": { - "type": "array", - "minItems": 1, - "maxItems": 32, - "items": { "$ref": "#/$defs/task" } - }, - "intentJournal": { "$ref": "#/$defs/intentJournal" }, - "finalGate": { - "anyOf": [ - { "$ref": "#/$defs/finalGate" }, - { "type": "null" } - ] - }, - "shipping": { "$ref": "#/$defs/shipping" }, - "ciObservations": { - "type": "array", - "items": { "$ref": "#/$defs/ciObservation" } - }, - "cleanup": { - "anyOf": [ - { "$ref": "#/$defs/cleanup" }, - { "type": "null" } - ] - }, - "terminal": { - "anyOf": [ - { "$ref": "#/$defs/terminal" }, - { "type": "null" } - ] - }, - "createdAt": { "type": "string", "format": "date-time" }, - "updatedAt": { "type": "string", "format": "date-time" } - }, - "$defs": { - "hash": { - "type": "string", - "pattern": "^[0-9a-f]{64}$" - }, - "commitOid": { - "type": "string", - "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" - }, - "phase": { - "enum": [ - "preflighting", - "running-task", - "promoting-task", - "final-review", - "pushing", - "creating-draft-pr", - "waiting-required-checks", - "marking-ready", - "cleaning-up", - "ready-for-human-review", - "human-decision-required", - "failed", - "cancelled" - ] - }, - "task": { - "type": "object", - "additionalProperties": false, - "required": [ - "id", - "runId", - "candidateManifestHash", - "eligibilityHash", - "promotionCommitOid", - "status" - ], - "properties": { - "id": { "type": "string", "minLength": 1, "maxLength": 128 }, - "runId": { - "type": ["string", "null"], - "minLength": 1, - "maxLength": 128 - }, - "candidateManifestHash": { - "anyOf": [ - { "$ref": "#/$defs/hash" }, - { "type": "null" } - ] - }, - "eligibilityHash": { - "anyOf": [ - { "$ref": "#/$defs/hash" }, - { "type": "null" } - ] - }, - "promotionCommitOid": { - "anyOf": [ - { "$ref": "#/$defs/commitOid" }, - { "type": "null" } - ] - }, - "status": { - "enum": ["pending", "running", "promoted", "halted"] - } - } - }, - "intentJournal": { - "type": "object", - "additionalProperties": false, - "required": ["ref", "entryCount", "lastEntryHash"], - "properties": { - "ref": { "type": "string", "minLength": 1, "maxLength": 4096 }, - "entryCount": { "type": "integer", "minimum": 0 }, - "lastEntryHash": { - "anyOf": [ - { "$ref": "#/$defs/hash" }, - { "type": "null" } - ] - } - } - }, - "finalGate": { - "type": "object", - "additionalProperties": false, - "required": ["reportRef", "reportHash", "headCommitOid", "eligibilityHash"], - "properties": { - "reportRef": { "type": "string", "minLength": 1, "maxLength": 4096 }, - "reportHash": { "$ref": "#/$defs/hash" }, - "headCommitOid": { "$ref": "#/$defs/commitOid" }, - "eligibilityHash": { "$ref": "#/$defs/hash" } - } - }, - "shipping": { - "type": "object", - "additionalProperties": false, - "required": ["branch", "prNumber", "prUrl", "ciDeadlineAt"], - "properties": { - "branch": { "type": "string", "minLength": 1, "maxLength": 255 }, - "prNumber": { - "type": ["integer", "null"], - "minimum": 1 - }, - "prUrl": { - "type": ["string", "null"], - "minLength": 1, - "maxLength": 4096 - }, - "ciDeadlineAt": { "type": "string", "format": "date-time" } - } - }, - "ciCheck": { - "type": "object", - "additionalProperties": false, - "required": ["bucket", "name", "state", "link"], - "properties": { - "bucket": { "enum": ["pass", "pending", "fail", "cancel", "skipping"] }, - "name": { "type": "string", "minLength": 1, "maxLength": 512 }, - "state": { "type": "string", "minLength": 1, "maxLength": 128 }, - "link": { - "type": ["string", "null"], - "minLength": 1, - "maxLength": 4096 - } - } - }, - "ciObservation": { - "type": "object", - "additionalProperties": false, - "required": ["observedAt", "result", "headCommitOid", "checks"], - "properties": { - "observedAt": { "type": "string", "format": "date-time" }, - "result": { "enum": ["missing", "pending", "failed", "passed"] }, - "headCommitOid": { "$ref": "#/$defs/commitOid" }, - "checks": { - "type": "array", - "items": { "$ref": "#/$defs/ciCheck" } - } - } - }, - "cleanup": { - "type": "object", - "additionalProperties": false, - "required": ["status", "worktreeRemoved", "lockReleased", "error", "completedAt"], - "properties": { - "status": { "enum": ["succeeded", "failed"] }, - "worktreeRemoved": { "type": "boolean" }, - "lockReleased": { "type": "boolean" }, - "error": { - "type": ["string", "null"], - "minLength": 1, - "maxLength": 4000 - }, - "completedAt": { "type": "string", "format": "date-time" } - } - }, - "terminal": { - "type": "object", - "additionalProperties": false, - "required": ["classification", "reason", "evidenceRefs", "completedAt"], - "properties": { - "classification": { - "enum": [ - "ready-for-human-review", - "human-decision-required", - "failed", - "cancelled" - ] - }, - "reason": { - "type": ["string", "null"], - "minLength": 1, - "maxLength": 4000 - }, - "evidenceRefs": { - "type": "array", - "items": { "type": "string", "minLength": 1, "maxLength": 4096 } - }, - "completedAt": { "type": "string", "format": "date-time" } - } - } - } -} diff --git a/runtime/schemas/autopilot-workflow-state.v2.json b/runtime/schemas/autopilot-workflow-state.v2.json new file mode 100644 index 0000000..08d8e96 --- /dev/null +++ b/runtime/schemas/autopilot-workflow-state.v2.json @@ -0,0 +1,344 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "autopilot-workflow-state.v2.json", + "type": "object", + "additionalProperties": false, + "required": [ + "stateVersion", + "workflowId", + "repositoryIdentity", + "baseCommitOid", + "workflowRef", + "worktreePath", + "autopilotSpecHash", + "revision", + "phase", + "currentTaskIndex", + "tasks", + "intentJournal", + "finalGate", + "branch", + "cleanup", + "terminal", + "createdAt", + "updatedAt" + ], + "properties": { + "stateVersion": { + "const": "2" + }, + "workflowId": { + "type": "string", + "minLength": 1, + "maxLength": 128 + }, + "repositoryIdentity": { + "type": "string", + "minLength": 1, + "maxLength": 4096 + }, + "baseCommitOid": { + "$ref": "#/$defs/commitOid" + }, + "workflowRef": { + "type": "string", + "pattern": "^refs/heads/[^\\u0000-\\u0020~^:?*\\\\[\\]]+$", + "maxLength": 1024 + }, + "worktreePath": { + "type": "string", + "minLength": 1, + "maxLength": 4096 + }, + "autopilotSpecHash": { + "$ref": "#/$defs/hash" + }, + "revision": { + "type": "integer", + "minimum": 0 + }, + "phase": { + "$ref": "#/$defs/phase" + }, + "currentTaskIndex": { + "type": "integer", + "minimum": 0 + }, + "tasks": { + "type": "array", + "minItems": 1, + "maxItems": 32, + "items": { + "$ref": "#/$defs/task" + } + }, + "intentJournal": { + "$ref": "#/$defs/intentJournal" + }, + "finalGate": { + "anyOf": [ + { + "$ref": "#/$defs/finalGate" + }, + { + "type": "null" + } + ] + }, + "branch": { + "type": "string", + "minLength": 1, + "maxLength": 1000, + "pattern": "^[^\\u0000-\\u0020~^:?*\\\\[\\]]+$" + }, + "cleanup": { + "anyOf": [ + { + "$ref": "#/$defs/cleanup" + }, + { + "type": "null" + } + ] + }, + "terminal": { + "anyOf": [ + { + "$ref": "#/$defs/terminal" + }, + { + "type": "null" + } + ] + }, + "createdAt": { + "type": "string", + "format": "date-time" + }, + "updatedAt": { + "type": "string", + "format": "date-time" + } + }, + "$defs": { + "hash": { + "type": "string", + "pattern": "^[0-9a-f]{64}$" + }, + "commitOid": { + "type": "string", + "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" + }, + "phase": { + "enum": [ + "preflighting", + "running-task", + "promoting-task", + "final-review", + "cleaning-up", + "ready-for-human-review", + "human-decision-required", + "failed", + "cancelled" + ] + }, + "task": { + "type": "object", + "additionalProperties": false, + "required": [ + "id", + "runId", + "candidateManifestHash", + "eligibilityHash", + "promotionCommitOid", + "status" + ], + "properties": { + "id": { + "type": "string", + "minLength": 1, + "maxLength": 128 + }, + "runId": { + "type": [ + "string", + "null" + ], + "minLength": 1, + "maxLength": 128 + }, + "candidateManifestHash": { + "anyOf": [ + { + "$ref": "#/$defs/hash" + }, + { + "type": "null" + } + ] + }, + "eligibilityHash": { + "anyOf": [ + { + "$ref": "#/$defs/hash" + }, + { + "type": "null" + } + ] + }, + "promotionCommitOid": { + "anyOf": [ + { + "$ref": "#/$defs/commitOid" + }, + { + "type": "null" + } + ] + }, + "status": { + "enum": [ + "pending", + "running", + "promoted", + "halted" + ] + } + } + }, + "intentJournal": { + "type": "object", + "additionalProperties": false, + "required": [ + "ref", + "entryCount", + "lastEntryHash" + ], + "properties": { + "ref": { + "type": "string", + "minLength": 1, + "maxLength": 4096 + }, + "entryCount": { + "type": "integer", + "minimum": 0 + }, + "lastEntryHash": { + "anyOf": [ + { + "$ref": "#/$defs/hash" + }, + { + "type": "null" + } + ] + } + } + }, + "finalGate": { + "type": "object", + "additionalProperties": false, + "required": [ + "reportRef", + "reportHash", + "headCommitOid", + "eligibilityHash" + ], + "properties": { + "reportRef": { + "type": "string", + "minLength": 1, + "maxLength": 4096 + }, + "reportHash": { + "$ref": "#/$defs/hash" + }, + "headCommitOid": { + "$ref": "#/$defs/commitOid" + }, + "eligibilityHash": { + "$ref": "#/$defs/hash" + } + } + }, + "cleanup": { + "type": "object", + "additionalProperties": false, + "required": [ + "status", + "worktreeRemoved", + "lockReleased", + "error", + "completedAt" + ], + "properties": { + "status": { + "enum": [ + "succeeded", + "failed" + ] + }, + "worktreeRemoved": { + "type": "boolean" + }, + "lockReleased": { + "type": "boolean" + }, + "error": { + "type": [ + "string", + "null" + ], + "minLength": 1, + "maxLength": 4000 + }, + "completedAt": { + "type": "string", + "format": "date-time" + } + } + }, + "terminal": { + "type": "object", + "additionalProperties": false, + "required": [ + "classification", + "reason", + "evidenceRefs", + "completedAt" + ], + "properties": { + "classification": { + "enum": [ + "ready-for-human-review", + "human-decision-required", + "failed", + "cancelled" + ] + }, + "reason": { + "type": [ + "string", + "null" + ], + "minLength": 1, + "maxLength": 4000 + }, + "evidenceRefs": { + "type": "array", + "items": { + "type": "string", + "minLength": 1, + "maxLength": 4096 + } + }, + "completedAt": { + "type": "string", + "format": "date-time" + } + } + } + } +} diff --git a/runtime/schemas/delegation-spec.v1.json b/runtime/schemas/delegation-spec.v1.json index 9e71b5d..78db221 100644 --- a/runtime/schemas/delegation-spec.v1.json +++ b/runtime/schemas/delegation-spec.v1.json @@ -28,6 +28,7 @@ }, "writeAllowlist": { "type": "array", + "maxItems": 512, "items": { "type": "string" }, @@ -35,6 +36,7 @@ }, "allowedTestDeletions": { "type": "array", + "maxItems": 512, "items": { "type": "string", "minLength": 1 @@ -42,12 +44,14 @@ }, "forbiddenScope": { "type": "array", + "maxItems": 512, "items": { "type": "string" } }, "successCriteria": { "type": "array", + "maxItems": 64, "items": { "type": "string", "minLength": 1 @@ -56,6 +60,7 @@ }, "verification": { "type": "array", + "maxItems": 32, "items": { "type": "object", "additionalProperties": false, @@ -77,6 +82,7 @@ }, "args": { "type": "array", + "maxItems": 256, "items": { "type": "string" } @@ -103,6 +109,7 @@ }, "expectedExitCodes": { "type": "array", + "maxItems": 32, "items": { "type": "integer" } @@ -112,6 +119,7 @@ }, "baselineFailureExitCodes": { "type": "array", + "maxItems": 32, "items": { "type": "integer" }, "minItems": 1 }, @@ -121,6 +129,7 @@ "properties": { "os": { "type": "array", + "maxItems": 8, "items": { "enum": [ "darwin", @@ -131,6 +140,7 @@ }, "arch": { "type": "array", + "maxItems": 8, "items": { "type": "string" } @@ -149,6 +159,7 @@ }, "slices": { "type": "array", + "maxItems": 32, "minItems": 1, "items": { "type": "object", @@ -171,6 +182,7 @@ }, "writeAllowlist": { "type": "array", + "maxItems": 512, "items": { "type": "string" }, @@ -178,6 +190,7 @@ }, "allowedTestDeletions": { "type": "array", + "maxItems": 512, "items": { "type": "string", "minLength": 1 @@ -185,12 +198,14 @@ }, "forbiddenScope": { "type": "array", + "maxItems": 512, "items": { "type": "string" } }, "successCriteria": { "type": "array", + "maxItems": 64, "items": { "type": "string", "minLength": 1 @@ -202,6 +217,7 @@ }, "dependsOn": { "type": "array", + "maxItems": 32, "items": { "type": "integer", "minimum": 1 }, "uniqueItems": true, "description": "1-based indices of the slices this slice must observe before it runs. Omit to depend on every preceding slice, which reproduces sequential execution." @@ -219,6 +235,7 @@ }, "producerPreferences": { "type": "array", + "maxItems": 16, "items": { "type": "string" } @@ -248,6 +265,7 @@ "properties": { "reviewers": { "type": "array", + "maxItems": 8, "minItems": 1, "items": { "enum": [ @@ -263,6 +281,7 @@ }, "focus": { "type": "array", + "maxItems": 32, "minItems": 1, "items": { "type": "string", diff --git a/runtime/schemas/final-branch-report.v1.json b/runtime/schemas/final-branch-report.v2.json similarity index 91% rename from runtime/schemas/final-branch-report.v1.json rename to runtime/schemas/final-branch-report.v2.json index a0f4bf5..a65569e 100644 --- a/runtime/schemas/final-branch-report.v1.json +++ b/runtime/schemas/final-branch-report.v2.json @@ -18,7 +18,7 @@ "evaluatedAt" ], "properties": { - "reportVersion": { "const": "1" }, + "reportVersion": { "const": "2" }, "workflowId": { "type": "string", "minLength": 1 }, "baseCommitOid": { "type": "string", "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" }, "headCommitOid": { "type": "string", "pattern": "^(?:[0-9a-f]{40}|[0-9a-f]{64})$" }, @@ -38,7 +38,7 @@ "type": "array", "items": { "type": "string", "minLength": 1 } }, - "status": { "enum": ["ready-to-ship", "human-decision-required"] }, + "status": { "enum": ["ready-for-human-review", "human-decision-required"] }, "evaluatedAt": { "type": "string", "format": "date-time" } } } diff --git a/runtime/server.mjs b/runtime/server.mjs index f917931..fcf2cb1 100644 --- a/runtime/server.mjs +++ b/runtime/server.mjs @@ -419,11 +419,11 @@ var require_codegen = __commonJS({ const rhs = this.rhs === void 0 ? "" : ` = ${this.rhs}`; return `${varKind} ${this.name}${rhs};` + _n; } - optimizeNames(names, constants15) { + optimizeNames(names, constants18) { if (!names[this.name.str]) return; if (this.rhs) - this.rhs = optimizeExpr(this.rhs, names, constants15); + this.rhs = optimizeExpr(this.rhs, names, constants18); return this; } get names() { @@ -440,10 +440,10 @@ var require_codegen = __commonJS({ render({ _n }) { return `${this.lhs} = ${this.rhs};` + _n; } - optimizeNames(names, constants15) { + optimizeNames(names, constants18) { if (this.lhs instanceof code_1.Name && !names[this.lhs.str] && !this.sideEffects) return; - this.rhs = optimizeExpr(this.rhs, names, constants15); + this.rhs = optimizeExpr(this.rhs, names, constants18); return this; } get names() { @@ -504,8 +504,8 @@ var require_codegen = __commonJS({ optimizeNodes() { return `${this.code}` ? this : void 0; } - optimizeNames(names, constants15) { - this.code = optimizeExpr(this.code, names, constants15); + optimizeNames(names, constants18) { + this.code = optimizeExpr(this.code, names, constants18); return this; } get names() { @@ -534,12 +534,12 @@ var require_codegen = __commonJS({ } return nodes.length > 0 ? this : void 0; } - optimizeNames(names, constants15) { + optimizeNames(names, constants18) { const { nodes } = this; let i = nodes.length; while (i--) { const n = nodes[i]; - if (n.optimizeNames(names, constants15)) + if (n.optimizeNames(names, constants18)) continue; subtractNames(names, n.names); nodes.splice(i, 1); @@ -592,12 +592,12 @@ var require_codegen = __commonJS({ return void 0; return this; } - optimizeNames(names, constants15) { + optimizeNames(names, constants18) { var _a3; - this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants15); - if (!(super.optimizeNames(names, constants15) || this.else)) + this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants18); + if (!(super.optimizeNames(names, constants18) || this.else)) return; - this.condition = optimizeExpr(this.condition, names, constants15); + this.condition = optimizeExpr(this.condition, names, constants18); return this; } get names() { @@ -620,10 +620,10 @@ var require_codegen = __commonJS({ render(opts) { return `for(${this.iteration})` + super.render(opts); } - optimizeNames(names, constants15) { - if (!super.optimizeNames(names, constants15)) + optimizeNames(names, constants18) { + if (!super.optimizeNames(names, constants18)) return; - this.iteration = optimizeExpr(this.iteration, names, constants15); + this.iteration = optimizeExpr(this.iteration, names, constants18); return this; } get names() { @@ -659,10 +659,10 @@ var require_codegen = __commonJS({ render(opts) { return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(opts); } - optimizeNames(names, constants15) { - if (!super.optimizeNames(names, constants15)) + optimizeNames(names, constants18) { + if (!super.optimizeNames(names, constants18)) return; - this.iterable = optimizeExpr(this.iterable, names, constants15); + this.iterable = optimizeExpr(this.iterable, names, constants18); return this; } get names() { @@ -704,11 +704,11 @@ var require_codegen = __commonJS({ (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNodes(); return this; } - optimizeNames(names, constants15) { + optimizeNames(names, constants18) { var _a3, _b; - super.optimizeNames(names, constants15); - (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants15); - (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants15); + super.optimizeNames(names, constants18); + (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants18); + (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants18); return this; } get names() { @@ -1009,7 +1009,7 @@ var require_codegen = __commonJS({ function addExprNames(names, from) { return from instanceof code_1._CodeOrName ? addNames(names, from.names) : names; } - function optimizeExpr(expr, names, constants15) { + function optimizeExpr(expr, names, constants18) { if (expr instanceof code_1.Name) return replaceName(expr); if (!canOptimize(expr)) @@ -1024,14 +1024,14 @@ var require_codegen = __commonJS({ return items; }, [])); function replaceName(n) { - const c = constants15[n.str]; + const c = constants18[n.str]; if (c === void 0 || names[n.str] !== 1) return n; delete names[n.str]; return c; } function canOptimize(e) { - return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants15[c.str] !== void 0); + return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants18[c.str] !== void 0); } } function subtractNames(names, from) { @@ -3238,8 +3238,8 @@ var require_utils = __commonJS({ } return ind; } - function removeDotSegments(path35) { - let input = path35; + function removeDotSegments(path43) { + let input = path43; const output = []; let nextSlash = -1; let len = 0; @@ -3491,8 +3491,8 @@ var require_schemes = __commonJS({ wsComponent.secure = void 0; } if (wsComponent.resourceName) { - const [path35, query] = wsComponent.resourceName.split("?"); - wsComponent.path = path35 && path35 !== "/" ? path35 : void 0; + const [path43, query] = wsComponent.resourceName.split("?"); + wsComponent.path = path43 && path43 !== "/" ? path43 : void 0; wsComponent.query = query; wsComponent.resourceName = void 0; } @@ -4352,15 +4352,15 @@ var require_core = __commonJS({ } return metaSchema; } - _removeAllSchemas(schemas7, regex) { - for (const keyRef in schemas7) { - const sch = schemas7[keyRef]; + _removeAllSchemas(schemas6, regex) { + for (const keyRef in schemas6) { + const sch = schemas6[keyRef]; if (!regex || regex.test(keyRef)) { if (typeof sch == "string") { - delete schemas7[keyRef]; + delete schemas6[keyRef]; } else if (sch && !sch.meta) { this._cache.delete(sch.schema); - delete schemas7[keyRef]; + delete schemas6[keyRef]; } } } @@ -8176,8 +8176,8 @@ function getErrorMap() { // node_modules/zod/v3/helpers/parseUtil.js var makeIssue = (params) => { - const { data, path: path35, errorMaps, issueData } = params; - const fullPath = [...path35, ...issueData.path || []]; + const { data, path: path43, errorMaps, issueData } = params; + const fullPath = [...path43, ...issueData.path || []]; const fullIssue = { ...issueData, path: fullPath @@ -8292,11 +8292,11 @@ var errorUtil; // node_modules/zod/v3/types.js var ParseInputLazyPath = class { - constructor(parent, value, path35, key) { + constructor(parent, value, path43, key) { this._cachedPath = []; this.parent = parent; this.data = value; - this._path = path35; + this._path = path43; this._key = key; } get path() { @@ -10748,12 +10748,12 @@ var ZodTuple = class _ZodTuple extends ZodType { }); } }; -ZodTuple.create = (schemas7, params) => { - if (!Array.isArray(schemas7)) { +ZodTuple.create = (schemas6, params) => { + if (!Array.isArray(schemas6)) { throw new Error("You must pass an array of schemas to z.tuple([ ... ])"); } return new ZodTuple({ - items: schemas7, + items: schemas6, typeName: ZodFirstPartyTypeKind.ZodTuple, rest: null, ...processCreateParams(params) @@ -12216,10 +12216,10 @@ function mergeDefs(...defs) { function cloneDef(schema) { return mergeDefs(schema._zod.def); } -function getElementAtPath(obj, path35) { - if (!path35) +function getElementAtPath(obj, path43) { + if (!path43) return obj; - return path35.reduce((acc, key) => acc?.[key], obj); + return path43.reduce((acc, key) => acc?.[key], obj); } function promiseAllObject(promisesObj) { const keys = Object.keys(promisesObj); @@ -12628,11 +12628,11 @@ function explicitlyAborted(x, startIndex = 0) { } return false; } -function prefixIssues(path35, issues) { +function prefixIssues(path43, issues) { return issues.map((iss) => { var _a3; (_a3 = iss).path ?? (_a3.path = []); - iss.path.unshift(path35); + iss.path.unshift(path43); return iss; }); } @@ -12779,16 +12779,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) { } function formatError(error51, mapper = (issue2) => issue2.message) { const fieldErrors = { _errors: [] }; - const processError = (error52, path35 = []) => { + const processError = (error52, path43 = []) => { for (const issue2 of error52.issues) { if (issue2.code === "invalid_union" && issue2.errors.length) { - issue2.errors.map((issues) => processError({ issues }, [...path35, ...issue2.path])); + issue2.errors.map((issues) => processError({ issues }, [...path43, ...issue2.path])); } else if (issue2.code === "invalid_key") { - processError({ issues: issue2.issues }, [...path35, ...issue2.path]); + processError({ issues: issue2.issues }, [...path43, ...issue2.path]); } else if (issue2.code === "invalid_element") { - processError({ issues: issue2.issues }, [...path35, ...issue2.path]); + processError({ issues: issue2.issues }, [...path43, ...issue2.path]); } else { - const fullpath = [...path35, ...issue2.path]; + const fullpath = [...path43, ...issue2.path]; if (fullpath.length === 0) { fieldErrors._errors.push(mapper(issue2)); } else { @@ -12815,17 +12815,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) { } function treeifyError(error51, mapper = (issue2) => issue2.message) { const result = { errors: [] }; - const processError = (error52, path35 = []) => { + const processError = (error52, path43 = []) => { var _a3, _b; for (const issue2 of error52.issues) { if (issue2.code === "invalid_union" && issue2.errors.length) { - issue2.errors.map((issues) => processError({ issues }, [...path35, ...issue2.path])); + issue2.errors.map((issues) => processError({ issues }, [...path43, ...issue2.path])); } else if (issue2.code === "invalid_key") { - processError({ issues: issue2.issues }, [...path35, ...issue2.path]); + processError({ issues: issue2.issues }, [...path43, ...issue2.path]); } else if (issue2.code === "invalid_element") { - processError({ issues: issue2.issues }, [...path35, ...issue2.path]); + processError({ issues: issue2.issues }, [...path43, ...issue2.path]); } else { - const fullpath = [...path35, ...issue2.path]; + const fullpath = [...path43, ...issue2.path]; if (fullpath.length === 0) { result.errors.push(mapper(issue2)); continue; @@ -12857,8 +12857,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) { } function toDotPath(_path) { const segs = []; - const path35 = _path.map((seg) => typeof seg === "object" ? seg.key : seg); - for (const seg of path35) { + const path43 = _path.map((seg) => typeof seg === "object" ? seg.key : seg); + for (const seg of path43) { if (typeof seg === "number") segs.push(`[${seg}]`); else if (typeof seg === "symbol") @@ -23736,7 +23736,7 @@ function toJSONSchema(input, params) { const [_, schema] = entry; process2(schema, ctx2); } - const schemas7 = {}; + const schemas6 = {}; const external = { registry: registry3, uri: params?.uri, @@ -23746,15 +23746,15 @@ function toJSONSchema(input, params) { for (const entry of registry3._idmap.entries()) { const [key, schema] = entry; extractDefs(ctx2, schema); - schemas7[key] = finalize(ctx2, schema); + schemas6[key] = finalize(ctx2, schema); } if (Object.keys(defs).length > 0) { const defsSegment = ctx2.target === "draft-2020-12" ? "$defs" : "definitions"; - schemas7.__shared = { + schemas6.__shared = { [defsSegment]: defs }; } - return { schemas: schemas7 }; + return { schemas: schemas6 }; } const ctx = initializeContext({ ...params, processors: allProcessors }); process2(input, ctx); @@ -23970,11 +23970,11 @@ function normalizeObjectSchema(schema) { } return void 0; } -function getDotPath(path35) { - if (path35.length === 0) { +function getDotPath(path43) { + if (path43.length === 0) { return "object root"; } - return path35.reduce((acc, seg, index) => { + return path43.reduce((acc, seg, index) => { if (index === 0) { return String(seg); } @@ -25999,13 +25999,13 @@ function resolveRef(ref, ctx) { if (!ref.startsWith("#")) { throw new Error("External $ref is not supported, only local refs (#/...) are allowed"); } - const path35 = ref.slice(1).split("/").filter(Boolean); - if (path35.length === 0) { + const path43 = ref.slice(1).split("/").filter(Boolean); + if (path43.length === 0) { return ctx.rootSchema; } const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions"; - if (path35[0] === defsKey) { - const key = path35[1]; + if (path43[0] === defsKey) { + const key = path43[1]; if (!key || !ctx.defs[key]) { throw new Error(`Reference not found: ${ref}`); } @@ -31795,166 +31795,88 @@ var EMPTY_COMPLETION_RESULT = { } }; -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js -import process3 from "node:process"; +// src/runtime/managed-worktree-root.ts +import { createHash as createHash3 } from "node:crypto"; +import { constants as constants6 } from "node:fs"; +import { lstat as lstat6, mkdir as mkdir3, open as open5, readdir as readdir3, realpath as realpath2 } from "node:fs/promises"; +import path8 from "node:path"; -// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js -var STDIO_DEFAULT_MAX_BUFFER_SIZE = 10 * 1024 * 1024; -var ReadBuffer = class { - constructor(options) { - this._maxBufferSize = options?.maxBufferSize ?? STDIO_DEFAULT_MAX_BUFFER_SIZE; - } - append(chunk) { - const newSize = (this._buffer?.length ?? 0) + chunk.length; - if (newSize > this._maxBufferSize) { - this.clear(); - throw new Error(`ReadBuffer exceeded maximum size of ${this._maxBufferSize} bytes`); - } - this._buffer = this._buffer ? Buffer.concat([this._buffer, chunk]) : chunk; - } - readMessage() { - if (!this._buffer) { - return null; - } - const index = this._buffer.indexOf("\n"); - if (index === -1) { - return null; - } - const line = this._buffer.toString("utf8", 0, index).replace(/\r$/, ""); - this._buffer = this._buffer.subarray(index + 1); - return deserializeMessage(line); - } - clear() { - this._buffer = void 0; - } +// src/platform/durable-directory.ts +import { constants as constants3 } from "node:fs"; +import { lstat as lstat3, mkdir, open as open2, readdir as readdir2 } from "node:fs/promises"; +import path5 from "node:path"; + +// src/protocol/delegation-spec.ts +var DEFAULT_REVIEW_CONFIG = { + reviewers: ["correctness", "systems"], + maxRounds: 2 }; -function deserializeMessage(line) { - return JSONRPCMessageSchema.parse(JSON.parse(line)); +var DEFAULT_IMPLEMENTATION_CONFIG = { + maxIncrements: 1 +}; +function resolveReviewConfig(spec) { + return spec.review ?? DEFAULT_REVIEW_CONFIG; } -function serializeMessage(message) { - return JSON.stringify(message) + "\n"; +function resolveImplementationConfig(spec) { + return spec.implementation ?? DEFAULT_IMPLEMENTATION_CONFIG; } - -// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js -var StdioServerTransport = class { - constructor(_stdin = process3.stdin, _stdout = process3.stdout, options) { - this._stdin = _stdin; - this._stdout = _stdout; - this._started = false; - this._ondata = (chunk) => { - try { - this._readBuffer.append(chunk); - this.processReadBuffer(); - } catch (error51) { - this.onerror?.(error51); - this.close().catch(() => { - }); - } - }; - this._onerror = (error51) => { - this.onerror?.(error51); - }; - this._readBuffer = new ReadBuffer({ maxBufferSize: options?.maxBufferSize }); - } - /** - * Starts listening for messages on stdin. - */ - async start() { - if (this._started) { - throw new Error("StdioServerTransport already started! If using Server class, note that connect() calls start() automatically."); - } - this._started = true; - this._stdin.on("data", this._ondata); - this._stdin.on("error", this._onerror); - } - processReadBuffer() { - while (true) { - try { - const message = this._readBuffer.readMessage(); - if (message === null) { - break; - } - this.onmessage?.(message); - } catch (error51) { - this.onerror?.(error51); - } - } - } - async close() { - this._stdin.off("data", this._ondata); - this._stdin.off("error", this._onerror); - const remainingDataListeners = this._stdin.listenerCount("data"); - if (remainingDataListeners === 0) { - this._stdin.pause(); - } - this._readBuffer.clear(); - this.onclose?.(); - } - send(message) { - return new Promise((resolve2) => { - const json2 = serializeMessage(message); - if (this._stdout.write(json2)) { - resolve2(); - } else { - this._stdout.once("drain", resolve2); - } - }); +function resolveSlices(spec) { + return spec.slices ?? []; +} +var DEFAULT_SLICE_CONCURRENCY = 1; +function resolveSliceConcurrency(spec) { + return spec.sliceConcurrency ?? DEFAULT_SLICE_CONCURRENCY; +} +function resolveSliceDependencies(slices, index) { + const declared = slices[index - 1]?.dependsOn; + if (declared === void 0) { + return Array.from({ length: index - 1 }, (_, offset) => offset + 1); } -}; - -// src/mcp/server.ts -import path34 from "node:path"; - -// src/protocol/versions.ts -var PROTOCOL_VERSION = "2.0.0"; -var DELEGATION_SPEC_VERSION = "1"; -var ATTEMPT_RESULT_VERSION = "1"; -var RUNTIME_VERSION = "0.52.0"; - -// src/protocol/attempt-result.ts -var FAILURE_PRECEDENCE = [ - "invalid-specification", - "environment-defect", - // clean baseline verification failed - "unavailable", - // pre-launch unavailability - "authentication-required", - // pre-launch; never triggers fallback - "spawn-failure", - "cancelled", - // per the initiating runtime event - "timeout", - "sandbox-violation", - "invalid-output", - "producer-failure", - "verification-failure" -]; -function classifyFailure(s) { - for (const reason of FAILURE_PRECEDENCE) if (s[reason]) return reason; - return null; + return [...declared].sort((left, right) => left - right); } +var RUNTIME_MAX_TIMEOUT_MS = 18e5; +var RUNTIME_MIN_EDIT_TIMEOUT_MS = 6e5; -// src/mcp/doctor.ts -import { createHash as createHash5 } from "node:crypto"; -import { constants as constants6 } from "node:fs"; -import { lstat as lstat6, open as open6, readdir as readdir4, realpath as realpath5 } from "node:fs/promises"; -import path14 from "node:path"; -import nodeProcess5 from "node:process"; - -// src/autopilot/workflow-store.ts -import { createHash as createHash3, randomUUID as randomUUID2 } from "node:crypto"; -import { constants as constants4 } from "node:fs"; -import { - lstat as lstat4, - link as link2, - mkdir as mkdir2, - open as open3, - readdir as readdir3, - realpath as realpath2, - rename, - rm as rm2 -} from "node:fs/promises"; -import path6 from "node:path"; +// src/platform/process-supervisor.ts +async function supervise(ps, req, opts) { + if (!(req.timeoutMs > 0 && req.timeoutMs <= RUNTIME_MAX_TIMEOUT_MS)) throw new Error("invalid timeout"); + const proc = await ps.spawnSupervised(req); + let timedOut = false, cancelled = false; + let settled = false; + const grace = opts.graceMs ?? 3e3; + const graceTimers = /* @__PURE__ */ new Set(); + const escalate = () => { + if (settled) return; + const timer2 = setTimeout(() => { + graceTimers.delete(timer2); + if (!settled) void ps.terminateProcessTree(proc).catch(() => { + }); + }, grace); + graceTimers.add(timer2); + }; + const cancelCooperatively = () => { + void Promise.resolve().then(() => ps.requestCooperativeCancellation(proc)).catch(() => { + }).then(escalate); + }; + const timer = setTimeout(() => { + timedOut = true; + cancelCooperatively(); + }, req.timeoutMs); + const onAbort = () => { + cancelled = true; + cancelCooperatively(); + }; + opts.onCancel?.addEventListener("abort", onAbort, { once: true }); + try { + const exit = await proc.done; + return { ...exit, timedOut: timedOut || exit.timedOut, cancelled: cancelled || exit.cancelled }; + } finally { + settled = true; + clearTimeout(timer); + for (const t of graceTimers) clearTimeout(t); + opts.onCancel?.removeEventListener("abort", onAbort); + } +} // src/platform/posix-platform-services.ts import { spawn, execFile } from "node:child_process"; @@ -32009,6 +31931,12 @@ var NestedDelegationError = class extends RuntimeError { this.name = "NestedDelegationError"; } }; +function errorCode(error51) { + return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; +} +function isMissing(error51) { + return errorCode(error51) === "ENOENT"; +} // src/git/git-output.ts function gitNulRecords(stdout, description) { @@ -32068,12 +31996,6 @@ var LOCK_RETRY_MS = 30; var LOCK_TIMEOUT_MS = nodeProcess2.platform === "win32" ? 15e3 : 2500; var OWNER_PROBE_TIMEOUT_MS = 1e3; var SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]{0,127}$/; -function isMissing(error51) { - return errorCode(error51) === "ENOENT"; -} -function errorCode(error51) { - return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; -} function delay(ms) { return new Promise((resolve2) => setTimeout(resolve2, ms)); } @@ -32083,9 +32005,6 @@ function isRecord(value) { function isPlainDirectory(metadata) { return metadata.isDirectory() && !metadata.isSymbolicLink(); } -function sameIdentity(left, right) { - return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; -} async function plainDirectoryIdentity(directoryPath) { try { const metadata = await lstat(directoryPath, { bigint: true }); @@ -32154,7 +32073,7 @@ async function readHandleBytes(handle, length) { } async function removeLockIfUnchanged(lockPath, handle, expectedIdentity, expectedContents, expectedLinks = 1) { const beforeMetadata = await handle.stat({ bigint: true }); - if (!beforeMetadata.isFile() || beforeMetadata.isSymbolicLink() || !sameIdentity(beforeMetadata, expectedIdentity) || beforeMetadata.nlink !== BigInt(expectedLinks) || beforeMetadata.size !== BigInt(expectedContents.byteLength)) { + if (!beforeMetadata.isFile() || beforeMetadata.isSymbolicLink() || !sameDirectoryIdentity(beforeMetadata, expectedIdentity) || beforeMetadata.nlink !== BigInt(expectedLinks) || beforeMetadata.size !== BigInt(expectedContents.byteLength)) { return false; } const currentBytes = await readHandleBytes(handle, expectedContents.byteLength); @@ -32230,7 +32149,6 @@ async function reclaimDeadCheckoutLocks(locksRoot, isProcessAlive2, getProcessSt await reclaimDeadLock(lockPath, isProcessAlive2, getProcessStartToken); } } -var reclaimLocks = reclaimDeadCheckoutLocks; async function lockIsOwnedByLiveProcess(locksRoot, lockKey, isProcessAlive2, getProcessStartToken) { let contents; try { @@ -32312,6 +32230,10 @@ async function describeLockContention(key, getProcessStartToken) { const self = owner.pid === nodeProcess2.pid ? " (this same process)" : ""; return `it is held by live pid ${owner.pid}${self}${extras}`; } +var LOCK_CONTENDED = "lock-contended"; +function isLockContention(error51) { + return error51 instanceof RuntimeError && error51.detail?.classification === LOCK_CONTENDED; +} async function withLockContentionDetail(error51, key, getProcessStartToken) { if (!(error51 instanceof RuntimeError)) return error51; let description; @@ -32326,8 +32248,8 @@ async function withLockContentionDetail(error51, key, getProcessStartToken) { async function acquireWxFileLock(key, timeoutMessage, ownerToken = null, owner = {}) { const targetLockPath = lockFilePath(key); const locksDir = path.dirname(targetLockPath); - const { mkdir: mkdir10 } = await import("node:fs/promises"); - await mkdir10(locksDir, { recursive: true }); + const { mkdir: mkdir11 } = await import("node:fs/promises"); + await mkdir11(locksDir, { recursive: true }); const deadline = Date.now() + LOCK_TIMEOUT_MS; for (; ; ) { try { @@ -32362,7 +32284,10 @@ async function acquireWxFileLock(key, timeoutMessage, ownerToken = null, owner = } catch (error51) { if (errorCode(error51) !== "EEXIST") throw error51; if (Date.now() >= deadline) { - throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { key }); + throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { + key, + classification: LOCK_CONTENDED + }); } await delay(LOCK_RETRY_MS); } @@ -32370,12 +32295,12 @@ async function acquireWxFileLock(key, timeoutMessage, ownerToken = null, owner = } async function validateLockParentIdentity(parentPath, expectedIdentity) { const metadata = await lstat(parentPath, { bigint: true }); - if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expectedIdentity)) { + if (!isPlainDirectory(metadata) || !sameDirectoryIdentity(metadata, expectedIdentity)) { throw new RuntimeError("recovery lock parent identity changed"); } } function isExpectedLockMetadata(metadata, expectedIdentity, expectedSize, expectedLinks) { - return metadata.isFile() && !metadata.isSymbolicLink() && metadata.nlink === BigInt(expectedLinks) && sameIdentity(metadata, expectedIdentity) && metadata.size === BigInt(expectedSize) && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; + return metadata.isFile() && !metadata.isSymbolicLink() && metadata.nlink === BigInt(expectedLinks) && sameDirectoryIdentity(metadata, expectedIdentity) && metadata.size === BigInt(expectedSize) && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; } async function validateOwnedLockState(handle, namedPaths, expectedIdentity, expectedContents, expectedLinks, parentPath, parentIdentity) { const validateHandle = async () => { @@ -32441,7 +32366,7 @@ async function removeExpectedLockPath(filename, expectedIdentity, expectedConten async function pathNamesLockIdentity(filename, expectedIdentity) { try { const metadata = await lstat(filename, { bigint: true }); - return metadata.isFile() && !metadata.isSymbolicLink() && sameIdentity(metadata, expectedIdentity); + return metadata.isFile() && !metadata.isSymbolicLink() && sameDirectoryIdentity(metadata, expectedIdentity); } catch (error51) { if (isMissing(error51)) return false; throw error51; @@ -32684,9 +32609,6 @@ async function releaseOwnedLock(lock) { // src/platform/posix-platform-services.ts var CLEANUP_JOURNAL_LOCK_KEY = createHash("sha256").update("claude-architect:cleanup-journal:v1").digest("hex"); -function errorCode2(error51) { - return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; -} async function gitCommonDir(cwd) { return new Promise((resolve2, reject) => { execFile("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd }, (error51, stdout) => { @@ -32709,7 +32631,7 @@ function killProcessGroup(pid, signal) { try { nodeProcess3.kill(-pid, signal); } catch (error51) { - if (errorCode2(error51) !== "ESRCH") throw error51; + if (errorCode(error51) !== "ESRCH") throw error51; } } var PosixPlatformServices = class { @@ -32794,8 +32716,8 @@ var PosixPlatformServices = class { if (!Number.isSafeInteger(pid) || pid <= 1) return null; if (nodeProcess3.platform === "linux") { try { - const stat = await fs.readFile(`/proc/${pid}/stat`, "utf8"); - const afterComm = stat.slice(stat.lastIndexOf(")") + 2).split(" "); + const stat2 = await fs.readFile(`/proc/${pid}/stat`, "utf8"); + const afterComm = stat2.slice(stat2.lastIndexOf(")") + 2).split(" "); const starttime = afterComm[19]; return starttime ? `linux:${starttime}` : null; } catch { @@ -32871,9 +32793,9 @@ import { execFile as execFile2, spawn as spawn2 } from "node:child_process"; import { createHash as createHash2 } from "node:crypto"; import { promises as fs2 } from "node:fs"; import { tmpdir as tmpdir3 } from "node:os"; -import path5 from "node:path"; +import path3 from "node:path"; import nodeProcess4 from "node:process"; -import { fileURLToPath as fileURLToPath2 } from "node:url"; +import { fileURLToPath } from "node:url"; // src/platform/windows-env.ts var CANONICAL = new Map(["Path", "SystemRoot", "ComSpec", "TEMP", "TMP", "USERPROFILE", "APPDATA", "LOCALAPPDATA"].map((name) => [name.toLowerCase(), name])); @@ -32893,97 +32815,360 @@ function windowsEssentialEnvironment(env = process.env) { ); } -// src/platform/durable-directory.ts -import { constants as constants3 } from "node:fs"; -import { lstat as lstat3, mkdir, open as open2, readdir as readdir2 } from "node:fs/promises"; -import path4 from "node:path"; - -// src/protocol/delegation-spec.ts -var DEFAULT_REVIEW_CONFIG = { - reviewers: ["correctness", "systems"], - maxRounds: 2 -}; -var DEFAULT_IMPLEMENTATION_CONFIG = { - maxIncrements: 1 -}; -function resolveReviewConfig(spec) { - return spec.review ?? DEFAULT_REVIEW_CONFIG; +// src/platform/windows-platform-services.ts +var childHandles = /* @__PURE__ */ new WeakMap(); +function resolveJobKillHelper(pluginRoot2, arch) { + const helperPath = path3.join(pluginRoot2, "native", "bin", `win32-job-kill-${arch}.exe`); + return { + path: helperPath, + async checkAvailable() { + try { + await fs2.access(helperPath); + return true; + } catch { + return false; + } + } + }; } -function resolveImplementationConfig(spec) { - return spec.implementation ?? DEFAULT_IMPLEMENTATION_CONFIG; +async function findPluginRoot() { + let directory = path3.dirname(fileURLToPath(import.meta.url)); + for (; ; ) { + try { + await fs2.access(path3.join(directory, "package.json")); + return directory; + } catch { + } + const parent = path3.dirname(directory); + if (parent === directory) throw new RuntimeError("unable to locate plugin root"); + directory = parent; + } } -function resolveSlices(spec) { - return spec.slices ?? []; +async function packageBinEntries(request, directory, fileSystem) { + const packageDirectory = path3.win32.join(directory, "node_modules", request.name); + const packagePath = path3.win32.join(packageDirectory, "package.json"); + if (!await fileSystem.isFile(packagePath.toLowerCase())) return []; + try { + const parsed = JSON.parse(await fileSystem.readFile(packagePath)); + if (typeof parsed !== "object" || parsed === null || !("bin" in parsed)) return []; + const bin = parsed.bin; + if (typeof bin === "string") { + return [path3.win32.relative(directory, path3.win32.join(packageDirectory, bin))]; + } + if (typeof bin !== "object" || bin === null) return []; + const namedBin = bin[request.name]; + if (typeof namedBin === "string") { + return [path3.win32.relative(directory, path3.win32.join(packageDirectory, namedBin))]; + } + } catch { + return []; + } + return []; } -var DEFAULT_SLICE_CONCURRENCY = 1; -function resolveSliceConcurrency(spec) { - return spec.sliceConcurrency ?? DEFAULT_SLICE_CONCURRENCY; +async function resolveWindowsExecutable(request, deps) { + if (request.explicitPath !== void 0) { + if (!await deps.fs.isFile(request.explicitPath.toLowerCase())) { + throw new RuntimeError(`executable is not accessible: ${request.explicitPath}`, { + path: request.explicitPath + }); + } + return { + kind: "native", + command: request.explicitPath, + prefixArgs: [], + resolvedFrom: `explicit:${request.explicitPath}` + }; + } + for (const directory of deps.pathEntries) { + for (const extension of deps.pathext) { + const candidate = path3.win32.join(directory, `${request.name}${extension.toLowerCase()}`); + if (!await deps.fs.isFile(candidate.toLowerCase())) continue; + const normalizedExtension = extension.toLowerCase(); + if (normalizedExtension === ".exe" || normalizedExtension === ".com") { + return { + kind: "native", + command: candidate, + prefixArgs: [], + resolvedFrom: `pathext:${candidate}` + }; + } + if (normalizedExtension === ".cmd" || normalizedExtension === ".bat") { + const entries = deps.npmEntryProbe ?? await packageBinEntries(request, directory, deps.fs); + for (const entry of entries) { + const absoluteEntry = path3.win32.join(directory, entry); + if (await deps.fs.isFile(absoluteEntry.toLowerCase())) { + return { + kind: "node-entrypoint", + command: deps.nodeExe, + prefixArgs: [absoluteEntry], + resolvedFrom: `npm-entry:${absoluteEntry}` + }; + } + } + return { + kind: "cmd-wrapper", + command: deps.comSpec ?? "C:\\Windows\\System32\\cmd.exe", + prefixArgs: ["/d", "/s", "/c", candidate], + resolvedFrom: `cmd-wrapper:${candidate}` + }; + } + } + } + throw new RuntimeError("executable was not found", { name: request.name }); } -function resolveSliceDependencies(slices, index) { - const declared = slices[index - 1]?.dependsOn; - if (declared === void 0) { - return Array.from({ length: index - 1 }, (_, offset) => offset + 1); +async function gitCommonDir2(cwd) { + return new Promise((resolve2, reject) => { + execFile2("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd }, (error51, stdout) => { + if (error51) reject(error51); + else { + try { + resolve2(gitPathOutput(stdout, "Git common directory")); + } catch (parseError) { + reject(parseError); + } + } + }); + }); +} +function canonicalizeForScope(candidate, root) { + const stripExtendedLengthPrefix = (value) => { + if (value.toUpperCase().startsWith("\\\\?\\UNC\\")) return `\\\\${value.slice(8)}`; + return value.startsWith("\\\\?\\") ? value.slice(4) : value; + }; + const normalizeVolume = (value) => value.replace( + /^[a-z]:/u, + (match) => match.toUpperCase() + ); + const normalizedCandidate = normalizeVolume( + path3.win32.normalize(stripExtendedLengthPrefix(candidate)) + ); + let normalizedRoot = normalizeVolume(path3.win32.normalize(stripExtendedLengthPrefix(root))); + if (normalizedRoot.endsWith("\\") && path3.win32.parse(normalizedRoot).root !== normalizedRoot) { + normalizedRoot = normalizedRoot.slice(0, -1); } - return [...declared].sort((left, right) => left - right); + return normalizedCandidate === normalizedRoot || normalizedCandidate.startsWith(`${normalizedRoot}\\`); } -var RUNTIME_MAX_TIMEOUT_MS = 18e5; -var RUNTIME_MIN_EDIT_TIMEOUT_MS = 6e5; - -// src/platform/process-supervisor.ts -async function supervise(ps, req, opts) { - if (!(req.timeoutMs > 0 && req.timeoutMs <= RUNTIME_MAX_TIMEOUT_MS)) throw new Error("invalid timeout"); - const proc = await ps.spawnSupervised(req); - let timedOut = false, cancelled = false; - let settled = false; - const grace = opts.graceMs ?? 3e3; - const graceTimers = /* @__PURE__ */ new Set(); - const escalate = () => { - if (settled) return; - const timer2 = setTimeout(() => { - graceTimers.delete(timer2); - if (!settled) void ps.terminateProcessTree(proc).catch(() => { +var WindowsPlatformServices = class { + constructor(pluginRoot2, arch = nodeProcess4.arch, tokenExecFile = execFile2) { + this.pluginRoot = pluginRoot2; + this.arch = arch; + this.tokenExecFile = tokenExecFile; + } + pluginRoot; + arch; + tokenExecFile; + os = "win32"; + ownProcessStartToken; + async jobKillHelper() { + return resolveJobKillHelper(this.pluginRoot ?? await findPluginRoot(), this.arch); + } + async runJobKillHelper(pid) { + const helper = await this.jobKillHelper(); + await new Promise((resolve2, reject) => { + this.tokenExecFile(helper.path, [String(pid)], { + windowsHide: true, + shell: false, + env: windowsEssentialEnvironment() + }, (error51) => { + if (error51 === null || error51.code === 2) resolve2(); + else reject(new RuntimeError("windows process-tree termination failed", { + path: helper.path, + pid, + cause: error51 + })); }); - }, grace); - graceTimers.add(timer2); - }; - const cancelCooperatively = () => { - void Promise.resolve().then(() => ps.requestCooperativeCancellation(proc)).catch(() => { - }).then(escalate); - }; - const timer = setTimeout(() => { - timedOut = true; - cancelCooperatively(); - }, req.timeoutMs); - const onAbort = () => { - cancelled = true; - cancelCooperatively(); - }; - opts.onCancel?.addEventListener("abort", onAbort, { once: true }); - try { - const exit = await proc.done; - return { ...exit, timedOut: timedOut || exit.timedOut, cancelled: cancelled || exit.cancelled }; - } finally { - settled = true; - clearTimeout(timer); - for (const t of graceTimers) clearTimeout(t); - opts.onCancel?.removeEventListener("abort", onAbort); + }); + } + async resolveExecutable(request) { + const pathext = (nodeProcess4.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean).map((extension) => extension.toUpperCase()); + const pathEntries = (request.searchPath ?? nodeProcess4.env.Path ?? nodeProcess4.env.PATH ?? "").split(";").filter(Boolean); + const realFs = { + async isFile(candidate) { + try { + return (await fs2.stat(candidate)).isFile(); + } catch { + return false; + } + }, + async readFile(candidate) { + return fs2.readFile(candidate, "utf8"); + } + }; + const commonDeps = { pathEntries, pathext, fs: realFs, nodeExe: nodeProcess4.execPath }; + return nodeProcess4.env.ComSpec === void 0 ? resolveWindowsExecutable(request, commonDeps) : resolveWindowsExecutable(request, { ...commonDeps, comSpec: nodeProcess4.env.ComSpec }); + } + async spawnSupervised(req) { + const helper = await this.jobKillHelper(); + if (!await helper.checkAvailable()) { + throw new RuntimeError("windows process-tree helper missing", { path: helper.path }); + } + const child = spawn2(req.executable.command, [...req.executable.prefixArgs, ...req.args], { + cwd: req.cwd, + env: normalizeWindowsEnv(req.env), + detached: false, + windowsHide: true, + stdio: ["pipe", "pipe", "pipe"] + }); + const outBuf = new BoundedBuffer(req.maxOutputBytes), errBuf = new BoundedBuffer(req.maxOutputBytes); + child.stdout.on("data", (c) => outBuf.push(c)); + child.stderr.on("data", (c) => errBuf.push(c)); + if (req.stdin != null) { + child.stdin?.on("error", () => { + }); + child.stdin?.write(req.stdin); + child.stdin?.end(); + } + let settled = false; + const done = new Promise((resolve2) => { + const finish = (e) => { + if (!settled) { + settled = true; + resolve2(e); + } + }; + child.on("error", (err) => finish({ + exitCode: null, + signal: null, + timedOut: false, + cancelled: false, + stdout: outBuf.toString(), + stderr: errBuf.toString(), + truncated: { stdout: outBuf.truncated, stderr: errBuf.truncated }, + spawnError: err + })); + child.on("close", (code, signal) => finish({ + exitCode: code, + signal, + timedOut: false, + cancelled: false, + stdout: outBuf.toString(), + stderr: errBuf.toString(), + truncated: { stdout: outBuf.truncated, stderr: errBuf.truncated } + })); + }); + const proc = { pid: child.pid ?? -1, done, stdout: child.stdout, stderr: child.stderr }; + childHandles.set(proc, child); + return proc; + } + async requestCooperativeCancellation(proc) { + const child = childHandles.get(proc); + if (child === void 0) return; + try { + child.kill("SIGTERM"); + } catch { + } } + async terminateProcessTree(proc) { + await this.runJobKillHelper(proc.pid); + } + async getProcessStartToken(pid) { + if (!Number.isSafeInteger(pid) || pid <= 1) return null; + if (pid === nodeProcess4.pid && this.ownProcessStartToken !== void 0) { + return this.ownProcessStartToken; + } + try { + const helper = await this.jobKillHelper(); + if (await helper.checkAvailable()) { + const nativeToken = await new Promise((resolve2) => { + try { + this.tokenExecFile( + helper.path, + ["token", String(pid)], + { + windowsHide: true, + shell: false, + env: windowsEssentialEnvironment() + }, + (error51, stdout) => { + const token = stdout.trim(); + if (error51 === null && token.length > 0) resolve2(`win32:${token}`); + else if (error51?.code === 2) resolve2(null); + else resolve2(void 0); + } + ); + } catch { + resolve2(void 0); + } + }); + if (nativeToken !== void 0) { + if (pid === nodeProcess4.pid && nativeToken !== null) this.ownProcessStartToken = nativeToken; + return nativeToken; + } + } + } catch { + } + return null; + } + async terminateProcessTreeByPid(pid, expectedToken) { + if (typeof expectedToken === "string") { + const liveToken = await this.getProcessStartToken(pid); + if (liveToken !== expectedToken) return; + } + await this.runJobKillHelper(pid); + } + async acquireCheckoutLock(checkout, owner = {}) { + const { gitCommonDir: commonDir } = await this.canonicalizePath(checkout); + if (commonDir === null) { + throw new RuntimeError("checkout Git common directory could not be resolved"); + } + const repositoryIdentity = commonDir; + const key = createHash2("sha256").update(repositoryIdentity).digest("hex"); + const ownerToken = await this.getProcessStartToken(nodeProcess4.pid); + let lock; + try { + lock = await acquireWxFileLock(key, `checkout is locked: ${checkout}`, ownerToken, owner); + } catch (error51) { + throw await withLockContentionDetail( + error51, + key, + (pid) => this.getProcessStartToken(pid) + ); + } + return { ...lock, repositoryIdentity }; + } + async acquireCleanupJournalLock() { + const ownerToken = await this.getProcessStartToken(nodeProcess4.pid); + return acquireWxFileLock(CLEANUP_JOURNAL_LOCK_KEY, "cleanup journal is locked", ownerToken); + } + async createSecureTempDirectory() { + return fs2.mkdtemp(path3.join(tmpdir3(), "claude-architect-")); + } + async assertDirectoryWriteIntegrity(directory, expectedIdentity) { + await assertWindowsDirectoryWriteIntegrity(directory, expectedIdentity, this); + } + async canonicalizePath(input) { + const canonical = await fs2.realpath(input); + let commonDir = null; + try { + commonDir = await fs2.realpath(await gitCommonDir2(canonical)); + } catch { + commonDir = null; + } + return { input, canonical, gitCommonDir: commonDir }; + } +}; + +// src/platform/select-platform.ts +var services; +function getPlatformServices() { + if (!services) services = process.platform === "win32" ? new WindowsPlatformServices() : new PosixPlatformServices(); + return services; } // src/platform/windows-filesystem-helper.ts import { access, lstat as lstat2, realpath } from "node:fs/promises"; -import path3 from "node:path"; -import { fileURLToPath } from "node:url"; +import path4 from "node:path"; +import { fileURLToPath as fileURLToPath2 } from "node:url"; async function pluginRoot() { - let directory = path3.dirname(fileURLToPath(import.meta.url)); + let directory = path4.dirname(fileURLToPath2(import.meta.url)); for (; ; ) { try { - const packagePath = path3.join(directory, "package.json"); + const packagePath = path4.join(directory, "package.json"); const metadata = await lstat2(packagePath); if (metadata.isFile() && !metadata.isSymbolicLink()) return directory; } catch { } - const parent = path3.dirname(directory); + const parent = path4.dirname(directory); if (parent === directory) { throw new RuntimeError("unable to locate plugin root for Windows filesystem helper", { classification: "cleanup-backend-unavailable", @@ -33001,7 +33186,7 @@ async function resolveWindowsFilesystemHelper(arch = process.arch) { }); } const root = await pluginRoot(); - const expected = path3.join(root, "native", "bin", `win32-filesystem-${arch}.exe`); + const expected = path4.join(root, "native", "bin", `win32-filesystem-${arch}.exe`); let canonical; try { await access(expected); @@ -33017,7 +33202,7 @@ async function resolveWindowsFilesystemHelper(arch = process.arch) { cause: error51 }); } - if (path3.win32.normalize(canonical).toLowerCase() !== path3.win32.normalize(expected).toLowerCase()) { + if (path4.win32.normalize(canonical).toLowerCase() !== path4.win32.normalize(expected).toLowerCase()) { throw new RuntimeError("Windows filesystem helper escaped the plugin package", { classification: "cleanup-backend-unavailable", toolError: "cleanup-backend-unavailable" @@ -33046,12 +33231,12 @@ async function assertWindowsDirectoryAcl(command, directory, expectedIdentity, p executable: helper, args: [ command, - path4.toNamespacedPath(directory), + path5.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString() ], - cwd: path4.dirname(directory), + cwd: path5.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: WINDOWS_DIRECTORY_SYNC_TIMEOUT_MS, maxOutputBytes: 16384 @@ -33086,14 +33271,14 @@ async function assertWindowsDirectoryWriteIntegrity(directory, expectedIdentity, } async function ensurePrivateDirectory(directory, options) { const platformServices = options.platformServices ?? getPlatformServices(); - const syncDirectory4 = options.syncDirectory ?? syncDirectoryMetadata; + const syncDirectory = options.syncDirectory ?? syncDirectoryMetadata; let created = false; if (options.create !== false) { try { await mkdir(directory, { mode: 448 }); created = true; } catch (error51) { - if (errorCode3(error51) !== "EEXIST") throw error51; + if (errorCode(error51) !== "EEXIST") throw error51; } } const metadata = await lstat3(directory, { bigint: true }); @@ -33155,19 +33340,16 @@ async function ensurePrivateDirectory(directory, options) { throw closeError; } if (primaryError !== void 0) throw primaryError; - await syncDirectory4(directory); + await syncDirectory(directory); } } - if (created) await syncDirectory4(path4.dirname(directory)); + if (created) await syncDirectory(path5.dirname(directory)); const settled = await lstat3(directory, { bigint: true }); if (!settled.isDirectory() || settled.isSymbolicLink() || settled.dev !== identity.dev || settled.ino !== identity.ino || settled.birthtimeNs !== identity.birthtimeNs) { throw new RuntimeError(`${options.description} identity changed during privacy validation`); } return identity; } -function errorCode3(error51) { - return error51.code; -} async function closeDirectoryHandle(handle, primaryError) { try { await handle?.close(); @@ -33187,12 +33369,12 @@ async function syncWindowsDirectoryMetadata(directory, expectedIdentity, platfor executable: helper, args: [ "sync-directory", - path4.toNamespacedPath(directory), + path5.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString() ], - cwd: path4.dirname(directory), + cwd: path5.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: WINDOWS_DIRECTORY_SYNC_TIMEOUT_MS, maxOutputBytes: 16384 @@ -33203,6 +33385,21 @@ async function syncWindowsDirectoryMetadata(directory, expectedIdentity, platfor ); } } +async function flushDirectory(directory) { + let handle; + try { + handle = await open2(directory, constants3.O_RDONLY | (constants3.O_NOFOLLOW ?? 0)); + await handle.sync(); + } catch (error51) { + const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode(error51) ?? ""); + if (!unsupportedOnWindows) throw error51; + } finally { + await handle?.close(); + } +} +function sameDirectoryIdentity(left, right) { + return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; +} async function syncDirectoryMetadata(directory, dependencies = {}) { const platform = dependencies.platform ?? process.platform; const openDirectory = dependencies.open ?? open2; @@ -33227,7 +33424,7 @@ async function syncDirectoryMetadata(directory, dependencies = {}) { } await handle.sync(); } catch (error51) { - if (platform === "win32" && WINDOWS_UNSUPPORTED_DIRECTORY_CODES.has(errorCode3(error51) ?? "")) { + if (platform === "win32" && WINDOWS_UNSUPPORTED_DIRECTORY_CODES.has(errorCode(error51) ?? "")) { windowsFallbackRequired = true; } else { primaryError = error51; @@ -33249,7 +33446,7 @@ async function syncDirectoryMetadata(directory, dependencies = {}) { async function syncDirectoryTreeMetadata(directory, options = {}) { const maxDepth = options.maxDepth ?? 16; const maxEntries = options.maxEntries ?? 1024; - const syncDirectory4 = options.syncDirectory ?? syncDirectoryMetadata; + const syncDirectory = options.syncDirectory ?? syncDirectoryMetadata; let observedEntries = 0; const syncFile = async (filename) => { const initial = await lstat3(filename, { bigint: true }); @@ -33303,7 +33500,7 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { throw new RuntimeError("durable directory tree exceeds entry limit"); } for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const entryPath = path4.join(current, entry.name); + const entryPath = path5.join(current, entry.name); if (entry.isDirectory() && !entry.isSymbolicLink()) { await visit(entryPath, depth + 1); } else if (entry.isFile() && !entry.isSymbolicLink()) { @@ -33312,7 +33509,7 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { throw new RuntimeError("durable directory tree contains an unsupported entry"); } } - await syncDirectory4(current); + await syncDirectory(current); const settled = await lstat3(current, { bigint: true }); if (!settled.isDirectory() || settled.isSymbolicLink() || settled.dev !== initial.dev || settled.ino !== initial.ino || settled.birthtimeNs !== initial.birthtimeNs) { throw new RuntimeError("durable directory identity changed during tree flush"); @@ -33321,346 +33518,542 @@ async function syncDirectoryTreeMetadata(directory, options = {}) { await visit(directory, 0); } -// src/platform/windows-platform-services.ts -var childHandles = /* @__PURE__ */ new WeakMap(); -function resolveJobKillHelper(pluginRoot2, arch) { - const helperPath = path5.join(pluginRoot2, "native", "bin", `win32-job-kill-${arch}.exe`); - return { - path: helperPath, - async checkAvailable() { +// src/platform/durable-write.ts +import { randomUUID as randomUUID2 } from "node:crypto"; +import { constants as constants4 } from "node:fs"; +import { link as link2, lstat as lstat4, mkdir as mkdir2, open as open3, readFile as readFile2, rename, rm as rm2 } from "node:fs/promises"; +import path6 from "node:path"; +import nodeProcess5 from "node:process"; +var NO_FOLLOW2 = constants4.O_NOFOLLOW ?? 0; +var SAFE_COMPONENT = /^[a-z0-9][a-z0-9._-]{0,127}$/i; +function isAlreadyPresent(error51) { + return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EEXIST"; +} +function sameIdentity(left, right) { + if (left.dev !== right.dev || left.ino !== right.ino) return false; + if (left.birthtimeNs <= 0n || right.birthtimeNs <= 0n) return true; + return left.birthtimeNs === right.birthtimeNs; +} +var DurableDirectorySession = class { + directory; + identity; + policy; + handle; + closed = false; + constructor(directory, identity, policy = {}, handle) { + this.directory = directory; + this.identity = identity; + this.policy = policy; + this.handle = handle; + } + async assertIdentity() { + if (this.closed) { + throw new RuntimeError("durable directory session is closed"); + } + const current = await lstat4(this.directory, { bigint: true }); + if (!current.isDirectory() || current.isSymbolicLink() || !sameIdentity(current, this.identity)) { + throw new RuntimeError("durable directory session identity changed"); + } + } + async sync() { + if (this.closed) { + throw new RuntimeError("durable directory session is closed"); + } + if (this.policy.syncDirectory !== void 0) { + await this.policy.syncDirectory(this.directory); + return; + } + if (this.handle !== void 0) { try { - await fs2.access(helperPath); - return true; + await this.handle.sync(); + return; } catch { - return false; } } - }; -} -async function findPluginRoot() { - let directory = path5.dirname(fileURLToPath2(import.meta.url)); - for (; ; ) { + await syncDirectoryMetadata(this.directory); + } + async close() { + this.closed = true; + if (this.handle !== void 0) { + try { + await this.handle.close(); + } catch { + } + this.handle = void 0; + } + } +}; +async function openDurableDirectorySession(directory, options = {}) { + let identity; + if (options.privateDirectory === true) { + identity = await ensurePrivateDirectory(directory, { + description: options.description ?? "durable directory", + create: options.create ?? false, + migratePermissions: true, + ...options.policy?.syncDirectory === void 0 ? {} : { syncDirectory: options.policy.syncDirectory } + }); + } else { + if (options.create !== false) { + try { + await mkdir2(directory, { recursive: true, mode: 448 }); + } catch (error51) { + if (!isAlreadyPresent(error51)) throw error51; + } + } + const metadata = await lstat4(directory, { bigint: true }); + if (!metadata.isDirectory() || metadata.isSymbolicLink()) { + throw new RuntimeError(`${options.description ?? "durable directory"} must be a plain directory`); + } + identity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs + }; + } + let handle; + if (options.policy?.platform !== "win32" && nodeProcess5.platform !== "win32") { try { - await fs2.access(path5.join(directory, "package.json")); - return directory; + handle = await open3(directory, constants4.O_RDONLY | NO_FOLLOW2); } catch { } - const parent = path5.dirname(directory); - if (parent === directory) throw new RuntimeError("unable to locate plugin root"); - directory = parent; } + return new DurableDirectorySession(directory, identity, options.policy, handle); } -async function packageBinEntries(request, directory, fileSystem) { - const packageDirectory = path5.win32.join(directory, "node_modules", request.name); - const packagePath = path5.win32.join(packageDirectory, "package.json"); - if (!await fileSystem.isFile(packagePath.toLowerCase())) return []; - try { - const parsed = JSON.parse(await fileSystem.readFile(packagePath)); - if (typeof parsed !== "object" || parsed === null || !("bin" in parsed)) return []; - const bin = parsed.bin; - if (typeof bin === "string") { - return [path5.win32.relative(directory, path5.win32.join(packageDirectory, bin))]; - } - if (typeof bin !== "object" || bin === null) return []; - const namedBin = bin[request.name]; - if (typeof namedBin === "string") { - return [path5.win32.relative(directory, path5.win32.join(packageDirectory, namedBin))]; +async function renameWithRetry(source, destination, platform = nodeProcess5.platform, maxAttempts = 50) { + for (let attempt = 1; ; attempt += 1) { + try { + await rename(source, destination); + return; + } catch (error51) { + const code = typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; + const isTransientWin32 = platform === "win32" && (code === "EPERM" || code === "EACCES" || code === "EBUSY"); + if (isTransientWin32 && attempt < maxAttempts) { + await new Promise((resolve2) => setTimeout(resolve2, 50)); + continue; + } + throw error51; } - } catch { - return []; } - return []; } -async function resolveWindowsExecutable(request, deps) { - if (request.explicitPath !== void 0) { - if (!await deps.fs.isFile(request.explicitPath.toLowerCase())) { - throw new RuntimeError(`executable is not accessible: ${request.explicitPath}`, { - path: request.explicitPath - }); - } - return { - kind: "native", - command: request.explicitPath, - prefixArgs: [], - resolvedFrom: `explicit:${request.explicitPath}` - }; +async function writeAtomic(session, name, bytes, mode) { + if (path6.isAbsolute(name) || path6.basename(name) !== name || !SAFE_COMPONENT.test(name)) { + throw new RuntimeError(`atomic write target must be a safe leaf name: ${name}`); } - for (const directory of deps.pathEntries) { - for (const extension of deps.pathext) { - const candidate = path5.win32.join(directory, `${request.name}${extension.toLowerCase()}`); - if (!await deps.fs.isFile(candidate.toLowerCase())) continue; - const normalizedExtension = extension.toLowerCase(); - if (normalizedExtension === ".exe" || normalizedExtension === ".com") { - return { - kind: "native", - command: candidate, - prefixArgs: [], - resolvedFrom: `pathext:${candidate}` - }; - } - if (normalizedExtension === ".cmd" || normalizedExtension === ".bat") { - const entries = deps.npmEntryProbe ?? await packageBinEntries(request, directory, deps.fs); - for (const entry of entries) { - const absoluteEntry = path5.win32.join(directory, entry); - if (await deps.fs.isFile(absoluteEntry.toLowerCase())) { - return { - kind: "node-entrypoint", - command: deps.nodeExe, - prefixArgs: [absoluteEntry], - resolvedFrom: `npm-entry:${absoluteEntry}` - }; - } + const destination = path6.join(session.directory, name); + const temporaryPath = path6.join(session.directory, `.${name}.${randomUUID2()}.tmp`); + let handle; + let temporaryCreated = false; + try { + await session.assertIdentity(); + handle = await open3( + temporaryPath, + constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + 384 + ); + temporaryCreated = true; + await session.assertIdentity(); + if (typeof bytes === "string") { + await handle.writeFile(bytes, { encoding: "utf8" }); + } else { + await handle.writeFile(bytes); + } + await handle.sync(); + await handle.close(); + handle = void 0; + await session.assertIdentity(); + if (mode === "immutable") { + try { + await link2(temporaryPath, destination); + } catch (error51) { + if (!isAlreadyPresent(error51)) throw error51; + await session.assertIdentity(); + const present = await lstat4(destination, { bigint: true }); + if (!present.isFile() || present.isSymbolicLink()) { + throw new RuntimeError(`archive entry is not a plain file: ${name}`); } - return { - kind: "cmd-wrapper", - command: deps.comSpec ?? "C:\\Windows\\System32\\cmd.exe", - prefixArgs: ["/d", "/s", "/c", candidate], - resolvedFrom: `cmd-wrapper:${candidate}` - }; + const existing = await readFile2(destination); + const expected = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : bytes; + if (!existing.equals(expected)) { + throw new RuntimeError(`archive entry already exists with different content: ${name}`); + } + } + await rm2(temporaryPath, { force: true }); + temporaryCreated = false; + } else if (mode === "replace") { + await renameWithRetry(temporaryPath, destination); + temporaryCreated = false; + } + await session.sync(); + await session.assertIdentity(); + } finally { + if (handle !== void 0) { + try { + await handle.close(); + } catch { + } + } + if (temporaryCreated) { + try { + await rm2(temporaryPath, { force: true }); + } catch { } } } - throw new RuntimeError("executable was not found", { name: request.name }); } -async function gitCommonDir2(cwd) { - return new Promise((resolve2, reject) => { - execFile2("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], { cwd }, (error51, stdout) => { - if (error51) reject(error51); - else { - try { - resolve2(gitPathOutput(stdout, "Git common directory")); - } catch (parseError) { - reject(parseError); - } - } - }); - }); + +// src/util/platform-path.ts +import path7 from "node:path"; +function stripWindowsExtendedPrefix(value) { + if (value.toLowerCase().startsWith("\\\\?\\unc\\")) return `\\\\${value.slice(8)}`; + return value.startsWith("\\\\?\\") ? value.slice(4) : value; } -function canonicalizeForScope(candidate, root) { - const stripExtendedLengthPrefix = (value) => { - if (value.toUpperCase().startsWith("\\\\?\\UNC\\")) return `\\\\${value.slice(8)}`; - return value.startsWith("\\\\?\\") ? value.slice(4) : value; - }; - const normalizeVolume = (value) => value.replace( - /^[a-z]:/u, - (match) => match.toUpperCase() - ); - const normalizedCandidate = normalizeVolume( - path5.win32.normalize(stripExtendedLengthPrefix(candidate)) +function platformPathsEqual(left, right, platform = process.platform) { + if (platform !== "win32") return path7.resolve(left) === path7.resolve(right); + return path7.win32.normalize(stripWindowsExtendedPrefix(left)) === path7.win32.normalize(stripWindowsExtendedPrefix(right)); +} + +// src/util/stable-file.ts +import { constants as constants5 } from "node:fs"; +import { lstat as lstat5, open as open4 } from "node:fs/promises"; +async function readStableRegularFile(filename, maxBytes, dependencies = {}) { + const handle = await (dependencies.open ?? open4)( + filename, + constants5.O_RDONLY | (constants5.O_NOFOLLOW ?? 0) | (constants5.O_NONBLOCK ?? 0) ); - let normalizedRoot = normalizeVolume(path5.win32.normalize(stripExtendedLengthPrefix(root))); - if (normalizedRoot.endsWith("\\") && path5.win32.parse(normalizedRoot).root !== normalizedRoot) { - normalizedRoot = normalizedRoot.slice(0, -1); + let primaryError; + try { + const metadata = await handle.stat({ bigint: true }); + const named = await (dependencies.lstat ?? lstat5)(filename, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || metadata.birthtimeNs <= 0n || metadata.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.birthtimeNs <= 0n || named.nlink !== 1n || named.dev !== metadata.dev || named.ino !== metadata.ino || named.birthtimeNs !== metadata.birthtimeNs || named.size !== metadata.size) return null; + if (maxBytes < 0n || maxBytes >= BigInt(Number.MAX_SAFE_INTEGER)) return null; + const limit = Math.min(Number(maxBytes) + 1, Number(metadata.size) + 1); + const buffer = Buffer.alloc(limit); + let bytesRead = 0; + while (bytesRead < limit) { + const read = await handle.read(buffer, bytesRead, limit - bytesRead, null); + if (read.bytesRead === 0) break; + bytesRead += read.bytesRead; + } + if (bytesRead > Number(maxBytes)) return null; + const contents = buffer.subarray(0, bytesRead); + const settled = await handle.stat({ bigint: true }); + const settledNamed = await (dependencies.lstat ?? lstat5)(filename, { bigint: true }); + if (!settled.isFile() || settled.nlink !== 1n || settled.birthtimeNs <= 0n || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.size !== metadata.size || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.birthtimeNs <= 0n || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size || settledNamed.mtimeNs !== settled.mtimeNs || settledNamed.ctimeNs !== settled.ctimeNs || BigInt(contents.byteLength) !== metadata.size) return null; + return contents; + } catch (error51) { + primaryError = error51; + throw error51; + } finally { + try { + await handle.close(); + } catch (closeError) { + if (primaryError === void 0) throw closeError; + throw new AggregateError( + [primaryError, closeError], + "stable file read failed and its handle could not be closed" + ); + } } - return normalizedCandidate === normalizedRoot || normalizedCandidate.startsWith(`${normalizedRoot}\\`); } -var WindowsPlatformServices = class { - constructor(pluginRoot2, arch = nodeProcess4.arch, tokenExecFile = execFile2) { - this.pluginRoot = pluginRoot2; - this.arch = arch; - this.tokenExecFile = tokenExecFile; + +// src/runtime/managed-worktree-root.ts +var WORKTREES_DIRECTORY = ".worktrees"; +var WORKTREE_NAMESPACE = "claude-architect"; +var IGNORE_FILE = ".gitignore"; +var IGNORE_CONTENTS = "*\n"; +var ROOT_RECORDS_DIRECTORY = "worktree-roots"; +var MAX_ROOT_RECORD_BYTES = 4096n; +var ROOT_RECORD_NAME = /^[0-9a-f]{64}$/u; +function managedWorktreeRootFor(checkoutRoot) { + return path8.join(path8.resolve(checkoutRoot), WORKTREES_DIRECTORY, WORKTREE_NAMESPACE); +} +async function repositoryNamespaceRoot(checkoutRoot, runGit) { + const listed = await runGit(checkoutRoot, ["worktree", "list", "--porcelain", "-z"]); + if (listed.exitCode !== 0 || listed.truncated?.stdout === true || listed.truncated?.stderr === true) { + throw new RuntimeError("repository worktrees could not be listed"); } - pluginRoot; - arch; - tokenExecFile; - os = "win32"; - ownProcessStartToken; - async jobKillHelper() { - return resolveJobKillHelper(this.pluginRoot ?? await findPluginRoot(), this.arch); + const records = listed.stdout.split("\0"); + const main = records[0]; + if (main === void 0 || !main.startsWith("worktree ")) { + throw new RuntimeError("repository main worktree could not be identified"); } - async runJobKillHelper(pid) { - const helper = await this.jobKillHelper(); - await new Promise((resolve2, reject) => { - this.tokenExecFile(helper.path, [String(pid)], { - windowsHide: true, - shell: false, - env: windowsEssentialEnvironment() - }, (error51) => { - if (error51 === null || error51.code === 2) resolve2(); - else reject(new RuntimeError("windows process-tree termination failed", { - path: helper.path, - pid, - cause: error51 - })); - }); - }); + const firstBlockEnd = records.indexOf(""); + const firstBlock = records.slice(0, firstBlockEnd === -1 ? records.length : firstBlockEnd); + const base = firstBlock.includes("bare") ? checkoutRoot : main.slice("worktree ".length); + return managedWorktreeRootFor(await realpath2(base)); +} +function legacyManagedWorktreeRoot(stateRoot2 = resolveStateDir()) { + return path8.join(path8.resolve(stateRoot2), "worktrees"); +} +function isManagedWorktreeNamespace(root) { + return path8.basename(root) === WORKTREE_NAMESPACE && path8.basename(path8.dirname(root)) === WORKTREES_DIRECTORY; +} +function isNamespaceControlEntry(name) { + return name === IGNORE_FILE; +} +function rootRecordName(root) { + return createHash3("sha256").update(root).digest("hex"); +} +async function plainDirectory(directory, description) { + const metadata = await lstat6(directory); + if (!metadata.isDirectory() || metadata.isSymbolicLink()) { + throw new RuntimeError(`${description} must be a plain directory`); } - async resolveExecutable(request) { - const pathext = (nodeProcess4.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean).map((extension) => extension.toUpperCase()); - const pathEntries = (request.searchPath ?? nodeProcess4.env.Path ?? nodeProcess4.env.PATH ?? "").split(";").filter(Boolean); - const realFs = { - async isFile(candidate) { - try { - return (await fs2.stat(candidate)).isFile(); - } catch { - return false; - } - }, - async readFile(candidate) { - return fs2.readFile(candidate, "utf8"); - } - }; - const commonDeps = { pathEntries, pathext, fs: realFs, nodeExe: nodeProcess4.execPath }; - return nodeProcess4.env.ComSpec === void 0 ? resolveWindowsExecutable(request, commonDeps) : resolveWindowsExecutable(request, { ...commonDeps, comSpec: nodeProcess4.env.ComSpec }); +} +async function prepareManagedWorktreeRoot(root, options = {}) { + if (!isManagedWorktreeNamespace(root) || !path8.isAbsolute(root)) { + throw new RuntimeError("managed worktree root is outside the managed namespace"); } - async spawnSupervised(req) { - const helper = await this.jobKillHelper(); - if (!await helper.checkAvailable()) { - throw new RuntimeError("windows process-tree helper missing", { path: helper.path }); - } - const child = spawn2(req.executable.command, [...req.executable.prefixArgs, ...req.args], { - cwd: req.cwd, - env: normalizeWindowsEnv(req.env), - detached: false, - windowsHide: true, - stdio: ["pipe", "pipe", "pipe"] - }); - const outBuf = new BoundedBuffer(req.maxOutputBytes), errBuf = new BoundedBuffer(req.maxOutputBytes); - child.stdout.on("data", (c) => outBuf.push(c)); - child.stderr.on("data", (c) => errBuf.push(c)); - if (req.stdin != null) { - child.stdin?.on("error", () => { - }); - child.stdin?.write(req.stdin); - child.stdin?.end(); - } - let settled = false; - const done = new Promise((resolve2) => { - const finish = (e) => { - if (!settled) { - settled = true; - resolve2(e); - } - }; - child.on("error", (err) => finish({ - exitCode: null, - signal: null, - timedOut: false, - cancelled: false, - stdout: outBuf.toString(), - stderr: errBuf.toString(), - truncated: { stdout: outBuf.truncated, stderr: errBuf.truncated }, - spawnError: err - })); - child.on("close", (code, signal) => finish({ - exitCode: code, - signal, - timedOut: false, - cancelled: false, - stdout: outBuf.toString(), - stderr: errBuf.toString(), - truncated: { stdout: outBuf.truncated, stderr: errBuf.truncated } - })); - }); - const proc = { pid: child.pid ?? -1, done, stdout: child.stdout, stderr: child.stderr }; - childHandles.set(proc, child); - return proc; + const shared = path8.dirname(root); + try { + await mkdir3(shared); + } catch (error51) { + if (errorCode(error51) !== "EEXIST") throw error51; } - async requestCooperativeCancellation(proc) { - const child = childHandles.get(proc); - if (child === void 0) return; + await plainDirectory(shared, "checkout worktrees directory"); + const identity = await ensurePrivateDirectory(root, { + description: "managed worktree root", + migratePermissions: true, + ...options.syncDirectory === void 0 ? {} : { syncDirectory: options.syncDirectory } + }); + await ensureNamespaceIgnored(root, options.syncDirectory ?? syncDirectoryMetadata); + await recordManagedWorktreeRoot(root, options); + return identity; +} +async function ensureNamespaceIgnored(root, syncDirectory) { + const ignorePath = path8.join(root, IGNORE_FILE); + try { + const handle = await open5( + ignorePath, + constants6.O_WRONLY | constants6.O_CREAT | constants6.O_EXCL | (constants6.O_NOFOLLOW ?? 0), + 384 + ); try { - child.kill("SIGTERM"); - } catch { + await handle.writeFile(IGNORE_CONTENTS, "utf8"); + await handle.sync(); + } finally { + await handle.close(); } + await syncDirectory(root); + } catch (error51) { + if (errorCode(error51) !== "EEXIST") throw error51; } - async terminateProcessTree(proc) { - await this.runJobKillHelper(proc.pid); + const existing = await readStableRegularFile(ignorePath, MAX_ROOT_RECORD_BYTES); + if (existing === null || existing.toString("utf8") !== IGNORE_CONTENTS) { + throw new RuntimeError("managed worktree root ignore file was replaced"); } - async getProcessStartToken(pid) { - if (!Number.isSafeInteger(pid) || pid <= 1) return null; - if (pid === nodeProcess4.pid && this.ownProcessStartToken !== void 0) { - return this.ownProcessStartToken; +} +async function recordManagedWorktreeRoot(root, options) { + const session = await openDurableDirectorySession( + path8.join(resolveStateDir(), ROOT_RECORDS_DIRECTORY), + { + description: "managed worktree root records", + privateDirectory: true, + create: true, + ...options.syncDirectory === void 0 ? {} : { policy: { syncDirectory: options.syncDirectory } } } - try { - const helper = await this.jobKillHelper(); - if (await helper.checkAvailable()) { - const nativeToken = await new Promise((resolve2) => { - try { - this.tokenExecFile( - helper.path, - ["token", String(pid)], - { - windowsHide: true, - shell: false, - env: windowsEssentialEnvironment() - }, - (error51, stdout) => { - const token = stdout.trim(); - if (error51 === null && token.length > 0) resolve2(`win32:${token}`); - else if (error51?.code === 2) resolve2(null); - else resolve2(void 0); - } - ); - } catch { - resolve2(void 0); - } - }); - if (nativeToken !== void 0) { - if (pid === nodeProcess4.pid && nativeToken !== null) this.ownProcessStartToken = nativeToken; - return nativeToken; - } - } - } catch { + ); + try { + await writeAtomic(session, rootRecordName(root), `${root} +`, "immutable"); + } finally { + await session.close(); + } +} +async function managedWorktreeRoots() { + const roots = [legacyManagedWorktreeRoot()]; + const malformed = []; + const recordsDirectory = path8.join(resolveStateDir(), ROOT_RECORDS_DIRECTORY); + let names; + try { + names = await readdir3(recordsDirectory); + } catch (error51) { + if (isMissing(error51)) return { roots, malformed }; + throw error51; + } + for (const name of names.sort()) { + if (name.startsWith(".")) continue; + const recordPath = path8.join(recordsDirectory, name); + const bytes = ROOT_RECORD_NAME.test(name) ? await readStableRegularFile(recordPath, MAX_ROOT_RECORD_BYTES) : null; + const root = bytes?.toString("utf8").replace(/\n$/u, "") ?? ""; + if (bytes === null || !path8.isAbsolute(root) || path8.resolve(root) !== root || !isManagedWorktreeNamespace(root) || rootRecordName(root) !== name) { + malformed.push(recordPath); + continue; } - return null; + roots.push(root); } - async terminateProcessTreeByPid(pid, expectedToken) { - if (typeof expectedToken === "string") { - const liveToken = await this.getProcessStartToken(pid); - if (liveToken !== expectedToken) return; + return { roots, malformed }; +} +async function isManagedWorktreeRoot(root) { + const legacy = legacyManagedWorktreeRoot(); + const canonicalLegacy = await realpath2(legacy).catch(() => legacy); + if (platformPathsEqual(root, legacy) || platformPathsEqual(root, canonicalLegacy)) return true; + if (!isManagedWorktreeNamespace(root)) return false; + const { roots } = await managedWorktreeRoots(); + return roots.some((candidate) => platformPathsEqual(candidate, root)); +} + +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js +import process3 from "node:process"; + +// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js +var STDIO_DEFAULT_MAX_BUFFER_SIZE = 10 * 1024 * 1024; +var ReadBuffer = class { + constructor(options) { + this._maxBufferSize = options?.maxBufferSize ?? STDIO_DEFAULT_MAX_BUFFER_SIZE; + } + append(chunk) { + const newSize = (this._buffer?.length ?? 0) + chunk.length; + if (newSize > this._maxBufferSize) { + this.clear(); + throw new Error(`ReadBuffer exceeded maximum size of ${this._maxBufferSize} bytes`); } - await this.runJobKillHelper(pid); + this._buffer = this._buffer ? Buffer.concat([this._buffer, chunk]) : chunk; } - async acquireCheckoutLock(checkout, owner = {}) { - const { gitCommonDir: commonDir } = await this.canonicalizePath(checkout); - if (commonDir === null) { - throw new RuntimeError("checkout Git common directory could not be resolved"); + readMessage() { + if (!this._buffer) { + return null; } - const repositoryIdentity = commonDir; - const key = createHash2("sha256").update(repositoryIdentity).digest("hex"); - const ownerToken = await this.getProcessStartToken(nodeProcess4.pid); - let lock; - try { - lock = await acquireWxFileLock(key, `checkout is locked: ${checkout}`, ownerToken, owner); - } catch (error51) { - throw await withLockContentionDetail( - error51, - key, - (pid) => this.getProcessStartToken(pid) - ); + const index = this._buffer.indexOf("\n"); + if (index === -1) { + return null; } - return { ...lock, repositoryIdentity }; + const line = this._buffer.toString("utf8", 0, index).replace(/\r$/, ""); + this._buffer = this._buffer.subarray(index + 1); + return deserializeMessage(line); } - async acquireCleanupJournalLock() { - const ownerToken = await this.getProcessStartToken(nodeProcess4.pid); - return acquireWxFileLock(CLEANUP_JOURNAL_LOCK_KEY, "cleanup journal is locked", ownerToken); + clear() { + this._buffer = void 0; } - async createSecureTempDirectory() { - return fs2.mkdtemp(path5.join(tmpdir3(), "claude-architect-")); +}; +function deserializeMessage(line) { + return JSONRPCMessageSchema.parse(JSON.parse(line)); +} +function serializeMessage(message) { + return JSON.stringify(message) + "\n"; +} + +// node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js +var StdioServerTransport = class { + constructor(_stdin = process3.stdin, _stdout = process3.stdout, options) { + this._stdin = _stdin; + this._stdout = _stdout; + this._started = false; + this._ondata = (chunk) => { + try { + this._readBuffer.append(chunk); + this.processReadBuffer(); + } catch (error51) { + this.onerror?.(error51); + this.close().catch(() => { + }); + } + }; + this._onerror = (error51) => { + this.onerror?.(error51); + }; + this._readBuffer = new ReadBuffer({ maxBufferSize: options?.maxBufferSize }); } - async assertDirectoryWriteIntegrity(directory, expectedIdentity) { - await assertWindowsDirectoryWriteIntegrity(directory, expectedIdentity, this); + /** + * Starts listening for messages on stdin. + */ + async start() { + if (this._started) { + throw new Error("StdioServerTransport already started! If using Server class, note that connect() calls start() automatically."); + } + this._started = true; + this._stdin.on("data", this._ondata); + this._stdin.on("error", this._onerror); } - async canonicalizePath(input) { - const canonical = await fs2.realpath(input); - let commonDir = null; - try { - commonDir = await fs2.realpath(await gitCommonDir2(canonical)); - } catch { - commonDir = null; + processReadBuffer() { + while (true) { + try { + const message = this._readBuffer.readMessage(); + if (message === null) { + break; + } + this.onmessage?.(message); + } catch (error51) { + this.onerror?.(error51); + } } - return { input, canonical, gitCommonDir: commonDir }; + } + async close() { + this._stdin.off("data", this._ondata); + this._stdin.off("error", this._onerror); + const remainingDataListeners = this._stdin.listenerCount("data"); + if (remainingDataListeners === 0) { + this._stdin.pause(); + } + this._readBuffer.clear(); + this.onclose?.(); + } + send(message) { + return new Promise((resolve2) => { + const json2 = serializeMessage(message); + if (this._stdout.write(json2)) { + resolve2(); + } else { + this._stdout.once("drain", resolve2); + } + }); } }; -// src/platform/select-platform.ts -var services; -function getPlatformServices() { - if (!services) services = process.platform === "win32" ? new WindowsPlatformServices() : new PosixPlatformServices(); - return services; +// src/mcp/server.ts +import path42 from "node:path"; + +// src/protocol/versions.ts +var PROTOCOL_VERSION = "3.0.0"; +var DELEGATION_SPEC_VERSION = "1"; +var ATTEMPT_RESULT_VERSION = "1"; +var RUNTIME_VERSION = "0.52.0"; + +// src/protocol/attempt-result.ts +var FAILURE_PRECEDENCE = [ + "invalid-specification", + "environment-defect", + // clean baseline verification failed + "unavailable", + // pre-launch unavailability + "authentication-required", + // pre-launch; never triggers fallback + "spawn-failure", + "cancelled", + // per the initiating runtime event + "timeout", + "sandbox-violation", + "invalid-output", + "producer-failure", + "verification-failure" +]; +function classifyFailure(s) { + for (const reason of FAILURE_PRECEDENCE) if (s[reason]) return reason; + return null; } +// src/mcp/doctor.ts +import { createHash as createHash6 } from "node:crypto"; +import { constants as constants9 } from "node:fs"; +import { lstat as lstat9, open as open9, readdir as readdir5, realpath as realpath6 } from "node:fs/promises"; +import path17 from "node:path"; +import nodeProcess6 from "node:process"; + +// src/autopilot/workflow-store.ts +import { createHash as createHash4, randomUUID as randomUUID3 } from "node:crypto"; +import { constants as constants7 } from "node:fs"; +import { + lstat as lstat7, + link as link3, + mkdir as mkdir4, + open as open6, + readdir as readdir4, + realpath as realpath3, + rename as rename2, + rm as rm3 +} from "node:fs/promises"; +import path9 from "node:path"; + // src/protocol/schema-loader.ts var import__ = __toESM(require__(), 1); @@ -33695,6 +34088,7 @@ var delegation_spec_v1_default = { }, writeAllowlist: { type: "array", + maxItems: 512, items: { type: "string" }, @@ -33702,6 +34096,7 @@ var delegation_spec_v1_default = { }, allowedTestDeletions: { type: "array", + maxItems: 512, items: { type: "string", minLength: 1 @@ -33709,12 +34104,14 @@ var delegation_spec_v1_default = { }, forbiddenScope: { type: "array", + maxItems: 512, items: { type: "string" } }, successCriteria: { type: "array", + maxItems: 64, items: { type: "string", minLength: 1 @@ -33723,6 +34120,7 @@ var delegation_spec_v1_default = { }, verification: { type: "array", + maxItems: 32, items: { type: "object", additionalProperties: false, @@ -33744,6 +34142,7 @@ var delegation_spec_v1_default = { }, args: { type: "array", + maxItems: 256, items: { type: "string" } @@ -33770,6 +34169,7 @@ var delegation_spec_v1_default = { }, expectedExitCodes: { type: "array", + maxItems: 32, items: { type: "integer" } @@ -33779,6 +34179,7 @@ var delegation_spec_v1_default = { }, baselineFailureExitCodes: { type: "array", + maxItems: 32, items: { type: "integer" }, minItems: 1 }, @@ -33788,6 +34189,7 @@ var delegation_spec_v1_default = { properties: { os: { type: "array", + maxItems: 8, items: { enum: [ "darwin", @@ -33798,6 +34200,7 @@ var delegation_spec_v1_default = { }, arch: { type: "array", + maxItems: 8, items: { type: "string" } @@ -33816,6 +34219,7 @@ var delegation_spec_v1_default = { }, slices: { type: "array", + maxItems: 32, minItems: 1, items: { type: "object", @@ -33838,6 +34242,7 @@ var delegation_spec_v1_default = { }, writeAllowlist: { type: "array", + maxItems: 512, items: { type: "string" }, @@ -33845,6 +34250,7 @@ var delegation_spec_v1_default = { }, allowedTestDeletions: { type: "array", + maxItems: 512, items: { type: "string", minLength: 1 @@ -33852,12 +34258,14 @@ var delegation_spec_v1_default = { }, forbiddenScope: { type: "array", + maxItems: 512, items: { type: "string" } }, successCriteria: { type: "array", + maxItems: 64, items: { type: "string", minLength: 1 @@ -33869,6 +34277,7 @@ var delegation_spec_v1_default = { }, dependsOn: { type: "array", + maxItems: 32, items: { type: "integer", minimum: 1 }, uniqueItems: true, description: "1-based indices of the slices this slice must observe before it runs. Omit to depend on every preceding slice, which reproduces sequential execution." @@ -33886,6 +34295,7 @@ var delegation_spec_v1_default = { }, producerPreferences: { type: "array", + maxItems: 16, items: { type: "string" } @@ -33915,6 +34325,7 @@ var delegation_spec_v1_default = { properties: { reviewers: { type: "array", + maxItems: 8, minItems: 1, items: { enum: [ @@ -33930,6 +34341,7 @@ var delegation_spec_v1_default = { }, focus: { type: "array", + maxItems: 32, minItems: 1, items: { type: "string", @@ -33980,10 +34392,10 @@ var delegation_spec_v1_default = { ] }; -// runtime/schemas/autopilot-spec.v1.json -var autopilot_spec_v1_default = { +// runtime/schemas/autopilot-spec.v2.json +var autopilot_spec_v2_default = { $schema: "https://json-schema.org/draft/2020-12/schema", - $id: "autopilot-spec.v1.json", + $id: "autopilot-spec.v2.json", type: "object", additionalProperties: false, required: [ @@ -33992,12 +34404,11 @@ var autopilot_spec_v1_default = { "base", "tasks", "finalSuccessCriteria", - "finalVerification", - "shipping" + "finalVerification" ], properties: { specVersion: { - const: "1" + const: "2" }, topic: { type: "string", @@ -34059,44 +34470,6 @@ var autopilot_spec_v1_default = { }, finalVerification: { $ref: "delegation-spec.v1.json#/properties/verification" - }, - shipping: { - type: "object", - additionalProperties: false, - required: [ - "provider", - "draft", - "markReadyWhenRequiredChecksPass", - "requiredChecksTimeoutMs", - "pullRequestTitle", - "pullRequestBody" - ], - properties: { - provider: { - const: "github" - }, - draft: { - const: true - }, - markReadyWhenRequiredChecksPass: { - const: true - }, - requiredChecksTimeoutMs: { - type: "integer", - minimum: 6e5, - maximum: 36e5 - }, - pullRequestTitle: { - type: "string", - minLength: 1, - maxLength: 256 - }, - pullRequestBody: { - type: "string", - minLength: 1, - maxLength: 4e3 - } - } } } }; @@ -34593,10 +34966,10 @@ var autopilot_eligibility_v1_default = { } }; -// runtime/schemas/autopilot-workflow-state.v1.json -var autopilot_workflow_state_v1_default = { +// runtime/schemas/autopilot-workflow-state.v2.json +var autopilot_workflow_state_v2_default = { $schema: "https://json-schema.org/draft/2020-12/schema", - $id: "autopilot-workflow-state.v1.json", + $id: "autopilot-workflow-state.v2.json", type: "object", additionalProperties: false, required: [ @@ -34613,60 +34986,108 @@ var autopilot_workflow_state_v1_default = { "tasks", "intentJournal", "finalGate", - "shipping", - "ciObservations", + "branch", "cleanup", "terminal", "createdAt", "updatedAt" ], properties: { - stateVersion: { const: "1" }, - workflowId: { type: "string", minLength: 1, maxLength: 128 }, - repositoryIdentity: { type: "string", minLength: 1, maxLength: 4096 }, - baseCommitOid: { $ref: "#/$defs/commitOid" }, + stateVersion: { + const: "2" + }, + workflowId: { + type: "string", + minLength: 1, + maxLength: 128 + }, + repositoryIdentity: { + type: "string", + minLength: 1, + maxLength: 4096 + }, + baseCommitOid: { + $ref: "#/$defs/commitOid" + }, workflowRef: { type: "string", pattern: "^refs/heads/[^\\u0000-\\u0020~^:?*\\\\[\\]]+$", maxLength: 1024 }, - worktreePath: { type: "string", minLength: 1, maxLength: 4096 }, - autopilotSpecHash: { $ref: "#/$defs/hash" }, - revision: { type: "integer", minimum: 0 }, - phase: { $ref: "#/$defs/phase" }, - currentTaskIndex: { type: "integer", minimum: 0 }, + worktreePath: { + type: "string", + minLength: 1, + maxLength: 4096 + }, + autopilotSpecHash: { + $ref: "#/$defs/hash" + }, + revision: { + type: "integer", + minimum: 0 + }, + phase: { + $ref: "#/$defs/phase" + }, + currentTaskIndex: { + type: "integer", + minimum: 0 + }, tasks: { type: "array", minItems: 1, maxItems: 32, - items: { $ref: "#/$defs/task" } + items: { + $ref: "#/$defs/task" + } + }, + intentJournal: { + $ref: "#/$defs/intentJournal" }, - intentJournal: { $ref: "#/$defs/intentJournal" }, finalGate: { anyOf: [ - { $ref: "#/$defs/finalGate" }, - { type: "null" } + { + $ref: "#/$defs/finalGate" + }, + { + type: "null" + } ] }, - shipping: { $ref: "#/$defs/shipping" }, - ciObservations: { - type: "array", - items: { $ref: "#/$defs/ciObservation" } + branch: { + type: "string", + minLength: 1, + maxLength: 1e3, + pattern: "^[^\\u0000-\\u0020~^:?*\\\\[\\]]+$" }, cleanup: { anyOf: [ - { $ref: "#/$defs/cleanup" }, - { type: "null" } + { + $ref: "#/$defs/cleanup" + }, + { + type: "null" + } ] }, terminal: { anyOf: [ - { $ref: "#/$defs/terminal" }, - { type: "null" } + { + $ref: "#/$defs/terminal" + }, + { + type: "null" + } ] }, - createdAt: { type: "string", format: "date-time" }, - updatedAt: { type: "string", format: "date-time" } + createdAt: { + type: "string", + format: "date-time" + }, + updatedAt: { + type: "string", + format: "date-time" + } }, $defs: { hash: { @@ -34683,10 +35104,6 @@ var autopilot_workflow_state_v1_default = { "running-task", "promoting-task", "final-review", - "pushing", - "creating-draft-pr", - "waiting-required-checks", - "marking-ready", "cleaning-up", "ready-for-human-review", "human-decision-required", @@ -34706,46 +35123,85 @@ var autopilot_workflow_state_v1_default = { "status" ], properties: { - id: { type: "string", minLength: 1, maxLength: 128 }, + id: { + type: "string", + minLength: 1, + maxLength: 128 + }, runId: { - type: ["string", "null"], + type: [ + "string", + "null" + ], minLength: 1, maxLength: 128 }, candidateManifestHash: { anyOf: [ - { $ref: "#/$defs/hash" }, - { type: "null" } + { + $ref: "#/$defs/hash" + }, + { + type: "null" + } ] }, eligibilityHash: { anyOf: [ - { $ref: "#/$defs/hash" }, - { type: "null" } + { + $ref: "#/$defs/hash" + }, + { + type: "null" + } ] }, promotionCommitOid: { anyOf: [ - { $ref: "#/$defs/commitOid" }, - { type: "null" } + { + $ref: "#/$defs/commitOid" + }, + { + type: "null" + } ] }, status: { - enum: ["pending", "running", "promoted", "halted"] + enum: [ + "pending", + "running", + "promoted", + "halted" + ] } } }, intentJournal: { type: "object", additionalProperties: false, - required: ["ref", "entryCount", "lastEntryHash"], + required: [ + "ref", + "entryCount", + "lastEntryHash" + ], properties: { - ref: { type: "string", minLength: 1, maxLength: 4096 }, - entryCount: { type: "integer", minimum: 0 }, + ref: { + type: "string", + minLength: 1, + maxLength: 4096 + }, + entryCount: { + type: "integer", + minimum: 0 + }, lastEntryHash: { anyOf: [ - { $ref: "#/$defs/hash" }, - { type: "null" } + { + $ref: "#/$defs/hash" + }, + { + type: "null" + } ] } } @@ -34753,81 +35209,75 @@ var autopilot_workflow_state_v1_default = { finalGate: { type: "object", additionalProperties: false, - required: ["reportRef", "reportHash", "headCommitOid", "eligibilityHash"], - properties: { - reportRef: { type: "string", minLength: 1, maxLength: 4096 }, - reportHash: { $ref: "#/$defs/hash" }, - headCommitOid: { $ref: "#/$defs/commitOid" }, - eligibilityHash: { $ref: "#/$defs/hash" } - } - }, - shipping: { - type: "object", - additionalProperties: false, - required: ["branch", "prNumber", "prUrl", "ciDeadlineAt"], + required: [ + "reportRef", + "reportHash", + "headCommitOid", + "eligibilityHash" + ], properties: { - branch: { type: "string", minLength: 1, maxLength: 255 }, - prNumber: { - type: ["integer", "null"], - minimum: 1 - }, - prUrl: { - type: ["string", "null"], + reportRef: { + type: "string", minLength: 1, maxLength: 4096 }, - ciDeadlineAt: { type: "string", format: "date-time" } - } - }, - ciCheck: { - type: "object", - additionalProperties: false, - required: ["bucket", "name", "state", "link"], - properties: { - bucket: { enum: ["pass", "pending", "fail", "cancel", "skipping"] }, - name: { type: "string", minLength: 1, maxLength: 512 }, - state: { type: "string", minLength: 1, maxLength: 128 }, - link: { - type: ["string", "null"], - minLength: 1, - maxLength: 4096 - } - } - }, - ciObservation: { - type: "object", - additionalProperties: false, - required: ["observedAt", "result", "headCommitOid", "checks"], - properties: { - observedAt: { type: "string", format: "date-time" }, - result: { enum: ["missing", "pending", "failed", "passed"] }, - headCommitOid: { $ref: "#/$defs/commitOid" }, - checks: { - type: "array", - items: { $ref: "#/$defs/ciCheck" } + reportHash: { + $ref: "#/$defs/hash" + }, + headCommitOid: { + $ref: "#/$defs/commitOid" + }, + eligibilityHash: { + $ref: "#/$defs/hash" } } }, cleanup: { type: "object", additionalProperties: false, - required: ["status", "worktreeRemoved", "lockReleased", "error", "completedAt"], + required: [ + "status", + "worktreeRemoved", + "lockReleased", + "error", + "completedAt" + ], properties: { - status: { enum: ["succeeded", "failed"] }, - worktreeRemoved: { type: "boolean" }, - lockReleased: { type: "boolean" }, + status: { + enum: [ + "succeeded", + "failed" + ] + }, + worktreeRemoved: { + type: "boolean" + }, + lockReleased: { + type: "boolean" + }, error: { - type: ["string", "null"], + type: [ + "string", + "null" + ], minLength: 1, maxLength: 4e3 }, - completedAt: { type: "string", format: "date-time" } + completedAt: { + type: "string", + format: "date-time" + } } }, terminal: { type: "object", additionalProperties: false, - required: ["classification", "reason", "evidenceRefs", "completedAt"], + required: [ + "classification", + "reason", + "evidenceRefs", + "completedAt" + ], properties: { classification: { enum: [ @@ -34838,15 +35288,25 @@ var autopilot_workflow_state_v1_default = { ] }, reason: { - type: ["string", "null"], + type: [ + "string", + "null" + ], minLength: 1, maxLength: 4e3 }, evidenceRefs: { type: "array", - items: { type: "string", minLength: 1, maxLength: 4096 } + items: { + type: "string", + minLength: 1, + maxLength: 4096 + } }, - completedAt: { type: "string", format: "date-time" } + completedAt: { + type: "string", + format: "date-time" + } } } } @@ -34977,7 +35437,7 @@ function loadSchemas() { } return { delegationSpec, - autopilotSpec: ajv.compile(autopilot_spec_v1_default), + autopilotSpec: ajv.compile(autopilot_spec_v2_default), candidateDecision: ajv.compile(candidate_decision_v2_default), attemptResult: ajv.compile(attempt_result_v1_default), reviewReport: ajv.compile(review_report_v1_default), @@ -34986,7 +35446,7 @@ function loadSchemas() { verificationReport: ajv.compile(verification_report_v1_default), advisorReport: ajv.compile(advisor_report_v1_default), autopilotEligibility: ajv.compile(autopilot_eligibility_v1_default), - autopilotWorkflowState: ajv.compile(autopilot_workflow_state_v1_default), + autopilotWorkflowState: ajv.compile(autopilot_workflow_state_v2_default), runStatus: ajv.compile(run_status_v1_default), pipelineGateCleared: ajv.compile(pipeline_gate_cleared_v1_default) }; @@ -35002,7 +35462,7 @@ function checkVersionCompat(skillProtocolVersion) { } // src/autopilot/workflow-store.ts -var NO_FOLLOW2 = constants4.O_NOFOLLOW ?? 0; +var NO_FOLLOW3 = constants7.O_NOFOLLOW ?? 0; var MAX_WRITER_LOCK_BYTES = 512; var MAX_WORKFLOW_OWNER_BYTES = 1024; var MAX_WORKFLOW_STATE_BYTES = 1e6; @@ -35023,21 +35483,7 @@ var LEGAL_WORKFLOW_PHASE_EDGES = Object.freeze({ "failed", "cancelled" ], - "final-review": ["pushing", "human-decision-required", "failed", "cancelled"], - pushing: ["creating-draft-pr", "human-decision-required", "failed", "cancelled"], - "creating-draft-pr": [ - "waiting-required-checks", - "human-decision-required", - "failed", - "cancelled" - ], - "waiting-required-checks": [ - "marking-ready", - "human-decision-required", - "failed", - "cancelled" - ], - "marking-ready": ["cleaning-up", "human-decision-required", "failed", "cancelled"], + "final-review": ["cleaning-up", "human-decision-required", "failed", "cancelled"], "cleaning-up": ["ready-for-human-review", "human-decision-required", "failed", "cancelled"], "ready-for-human-review": [], "human-decision-required": [], @@ -35047,12 +35493,6 @@ var LEGAL_WORKFLOW_PHASE_EDGES = Object.freeze({ function workflowError(message, toolError) { return new RuntimeError(message, { toolError }); } -function errorCode4(error51) { - return error51.code; -} -function isMissing2(error51) { - return errorCode4(error51) === "ENOENT"; -} function isPlainDirectory2(metadata) { return metadata.isDirectory() && !metadata.isSymbolicLink(); } @@ -35061,7 +35501,7 @@ function isProcessAlive(pid) { process.kill(pid, 0); return true; } catch (error51) { - return errorCode4(error51) !== "ESRCH"; + return errorCode(error51) !== "ESRCH"; } } async function isWriterAlive(record2) { @@ -35105,7 +35545,7 @@ function sameIdentity2(metadata, identity) { return metadata.dev === identity.dev && metadata.ino === identity.ino; } async function inspectPlainDirectory(directory) { - const metadata = await lstat4(directory); + const metadata = await lstat7(directory); if (!isPlainDirectory2(metadata)) { throw workflowError( "workflow state directory must be a plain directory", @@ -35115,30 +35555,18 @@ async function inspectPlainDirectory(directory) { return { dev: metadata.dev, ino: metadata.ino, - canonicalPath: await realpath2(directory) + canonicalPath: await realpath3(directory) }; } async function assertDirectoryIdentity(directory, expected) { const [metadata, canonicalPath] = await Promise.all([ - lstat4(directory), - realpath2(directory) + lstat7(directory), + realpath3(directory) ]); if (!isPlainDirectory2(metadata) || !sameIdentity2(metadata, expected) || canonicalPath !== expected.canonicalPath) { throw workflowError("workflow state directory identity changed", "unsafe-workflow-state"); } } -async function syncDirectory(directory) { - let handle; - try { - handle = await open3(directory, constants4.O_RDONLY | NO_FOLLOW2); - await handle.sync(); - } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode4(error51) ?? ""); - if (!unsupportedOnWindows) throw error51; - } finally { - await handle?.close(); - } -} async function readHandleBytes2(handle, size) { const bytes = Buffer.alloc(size); let offset = 0; @@ -35153,6 +35581,18 @@ async function readHandleBytes2(handle, size) { return bytes; } var SAFE_WORKFLOW_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u; +async function readSingleLinkFile(handle, filename, limits, errors) { + const metadata = await handle.stat(); + const named = await lstat7(filename); + if (metadata.isFile() && metadata.size > limits.maxBytes) throw errors.oversized(); + if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size < limits.minBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) throw errors.unsafe(); + const first = await readHandleBytes2(handle, metadata.size); + const second = await readHandleBytes2(handle, metadata.size); + const settled = await handle.stat(); + const settledNamed = await lstat7(filename); + if (!first.equals(second) || !settled.isFile() || settled.nlink !== 1 || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.size !== metadata.size) throw errors.changed(); + return { bytes: first, metadata }; +} function assertWorkflowId(workflowId) { if (!SAFE_WORKFLOW_ID.test(workflowId)) { throw workflowError("workflow id is not a safe path component", "invalid-workflow-state"); @@ -35182,6 +35622,12 @@ function assertSemanticState(state, workflowId) { } var validateWorkflowState = loadSchemas().autopilotWorkflowState; function validateState(value, workflowId) { + if (isRecord2(value) && value.stateVersion === "1") { + throw workflowError( + "workflow was created by a runtime that shipped branches itself (state v1); finish or cancel it with that runtime, or start a new workflow", + "workflow-state-version-unsupported" + ); + } if (!validateWorkflowState(value)) { throw workflowError("workflow state does not match its schema", "invalid-workflow-state"); } @@ -35235,7 +35681,7 @@ function canonicalJson(value) { return JSON.stringify(normalizeJournalJson(value, "workflow journal record")); } function journalEntryHash(entry) { - return createHash3("sha256").update(canonicalJson(entry), "utf8").digest("hex"); + return createHash4("sha256").update(canonicalJson(entry), "utf8").digest("hex"); } function serializeJournalEntry(entry) { const complete = { @@ -35402,13 +35848,13 @@ var WorkflowStore = class { constructor(workflowId, options = {}) { assertWorkflowId(workflowId); this.workflowId = workflowId; - this.stateRoot = path6.resolve(options.stateDirectory ?? resolveStateDir()); - this.workflowsDirectory = path6.join(this.stateRoot, "workflows"); - this.workflowDirectory = path6.join(this.workflowsDirectory, workflowId); - this.statePath = path6.join(this.workflowDirectory, "state.json"); - this.journalPath = path6.join(this.workflowDirectory, "journal.ndjson"); - this.lockPath = path6.join(this.workflowDirectory, "state.lock"); - this.ownerPath = path6.join(this.workflowDirectory, "owner.json"); + this.stateRoot = path9.resolve(options.stateDirectory ?? resolveStateDir()); + this.workflowsDirectory = path9.join(this.stateRoot, "workflows"); + this.workflowDirectory = path9.join(this.workflowsDirectory, workflowId); + this.statePath = path9.join(this.workflowDirectory, "state.json"); + this.journalPath = path9.join(this.workflowDirectory, "journal.ndjson"); + this.lockPath = path9.join(this.workflowDirectory, "state.lock"); + this.ownerPath = path9.join(this.workflowDirectory, "owner.json"); this.now = options.now ?? (() => (/* @__PURE__ */ new Date()).toISOString()); this.maxStateBytes = options.maxStateBytes ?? MAX_WORKFLOW_STATE_BYTES; this.maxJournalBytes = options.maxJournalBytes ?? MAX_WORKFLOW_JOURNAL_BYTES; @@ -35676,7 +36122,7 @@ var WorkflowStore = class { next.autopilotSpecHash = current.autopilotSpecHash; next.intentJournal = structuredClone(current.intentJournal); next.createdAt = current.createdAt; - next.shipping.ciDeadlineAt = current.shipping.ciDeadlineAt; + next.branch = current.branch; next.revision = current.revision + 1; next.phase = transitionTo ?? current.phase; next.updatedAt = this.now(); @@ -35696,20 +36142,20 @@ var WorkflowStore = class { } async ensureWorkflowDirectory() { const root = await inspectPlainDirectory(this.stateRoot); - await mkdir2(this.workflowsDirectory, { mode: 448 }).catch((error51) => { - if (errorCode4(error51) !== "EEXIST") throw error51; + await mkdir4(this.workflowsDirectory, { mode: 448 }).catch((error51) => { + if (errorCode(error51) !== "EEXIST") throw error51; }); await assertDirectoryIdentity(this.stateRoot, root); const workflows = await inspectPlainDirectory(this.workflowsDirectory); - if (path6.dirname(workflows.canonicalPath) !== root.canonicalPath) { + if (path9.dirname(workflows.canonicalPath) !== root.canonicalPath) { throw workflowError("workflows directory escapes plugin data", "unsafe-workflow-state"); } - await mkdir2(this.workflowDirectory, { mode: 448 }).catch((error51) => { - if (errorCode4(error51) !== "EEXIST") throw error51; + await mkdir4(this.workflowDirectory, { mode: 448 }).catch((error51) => { + if (errorCode(error51) !== "EEXIST") throw error51; }); await assertDirectoryIdentity(this.workflowsDirectory, workflows); const workflow = await inspectPlainDirectory(this.workflowDirectory); - if (path6.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { + if (path9.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { throw workflowError("workflow directory escapes plugin data", "unsafe-workflow-state"); } return workflow; @@ -35718,7 +36164,7 @@ var WorkflowStore = class { const root = await inspectPlainDirectory(this.stateRoot); const workflows = await inspectPlainDirectory(this.workflowsDirectory); const workflow = await inspectPlainDirectory(this.workflowDirectory); - if (path6.dirname(workflows.canonicalPath) !== root.canonicalPath || path6.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { + if (path9.dirname(workflows.canonicalPath) !== root.canonicalPath || path9.dirname(workflow.canonicalPath) !== workflows.canonicalPath) { throw workflowError("workflow state path escapes plugin data", "unsafe-workflow-state"); } return workflow; @@ -35741,13 +36187,13 @@ var WorkflowStore = class { } let handle; try { - handle = await open3( + handle = await open6( this.ownerPath, - constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL | NO_FOLLOW3, 384 ); } catch (error51) { - if (errorCode4(error51) === "EEXIST") { + if (errorCode(error51) === "EEXIST") { throw workflowError("workflow already has an owner", "workflow-lease-conflict"); } throw error51; @@ -35757,7 +36203,7 @@ var WorkflowStore = class { await handle.writeFile(bytes); await handle.sync(); const metadata = await handle.stat(); - const named = await lstat4(this.ownerPath); + const named = await lstat7(this.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size !== bytes.byteLength || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("workflow owner was substituted", "unsafe-workflow-owner"); } @@ -35776,7 +36222,7 @@ var WorkflowStore = class { if (identity === void 0) { throw workflowError("workflow owner was not created", "unsafe-workflow-owner"); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return structuredClone(record2); } @@ -35784,26 +36230,25 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); let handle; try { - handle = await open3(this.ownerPath, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open6(this.ownerPath, constants7.O_RDONLY | NO_FOLLOW3); } catch (error51) { - if (isMissing2(error51)) { + if (isMissing(error51)) { throw workflowError("workflow owner does not exist", "workflow-lease-not-found"); } throw error51; } try { - const metadata = await handle.stat(); - const named = await lstat4(this.ownerPath); - if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size < 1 || metadata.size > MAX_WORKFLOW_OWNER_BYTES || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { - throw workflowError("workflow owner is unsafe", "unsafe-workflow-owner"); - } - const first = await readHandleBytes2(handle, metadata.size); - const second = await readHandleBytes2(handle, metadata.size); - const settled = await handle.stat(); - const settledNamed = await lstat4(this.ownerPath); - if (!first.equals(second) || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.size !== metadata.size) { - throw workflowError("workflow owner changed during read", "unsafe-workflow-owner"); - } + const unsafe = () => workflowError("workflow owner is unsafe", "unsafe-workflow-owner"); + const { bytes: first, metadata } = await readSingleLinkFile( + handle, + this.ownerPath, + { minBytes: 1, maxBytes: MAX_WORKFLOW_OWNER_BYTES }, + { + unsafe, + oversized: unsafe, + changed: () => workflowError("workflow owner changed during read", "unsafe-workflow-owner") + } + ); return { dev: metadata.dev, ino: metadata.ino, @@ -35820,27 +36265,27 @@ var WorkflowStore = class { async removeWorkflowOwner(identity, directory) { let handle; try { - handle = await open3(this.ownerPath, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open6(this.ownerPath, constants7.O_RDONLY | NO_FOLLOW3); } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing(error51)) return false; throw error51; } try { const metadata = await handle.stat(); - let named = await lstat4(this.ownerPath); + let named = await lstat7(this.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.dev !== identity.dev || metadata.ino !== identity.ino || metadata.size !== identity.size || metadata.mtimeMs !== identity.mtimeMs || metadata.ctimeMs !== identity.ctimeMs || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== identity.dev || named.ino !== identity.ino) return false; const bytes = await readHandleBytes2(handle, metadata.size); const settled = await handle.stat(); - named = await lstat4(this.ownerPath); + named = await lstat7(this.ownerPath); if (!bytes.equals(identity.bytes) || settled.dev !== identity.dev || settled.ino !== identity.ino || settled.size !== identity.size || settled.mtimeMs !== identity.mtimeMs || settled.ctimeMs !== identity.ctimeMs || named.dev !== identity.dev || named.ino !== identity.ino) return false; - await rm2(this.ownerPath); + await rm3(this.ownerPath); } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing(error51)) return false; throw error51; } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return true; } @@ -35851,11 +36296,11 @@ var WorkflowStore = class { let operationError; try { for (let attempt = 0; attempt < 4; attempt += 1) { - const token = randomUUID2(); - const ownerPath = path6.join(this.workflowDirectory, `.state.lock.${token}.owner`); - ownerHandle = await open3( + const token = randomUUID3(); + const ownerPath = path9.join(this.workflowDirectory, `.state.lock.${token}.owner`); + ownerHandle = await open6( ownerPath, - constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL | NO_FOLLOW3, 384 ); const record2 = { @@ -35868,17 +36313,17 @@ var WorkflowStore = class { `, "utf8"); await ownerHandle.sync(); const ownerMetadata = await ownerHandle.stat(); - const namedOwner = await lstat4(ownerPath); + const namedOwner = await lstat7(ownerPath); if (!ownerMetadata.isFile() || ownerMetadata.nlink !== 1 || ownerMetadata.size > MAX_WRITER_LOCK_BYTES || !namedOwner.isFile() || namedOwner.isSymbolicLink() || namedOwner.dev !== ownerMetadata.dev || namedOwner.ino !== ownerMetadata.ino) { throw workflowError("workflow state lock owner was substituted", "unsafe-workflow-state"); } try { - await link2(ownerPath, this.lockPath); + await link3(ownerPath, this.lockPath); } catch (error51) { await ownerHandle.close(); ownerHandle = void 0; - await rm2(ownerPath, { force: true }); - if (errorCode4(error51) !== "EEXIST") throw error51; + await rm3(ownerPath, { force: true }); + if (errorCode(error51) !== "EEXIST") throw error51; const existing = await this.readWriterLock(directory); if (await isWriterAlive(existing.record)) { throw workflowError( @@ -35891,7 +36336,7 @@ var WorkflowStore = class { } continue; } - const namedLock = await lstat4(this.lockPath); + const namedLock = await lstat7(this.lockPath); if (!namedLock.isFile() || namedLock.isSymbolicLink() || namedLock.dev !== ownerMetadata.dev || namedLock.ino !== ownerMetadata.ino) { throw workflowError("workflow state lock was substituted", "unsafe-workflow-state"); } @@ -35901,7 +36346,7 @@ var WorkflowStore = class { ownerPath, record: record2 }; - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); break; } if (lockIdentity === void 0) { @@ -35918,8 +36363,8 @@ var WorkflowStore = class { await ownerHandle?.close(); if (lockIdentity !== void 0) { await this.retireWriterLock(lockIdentity, directory); - await rm2(lockIdentity.ownerPath, { force: true }); - await syncDirectory(this.workflowDirectory); + await rm3(lockIdentity.ownerPath, { force: true }); + await flushDirectory(this.workflowDirectory); } } catch (cleanupError) { if (operationError === void 0) throw cleanupError; @@ -35932,10 +36377,10 @@ var WorkflowStore = class { } async readWriterLock(directory) { await assertDirectoryIdentity(this.workflowDirectory, directory); - const handle = await open3(this.lockPath, constants4.O_RDONLY | NO_FOLLOW2); + const handle = await open6(this.lockPath, constants7.O_RDONLY | NO_FOLLOW3); try { const metadata = await handle.stat(); - const named = await lstat4(this.lockPath); + const named = await lstat7(this.lockPath); if (!metadata.isFile() || metadata.nlink < 1 || metadata.nlink > 2 || metadata.size < 1 || metadata.size > MAX_WRITER_LOCK_BYTES || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("workflow state lock is unsafe", "unsafe-workflow-state"); } @@ -35949,7 +36394,7 @@ var WorkflowStore = class { return { dev: metadata.dev, ino: metadata.ino, - ownerPath: path6.join(this.workflowDirectory, `.state.lock.${record2.token}.owner`), + ownerPath: path9.join(this.workflowDirectory, `.state.lock.${record2.token}.owner`), record: record2 }; } finally { @@ -35959,72 +36404,72 @@ var WorkflowStore = class { async retireWriterLock(identity, directory) { let handle; try { - handle = await open3(this.lockPath, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open6(this.lockPath, constants7.O_RDONLY | NO_FOLLOW3); } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing(error51)) return false; throw error51; } try { const metadata = await handle.stat(); - let named = await lstat4(this.lockPath); + let named = await lstat7(this.lockPath); if (!metadata.isFile() || metadata.dev !== identity.dev || metadata.ino !== identity.ino || !named.isFile() || named.isSymbolicLink() || named.dev !== identity.dev || named.ino !== identity.ino) return false; const contents = await readHandleBytes2(handle, metadata.size); const record2 = parseWriterLock(contents); if (record2.pid !== identity.record.pid || record2.processToken !== identity.record.processToken || record2.token !== identity.record.token) return false; const settled = await handle.stat(); - named = await lstat4(this.lockPath); + named = await lstat7(this.lockPath); if (settled.dev !== identity.dev || settled.ino !== identity.ino || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || named.dev !== identity.dev || named.ino !== identity.ino) return false; - await rm2(this.lockPath); + await rm3(this.lockPath); } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing(error51)) return false; throw error51; } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return true; } async retireWriterOwner(identity, directory) { let handle; try { - handle = await open3(identity.ownerPath, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open6(identity.ownerPath, constants7.O_RDONLY | NO_FOLLOW3); } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing(error51)) return false; throw error51; } try { const metadata = await handle.stat(); - let named = await lstat4(identity.ownerPath); + let named = await lstat7(identity.ownerPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.dev !== identity.dev || metadata.ino !== identity.ino || metadata.size < 1 || metadata.size > MAX_WRITER_LOCK_BYTES || !named.isFile() || named.isSymbolicLink() || named.dev !== identity.dev || named.ino !== identity.ino) return false; const contents = await readHandleBytes2(handle, metadata.size); const record2 = parseWriterLock(contents); if (record2.pid !== identity.record.pid || record2.processToken !== identity.record.processToken || record2.token !== identity.record.token) return false; const settled = await handle.stat(); - named = await lstat4(identity.ownerPath); + named = await lstat7(identity.ownerPath); if (settled.nlink !== 1 || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || named.dev !== identity.dev || named.ino !== identity.ino) return false; - await rm2(identity.ownerPath); + await rm3(identity.ownerPath); } catch (error51) { - if (isMissing2(error51)) return false; + if (isMissing(error51)) return false; throw error51; } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return true; } async recoverAbandonedStateFiles(directory) { await assertDirectoryIdentity(this.workflowDirectory, directory); - const names = (await readdir3(this.workflowDirectory)).filter((name) => /^\.state\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.(?:tmp|publish)$/u.test(name)); + const names = (await readdir4(this.workflowDirectory)).filter((name) => /^\.state\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.(?:tmp|publish)$/u.test(name)); if (names.length === 0) return; const artifacts = []; for (const name of names) { - const filePath = path6.join(this.workflowDirectory, name); - const handle = await open3(filePath, constants4.O_RDONLY | NO_FOLLOW2); + const filePath = path9.join(this.workflowDirectory, name); + const handle = await open6(filePath, constants7.O_RDONLY | NO_FOLLOW3); try { const metadata = await handle.stat(); - const named = await lstat4(filePath); + const named = await lstat7(filePath); if (!metadata.isFile() || metadata.nlink < 1 || metadata.nlink > 2 || metadata.size > this.maxStateBytes || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("abandoned workflow state file is unsafe", "unsafe-workflow-state"); } @@ -36033,8 +36478,8 @@ var WorkflowStore = class { await handle.close(); } } - const stateMetadata = await lstat4(this.statePath).catch((error51) => { - if (isMissing2(error51)) return null; + const stateMetadata = await lstat7(this.statePath).catch((error51) => { + if (isMissing(error51)) return null; throw error51; }); const linksByIdentity = /* @__PURE__ */ new Map(); @@ -36053,13 +36498,13 @@ var WorkflowStore = class { } } for (const artifact of artifacts) { - const named = await lstat4(artifact.filePath); + const named = await lstat7(artifact.filePath); if (!named.isFile() || named.isSymbolicLink() || named.dev !== artifact.metadata.dev || named.ino !== artifact.metadata.ino) { throw workflowError("abandoned workflow state file changed", "unsafe-workflow-state"); } - await rm2(artifact.filePath); + await rm3(artifact.filePath); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } async readFromDirectory(directory) { @@ -36067,26 +36512,22 @@ var WorkflowStore = class { let handle; try { try { - handle = await open3(this.statePath, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open6(this.statePath, constants7.O_RDONLY | NO_FOLLOW3); } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing(error51)) return null; throw error51; } - const metadata = await handle.stat(); - const named = await lstat4(this.statePath); - if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > this.maxStateBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { - throw workflowError( - "workflow state must be a bounded regular single-link file", - metadata.size > this.maxStateBytes ? "workflow-state-too-large" : "unsafe-workflow-state" - ); - } - const first = await readHandleBytes2(handle, metadata.size); - const second = await readHandleBytes2(handle, metadata.size); - const settled = await handle.stat(); - const settledNamed = await lstat4(this.statePath); - if (!first.equals(second) || !settled.isFile() || settled.nlink !== 1 || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino) { - throw workflowError("workflow state changed during read", "unsafe-workflow-state"); - } + const message = "workflow state must be a bounded regular single-link file"; + const { bytes: first } = await readSingleLinkFile( + handle, + this.statePath, + { minBytes: 0, maxBytes: this.maxStateBytes }, + { + unsafe: () => workflowError(message, "unsafe-workflow-state"), + oversized: () => workflowError(message, "workflow-state-too-large"), + changed: () => workflowError("workflow state changed during read", "unsafe-workflow-state") + } + ); let parsed; try { parsed = JSON.parse(first.toString("utf8")); @@ -36096,7 +36537,7 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); return validateState(parsed, this.workflowId); } catch (error51) { - if (isMissing2(error51)) return null; + if (isMissing(error51)) return null; throw error51; } finally { await handle?.close(); @@ -36153,9 +36594,9 @@ var WorkflowStore = class { let handle; try { try { - handle = await open3(this.journalPath, constants4.O_RDONLY | NO_FOLLOW2); + handle = await open6(this.journalPath, constants7.O_RDONLY | NO_FOLLOW3); } catch (error51) { - if (isMissing2(error51)) { + if (isMissing(error51)) { await assertDirectoryIdentity(this.workflowDirectory, directory); return { entries: [], @@ -36170,21 +36611,17 @@ var WorkflowStore = class { } throw error51; } - const metadata = await handle.stat(); - const named = await lstat4(this.journalPath); - if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > this.maxJournalBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { - throw workflowError( - "workflow journal must be a bounded regular single-link file", - metadata.size > this.maxJournalBytes ? "workflow-journal-too-large" : "unsafe-workflow-state" - ); - } - const first = await readHandleBytes2(handle, metadata.size); - const second = await readHandleBytes2(handle, metadata.size); - const settled = await handle.stat(); - const settledNamed = await lstat4(this.journalPath); - if (!first.equals(second) || settled.size !== metadata.size || settled.mtimeMs !== metadata.mtimeMs || settled.ctimeMs !== metadata.ctimeMs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino) { - throw workflowError("workflow journal changed during read", "unsafe-workflow-state"); - } + const message = "workflow journal must be a bounded regular single-link file"; + const { bytes: first, metadata } = await readSingleLinkFile( + handle, + this.journalPath, + { minBytes: 0, maxBytes: this.maxJournalBytes }, + { + unsafe: () => workflowError(message, "unsafe-workflow-state"), + oversized: () => workflowError(message, "workflow-journal-too-large"), + changed: () => workflowError("workflow journal changed during read", "unsafe-workflow-state") + } + ); const finalNewline = first.lastIndexOf(10); const tornTail = first.byteLength > 0 && finalNewline !== first.byteLength - 1; const completeByteLength = tornTail ? finalNewline + 1 : first.byteLength; @@ -36216,10 +36653,10 @@ var WorkflowStore = class { async truncateTornJournalTail(directory, snapshot) { if (!snapshot.tornTail || snapshot.identity === null) return; await assertDirectoryIdentity(this.workflowDirectory, directory); - const handle = await open3(this.journalPath, constants4.O_RDWR | NO_FOLLOW2); + const handle = await open6(this.journalPath, constants7.O_RDWR | NO_FOLLOW3); try { const metadata = await handle.stat(); - const named = await lstat4(this.journalPath); + const named = await lstat7(this.journalPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.dev !== snapshot.identity.dev || metadata.ino !== snapshot.identity.ino || metadata.size !== snapshot.fileSize || metadata.mtimeMs !== snapshot.mtimeMs || metadata.ctimeMs !== snapshot.ctimeMs || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino) { throw workflowError("workflow journal changed during torn-tail repair", "unsafe-workflow-state"); } @@ -36228,7 +36665,7 @@ var WorkflowStore = class { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } async appendJournalEntry(bytes, directory, expectedSize) { @@ -36236,14 +36673,14 @@ var WorkflowStore = class { throw workflowError("workflow journal exceeds its size limit", "workflow-journal-too-large"); } await assertDirectoryIdentity(this.workflowDirectory, directory); - const handle = await open3( + const handle = await open6( this.journalPath, - constants4.O_WRONLY | constants4.O_CREAT | constants4.O_APPEND | NO_FOLLOW2, + constants7.O_WRONLY | constants7.O_CREAT | constants7.O_APPEND | NO_FOLLOW3, 384 ); try { const metadata = await handle.stat(); - const named = await lstat4(this.journalPath); + const named = await lstat7(this.journalPath); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size !== expectedSize || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== metadata.dev || named.ino !== metadata.ino) { throw workflowError("workflow journal changed before append", "unsafe-workflow-state"); } @@ -36257,7 +36694,7 @@ var WorkflowStore = class { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } async assertCurrentRevision(directory, expectedRevision) { @@ -36267,29 +36704,29 @@ var WorkflowStore = class { } } async publish(bytes, directory, create) { - const temporaryPath = path6.join( + const temporaryPath = path9.join( this.workflowDirectory, - `.state.${randomUUID2()}.tmp` + `.state.${randomUUID3()}.tmp` ); - const publicationPath = path6.join( + const publicationPath = path9.join( this.workflowDirectory, - `.state.${randomUUID2()}.publish` + `.state.${randomUUID3()}.publish` ); let handle; let temporaryExists = false; let publicationExists = false; let temporaryIdentity; try { - handle = await open3( + handle = await open6( temporaryPath, - constants4.O_WRONLY | constants4.O_CREAT | constants4.O_EXCL | NO_FOLLOW2, + constants7.O_WRONLY | constants7.O_CREAT | constants7.O_EXCL | NO_FOLLOW3, 384 ); temporaryExists = true; await handle.writeFile(bytes); await handle.sync(); const metadata = await handle.stat({ bigint: true }); - const named = await lstat4(temporaryPath, { bigint: true }); + const named = await lstat7(temporaryPath, { bigint: true }); if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size !== BigInt(bytes.byteLength) || !named.isFile() || named.isSymbolicLink() || named.dev !== metadata.dev || named.ino !== metadata.ino) { throw workflowError("workflow state temporary file changed", "unsafe-workflow-state"); } @@ -36299,10 +36736,10 @@ var WorkflowStore = class { await assertDirectoryIdentity(this.workflowDirectory, directory); if (create) { try { - await lstat4(this.statePath); + await lstat7(this.statePath); throw workflowError("workflow state already exists", "workflow-state-conflict"); } catch (error51) { - if (!isMissing2(error51)) throw error51; + if (!isMissing(error51)) throw error51; } } await this.stageStatePublication( @@ -36318,40 +36755,40 @@ var WorkflowStore = class { bytes, temporaryIdentity ); - await rm2(temporaryPath); + await rm3(temporaryPath); temporaryExists = false; - await rename(publicationPath, this.statePath); + await rename2(publicationPath, this.statePath); publicationExists = false; await this.assertPublishedState(bytes, temporaryIdentity); - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } finally { await handle?.close(); - if (temporaryExists) await rm2(temporaryPath, { force: true }); - if (publicationExists) await rm2(publicationPath, { force: true }); + if (temporaryExists) await rm3(temporaryPath, { force: true }); + if (publicationExists) await rm3(publicationPath, { force: true }); } } async stageStatePublication(temporaryPath, publicationPath, expectedBytes, expectedIdentity) { let linked = false; try { - await link2(temporaryPath, publicationPath); + await link3(temporaryPath, publicationPath); linked = true; - const publication = await lstat4(publicationPath, { bigint: true }); + const publication = await lstat7(publicationPath, { bigint: true }); if (!publication.isFile() || publication.isSymbolicLink() || publication.nlink !== 2n || publication.dev !== expectedIdentity.dev || publication.ino !== expectedIdentity.ino || publication.size !== BigInt(expectedBytes.byteLength)) { throw workflowError("workflow state publication source changed", "unsafe-workflow-state"); } } catch (error51) { - if (linked) await rm2(publicationPath, { force: true }); + if (linked) await rm3(publicationPath, { force: true }); throw error51; } } async assertStagedPublication(temporaryPath, publicationPath, expectedBytes, expectedIdentity) { - const handle = await open3(publicationPath, constants4.O_RDONLY | NO_FOLLOW2); + const handle = await open6(publicationPath, constants7.O_RDONLY | NO_FOLLOW3); try { const metadata = await handle.stat({ bigint: true }); const [publication, temporary] = await Promise.all([ - lstat4(publicationPath, { bigint: true }), - lstat4(temporaryPath, { bigint: true }) + lstat7(publicationPath, { bigint: true }), + lstat7(temporaryPath, { bigint: true }) ]); if (!metadata.isFile() || metadata.nlink !== 2n || metadata.size !== BigInt(expectedBytes.byteLength) || metadata.dev !== expectedIdentity.dev || metadata.ino !== expectedIdentity.ino || !publication.isFile() || publication.isSymbolicLink() || publication.dev !== expectedIdentity.dev || publication.ino !== expectedIdentity.ino || !temporary.isFile() || temporary.isSymbolicLink() || temporary.dev !== expectedIdentity.dev || temporary.ino !== expectedIdentity.ino) { throw workflowError("workflow state publication changed before commit", "unsafe-workflow-state"); @@ -36366,10 +36803,10 @@ var WorkflowStore = class { } } async assertPublishedState(expectedBytes, expectedIdentity) { - const handle = await open3(this.statePath, constants4.O_RDONLY | NO_FOLLOW2); + const handle = await open6(this.statePath, constants7.O_RDONLY | NO_FOLLOW3); try { const metadata = await handle.stat({ bigint: true }); - const named = await lstat4(this.statePath, { bigint: true }); + const named = await lstat7(this.statePath, { bigint: true }); if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size !== BigInt(expectedBytes.byteLength) || metadata.dev !== expectedIdentity.dev || metadata.ino !== expectedIdentity.ino || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1n || named.dev !== metadata.dev || named.ino !== metadata.ino || named.size !== metadata.size) { throw workflowError("published workflow state identity changed", "unsafe-workflow-state"); } @@ -36385,6 +36822,81 @@ var WorkflowStore = class { }; // src/git/git-exec.ts +import path10 from "node:path"; +var RUNTIME_IDENTITY = { + GIT_AUTHOR_NAME: "claude-architect", + GIT_AUTHOR_EMAIL: "runtime@claude-architect.invalid", + GIT_COMMITTER_NAME: "claude-architect", + GIT_COMMITTER_EMAIL: "runtime@claude-architect.invalid", + GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z", + GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z" +}; +function userConfigEnvironment() { + const environment = {}; + for (const key of ["GIT_CONFIG_GLOBAL", "GIT_CONFIG_SYSTEM", "GIT_CONFIG_NOSYSTEM"]) { + const value = process.env[key]; + if (value !== void 0) environment[key] = value; + } + return environment; +} +var IDENTITY_VARIABLES = /* @__PURE__ */ new Set(["GIT_AUTHOR_IDENT", "GIT_COMMITTER_IDENT"]); +var IDENT_LINE = /^([^<>\n]+) <([^<>\n]*)> (\d+ [+-]\d{4})$/; +async function userCommitEnvironment(cwd, run = git) { + const environment = {}; + for (const [role, variable] of [ + ["AUTHOR", "GIT_AUTHOR_IDENT"], + ["COMMITTER", "GIT_COMMITTER_IDENT"] + ]) { + const result = await run(cwd, ["var", variable], { userIdentity: true }); + const match = result.exitCode === 0 && result.truncated?.stdout !== true ? IDENT_LINE.exec(result.stdout.trim()) : null; + if (match === null) return null; + environment[`GIT_${role}_NAME`] = match[1].trim(); + environment[`GIT_${role}_EMAIL`] = match[2]; + environment[`GIT_${role}_DATE`] = match[3]; + } + return environment; +} +var pinnedWorktrees = /* @__PURE__ */ new Map(); +function pinWorktreeGitDirectory(worktreePath, pin) { + pinnedWorktrees.set(path10.resolve(worktreePath), { ...pin }); +} +function unpinWorktreeGitDirectory(worktreePath) { + pinnedWorktrees.delete(path10.resolve(worktreePath)); +} +function pinnedWorktreeGitDirectory(worktreePath) { + const pin = pinnedWorktrees.get(path10.resolve(worktreePath)); + return pin === void 0 ? void 0 : { ...pin }; +} +function pinnedEnvironment(cwd) { + const resolved = path10.resolve(cwd); + for (const [workTree, pin] of pinnedWorktrees) { + if (resolved === workTree || resolved.startsWith(`${workTree}${path10.sep}`)) { + return { GIT_DIR: pin.gitDir, GIT_COMMON_DIR: pin.commonDir, GIT_WORK_TREE: workTree }; + } + } + return {}; +} +var DRIVER_HONORING_COMMANDS = /* @__PURE__ */ new Set(["diff", "log", "show", "format-patch", "blame"]); +var DEFAULT_MAX_OUTPUT_BYTES = 8e6; +var INDEX_LISTING_MAX_BYTES = 512 * 1024 * 1024; +function subcommandIndex(args) { + let index = 0; + while (index < args.length && args[index].startsWith("-")) { + index += args[index] === "-c" || args[index] === "-C" ? 2 : 1; + } + return index; +} +function gitSubcommand(args) { + return args[subcommandIndex(args)]; +} +function withoutDiffDrivers(args) { + const index = subcommandIndex(args); + const command = args[index]; + if (command === void 0 || !DRIVER_HONORING_COMMANDS.has(command)) return args; + const flags = command === "blame" ? ["--no-textconv"] : ["--no-textconv", "--no-ext-diff"]; + const missing = flags.filter((flag) => !args.includes(flag)); + return [...args.slice(0, index + 1), ...missing, ...args.slice(index + 1)]; +} var FILTER_KEY_PATTERN = "^filter\\..*\\.(clean|smudge|process|required)$"; var LOCAL_DISCOVERY_PATTERN = "^(extensions\\.worktreeconfig|filter\\..*\\.(clean|smudge|process|required))$"; function toGitResult(exit) { @@ -36462,25 +36974,30 @@ async function git(cwd, args, indexFileOrOptions) { const executable = await resolveGit(platformServices); const nullDevice = process.platform === "win32" ? "NUL" : "/dev/null"; const options = typeof indexFileOrOptions === "string" ? { indexFile: indexFileOrOptions } : indexFileOrOptions ?? {}; - const maxOutputBytes = options.maxOutputBytes ?? 8e6; + if (options.userIdentity === true && !(args.length === 2 && args[0] === "var" && IDENTITY_VARIABLES.has(args[1]))) { + return { + stdout: "", + stderr: "userIdentity is limited to git var of a commit identity\n", + exitCode: 2 + }; + } + const maxOutputBytes = options.maxOutputBytes ?? (gitSubcommand(args) === "ls-files" ? INDEX_LISTING_MAX_BYTES : DEFAULT_MAX_OUTPUT_BYTES); const env = { PATH: process.env.PATH ?? "", - GIT_CONFIG_GLOBAL: "/dev/null", - GIT_CONFIG_SYSTEM: "/dev/null", - GIT_CONFIG_NOSYSTEM: "1", + ...options.userIdentity === true ? userConfigEnvironment() : { + GIT_CONFIG_GLOBAL: nullDevice, + GIT_CONFIG_SYSTEM: nullDevice, + GIT_CONFIG_NOSYSTEM: "1" + }, GIT_ATTR_NOSYSTEM: "1", GIT_OPTIONAL_LOCKS: "0", GIT_TERMINAL_PROMPT: "0", ...process.env.HOME ? { HOME: process.env.HOME } : {}, ...process.env.XDG_CONFIG_HOME ? { XDG_CONFIG_HOME: process.env.XDG_CONFIG_HOME } : {}, - GIT_AUTHOR_NAME: "claude-architect", - GIT_AUTHOR_EMAIL: "runtime@claude-architect.invalid", - GIT_COMMITTER_NAME: "claude-architect", - GIT_COMMITTER_EMAIL: "runtime@claude-architect.invalid", - GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z", - GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z", + ...options.userIdentity === true ? {} : RUNTIME_IDENTITY, ...options.indexFile ? { GIT_INDEX_FILE: options.indexFile } : {}, - ...options.env + ...options.env, + ...pinnedEnvironment(cwd) }; const hardeningArgs = [ "-c", @@ -36543,7 +37060,14 @@ async function git(cwd, args, indexFileOrOptions) { if (neutralizations.error !== void 0) return neutralizations.error; const exit = await supervise(platformServices, { executable, - args: [...hardeningArgs, ...neutralizations.args ?? [], ...args], + args: [ + ...hardeningArgs, + ...neutralizations.args ?? [], + // Never let Git guess `user@host` from the machine: an identity the user + // did not configure must surface as missing. + ...options.userIdentity === true ? ["-c", "user.useConfigOnly=true"] : [], + ...withoutDiffDrivers(args) + ], cwd, env, ...options.stdin === void 0 ? {} : { stdin: options.stdin }, @@ -36554,44 +37078,31 @@ async function git(cwd, args, indexFileOrOptions) { } // src/git/worktree-registration.ts -import { realpath as realpath3 } from "node:fs/promises"; -import path8 from "node:path"; - -// src/util/platform-path.ts -import path7 from "node:path"; -function stripWindowsExtendedPrefix(value) { - if (value.toLowerCase().startsWith("\\\\?\\unc\\")) return `\\\\${value.slice(8)}`; - return value.startsWith("\\\\?\\") ? value.slice(4) : value; -} -function platformPathsEqual(left, right, platform = process.platform) { - if (platform !== "win32") return path7.resolve(left) === path7.resolve(right); - return path7.win32.normalize(stripWindowsExtendedPrefix(left)) === path7.win32.normalize(stripWindowsExtendedPrefix(right)); -} - -// src/git/worktree-registration.ts +import { realpath as realpath4 } from "node:fs/promises"; +import path11 from "node:path"; async function canonicalizeWorktreePath(pathname, allowMissing) { - if (!path8.isAbsolute(pathname)) { + if (!path11.isAbsolute(pathname)) { throw new RuntimeError("worktree registration path is not absolute"); } - const resolved = path8.resolve(pathname); + const resolved = path11.resolve(pathname); try { - return await realpath3(resolved); + return await realpath4(resolved); } catch (error51) { - if (!allowMissing || error51.code !== "ENOENT") throw error51; + if (!allowMissing || !isMissing(error51)) throw error51; } const missingSegments = []; let ancestor = resolved; for (; ; ) { - const parent = path8.dirname(ancestor); + const parent = path11.dirname(ancestor); if (parent === ancestor) { throw new RuntimeError("worktree registration path has no existing ancestor"); } - missingSegments.unshift(path8.basename(ancestor)); + missingSegments.unshift(path11.basename(ancestor)); ancestor = parent; try { - return path8.join(await realpath3(ancestor), ...missingSegments); + return path11.join(await realpath4(ancestor), ...missingSegments); } catch (error51) { - if (error51.code !== "ENOENT") throw error51; + if (!isMissing(error51)) throw error51; } } } @@ -36607,7 +37118,7 @@ async function findWorktreeRegistration(fields, worktreePath, allowMissing = fal allowMissing ); } catch (error51) { - if (error51.code === "ENOENT") continue; + if (isMissing(error51)) continue; throw error51; } if (platformPathsEqual(reported, expected)) return index; @@ -36657,7 +37168,7 @@ import { homedir } from "node:os"; import { join as join2 } from "node:path"; // src/producers/plain-text.ts -import { open as open4 } from "node:fs/promises"; +import { open as open7 } from "node:fs/promises"; // src/producers/skill-bootstrap.ts import { existsSync } from "node:fs"; @@ -36837,7 +37348,7 @@ async function normalizeNodeShim(executable) { if (executable.kind !== "native") return executable; let handle; try { - handle = await open4(executable.command, "r"); + handle = await open7(executable.command, "r"); const buffer = Buffer.alloc(256); const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0); const firstLine = buffer.subarray(0, bytesRead).toString("utf8").split(/\r?\n/u, 1)[0] ?? ""; @@ -37840,10 +38351,10 @@ var registry2 = new ProducerRegistry([new CodexAdapter(), new OpenCodeAdapter(), // src/producers/producer-runtime.ts import { existsSync as existsSync7, statSync as statSync2 } from "node:fs"; import { homedir as homedir8 } from "node:os"; -import path11 from "node:path"; +import path14 from "node:path"; // src/runtime/environment-policy.ts -import path9 from "node:path"; +import path12 from "node:path"; // src/runtime/redaction.ts var registeredSecrets = /* @__PURE__ */ new Map(); @@ -38090,14 +38601,14 @@ function buildEnvironment(args) { env, provenance, "APPDATA", - path9.win32.join(args.tempHome, "AppData", "Roaming"), + path12.win32.join(args.tempHome, "AppData", "Roaming"), "platform" ); setEnvironmentValue( env, provenance, "LOCALAPPDATA", - path9.win32.join(args.tempHome, "AppData", "Local"), + path12.win32.join(args.tempHome, "AppData", "Local"), "platform" ); } else { @@ -38120,6 +38631,9 @@ function buildEnvironment(args) { setEnvironmentValue(env, provenance, name, value, "adapter"); } for (const [name, value] of Object.entries(args.specAdditions ?? {})) { + if (provenance.get(name) === "platform") { + throw new RuntimeError(`delegation environment may not override ${JSON.stringify(name)}`); + } setEnvironmentValue(env, provenance, name, value, "spec"); } setEnvironmentValue( @@ -38130,12 +38644,16 @@ function buildEnvironment(args) { "platform" ); const environmentSecretRegistration = registerSensitiveEnvironment(env); + const passedValueRegistration = combineSecretRegistrations( + [...provenance.entries()].filter(([name, source]) => (source === "adapter" || source === "spec") && !path12.isAbsolute(env[name] ?? "")).map(([name]) => registerSecretValue(env[name] ?? "")) + ); return { env, provenance: [...provenance.entries()].map(([name, source]) => ({ name, source })).sort((left, right) => compareNames(left.name, right.name)), secretRegistration: combineSecretRegistrations([ hostSecretRegistration, - environmentSecretRegistration + environmentSecretRegistration, + passedValueRegistration ]) }; } catch (error51) { @@ -38167,14 +38685,14 @@ function buildWriteSeatbeltPolicy(args) { extraWritableRoots: [...args.extraWritableRoots] }; } -function sbPath(path35) { - for (const character of path35) { +function sbPath(path43) { + for (const character of path43) { const codePoint = character.codePointAt(0); if (codePoint !== void 0 && (codePoint < 32 || codePoint === 127)) { - throw new Error(`seatbelt: control character in path: ${JSON.stringify(path35)}`); + throw new Error(`seatbelt: control character in path: ${JSON.stringify(path43)}`); } } - return `"${path35.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; + return `"${path43.replace(/\\/gu, "\\\\").replace(/"/gu, '\\"')}"`; } function isDeclaredStateRoot(normalized, invocation, policy) { const roots = []; @@ -38225,14 +38743,14 @@ function isDeclaredStateRoot(normalized, invocation, policy) { const winUserHomePattern = /^[a-zA-Z]:\\Users\\[^\\]+(?:\\.*)?$/u; return userHomePattern.test(normalized) || winUserHomePattern.test(normalized); } -function isValidInheritedStatePath(path35, invocation, policy) { - if (typeof path35 !== "string" || path35.trim().length === 0) return false; - if (!isAbsolute(path35)) return false; - const parsed = parse3(path35); - if (path35 === "/" || path35 === parsed.root) return false; - const normalized = normalize(path35); +function isValidInheritedStatePath(path43, invocation, policy) { + if (typeof path43 !== "string" || path43.trim().length === 0) return false; + if (!isAbsolute(path43)) return false; + const parsed = parse3(path43); + if (path43 === "/" || path43 === parsed.root) return false; + const normalized = normalize(path43); if (normalized === "/" || normalized === parsed.root) return false; - if (resolve(path35) === "/" || resolve(path35) === parsed.root) return false; + if (resolve(path43) === "/" || resolve(path43) === parsed.root) return false; return isDeclaredStateRoot(normalized, invocation, policy); } function inheritedStateWritablePaths(invocation, policy) { @@ -38246,28 +38764,52 @@ function inheritedStateWritablePaths(invocation, policy) { } return [...declared]; } +var CREDENTIAL_PATHS = [ + ".ssh", + ".aws", + ".azure", + ".gnupg", + ".kube", + ".docker", + ".netrc", + ".git-credentials", + ".config/gh", + ".config/gcloud" +]; +function credentialReadDenials() { + const home = process.env.HOME ?? homedir7(); + if (!isAbsolute(home) || resolve(home) === "/") return []; + return [...new Set(CREDENTIAL_PATHS.flatMap((entry) => { + const candidate = resolve(home, entry); + try { + return [candidate, realpathSync2(candidate)]; + } catch { + return [candidate]; + } + }))]; +} function buildProfile(policy, additionalWritable) { const writable = [...new Set([ policy.worktreePath, policy.tempHome, - process.env.TMPDIR ?? "/private/tmp", - "/private/tmp", + ...policy.sharedTemp === false ? [] : [process.env.TMPDIR ?? "/private/tmp", "/private/tmp"], "/dev", ...policy.extraWritableRoots ?? [], ...additionalWritable - ].filter((path35) => typeof path35 === "string" && path35.length > 0).flatMap((path35) => { + ].filter((path43) => typeof path43 === "string" && path43.length > 0).flatMap((path43) => { try { - return [path35, realpathSync2(path35)]; + return [path43, realpathSync2(path43)]; } catch { - return [path35]; + return [path43]; } }))]; const lines = [ "(version 1)", "(allow default)", "(deny file-write*)", - ...writable.map((path35) => `(allow file-write* (subpath ${sbPath(path35)}))`), - '(allow file-write* (literal "/dev/null") (literal "/dev/tty"))' + ...writable.map((path43) => `(allow file-write* (subpath ${sbPath(path43)}))`), + '(allow file-write* (literal "/dev/null") (literal "/dev/tty"))', + ...credentialReadDenials().map((path43) => `(deny file-read* (subpath ${sbPath(path43)}))`) ]; if (!policy.allowNetwork) lines.push("(deny network*)"); return lines.join("\n"); @@ -38290,24 +38832,30 @@ function wrapInvocationWithSeatbelt(invocation, policy) { args: ["-p", profile, ...inner] }; } +function seatbeltArgv(policy, argv) { + const profile = buildProfile({ + worktreePath: policy.worktreePath, + tempHome: policy.scratchDir, + allowNetwork: true, + sharedTemp: false + }, []); + return { command: "/usr/bin/sandbox-exec", args: ["-p", profile, ...argv] }; +} // src/runtime/run-start.ts -import { randomUUID as randomUUID3 } from "node:crypto"; -import { constants as constants5 } from "node:fs"; +import { randomUUID as randomUUID4 } from "node:crypto"; +import { constants as constants8 } from "node:fs"; import { access as access2, - lstat as lstat5, - open as open5, - realpath as realpath4, - rename as rename2, - rm as rm3 + lstat as lstat8, + open as open8, + realpath as realpath5, + rename as rename3, + rm as rm4 } from "node:fs/promises"; -import path10 from "node:path"; +import path13 from "node:path"; import { fileURLToPath as fileURLToPath4 } from "node:url"; -var NO_FOLLOW3 = constants5.O_NOFOLLOW ?? 0; -function errorCode5(error51) { - return error51.code; -} +var NO_FOLLOW4 = constants8.O_NOFOLLOW ?? 0; async function resolveWatchdogPath() { const candidates = [ new URL("../../runtime/watchdog.mjs", import.meta.url), @@ -38344,35 +38892,23 @@ async function parentDeathWatchdogInvocation(executable, args) { } function assertDirectoryIdentity2(target) { return Promise.all([ - lstat5(target.publicDirectory), - realpath4(target.publicDirectory) + lstat8(target.publicDirectory), + realpath5(target.publicDirectory) ]).then(([metadata, canonical]) => { if (!metadata.isDirectory() || metadata.isSymbolicLink() || metadata.dev !== target.identity.dev || metadata.ino !== target.identity.ino || canonical !== target.canonicalDirectory) { throw new RuntimeError("run archive directory identity changed"); } }); } -async function syncDirectory2(directory) { - let handle; - try { - handle = await open5(directory, constants5.O_RDONLY | NO_FOLLOW3); - await handle.sync(); - } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode5(error51) ?? ""); - if (!unsupportedOnWindows) throw error51; - } finally { - await handle?.close(); - } -} async function writeRunStart(target, record2, create) { await assertDirectoryIdentity2(target); - const destination = path10.join(target.canonicalDirectory, "run-start.json"); + const destination = path13.join(target.canonicalDirectory, "run-start.json"); const serialized = `${JSON.stringify(record2, null, 2)} `; if (create) { - const handle2 = await open5( + const handle2 = await open8( destination, - constants5.O_WRONLY | constants5.O_CREAT | constants5.O_EXCL | NO_FOLLOW3, + constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | NO_FOLLOW4, 384 ); try { @@ -38381,20 +38917,20 @@ async function writeRunStart(target, record2, create) { } finally { await handle2.close(); } - await syncDirectory2(target.canonicalDirectory); + await flushDirectory(target.canonicalDirectory); await assertDirectoryIdentity2(target); return; } - const temporaryPath = path10.join( + const temporaryPath = path13.join( target.canonicalDirectory, - `.run-start.${randomUUID3()}.tmp` + `.run-start.${randomUUID4()}.tmp` ); let created = false; let handle; try { - handle = await open5( + handle = await open8( temporaryPath, - constants5.O_WRONLY | constants5.O_CREAT | constants5.O_EXCL | NO_FOLLOW3, + constants8.O_WRONLY | constants8.O_CREAT | constants8.O_EXCL | NO_FOLLOW4, 384 ); created = true; @@ -38403,19 +38939,19 @@ async function writeRunStart(target, record2, create) { await handle.close(); handle = void 0; await assertDirectoryIdentity2(target); - await rename2(temporaryPath, destination); + await rename3(temporaryPath, destination); created = false; - await syncDirectory2(target.canonicalDirectory); + await flushDirectory(target.canonicalDirectory); await assertDirectoryIdentity2(target); } finally { await handle?.close(); - if (created) await rm3(temporaryPath, { force: true }); + if (created) await rm4(temporaryPath, { force: true }); } } async function initializeRunStart(store, record2) { await store.writeLog("lifecycle", "attempt lock acquired\n"); - const canonicalDirectory = await realpath4(store.runDirectory); - const metadata = await lstat5(store.runDirectory); + const canonicalDirectory = await realpath5(store.runDirectory); + const metadata = await lstat8(store.runDirectory); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { throw new RuntimeError("run archive directory is not a plain directory"); } @@ -38603,7 +39139,7 @@ var ProducerRuntime = class { ...request.extraWritableRoots && request.extraWritableRoots.length > 0 ? { extraWritableRoots: request.extraWritableRoots } : {}, ...request.gitObjectAccess ? { gitObjectDirectory: request.gitObjectAccess.privateObjectsDir, - gitAlternateObjectDirectories: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path11.delimiter) : request.gitObjectAccess.sharedObjectsDir + gitAlternateObjectDirectories: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path14.delimiter) : request.gitObjectAccess.sharedObjectsDir } : {} }; let invocation = adapter.buildInvocation(request.spec, invocationContext); @@ -38632,7 +39168,7 @@ var ProducerRuntime = class { ...request.envAdditions ?? {}, ...request.gitObjectAccess ? { GIT_OBJECT_DIRECTORY: request.gitObjectAccess.privateObjectsDir, - GIT_ALTERNATE_OBJECT_DIRECTORIES: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path11.delimiter) : request.gitObjectAccess.sharedObjectsDir + GIT_ALTERNATE_OBJECT_DIRECTORIES: Array.isArray(request.gitObjectAccess.sharedObjectsDir) ? request.gitObjectAccess.sharedObjectsDir.join(path14.delimiter) : request.gitObjectAccess.sharedObjectsDir } : {} }, ...tempHome === null ? {} : { tempHome } @@ -38685,13 +39221,21 @@ async function probeAll(ctx, producerRegistry = registry2, options) { // src/verify/dependency-link.ts import { execFile as execFile3 } from "node:child_process"; -import { access as access3, mkdir as mkdir3, mkdtemp, readFile as readFile2, rm as rm4, writeFile } from "node:fs/promises"; +import { access as access3, mkdir as mkdir5, mkdtemp, readFile as readFile3, rm as rm5, stat, writeFile } from "node:fs/promises"; import { tmpdir as tmpdir5 } from "node:os"; -import path12 from "node:path"; +import path15 from "node:path"; import { promisify } from "node:util"; var execFileAsync = promisify(execFile3); var LOCKFILES = ["package-lock.json", "bun.lockb", "pnpm-lock.yaml", "yarn.lock"]; var COPY_TIMEOUT_MS = 12e4; +var MAX_LOCKFILE_BYTES = 64 * 1024 * 1024; +var SYSTEM_CP = ["/bin/cp", "/usr/bin/cp"]; +async function systemCp() { + for (const candidate of SYSTEM_CP) { + if (await exists(candidate)) return candidate; + } + throw new Error("system cp is unavailable"); +} function cowClone(platform, source, target) { if (platform === "darwin") { return { args: ["-Rc", source, target], strategy: "clonefile" }; @@ -38714,30 +39258,32 @@ async function probeCowSupport(dependencies = {}) { if (platform !== "darwin" && platform !== "linux") { return { cowSupported: false, strategy: "unsupported" }; } - const probeRoot = await mkdtemp(path12.join(tmpdir5(), "ca-cow-probe-")); + const probeRoot = await mkdtemp(path15.join(tmpdir5(), "ca-cow-probe-")); try { - const source = path12.join(probeRoot, "source"); - const target = path12.join(probeRoot, "target"); + const source = path15.join(probeRoot, "source"); + const target = path15.join(probeRoot, "target"); const clone2 = cowClone(platform, source, target); if (clone2 === null) return { cowSupported: false, strategy: "unsupported" }; - await mkdir3(source); - await writeFile(path12.join(source, "sentinel"), "probe\n"); + await mkdir5(source); + await writeFile(path15.join(source, "sentinel"), "probe\n"); try { - await (dependencies.execFile ?? execFileAsync)("cp", clone2.args, { timeout: COPY_TIMEOUT_MS }); + await (dependencies.execFile ?? execFileAsync)(await systemCp(), clone2.args, { + timeout: COPY_TIMEOUT_MS + }); return { cowSupported: true, strategy: clone2.strategy }; } catch { return { cowSupported: false, strategy: clone2.strategy }; } } finally { - await rm4(probeRoot, { recursive: true, force: true }); + await rm5(probeRoot, { recursive: true, force: true }); } } async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = {}) { - const primaryModules = path12.join(primaryRepo, "node_modules"); + const primaryModules = path15.join(primaryRepo, "node_modules"); if (!await exists(primaryModules)) return "none"; const [primaryLockfiles, worktreeLockfiles] = await Promise.all([ - Promise.all(LOCKFILES.map((lockfile) => exists(path12.join(primaryRepo, lockfile)))), - Promise.all(LOCKFILES.map((lockfile) => exists(path12.join(worktreePath, lockfile)))) + Promise.all(LOCKFILES.map((lockfile) => exists(path15.join(primaryRepo, lockfile)))), + Promise.all(LOCKFILES.map((lockfile) => exists(path15.join(worktreePath, lockfile)))) ]); if (!primaryLockfiles.some(Boolean)) return "none"; if (primaryLockfiles.some((present, index) => present !== worktreeLockfiles[index])) { @@ -38746,9 +39292,14 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = try { const comparisons = await Promise.all(LOCKFILES.map(async (lockfile, index) => { if (!primaryLockfiles[index]) return true; + const sizes = await Promise.all([ + stat(path15.join(primaryRepo, lockfile)), + stat(path15.join(worktreePath, lockfile)) + ]); + if (sizes.some((entry) => entry.size > MAX_LOCKFILE_BYTES) || sizes[0].size !== sizes[1].size) return false; const [primaryLock, worktreeLock] = await Promise.all([ - readFile2(path12.join(primaryRepo, lockfile)), - readFile2(path12.join(worktreePath, lockfile)) + readFile3(path15.join(primaryRepo, lockfile)), + readFile3(path15.join(worktreePath, lockfile)) ]); return primaryLock.equals(worktreeLock); })); @@ -38756,23 +39307,25 @@ async function linkPrimaryDependencies(primaryRepo, worktreePath, dependencies = } catch { return "skipped-lockfile-mismatch"; } - const targetModules = path12.join(worktreePath, "node_modules"); + const targetModules = path15.join(worktreePath, "node_modules"); const platform = dependencies.platform ?? process.platform; const clone2 = cowClone(platform, primaryModules, targetModules); if (clone2 === null) return "skipped-cow-unsupported"; try { - await (dependencies.execFile ?? execFileAsync)("cp", clone2.args, { timeout: COPY_TIMEOUT_MS }); + await (dependencies.execFile ?? execFileAsync)(await systemCp(), clone2.args, { + timeout: COPY_TIMEOUT_MS + }); return "inherited"; } catch { - await rm4(targetModules, { recursive: true, force: true }); + await rm5(targetModules, { recursive: true, force: true }); return "skipped-cow-unsupported"; } } // src/mcp/live-bundle.ts -import { createHash as createHash4 } from "node:crypto"; -import { readFile as readFile3 } from "node:fs/promises"; -import path13 from "node:path"; +import { createHash as createHash5 } from "node:crypto"; +import { readFile as readFile4 } from "node:fs/promises"; +import path16 from "node:path"; var NOT_SELF_HOSTED = { selfHosted: false, runningVersion: RUNTIME_VERSION, @@ -38788,7 +39341,7 @@ async function readOrNull(read, target) { } } function sha256(contents) { - return createHash4("sha256").update(contents).digest("hex"); + return createHash5("sha256").update(contents).digest("hex"); } function declaredName(manifest) { try { @@ -38800,18 +39353,18 @@ function declaredName(manifest) { } } async function checkLiveBundle(checkoutPath, deps = {}) { - const read = deps.readFile ?? ((target) => readFile3(target)); + const read = deps.readFile ?? ((target) => readFile4(target)); const runningVersion = deps.runningVersion ?? RUNTIME_VERSION; - const manifest = await readOrNull(read, path13.join(checkoutPath, ".claude-plugin", "plugin.json")); + const manifest = await readOrNull(read, path16.join(checkoutPath, ".claude-plugin", "plugin.json")); if (manifest === null) return { ...NOT_SELF_HOSTED, runningVersion }; const declared = declaredName(manifest); if (declared === null || declared.name !== "claude-architect") { return { ...NOT_SELF_HOSTED, runningVersion }; } const repositoryVersion = typeof declared.version === "string" ? declared.version : null; - const repositoryBundle = await readOrNull(read, path13.join(checkoutPath, "runtime", "server.mjs")); + const repositoryBundle = await readOrNull(read, path16.join(checkoutPath, "runtime", "server.mjs")); const runningBundlePath = deps.runningBundlePath ?? process.argv[1]; - const runningBundle = runningBundlePath === void 0 || path13.basename(runningBundlePath) !== "server.mjs" ? null : await readOrNull(read, runningBundlePath); + const runningBundle = runningBundlePath === void 0 || path16.basename(runningBundlePath) !== "server.mjs" ? null : await readOrNull(read, runningBundlePath); const bundleMatches = repositoryBundle === null || runningBundle === null ? null : sha256(repositoryBundle) === sha256(runningBundle); return { selfHosted: true, @@ -38830,12 +39383,11 @@ function liveBundleDiagnostic(status) { // src/mcp/doctor.ts var POSIX_HOME_PATH = /\/(?:Users|home)\/[^/\\\s"']+(?:\/[^/\\\s"']+)*/g; var WINDOWS_HOME_PATH = /[A-Za-z]:\\Users\\[^/\\\s"']+(?:\\[^/\\\s"']+)*/gi; -var CHECKOUT_LOCK_NAME = CHECKOUT_LOCK_NAME_PATTERN; var MAX_CHECKOUT_LOCK_BYTES = 4096; var MAX_AUTOPILOT_OWNER_BYTES = 1024; var MAX_AUTOPILOT_REGISTRATION_BYTES = 32768; var MAX_AUTOPILOT_SCAN_ENTRIES = 1024; -var NO_FOLLOW4 = constants6.O_NOFOLLOW ?? 0; +var NO_FOLLOW5 = constants9.O_NOFOLLOW ?? 0; var WORKFLOW_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u; var OID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u; var AUTOPILOT_ISSUE_ORDER = [ @@ -38844,8 +39396,6 @@ var AUTOPILOT_ISSUE_ORDER = [ "autopilot-worktree-orphaned", "autopilot-branch-mismatch", "autopilot-promotion-incomplete", - "autopilot-remote-recovery-required", - "autopilot-pr-recovery-required", "autopilot-state-malformed", "autopilot-scan-truncated" ]; @@ -38872,16 +39422,18 @@ function nodeIsSupported(version2) { function gitVersion(stdout) { return /^git version ([^\s]+)(?:\s|$)/u.exec(stdout.trim())?.[1] ?? null; } -function errorCode6(error51) { - return error51.code; +function gitMeetsFloor(version2) { + const [major, minor] = version2.split(".").map((part) => Number.parseInt(part, 10)); + if (!Number.isInteger(major) || !Number.isInteger(minor)) return false; + return major > 2 || major === 2 && minor >= 40; } function defaultIsProcessAlive2(pid) { try { - nodeProcess5.kill(pid, 0); + nodeProcess6.kill(pid, 0); return true; } catch (error51) { - if (errorCode6(error51) === "EPERM") return true; - if (errorCode6(error51) === "ESRCH") return false; + if (errorCode(error51) === "EPERM") return true; + if (errorCode(error51) === "ESRCH") return false; throw error51; } } @@ -38917,16 +39469,16 @@ async function readCheckoutLock(handle) { } async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { if (stateDir === void 0) return []; - const locksRoot = path14.join(stateDir, "locks"); + const locksRoot = path17.join(stateDir, "locks"); let entries; try { - entries = await readdir4(locksRoot, { withFileTypes: true }); + entries = await readdir5(locksRoot, { withFileTypes: true }); } catch (error51) { - return errorCode6(error51) === "ENOENT" ? [] : ["checkout-lock-scan-failed"]; + return errorCode(error51) === "ENOENT" ? [] : ["checkout-lock-scan-failed"]; } const issues = /* @__PURE__ */ new Set(); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const match = CHECKOUT_LOCK_NAME.exec(entry.name); + const match = CHECKOUT_LOCK_NAME_PATTERN.exec(entry.name); if (match === null || match[1] === CLEANUP_JOURNAL_LOCK_KEY) continue; if (!entry.isFile() || entry.isSymbolicLink()) { issues.add("checkout-lock-malformed"); @@ -38934,7 +39486,7 @@ async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { } let handle; try { - handle = await open6(path14.join(locksRoot, entry.name), constants6.O_RDONLY | NO_FOLLOW4); + handle = await open9(path17.join(locksRoot, entry.name), constants9.O_RDONLY | NO_FOLLOW5); const metadataBeforeRead = await handle.stat(); if (!metadataBeforeRead.isFile() || metadataBeforeRead.size > MAX_CHECKOUT_LOCK_BYTES) { issues.add("checkout-lock-malformed"); @@ -38958,7 +39510,7 @@ async function checkoutLockIssues(stateDir, ps, isProcessAlive2) { const liveToken = owner.processToken === null ? null : await ps.getProcessStartToken(owner.pid); issues.add(owner.processToken !== null && liveToken !== null && liveToken !== owner.processToken ? "checkout-lock-leaked" : "checkout-lock-held"); } catch (error51) { - if (errorCode6(error51) !== "ENOENT") issues.add("checkout-lock-malformed"); + if (errorCode(error51) !== "ENOENT") issues.add("checkout-lock-malformed"); } finally { try { await handle?.close(); @@ -38978,9 +39530,9 @@ async function readBoundedRegularFile(filename, maxBytes) { let handle; let outcome = { status: "malformed" }; try { - handle = await open6(filename, constants6.O_RDONLY | NO_FOLLOW4); + handle = await open9(filename, constants9.O_RDONLY | NO_FOLLOW5); const before = await handle.stat(); - const named = await lstat6(filename); + const named = await lstat9(filename); if (!before.isFile() || before.nlink !== 1 || before.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.nlink !== 1 || named.dev !== before.dev || named.ino !== before.ino || named.size !== before.size) return outcome; const bytes = Buffer.alloc(before.size); let offset = 0; @@ -38990,11 +39542,11 @@ async function readBoundedRegularFile(filename, maxBytes) { offset += bytesRead; } const after = await handle.stat(); - const settledNamed = await lstat6(filename); + const settledNamed = await lstat9(filename); if (offset !== before.size || after.dev !== before.dev || after.ino !== before.ino || after.nlink !== 1 || after.size !== before.size || after.mtimeMs !== before.mtimeMs || after.ctimeMs !== before.ctimeMs || settledNamed.dev !== before.dev || settledNamed.ino !== before.ino || settledNamed.nlink !== 1 || settledNamed.size !== before.size) return outcome; outcome = { status: "ok", text: bytes.toString("utf8") }; } catch (error51) { - if (errorCode6(error51) === "ENOENT") outcome = { status: "missing" }; + if (errorCode(error51) === "ENOENT") outcome = { status: "missing" }; } finally { try { await handle?.close(); @@ -39030,7 +39582,7 @@ function parseRegistration(text) { } if (typeof value !== "object" || value === null || Array.isArray(value)) return null; const record2 = value; - if (record2.ownershipVersion !== "1" || typeof record2.workflowId !== "string" || !WORKFLOW_ID.test(record2.workflowId) || typeof record2.checkoutPath !== "string" || !path14.isAbsolute(record2.checkoutPath) || typeof record2.gitCommonDir !== "string" || !path14.isAbsolute(record2.gitCommonDir) || typeof record2.repositoryIdentity !== "string" || typeof record2.worktreePath !== "string" || !path14.isAbsolute(record2.worktreePath) || typeof record2.worktreeGitDir !== "string" || !path14.isAbsolute(record2.worktreeGitDir) || typeof record2.branch !== "string" || record2.branchRef !== `refs/heads/${record2.branch}` || record2.baseRef !== `refs/claude-architect/autopilot/${record2.workflowId}/base` || typeof record2.baseBranch !== "string" || typeof record2.baseCommitOid !== "string" || !OID.test(record2.baseCommitOid) || record2.remote !== "origin" || typeof record2.remoteUrl !== "string" || typeof record2.ownerRepo !== "string" || !isBootstrapOwner(record2.bootstrapOwner, record2.workflowId)) return null; + if (record2.ownershipVersion !== "1" || typeof record2.workflowId !== "string" || !WORKFLOW_ID.test(record2.workflowId) || typeof record2.checkoutPath !== "string" || !path17.isAbsolute(record2.checkoutPath) || typeof record2.gitCommonDir !== "string" || !path17.isAbsolute(record2.gitCommonDir) || typeof record2.repositoryIdentity !== "string" || typeof record2.worktreePath !== "string" || !path17.isAbsolute(record2.worktreePath) || typeof record2.worktreeGitDir !== "string" || !path17.isAbsolute(record2.worktreeGitDir) || typeof record2.branch !== "string" || record2.branchRef !== `refs/heads/${record2.branch}` || record2.baseRef !== `refs/claude-architect/autopilot/${record2.workflowId}/base` || typeof record2.baseBranch !== "string" || typeof record2.baseCommitOid !== "string" || !OID.test(record2.baseCommitOid) || record2.remote !== "origin" || typeof record2.remoteUrl !== "string" || typeof record2.ownerRepo !== "string" || !isBootstrapOwner(record2.bootstrapOwner, record2.workflowId)) return null; return record2; } async function ownerStatus(owner, ps, isProcessAlive2) { @@ -39050,27 +39602,27 @@ function sameOwner(lease, bootstrap) { return lease.workflowId === bootstrap.workflowId && lease.pid === bootstrap.pid && lease.processToken === bootstrap.processToken; } function registrationFilename(workflowId) { - return `${createHash5("sha256").update(workflowId).digest("hex")}.json`; + return `${createHash6("sha256").update(workflowId).digest("hex")}.json`; } async function safeDirectoryEntries(directory, issues) { try { - const metadata = await lstat6(directory); + const metadata = await lstat9(directory); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { issues.add("autopilot-state-malformed"); return []; } - const entries = await readdir4(directory, { withFileTypes: true }); + const entries = await readdir5(directory, { withFileTypes: true }); if (entries.length > MAX_AUTOPILOT_SCAN_ENTRIES) { issues.add("autopilot-state-malformed"); } return entries.sort((left, right) => left.name.localeCompare(right.name)).slice(0, MAX_AUTOPILOT_SCAN_ENTRIES); } catch (error51) { - if (errorCode6(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); + if (errorCode(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); return []; } } async function scanRegistrations(stateRoot2, issues) { - const root = path14.join(stateRoot2, "autopilot-branches"); + const root = path17.join(stateRoot2, "autopilot-branches"); const entries = await safeDirectoryEntries(root, issues); const registrations = /* @__PURE__ */ new Map(); const filenames = /* @__PURE__ */ new Set(); @@ -39081,7 +39633,7 @@ async function scanRegistrations(stateRoot2, issues) { continue; } const read = await readBoundedRegularFile( - path14.join(root, entry.name), + path17.join(root, entry.name), MAX_AUTOPILOT_REGISTRATION_BYTES ); if (read.status !== "ok") { @@ -39098,7 +39650,7 @@ async function scanRegistrations(stateRoot2, issues) { return { registrations, filenames }; } function branchMatchesState(registration, state) { - return registration.workflowId === state.workflowId && registration.repositoryIdentity === state.repositoryIdentity && registration.baseCommitOid === state.baseCommitOid && registration.branchRef === state.workflowRef && registration.worktreePath === state.worktreePath && registration.branch === state.shipping.branch; + return registration.workflowId === state.workflowId && registration.repositoryIdentity === state.repositoryIdentity && registration.baseCommitOid === state.baseCommitOid && registration.branchRef === state.workflowRef && registration.worktreePath === state.worktreePath && registration.branch === state.branch; } function expectedHead(state, registration) { if (state === null) return null; @@ -39108,14 +39660,14 @@ function expectedHead(state, registration) { async function observedBranchMatches(registration, state, git2) { try { const [checkoutMetadata, worktreeMetadata] = await Promise.all([ - lstat6(registration.checkoutPath), - lstat6(registration.worktreePath) + lstat9(registration.checkoutPath), + lstat9(registration.worktreePath) ]); if (!checkoutMetadata.isDirectory() || checkoutMetadata.isSymbolicLink() || !worktreeMetadata.isDirectory() || worktreeMetadata.isSymbolicLink()) return false; const [checkout, worktree, common] = await Promise.all([ - realpath5(registration.checkoutPath), - realpath5(registration.worktreePath), - realpath5(registration.gitCommonDir) + realpath6(registration.checkoutPath), + realpath6(registration.worktreePath), + realpath6(registration.gitCommonDir) ]); if (checkout !== registration.checkoutPath || worktree !== registration.worktreePath || common !== registration.gitCommonDir) return false; const [observedCommon, worktrees, symbolic, head, branchRef, baseRef] = await Promise.all([ @@ -39127,7 +39679,7 @@ async function observedBranchMatches(registration, state, git2) { git2(registration.checkoutPath, ["rev-parse", "--verify", registration.baseRef]) ]); if ([observedCommon, worktrees, symbolic, head, branchRef, baseRef].some((result) => result.exitCode !== 0 || result.truncated?.stdout === true || result.truncated?.stderr === true)) return false; - if (await realpath5(gitPathOutput( + if (await realpath6(gitPathOutput( observedCommon.stdout, "workflow common directory" )) !== registration.gitCommonDir || symbolic.stdout.trim() !== registration.branch || head.stdout.trim() !== branchRef.stdout.trim() || baseRef.stdout.trim() !== registration.baseCommitOid) return false; @@ -39145,11 +39697,11 @@ async function observedBranchMatches(registration, state, git2) { } async function autopilotIssues(stateDir, ps, isProcessAlive2, git2) { if (stateDir === void 0) return []; - const stateRoot2 = path14.resolve(stateDir); + const stateRoot2 = path17.resolve(stateDir); const issues = /* @__PURE__ */ new Set(); let probes = 0; const registrationScan = await scanRegistrations(stateRoot2, issues); - const workflowsRoot = path14.join(stateRoot2, "workflows"); + const workflowsRoot = path17.join(stateRoot2, "workflows"); const workflowEntries = await safeDirectoryEntries(workflowsRoot, issues); const states = /* @__PURE__ */ new Map(); for (const entry of workflowEntries) { @@ -39202,19 +39754,13 @@ async function autopilotIssues(stateDir, ps, isProcessAlive2, git2) { ); if (bootstrapStatus !== leaseStatus) issues.add("autopilot-state-malformed"); } - if (leaseStatus === "dead" && state.phase === "pushing") { - issues.add("autopilot-remote-recovery-required"); - } - if (leaseStatus === "dead" && (state.phase === "creating-draft-pr" || state.phase === "marking-ready")) { - issues.add("autopilot-pr-recovery-required"); - } let worktreeExists = false; try { - const metadata = await lstat6(state.worktreePath); + const metadata = await lstat9(state.worktreePath); worktreeExists = metadata.isDirectory() && !metadata.isSymbolicLink(); if (!worktreeExists) issues.add("autopilot-state-malformed"); } catch (error51) { - if (errorCode6(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); + if (errorCode(error51) !== "ENOENT") issues.add("autopilot-state-malformed"); } if (worktreeExists && registrationMissing) { issues.add("autopilot-worktree-orphaned"); @@ -39286,15 +39832,16 @@ async function doctor(deps = {}) { try { const result = await gitRunner(process.cwd(), ["--version"]); const version2 = result.exitCode === 0 && result.truncated?.stdout !== true ? gitVersion(result.stdout) : null; - let path35 = null; + let path43 = null; try { - path35 = (await ps.resolveExecutable({ name: "git" })).command; + path43 = (await ps.resolveExecutable({ name: "git" })).command; } catch { } - git2 = { version: version2, ok: version2 !== null, path: path35 }; + git2 = { version: version2, ok: version2 !== null, path: path43 }; } catch { } if (!git2.ok) issues.push("git-unavailable"); + else if (!gitMeetsFloor(git2.version)) issues.push("git-too-old"); let dependencyClone; try { dependencyClone = await (deps.probeCowSupport ?? probeCowSupport)(); @@ -39439,10 +39986,22 @@ function gitChangedFiles(checkoutPath, deps = {}) { } // src/autopilot/autopilot-controller.ts -import { randomUUID as randomUUID10 } from "node:crypto"; +import { randomUUID as randomUUID9 } from "node:crypto"; + +// src/mcp/decision-authority.ts +var DECISION_AUTHORITY_ENV = "CLAUDE_ARCHITECT_DECISION_AUTHORITY"; +function decisionAuthority(env = process.env, warn = (message) => console.error(message)) { + const raw = env[DECISION_AUTHORITY_ENV]; + if (raw === void 0 || raw === "") return "autonomous"; + if (raw === "autonomous" || raw === "human") return raw; + warn( + `${DECISION_AUTHORITY_ENV}="${raw}" is not a recognized decision authority; requiring human confirmation. Valid values: "autonomous", "human".` + ); + return "human"; +} // src/protocol/spec-validator.ts -import path15 from "node:path"; +import path18 from "node:path"; var schemas = loadSchemas(); function allowlistCovers(top, glob) { return top.some((pattern) => { @@ -39453,7 +40012,7 @@ function allowlistCovers(top, glob) { }); } function isSafeRepositoryGlob(glob) { - return glob.length > 0 && !path15.posix.isAbsolute(glob) && !path15.win32.isAbsolute(glob) && !glob.split(/[\\/]/).includes(".."); + return glob.length > 0 && !path18.posix.isAbsolute(glob) && !path18.win32.isAbsolute(glob) && !glob.split(/[\\/]/).includes(".."); } function sliceDependencyError(sliceIndex, dependencyIndex, message) { return { @@ -39535,8 +40094,8 @@ function validateSpec(input) { ); if (topLevelDeletionError !== null) return topLevelDeletionError; for (const [index, command] of spec.verification.entries()) { - const normalizedCwd = path15.posix.normalize(command.cwd); - if (path15.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { + const normalizedCwd = path18.posix.normalize(command.cwd); + if (path18.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { return { ok: false, errors: [{ @@ -39564,8 +40123,8 @@ function validateSpec(input) { } } for (const [commandIndex, command] of slice.verification.entries()) { - const normalizedCwd = path15.posix.normalize(command.cwd); - if (path15.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { + const normalizedCwd = path18.posix.normalize(command.cwd); + if (path18.isAbsolute(command.cwd) || normalizedCwd === ".." || normalizedCwd.startsWith("../")) { return { ok: false, errors: [{ @@ -39634,6 +40193,15 @@ function taskIdForDelegationPath(input, instancePath) { return idLength >= 1 && idLength <= 128 ? task.id : void 0; } function validateAutopilotSpec(input) { + if (isRecord4(input) && input.specVersion === "1") { + return { + ok: false, + errors: [{ + path: "#/specVersion", + message: 'autopilot spec v1 is unsupported: Autopilot now ends at a final-reviewed local branch; remove `shipping` and set specVersion to "2"' + }] + }; + } const schemaValid = schemas.autopilotSpec(input); const errors = (schemas.autopilotSpec.errors ?? []).filter((error51) => taskIdForDelegationPath(input, error51.instancePath) === void 0).map((error51) => ({ path: error51.instancePath || error51.schemaPath, @@ -39669,10 +40237,10 @@ function validateAutopilotSpec(input) { } // src/autopilot/autopilot-eligibility.ts -import { createHash as createHash8 } from "node:crypto"; +import { createHash as createHash9 } from "node:crypto"; // src/git/changed-path-manifest.ts -import { createHash as createHash6 } from "node:crypto"; +import { createHash as createHash7 } from "node:crypto"; function splitNul(value) { const fields = value.split("\0"); if (fields.at(-1) === "") fields.pop(); @@ -39727,9 +40295,9 @@ function sortChangedPaths(changedPaths) { function deriveChangedPaths(inputs) { const rawEntries = new Map(inputs.rawDiff.map((entry) => [entry.path, entry])); const treeEntries = parseTree(inputs.treeOutput); - return sortChangedPaths(parseNameStatus(inputs.nameStatusOutput).map(({ path: path35, status }) => { - const treeEntry = treeEntries.get(path35); - const rawEntry = rawEntries.get(path35); + return sortChangedPaths(parseNameStatus(inputs.nameStatusOutput).map(({ path: path43, status }) => { + const treeEntry = treeEntries.get(path43); + const rawEntry = rawEntries.get(path43); if (treeEntry === void 0 && status !== "D") { throw new RuntimeError("candidate tree is missing a changed path"); } @@ -39737,7 +40305,7 @@ function deriveChangedPaths(inputs) { throw new RuntimeError("git diff-tree outputs disagree"); } return { - path: path35, + path: path43, changeType: changeType(status), mode: treeEntry?.mode ?? rawEntry.oldMode, contentHash: treeEntry?.oid ?? null @@ -39764,8 +40332,8 @@ function validateChangedPaths(changedPaths) { } function manifestHashOf(changedPaths) { validateChangedPaths(changedPaths); - const canonical = changedPaths.map(({ path: path35, changeType: changeType2, mode, contentHash }) => ({ path: path35, changeType: changeType2, mode, contentHash })); - return createHash6("sha256").update(JSON.stringify(canonical)).digest("hex"); + const canonical = changedPaths.map(({ path: path43, changeType: changeType2, mode, contentHash }) => ({ path: path43, changeType: changeType2, mode, contentHash })); + return createHash7("sha256").update(JSON.stringify(canonical)).digest("hex"); } function inspectChangedPathManifest(inputs) { const changedPaths = deriveChangedPaths(inputs); @@ -39784,7 +40352,263 @@ function computeChangedPathManifest(inputs) { } // src/runtime/review-snapshot.ts -import { createHash as createHash7 } from "node:crypto"; +import { createHash as createHash8 } from "node:crypto"; + +// src/git/candidate-tree.ts +import { lstat as lstat10, mkdtemp as mkdtemp2, rm as rm6 } from "node:fs/promises"; +import { tmpdir as tmpdir6 } from "node:os"; +import path19 from "node:path"; + +// src/util/glob.ts +function escapeRegex2(character) { + return /[\\^$.*+?()[\]{}|]/.test(character) ? `\\${character}` : character; +} +function globMatches(pattern, candidate, caseInsensitive = false) { + let expression = "^"; + for (let index = 0; index < pattern.length; index += 1) { + const character = pattern[index]; + if (character === void 0) break; + if (character !== "*") { + expression += escapeRegex2(character); + continue; + } + if (pattern[index + 1] !== "*") { + expression += "[^/]*"; + continue; + } + index += 1; + if (pattern[index + 1] === "/") { + expression += "(?:.*/)?"; + index += 1; + } else { + expression += ".*"; + } + } + return new RegExp(`${expression}$`, caseInsensitive ? "i" : void 0).test(candidate); +} + +// src/git/checked-git.ts +var MAX_DIAGNOSTIC_LENGTH2 = 2e3; +function gitFailure(action, result) { + const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH2); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} +function gitSucceeded(result) { + return result.exitCode === 0 && result.truncated?.stdout !== true && result.truncated?.stderr !== true; +} +async function gitChecked(cwd, args, options) { + const result = await git(cwd, args, options); + const command = gitSubcommand(args) ?? "command"; + if (result.exitCode !== 0) throw gitFailure(`git ${command}`, result); + if (!gitSucceeded(result)) { + throw new RuntimeError(`git ${command} output exceeded the runtime bound`, { + command, + truncated: result.truncated + }); + } + return result.stdout; +} +function reviewDiffArgs(base, head, extra = []) { + return [ + `--attr-source=${base}`, + "diff", + "--no-color", + "--no-ext-diff", + "--no-textconv", + ...extra, + base, + head, + "--" + ]; +} +async function reviewDiff(cwd, base, head, options) { + return await gitChecked(cwd, reviewDiffArgs(base, head), options); +} + +// src/git/candidate-tree.ts +var MAX_REJECT_PATHS = 25; +var BINARY_PATCH_PAYLOAD_MARKER = "[[BINARY_PATCH_PAYLOAD_OMITTED]]"; +async function checkedGit(cwd, args, indexFile) { + return await gitChecked(cwd, args, indexFile === void 0 ? void 0 : { indexFile }); +} +function parsePorcelainPaths(output, kind) { + const fields = splitNul(output); + const paths = []; + for (let index = 0; index < fields.length; index += 1) { + const entry = fields[index]; + const status = entry.slice(0, 2); + const entryPath = entry.slice(3); + if (kind === "ignored" !== (status === "!!")) { + if (status.includes("R")) index += 1; + continue; + } + paths.push(entryPath); + if (status.includes("R")) { + const sourcePath = fields[index + 1]; + if (sourcePath !== void 0) paths.push(sourcePath); + index += 1; + } + } + return [...new Set(paths)]; +} +async function inventoryWorktree(worktreePath) { + const changed = await checkedGit(worktreePath, [ + "status", + "--porcelain=v1", + "-z", + "--untracked-files=all" + ]); + const ignored = await checkedGit(worktreePath, [ + "status", + "--porcelain=v1", + "-z", + "--ignored", + "--untracked-files=all" + ]); + return { + changedPaths: parsePorcelainPaths(changed, "changed"), + ignoredPaths: parsePorcelainPaths(ignored, "ignored") + }; +} +function isAllowed(pathname, writeAllowlist, forbiddenScope, opaqueDirectory = false) { + const scopePaths = opaqueDirectory ? [pathname, `${pathname}/`] : [pathname]; + return writeAllowlist.some((pattern) => scopePaths.some((candidate) => globMatches(pattern, candidate))) && !forbiddenScope.some((pattern) => scopePaths.some((candidate) => globMatches(pattern, candidate, true))); +} +async function advisoryLstatScan(worktreePath, changedPaths) { + const symlinkResults = await Promise.all(changedPaths.map(async (changedPath) => { + try { + return (await lstat10(path19.resolve(worktreePath, changedPath))).isSymbolicLink(); + } catch (error51) { + if (isMissing(error51)) return false; + throw error51; + } + })); + return symlinkResults.some(Boolean); +} +function sanitizeReviewPatch(patch) { + const sanitizedLines = []; + let omittingBinaryPayload = false; + for (const line of patch.split(/\r?\n/)) { + if (line === "GIT binary patch") { + sanitizedLines.push(line, BINARY_PATCH_PAYLOAD_MARKER); + omittingBinaryPayload = true; + continue; + } + if (omittingBinaryPayload) { + if (!line.startsWith("diff --git ")) continue; + omittingBinaryPayload = false; + } + sanitizedLines.push(line); + } + return redact(sanitizedLines.join("\n")); +} +async function candidateReviewPatch(cwd, baseCommitOid, candidate, options) { + return sanitizeReviewPatch(await gitChecked( + cwd, + reviewDiffArgs(baseCommitOid, candidate, ["--binary", "--full-index"]), + options + )); +} +async function freezeCandidate(args) { + const inventory = await inventoryWorktree(args.worktreePath); + const outOfScope = inventory.changedPaths.filter((changedPath) => !isAllowed(changedPath, args.writeAllowlist, args.forbiddenScope)); + if (outOfScope.length > 0) { + return { ok: false, reason: "out-of-scope-write", paths: outOfScope.slice(0, MAX_REJECT_PATHS) }; + } + if (await advisoryLstatScan(args.worktreePath, inventory.changedPaths)) { + return { ok: false, reason: "modified-symlink" }; + } + const indexDirectory = await mkdtemp2(path19.join(tmpdir6(), "claude-architect-index-")); + const indexFile = path19.join(indexDirectory, "index"); + try { + await checkedGit(args.worktreePath, ["read-tree", args.baseCommitOid], indexFile); + if (inventory.changedPaths.length > 0) { + const literalPathspecs = inventory.changedPaths.map((changedPath) => `:(literal)${changedPath}`); + await checkedGit(args.worktreePath, ["add", "--all", "--", ...literalPathspecs], indexFile); + } + const candidateTreeOid = (await checkedGit(args.worktreePath, ["write-tree"], indexFile)).trim(); + const baseTreeOid = (await checkedGit( + args.worktreePath, + ["rev-parse", `${args.baseCommitOid}^{tree}`] + )).trim(); + if (candidateTreeOid === baseTreeOid) return { ok: false, reason: "empty-candidate" }; + const rawDiff = parseRawDiff(await checkedGit(args.worktreePath, [ + "diff-tree", + "-r", + "--no-commit-id", + "--no-renames", + "--raw", + "-z", + args.baseCommitOid, + candidateTreeOid + ])); + const frozenOutOfScope = rawDiff.filter((entry) => !isAllowed( + entry.path, + args.writeAllowlist, + args.forbiddenScope, + entry.oldMode === "160000" || entry.newMode === "160000" + )).map((entry) => entry.path); + if (frozenOutOfScope.length > 0) { + return { + ok: false, + reason: "out-of-scope-write", + paths: frozenOutOfScope.slice(0, MAX_REJECT_PATHS) + }; + } + if (rawDiff.some((entry) => [entry.oldMode, entry.newMode].some((mode) => mode === "120000" || mode === "160000"))) { + return { ok: false, reason: "modified-symlink" }; + } + const nameStatusOutput = await checkedGit(args.repoRoot, [ + "diff-tree", + "-r", + "--no-commit-id", + "--no-renames", + "--name-status", + "-z", + args.baseCommitOid, + candidateTreeOid + ]); + const treeOutput = await checkedGit( + args.repoRoot, + ["ls-tree", "-r", "-z", candidateTreeOid] + ); + const { changedPaths, manifestHash } = computeChangedPathManifest({ + rawDiff, + nameStatusOutput, + treeOutput + }); + const patch = await candidateReviewPatch(args.repoRoot, args.baseCommitOid, candidateTreeOid); + const anchorRef = `refs/claude-architect/candidates/${args.runId}`; + const candidateCommitOid = (await checkedGit(args.repoRoot, [ + "commit-tree", + candidateTreeOid, + "-p", + args.baseCommitOid, + "-m", + `candidate ${args.runId}` + ])).trim(); + await checkedGit(args.repoRoot, ["update-ref", anchorRef, candidateCommitOid]); + return { + ok: true, + artifact: { + baseCommitOid: args.baseCommitOid, + candidateTreeOid, + candidateCommitOid, + anchorRef, + manifestHash, + changedPaths, + patch + }, + evidence: { + ignoredPaths: inventory.ignoredPaths.map((ignoredPath) => redact(ignoredPath)).sort((left, right) => left < right ? -1 : left > right ? 1 : 0) + } + }; + } finally { + await rm6(indexDirectory, { recursive: true, force: true }); + } +} + +// src/runtime/review-snapshot.ts var SHA256 = /^[0-9a-f]{64}$/u; var GIT_OID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; var REDACTION_MARKER = /\[(?:a|b|e|g|j|k|l|s)\]/u; @@ -39941,26 +40765,22 @@ async function createReviewSnapshot(run) { if (!anchorMissing && (anchor.exitCode !== 0 || anchor.stdout.trim() !== candidate.candidateCommitOid || anchor.truncated?.stdout === true || anchor.truncated?.stderr === true) || tree.exitCode !== 0 || tree.stdout.trim() !== candidate.candidateTreeOid || tree.truncated?.stdout === true || tree.truncated?.stderr === true) { throw reviewError("candidate anchor no longer matches the archive", "candidate-anchor-mismatch"); } - const patch = await git2(run.repoRoot, [ - "diff", - "--no-ext-diff", - "--no-textconv", - "--binary", - "--full-index", + const patchResult = await git2(run.repoRoot, reviewDiffArgs( candidate.baseCommitOid, candidate.candidateTreeOid, - "--" - ]); - if (patch.exitCode !== 0 || patch.truncated?.stdout === true || patch.truncated?.stderr === true) { + ["--binary", "--full-index"] + )); + if (!gitSucceeded(patchResult)) { throw reviewError("failed to regenerate candidate patch", "candidate-review-failed"); } + const patch = sanitizeReviewPatch(patchResult.stdout); const snapshot = { runId: run.runId, baseCommitOid: candidate.baseCommitOid, candidateCommitOid: candidate.candidateCommitOid, candidateTreeOid: candidate.candidateTreeOid, manifestHash: candidate.manifestHash, - patch: patch.stdout, + patch, changedPaths: candidate.changedPaths.map((change) => ({ ...change })), evidence: boundEvidence(result.evidence), executedVerification: result.executedVerification.map((outcome) => ({ @@ -39975,13 +40795,12 @@ async function createReviewSnapshot(run) { function reviewSnapshotHash(snapshot) { const validated = validateReviewSnapshot(snapshot, snapshot.runId); assertRedactionInvariants(validated); - const hash2 = createHash7("sha256").update(canonicalJsonValue(validated)).digest("hex"); + const hash2 = createHash8("sha256").update(canonicalJsonValue(validated)).digest("hex"); if (!SHA256.test(hash2)) throw new RuntimeError("review snapshot hash is invalid"); return hash2; } // src/autopilot/autopilot-eligibility.ts -var SHA2562 = /^[0-9a-f]{64}$/u; function canonicalJsonValue2(value) { if (value === null) return "null"; if (typeof value === "string" || typeof value === "boolean") return JSON.stringify(value); @@ -40000,7 +40819,7 @@ function canonicalJsonValue2(value) { } function canonicalArtifactHash(value) { const jsonValue = JSON.parse(JSON.stringify(value)); - return createHash8("sha256").update(canonicalJsonValue2(jsonValue)).digest("hex"); + return createHash9("sha256").update(canonicalJsonValue2(jsonValue)).digest("hex"); } function pipelineResultHash(result) { return canonicalArtifactHash(result); @@ -40026,50 +40845,22 @@ function autopilotDecisionEligibilityProjection(record2) { function addReason(reasons, reason) { if (!reasons.includes(reason)) reasons.push(reason); } -function hashesAgree(actual, expected) { - return SHA2562.test(actual) && actual === expected; -} -function eligibilityInputFromArtifacts(args) { - const { pipelineResult, reviewSnapshot, advisor } = args; +function evaluateAutopilotEligibility(evidence) { + const { pipelineResult, reviewSnapshot, advisor } = evidence; + const reasons = []; const candidate = pipelineResult.attempt.candidate; const lastRound = pipelineResult.rounds.at(-1); - return { - runId: pipelineResult.runId, - status: pipelineResult.status, - gate: structuredClone(pipelineResult.gate), - attemptStatus: pipelineResult.attempt.status, - verification: pipelineResult.verification === null ? null : structuredClone(pipelineResult.verification), - finalReviews: structuredClone(lastRound?.reviews ?? []), - finalFindings: structuredClone(lastRound?.consolidated.findings ?? []), - finalFixReReviewed: lastRound?.fix === null, - advisor: structuredClone(advisor), - baseCommitOid: candidate?.baseCommitOid ?? reviewSnapshot.baseCommitOid, - candidateCommitOid: candidate?.candidateCommitOid ?? reviewSnapshot.candidateCommitOid, - candidateTreeOid: candidate?.candidateTreeOid ?? reviewSnapshot.candidateTreeOid, - candidateManifestHash: candidate?.manifestHash ?? reviewSnapshot.manifestHash, - reviewRunId: reviewSnapshot.runId, - reviewBaseCommitOid: reviewSnapshot.baseCommitOid, - reviewCandidateCommitOid: reviewSnapshot.candidateCommitOid, - reviewCandidateTreeOid: reviewSnapshot.candidateTreeOid, - reviewManifestHash: reviewSnapshot.manifestHash, - reviewSnapshotHash: reviewSnapshotHash(reviewSnapshot), - pipelineResultHash: pipelineResultHash(pipelineResult), - advisorReportHash: advisorReportHash(advisor), - evaluatedAt: args.evaluatedAt, - pipelineResult: structuredClone(pipelineResult), - reviewSnapshot: structuredClone(reviewSnapshot) - }; -} -function evaluateAutopilotEligibility(input) { - const reasons = []; - if (input.status !== "decision-ready") addReason(reasons, "pipeline status is not decision-ready"); - if (!input.gate.decisionReady) addReason(reasons, "pipeline gate is not decision-ready"); - if (input.gate.requiresHumanDecision) addReason(reasons, "pipeline gate requires human decision"); - for (const reason of input.gate.reasons) addReason(reasons, `pipeline gate: ${reason}`); - if (input.attemptStatus !== "verified-candidate") { + const gate = pipelineResult.gate; + if (pipelineResult.status !== "decision-ready") { + addReason(reasons, "pipeline status is not decision-ready"); + } + if (!gate.decisionReady) addReason(reasons, "pipeline gate is not decision-ready"); + if (gate.requiresHumanDecision) addReason(reasons, "pipeline gate requires human decision"); + for (const reason of gate.reasons) addReason(reasons, `pipeline gate: ${reason}`); + if (pipelineResult.attempt.status !== "verified-candidate") { addReason(reasons, "attempt is not a verified candidate"); } - const verification = input.verification; + const verification = pipelineResult.verification; if (verification === null) { addReason(reasons, "trusted verification is missing"); } else { @@ -40089,8 +40880,9 @@ function evaluateAutopilotEligibility(input) { addReason(reasons, "trusted verification evidence contains failures"); } } + const finalReviews = lastRound?.reviews ?? []; for (const reviewer of ["correctness", "systems"]) { - const report = input.finalReviews.find((review) => review.reviewer === reviewer)?.report; + const report = finalReviews.find((review) => review.reviewer === reviewer)?.report; if (report?.verdict !== "approve") { addReason(reasons, `final ${reviewer} review does not approve`); } @@ -40098,100 +40890,91 @@ function evaluateAutopilotEligibility(input) { addReason(reasons, `final ${reviewer} review has coverage gaps`); } } - if (input.finalFindings.some((finding) => finding.severity === "blocker" || finding.severity === "major")) { + if ((lastRound?.consolidated.findings ?? []).some((finding) => finding.severity === "blocker" || finding.severity === "major")) { addReason(reasons, "final review contains blocker or major findings"); } - if (!input.finalFixReReviewed) addReason(reasons, "final fix was not independently re-reviewed"); - if (input.advisor.verdict !== "approve") addReason(reasons, "advisor does not approve"); - if (input.advisor.risks.some((risk) => risk.severity === "blocker" || risk.severity === "major")) { + if (lastRound?.fix !== null) addReason(reasons, "final fix was not independently re-reviewed"); + if (advisor.verdict !== "approve") addReason(reasons, "advisor does not approve"); + if (advisor.risks.some((risk) => risk.severity === "blocker" || risk.severity === "major")) { addReason(reasons, "advisor reported blocker or major risk"); } - if (input.advisor.coverageGaps.length > 0) addReason(reasons, "advisor reported coverage gaps"); - if (input.runId !== input.reviewRunId) addReason(reasons, "review snapshot run id mismatch"); - if (input.baseCommitOid !== input.reviewBaseCommitOid) { - addReason(reasons, "review snapshot base commit mismatch"); - } - if (input.candidateCommitOid !== input.reviewCandidateCommitOid) { - addReason(reasons, "review snapshot candidate commit mismatch"); - } - if (input.candidateTreeOid !== input.reviewCandidateTreeOid) { - addReason(reasons, "review snapshot candidate tree mismatch"); - } - if (input.candidateManifestHash !== input.reviewManifestHash) { - addReason(reasons, "review snapshot candidate manifest mismatch"); - } - if (!SHA2562.test(input.reviewSnapshotHash)) addReason(reasons, "review snapshot hash is invalid"); - if (!SHA2562.test(input.pipelineResultHash)) addReason(reasons, "pipeline result hash is invalid"); - if (!SHA2562.test(input.advisorReportHash)) addReason(reasons, "advisor report hash is invalid"); - if (input.reviewSnapshot === void 0) { - addReason(reasons, "review snapshot source artifact is missing"); + if (advisor.coverageGaps.length > 0) addReason(reasons, "advisor reported coverage gaps"); + if (candidate === null) { + addReason(reasons, "pipeline result has no candidate"); } else { - try { - if (!hashesAgree(input.reviewSnapshotHash, reviewSnapshotHash(input.reviewSnapshot))) { - addReason(reasons, "review snapshot hash mismatch"); - } - } catch { - addReason(reasons, "review snapshot is malformed"); + if (pipelineResult.runId !== reviewSnapshot.runId) { + addReason(reasons, "review snapshot run id mismatch"); + } + if (candidate.baseCommitOid !== reviewSnapshot.baseCommitOid) { + addReason(reasons, "review snapshot base commit mismatch"); + } + if (candidate.candidateCommitOid !== reviewSnapshot.candidateCommitOid) { + addReason(reasons, "review snapshot candidate commit mismatch"); + } + if (candidate.candidateTreeOid !== reviewSnapshot.candidateTreeOid) { + addReason(reasons, "review snapshot candidate tree mismatch"); + } + if (candidate.manifestHash !== reviewSnapshot.manifestHash) { + addReason(reasons, "review snapshot candidate manifest mismatch"); } - } - if (input.pipelineResult === void 0) { - addReason(reasons, "pipeline result source artifact is missing"); - } else { try { - if (!hashesAgree(input.pipelineResultHash, pipelineResultHash(input.pipelineResult))) { - addReason(reasons, "pipeline result hash mismatch"); - } - const sourceLastRound = input.pipelineResult.rounds.at(-1); - if (input.pipelineResult.status !== input.status || input.pipelineResult.attempt.status !== input.attemptStatus || canonicalArtifactHash(input.pipelineResult.gate) !== canonicalArtifactHash(input.gate) || canonicalArtifactHash(input.pipelineResult.verification) !== canonicalArtifactHash(input.verification) || canonicalArtifactHash(sourceLastRound?.reviews ?? []) !== canonicalArtifactHash(input.finalReviews) || canonicalArtifactHash(sourceLastRound?.consolidated.findings ?? []) !== canonicalArtifactHash(input.finalFindings) || sourceLastRound?.fix === null !== input.finalFixReReviewed) { - addReason(reasons, "pipeline result eligibility projection mismatch"); - } - const candidate = input.pipelineResult.attempt.candidate; - if (input.pipelineResult.runId !== input.runId || input.pipelineResult.attempt.runId !== input.runId || input.pipelineResult.finalCandidateCommit !== input.candidateCommitOid || candidate === null || candidate.baseCommitOid !== input.baseCommitOid || candidate.candidateCommitOid !== input.candidateCommitOid || candidate.candidateTreeOid !== input.candidateTreeOid || candidate.manifestHash !== input.candidateManifestHash || manifestHashOf(candidate.changedPaths) !== candidate.manifestHash) { + if (pipelineResult.attempt.runId !== pipelineResult.runId || pipelineResult.finalCandidateCommit !== candidate.candidateCommitOid || manifestHashOf(candidate.changedPaths) !== candidate.manifestHash) { addReason(reasons, "pipeline result candidate binding mismatch"); } } catch { addReason(reasons, "pipeline result is malformed"); } } + let reviewSnapshotHash2 = ""; + let resultHash = ""; + let advisorHash = ""; try { - if (!hashesAgree(input.advisorReportHash, advisorReportHash(input.advisor))) { - addReason(reasons, "advisor report hash mismatch"); - } + reviewSnapshotHash2 = reviewSnapshotHash(reviewSnapshot); + } catch { + addReason(reasons, "review snapshot is malformed"); + } + try { + resultHash = pipelineResultHash(pipelineResult); + } catch { + addReason(reasons, "pipeline result is malformed"); + } + try { + advisorHash = advisorReportHash(advisor); } catch { addReason(reasons, "advisor report is malformed"); } return { recordVersion: "1", policyVersion: "1", - runId: input.runId, + runId: pipelineResult.runId, eligible: reasons.length === 0, reasons, - baseCommitOid: input.baseCommitOid, - candidateCommitOid: input.candidateCommitOid, - candidateTreeOid: input.candidateTreeOid, - candidateManifestHash: input.candidateManifestHash, - reviewSnapshotHash: input.reviewSnapshotHash, - pipelineResultHash: input.pipelineResultHash, - advisorReportHash: input.advisorReportHash, - evaluatedAt: input.evaluatedAt + baseCommitOid: candidate?.baseCommitOid ?? reviewSnapshot.baseCommitOid, + candidateCommitOid: candidate?.candidateCommitOid ?? reviewSnapshot.candidateCommitOid, + candidateTreeOid: candidate?.candidateTreeOid ?? reviewSnapshot.candidateTreeOid, + candidateManifestHash: candidate?.manifestHash ?? reviewSnapshot.manifestHash, + reviewSnapshotHash: reviewSnapshotHash2, + pipelineResultHash: resultHash, + advisorReportHash: advisorHash, + evaluatedAt: evidence.evaluatedAt }; } // src/autopilot/final-branch-reviewer.ts -import { createHash as createHash12, randomUUID as randomUUID9 } from "node:crypto"; -import { constants as constants13 } from "node:fs"; -import { link as link7, lstat as lstat16, open as open13, readFile as readFile6, rm as rm10 } from "node:fs/promises"; -import path25 from "node:path"; +import { createHash as createHash12 } from "node:crypto"; +import { constants as constants14 } from "node:fs"; +import { open as open14 } from "node:fs/promises"; +import path28 from "node:path"; // src/runtime/worktree-manager.ts import { randomUUID as randomUUID6 } from "node:crypto"; -import { lstat as lstat11, mkdir as mkdir5, readdir as readdir6, realpath as realpath7, rename as rename5 } from "node:fs/promises"; -import path19 from "node:path"; +import { lstat as lstat13, mkdir as mkdir6, readdir as readdir7, realpath as realpath8, rename as rename5 } from "node:fs/promises"; +import path22 from "node:path"; // src/platform/bound-directory-cleanup.ts -import { constants as constants7 } from "node:fs"; -import { access as access4, lstat as lstat7, open as open7, rmdir } from "node:fs/promises"; -import path16 from "node:path"; +import { constants as constants10 } from "node:fs"; +import { access as access4, lstat as lstat11, open as open10, rmdir } from "node:fs/promises"; +import path20 from "node:path"; var DEFAULT_EMPTY_DIRECTORY_TIMEOUT_MS = 12e4; var EMPTY_DIRECTORY_TIMEOUT_ENV = "CLAUDE_ARCHITECT_EMPTY_DIRECTORY_TIMEOUT_MS"; function resolveEmptyDirectoryTimeoutMs(env = process.env, warn = (message) => console.error(message)) { @@ -40245,19 +41028,68 @@ const sameIdentity = (left, right) => left.dev === right.dev && left.birthtimeNs === right.birthtimeNs && left.isDirectory() === right.isDirectory() && left.isSymbolicLink() === right.isSymbolicLink(); -const darwinHandlePath = fd => { +// One lsof spawn resolves a whole batch of handles; per-directory spawns made +// large trees (node_modules) blow the cleanup budget. +const darwinHandlePaths = fds => { const output = execFileSync("/usr/sbin/lsof", [ - "-a", "-p", String(process.pid), "-d", String(fd), "-F0pn", - ], { encoding: "utf8", env: {}, maxBuffer: 16_384, timeout: 5_000 }); - const match = /(?:^|[\n\u0000])n([^\u0000]*)\u0000/u.exec(output); - if (match === null) process.exit(50); - return match[1]; + "-a", "-p", String(process.pid), "-d", fds.join(","), "-F0pn", + ], { encoding: "utf8", env: {}, maxBuffer: 1_048_576, timeout: 5_000 }); + const paths = new Map(); + for (const match of output.matchAll(/(?:^|[\n\u0000])f(\d+)\u0000n([^\u0000]*)\u0000/gu)) { + if (paths.has(match[1])) process.exit(50); + paths.set(match[1], match[2]); + } + if (fds.some(fd => !paths.has(String(fd)))) process.exit(50); + return paths; }; +const identityKey = stats => stats.dev + ":" + stats.ino + ":" + stats.birthtimeNs; +const DIRECTORY_BATCH = 64; +const removeDarwinBoundDirectories = async directories => { + for (let start = 0; start < directories.length; start += DIRECTORY_BATCH) { + const batch = directories.slice(start, start + DIRECTORY_BATCH); + const handles = []; + try { + for (const [entry, expected] of batch) { + const handle = await open(entry, constants.O_RDONLY | (constants.O_NOFOLLOW || 0)); + handles.push(handle); + if (!sameIdentity(await handle.stat({ bigint: true }), expected)) process.exit(51); + } + const fds = handles.map(handle => handle.fd); + const originalPaths = darwinHandlePaths(fds); + for (const [index, [entry, expected]] of batch.entries()) { + if (!sameIdentity(await lstat(entry, { bigint: true }), expected)) process.exit(61); + await rmdir(entry); + if (!sameIdentity(await handles[index].stat({ bigint: true }), expected)) process.exit(53); + } + const removedPaths = darwinHandlePaths(fds); + for (const fd of fds) { + if (removedPaths.get(String(fd)) !== originalPaths.get(String(fd))) process.exit(55); + } + } finally { + for (const handle of handles) await handle.close(); + } + const removed = new Set(batch.map(([, expected]) => identityKey(expected))); + for (const sibling of await readdir(".")) { + if (removed.has(identityKey(await lstat(sibling, { bigint: true })))) process.exit(46); + } + } +}; +const removeBoundDirectories = async directories => { + if (process.platform === "darwin") { + await removeDarwinBoundDirectories(directories); + return; + } + for (const [entry, expected] of directories) { + await removeBoundEntry(entry, expected, true); + for (const sibling of await readdir(".")) { + if (sameIdentity(await lstat(sibling, { bigint: true }), expected)) process.exit(46); + } + } +}; +// darwin resolves directory handles in batches (removeDarwinBoundDirectories). const boundHandlePath = async fd => process.platform === "linux" ? await readlink("/proc/self/fd/" + fd) - : process.platform === "darwin" - ? darwinHandlePath(fd) - : null; + : null; const removeBoundUnopenedEntry = async (entry, expected) => { const tombstone = ".remove-symlink-" + randomUUID(); await rename(entry, tombstone); @@ -40358,6 +41190,7 @@ const removeBoundEntry = async (entry, expected, directory) => { }; const emptyBoundDirectory = async expected => { if (!sameIdentity(await lstat(".", { bigint: true }), expected)) process.exit(41); + const emptiedDirectories = []; for (const entry of await readdir(".")) { const child = await lstat(entry, { bigint: true }); if (child.birthtimeNs <= 0n) process.exit(42); @@ -40375,10 +41208,7 @@ const emptyBoundDirectory = async expected => { process.chdir(".."); if (!sameIdentity(await lstat(".", { bigint: true }), parent)) process.exit(44); if (!sameIdentity(await lstat(entry, { bigint: true }), child)) process.exit(45); - await removeBoundEntry(entry, child, true); - for (const sibling of await readdir(".")) { - if (sameIdentity(await lstat(sibling, { bigint: true }), child)) process.exit(46); - } + emptiedDirectories.push([entry, child]); } else { if (!sameIdentity(await lstat(entry, { bigint: true }), child)) process.exit(47); if (!child.isFile() || child.isSymbolicLink()) { @@ -40388,6 +41218,7 @@ const emptyBoundDirectory = async expected => { } } } + await removeBoundDirectories(emptiedDirectories); if (!sameIdentity(await lstat(".", { bigint: true }), expected)) process.exit(48); }; (async () => { @@ -40439,7 +41270,7 @@ async function darwinHandlePath(directory, handle, platformServices) { handle.fd.toString(), "-F0pn" ], - cwd: path16.dirname(directory), + cwd: path20.dirname(directory), env: {}, timeoutMs: 5e3, maxOutputBytes: 16384 @@ -40457,13 +41288,13 @@ async function removeWindowsBoundEmptyDirectory(directory, expectedIdentity, pla executable: helper, args: [ "remove", - path16.toNamespacedPath(directory), + path20.toNamespacedPath(directory), expectedIdentity.dev.toString(), expectedIdentity.ino.toString(), expectedIdentity.birthtimeNs.toString(), "true" ], - cwd: path16.dirname(directory), + cwd: path20.dirname(directory), env: windowsEssentialEnvironment(), timeoutMs: 3e4, maxOutputBytes: 16384 @@ -40484,15 +41315,15 @@ async function verifyBoundDirectoryCleanupSupport(platformServices) { try { if (platformServices.os === "linux") { await Promise.all([ - access4("/proc/self/mountinfo", constants7.R_OK), - access4("/proc/self/fd", constants7.R_OK) + access4("/proc/self/mountinfo", constants10.R_OK), + access4("/proc/self/fd", constants10.R_OK) ]); return; } if (platformServices.os === "darwin") { await Promise.all([ - access4("/usr/sbin/lsof", constants7.X_OK), - access4("/bin/df", constants7.X_OK) + access4("/usr/sbin/lsof", constants10.X_OK), + access4("/bin/df", constants10.X_OK) ]); return; } @@ -40524,21 +41355,21 @@ async function removeBoundEmptyDirectory(directory, expectedIdentity, platformSe let handle; let primaryError; try { - const named = await lstat7(directory, { bigint: true }); + const named = await lstat11(directory, { bigint: true }); if (!named.isDirectory() || named.isSymbolicLink() || !sameBoundIdentity(named, expectedIdentity)) { throw new RuntimeError("directory identity changed before bound removal"); } - handle = await open7(directory, constants7.O_RDONLY | (constants7.O_NOFOLLOW ?? 0)); + handle = await open10(directory, constants10.O_RDONLY | (constants10.O_NOFOLLOW ?? 0)); const opened = await handle.stat({ bigint: true }); if (!opened.isDirectory() || !sameBoundIdentity(opened, expectedIdentity)) { throw new RuntimeError("opened directory identity changed before bound removal"); } - const settledNamed = await lstat7(directory, { bigint: true }); + const settledNamed = await lstat11(directory, { bigint: true }); if (!settledNamed.isDirectory() || settledNamed.isSymbolicLink() || !sameBoundIdentity(settledNamed, expectedIdentity)) { throw new RuntimeError("directory identity changed before final bound removal"); } const darwinPath = platformServices.os === "darwin" ? await darwinHandlePath(directory, handle, platformServices) : void 0; - const removalTarget = await lstat7(directory, { bigint: true }); + const removalTarget = await lstat11(directory, { bigint: true }); if (!removalTarget.isDirectory() || removalTarget.isSymbolicLink() || !sameBoundIdentity(removalTarget, expectedIdentity)) { throw new RuntimeError("directory identity changed at the final removal boundary"); } @@ -40600,64 +41431,18 @@ async function emptyBoundDirectory(directory, expectedIdentity, platformServices } // src/runtime/worktree-removal-manifest.ts -import { randomUUID as randomUUID4 } from "node:crypto"; -import { constants as constants9 } from "node:fs"; +import { randomUUID as randomUUID5 } from "node:crypto"; +import { constants as constants11 } from "node:fs"; import { - link as link3, - lstat as lstat9, - open as open9, - readdir as readdir5, - realpath as realpath6, - rename as rename3, - rm as rm5 + link as link4, + lstat as lstat12, + open as open11, + readdir as readdir6, + realpath as realpath7, + rename as rename4, + rm as rm7 } from "node:fs/promises"; -import path17 from "node:path"; - -// src/util/stable-file.ts -import { constants as constants8 } from "node:fs"; -import { lstat as lstat8, open as open8 } from "node:fs/promises"; -async function readStableRegularFile(filename, maxBytes, dependencies = {}) { - const handle = await (dependencies.open ?? open8)( - filename, - constants8.O_RDONLY | (constants8.O_NOFOLLOW ?? 0) | (constants8.O_NONBLOCK ?? 0) - ); - let primaryError; - try { - const metadata = await handle.stat({ bigint: true }); - const named = await (dependencies.lstat ?? lstat8)(filename, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || metadata.birthtimeNs <= 0n || metadata.size > maxBytes || !named.isFile() || named.isSymbolicLink() || named.birthtimeNs <= 0n || named.nlink !== 1n || named.dev !== metadata.dev || named.ino !== metadata.ino || named.birthtimeNs !== metadata.birthtimeNs || named.size !== metadata.size) return null; - if (maxBytes < 0n || maxBytes >= BigInt(Number.MAX_SAFE_INTEGER)) return null; - const limit = Math.min(Number(maxBytes) + 1, Number(metadata.size) + 1); - const buffer = Buffer.alloc(limit); - let bytesRead = 0; - while (bytesRead < limit) { - const read = await handle.read(buffer, bytesRead, limit - bytesRead, null); - if (read.bytesRead === 0) break; - bytesRead += read.bytesRead; - } - if (bytesRead > Number(maxBytes)) return null; - const contents = buffer.subarray(0, bytesRead); - const settled = await handle.stat({ bigint: true }); - const settledNamed = await (dependencies.lstat ?? lstat8)(filename, { bigint: true }); - if (!settled.isFile() || settled.nlink !== 1n || settled.birthtimeNs <= 0n || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.size !== metadata.size || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.birthtimeNs <= 0n || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size || settledNamed.mtimeNs !== settled.mtimeNs || settledNamed.ctimeNs !== settled.ctimeNs || BigInt(contents.byteLength) !== metadata.size) return null; - return contents; - } catch (error51) { - primaryError = error51; - throw error51; - } finally { - try { - await handle.close(); - } catch (closeError) { - if (primaryError === void 0) throw closeError; - throw new AggregateError( - [primaryError, closeError], - "stable file read failed and its handle could not be closed" - ); - } - } -} - -// src/runtime/worktree-removal-manifest.ts +import path21 from "node:path"; var MANIFEST_DIRECTORY = "worktree-removals"; var MANIFEST_NAME = /^([a-z0-9][a-z0-9-]{0,127})\.json$/i; var TEMPORARY_MANIFEST_NAME = /^\.([a-z0-9][a-z0-9-]{0,127})\.[0-9a-f-]{36}\.tmp$/i; @@ -40668,11 +41453,8 @@ var MAX_MANIFEST_BYTES = 32768n; function sameIdentity3(metadata, expected) { return metadata.dev === expected.dev && metadata.ino === expected.ino && metadata.birthtimeNs > 0n && metadata.birthtimeNs === expected.birthtimeNs; } -function errorCode7(error51) { - return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; -} function manifestRoot() { - return path17.join(resolveStateDir(), MANIFEST_DIRECTORY); + return path21.join(resolveStateDir(), MANIFEST_DIRECTORY); } async function ensurePrivateDirectory2(directory) { return await ensurePrivateDirectory(directory, { @@ -40680,22 +41462,22 @@ async function ensurePrivateDirectory2(directory) { }); } async function assertDirectoryIdentity3(directory, expected) { - const metadata = await lstat9(directory, { bigint: true }); + const metadata = await lstat12(directory, { bigint: true }); if (!metadata.isDirectory() || metadata.isSymbolicLink() || !sameIdentity3(metadata, expected)) { throw new RuntimeError("worktree removal manifest directory identity changed"); } } async function assertMissing(filename, description) { try { - await lstat9(filename); + await lstat12(filename); } catch (error51) { - if (errorCode7(error51) === "ENOENT") return; + if (errorCode(error51) === "ENOENT") return; throw error51; } throw new RuntimeError(`${description} unexpectedly remains`); } async function assertManifestIdentity(manifestPath, expected, expectedLinks) { - const metadata = await lstat9(manifestPath, { bigint: true }); + const metadata = await lstat12(manifestPath, { bigint: true }); if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== expectedLinks || !sameIdentity3(metadata, expected)) { throw new RuntimeError("worktree removal manifest publication identity changed"); } @@ -40737,8 +41519,8 @@ async function writeSyncedManifest(handle, manifest) { } function validateManifestPath(manifestPath, transactionId) { const root = manifestRoot(); - const expected = path17.join(root, `${transactionId}.json`); - if (!MANIFEST_NAME.test(path17.basename(manifestPath)) || manifestPath !== expected) { + const expected = path21.join(root, `${transactionId}.json`); + if (!MANIFEST_NAME.test(path21.basename(manifestPath)) || manifestPath !== expected) { throw new RuntimeError("worktree removal manifest path is invalid"); } return root; @@ -40802,7 +41584,7 @@ function parseManifest(contents, transactionId) { record2.registrationPath, record2.quarantineRoot, record2.quarantinePath - ].every((value2) => typeof value2 === "string" && path17.isAbsolute(value2)) || record2.physicalPresent === false && (record2.physicalDev !== "0" || record2.physicalIno !== "0" || record2.physicalBirthtimeNs !== "0")) { + ].every((value2) => typeof value2 === "string" && path21.isAbsolute(value2)) || record2.physicalPresent === false && (record2.physicalDev !== "0" || record2.physicalIno !== "0" || record2.physicalBirthtimeNs !== "0")) { throw new RuntimeError("worktree removal manifest is malformed"); } return record2; @@ -40810,16 +41592,16 @@ function parseManifest(contents, transactionId) { async function verifyWorktreeRemovalManifestStorage() { const root = manifestRoot(); const rootIdentity = await ensurePrivateDirectory2(root); - const token = randomUUID4(); - const sourcePath = path17.join(root, `.hardlink-probe-${token}.source`); - const linkedPath = path17.join(root, `.hardlink-probe-${token}.linked`); + const token = randomUUID5(); + const sourcePath = path21.join(root, `.hardlink-probe-${token}.source`); + const linkedPath = path21.join(root, `.hardlink-probe-${token}.linked`); let sourceExists = false; let linkedExists = false; let primaryError; try { - const handle = await open9( + const handle = await open11( sourcePath, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | (constants9.O_NOFOLLOW ?? 0), + constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | (constants11.O_NOFOLLOW ?? 0), 384 ); sourceExists = true; @@ -40840,7 +41622,7 @@ async function verifyWorktreeRemovalManifestStorage() { await handle.close(); } await assertDirectoryIdentity3(root, rootIdentity); - await link3(sourcePath, linkedPath); + await link4(sourcePath, linkedPath); linkedExists = true; await Promise.all([ assertManifestIdentity(sourcePath, identity, 2n), @@ -40852,8 +41634,8 @@ async function verifyWorktreeRemovalManifestStorage() { const cleanupErrors = []; try { await assertDirectoryIdentity3(root, rootIdentity); - if (linkedExists) await rm5(linkedPath, { force: false }); - if (sourceExists) await rm5(sourcePath, { force: false }); + if (linkedExists) await rm7(linkedPath, { force: false }); + if (sourceExists) await rm7(sourcePath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { @@ -40881,31 +41663,31 @@ async function persistWorktreeRemovalManifest(manifest) { validateManifestForWrite(manifest); const root = manifestRoot(); const rootIdentity = await ensurePrivateDirectory2(root); - const manifestPath = path17.join(root, `${manifest.transactionId}.json`); - const temporaryPath = path17.join( + const manifestPath = path21.join(root, `${manifest.transactionId}.json`); + const temporaryPath = path21.join( root, - `.${manifest.transactionId}.${randomUUID4()}.tmp` + `.${manifest.transactionId}.${randomUUID5()}.tmp` ); let temporaryExists = false; let manifestExists = false; try { - const handle = await open9( + const handle = await open11( temporaryPath, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | (constants9.O_NOFOLLOW ?? 0), + constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | (constants11.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; const temporaryIdentity = await writeSyncedManifest(handle, manifest); await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(temporaryPath, temporaryIdentity, 1n); - await link3(temporaryPath, manifestPath); + await link4(temporaryPath, manifestPath); manifestExists = true; await assertDirectoryIdentity3(root, rootIdentity); await Promise.all([ assertManifestIdentity(temporaryPath, temporaryIdentity, 2n), assertManifestIdentity(manifestPath, temporaryIdentity, 2n) ]); - await rm5(temporaryPath); + await rm7(temporaryPath); temporaryExists = false; await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); @@ -40924,14 +41706,14 @@ async function persistWorktreeRemovalManifest(manifest) { } if (temporaryExists) { try { - await rm5(temporaryPath, { force: true }); + await rm7(temporaryPath, { force: true }); } catch (cleanupError) { cleanupErrors.push(cleanupError); } } if (manifestExists) { try { - await rm5(manifestPath, { force: true }); + await rm7(manifestPath, { force: true }); } catch (cleanupError) { cleanupErrors.push(cleanupError); } @@ -40949,23 +41731,23 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { validateManifestForWrite(manifest); const root = validateManifestPath(manifestPath, manifest.transactionId); const rootIdentity = await ensurePrivateDirectory2(root); - const temporaryPath = path17.join( + const temporaryPath = path21.join( root, - `.${manifest.transactionId}.${randomUUID4()}.tmp` + `.${manifest.transactionId}.${randomUUID5()}.tmp` ); let temporaryExists = false; let primaryError; try { - const handle = await open9( + const handle = await open11( temporaryPath, - constants9.O_WRONLY | constants9.O_CREAT | constants9.O_EXCL | (constants9.O_NOFOLLOW ?? 0), + constants11.O_WRONLY | constants11.O_CREAT | constants11.O_EXCL | (constants11.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; const temporaryIdentity = await writeSyncedManifest(handle, manifest); await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(temporaryPath, temporaryIdentity, 1n); - await rename3(temporaryPath, manifestPath); + await rename4(temporaryPath, manifestPath); temporaryExists = false; await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, temporaryIdentity, 1n); @@ -40979,7 +41761,7 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { if (temporaryExists) { try { await assertDirectoryIdentity3(root, rootIdentity); - await rm5(temporaryPath, { force: true }); + await rm7(temporaryPath, { force: true }); } catch (cleanupError) { if (primaryError === void 0) throw cleanupError; throw new AggregateError( @@ -40993,7 +41775,7 @@ async function replaceWorktreeRemovalManifest(manifestPath, manifest) { async function removeWorktreeRemovalManifest(manifestPath, transactionId) { const root = validateManifestPath(manifestPath, transactionId); const rootIdentity = await ensurePrivateDirectory2(root); - const manifestMetadata = await lstat9(manifestPath, { bigint: true }); + const manifestMetadata = await lstat12(manifestPath, { bigint: true }); if (!manifestMetadata.isFile() || manifestMetadata.isSymbolicLink() || manifestMetadata.nlink !== 1n || manifestMetadata.birthtimeNs <= 0n) { throw new RuntimeError("worktree removal manifest identity is ambiguous before removal"); } @@ -41002,21 +41784,21 @@ async function removeWorktreeRemovalManifest(manifestPath, transactionId) { ino: manifestMetadata.ino, birthtimeNs: manifestMetadata.birthtimeNs }; - const guardPath = path17.join( + const guardPath = path21.join( root, - `.remove-manifest-${transactionId}.${randomUUID4()}.guard` + `.remove-manifest-${transactionId}.${randomUUID5()}.guard` ); await assertDirectoryIdentity3(root, rootIdentity); - await link3(manifestPath, guardPath); + await link4(manifestPath, guardPath); await Promise.all([ assertManifestIdentity(manifestPath, identity, 2n), assertManifestIdentity(guardPath, identity, 2n) ]); - await rm5(manifestPath, { force: false }); + await rm7(manifestPath, { force: false }); await assertDirectoryIdentity3(root, rootIdentity); await assertMissing(manifestPath, "worktree removal manifest"); await assertManifestIdentity(guardPath, identity, 1n); - await rm5(guardPath, { force: false }); + await rm7(guardPath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); await Promise.all([ @@ -41025,16 +41807,16 @@ async function removeWorktreeRemovalManifest(manifestPath, transactionId) { ]); } async function readLinkedManifest(temporaryPath, manifestPath) { - const handle = await open9( + const handle = await open11( manifestPath, - constants9.O_RDONLY | (constants9.O_NOFOLLOW ?? 0) + constants11.O_RDONLY | (constants11.O_NOFOLLOW ?? 0) ); let primaryError; try { const [opened, temporary, published] = await Promise.all([ handle.stat({ bigint: true }), - lstat9(temporaryPath, { bigint: true }), - lstat9(manifestPath, { bigint: true }) + lstat12(temporaryPath, { bigint: true }), + lstat12(manifestPath, { bigint: true }) ]); if (!opened.isFile() || opened.nlink !== 2n || opened.size > MAX_MANIFEST_BYTES || !temporary.isFile() || temporary.isSymbolicLink() || temporary.nlink !== 2n || !published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity3(temporary, opened) || !sameIdentity3(published, opened) || temporary.size !== opened.size || published.size !== opened.size) { throw new RuntimeError("linked worktree removal manifest residue is ambiguous"); @@ -41049,8 +41831,8 @@ async function readLinkedManifest(temporaryPath, manifestPath) { } const [settled, settledTemporary, settledPublished] = await Promise.all([ handle.stat({ bigint: true }), - lstat9(temporaryPath, { bigint: true }), - lstat9(manifestPath, { bigint: true }) + lstat12(temporaryPath, { bigint: true }), + lstat12(manifestPath, { bigint: true }) ]); if (offset !== size || !sameIdentity3(settled, opened) || settled.nlink !== 2n || settled.size !== opened.size || settled.mtimeNs !== opened.mtimeNs || settled.ctimeNs !== opened.ctimeNs || !sameIdentity3(settledTemporary, opened) || settledTemporary.nlink !== 2n || !sameIdentity3(settledPublished, opened) || settledPublished.nlink !== 2n) { throw new RuntimeError("linked worktree removal manifest residue changed while reading"); @@ -41073,8 +41855,8 @@ async function readLinkedManifest(temporaryPath, manifestPath) { } async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, transactionId) { const root = validateManifestPath(manifestPath, transactionId); - const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(path17.basename(temporaryPath)); - if (temporaryMatch?.[1] !== transactionId || path17.dirname(temporaryPath) !== root) { + const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(path21.basename(temporaryPath)); + if (temporaryMatch?.[1] !== transactionId || path21.dirname(temporaryPath) !== root) { throw new RuntimeError("temporary worktree removal manifest path is invalid"); } const rootIdentity = await ensurePrivateDirectory2(root); @@ -41082,12 +41864,12 @@ async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, let published; try { [temporary, published] = await Promise.all([ - lstat9(temporaryPath, { bigint: true }), - lstat9(manifestPath, { bigint: true }) + lstat12(temporaryPath, { bigint: true }), + lstat12(manifestPath, { bigint: true }) ]); } catch (error51) { - if (errorCode7(error51) === "ENOENT") { - const remaining = await lstat9(manifestPath, { bigint: true }).catch(() => null); + if (errorCode(error51) === "ENOENT") { + const remaining = await lstat12(manifestPath, { bigint: true }).catch(() => null); if (remaining !== null && remaining.isFile() && remaining.nlink === 1n) return; } throw error51; @@ -41101,7 +41883,7 @@ async function settleLinkedWorktreeRemovalManifest(manifestPath, temporaryPath, birthtimeNs: published.birthtimeNs }; await assertDirectoryIdentity3(root, rootIdentity); - await rm5(temporaryPath, { force: false }); + await rm7(temporaryPath, { force: false }); await assertDirectoryIdentity3(root, rootIdentity); await assertManifestIdentity(manifestPath, publishedIdentity, 1n); await syncDirectoryMetadata(root); @@ -41115,7 +41897,7 @@ async function readWorktreeRemovalManifest(manifestPath, transactionId) { try { contents = await readStableRegularFile(manifestPath, MAX_MANIFEST_BYTES); } catch (error51) { - if (errorCode7(error51) === "ENOENT") return null; + if (errorCode(error51) === "ENOENT") return null; throw error51; } await assertDirectoryIdentity3(root, rootIdentity); @@ -41133,9 +41915,9 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { description: "worktree removal manifest root", create: false }); - entries = await readdir5(root, { withFileTypes: true }); + entries = await readdir6(root, { withFileTypes: true }); } catch (error51) { - if (errorCode7(error51) === "ENOENT") return; + if (errorCode(error51) === "ENOENT") return; throw error51; } for (const entry of entries) { @@ -41146,14 +41928,14 @@ async function assertNoPendingWorktreeRemovalForRepository(repositoryIdentity) { if (match === null || !entry.isFile() || entry.isSymbolicLink()) { throw new RuntimeError("worktree removal manifest root contains ambiguous residue"); } - const manifestPath = path17.join(root, entry.name); + const manifestPath = path21.join(root, entry.name); const manifest = await readWorktreeRemovalManifest(manifestPath, match[1]); if (manifest === null) { throw new RuntimeError("worktree removal manifest changed during lease validation"); } let canonicalCommonDir; try { - canonicalCommonDir = await realpath6(manifest.commonDir); + canonicalCommonDir = await realpath7(manifest.commonDir); } catch (error51) { throw new RuntimeError("worktree removal repository identity is unavailable", { cause: error51 @@ -41169,9 +41951,9 @@ async function readPendingWorktreeRemovalManifests() { const root = manifestRoot(); let initialMetadata; try { - initialMetadata = await lstat9(root, { bigint: true }); + initialMetadata = await lstat12(root, { bigint: true }); } catch (error51) { - if (errorCode7(error51) === "ENOENT") return { pending: [], issues: [] }; + if (errorCode(error51) === "ENOENT") return { pending: [], issues: [] }; return { pending: [], issues: [{ manifestPath: root, error: error51 }] }; } if (!initialMetadata.isDirectory() || initialMetadata.isSymbolicLink()) { @@ -41187,7 +41969,7 @@ async function readPendingWorktreeRemovalManifests() { let entries; try { rootIdentity = await ensurePrivateDirectory2(root); - entries = await readdir5(root, { withFileTypes: true }); + entries = await readdir6(root, { withFileTypes: true }); await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { return { pending: [], issues: [{ manifestPath: root, error: error51 }] }; @@ -41199,23 +41981,23 @@ async function readPendingWorktreeRemovalManifests() { for (const entry of sortedEntries) { const guardMatch = MANIFEST_REMOVAL_GUARD.exec(entry.name); if (guardMatch === null) continue; - const guardPath = path17.join(root, entry.name); - const publishedPath = path17.join(root, `${guardMatch[1]}.json`); + const guardPath = path21.join(root, entry.name); + const publishedPath = path21.join(root, `${guardMatch[1]}.json`); try { await assertDirectoryIdentity3(root, rootIdentity); - const guard = await lstat9(guardPath, { bigint: true }); + const guard = await lstat12(guardPath, { bigint: true }); if (!guard.isFile() || guard.isSymbolicLink() || guard.birthtimeNs <= 0n || guard.nlink !== 1n && guard.nlink !== 2n) { throw new RuntimeError("worktree removal manifest guard is malformed"); } if (guard.nlink === 2n) { - const published = await lstat9(publishedPath, { bigint: true }); + const published = await lstat12(publishedPath, { bigint: true }); if (!published.isFile() || published.isSymbolicLink() || published.nlink !== 2n || !sameIdentity3(published, guard)) { throw new RuntimeError("worktree removal manifest guard pair is inconsistent"); } } else { await assertMissing(publishedPath, "removed worktree manifest"); } - await rm5(guardPath, { force: false }); + await rm7(guardPath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); } catch (error51) { @@ -41227,7 +42009,7 @@ async function readPendingWorktreeRemovalManifests() { const match = HARDLINK_PROBE_NAME.exec(entry.name); if (match === null) continue; const pair = probeEntries.get(match[1]) ?? {}; - pair[match[2]] = path17.join(root, entry.name); + pair[match[2]] = path21.join(root, entry.name); probeEntries.set(match[1], pair); } for (const pair of probeEntries.values()) { @@ -41236,7 +42018,7 @@ async function readPendingWorktreeRemovalManifests() { await assertDirectoryIdentity3(root, rootIdentity); const metadata = await Promise.all(paths.map(async (probePath) => ({ path: probePath, - metadata: await lstat9(probePath, { bigint: true }) + metadata: await lstat12(probePath, { bigint: true }) }))); if (metadata.some(({ metadata: value }) => !value.isFile() || value.isSymbolicLink() || value.birthtimeNs <= 0n)) { throw new RuntimeError("manifest hard-link probe residue is malformed"); @@ -41249,7 +42031,7 @@ async function readPendingWorktreeRemovalManifests() { throw new RuntimeError("manifest hard-link probe pair is inconsistent"); } for (const { path: probePath } of metadata.reverse()) { - await rm5(probePath, { force: false }); + await rm7(probePath, { force: false }); } await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); @@ -41260,7 +42042,7 @@ async function readPendingWorktreeRemovalManifests() { for (const entry of sortedEntries) { const temporaryMatch = TEMPORARY_MANIFEST_NAME.exec(entry.name); if (temporaryMatch === null) continue; - const temporaryPath = path17.join(root, entry.name); + const temporaryPath = path21.join(root, entry.name); if (!entry.isFile() || entry.isSymbolicLink()) { issues.push({ manifestPath: temporaryPath, @@ -41269,16 +42051,16 @@ async function readPendingWorktreeRemovalManifests() { continue; } const transactionId = temporaryMatch[1]; - const publishedPath = path17.join(root, `${transactionId}.json`); + const publishedPath = path21.join(root, `${transactionId}.json`); try { await assertDirectoryIdentity3(root, rootIdentity); - const temporaryMetadata = await lstat9(temporaryPath, { bigint: true }); + const temporaryMetadata = await lstat12(temporaryPath, { bigint: true }); if (temporaryMetadata.nlink === 1n) { const contents = await readStableRegularFile(temporaryPath, MAX_MANIFEST_BYTES); if (contents === null) { throw new RuntimeError("unpublished worktree removal manifest is not stable"); } - await rm5(temporaryPath, { force: false }); + await rm7(temporaryPath, { force: false }); await syncDirectoryMetadata(root); await assertDirectoryIdentity3(root, rootIdentity); } else { @@ -41297,7 +42079,7 @@ async function readPendingWorktreeRemovalManifests() { } for (const entry of sortedEntries) { if (TEMPORARY_MANIFEST_NAME.test(entry.name) || HARDLINK_PROBE_NAME.test(entry.name) || MANIFEST_REMOVAL_GUARD.test(entry.name)) continue; - const manifestPath = path17.join(root, entry.name); + const manifestPath = path21.join(root, entry.name); const match = MANIFEST_NAME.exec(entry.name); if (match === null || !entry.isFile() || entry.isSymbolicLink()) { issues.push({ @@ -41324,185 +42106,6 @@ async function readPendingWorktreeRemovalManifests() { return { pending, issues }; } -// src/platform/durable-write.ts -import { randomUUID as randomUUID5 } from "node:crypto"; -import { constants as constants10 } from "node:fs"; -import { link as link4, lstat as lstat10, mkdir as mkdir4, open as open10, readFile as readFile4, rename as rename4, rm as rm6 } from "node:fs/promises"; -import path18 from "node:path"; -import nodeProcess6 from "node:process"; -var NO_FOLLOW5 = constants10.O_NOFOLLOW ?? 0; -var SAFE_COMPONENT = /^[a-z0-9][a-z0-9._-]{0,127}$/i; -function isAlreadyPresent(error51) { - return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EEXIST"; -} -function sameIdentity4(left, right) { - if (left.dev !== right.dev || left.ino !== right.ino) return false; - if (left.birthtimeNs <= 0n || right.birthtimeNs <= 0n) return true; - return left.birthtimeNs === right.birthtimeNs; -} -var DurableDirectorySession = class { - directory; - identity; - policy; - handle; - closed = false; - constructor(directory, identity, policy = {}, handle) { - this.directory = directory; - this.identity = identity; - this.policy = policy; - this.handle = handle; - } - async assertIdentity() { - if (this.closed) { - throw new RuntimeError("durable directory session is closed"); - } - const current = await lstat10(this.directory, { bigint: true }); - if (!current.isDirectory() || current.isSymbolicLink() || !sameIdentity4(current, this.identity)) { - throw new RuntimeError("durable directory session identity changed"); - } - } - async sync() { - if (this.closed) { - throw new RuntimeError("durable directory session is closed"); - } - if (this.policy.syncDirectory !== void 0) { - await this.policy.syncDirectory(this.directory); - return; - } - if (this.handle !== void 0) { - try { - await this.handle.sync(); - return; - } catch { - } - } - await syncDirectoryMetadata(this.directory); - } - async close() { - this.closed = true; - if (this.handle !== void 0) { - try { - await this.handle.close(); - } catch { - } - this.handle = void 0; - } - } -}; -async function openDurableDirectorySession(directory, options = {}) { - let identity; - if (options.privateDirectory === true) { - identity = await ensurePrivateDirectory(directory, { - description: options.description ?? "durable directory", - create: options.create ?? false, - migratePermissions: true, - ...options.policy?.syncDirectory === void 0 ? {} : { syncDirectory: options.policy.syncDirectory } - }); - } else { - if (options.create !== false) { - try { - await mkdir4(directory, { recursive: true, mode: 448 }); - } catch (error51) { - if (!isAlreadyPresent(error51)) throw error51; - } - } - const metadata = await lstat10(directory, { bigint: true }); - if (!metadata.isDirectory() || metadata.isSymbolicLink()) { - throw new RuntimeError(`${options.description ?? "durable directory"} must be a plain directory`); - } - identity = { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs - }; - } - let handle; - if (options.policy?.platform !== "win32" && nodeProcess6.platform !== "win32") { - try { - handle = await open10(directory, constants10.O_RDONLY | NO_FOLLOW5); - } catch { - } - } - return new DurableDirectorySession(directory, identity, options.policy, handle); -} -async function renameWithRetry(source, destination, platform = nodeProcess6.platform, maxAttempts = 50) { - for (let attempt = 1; ; attempt += 1) { - try { - await rename4(source, destination); - return; - } catch (error51) { - const code = typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; - const isTransientWin32 = platform === "win32" && (code === "EPERM" || code === "EACCES" || code === "EBUSY"); - if (isTransientWin32 && attempt < maxAttempts) { - await new Promise((resolve2) => setTimeout(resolve2, 50)); - continue; - } - throw error51; - } - } -} -async function writeAtomic(session, name, bytes, mode) { - if (path18.isAbsolute(name) || path18.basename(name) !== name || !SAFE_COMPONENT.test(name)) { - throw new RuntimeError(`atomic write target must be a safe leaf name: ${name}`); - } - const destination = path18.join(session.directory, name); - const temporaryPath = path18.join(session.directory, `.${name}.${randomUUID5()}.tmp`); - let handle; - let temporaryCreated = false; - try { - await session.assertIdentity(); - handle = await open10( - temporaryPath, - constants10.O_WRONLY | constants10.O_CREAT | constants10.O_EXCL | NO_FOLLOW5, - 384 - ); - temporaryCreated = true; - await session.assertIdentity(); - if (typeof bytes === "string") { - await handle.writeFile(bytes, { encoding: "utf8" }); - } else { - await handle.writeFile(bytes); - } - await handle.sync(); - await handle.close(); - handle = void 0; - await session.assertIdentity(); - if (mode === "immutable") { - try { - await link4(temporaryPath, destination); - } catch (error51) { - if (!isAlreadyPresent(error51)) throw error51; - await session.assertIdentity(); - const existing = await readFile4(destination); - const expected = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : bytes; - if (!existing.equals(expected)) { - throw new RuntimeError(`archive entry already exists with different content: ${name}`); - } - } - await rm6(temporaryPath, { force: true }); - temporaryCreated = false; - } else if (mode === "replace") { - await renameWithRetry(temporaryPath, destination); - temporaryCreated = false; - } - await session.sync(); - await session.assertIdentity(); - } finally { - if (handle !== void 0) { - try { - await handle.close(); - } catch { - } - } - if (temporaryCreated) { - try { - await rm6(temporaryPath, { force: true }); - } catch { - } - } - } -} - // src/platform/platform-safety.ts var PlatformSafety = class { constructor(platformServices = getPlatformServices()) { @@ -41513,34 +42116,29 @@ var PlatformSafety = class { const lease = await this.platformServices.acquireCheckoutLock(checkout, { ...options?.runId === void 0 ? {} : { runId: options.runId } }); - let primaryError; let result; - let completed = false; try { await this.assertAmbiguityGate(lease.repositoryIdentity); result = await fn(lease); - completed = true; - return result; - } catch (error51) { - primaryError = error51; - throw error51; - } finally { + } catch (primaryError) { try { await lease.release(); } catch (releaseError) { - if (completed && options?.onReleaseError !== void 0) { - result = options.onReleaseError(releaseError, result); - } else if (primaryError !== void 0) { - const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); - throw new AggregateError( - [primaryError, releaseError], - `${primaryMessage}; checkout lock release failed` - ); - } else { - throw releaseError; - } + const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); + throw new AggregateError( + [primaryError, releaseError], + `${primaryMessage}; checkout lock release failed` + ); } + throw primaryError; } + try { + await lease.release(); + } catch (releaseError) { + if (options?.onReleaseError === void 0) throw releaseError; + return options.onReleaseError(releaseError, result); + } + return result; } async withRecoveryLease(checkout, fn, options) { const lease = await this.platformServices.acquireCheckoutLock(checkout, { @@ -41668,7 +42266,7 @@ async function coordinateWorktreeRemoval(coordination) { } // src/runtime/worktree-manager.ts -var MAX_DIAGNOSTIC_LENGTH2 = 2e3; +var MAX_DIAGNOSTIC_LENGTH3 = 2e3; var REMOVE_ATTEMPTS = 5; var REMOVE_RETRY_DELAY_MS = 250; var SAFE_MANAGED_ID = /^[a-z0-9][a-z0-9._-]*$/; @@ -41677,35 +42275,32 @@ var WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY = "claude-architect-quarantine"; function delay2(milliseconds) { return new Promise((resolve2) => setTimeout(resolve2, milliseconds)); } -function errorCode8(error51) { - return typeof error51 === "object" && error51 !== null && "code" in error51 ? String(error51.code) : void 0; -} async function syncChangedDirectories(dependencies, ...directories) { - const syncDirectory4 = dependencies.syncDirectory ?? syncDirectoryMetadata; - for (const directory of new Set(directories.map((value) => path19.resolve(value)))) { - await syncDirectory4(directory); + const syncDirectory = dependencies.syncDirectory ?? syncDirectoryMetadata; + for (const directory of new Set(directories.map((value) => path22.resolve(value)))) { + await syncDirectory(directory); } } function failure(action, result) { const output = (result.stderr || result.stdout).trim(); - const diagnostic = output === "" ? "" : boundedRedactedDiagnostic(output, MAX_DIAGNOSTIC_LENGTH2); + const diagnostic = output === "" ? "" : boundedRedactedDiagnostic(output, MAX_DIAGNOSTIC_LENGTH3); return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); } -function sameDirectoryIdentity(left, right) { +function sameDirectoryIdentity2(left, right) { return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; } async function quarantinedIdentityRemainsNamed(quarantineRoot, expectedIdentity) { - const entries = await readdir6(quarantineRoot, { withFileTypes: true }); + const entries = await readdir7(quarantineRoot, { withFileTypes: true }); for (const entry of entries) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const observed = await managedWorktreeDirectoryIdentity(path19.join(quarantineRoot, entry.name)); - if (observed !== null && sameDirectoryIdentity(observed, expectedIdentity)) return true; + const observed = await managedWorktreeDirectoryIdentity(path22.join(quarantineRoot, entry.name)); + if (observed !== null && sameDirectoryIdentity2(observed, expectedIdentity)) return true; } return false; } async function managedWorktreeDirectoryIdentity(directory) { try { - const metadata = await lstat11(directory, { bigint: true }); + const metadata = await lstat13(directory, { bigint: true }); if (!metadata.isDirectory() || metadata.isSymbolicLink()) { throw new RuntimeError("managed worktree must be a plain directory"); } @@ -41718,7 +42313,7 @@ async function managedWorktreeDirectoryIdentity(directory) { birthtimeNs: metadata.birthtimeNs }; } catch (error51) { - if (errorCode8(error51) === "ENOENT") return null; + if (errorCode(error51) === "ENOENT") return null; throw error51; } } @@ -41729,14 +42324,14 @@ async function requiredDirectoryIdentity(directory, description) { } async function assertDirectoryIdentity4(directory, expected, description) { const observed = await managedWorktreeDirectoryIdentity(directory); - if (observed === null || !sameDirectoryIdentity(observed, expected)) { + if (observed === null || !sameDirectoryIdentity2(observed, expected)) { throw new RuntimeError(`${description} identity changed`); } } async function removeQuarantinedDirectory(quarantineRoot, quarantinePath, expectedIdentity, options) { const rootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); const initialIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); - if (rootIdentity === null || initialIdentity === null || !sameDirectoryIdentity(initialIdentity, expectedIdentity)) { + if (rootIdentity === null || initialIdentity === null || !sameDirectoryIdentity2(initialIdentity, expectedIdentity)) { throw new RuntimeError("managed worktree identity changed before removal"); } await emptyBoundDirectory( @@ -41746,7 +42341,7 @@ async function removeQuarantinedDirectory(quarantineRoot, quarantinePath, expect ); const emptiedIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); const emptiedRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (emptiedIdentity === null || !sameDirectoryIdentity(emptiedIdentity, expectedIdentity) || emptiedRootIdentity === null || !sameDirectoryIdentity(emptiedRootIdentity, rootIdentity)) { + if (emptiedIdentity === null || !sameDirectoryIdentity2(emptiedIdentity, expectedIdentity) || emptiedRootIdentity === null || !sameDirectoryIdentity2(emptiedRootIdentity, rootIdentity)) { throw new RuntimeError("managed worktree identity changed after emptying"); } await removeBoundEmptyDirectory( @@ -41758,33 +42353,26 @@ async function removeQuarantinedDirectory(quarantineRoot, quarantinePath, expect await syncChangedDirectories(options, quarantineRoot); const removedIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); const remainingRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (removedIdentity !== null || remainingRootIdentity === null || !sameDirectoryIdentity(remainingRootIdentity, rootIdentity) || await quarantinedIdentityRemainsNamed(quarantineRoot, expectedIdentity)) { + if (removedIdentity !== null || remainingRootIdentity === null || !sameDirectoryIdentity2(remainingRootIdentity, rootIdentity) || await quarantinedIdentityRemainsNamed(quarantineRoot, expectedIdentity)) { throw new RuntimeError("managed worktree removal did not settle safely"); } } async function managedPath(worktreePath) { - const root = path19.resolve(resolveStateDir(), "worktrees"); - const target = path19.resolve(worktreePath); - let canonicalRoot; - try { - canonicalRoot = await realpath7(root); - } catch (error51) { - if (errorCode8(error51) !== "ENOENT") throw error51; - canonicalRoot = path19.join(await realpath7(path19.dirname(root)), path19.basename(root)); - } + const target = path22.resolve(worktreePath); let canonicalTarget; try { canonicalTarget = await canonicalizeWorktreePath(target, true); } catch (error51) { - if (errorCode8(error51) !== "ENOENT") throw error51; - const targetParent = path19.dirname(target); - canonicalTarget = path19.join( - await realpath7(path19.dirname(targetParent)), - path19.basename(targetParent), - path19.basename(target) + if (errorCode(error51) !== "ENOENT") throw error51; + const targetParent = path22.dirname(target); + canonicalTarget = path22.join( + await realpath8(path22.dirname(targetParent)), + path22.basename(targetParent), + path22.basename(target) ); } - if (platformPathsEqual(canonicalTarget, canonicalRoot) || !platformPathsEqual(path19.dirname(canonicalTarget), canonicalRoot)) { + const canonicalRoot = path22.dirname(canonicalTarget); + if (platformPathsEqual(canonicalTarget, canonicalRoot) || !await isManagedWorktreeRoot(canonicalRoot)) { throw new RuntimeError("refusing to remove unmanaged worktree path"); } return { root: canonicalRoot, target: canonicalTarget }; @@ -41800,18 +42388,18 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option const observedIdentity = await managedWorktreeDirectoryIdentity(target); if (observedIdentity === null) return false; const expectedIdentity = options.expectedIdentity ?? observedIdentity; - if (!sameDirectoryIdentity(observedIdentity, expectedIdentity)) { + if (!sameDirectoryIdentity2(observedIdentity, expectedIdentity)) { throw new RuntimeError("managed worktree directory identity changed before quarantine"); } const quarantineToken = (options.uuid ?? randomUUID6)(); if (!SAFE_QUARANTINE_TOKEN.test(quarantineToken)) { throw new RuntimeError("invalid managed worktree quarantine token"); } - const quarantinePath = path19.join( + const quarantinePath = path22.join( quarantineRoot, `.remove-${quarantineLabel}-${quarantineToken}` ); - if (path19.dirname(quarantinePath) !== quarantineRoot) { + if (path22.dirname(quarantinePath) !== quarantineRoot) { throw new RuntimeError("managed worktree quarantine path escaped its root"); } const move = options.rename ?? rename5; @@ -41837,7 +42425,7 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option const quarantinedIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); const settledRootIdentity = await managedWorktreeDirectoryIdentity(root); const settledQuarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (quarantinedIdentity === null || !sameDirectoryIdentity(quarantinedIdentity, expectedIdentity) || settledRootIdentity === null || !sameDirectoryIdentity(settledRootIdentity, rootIdentity) || settledQuarantineRootIdentity === null || !sameDirectoryIdentity(settledQuarantineRootIdentity, quarantineRootIdentity)) { + if (quarantinedIdentity === null || !sameDirectoryIdentity2(quarantinedIdentity, expectedIdentity) || settledRootIdentity === null || !sameDirectoryIdentity2(settledRootIdentity, rootIdentity) || settledQuarantineRootIdentity === null || !sameDirectoryIdentity2(settledQuarantineRootIdentity, quarantineRootIdentity)) { throw new RuntimeError("managed worktree identity changed during quarantine"); } const rollbackQuarantine = async (operationError, message) => { @@ -41845,7 +42433,7 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option const rollbackIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); const rollbackRootIdentity = await managedWorktreeDirectoryIdentity(root); const rollbackQuarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (rollbackIdentity === null || !sameDirectoryIdentity(rollbackIdentity, expectedIdentity) || rollbackRootIdentity === null || !sameDirectoryIdentity(rollbackRootIdentity, rootIdentity) || rollbackQuarantineRootIdentity === null || !sameDirectoryIdentity(rollbackQuarantineRootIdentity, quarantineRootIdentity) || await managedWorktreeDirectoryIdentity(target) !== null) { + if (rollbackIdentity === null || !sameDirectoryIdentity2(rollbackIdentity, expectedIdentity) || rollbackRootIdentity === null || !sameDirectoryIdentity2(rollbackRootIdentity, rootIdentity) || rollbackQuarantineRootIdentity === null || !sameDirectoryIdentity2(rollbackQuarantineRootIdentity, quarantineRootIdentity) || await managedWorktreeDirectoryIdentity(target) !== null) { throw new RuntimeError("managed worktree quarantine rollback is unsafe"); } await move(quarantinePath, target); @@ -41853,7 +42441,7 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option const restoredIdentity = await managedWorktreeDirectoryIdentity(target); const restoredRootIdentity = await managedWorktreeDirectoryIdentity(root); const restoredQuarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (restoredIdentity === null || !sameDirectoryIdentity(restoredIdentity, expectedIdentity) || restoredRootIdentity === null || !sameDirectoryIdentity(restoredRootIdentity, rootIdentity) || restoredQuarantineRootIdentity === null || !sameDirectoryIdentity(restoredQuarantineRootIdentity, quarantineRootIdentity)) { + if (restoredIdentity === null || !sameDirectoryIdentity2(restoredIdentity, expectedIdentity) || restoredRootIdentity === null || !sameDirectoryIdentity2(restoredRootIdentity, rootIdentity) || restoredQuarantineRootIdentity === null || !sameDirectoryIdentity2(restoredQuarantineRootIdentity, quarantineRootIdentity)) { throw new RuntimeError("managed worktree quarantine rollback changed identity"); } } catch (rollbackError) { @@ -41881,7 +42469,7 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option if (options.preserveQuarantine === true) return true; const finalRootIdentity = await managedWorktreeDirectoryIdentity(root); const finalQuarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (finalRootIdentity === null || !sameDirectoryIdentity(finalRootIdentity, rootIdentity) || finalQuarantineRootIdentity === null || !sameDirectoryIdentity(finalQuarantineRootIdentity, quarantineRootIdentity)) { + if (finalRootIdentity === null || !sameDirectoryIdentity2(finalRootIdentity, rootIdentity) || finalQuarantineRootIdentity === null || !sameDirectoryIdentity2(finalQuarantineRootIdentity, quarantineRootIdentity)) { throw new RuntimeError("managed worktree root identity changed before removal"); } await removeQuarantinedDirectory( @@ -41894,7 +42482,7 @@ async function removeDirectoryByQuarantine(root, target, quarantineLabel, option managedWorktreeDirectoryIdentity(root), managedWorktreeDirectoryIdentity(target) ]); - if (remainingRootIdentity === null || !sameDirectoryIdentity(remainingRootIdentity, rootIdentity) || replacementIdentity !== null) { + if (remainingRootIdentity === null || !sameDirectoryIdentity2(remainingRootIdentity, rootIdentity) || replacementIdentity !== null) { throw new RuntimeError("managed worktree root or target changed after removal"); } return true; @@ -41904,7 +42492,7 @@ async function removeManagedWorktreeDirectory(worktreePath, options = {}) { return await removeDirectoryByQuarantine( root, target, - path19.basename(target), + path22.basename(target), options ); } @@ -41920,19 +42508,19 @@ async function isRegisteredWorktree(repoRoot, worktreePath, runGit, allowMissing ) !== -1; } async function boundPlainChildDirectory(root, candidate, description) { - const resolvedCandidate = path19.resolve(candidate); - if (!path19.isAbsolute(candidate) || !platformPathsEqual(path19.dirname(resolvedCandidate), root)) { + const resolvedCandidate = path22.resolve(candidate); + if (!path22.isAbsolute(candidate) || !platformPathsEqual(path22.dirname(resolvedCandidate), root)) { throw new RuntimeError(`${description} escaped its root`); } - const before = await lstat11(resolvedCandidate, { bigint: true }); + const before = await lstat13(resolvedCandidate, { bigint: true }); if (!before.isDirectory() || before.isSymbolicLink() || before.birthtimeNs <= 0n) { throw new RuntimeError(`${description} is not a stable plain directory`); } - const canonical = await realpath7(resolvedCandidate); - if (!platformPathsEqual(canonical, resolvedCandidate) || !platformPathsEqual(path19.dirname(canonical), root)) { + const canonical = await realpath8(resolvedCandidate); + if (!platformPathsEqual(canonical, resolvedCandidate) || !platformPathsEqual(path22.dirname(canonical), root)) { throw new RuntimeError(`${description} changed identity during canonicalization`); } - const after = await lstat11(resolvedCandidate, { bigint: true }); + const after = await lstat13(resolvedCandidate, { bigint: true }); if (!after.isDirectory() || after.isSymbolicLink() || after.dev !== before.dev || after.ino !== before.ino || after.birthtimeNs <= 0n || after.birthtimeNs !== before.birthtimeNs) { throw new RuntimeError(`${description} changed identity during validation`); } @@ -41948,9 +42536,9 @@ async function boundPlainChildDirectory(root, candidate, description) { async function worktreeMarkerRegistrationPath(worktreePath) { let contents; try { - contents = await readStableRegularFile(path19.join(worktreePath, ".git"), 32768n); + contents = await readStableRegularFile(path22.join(worktreePath, ".git"), 32768n); } catch (error51) { - if (errorCode8(error51) === "ENOENT") return null; + if (errorCode(error51) === "ENOENT") return null; throw error51; } if (contents === null) return null; @@ -41959,13 +42547,14 @@ async function worktreeMarkerRegistrationPath(worktreePath) { throw new RuntimeError("managed worktree marker is malformed"); } const registrationPath = marker.slice("gitdir: ".length); - if (!path19.isAbsolute(registrationPath)) { + if (!path22.isAbsolute(registrationPath)) { throw new RuntimeError("managed worktree marker registration is not absolute"); } - return path19.resolve(registrationPath); + return path22.resolve(registrationPath); } async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { - const markerRegistrationPath = await worktreeMarkerRegistrationPath(worktreePath); + const pinned = pinnedWorktreeGitDirectory(worktreePath); + const markerRegistrationPath = pinned === void 0 ? await worktreeMarkerRegistrationPath(worktreePath) : path22.resolve(pinned.gitDir); const commonResult = await runGit(repoRoot, [ "rev-parse", "--path-format=absolute", @@ -42003,16 +42592,16 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { gitDirResult.stdout, "worktree administrative directory" ); - if (!path19.isAbsolute(reportedCommonDir) || !path19.isAbsolute(reportedAdministrativePath)) { + if (!path22.isAbsolute(reportedCommonDir) || !path22.isAbsolute(reportedAdministrativePath)) { throw new RuntimeError("worktree registration lookup returned a non-absolute path"); } - const commonDir = await realpath7(reportedCommonDir); - const expectedAdministrativeRoot = path19.join(commonDir, "worktrees"); - const administrativeRoot = await realpath7(expectedAdministrativeRoot); + const commonDir = await realpath8(reportedCommonDir); + const expectedAdministrativeRoot = path22.join(commonDir, "worktrees"); + const administrativeRoot = await realpath8(expectedAdministrativeRoot); if (!platformPathsEqual(administrativeRoot, expectedAdministrativeRoot)) { throw new RuntimeError("worktree administrative root escaped its repository"); } - if (markerRegistrationPath === null || !platformPathsEqual(path19.resolve(reportedAdministrativePath), markerRegistrationPath)) { + if (markerRegistrationPath === null || !platformPathsEqual(path22.resolve(reportedAdministrativePath), markerRegistrationPath)) { throw new RuntimeError("worktree marker names a different administrative directory"); } const administrative = await boundPlainChildDirectory( @@ -42021,7 +42610,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { "worktree administrative directory" ); const contents = await readStableRegularFile( - path19.join(administrative.path, "gitdir"), + path22.join(administrative.path, "gitdir"), 32768n ); if (contents === null) { @@ -42031,7 +42620,9 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { contents.toString("utf8"), "worktree registration backlink" ); - if (!path19.isAbsolute(backlink) || await realpath7(backlink) !== await realpath7(path19.join(worktreePath, ".git"))) { + const expectedBacklink = pinned === void 0 ? await realpath8(path22.join(worktreePath, ".git")) : path22.join(await canonicalizeWorktreePath(worktreePath, true), ".git"); + const actualBacklink = pinned === void 0 ? await realpath8(backlink) : path22.join(await canonicalizeWorktreePath(path22.dirname(backlink), true), ".git"); + if (!path22.isAbsolute(backlink) || path22.basename(backlink) !== ".git" || !platformPathsEqual(actualBacklink, expectedBacklink)) { throw new RuntimeError("worktree registration backlink does not match the managed path"); } return { @@ -42042,7 +42633,7 @@ async function worktreeRegistrationDirectory(repoRoot, worktreePath, runGit) { }; } async function registrationQuarantineRoot(commonDir, dependencies) { - const quarantineRoot = path19.join(commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY); + const quarantineRoot = path22.join(commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY); await ensurePrivateDirectory(quarantineRoot, { description: "worktree registration quarantine", migratePermissions: true, @@ -42056,7 +42647,7 @@ async function restoreStagedRegistration(registrationRoot, registrationPath, qua const quarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); const sourceIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); const destinationIdentity = await managedWorktreeDirectoryIdentity(registrationPath); - if (registrationRootIdentity === null || !sameDirectoryIdentity(registrationRootIdentity, expectedRegistrationRootIdentity) || quarantineRootIdentity === null || !sameDirectoryIdentity(quarantineRootIdentity, expectedQuarantineRootIdentity) || sourceIdentity === null || !sameDirectoryIdentity(sourceIdentity, expectedIdentity) || destinationIdentity !== null) { + if (registrationRootIdentity === null || !sameDirectoryIdentity2(registrationRootIdentity, expectedRegistrationRootIdentity) || quarantineRootIdentity === null || !sameDirectoryIdentity2(quarantineRootIdentity, expectedQuarantineRootIdentity) || sourceIdentity === null || !sameDirectoryIdentity2(sourceIdentity, expectedIdentity) || destinationIdentity !== null) { throw new RuntimeError("staged worktree registration rollback is unsafe"); } const move = dependencies.rename ?? rename5; @@ -42082,12 +42673,12 @@ async function restoreStagedRegistration(registrationRoot, registrationPath, qua const restoredIdentity = await managedWorktreeDirectoryIdentity(registrationPath); const settledRegistrationRoot = await managedWorktreeDirectoryIdentity(registrationRoot); const settledQuarantineRoot = await managedWorktreeDirectoryIdentity(quarantineRoot); - if (restoredIdentity === null || !sameDirectoryIdentity(restoredIdentity, expectedIdentity) || await managedWorktreeDirectoryIdentity(quarantinePath) !== null || settledRegistrationRoot === null || !sameDirectoryIdentity(settledRegistrationRoot, expectedRegistrationRootIdentity) || settledQuarantineRoot === null || !sameDirectoryIdentity(settledQuarantineRoot, expectedQuarantineRootIdentity)) { + if (restoredIdentity === null || !sameDirectoryIdentity2(restoredIdentity, expectedIdentity) || await managedWorktreeDirectoryIdentity(quarantinePath) !== null || settledRegistrationRoot === null || !sameDirectoryIdentity2(settledRegistrationRoot, expectedRegistrationRootIdentity) || settledQuarantineRoot === null || !sameDirectoryIdentity2(settledQuarantineRoot, expectedQuarantineRootIdentity)) { throw new RuntimeError("staged worktree registration rollback changed identity"); } } async function stageRegistrationDirectory(repoRoot, registration, worktreePath, quarantineRoot, quarantinePath, transactionId, runGit, dependencies, allowMissingWorktree = false) { - const quarantineLabel = `registration-${path19.basename(registration.path)}`; + const quarantineLabel = `registration-${path22.basename(registration.path)}`; const [registrationRootIdentity, quarantineRootIdentity] = await Promise.all([ requiredDirectoryIdentity(registration.root, "Git registration root"), requiredDirectoryIdentity(quarantineRoot, "Git registration quarantine root") @@ -42119,7 +42710,7 @@ async function stageRegistrationDirectory(repoRoot, registration, worktreePath, } catch (stageError) { const originalIdentity = await managedWorktreeDirectoryIdentity(registration.path); const quarantineIdentity = await managedWorktreeDirectoryIdentity(quarantinePath); - if (originalIdentity === null && quarantineIdentity !== null && sameDirectoryIdentity(quarantineIdentity, registration.identity)) { + if (originalIdentity === null && quarantineIdentity !== null && sameDirectoryIdentity2(quarantineIdentity, registration.identity)) { try { await restoreStagedRegistration( registration.root, @@ -42199,12 +42790,12 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr commonResult.stdout, "stale worktree common directory" ); - if (!path19.isAbsolute(reportedCommonDir) || !path19.isAbsolute(worktreeGitDir)) { + if (!path22.isAbsolute(reportedCommonDir) || !path22.isAbsolute(worktreeGitDir)) { throw new RuntimeError("stale worktree registration paths must be absolute"); } - const commonDir = await realpath7(reportedCommonDir); - const expectedRegistrationRoot = path19.join(commonDir, "worktrees"); - const registrationRoot = await realpath7(expectedRegistrationRoot); + const commonDir = await realpath8(reportedCommonDir); + const expectedRegistrationRoot = path22.join(commonDir, "worktrees"); + const registrationRoot = await realpath8(expectedRegistrationRoot); if (!platformPathsEqual(registrationRoot, expectedRegistrationRoot)) { throw new RuntimeError("stale worktree administrative root escaped its repository"); } @@ -42214,8 +42805,8 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr "stale worktree administrative directory" ); const [gitdirContents, headContents] = await Promise.all([ - readStableRegularFile(path19.join(registration.path, "gitdir"), 32768n), - readStableRegularFile(path19.join(registration.path, "HEAD"), 32768n) + readStableRegularFile(path22.join(registration.path, "gitdir"), 32768n), + readStableRegularFile(path22.join(registration.path, "HEAD"), 32768n) ]); if (gitdirContents === null || headContents === null) { throw new RuntimeError("stale worktree registration files are not stable"); @@ -42225,12 +42816,12 @@ async function staleWorktreeRegistrationDirectory(repoRoot, worktreePath, worktr "stale worktree registration backlink" ); const head = gitPathOutput(headContents.toString("utf8"), "stale worktree HEAD"); - if (!path19.isAbsolute(backlink) || path19.basename(backlink) !== ".git" || (expectedBranchRef === null ? !(/^ref: refs\//u.test(head) || /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u.test(head)) : head !== `ref: ${expectedBranchRef}`)) { + if (!path22.isAbsolute(backlink) || path22.basename(backlink) !== ".git" || (expectedBranchRef === null ? !(/^ref: refs\//u.test(head) || /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/u.test(head)) : head !== `ref: ${expectedBranchRef}`)) { throw new RuntimeError("stale worktree registration identity is inconsistent"); } const { target } = await managedPath(worktreePath); const canonicalBacklinkWorktree = await canonicalizeWorktreePath( - path19.dirname(path19.resolve(backlink)), + path22.dirname(path22.resolve(backlink)), true ); const canonicalExpectedWorktree = await canonicalizeWorktreePath(target, true); @@ -42258,25 +42849,25 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, commonResult.stdout, "missing worktree common directory" ); - if (!path19.isAbsolute(reportedCommonDir)) { + if (!path22.isAbsolute(reportedCommonDir)) { throw new RuntimeError("missing worktree common directory is not absolute"); } - const commonDir = await realpath7(reportedCommonDir); - const expectedRegistrationRoot = path19.join(commonDir, "worktrees"); - const registrationRoot = await realpath7(expectedRegistrationRoot); + const commonDir = await realpath8(reportedCommonDir); + const expectedRegistrationRoot = path22.join(commonDir, "worktrees"); + const registrationRoot = await realpath8(expectedRegistrationRoot); if (!platformPathsEqual(registrationRoot, expectedRegistrationRoot)) { throw new RuntimeError("worktree administrative root escaped its repository"); } const expectedWorktree = await canonicalizeWorktreePath(worktreePath, true); const matches = []; - for (const entry of await readdir6(registrationRoot, { withFileTypes: true })) { + for (const entry of await readdir7(registrationRoot, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path19.join(registrationRoot, entry.name); + const registrationPath = path22.join(registrationRoot, entry.name); if (expectedRegistrationPath !== null && !platformPathsEqual(registrationPath, expectedRegistrationPath)) { continue; } const contents = await readStableRegularFile( - path19.join(registrationPath, "gitdir"), + path22.join(registrationPath, "gitdir"), 32768n ); if (contents === null) continue; @@ -42286,15 +42877,15 @@ async function discoverStaleWorktreeRegistration(repoRoot, worktreePath, runGit, } catch { continue; } - if (!path19.isAbsolute(backlink) || path19.basename(backlink) !== ".git") continue; + if (!path22.isAbsolute(backlink) || path22.basename(backlink) !== ".git") continue; let candidateWorktree; try { - candidateWorktree = await canonicalizeWorktreePath(path19.dirname(backlink), true); + candidateWorktree = await canonicalizeWorktreePath(path22.dirname(backlink), true); } catch { continue; } if (platformPathsEqual(candidateWorktree, expectedWorktree)) { - matches.push(await realpath7(registrationPath)); + matches.push(await realpath8(registrationPath)); } } if (matches.length !== 1) { @@ -42337,17 +42928,17 @@ async function removeStaleWorktreeRegistration(repoRoot, worktreePath, worktreeG if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid stale worktree quarantine token"); } - const physicalQuarantinePath = path19.join( + const physicalQuarantinePath = path22.join( root, - `.remove-${path19.basename(target)}-${transactionId}` + `.remove-${path22.basename(target)}-${transactionId}` ); const quarantineRoot = await registrationQuarantineRoot( registration.commonDir, dependencies ); - const quarantinePath = path19.join( + const quarantinePath = path22.join( quarantineRoot, - `.remove-registration-${path19.basename(registration.path)}-${transactionId}` + `.remove-registration-${path22.basename(registration.path)}-${transactionId}` ); const [ commonDirIdentity, @@ -42418,7 +43009,7 @@ async function removeStaleWorktreeRegistration(repoRoot, worktreePath, worktreeG await assertRemovalRoots(); await syncChangedDirectories(dependencies, registration.root, quarantineRoot); const restored = await managedWorktreeDirectoryIdentity(registration.path); - return restored !== null && sameDirectoryIdentity(restored, registration.identity) && await managedWorktreeDirectoryIdentity(quarantinePath) === null; + return restored !== null && sameDirectoryIdentity2(restored, registration.identity) && await managedWorktreeDirectoryIdentity(quarantinePath) === null; }, removePhysical: async (markRemovalStarted) => { await assertRemovalRoots(); @@ -42436,7 +43027,7 @@ async function removeStaleWorktreeRegistration(repoRoot, worktreePath, worktreeG async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = {}, expectedIdentity) { const runGit = dependencies.git ?? git; const observedIdentity = await managedWorktreeDirectoryIdentity(worktreePath); - if (expectedIdentity !== void 0 && (observedIdentity === null || !sameDirectoryIdentity(observedIdentity, expectedIdentity))) { + if (expectedIdentity !== void 0 && (observedIdentity === null || !sameDirectoryIdentity2(observedIdentity, expectedIdentity))) { throw new RuntimeError("managed worktree identity changed before registration removal"); } const identity = expectedIdentity ?? observedIdentity; @@ -42456,7 +43047,7 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { } const registration = await worktreeRegistrationDirectory(repoRoot, worktreePath, runGit); const settledIdentity = await managedWorktreeDirectoryIdentity(worktreePath); - if (settledIdentity === null || !sameDirectoryIdentity(settledIdentity, identity)) { + if (settledIdentity === null || !sameDirectoryIdentity2(settledIdentity, identity)) { throw new RuntimeError("managed worktree identity changed before removal transaction"); } const { root, target } = await managedPath(worktreePath); @@ -42464,17 +43055,17 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid physical worktree quarantine token"); } - const physicalQuarantinePath = path19.join( + const physicalQuarantinePath = path22.join( root, - `.remove-${path19.basename(target)}-${transactionId}` + `.remove-${path22.basename(target)}-${transactionId}` ); const quarantineRoot = await registrationQuarantineRoot( registration.commonDir, dependencies ); - const quarantinePath = path19.join( + const quarantinePath = path22.join( quarantineRoot, - `.remove-registration-${path19.basename(registration.path)}-${transactionId}` + `.remove-registration-${path22.basename(registration.path)}-${transactionId}` ); const [ commonDirIdentity, @@ -42544,14 +43135,14 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { await assertRemovalRoots(); await syncChangedDirectories(dependencies, registration.root, quarantineRoot); const restored = await managedWorktreeDirectoryIdentity(registration.path); - return restored !== null && sameDirectoryIdentity(restored, registration.identity) && await managedWorktreeDirectoryIdentity(quarantinePath) === null; + return restored !== null && sameDirectoryIdentity2(restored, registration.identity) && await managedWorktreeDirectoryIdentity(quarantinePath) === null; }, removePhysical: async (markRemovalStarted) => { await assertRemovalRoots(); const removed = await removeDirectoryByQuarantine( root, target, - path19.basename(target), + path22.basename(target), { ...dependencies, uuid: () => transactionId, @@ -42564,7 +43155,7 @@ async function removeRegisteredWorktree(repoRoot, worktreePath, dependencies = { physicalIsUnchanged: async () => { await assertRemovalRoots(); const physical = await managedWorktreeDirectoryIdentity(target); - return physical !== null && sameDirectoryIdentity(physical, identity) && await managedWorktreeDirectoryIdentity(physicalQuarantinePath) === null; + return physical !== null && sameDirectoryIdentity2(physical, identity) && await managedWorktreeDirectoryIdentity(physicalQuarantinePath) === null; } }); } @@ -42609,41 +43200,36 @@ var WorktreeManager = class { ...this.runId === void 0 ? {} : { runId: this.runId } }); } - managedWorktreePath(stateRoot2 = path19.resolve(resolveStateDir())) { + namespaceRoot; + async managedRoot() { + this.namespaceRoot ??= await repositoryNamespaceRoot(this.repoRoot, git); + return this.namespaceRoot; + } + managedWorktreePath(worktreesRoot) { if (!SAFE_MANAGED_ID.test(this.runId)) { throw new RuntimeError("invalid worktree run id"); } - const worktreesRoot = path19.resolve(stateRoot2, "worktrees"); - const worktreePath = path19.resolve(worktreesRoot, this.runId); - if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path19.sep}`)) { + const worktreePath = path22.resolve(worktreesRoot, this.runId); + if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path22.sep}`)) { throw new RuntimeError("invalid worktree run id"); } return { worktreesRoot, worktreePath }; } async prepareManagedWorktreeRoot() { await verifyBoundDirectoryCleanupSupport(this.lockingPlatformServices()); - const configuredStateRoot = path19.resolve(resolveStateDir()); - const syncDirectory4 = this.dependencies.syncDirectory ?? syncDirectoryMetadata; - const stateRootIdentity = await ensurePrivateDirectory(configuredStateRoot, { + const syncDirectory = this.dependencies.syncDirectory ?? syncDirectoryMetadata; + await ensurePrivateDirectory(path22.resolve(resolveStateDir()), { description: "runtime state root", migratePermissions: true, - syncDirectory: syncDirectory4, + syncDirectory, ...this.dependencies.processSupervisor === void 0 ? {} : { platformServices: this.dependencies.processSupervisor } }); - const stateRoot2 = await realpath7(configuredStateRoot); - await assertDirectoryIdentity4(stateRoot2, stateRootIdentity, "runtime state root"); - const { worktreesRoot, worktreePath } = this.managedWorktreePath(stateRoot2); - const worktreesRootIdentity = await ensurePrivateDirectory(worktreesRoot, { - description: "managed worktree root", - migratePermissions: true, - syncDirectory: syncDirectory4, - ...this.dependencies.processSupervisor === void 0 ? {} : { platformServices: this.dependencies.processSupervisor } + const { worktreesRoot, worktreePath } = this.managedWorktreePath(await this.managedRoot()); + const worktreesRootIdentity = await prepareManagedWorktreeRoot(worktreesRoot, { + syncDirectory }); await (this.dependencies.verifyRemovalStorage ?? verifyWorktreeRemovalManifestStorage)(); - await Promise.all([ - assertDirectoryIdentity4(stateRoot2, stateRootIdentity, "runtime state root"), - assertDirectoryIdentity4(worktreesRoot, worktreesRootIdentity, "managed worktree root") - ]); + await assertDirectoryIdentity4(worktreesRoot, worktreesRootIdentity, "managed worktree root"); return { worktreesRoot, worktreePath, @@ -42663,22 +43249,22 @@ var WorktreeManager = class { commonResult.stdout, "worktree creation common directory" ); - if (!path19.isAbsolute(reportedCommonDir)) { + if (!path22.isAbsolute(reportedCommonDir)) { throw new RuntimeError("worktree creation common directory is not absolute"); } - const commonDir = await realpath7(reportedCommonDir); - const registrationRoot = path19.join(commonDir, "worktrees"); + const commonDir = await realpath8(reportedCommonDir); + const registrationRoot = path22.join(commonDir, "worktrees"); let registrationRootCreated = false; try { - await mkdir5(registrationRoot, { mode: 448 }); + await mkdir6(registrationRoot, { mode: 448 }); registrationRootCreated = true; } catch (error51) { - if (errorCode8(error51) !== "EEXIST") throw error51; + if (errorCode(error51) !== "EEXIST") throw error51; } if (registrationRootCreated) { await (this.dependencies.syncDirectory ?? syncDirectoryMetadata)(commonDir); } - const registrationMetadata = await lstat11(registrationRoot, { bigint: true }); + const registrationMetadata = await lstat13(registrationRoot, { bigint: true }); if (!registrationMetadata.isDirectory() || registrationMetadata.isSymbolicLink() || registrationMetadata.birthtimeNs <= 0n) { throw new RuntimeError("Git worktree registration root lacks stable identity"); } @@ -42702,17 +43288,17 @@ var WorktreeManager = class { if (!SAFE_QUARANTINE_TOKEN.test(transactionId)) { throw new RuntimeError("invalid worktree creation transaction token"); } - const registrationPath = path19.join( + const registrationPath = path22.join( registrationRoot, `.creation-${transactionId}` ); - const quarantinePath = path19.join( + const quarantinePath = path22.join( quarantineRoot, `.remove-registration-creation-${transactionId}` ); - const stagingPath = path19.join( + const stagingPath = path22.join( worktreesRoot, - `.create-${path19.basename(worktreePath)}-${transactionId}` + `.create-${path22.basename(worktreePath)}-${transactionId}` ); let manifest = { manifestVersion: "1", @@ -42747,7 +43333,7 @@ var WorktreeManager = class { }; const manifestPath = await persistWorktreeRemovalManifest(manifest); await assertDirectoryIdentity4(worktreesRoot, rootIdentity, "managed worktree root"); - await mkdir5(stagingPath, { mode: 448 }); + await mkdir6(stagingPath, { mode: 448 }); await syncChangedDirectories(this.dependencies, worktreesRoot); const physicalIdentity = await requiredDirectoryIdentity( stagingPath, @@ -42773,7 +43359,7 @@ var WorktreeManager = class { } async captureCreatedIdentity(worktreePath, worktreesRoot, expectedRootIdentity) { const settledRootIdentity = await managedWorktreeDirectoryIdentity(worktreesRoot); - if (settledRootIdentity === null || !sameDirectoryIdentity(settledRootIdentity, expectedRootIdentity)) { + if (settledRootIdentity === null || !sameDirectoryIdentity2(settledRootIdentity, expectedRootIdentity)) { throw new WorktreeRootChangedError( "managed worktree root identity changed during creation" ); @@ -42839,14 +43425,14 @@ var WorktreeManager = class { commonResult.stdout, "worktree registration filesystem" ); - if (!path19.isAbsolute(reported)) { + if (!path22.isAbsolute(reported)) { throw new RuntimeError("worktree registration filesystem path is not absolute"); } - const commonDir = await realpath7(reported); + const commonDir = await realpath8(reported); if (await managedWorktreeDirectoryIdentity(commonDir) === null) { throw new RuntimeError("worktree registration filesystem identity is unavailable"); } - const registrationRoot = path19.join(commonDir, "worktrees"); + const registrationRoot = path22.join(commonDir, "worktrees"); const existingRegistrationRoot = await managedWorktreeDirectoryIdentity(registrationRoot); if (existingRegistrationRoot !== null && existingRegistrationRoot.birthtimeNs <= 0n) { throw new RuntimeError("worktree registration root lacks stable identity"); @@ -42876,6 +43462,7 @@ var WorktreeManager = class { "created Git registration" ) ]); + return registration; } async finishCreatedWorktree(worktreePath, worktreesRoot, rootIdentity, identity) { const settled = await this.captureCreatedIdentity( @@ -42883,7 +43470,7 @@ var WorktreeManager = class { worktreesRoot, rootIdentity ); - if (!sameDirectoryIdentity(settled, identity)) { + if (!sameDirectoryIdentity2(settled, identity)) { return await this.failCreatedWorktree( worktreePath, identity, @@ -42923,15 +43510,16 @@ var WorktreeManager = class { ); } const identity = await this.captureCreatedIdentity(worktreePath, worktreesRoot, rootIdentity); - if (!sameDirectoryIdentity(identity, creation.physicalIdentity)) { + if (!sameDirectoryIdentity2(identity, creation.physicalIdentity)) { return await this.failCreatedWorktree( worktreePath, creation.physicalIdentity, new RuntimeError("created worktree replaced its durable placeholder") ); } + let registration; try { - await this.syncCreatedWorktree( + registration = await this.syncCreatedWorktree( worktreePath, worktreesRoot, rootIdentity, @@ -42957,6 +43545,10 @@ var WorktreeManager = class { rootIdentity, identity ); + pinWorktreeGitDirectory(worktreePath, { + gitDir: registration.path, + commonDir: registration.commonDir + }); await removeWorktreeRemovalManifest(creation.manifestPath, creation.transactionId); return created; } @@ -42991,15 +43583,16 @@ var WorktreeManager = class { ); } const identity = await this.captureCreatedIdentity(worktreePath, worktreesRoot, rootIdentity); - if (!sameDirectoryIdentity(identity, creation.physicalIdentity)) { + if (!sameDirectoryIdentity2(identity, creation.physicalIdentity)) { return await this.failCreatedWorktree( worktreePath, creation.physicalIdentity, new RuntimeError("created worktree replaced its durable placeholder") ); } + let registration; try { - await this.syncCreatedWorktree( + registration = await this.syncCreatedWorktree( worktreePath, worktreesRoot, rootIdentity, @@ -43025,22 +43618,23 @@ var WorktreeManager = class { rootIdentity, identity ); + pinWorktreeGitDirectory(worktreePath, { + gitDir: registration.path, + commonDir: registration.commonDir + }); await removeWorktreeRemovalManifest(creation.manifestPath, creation.transactionId); return created; } async removeUnderLease(worktreePath, expectedIdentity) { - const expectedWorktreePath = this.managedWorktreePath().worktreePath; + const managedRoot = await this.managedRoot(); + const expectedWorktreePath = this.managedWorktreePath(managedRoot).worktreePath; const canonicalWorktreePath = await canonicalizeWorktreePath(worktreePath, true); let canonicalExpectedPath; try { canonicalExpectedPath = await canonicalizeWorktreePath(expectedWorktreePath, true); } catch (error51) { - if (errorCode8(error51) !== "ENOENT") throw error51; - canonicalExpectedPath = path19.join( - await realpath7(path19.resolve(resolveStateDir())), - "worktrees", - path19.basename(expectedWorktreePath) - ); + if (errorCode(error51) !== "ENOENT") throw error51; + canonicalExpectedPath = path22.join(managedRoot, path22.basename(expectedWorktreePath)); } if (!platformPathsEqual(canonicalWorktreePath, canonicalExpectedPath)) { throw new RuntimeError("refusing to remove unmanaged worktree path"); @@ -43062,6 +43656,7 @@ var WorktreeManager = class { } async remove(worktreePath, expectedIdentity) { await this.withCheckoutLease(async () => await this.removeUnderLease(worktreePath, expectedIdentity)); + unpinWorktreeGitDirectory(worktreePath); } }; async function cleanupWorktree(worktree) { @@ -43101,10 +43696,10 @@ async function withManagedWorktree(args) { } // src/verify/project-verifier.ts -import { realpath as realpath8 } from "node:fs/promises"; -import path20 from "node:path"; +import { mkdtemp as mkdtemp3, realpath as realpath9, rm as rm8 } from "node:fs/promises"; +import { tmpdir as tmpdir7 } from "node:os"; +import path23 from "node:path"; var MAX_COMMAND_OUTPUT_BYTES = 1e6; -var MAX_DIAGNOSTIC_LENGTH3 = 2e3; var POSIX_ESSENTIAL_ENV2 = [ "HOME", "PATH", @@ -43117,14 +43712,9 @@ var POSIX_ESSENTIAL_ENV2 = [ "XDG_STATE_HOME", "XDG_RUNTIME_DIR" ]; -function gitFailure(action, result) { - const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH3); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit(cwd, args) { - const result = await git(cwd, args); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; +function verificationConfinementBackend(os, arch) { + const platform = SANDBOX_BACKENDS.find((backend) => backend.id === "macos-seatbelt")?.platforms.find((candidate) => candidate.os === os && candidate.environmentType === "native" && (candidate.arch === void 0 || candidate.arch === arch)); + return platform === void 0 || platform.state === "unsupported" ? null : "macos-seatbelt"; } function defineEnvironmentValue(environment, name, value) { Object.defineProperty(environment, name, { @@ -43150,17 +43740,17 @@ function commandEnvironment(command, os) { } function isWithinScope(root, candidate, os) { if (os === "win32") return canonicalizeForScope(candidate, root); - const relative2 = path20.posix.relative(root, candidate); - return relative2 === "" || !path20.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); + const relative2 = path23.posix.relative(root, candidate); + return relative2 === "" || !path23.posix.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith("../"); } async function resolveCommandCwd(worktreePath, commandCwd, os) { - if (path20.isAbsolute(commandCwd)) return null; - const lexical = path20.resolve(worktreePath, commandCwd); + if (path23.isAbsolute(commandCwd)) return null; + const lexical = path23.resolve(worktreePath, commandCwd); if (!isWithinScope(worktreePath, lexical, os)) return null; try { const [canonicalRoot, canonicalCwd] = await Promise.all([ - realpath8(worktreePath), - realpath8(lexical) + realpath9(worktreePath), + realpath9(lexical) ]); return isWithinScope(canonicalRoot, canonicalCwd, os) ? canonicalCwd : null; } catch { @@ -43205,12 +43795,30 @@ async function executeCommand(args) { const environment = commandEnvironment(command, ps.os); executable = await ps.resolveExecutable({ name: command.executable, - ...path20.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}, + ...path23.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}, searchPath: environment.PATH ?? environment.Path ?? "" }); + let spawned = { executable, args: command.args }; + if (args.confinement) { + defineEnvironmentValue(environment, "TMPDIR", args.confinement.scratchDir); + const confined = seatbeltArgv(args.confinement, [ + executable.command, + ...executable.prefixArgs, + ...command.args + ]); + spawned = { + executable: { + kind: "native", + command: confined.command, + prefixArgs: [], + resolvedFrom: `seatbelt:${executable.resolvedFrom}` + }, + args: confined.args + }; + } exit = await supervise(ps, { - executable, - args: command.args, + executable: spawned.executable, + args: spawned.args, cwd, env: environment, timeoutMs: command.timeoutMs, @@ -43239,7 +43847,7 @@ async function executeCommand(args) { }, evidence: { id: redact(command.id), - confinement: "none", + confinement: args.confinement?.backend ?? "none", networkPolicy: "unenforced", requestedNetwork: command.network, skipped: false, @@ -43263,7 +43871,7 @@ async function executeCommand(args) { } async function scanCommandMutations(args) { const [status, currentHead, indexEntries] = await Promise.all([ - checkedGit(args.worktreePath, [ + gitChecked(args.worktreePath, [ "status", "--porcelain=v2", "-z", @@ -43271,8 +43879,8 @@ async function scanCommandMutations(args) { "--ignored=matching", "--ignore-submodules=none" ]), - checkedGit(args.worktreePath, ["rev-parse", "--verify", "HEAD"]), - checkedGit(args.worktreePath, ["ls-files", "-v", "-z"]) + gitChecked(args.worktreePath, ["rev-parse", "--verify", "HEAD"]), + gitChecked(args.worktreePath, ["ls-files", "-v", "-z"]) ]); const statusRecords = status.split("\0").filter((record2) => record2.length > 0 && !(args.dependencyLink === "inherited" && /^[?!] node_modules\/?$/.test(record2))); const hiddenIndexRecords = indexEntries.split("\0").filter((record2) => /^(?:S|[a-z]) /.test(record2)).map((record2) => `index ${record2}`); @@ -43310,10 +43918,14 @@ async function projectVerify(args) { args.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.borrowedCheckoutLease } ); const materialized = await manager.create(args.artifact.candidateCommitOid); + const backend = verificationConfinementBackend(ps.os, arch); + let scratchDir = null; let primaryError; try { + scratchDir = backend === null ? null : await mkdtemp3(path23.join(tmpdir7(), "claude-architect-verify-")); + const confinement = backend === null || scratchDir === null ? null : { backend, worktreePath: materialized.path, scratchDir }; const dependencyLink = await linkPrimaryDependencies(args.repoRoot, materialized.path); - const materializedTree = (await checkedGit( + const materializedTree = (await gitChecked( materialized.path, ["rev-parse", "HEAD^{tree}"] )).trim(); @@ -43361,6 +43973,7 @@ async function projectVerify(args) { cwd, ps, now, + confinement, ...args.logNamePrefix === void 0 ? {} : { logNamePrefix: args.logNamePrefix } }); commandOutcomes.push(executed.outcome); @@ -43390,6 +44003,7 @@ async function projectVerify(args) { primaryError = error51; throw error51; } finally { + if (scratchDir !== null) await rm8(scratchDir, { recursive: true, force: true }); try { await materialized.cleanup(); } catch (cleanupError) { @@ -43402,36 +44016,7 @@ async function projectVerify(args) { } } -// src/util/glob.ts -function escapeRegex2(character) { - return /[\\^$.*+?()[\]{}|]/.test(character) ? `\\${character}` : character; -} -function globMatches(pattern, candidate, caseInsensitive = false) { - let expression = "^"; - for (let index = 0; index < pattern.length; index += 1) { - const character = pattern[index]; - if (character === void 0) break; - if (character !== "*") { - expression += escapeRegex2(character); - continue; - } - if (pattern[index + 1] !== "*") { - expression += "[^/]*"; - continue; - } - index += 1; - if (pattern[index + 1] === "/") { - expression += "(?:.*/)?"; - index += 1; - } else { - expression += ".*"; - } - } - return new RegExp(`${expression}$`, caseInsensitive ? "i" : void 0).test(candidate); -} - // src/verify/structural-verifier.ts -var MAX_DIAGNOSTIC_LENGTH4 = 2e3; var MODE_STRUCTURAL_FAILURES = { candidate: [ "manifest-divergence", @@ -43459,19 +44044,7 @@ var MODE_STRUCTURAL_FAILURES = { "artifact-base-mismatch" ] }; -function gitFailure2(action, result) { - const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH4); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit2(cwd, args) { - const result = await git(cwd, args); - if (result.exitCode !== 0) throw gitFailure2(`git ${args[0] ?? "command"}`, result); - if (result.truncated?.stdout === true || result.truncated?.stderr === true) { - throw gitFailure2(`git ${args[0] ?? "command"}`, { ...result, stderr: "output truncated" }); - } - return result.stdout; -} -function isAllowed(pathname, writeAllowlist, forbiddenScope, opaqueDirectory = false) { +function isAllowed2(pathname, writeAllowlist, forbiddenScope, opaqueDirectory = false) { const scopePaths = opaqueDirectory ? [pathname, `${pathname}/`] : [pathname]; return writeAllowlist.some((pattern) => scopePaths.some((candidate) => globMatches(pattern, candidate))) && !forbiddenScope.some((pattern) => scopePaths.some((candidate) => globMatches(pattern, candidate, true))); } @@ -43492,7 +44065,7 @@ function pathsCaseCollide(changedPaths, treePaths) { } async function candidateHasCaseCollision(args) { const [changedOutput, treeOutput] = await Promise.all([ - checkedGit2(args.worktreePath, [ + gitChecked(args.worktreePath, [ "diff-tree", "-r", "--no-commit-id", @@ -43502,7 +44075,7 @@ async function candidateHasCaseCollision(args) { args.baseCommitOid, args.artifact.candidateTreeOid ]), - checkedGit2(args.worktreePath, [ + gitChecked(args.worktreePath, [ "ls-tree", "-r", "--name-only", @@ -43514,7 +44087,7 @@ async function candidateHasCaseCollision(args) { } async function recomputeManifest(args) { const [rawOutput, nameStatusOutput, treeOutput] = await Promise.all([ - checkedGit2(args.worktreePath, [ + gitChecked(args.worktreePath, [ "diff-tree", "-r", "--no-commit-id", @@ -43524,7 +44097,7 @@ async function recomputeManifest(args) { args.baseCommitOid, args.artifact.candidateTreeOid ]), - checkedGit2(args.worktreePath, [ + gitChecked(args.worktreePath, [ "diff-tree", "-r", "--no-commit-id", @@ -43534,7 +44107,7 @@ async function recomputeManifest(args) { args.baseCommitOid, args.artifact.candidateTreeOid ]), - checkedGit2(args.worktreePath, ["ls-tree", "-r", "-z", args.artifact.candidateTreeOid]) + gitChecked(args.worktreePath, ["ls-tree", "-r", "-z", args.artifact.candidateTreeOid]) ]); const rawDiff = parseRawDiff(rawOutput); const { changedPaths, manifestHash } = inspectChangedPathManifest({ @@ -43568,20 +44141,20 @@ async function singleCommitIdentityMatches(args) { } async function branchIdentityMatches(args) { const [sourceHead, materializedHead, candidateTree, sourceStatus, materializedStatus] = await Promise.all([ - checkedGit2(args.repoRoot, ["rev-parse", "--verify", "HEAD^{commit}"]), - checkedGit2(args.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"]), - checkedGit2(args.repoRoot, [ + gitChecked(args.repoRoot, ["rev-parse", "--verify", "HEAD^{commit}"]), + gitChecked(args.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"]), + gitChecked(args.repoRoot, [ "rev-parse", "--verify", `${args.artifact.candidateCommitOid}^{tree}` ]), - checkedGit2(args.repoRoot, [ + gitChecked(args.repoRoot, [ "status", "--porcelain=v1", "-z", "--untracked-files=all" ]), - checkedGit2(args.worktreePath, [ + gitChecked(args.worktreePath, [ "status", "--porcelain=v1", "-z", @@ -43612,9 +44185,9 @@ async function structuralVerify(args, mode = "candidate") { caseCollision ] = await Promise.all([ recomputeManifest(args), - checkedGit2(args.repoRoot, ["rev-parse", `${args.baseCommitOid}^{tree}`]), - observesCheckoutDrift ? checkedGit2(args.repoRoot, ["rev-parse", "--verify", "HEAD"]) : Promise.resolve(""), - observesCheckoutDrift ? checkedGit2(args.repoRoot, [ + gitChecked(args.repoRoot, ["rev-parse", `${args.baseCommitOid}^{tree}`]), + observesCheckoutDrift ? gitChecked(args.repoRoot, ["rev-parse", "--verify", "HEAD"]) : Promise.resolve(""), + observesCheckoutDrift ? gitChecked(args.repoRoot, [ "status", "--porcelain=v1", "--untracked-files=all", @@ -43630,7 +44203,7 @@ async function structuralVerify(args, mode = "candidate") { manifest.manifestHash === null || JSON.stringify(args.artifact.changedPaths) !== JSON.stringify(manifest.changedPaths) || args.artifact.manifestHash !== manifest.manifestHash ); record2("artifact-divergence", !identityValid); - record2("out-of-scope-write", manifest.changedPaths.some((change) => !isAllowed( + record2("out-of-scope-write", manifest.changedPaths.some((change) => !isAllowed2( change.path, args.writeAllowlist, args.forbiddenScope, @@ -43779,8 +44352,36 @@ var AcceptanceVerifier = class { } }; -// src/runtime/run-decision.ts -import { createHash as createHash10 } from "node:crypto"; +// src/verify/verification-inputs.ts +var TEST_PATH_PATTERNS = [ + /(?:^|\/)(?:tests?|__tests__|spec|specs|testdata|fixtures)\//u, + /\.(?:test|spec)\.[^/]+$/u, + /(?:^|\/)(?:test_[^/]+|[^/]+_test)\.(?:py|go|rb|rs|exs?)$/u, + /(?:^|\/)[^/]+(?:Test|Tests|Spec)\.(?:java|kt|cs|swift|scala)$/u, + /(?:^|\/)conftest\.py$/u +]; +function isTestPath(candidate) { + return TEST_PATH_PATTERNS.some((pattern) => pattern.test(candidate)); +} +var VERIFICATION_INPUT_PATTERNS = [ + ...TEST_PATH_PATTERNS, + // Test runner, compiler, and task configuration. + /(?:^|\/)(?:vitest|vite|jest|mocha|karma|playwright|cypress|ava|babel|webpack|rollup|esbuild)\.config\.[^/]+$/u, + /(?:^|\/)\.(?:mocharc|babelrc|nycrc|c8rc)(?:\.[^/]+)?$/u, + /(?:^|\/)tsconfig(?:\.[^/]+)?\.json$/u, + /(?:^|\/)(?:pytest|tox|setup)\.(?:ini|cfg)$/u, + /(?:^|\/)(?:Makefile|GNUmakefile|justfile|Taskfile\.ya?ml|Rakefile|build\.gradle(?:\.kts)?|pom\.xml)$/u, + // Dependency manifests and lockfiles. + /(?:^|\/)package\.json$/u, + /(?:^|\/)(?:package-lock\.json|npm-shrinkwrap\.json|yarn\.lock|pnpm-lock\.yaml|bun\.lockb?)$/u, + /(?:^|\/)(?:pyproject\.toml|requirements[^/]*\.txt|Pipfile(?:\.lock)?|poetry\.lock|uv\.lock)$/u, + /(?:^|\/)(?:Cargo\.(?:toml|lock)|go\.(?:mod|sum)|Gemfile(?:\.lock)?|mix\.(?:exs|lock))$/u, + // Attribute and ignore rules change which bytes Git and tools see. + /(?:^|\/)\.git(?:attributes|ignore|modules)$/u +]; +function verificationInputPaths(changedPaths) { + return changedPaths.filter((changed) => VERIFICATION_INPUT_PATTERNS.some((pattern) => pattern.test(changed))); +} // src/protocol/pipeline-gate-cleared.ts var GIT_OID2 = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; @@ -43810,40 +44411,28 @@ function parsePipelineGateCleared(value) { }; } -// src/mcp/decision-authority.ts -var DECISION_AUTHORITY_ENV = "CLAUDE_ARCHITECT_DECISION_AUTHORITY"; -function decisionAuthority(env = process.env, warn = (message) => console.error(message)) { - const raw = env[DECISION_AUTHORITY_ENV]; - if (raw === void 0 || raw === "") return "autonomous"; - if (raw === "autonomous" || raw === "human") return raw; - warn( - `${DECISION_AUTHORITY_ENV}="${raw}" is not a recognized decision authority; requiring human confirmation. Valid values: "autonomous", "human".` - ); - return "human"; -} - // src/runtime/artifact-store.ts import { randomUUID as randomUUID7 } from "node:crypto"; -import { constants as constants11 } from "node:fs"; +import { constants as constants12 } from "node:fs"; import { - lstat as lstat12, - mkdir as mkdir6, - open as open11, + lstat as lstat14, + mkdir as mkdir7, + open as open12, opendir, - readdir as readdir7, - realpath as realpath9, + readdir as readdir8, + realpath as realpath10, rename as rename6, - rm as rm7 + rm as rm9 } from "node:fs/promises"; -import path21 from "node:path"; +import path24 from "node:path"; // src/runtime/run-manifest.ts -import { createHash as createHash9 } from "node:crypto"; +import { createHash as createHash10 } from "node:crypto"; function compareText(left, right) { return left < right ? -1 : left > right ? 1 : 0; } function sha2562(value) { - return createHash9("sha256").update(value).digest("hex"); + return createHash10("sha256").update(value).digest("hex"); } function canonicalize(value) { if (Array.isArray(value)) return value.map(canonicalize); @@ -44019,7 +44608,7 @@ var WINDOWS_RESERVED_COMPONENT = /^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i; var CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; var PRUNE_BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; var CLEANUP_JOURNAL = "cleanup.ndjson"; -var NO_FOLLOW6 = constants11.O_NOFOLLOW ?? 0; +var NO_FOLLOW6 = constants12.O_NOFOLLOW ?? 0; var MAX_ARCHIVE_FILE_BYTES = 8e6; var MAX_EVIDENCE_REFERENCES = 4096; var MAX_EVIDENCE_DEPTH = 16; @@ -44041,21 +44630,15 @@ function validateComponent(value, kind) { throw new RuntimeError(`invalid ${kind}: ${JSON.stringify(value)}`); } } -function errorCode9(error51) { - return error51.code; -} -function isMissing3(error51) { - return errorCode9(error51) === "ENOENT"; -} function isAlreadyPresent2(error51) { - return errorCode9(error51) === "EEXIST"; + return errorCode(error51) === "EEXIST"; } async function pathExists(filename) { try { - await lstat12(filename); + await lstat14(filename); return true; } catch (error51) { - if (isMissing3(error51)) return false; + if (isMissing(error51)) return false; throw error51; } } @@ -44071,62 +44654,50 @@ function compareEntries(left, right) { return left.runId < right.runId ? -1 : left.runId > right.runId ? 1 : 0; } function isWithin(root, candidate) { - const relative2 = path21.relative(root, candidate); - return relative2 === "" || !path21.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path21.sep}`); + const relative2 = path24.relative(root, candidate); + return relative2 === "" || !path24.isAbsolute(relative2) && relative2 !== ".." && !relative2.startsWith(`..${path24.sep}`); } async function ensurePlainDirectory(directory) { let created = false; try { - await mkdir6(directory, { mode: 448 }); + await mkdir7(directory, { mode: 448 }); created = true; } catch (error51) { if (!isAlreadyPresent2(error51)) throw error51; } - const metadata = await lstat12(directory); + const metadata = await lstat14(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(directory)}`); } - if (created) await syncDirectory3(path21.dirname(directory)); + if (created) await flushDirectory(path24.dirname(directory)); return { dev: metadata.dev, ino: metadata.ino }; } async function ensurePlainDirectoryTree(directory) { try { return await ensurePlainDirectory(directory); } catch (error51) { - if (!isMissing3(error51)) throw error51; - const parent = path21.dirname(directory); + if (!isMissing(error51)) throw error51; + const parent = path24.dirname(directory); if (parent === directory) throw error51; await ensurePlainDirectoryTree(parent); return ensurePlainDirectory(directory); } } async function assertDirectoryIdentity5(directory, expected) { - const metadata = await lstat12(directory); + const metadata = await lstat14(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory() || metadata.dev !== expected.dev || metadata.ino !== expected.ino) { throw new RuntimeError("archive directory identity changed during operation"); } } -async function syncDirectory3(directory) { - let handle; - try { - handle = await open11(directory, constants11.O_RDONLY | NO_FOLLOW6); - await handle.sync(); - } catch (error51) { - const unsupportedOnWindows = process.platform === "win32" && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode9(error51) ?? ""); - if (!unsupportedOnWindows) throw error51; - } finally { - await handle?.close(); - } -} async function readRegularFile(filename, parentIdentity) { - const linkMetadata = await lstat12(filename); + const linkMetadata = await lstat14(filename); if (linkMetadata.isSymbolicLink()) { throw new RuntimeError(`archive entry must not be a symbolic link: ${redact(filename)}`); } - const handle = await open11(filename, constants11.O_RDONLY | NO_FOLLOW6); + const handle = await open12(filename, constants12.O_RDONLY | NO_FOLLOW6); try { if (parentIdentity !== void 0) { - await assertDirectoryIdentity5(path21.dirname(filename), parentIdentity); + await assertDirectoryIdentity5(path24.dirname(filename), parentIdentity); } const metadata = await handle.stat(); if (!metadata.isFile()) { @@ -44153,7 +44724,7 @@ async function readRegularFile(filename, parentIdentity) { throw new RuntimeError(`archive entry changed while being read: ${redact(filename)}`); } if (parentIdentity !== void 0) { - await assertDirectoryIdentity5(path21.dirname(filename), parentIdentity); + await assertDirectoryIdentity5(path24.dirname(filename), parentIdentity); } return contents.subarray(0, offset).toString("utf8"); } finally { @@ -44161,7 +44732,7 @@ async function readRegularFile(filename, parentIdentity) { } } async function directoryBytes(directory, expectedIdentity) { - const metadata = await lstat12(directory); + const metadata = await lstat14(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError("archive size accounting requires a plain directory"); } @@ -44174,16 +44745,16 @@ async function directoryBytes(directory, expectedIdentity) { try { entries = await opendir(directory); } catch (error51) { - if (isMissing3(error51)) return 0; + if (isMissing(error51)) return 0; throw error51; } try { await assertDirectoryIdentity5(directory, identity); for await (const entry of entries) { await assertDirectoryIdentity5(directory, identity); - const entryPath = path21.join(directory, entry.name); + const entryPath = path24.join(directory, entry.name); try { - const entryMetadata = await lstat12(entryPath); + const entryMetadata = await lstat14(entryPath); if (entryMetadata.isSymbolicLink()) { throw new RuntimeError("archive size accounting encountered a symbolic link"); } @@ -44191,13 +44762,13 @@ async function directoryBytes(directory, expectedIdentity) { else if (entryMetadata.isFile()) total += entryMetadata.size; await assertDirectoryIdentity5(directory, identity); } catch (error51) { - if (!isMissing3(error51)) throw error51; + if (!isMissing(error51)) throw error51; } } await assertDirectoryIdentity5(directory, identity); } finally { await entries.close().catch((error51) => { - if (errorCode9(error51) !== "ERR_DIR_CLOSED") throw error51; + if (errorCode(error51) !== "ERR_DIR_CLOSED") throw error51; }); } return total; @@ -44266,7 +44837,7 @@ function preserveNullableIdentity2(value, label) { function preserveCandidatePath(value) { const candidatePath = preserveIdentity2(value, "candidate path"); const segments = candidatePath.split("/"); - if (candidatePath === "" || candidatePath.includes("\\") || candidatePath.includes("\0") || path21.posix.isAbsolute(candidatePath) || path21.win32.isAbsolute(candidatePath) || /^[A-Za-z]:/.test(candidatePath) || segments.some((segment) => segment === "" || segment === "." || segment === "..")) { + if (candidatePath === "" || candidatePath.includes("\\") || candidatePath.includes("\0") || path24.posix.isAbsolute(candidatePath) || path24.win32.isAbsolute(candidatePath) || /^[A-Za-z]:/.test(candidatePath) || segments.some((segment) => segment === "" || segment === "." || segment === "..")) { throw new RuntimeError("candidate path must be a normalized relative Git path"); } return candidatePath; @@ -44562,14 +45133,14 @@ var POST_PIPELINE_AUTOPILOT = { function pipelineArtifact(name) { validateComponent(name, "log name"); return { - relativePath: path21.posix.join("pipeline", `${name}.json`), + relativePath: path24.posix.join("pipeline", `${name}.json`), parse: (value) => value, write: { mode: "immutable", prepare: (value) => redactRecord(value) } }; } function logReference(name) { validateComponent(name, "log name"); - return path21.posix.join("logs", `${name}.log`); + return path24.posix.join("logs", `${name}.log`); } var ArtifactStore = class _ArtifactStore { runDirectory; @@ -44578,13 +45149,13 @@ var ArtifactStore = class _ArtifactStore { constructor(runId) { validateComponent(runId, "run id"); this.runId = runId; - this.runsRoot = path21.join(resolveStateDir(), "runs"); - this.runDirectory = path21.join(this.runsRoot, runId); + this.runsRoot = path24.join(resolveStateDir(), "runs"); + this.runDirectory = path24.join(this.runsRoot, runId); } async ensureRunsRoot() { - await ensurePlainDirectoryTree(path21.dirname(this.runsRoot)); + await ensurePlainDirectoryTree(path24.dirname(this.runsRoot)); await ensurePlainDirectory(this.runsRoot); - return realpath9(this.runsRoot); + return realpath10(this.runsRoot); } async ensureRunDirectory(create) { const canonicalRunsRoot = await this.ensureRunsRoot(); @@ -44592,37 +45163,37 @@ var ArtifactStore = class _ArtifactStore { await ensurePlainDirectory(this.runDirectory); } else { try { - const metadata = await lstat12(this.runDirectory); + const metadata = await lstat14(this.runDirectory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(this.runDirectory)}`); } } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing(error51)) return null; throw error51; } } - const canonicalRunDirectory = await realpath9(this.runDirectory); + const canonicalRunDirectory = await realpath10(this.runDirectory); if (!isWithin(canonicalRunsRoot, canonicalRunDirectory)) { throw new RuntimeError("archive directory escapes plugin data"); } return canonicalRunDirectory; } async ensureArchiveDirectory(relativePath) { - if (path21.isAbsolute(relativePath)) throw new RuntimeError("archive path must be relative"); - const normalized = path21.normalize(relativePath); - if (normalized === ".." || normalized.startsWith(`..${path21.sep}`)) { + if (path24.isAbsolute(relativePath)) throw new RuntimeError("archive path must be relative"); + const normalized = path24.normalize(relativePath); + if (normalized === ".." || normalized.startsWith(`..${path24.sep}`)) { throw new RuntimeError("archive path escapes run directory"); } const canonicalRunDirectory = await this.ensureRunDirectory(true); if (canonicalRunDirectory === null) throw new RuntimeError("failed to create archive directory"); - const relativeDirectory = path21.dirname(normalized); + const relativeDirectory = path24.dirname(normalized); if (relativeDirectory === ".") return canonicalRunDirectory; let current = canonicalRunDirectory; - for (const component of relativeDirectory.split(path21.sep)) { + for (const component of relativeDirectory.split(path24.sep)) { validateComponent(component, "log name"); - current = path21.join(current, component); + current = path24.join(current, component); await ensurePlainDirectory(current); - const canonicalCurrent = await realpath9(current); + const canonicalCurrent = await realpath10(current); if (!isWithin(canonicalRunDirectory, canonicalCurrent)) { throw new RuntimeError("archive directory escapes run directory"); } @@ -44634,7 +45205,7 @@ var ArtifactStore = class _ArtifactStore { const directory = await this.ensureArchiveDirectory(relativePath); const session = await openDurableDirectorySession(directory); try { - await platformSafety.writeAtomic(session, path21.basename(relativePath), text, "immutable"); + await platformSafety.writeAtomic(session, path24.basename(relativePath), text, "immutable"); } finally { await session.close(); } @@ -44664,7 +45235,7 @@ var ArtifactStore = class _ArtifactStore { return; } const leaf = descriptor.relativePath; - if (path21.posix.dirname(leaf) !== "." || !isSafeComponent(leaf)) { + if (path24.posix.dirname(leaf) !== "." || !isSafeComponent(leaf)) { throw new RuntimeError("replacement archive path must be a safe relative leaf"); } const directory = await this.ensureRunDirectory(false); @@ -44707,7 +45278,7 @@ var ArtifactStore = class _ArtifactStore { * caller-supplied reference. */ async readEvidence(reference) { - if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path21.posix.isAbsolute(reference) || reference.includes("\\") || /[\0\r\n]/u.test(reference)) { + if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path24.posix.isAbsolute(reference) || reference.includes("\\") || /[\0\r\n]/u.test(reference)) { throw new RuntimeError("invalid archived evidence reference"); } const components = reference.split("/"); @@ -44721,12 +45292,12 @@ var ArtifactStore = class _ArtifactStore { try { for (const component of components.slice(0, -1)) { await assertDirectoryIdentity5(directory.path, directory.identity); - const child = path21.join(directory.path, component); - const metadata = await lstat12(child); + const child = path24.join(directory.path, component); + const metadata = await lstat14(child); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError("archived evidence directory is not a plain directory"); } - const canonical = await realpath9(child); + const canonical = await realpath10(child); if (!isWithin(run.path, canonical)) { throw new RuntimeError("archived evidence reference escapes run directory"); } @@ -44737,13 +45308,13 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(directory.path, directory.identity); } const content = await readRegularFile( - path21.join(directory.path, components.at(-1)), + path24.join(directory.path, components.at(-1)), directory.identity ); await assertDirectoryIdentity5(run.path, run.identity); return content; } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing(error51)) return null; throw error51; } } @@ -44761,12 +45332,12 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived evidence nesting exceeds the supported limit"); } await assertDirectoryIdentity5(directory.path, directory.identity); - const names = (await readdir7(directory.path)).sort(); + const names = (await readdir8(directory.path)).sort(); for (const name of names) { if (STORE_TEMPORARY_RESIDUE.test(name)) continue; validateComponent(name, "log name"); - const child = path21.join(directory.path, name); - const metadata = await lstat12(child); + const child = path24.join(directory.path, name); + const metadata = await lstat14(child); if (metadata.isSymbolicLink()) { throw new RuntimeError("archived evidence must not contain symbolic links"); } @@ -44775,7 +45346,7 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived evidence reference is too long"); } if (metadata.isDirectory()) { - const canonical = await realpath9(child); + const canonical = await realpath10(child); if (!isWithin(run.path, canonical)) { throw new RuntimeError("archived evidence directory escapes run directory"); } @@ -44830,11 +45401,11 @@ var ArtifactStore = class _ArtifactStore { async ensureExistingRunDirectory(directory) { const canonicalRunsRoot = await this.ensureRunsRoot(); try { - const metadata = await lstat12(directory); + const metadata = await lstat14(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) { throw new RuntimeError(`archive directory must not be a symbolic link: ${redact(directory)}`); } - const canonicalDirectory = await realpath9(directory); + const canonicalDirectory = await realpath10(directory); if (!isWithin(canonicalRunsRoot, canonicalDirectory)) { throw new RuntimeError("archive directory escapes plugin data"); } @@ -44842,7 +45413,7 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(directory, identity); return { path: canonicalDirectory, identity }; } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing(error51)) return null; throw error51; } } @@ -44885,12 +45456,12 @@ var ArtifactStore = class _ArtifactStore { this.readAdvisorReport() ]); if (pipelineResult === null || reviewSnapshot === null || advisorReport === null) return null; - return evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + return evaluateAutopilotEligibility({ pipelineResult, reviewSnapshot, advisor: advisorReport, evaluatedAt: record2.evaluatedAt - })); + }); } /** * The archived eligibility record, re-derived from the archived evidence it @@ -44924,12 +45495,12 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("advisor report cannot be safely persisted after redaction"); } const record2 = validateAutopilotEligibilityRecord(structuredClone(args.eligibility), this.runId); - const expected = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const expected = evaluateAutopilotEligibility({ pipelineResult: archivedPipelineResult, reviewSnapshot: archivedReviewSnapshot, advisor: sanitizedReport, evaluatedAt: record2.evaluatedAt - })); + }); if (canonicalArtifactHash(expected) !== canonicalArtifactHash(record2)) { throw new RuntimeError("post-pipeline eligibility was not derived from the supplied frozen evidence"); } @@ -45024,18 +45595,18 @@ var ArtifactStore = class _ArtifactStore { async clearPipelineActiveMarker() { const directory = await this.ensureRunDirectory(false); if (directory === null) return; - await rm7(path21.join(directory, PIPELINE_ACTIVE_MARKER.relativePath), { force: true }); + await rm9(path24.join(directory, PIPELINE_ACTIVE_MARKER.relativePath), { force: true }); } async list() { await this.ensureRunsRoot(); - const entries = await readdir7(this.runsRoot, { withFileTypes: true }); + const entries = await readdir8(this.runsRoot, { withFileTypes: true }); return entries.filter((entry) => entry.isDirectory() && isSafeComponent(entry.name)).map((entry) => entry.name).sort(); } async entries() { const entries = await Promise.all((await this.list()).map(async (runId) => { - const directory = path21.join(this.runsRoot, runId); + const directory = path24.join(this.runsRoot, runId); try { - const metadata = await lstat12(directory); + const metadata = await lstat14(directory); if (metadata.isSymbolicLink() || !metadata.isDirectory()) return null; return { runId, @@ -45045,7 +45616,7 @@ var ArtifactStore = class _ArtifactStore { identity: { dev: metadata.dev, ino: metadata.ino } }; } catch (error51) { - if (isMissing3(error51)) return null; + if (isMissing(error51)) return null; throw error51; } })); @@ -45073,7 +45644,7 @@ var ArtifactStore = class _ArtifactStore { throw new RuntimeError("archived candidate does not match its run manifest"); } const repositoryTopLevel = await git(canonicalRepoRoot, ["rev-parse", "--show-toplevel"]); - if (repositoryTopLevel.exitCode !== 0 || await realpath9(gitPathOutput( + if (repositoryTopLevel.exitCode !== 0 || await realpath10(gitPathOutput( repositoryTopLevel.stdout, "candidate repository root" )) !== canonicalRepoRoot) { @@ -45195,10 +45766,10 @@ var ArtifactStore = class _ArtifactStore { try { await this.ensureRunsRoot(); const runsRootIdentity = await ensurePlainDirectory(this.runsRoot); - const filename = path21.join(this.runsRoot, CLEANUP_JOURNAL); - const handle = await open11( + const filename = path24.join(this.runsRoot, CLEANUP_JOURNAL); + const handle = await open12( filename, - constants11.O_WRONLY | constants11.O_CREAT | constants11.O_APPEND | NO_FOLLOW6, + constants12.O_WRONLY | constants12.O_CREAT | constants12.O_APPEND | NO_FOLLOW6, 384 ); try { @@ -45214,7 +45785,7 @@ var ArtifactStore = class _ArtifactStore { await handle.close(); } await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); - await syncDirectory3(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); } finally { await journalLock.release(); @@ -45244,11 +45815,11 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(entry.directory, entry.identity); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); await rename6(entry.directory, quarantinePath); - await syncDirectory3(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); await assertDirectoryIdentity5(quarantinePath, entry.identity); - await rm7(quarantinePath, { recursive: true, force: false }); - await syncDirectory3(this.runsRoot); + await rm9(quarantinePath, { recursive: true, force: false }); + await flushDirectory(this.runsRoot); await this.appendCleanupRecord({ event: "prune-cleanup-complete", runId: entry.runId, @@ -45275,13 +45846,12 @@ var ArtifactStore = class _ArtifactStore { if (attempted.has(entry.runId)) return; attempted.add(entry.runId); const quarantineName = `.prune-${entry.runId}-${randomUUID7()}`; - const quarantinePath = path21.join(this.runsRoot, quarantineName); + const quarantinePath = path24.join(this.runsRoot, quarantineName); const runStore = new _ArtifactStore(entry.runId); let prepared = null; let transaction = null; let runsRootIdentity = null; let archiveRemovalCommitted = false; - let lease = null; try { if (await runStore.readPipelineActiveMarker() !== null) { retained.push({ runId: entry.runId, reason: "active-run" }); @@ -45302,7 +45872,7 @@ var ArtifactStore = class _ArtifactStore { try { canonical = await platformServices.canonicalizePath(initialManifest.repoRoot); } catch (error51) { - if (errorCode9(error51) !== "ENOENT") throw error51; + if (errorCode(error51) !== "ENOENT") throw error51; await this.reclaimRepoAbsentArchive( entry, reason, @@ -45315,8 +45885,7 @@ var ArtifactStore = class _ArtifactStore { return; } const safety = new PlatformSafety(platformServices); - await safety.withCheckoutLease(canonical.canonical, async (acquiredLease) => { - lease = acquiredLease; + await safety.withCheckoutLease(canonical.canonical, async () => { await assertDirectoryIdentity5(entry.directory, entry.identity); const currentManifest = await runStore.readManifest(); if (currentManifest === null || serializeJson(currentManifest) !== serializeJson(initialManifest)) { @@ -45360,12 +45929,12 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(entry.directory, entry.identity); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); await rename6(entry.directory, quarantinePath); - await syncDirectory3(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, runsRootIdentity); await assertDirectoryIdentity5(quarantinePath, entry.identity); archiveRemovalCommitted = true; - await rm7(quarantinePath, { recursive: true, force: false }); - await syncDirectory3(this.runsRoot); + await rm9(quarantinePath, { recursive: true, force: false }); + await flushDirectory(this.runsRoot); await transaction.commit(); await this.appendCleanupRecord({ event: "prune-cleanup-complete", @@ -45406,7 +45975,7 @@ var ArtifactStore = class _ArtifactStore { await assertDirectoryIdentity5(this.runsRoot, expectedRunsRoot); await assertDirectoryIdentity5(quarantinePath, entry.identity); await rename6(quarantinePath, entry.directory); - await syncDirectory3(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity5(this.runsRoot, expectedRunsRoot); await assertDirectoryIdentity5(entry.directory, entry.identity); } else if (runDirectoryExists) { @@ -45490,7 +46059,10 @@ var RunDecision = class { coherenceErrors.push(`failed to read manifest: ${err instanceof Error ? err.message : String(err)}`); return null; }) : Promise.resolve(null); - const readSnapshot = typeof store.readReviewSnapshot === "function" ? store.readReviewSnapshot().catch(() => null) : Promise.resolve(null); + const readSnapshot = typeof store.readReviewSnapshot === "function" ? store.readReviewSnapshot().catch((err) => { + coherenceErrors.push(`failed to read review snapshot: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) : Promise.resolve(null); const readGateRecord = typeof store.readPipelineGateCleared === "function" ? store.readPipelineGateCleared().catch((err) => { gateRecordError = `the pipeline gate clearance record is malformed: ${err instanceof Error ? err.message : String(err)}`; return null; @@ -45532,7 +46104,12 @@ var RunDecision = class { if (manifest.candidateManifestHash !== result.candidate.manifestHash) { coherenceErrors.push("archived candidate manifest hash does not match run manifest"); } - const expectedHash = createHash10("sha256").update(JSON.stringify(result.candidate.changedPaths)).digest("hex"); + let expectedHash; + try { + expectedHash = manifestHashOf(result.candidate.changedPaths); + } catch { + expectedHash = null; + } if (result.candidate.manifestHash !== expectedHash) { coherenceErrors.push("archived candidate changed paths hash mismatch"); } @@ -45622,9 +46199,20 @@ var RunDecision = class { humanReasons.push(`decision authority is "${authority}"`); } const isPlainDelegate = snapshot.result.evidence?.plainDelegate === true && refusedEvidence === void 0 && incompleteEvidence === void 0 && snapshot.result.evidence?.pipelineGateCleared === void 0 && snapshot.gateRecord === null; + if (verificationRanUnconfined(snapshot.manifest)) { + humanReasons.push("project verification ran without OS confinement on this platform"); + } if (snapshot.gateRecordError) { humanReasons.push(snapshot.gateRecordError); } else if (isPlainDelegate) { + const touched = verificationInputPaths( + snapshot.result.candidate.changedPaths.map((change) => change.path) + ); + if (touched.length > 0) { + humanReasons.push( + `the candidate changes verification inputs: ${touched.slice(0, 10).join(", ")}` + ); + } } else if (snapshot.gateRecord === null) { humanReasons.push("the pipeline gate clearance record is missing"); } else if (snapshot.gateRecord.requiresHumanDecision === true) { @@ -45640,13 +46228,21 @@ var RunDecision = class { return verifier.verify(args); } }; +var OS_CONFINEMENT = new Set( + SANDBOX_BACKENDS.filter((backend) => backend.kind === "os").map((backend) => backend.id) +); +function verificationRanUnconfined(manifest) { + const policy = isRecord7(manifest.effectivePolicy) ? manifest.effectivePolicy.verificationPolicy : void 0; + if (!Array.isArray(policy)) return true; + return policy.some((command) => !isRecord7(command) || command.skipped !== true && !(typeof command.confinement === "string" && OS_CONFINEMENT.has(command.confinement))); +} var runDecision = new RunDecision(); async function readRunDecisionSnapshot(runId, options) { return runDecision.readSnapshot(runId, options); } // src/pipeline/role-runner.ts -import { rm as rm8 } from "node:fs/promises"; +import { rm as rm10 } from "node:fs/promises"; // src/producers/routing-policy.ts function route(preferences, reports) { @@ -45909,8 +46505,8 @@ function buildRoleSpec(role, base, pkg) { } // src/pipeline/git-writable-roots.ts -import { lstat as lstat13, mkdir as mkdir7, readFile as readFile5, realpath as realpath10 } from "node:fs/promises"; -import path22 from "node:path"; +import { lstat as lstat15, mkdir as mkdir8, readFile as readFile5, realpath as realpath11 } from "node:fs/promises"; +import path25 from "node:path"; function invalidWritableRoots(message, cause) { return new RuntimeError(message, { classification: "sandbox-violation", @@ -45918,21 +46514,21 @@ function invalidWritableRoots(message, cause) { }); } async function requirePlainFile(filename, label) { - const stats = await lstat13(filename); + const stats = await lstat15(filename); if (!stats.isFile() || stats.isSymbolicLink()) { throw invalidWritableRoots(`${label} must be a plain regular file`); } return stats; } async function requirePlainDirectory(directory, label) { - const stats = await lstat13(directory); + const stats = await lstat15(directory); if (!stats.isDirectory() || stats.isSymbolicLink()) { throw invalidWritableRoots(`${label} must be a plain directory`); } } function isContainedBy(parent, candidate) { - const relative2 = path22.relative(parent, candidate); - return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path22.sep}`) && !path22.isAbsolute(relative2); + const relative2 = path25.relative(parent, candidate); + return relative2 !== "" && relative2 !== ".." && !relative2.startsWith(`..${path25.sep}`) && !path25.isAbsolute(relative2); } function sameFileIdentity(before, after) { return before.dev === after.dev && before.ino === after.ino; @@ -45947,16 +46543,16 @@ async function readStablePlainFile(filename, label) { return value; } async function resolveLinkedWorktreeWritableRoots(worktreePath) { - const dotGit = path22.join(worktreePath, ".git"); + const dotGit = path25.join(worktreePath, ".git"); try { const pointer = await readStablePlainFile(dotGit, "linked worktree .git entry"); const match = /^gitdir: (.+)\r?\n?$/.exec(pointer); if (match === null) { throw invalidWritableRoots("linked worktree .git pointer is malformed"); } - const gitDir = await realpath10(path22.resolve(worktreePath, match[1])); + const gitDir = await realpath11(path25.resolve(worktreePath, match[1])); await requirePlainDirectory(gitDir, "linked worktree private git directory"); - const commonDirPointer = path22.join(gitDir, "commondir"); + const commonDirPointer = path25.join(gitDir, "commondir"); const commonDirValue = (await readStablePlainFile( commonDirPointer, "linked worktree commondir entry" @@ -45964,19 +46560,19 @@ async function resolveLinkedWorktreeWritableRoots(worktreePath) { if (commonDirValue === "" || commonDirValue.includes("\0")) { throw invalidWritableRoots("linked worktree commondir pointer is malformed"); } - const commonDir = await realpath10(path22.resolve(gitDir, commonDirValue)); + const commonDir = await realpath11(path25.resolve(gitDir, commonDirValue)); await requirePlainDirectory(commonDir, "common git directory"); - const worktreesDir = await realpath10(path22.join(commonDir, "worktrees")); + const worktreesDir = await realpath11(path25.join(commonDir, "worktrees")); await requirePlainDirectory(worktreesDir, "common git worktrees directory"); if (!isContainedBy(worktreesDir, gitDir)) { throw invalidWritableRoots("linked worktree private git directory escapes common git worktrees"); } - const sharedObjectsDir = await realpath10(path22.join(commonDir, "objects")); + const sharedObjectsDir = await realpath11(path25.join(commonDir, "objects")); await requirePlainDirectory(sharedObjectsDir, "common git objects directory"); - const privateObjectsPath = path22.join(gitDir, "private-objects"); - await mkdir7(privateObjectsPath, { recursive: true, mode: 448 }); + const privateObjectsPath = path25.join(gitDir, "private-objects"); + await mkdir8(privateObjectsPath, { recursive: true, mode: 448 }); await requirePlainDirectory(privateObjectsPath, "private git objects directory"); - const privateObjectsDir = await realpath10(privateObjectsPath); + const privateObjectsDir = await realpath11(privateObjectsPath); if (!isContainedBy(gitDir, privateObjectsDir)) { throw invalidWritableRoots("private git objects directory escapes linked worktree git directory"); } @@ -46031,7 +46627,7 @@ async function cleanupProcessAttempt(tempHome, builtEnvironment) { } if (tempHome !== null) { try { - await rm8(tempHome, { recursive: true, force: true }); + await rm10(tempHome, { recursive: true, force: true }); } catch (error51) { failures.push(error51); } @@ -46213,13 +46809,13 @@ async function parseStructuredReport(raw, validate, repair) { // src/autopilot/branch-manager.ts import { createHash as createHash11, randomUUID as randomUUID8 } from "node:crypto"; -import { constants as constants12 } from "node:fs"; -import { chmod, link as link6, lstat as lstat15, mkdir as mkdir8, mkdtemp as mkdtemp2, open as open12, realpath as realpath12, rm as rm9 } from "node:fs/promises"; -import path24 from "node:path"; +import { constants as constants13 } from "node:fs"; +import { chmod, link as link5, lstat as lstat17, mkdir as mkdir9, mkdtemp as mkdtemp4, open as open13, realpath as realpath13, rm as rm11 } from "node:fs/promises"; +import path27 from "node:path"; // src/git/repo-preconditions.ts -import { access as access5, lstat as lstat14, opendir as opendir2, readlink, realpath as realpath11 } from "node:fs/promises"; -import path23 from "node:path"; +import { access as access5, lstat as lstat16, opendir as opendir2, readlink, realpath as realpath12 } from "node:fs/promises"; +import path26 from "node:path"; var MAX_DETAIL_ENTRIES = 20; function boundedDetail(lines) { if (lines.length <= MAX_DETAIL_ENTRIES) return lines; @@ -46235,9 +46831,6 @@ var IN_PROGRESS_PATHS = [ "BISECT_LOG" ]; var MAX_NESTED_REPOSITORY_SCAN_ENTRIES = 1e4; -function succeeded(result) { - return result.exitCode === 0; -} async function exists2(filePath) { try { await access5(filePath); @@ -46255,10 +46848,10 @@ async function checkInProgressOperation(checkoutPath, runGit = git) { "--path-format=absolute", "--git-dir" ]); - if (!succeeded(gitDirectoryResult)) return "scan-failed"; + if (!gitSucceeded(gitDirectoryResult)) return "scan-failed"; try { const gitDirectory = gitPathOutput(gitDirectoryResult.stdout, "Git directory"); - return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path23.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; + return (await Promise.all(IN_PROGRESS_PATHS.map((relative2) => exists2(path26.join(gitDirectory, relative2))))).some(Boolean) ? "in-progress" : "clear"; } catch { return "scan-failed"; } @@ -46290,7 +46883,7 @@ function indexPathsWithMode(output, mode) { for (const record2 of output.split("\0")) { if (!record2.startsWith(`${mode} `)) continue; const separator = record2.indexOf(" "); - if (separator !== -1) paths.add(record2.slice(separator + 1).split(path23.sep).join("/")); + if (separator !== -1) paths.add(record2.slice(separator + 1).split(path26.sep).join("/")); } return paths; } @@ -46298,8 +46891,8 @@ function pathIsWithin(root, candidate) { if (getPlatformServices().os === "win32") { return canonicalizeForScope(candidate, root); } - const relative2 = path23.relative(root, candidate); - return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path23.sep}`) && !path23.isAbsolute(relative2); + const relative2 = path26.relative(root, candidate); + return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path26.sep}`) && !path26.isAbsolute(relative2); } function pathsIdentifySameLocation(left, right) { if (getPlatformServices().os === "win32") { @@ -46319,21 +46912,21 @@ async function isSafeTrackedFileSymlink(repositoryRoot, symlinkPath, relativePat if (hasCode(error51, ["ENOENT", "ENOTDIR", "ELOOP"])) return false; throw error51; } - if (path23.isAbsolute(linkTarget)) return false; - const lexicalTarget = path23.resolve(path23.dirname(symlinkPath), linkTarget); + if (path26.isAbsolute(linkTarget)) return false; + const lexicalTarget = path26.resolve(path26.dirname(symlinkPath), linkTarget); if (!pathIsWithin(repositoryRoot, lexicalTarget)) return false; - if (pathIsWithin(path23.join(repositoryRoot, ".git"), lexicalTarget)) return false; + if (pathIsWithin(path26.join(repositoryRoot, ".git"), lexicalTarget)) return false; let target; try { - target = await realpath11(symlinkPath); + target = await realpath12(symlinkPath); } catch (error51) { if (hasCode(error51, ["ENOENT", "ENOTDIR", "ELOOP"])) return false; throw error51; } if (!pathsIdentifySameLocation(lexicalTarget, target)) return false; if (!pathIsWithin(repositoryRoot, target)) return false; - if (pathIsWithin(path23.join(repositoryRoot, ".git"), target)) return false; - return (await lstat14(target)).isFile(); + if (pathIsWithin(path26.join(repositoryRoot, ".git"), target)) return false; + return (await lstat16(target)).isFile(); } async function findNestedRepositories(repositoryRoot, registeredSubmodules, trackedSymlinks, writeAllowlist) { const nested = [...registeredSubmodules].filter((submodulePath) => writeAllowlist.some((pattern) => patternOverlapsRepository(pattern, submodulePath))); @@ -46343,7 +46936,7 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac const directory = pendingDirectories.pop(); if (directory.relativePath !== "") { try { - await lstat14(path23.join(directory.path, ".git")); + await lstat16(path26.join(directory.path, ".git")); nested.push(directory.relativePath); continue; } catch (error51) { @@ -46358,8 +46951,8 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac throw new Error("nested repository scan entry budget exceeded"); } if (entry.name === ".git") continue; - const child = path23.join(directory.path, entry.name); - const relativeChild = path23.relative(repositoryRoot, child).split(path23.sep).join("/"); + const child = path26.join(directory.path, entry.name); + const relativeChild = path26.relative(repositoryRoot, child).split(path26.sep).join("/"); if (registeredSubmodules.has(relativeChild)) continue; if (!writeAllowlist.some((pattern) => patternOverlapsRepository(pattern, relativeChild))) continue; if (entry.isSymbolicLink()) { @@ -46385,10 +46978,10 @@ async function findNestedRepositories(repositoryRoot, registeredSubmodules, trac async function checkPreconditions(repoRoot, options = {}) { const { canonical } = await getPlatformServices().canonicalizePath(repoRoot); const bare = await git(canonical, ["rev-parse", "--is-bare-repository"]); - if (!succeeded(bare)) return { ok: false, reason: "not-a-repository" }; + if (!gitSucceeded(bare)) return { ok: false, reason: "not-a-repository" }; if (bare.stdout.trim() === "true") return { ok: false, reason: "bare-repository" }; const head = await git(canonical, ["rev-parse", "--verify", "HEAD"]); - if (!succeeded(head)) return { ok: false, reason: "unborn-repository" }; + if (!gitSucceeded(head)) return { ok: false, reason: "unborn-repository" }; const baseCommitOid = head.stdout.trim(); const inProgress = await checkInProgressOperation(canonical); if (inProgress === "in-progress") return { ok: false, reason: "in-progress-operation" }; @@ -46396,7 +46989,7 @@ async function checkPreconditions(repoRoot, options = {}) { return { ok: false, reason: "in-progress-operation-scan-failed" }; } const submodules = await git(canonical, ["submodule", "status", "--recursive"]); - if (!succeeded(submodules)) return { ok: false, reason: "git-command-failed" }; + if (!gitSucceeded(submodules)) return { ok: false, reason: "git-command-failed" }; if (/^[+-]/m.test(submodules.stdout)) { return { ok: false, @@ -46410,7 +47003,7 @@ async function checkPreconditions(repoRoot, options = {}) { "--untracked-files=all", "--ignore-submodules=none" ]); - if (!succeeded(status)) return { ok: false, reason: "git-command-failed" }; + if (!gitSucceeded(status)) return { ok: false, reason: "git-command-failed" }; if (status.stdout.length > 0) { return { ok: false, @@ -46424,11 +47017,11 @@ async function checkPreconditions(repoRoot, options = {}) { } if (sparseCheckout.stdout.trim() === "true") return { ok: false, reason: "sparse-checkout" }; const indexEntries = await git(canonical, ["ls-files", "-v"]); - if (!succeeded(indexEntries)) return { ok: false, reason: "git-command-failed" }; + if (!gitSucceeded(indexEntries)) return { ok: false, reason: "git-command-failed" }; if (/^[Ssh] /m.test(indexEntries.stdout)) return { ok: false, reason: "skip-worktree-entries" }; if (options.writeAllowlist !== void 0 && options.writeAllowlist.length > 0) { const stagedEntries = await git(canonical, ["ls-files", "--stage", "-z"]); - if (!succeeded(stagedEntries)) return { ok: false, reason: "git-command-failed" }; + if (!gitSucceeded(stagedEntries)) return { ok: false, reason: "git-command-failed" }; const registeredSubmodules = indexPathsWithMode(stagedEntries.stdout, "160000"); const trackedSymlinks = indexPathsWithMode(stagedEntries.stdout, "120000"); let nestedRepositories; @@ -46452,8 +47045,8 @@ async function checkPreconditions(repoRoot, options = {}) { "--path-format=absolute", "--git-common-dir" ]); - if (!succeeded(commonDirectoryResult)) return { ok: false, reason: "git-command-failed" }; - const gitCommonDir3 = await realpath11(gitPathOutput( + if (!gitSucceeded(commonDirectoryResult)) return { ok: false, reason: "git-command-failed" }; + const gitCommonDir3 = await realpath12(gitPathOutput( commonDirectoryResult.stdout, "Git common directory" )); @@ -46474,9 +47067,6 @@ var WorkflowBranchError = class extends RuntimeError { } classification; }; -function succeeded2(result) { - return result.exitCode === 0 && result.truncated?.stdout !== true && result.truncated?.stderr !== true; -} function transportFailure(action) { return { exitCode: 2, stdout: "", stderr: `${action} failed in isolated transport` }; } @@ -46504,14 +47094,14 @@ function createIsolatedRemoteTransport(runGit = git) { }); }; const createRepository = async () => { - const root = path24.join(resolveStateDir(), "autopilot-remote"); - await mkdir8(root, { recursive: true, mode: 448 }); + const root = path27.join(resolveStateDir(), "autopilot-remote"); + await mkdir9(root, { recursive: true, mode: 448 }); await chmod(root, 448); - const repository = await mkdtemp2(path24.join(root, "operation-")); + const repository = await mkdtemp4(path27.join(root, "operation-")); await chmod(repository, 448); const initialized = await runIsolatedGit(repository, ["init", "--bare", "--quiet", "."]); - if (!succeeded2(initialized)) { - await rm9(repository, { recursive: true, force: true }); + if (!gitSucceeded(initialized)) { + await rm11(repository, { recursive: true, force: true }); throw new RuntimeError("isolated remote repository initialization failed"); } return repository; @@ -46528,7 +47118,7 @@ function createIsolatedRemoteTransport(runGit = git) { } if (repository !== void 0) { try { - await rm9(repository, { recursive: true }); + await rm11(repository, { recursive: true }); } catch { return transportFailure("isolated remote repository cleanup"); } @@ -46549,24 +47139,24 @@ function createIsolatedRemoteTransport(runGit = git) { canonicalUrl, `${sourceRef}:${quarantineRef}` ]); - if (succeeded2(result)) { + if (gitSucceeded(result)) { const resolved = await runIsolatedGit(repository, ["rev-parse", "--verify", quarantineRef]); - if (!succeeded2(resolved) || !isOid(resolved.stdout.trim())) { - result = succeeded2(resolved) ? transportFailure("git resolve fetched base") : resolved; + if (!gitSucceeded(resolved) || !isOid(resolved.stdout.trim())) { + result = gitSucceeded(resolved) ? transportFailure("git resolve fetched base") : resolved; } else { fetchedOid = resolved.stdout.trim(); - const bundlePath = path24.join(repository, "base.bundle"); + const bundlePath = path27.join(repository, "base.bundle"); const bundled = await runIsolatedGit( repository, ["bundle", "create", bundlePath, quarantineRef] ); - if (!succeeded2(bundled)) { + if (!gitSucceeded(bundled)) { result = bundled; fetchedOid = void 0; } else { const imported = await runIsolatedGit(cwd, ["bundle", "unbundle", bundlePath]); result = imported; - if (!succeeded2(imported)) fetchedOid = void 0; + if (!gitSucceeded(imported)) fetchedOid = void 0; } } } @@ -46575,14 +47165,14 @@ function createIsolatedRemoteTransport(runGit = git) { } finally { if (repository !== void 0) { try { - await rm9(repository, { recursive: true }); + await rm11(repository, { recursive: true }); } catch { result = transportFailure("isolated remote repository cleanup"); fetchedOid = void 0; } } } - if (!succeeded2(result) || fetchedOid === void 0) return result; + if (!gitSucceeded(result) || fetchedOid === void 0) return result; return runIsolatedGit(cwd, [ "update-ref", destinationRef, @@ -46624,10 +47214,10 @@ function canonicalGithubUrl(raw) { fail("remote-url-invalid"); } const canonicalOwner = owner.toLowerCase(); - const canonicalRepository2 = repository.toLowerCase(); + const canonicalRepository = repository.toLowerCase(); return { - url: `https://github.com/${canonicalOwner}/${canonicalRepository2}.git`, - ownerRepo: `${canonicalOwner}/${canonicalRepository2}` + url: `https://github.com/${canonicalOwner}/${canonicalRepository}.git`, + ownerRepo: `${canonicalOwner}/${canonicalRepository}` }; } function parseRemoteHeads(output) { @@ -46657,7 +47247,7 @@ async function parseWorktreeRegistrations(output, allowMissing = false) { const separator = field.indexOf(" "); const key = separator === -1 ? field : field.slice(0, separator); const value = separator === -1 ? "" : field.slice(separator + 1); - if (key === "worktree") registration.worktree = path24.resolve(value); + if (key === "worktree") registration.worktree = path27.resolve(value); else if (key === "HEAD") registration.head = value; else if (key === "branch") registration.branch = value; } @@ -46700,7 +47290,7 @@ function parseRegistration2(value, workflowId) { "remoteUrl", "ownerRepo", "bootstrapOwner" - ]) || parsed.ownershipVersion !== OWNERSHIP_VERSION || parsed.workflowId !== workflowId || typeof parsed.checkoutPath !== "string" || !path24.isAbsolute(parsed.checkoutPath) || path24.resolve(parsed.checkoutPath) !== parsed.checkoutPath || typeof parsed.gitCommonDir !== "string" || !path24.isAbsolute(parsed.gitCommonDir) || path24.resolve(parsed.gitCommonDir) !== parsed.gitCommonDir || typeof parsed.repositoryIdentity !== "string" || parsed.repositoryIdentity !== parsed.gitCommonDir || typeof parsed.worktreePath !== "string" || !path24.isAbsolute(parsed.worktreePath) || path24.resolve(parsed.worktreePath) !== parsed.worktreePath || typeof parsed.worktreeGitDir !== "string" || !path24.isAbsolute(parsed.worktreeGitDir) || path24.resolve(parsed.worktreeGitDir) !== parsed.worktreeGitDir || typeof parsed.branch !== "string" || parsed.branchRef !== `refs/heads/${parsed.branch}` || parsed.baseRef !== `refs/claude-architect/autopilot/${workflowId}/base` || typeof parsed.baseBranch !== "string" || !isOid(parsed.baseCommitOid ?? "") || parsed.remote !== "origin" || typeof parsed.remoteUrl !== "string" || typeof parsed.ownerRepo !== "string" || !isBootstrapOwnerRecord(parsed.bootstrapOwner, workflowId)) return null; + ]) || parsed.ownershipVersion !== OWNERSHIP_VERSION || parsed.workflowId !== workflowId || typeof parsed.checkoutPath !== "string" || !path27.isAbsolute(parsed.checkoutPath) || path27.resolve(parsed.checkoutPath) !== parsed.checkoutPath || typeof parsed.gitCommonDir !== "string" || !path27.isAbsolute(parsed.gitCommonDir) || path27.resolve(parsed.gitCommonDir) !== parsed.gitCommonDir || typeof parsed.repositoryIdentity !== "string" || parsed.repositoryIdentity !== parsed.gitCommonDir || typeof parsed.worktreePath !== "string" || !path27.isAbsolute(parsed.worktreePath) || path27.resolve(parsed.worktreePath) !== parsed.worktreePath || typeof parsed.worktreeGitDir !== "string" || !path27.isAbsolute(parsed.worktreeGitDir) || path27.resolve(parsed.worktreeGitDir) !== parsed.worktreeGitDir || typeof parsed.branch !== "string" || parsed.branchRef !== `refs/heads/${parsed.branch}` || parsed.baseRef !== `refs/claude-architect/autopilot/${workflowId}/base` || typeof parsed.baseBranch !== "string" || !isOid(parsed.baseCommitOid ?? "") || parsed.remote !== "origin" || typeof parsed.remoteUrl !== "string" || typeof parsed.ownerRepo !== "string" || !isBootstrapOwnerRecord(parsed.bootstrapOwner, workflowId)) return null; return parsed; } async function readRegistrationFile(ownershipPath, expectedWorkflowId) { @@ -46729,22 +47319,22 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { throw new RuntimeError("workflow ownership record is malformed"); } const ownershipHash = createHash11("sha256").update(registration.workflowId).digest("hex"); - const expectedOwnershipPath = path24.join( + const expectedOwnershipPath = path27.join( resolveStateDir(), "autopilot-branches", `${ownershipHash}.json` ); - if (path24.resolve(ownershipPath) !== path24.resolve(expectedOwnershipPath)) { + if (path27.resolve(ownershipPath) !== path27.resolve(expectedOwnershipPath)) { throw new RuntimeError("workflow ownership filename does not match its workflow id"); } const [canonicalOwnershipPath, canonicalExpectedOwnershipPath, canonicalWorktreePath] = await Promise.all([ - realpath12(ownershipPath), - realpath12(expectedOwnershipPath), - realpath12(worktreePath) + realpath13(ownershipPath), + realpath13(expectedOwnershipPath), + realpath13(worktreePath) ]); let canonicalRegisteredWorktreePath; try { - canonicalRegisteredWorktreePath = await realpath12(registration.worktreePath); + canonicalRegisteredWorktreePath = await realpath13(registration.worktreePath); } catch (error51) { throw new RuntimeError("workflow ownership worktree path is unavailable", { cause: error51 }); } @@ -46753,10 +47343,10 @@ async function workflowWorktreeOwnershipClaim(ownershipPath, worktreePath) { throw new RuntimeError("workflow ownership record changed during validation"); } const managedName = `workflow-${ownershipHash.slice(0, 32)}`; - const candidateName = path24.basename(canonicalWorktreePath); + const candidateName = path27.basename(canonicalWorktreePath); const ownsPrimary = candidateName === managedName && canonicalRegisteredWorktreePath === canonicalWorktreePath; const legacyFinalName = `final-${createHash11("sha256").update(JSON.stringify(registration.workflowId)).digest("hex").slice(0, 24)}`; - const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path24.basename(canonicalRegisteredWorktreePath) === managedName && path24.dirname(canonicalRegisteredWorktreePath) === path24.dirname(canonicalWorktreePath); + const ownsFinalMaterialization = (candidateName === `${managedName}-final` || candidateName === legacyFinalName) && path27.basename(canonicalRegisteredWorktreePath) === managedName && path27.dirname(canonicalRegisteredWorktreePath) === path27.dirname(canonicalWorktreePath); if (canonicalOwnershipPath !== canonicalExpectedOwnershipPath || !ownsPrimary && !ownsFinalMaterialization) { throw new RuntimeError("workflow ownership record names a different worktree"); } @@ -46782,7 +47372,7 @@ var WorkflowBranchManager = class { constructor(dependencies = {}) { this.runGit = dependencies.git ?? git; this.remoteTransport = dependencies.remoteTransport ?? createIsolatedRemoteTransport(this.runGit); - this.removeOwnership = dependencies.removeOwnership ?? ((ownershipPath) => rm9(ownershipPath)); + this.removeOwnership = dependencies.removeOwnership ?? ((ownershipPath) => rm11(ownershipPath)); const platformServices = dependencies.platformServices ?? getPlatformServices(); this.platformServices = platformServices; this.getProcessStartToken = platformServices.getProcessStartToken?.bind(platformServices) ?? getPlatformServices().getProcessStartToken.bind(getPlatformServices()); @@ -46793,7 +47383,7 @@ var WorkflowBranchManager = class { } ownershipPath(workflowId) { const name = createHash11("sha256").update(workflowId).digest("hex"); - return path24.join(resolveStateDir(), "autopilot-branches", `${name}.json`); + return path27.join(resolveStateDir(), "autopilot-branches", `${name}.json`); } async readRegistration(workflowId) { try { @@ -46823,7 +47413,7 @@ var WorkflowBranchManager = class { } async ownershipExists(workflowId) { try { - await lstat15(this.ownershipPath(workflowId)); + await lstat17(this.ownershipPath(workflowId)); return true; } catch (error51) { if (typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT") { @@ -46834,17 +47424,17 @@ var WorkflowBranchManager = class { } async persistOwnership(identity, bootstrapOwner) { const ownershipPath = this.ownershipPath(identity.workflowId); - const directory = path24.dirname(ownershipPath); - await mkdir8(directory, { recursive: true }); - const temporaryPath = path24.join(directory, `.${path24.basename(ownershipPath)}.${randomUUID8()}.tmp`); + const directory = path27.dirname(ownershipPath); + await mkdir9(directory, { recursive: true }); + const temporaryPath = path27.join(directory, `.${path27.basename(ownershipPath)}.${randomUUID8()}.tmp`); const bytes = Buffer.from(`${JSON.stringify({ ...identity, bootstrapOwner })} `); let temporaryExists = false; let ownershipLinked = false; try { - const handle = await open12( + const handle = await open13( temporaryPath, - constants12.O_WRONLY | constants12.O_CREAT | constants12.O_EXCL | (constants12.O_NOFOLLOW ?? 0), + constants13.O_WRONLY | constants13.O_CREAT | constants13.O_EXCL | (constants13.O_NOFOLLOW ?? 0), 384 ); temporaryExists = true; @@ -46855,7 +47445,7 @@ var WorkflowBranchManager = class { await handle.close(); } try { - await link6(temporaryPath, ownershipPath); + await link5(temporaryPath, ownershipPath); ownershipLinked = true; } catch (error51) { if (typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "EEXIST") { @@ -46863,13 +47453,13 @@ var WorkflowBranchManager = class { } throw error51; } - await rm9(temporaryPath); + await rm11(temporaryPath); temporaryExists = false; await syncDirectoryMetadata(directory); ownershipLinked = false; } finally { - if (temporaryExists) await rm9(temporaryPath, { force: true }); - if (ownershipLinked) await rm9(ownershipPath, { force: true }); + if (temporaryExists) await rm11(temporaryPath, { force: true }); + if (ownershipLinked) await rm11(ownershipPath, { force: true }); } } async resolveRemote(checkoutPath) { @@ -46895,7 +47485,7 @@ var WorkflowBranchManager = class { "--get-all", "remote.origin.url" ]); - if (!succeeded2(urls)) operationFailure("git config remote URL", urls); + if (!gitSucceeded(urls)) operationFailure("git config remote URL", urls); const values = urls.stdout.split("\n").filter((value) => value !== ""); if (values.length !== 1) fail("remote-url-ambiguous"); return canonicalGithubUrl(values[0]); @@ -46917,7 +47507,6 @@ var WorkflowBranchManager = class { let fetchedOidForCleanup; let completedIdentity; let operationError; - const workflowHash = createHash11("sha256").update(request.workflowId).digest("hex"); const remoteIdentity = await this.resolveRemote(initial.canonical); const safety = new PlatformSafety(this.platformServices); try { @@ -46935,13 +47524,13 @@ var WorkflowBranchManager = class { "--branch", branch ]); - if (!succeeded2(checkedBranch)) fail("branch-name-invalid"); + if (!gitSucceeded(checkedBranch)) fail("branch-name-invalid"); for (const candidate of [baseRef, fetchedRef]) { const checked2 = await this.runGit(initial.canonical, ["check-ref-format", candidate]); - if (!succeeded2(checked2)) fail("branch-name-invalid"); + if (!gitSucceeded(checked2)) fail("branch-name-invalid"); } const localHeads = await this.runGit(initial.canonical, ["for-each-ref", "--format=%(refname)", "refs/heads/"]); - if (!succeeded2(localHeads)) operationFailure("git branch scan", localHeads); + if (!gitSucceeded(localHeads)) operationFailure("git branch scan", localHeads); const localCollision = localHeads.stdout.split("\n").filter(Boolean).some((ref) => ref.toLowerCase() === branchRef.toLowerCase()); if (localCollision) fail("local-branch-exists"); for (const privateRef of [baseRef, fetchedRef]) { @@ -46950,7 +47539,7 @@ var WorkflowBranchManager = class { if (exists3.exitCode !== 1) operationFailure("git private ref scan", exists3); } const advertised = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); - if (!succeeded2(advertised)) operationFailure("git remote branch scan", advertised); + if (!gitSucceeded(advertised)) operationFailure("git remote branch scan", advertised); const remoteHeads = parseRemoteHeads(advertised.stdout); if ([...remoteHeads.keys()].some((name) => name.toLowerCase() === branch.toLowerCase())) { fail("remote-branch-exists"); @@ -46963,18 +47552,18 @@ var WorkflowBranchManager = class { `refs/heads/${request.baseBranch}`, fetchedRef ); - if (!succeeded2(fetched)) operationFailure("git fetch base", fetched); + if (!gitSucceeded(fetched)) operationFailure("git fetch base", fetched); fetchedCreated = true; const fetchedOidResult = await this.runGit(initial.canonical, ["rev-parse", "--verify", fetchedRef]); - if (!succeeded2(fetchedOidResult)) operationFailure("git resolve fetched base", fetchedOidResult); + if (!gitSucceeded(fetchedOidResult)) operationFailure("git resolve fetched base", fetchedOidResult); const fetchedOid = fetchedOidResult.stdout.trim(); if (!isOid(fetchedOid)) fail("stale-fetched-base"); fetchedOidForCleanup = fetchedOid; if (fetchedOid !== advertisedBase) fail("stale-fetched-base"); const commit = await this.runGit(initial.canonical, ["cat-file", "-e", `${fetchedOid}^{commit}`]); - if (!succeeded2(commit)) fail("fetched-base-not-commit"); + if (!gitSucceeded(commit)) fail("fetched-base-not-commit"); const confirmed = await this.remoteTransport.listHeads(initial.canonical, remoteIdentity.url); - if (!succeeded2(confirmed)) operationFailure("git remote base confirmation", confirmed); + if (!gitSucceeded(confirmed)) operationFailure("git remote base confirmation", confirmed); const confirmedHeads = parseRemoteHeads(confirmed.stdout); if ([...confirmedHeads.keys()].some((name) => name.toLowerCase() === branch.toLowerCase())) { fail("remote-branch-exists"); @@ -46993,7 +47582,7 @@ var WorkflowBranchManager = class { "" ].join("\n") }); - if (!succeeded2(transaction)) operationFailure("git create workflow refs", transaction); + if (!gitSucceeded(transaction)) operationFailure("git create workflow refs", transaction); fetchedCreated = false; refsCreated = true; const worktreeManager = new WorktreeManager( @@ -47003,16 +47592,16 @@ var WorkflowBranchManager = class { { ...this.worktreeManagerDependencies, borrowedCheckoutLease: lock } ); attached = await worktreeManager.createAttached(branch, fetchedOid); - const worktreePath = await realpath12(attached.path); + const worktreePath = await realpath13(attached.path); const worktreeGitDirResult = await this.runGit(worktreePath, [ "rev-parse", "--path-format=absolute", "--git-dir" ]); - if (!succeeded2(worktreeGitDirResult)) { + if (!gitSucceeded(worktreeGitDirResult)) { operationFailure("git resolve worktree administrative directory", worktreeGitDirResult); } - const worktreeGitDir = await realpath12(gitPathOutput( + const worktreeGitDir = await realpath13(gitPathOutput( worktreeGitDirResult.stdout, "workflow worktree Git directory" )); @@ -47058,7 +47647,7 @@ var WorkflowBranchManager = class { "" ].join("\n") }); - if (!succeeded2(rollback)) cleanupErrors.push(new RuntimeError("workflow ref rollback failed")); + if (!gitSucceeded(rollback)) cleanupErrors.push(new RuntimeError("workflow ref rollback failed")); } else if (refsCreated) { cleanupErrors.push(new RuntimeError("workflow ref identity unavailable for safe rollback")); } else if (fetchedCreated && fetchedOidForCleanup !== void 0) { @@ -47068,7 +47657,7 @@ var WorkflowBranchManager = class { fetchedRef, fetchedOidForCleanup ]); - if (!succeeded2(rollback)) cleanupErrors.push(new RuntimeError("fetched ref rollback failed")); + if (!gitSucceeded(rollback)) cleanupErrors.push(new RuntimeError("fetched ref rollback failed")); } else if (fetchedCreated) { cleanupErrors.push(new RuntimeError("fetched ref identity unavailable for safe rollback")); } @@ -47118,22 +47707,13 @@ var WorkflowBranchManager = class { if (worktree.canonical !== identity.worktreePath) { return { ok: false, classification: "worktree-path-changed" }; } - let remoteIdentity; - try { - remoteIdentity = await this.resolveRemote(identity.checkoutPath); - } catch { - return { ok: false, classification: "remote-identity-changed" }; - } - if (remoteIdentity.url !== identity.remoteUrl || remoteIdentity.ownerRepo !== identity.ownerRepo) { - return { ok: false, classification: "remote-identity-changed" }; - } const registered = await this.runGit(identity.checkoutPath, [ "worktree", "list", "--porcelain", "-z" ]); - if (!succeeded2(registered)) return { ok: false, classification: "git-command-failed" }; + if (!gitSucceeded(registered)) return { ok: false, classification: "git-command-failed" }; const registrations = await parseWorktreeRegistrations(registered.stdout); if (registrations === null) return { ok: false, classification: "git-command-failed" }; const expectedRegistration = registrations.find( @@ -47148,14 +47728,14 @@ var WorkflowBranchManager = class { "--short", "HEAD" ]); - if (!succeeded2(symbolic) || symbolic.stdout.trim() !== identity.branch) { + if (!gitSucceeded(symbolic) || symbolic.stdout.trim() !== identity.branch) { return { ok: false, classification: "branch-changed" }; } if (expectedRegistration.branch !== identity.branchRef) { return { ok: false, classification: "worktree-registration-changed" }; } const head = await this.runGit(identity.worktreePath, ["rev-parse", "--verify", "HEAD"]); - if (!succeeded2(head)) return { ok: false, classification: "git-command-failed" }; + if (!gitSucceeded(head)) return { ok: false, classification: "git-command-failed" }; if (head.stdout.trim() !== expectedHead2) return { ok: false, classification: "head-changed" }; const status = await this.runGit(identity.worktreePath, [ "status", @@ -47163,7 +47743,7 @@ var WorkflowBranchManager = class { "--untracked-files=all", "--ignore-submodules=none" ]); - if (!succeeded2(status)) return { ok: false, classification: "git-command-failed" }; + if (!gitSucceeded(status)) return { ok: false, classification: "git-command-failed" }; if (!allowStagedBytes && status.stdout !== "") { return { ok: false, classification: "dirty-worktree" }; } @@ -47173,20 +47753,9 @@ var WorkflowBranchManager = class { return { ok: false, classification: "in-progress-operation-scan-failed" }; } const base = await this.runGit(identity.checkoutPath, ["rev-parse", "--verify", identity.baseRef]); - if (!succeeded2(base) || base.stdout.trim() !== identity.baseCommitOid) { + if (!gitSucceeded(base) || base.stdout.trim() !== identity.baseCommitOid) { return { ok: false, classification: "base-ref-changed" }; } - const remote = await this.remoteTransport.listHeads(identity.checkoutPath, identity.remoteUrl); - if (!succeeded2(remote)) return { ok: false, classification: "git-command-failed" }; - let remoteHeads; - try { - remoteHeads = parseRemoteHeads(remote.stdout); - } catch { - return { ok: false, classification: "git-command-failed" }; - } - if (remoteHeads.get(identity.baseBranch) !== identity.baseCommitOid) { - return { ok: false, classification: "remote-base-changed" }; - } return { ok: true }; } async revalidate(identity, expectedHead2 = identity.baseCommitOid) { @@ -47241,10 +47810,8 @@ var WorkflowBranchManager = class { return { ok: false, classification: "git-command-failed" }; } } - async cleanupLocked(identity, expectedHead2, checkoutLease) { - if (!await this.readOwnership(identity)) { - return { ok: false, classification: "cleanup-failed" }; - } + async cleanupLocked(identity, expectedHead2, checkoutLease, retainBranch) { + const owned = await this.readOwnership(identity); const checkout = await this.platformServices.canonicalizePath(identity.checkoutPath); if (checkout.gitCommonDir !== identity.gitCommonDir) { return { ok: false, classification: "cleanup-failed" }; @@ -47262,7 +47829,7 @@ var WorkflowBranchManager = class { "check-ref-format", identity.baseRef ]); - if (!succeeded2(checkedBranch) || !succeeded2(checkedBranchRef) || !succeeded2(checkedBaseRef)) { + if (!gitSucceeded(checkedBranch) || !gitSucceeded(checkedBranchRef) || !gitSucceeded(checkedBaseRef)) { return { ok: false, classification: "cleanup-failed" }; } const registered = await this.runGit(identity.checkoutPath, [ @@ -47271,7 +47838,7 @@ var WorkflowBranchManager = class { "--porcelain", "-z" ]); - if (!succeeded2(registered)) return { ok: false, classification: "cleanup-failed" }; + if (!gitSucceeded(registered)) return { ok: false, classification: "cleanup-failed" }; const registrations = await parseWorktreeRegistrations(registered.stdout, true); if (registrations === null) return { ok: false, classification: "cleanup-failed" }; const expectedRegistration = registrations.find( @@ -47299,7 +47866,7 @@ var WorkflowBranchManager = class { "--path-format=absolute", "--git-dir" ]); - if (!succeeded2(actualGitDir) || await realpath12(gitPathOutput( + if (!gitSucceeded(actualGitDir) || await realpath13(gitPathOutput( actualGitDir.stdout, "workflow worktree Git directory" )) !== identity.worktreeGitDir) { @@ -47312,7 +47879,7 @@ var WorkflowBranchManager = class { "HEAD" ]); const head = await this.runGit(identity.worktreePath, ["rev-parse", "--verify", "HEAD"]); - if (!succeeded2(symbolic) || symbolic.stdout.trim() !== identity.branch || !succeeded2(head) || head.stdout.trim() !== expectedHead2) { + if (!gitSucceeded(symbolic) || symbolic.stdout.trim() !== identity.branch || !gitSucceeded(head) || head.stdout.trim() !== expectedHead2) { return { ok: false, classification: "cleanup-failed" }; } } @@ -47331,25 +47898,28 @@ var WorkflowBranchManager = class { "--quiet", identity.baseRef ]); - const refsPresent = branchPresence.exitCode === 0 && basePresence.exitCode === 0; - const refsAbsent = branchPresence.exitCode === 1 && basePresence.exitCode === 1; - if (!refsPresent && !refsAbsent || refsAbsent && registrationPresent) { + const presenceKnown = (exitCode) => exitCode === 0 || exitCode === 1; + if (!presenceKnown(branchPresence.exitCode) || !presenceKnown(basePresence.exitCode)) { return { ok: false, classification: "cleanup-failed" }; } - if (refsPresent) { - const branch = await this.runGit(identity.checkoutPath, [ - "rev-parse", - "--verify", - identity.branchRef - ]); - const base = await this.runGit(identity.checkoutPath, [ - "rev-parse", - "--verify", - identity.baseRef - ]); - if (!succeeded2(branch) || !succeeded2(base) || branch.stdout.trim() !== expectedHead2 || base.stdout.trim() !== identity.baseCommitOid) { - return { ok: false, classification: "cleanup-failed" }; - } + const branchPresent = branchPresence.exitCode === 0; + const basePresent = basePresence.exitCode === 0; + if (retainBranch) { + if (!branchPresent) return { ok: false, classification: "cleanup-failed" }; + } else if (branchPresent !== basePresent || !branchPresent && registrationPresent) { + return { ok: false, classification: "cleanup-failed" }; + } + const [branch, base] = await Promise.all([ + branchPresent ? this.runGit(identity.checkoutPath, ["rev-parse", "--verify", identity.branchRef]) : null, + basePresent ? this.runGit(identity.checkoutPath, ["rev-parse", "--verify", identity.baseRef]) : null + ]); + if (branch !== null && (!gitSucceeded(branch) || branch.stdout.trim() !== expectedHead2) || base !== null && (!gitSucceeded(base) || base.stdout.trim() !== identity.baseCommitOid)) { + return { ok: false, classification: "cleanup-failed" }; + } + const removeBranch = branchPresent && !retainBranch; + const nothingLeft = !registrationPresent && !basePresent && !removeBranch; + if (!owned) { + return nothingLeft ? { ok: true, worktreeRemoved: true, refsRemoved: true } : { ok: false, classification: "cleanup-failed" }; } const manager = new WorktreeManager( identity.checkoutPath, @@ -47370,27 +47940,23 @@ var WorkflowBranchManager = class { ); } } - if (refsPresent) { + if (basePresent || removeBranch) { const refs = await this.runGit(identity.checkoutPath, ["update-ref", "--stdin"], { stdin: [ "start", - `delete ${identity.branchRef} ${expectedHead2}`, - `delete ${identity.baseRef} ${identity.baseCommitOid}`, + ...removeBranch ? [`delete ${identity.branchRef} ${expectedHead2}`] : [], + ...basePresent ? [`delete ${identity.baseRef} ${identity.baseCommitOid}`] : [], "prepare", "commit", "" ].join("\n") }); - if (!succeeded2(refs)) return { ok: false, classification: "cleanup-failed" }; + if (!gitSucceeded(refs)) return { ok: false, classification: "cleanup-failed" }; } await this.removeOwnership(this.ownershipPath(identity.workflowId)); - return { - ok: true, - worktreeRemoved: registrationPresent, - refsRemoved: refsPresent - }; + return { ok: true, worktreeRemoved: true, refsRemoved: true }; } - async cleanup(identity, expectedHead2 = identity.baseCommitOid) { + async cleanup(identity, expectedHead2 = identity.baseCommitOid, options = {}) { if (!isOid(expectedHead2) || !isOid(identity.baseCommitOid) || !WORKFLOW_ID2.test(identity.workflowId) || typeof identity.worktreeGitDir !== "string" || identity.branchRef !== `refs/heads/${identity.branch}` || identity.baseRef !== `refs/claude-architect/autopilot/${identity.workflowId}/base`) { return { ok: false, classification: "cleanup-failed" }; } @@ -47401,7 +47967,7 @@ var WorkflowBranchManager = class { if (lock.repositoryIdentity !== identity.repositoryIdentity) { return { ok: false, classification: "cleanup-failed" }; } - return await this.cleanupLocked(identity, expectedHead2, lock); + return await this.cleanupLocked(identity, expectedHead2, lock, options.retainBranch === true); }, { onReleaseError: (releaseError, res) => { logger.warn("checkout lock release failed after workflow branch cleanup", { @@ -47421,8 +47987,8 @@ var WorkflowBranchManager = class { // src/autopilot/final-branch-reviewer.ts var OBJECT_ID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; -var SHA2563 = /^[0-9a-f]{64}$/u; -var NO_FOLLOW7 = constants13.O_NOFOLLOW ?? 0; +var SHA2562 = /^[0-9a-f]{64}$/u; +var NO_FOLLOW7 = constants14.O_NOFOLLOW ?? 0; var MAX_FINAL_BRANCH_ARTIFACT_BYTES = 64 * 1024 * 1024; var MAX_TASK_EVIDENCE_REFS = 4096; var MAX_TASK_EVIDENCE_BYTES = 8 * 1024 * 1024; @@ -47449,15 +48015,12 @@ var FinalBranchReviewError = class extends RuntimeError { classification; }; var schemas3 = loadSchemas(); -function succeeded3(result) { - return result.exitCode === 0 && result.truncated?.stdout !== true && result.truncated?.stderr !== true; -} function fail2(classification, message) { throw new FinalBranchReviewError(classification, message); } -async function checkedGit3(runGit, cwd, args) { +async function checkedGit2(runGit, cwd, args) { const result = await runGit(cwd, args); - if (!succeeded3(result)) fail2("git-command-failed", `git ${args[0] ?? "command"} failed`); + if (!gitSucceeded(result)) fail2("git-command-failed", `git ${args[0] ?? "command"} failed`); return result.stdout; } function normalizedEvidenceRefs(references, allowEmpty = false, maximum = 128) { @@ -47466,7 +48029,7 @@ function normalizedEvidenceRefs(references, allowEmpty = false, maximum = 128) { } const unique = /* @__PURE__ */ new Set(); for (const reference of references) { - if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path25.posix.isAbsolute(reference) || reference.includes("\\") || reference.split("/").some((component) => component === "" || component === "." || component === "..") || /[\0\r\n]/u.test(reference)) { + if (typeof reference !== "string" || reference.length < 1 || reference.length > 1024 || path28.posix.isAbsolute(reference) || reference.includes("\\") || reference.split("/").some((component) => component === "" || component === "." || component === "..") || /[\0\r\n]/u.test(reference)) { fail2("missing-task-evidence", "task evidence reference is invalid"); } unique.add(reference); @@ -47512,12 +48075,12 @@ async function validateArchivedTaskEvidence(task, evidence, context) { `${evidence.promotionCommitOid}^{tree}` ]) ]); - if (result === null || manifest === null || pipelineResult === null || snapshot === null || advisor === null || eligibility === null || decision === null || candidate === null || result.status !== "verified-candidate" || result.runId !== evidence.runId || manifest.runId !== evidence.runId || manifest.baseCommitOid !== context.expectedParentCommitOid || pipelineResult.runId !== evidence.runId || candidate.baseCommitOid !== context.expectedParentCommitOid || candidate.manifestHash !== evidence.candidateManifestHash || manifest.candidateManifestHash !== evidence.candidateManifestHash || pipelineResult.finalCandidateCommit !== candidate.candidateCommitOid || eligibility.runId !== evidence.runId || eligibility.baseCommitOid !== context.expectedParentCommitOid || eligibility.candidateCommitOid !== candidate.candidateCommitOid || eligibility.candidateTreeOid !== candidate.candidateTreeOid || eligibility.candidateManifestHash !== evidence.candidateManifestHash || !eligibility.eligible || eligibility.reasons.length !== 0 || task.eligibilityHash === null || autopilotEligibilityRecordHash(eligibility) !== task.eligibilityHash || decision.decisionVersion !== "2" || decision.authority !== "autopilot-policy" || decision.decision !== "accepted" || decision.candidateManifestHash !== evidence.candidateManifestHash || decision.evidenceHash !== task.eligibilityHash || !succeeded3(promotionParent) || promotionParent.stdout.trim() !== context.expectedParentCommitOid || !succeeded3(promotionTree) || promotionTree.stdout.trim() !== candidate.candidateTreeOid) { + if (result === null || manifest === null || pipelineResult === null || snapshot === null || advisor === null || eligibility === null || decision === null || candidate === null || result.status !== "verified-candidate" || result.runId !== evidence.runId || manifest.runId !== evidence.runId || manifest.baseCommitOid !== context.expectedParentCommitOid || pipelineResult.runId !== evidence.runId || candidate.baseCommitOid !== context.expectedParentCommitOid || candidate.manifestHash !== evidence.candidateManifestHash || manifest.candidateManifestHash !== evidence.candidateManifestHash || pipelineResult.finalCandidateCommit !== candidate.candidateCommitOid || eligibility.runId !== evidence.runId || eligibility.baseCommitOid !== context.expectedParentCommitOid || eligibility.candidateCommitOid !== candidate.candidateCommitOid || eligibility.candidateTreeOid !== candidate.candidateTreeOid || eligibility.candidateManifestHash !== evidence.candidateManifestHash || !eligibility.eligible || eligibility.reasons.length !== 0 || task.eligibilityHash === null || autopilotEligibilityRecordHash(eligibility) !== task.eligibilityHash || decision.decisionVersion !== "2" || decision.authority !== "autopilot-policy" || decision.decision !== "accepted" || decision.candidateManifestHash !== evidence.candidateManifestHash || decision.evidenceHash !== task.eligibilityHash || !gitSucceeded(promotionParent) || promotionParent.stdout.trim() !== context.expectedParentCommitOid || !gitSucceeded(promotionTree) || promotionTree.stdout.trim() !== candidate.candidateTreeOid) { fail2("missing-task-evidence", `task evidence identities do not match: ${task.id}`); } } function requirePromotedTask(task) { - if (task.status !== "promoted" || task.runId === null || task.candidateManifestHash === null || !SHA2563.test(task.candidateManifestHash) || task.promotionCommitOid === null || !OBJECT_ID.test(task.promotionCommitOid)) { + if (task.status !== "promoted" || task.runId === null || task.candidateManifestHash === null || !SHA2562.test(task.candidateManifestHash) || task.promotionCommitOid === null || !OBJECT_ID.test(task.promotionCommitOid)) { fail2("workflow-state-mismatch", `task ${task.id} is not durably promoted`); } return { @@ -47553,6 +48116,13 @@ function normalizeTaskEvidence(state, supplied) { function evidenceHash(content) { return createHash12("sha256").update(content, "utf8").digest("hex"); } +function reviewEvidenceRefs(archived, declared) { + return normalizedEvidenceRefs( + [...archived.filter((reference) => !reference.startsWith("logs/")), ...declared], + false, + MAX_TASK_EVIDENCE_REFS + ); +} async function freezeTaskEvidence(evidence, evidenceStore) { return await Promise.all(evidence.map(async (task) => { const store = evidenceStore(task.runId); @@ -47569,8 +48139,9 @@ async function freezeTaskEvidence(evidence, evidenceStore) { if (REQUIRED_TASK_EVIDENCE_REFS.some((reference) => !archivedReferences.includes(reference)) || task.evidenceRefs.some((reference) => !archivedReferences.includes(reference))) { fail2("missing-task-evidence", `task evidence archive is incomplete: ${task.taskId}`); } + const frozenReferences = reviewEvidenceRefs(archivedReferences, task.evidenceRefs); let frozenBytes = 0; - const frozen = await Promise.all(archivedReferences.map(async (reference) => { + const frozen = await Promise.all(frozenReferences.map(async (reference) => { let content; try { content = await store.readEvidence(reference); @@ -47602,7 +48173,7 @@ async function freezeTaskEvidence(evidence, evidenceStore) { if (JSON.stringify(finalReferences) !== JSON.stringify(archivedReferences)) { fail2("missing-task-evidence", `task evidence archive changed: ${task.taskId}`); } - return { ...task, evidenceRefs: archivedReferences, evidence: frozen }; + return { ...task, evidenceRefs: frozenReferences, evidence: frozen }; })); } async function assertTaskEvidenceCurrent(artifact, evidenceStore) { @@ -47618,7 +48189,7 @@ async function assertTaskEvidenceCurrent(artifact, evidenceStore) { } catch { fail2("missing-task-evidence", `task evidence archive is unavailable: ${task.taskId}`); } - if (task.evidence.length !== task.evidenceRefs.length || JSON.stringify(archivedReferences) !== JSON.stringify(task.evidenceRefs) || task.evidence.some((item, index) => item.reference !== task.evidenceRefs[index])) { + if (task.evidence.length !== task.evidenceRefs.length || JSON.stringify(reviewEvidenceRefs(archivedReferences, task.evidenceRefs)) !== JSON.stringify(task.evidenceRefs) || task.evidence.some((item, index) => item.reference !== task.evidenceRefs[index])) { fail2("missing-task-evidence", "frozen task evidence index is inconsistent"); } for (const item of task.evidence) { @@ -47647,7 +48218,7 @@ async function provePromotionChain(runGit, checkoutPath, baseCommitOid, headComm "--verify", `${task.promotionCommitOid}^` ]); - if (!succeeded3(commit) || commit.stdout.trim() !== task.promotionCommitOid || !succeeded3(parent) || parent.stdout.trim() !== expectedParent) { + if (!gitSucceeded(commit) || commit.stdout.trim() !== task.promotionCommitOid || !gitSucceeded(parent) || parent.stdout.trim() !== expectedParent) { fail2("workflow-state-mismatch", `task promotion is not in branch order: ${task.taskId}`); } expectedParent = task.promotionCommitOid; @@ -47676,12 +48247,12 @@ async function revalidateHead(checkoutPath, expectedHead2, runGit = git, expecte fail2("workflow-state-mismatch", "expected final branch head is invalid"); } const result = await runGit(checkoutPath, ["rev-parse", "--verify", "HEAD^{commit}"]); - if (!succeeded3(result)) fail2("git-command-failed", "failed to revalidate final branch head"); + if (!gitSucceeded(result)) fail2("git-command-failed", "failed to revalidate final branch head"); if (result.stdout.trim() !== expectedHead2) { fail2("head-changed", "final branch head changed"); } const tree = await runGit(checkoutPath, ["rev-parse", "--verify", "HEAD^{tree}"]); - if (!succeeded3(tree)) fail2("git-command-failed", "failed to revalidate final branch tree"); + if (!gitSucceeded(tree)) fail2("git-command-failed", "failed to revalidate final branch tree"); if (expectedTree !== void 0 && tree.stdout.trim() !== expectedTree) { fail2("head-changed", "final branch tree changed"); } @@ -47691,7 +48262,7 @@ async function revalidateHead(checkoutPath, expectedHead2, runGit = git, expecte "-z", "--untracked-files=all" ]); - if (!succeeded3(status)) fail2("git-command-failed", "failed to revalidate final branch status"); + if (!gitSucceeded(status)) fail2("git-command-failed", "failed to revalidate final branch status"); if (status.stdout !== "") fail2("head-changed", "final branch checkout is dirty"); } async function withHeadRevalidation(request) { @@ -47858,98 +48429,59 @@ function freezePackage(value) { } return value; } -async function persistImmutableJson(workflowDirectory, reference, value) { - const destination = path25.join(workflowDirectory, reference); - const temporary = path25.join(workflowDirectory, `.${reference}.${randomUUID9()}.tmp`); +async function persistJson(workflowDirectory, reference, value, mode) { const serialized = `${JSON.stringify(value, null, 2)} `; - let handle; - let temporaryExists = false; try { - handle = await open13( - temporary, - constants13.O_WRONLY | constants13.O_CREAT | constants13.O_EXCL | NO_FOLLOW7, - 384 - ); - temporaryExists = true; - await handle.writeFile(serialized, "utf8"); - await handle.sync(); - await handle.close(); - handle = void 0; + const session = await openDurableDirectorySession(workflowDirectory, { + description: "workflow directory", + create: false + }); try { - await link7(temporary, destination); - } catch (error51) { - if (error51.code !== "EEXIST") throw error51; - const metadata = await lstat16(destination); - if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== 1 || await readFile6(destination, "utf8") !== serialized) { - fail2("artifact-persistence-failed", `a different ${reference} already exists`); - } - } - await rm10(temporary); - temporaryExists = false; - await syncDirectoryMetadata(workflowDirectory); - if (await readFile6(destination, "utf8") !== serialized) { - fail2("artifact-persistence-failed", `${reference} was not durably persisted`); + await writeAtomic(session, reference, serialized, mode === "immutable" ? "immutable" : "replace"); + } finally { + await session.close(); } - } catch (error51) { - if (error51 instanceof FinalBranchReviewError) throw error51; + } catch { fail2("artifact-persistence-failed", `failed to persist ${reference}`); - } finally { - await handle?.close(); - if (temporaryExists) await rm10(temporary, { force: true }); } } async function persistFrozenArtifact(workflowDirectory, artifact) { - const destination = path25.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - const temporary = path25.join( - workflowDirectory, - `.${FINAL_BRANCH_ARTIFACT_REF}.${randomUUID9()}.tmp` - ); - const serialized = `${JSON.stringify(artifact, null, 2)} -`; + await persistJson(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF, artifact, "immutable"); +} +async function readPublishedReport(workflowDirectory, artifact) { let handle; - let temporaryExists = false; try { - handle = await open13( - temporary, - constants13.O_WRONLY | constants13.O_CREAT | constants13.O_EXCL | NO_FOLLOW7, - 384 - ); - temporaryExists = true; - await handle.writeFile(serialized, "utf8"); - await handle.sync(); - await handle.close(); - handle = void 0; - try { - await link7(temporary, destination); - } catch (error51) { - if (error51.code !== "EEXIST") throw error51; - const metadata = await lstat16(destination); - if (!metadata.isFile() || metadata.isSymbolicLink() || metadata.nlink !== 1 || await readFile6(destination, "utf8") !== serialized) { - fail2("artifact-persistence-failed", "a different final branch artifact already exists"); - } + handle = await open14(path28.join(workflowDirectory, FINAL_BRANCH_REPORT_REF), constants14.O_RDONLY | NO_FOLLOW7); + } catch (error51) { + if (isMissing(error51)) return null; + fail2("artifact-persistence-failed", "final branch report is unavailable"); + } + try { + const metadata = await handle.stat(); + if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > MAX_FINAL_BRANCH_ARTIFACT_BYTES) { + fail2("artifact-persistence-failed", "final branch report is not a safe regular file"); } - await rm10(temporary); - temporaryExists = false; - await syncDirectoryMetadata(workflowDirectory); - const persisted = JSON.parse(await readFile6(destination, "utf8")); - const { branchArtifactHash, ...unhashed } = persisted; - if (branchArtifactHash !== artifact.branchArtifactHash || branchArtifactHashOf(unhashed) !== artifact.branchArtifactHash) { - fail2("artifact-persistence-failed", "final branch artifact was not durably persisted"); + const report = JSON.parse(await handle.readFile("utf8")); + if (report.reportVersion !== "2") { + fail2("artifact-persistence-failed", "final branch report version is unsupported"); } + if (report.workflowId !== artifact.workflowId || report.baseCommitOid !== artifact.baseCommitOid || report.headCommitOid !== artifact.headCommitOid || report.branchArtifactHash !== artifact.branchArtifactHash) { + fail2("artifact-persistence-failed", "a final branch report for a different artifact exists"); + } + return report; } catch (error51) { if (error51 instanceof FinalBranchReviewError) throw error51; - fail2("artifact-persistence-failed", "failed to persist final branch artifact"); + fail2("artifact-persistence-failed", "final branch report is unreadable"); } finally { - await handle?.close(); - if (temporaryExists) await rm10(temporary, { force: true }); + await handle.close(); } } async function assertPersistedArtifact(workflowDirectory, artifact) { let handle; try { - const destination = path25.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - handle = await open13(destination, constants13.O_RDONLY | NO_FOLLOW7); + const destination = path28.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); + handle = await open14(destination, constants14.O_RDONLY | NO_FOLLOW7); const metadata = await handle.stat(); if (!metadata.isFile() || metadata.nlink !== 1 || metadata.size > MAX_FINAL_BRANCH_ARTIFACT_BYTES) { fail2("artifact-persistence-failed", "final branch artifact is not a safe regular file"); @@ -48024,7 +48556,7 @@ var FinalBranchReviewer = class { fail2("workflow-state-mismatch", "final branch ownership does not match workflow state"); } const normalizedTaskEvidence = normalizeTaskEvidence(state, request.taskEvidence); - const headCommitOid = (await checkedGit3( + const headCommitOid = (await checkedGit2( this.runGit, state.worktreePath, ["rev-parse", "--verify", "HEAD^{commit}"] @@ -48052,13 +48584,13 @@ var FinalBranchReviewer = class { normalizedTaskEvidence, this.evidenceStore ); - const headTreeOid = (await checkedGit3( + const headTreeOid = (await checkedGit2( this.runGit, state.worktreePath, ["rev-parse", "--verify", `${headCommitOid}^{tree}`] )).trim(); if (!OBJECT_ID.test(headTreeOid)) fail2("git-command-failed", "final branch tree is invalid"); - const rawDiff = parseRawDiff(await checkedGit3(this.runGit, state.worktreePath, [ + const rawDiff = parseRawDiff(await checkedGit2(this.runGit, state.worktreePath, [ "diff-tree", "-r", "--no-commit-id", @@ -48069,7 +48601,7 @@ var FinalBranchReviewer = class { headTreeOid ])); const [nameStatusOutput, treeOutput, patch] = await Promise.all([ - checkedGit3(this.runGit, state.worktreePath, [ + checkedGit2(this.runGit, state.worktreePath, [ "diff-tree", "-r", "--no-commit-id", @@ -48079,16 +48611,12 @@ var FinalBranchReviewer = class { state.baseCommitOid, headTreeOid ]), - checkedGit3(this.runGit, state.worktreePath, ["ls-tree", "-r", "-z", headTreeOid]), - checkedGit3(this.runGit, state.worktreePath, [ - "diff", - "--no-ext-diff", - "--no-textconv", - "--binary", - "--full-index", - state.baseCommitOid, - headTreeOid - ]) + checkedGit2(this.runGit, state.worktreePath, ["ls-tree", "-r", "-z", headTreeOid]), + checkedGit2( + this.runGit, + state.worktreePath, + reviewDiffArgs(state.baseCommitOid, headTreeOid, ["--binary", "--full-index"]) + ) ]); const manifest = computeChangedPathManifest({ rawDiff, nameStatusOutput, treeOutput }); await revalidateHead(state.worktreePath, headCommitOid, this.runGit, headTreeOid); @@ -48296,6 +48824,8 @@ var FinalBranchReviewer = class { if (state.phase !== "final-review" || state.baseCommitOid !== artifact.baseCommitOid || state.tasks.length !== request.autopilotSpec.tasks.length || state.tasks.some((task, index) => task.id !== request.autopilotSpec.tasks[index]?.id) || canonicalArtifactHash(request.autopilotSpec) !== state.autopilotSpecHash) { fail2("workflow-state-mismatch", "final review specification does not match workflow state"); } + const published = await readPublishedReport(store.workflowDirectory, artifact); + if (published !== null) return published; const spec = finalDelegationSpec(request.autopilotSpec); const reasons = []; let verification = failedVerification("final verification did not run"); @@ -48329,15 +48859,14 @@ var FinalBranchReviewer = class { const frozenEvidence = freezePackage({ autopilotSpec: structuredClone(request.autopilotSpec), artifact: structuredClone(artifact), - verification: structuredClone(verification), - taskEvidence: structuredClone(artifact.taskEvidence) + verification: structuredClone(verification) }); const pkg = freezePackage({ spec, baselineCommit: artifact.baseCommitOid, candidateCommit: artifact.headCommitOid, candidateDiff: artifact.patch, - testEvidence: JSON.stringify(frozenEvidence), + testEvidence: JSON.stringify(verification), advisorEvidence: frozenEvidence }); const runStructuredFinalRole = async (role, validate) => { @@ -48387,7 +48916,7 @@ var FinalBranchReviewer = class { advisorReasons(advisor, reasons); const reviewReports = [correctness, systems]; const report = { - reportVersion: "1", + reportVersion: "2", workflowId: artifact.workflowId, baseCommitOid: artifact.baseCommitOid, headCommitOid: artifact.headCommitOid, @@ -48398,21 +48927,17 @@ var FinalBranchReviewer = class { taskEvidenceHashes: artifact.taskEvidence.map((evidence) => canonicalArtifactHash(evidence)), eligible: reasons.length === 0, reasons, - status: reasons.length === 0 ? "ready-to-ship" : "human-decision-required", + status: reasons.length === 0 ? "ready-for-human-review" : "human-decision-required", evaluatedAt: this.now() }; await this.runHeadBoundPhaseCore( artifact, "final-evidence-publication", async () => { - await persistImmutableJson(store.workflowDirectory, FINAL_VERIFICATION_REF, verification); - await persistImmutableJson( - store.workflowDirectory, - FINAL_CORRECTNESS_REVIEW_REF, - correctness - ); - await persistImmutableJson(store.workflowDirectory, FINAL_SYSTEMS_REVIEW_REF, systems); - await persistImmutableJson(store.workflowDirectory, FINAL_ADVISOR_REF, advisor); + await persistJson(store.workflowDirectory, FINAL_VERIFICATION_REF, verification, "replaceable"); + await persistJson(store.workflowDirectory, FINAL_CORRECTNESS_REVIEW_REF, correctness, "replaceable"); + await persistJson(store.workflowDirectory, FINAL_SYSTEMS_REVIEW_REF, systems, "replaceable"); + await persistJson(store.workflowDirectory, FINAL_ADVISOR_REF, advisor, "replaceable"); }, request.checkoutPath, checkoutLease @@ -48420,10 +48945,11 @@ var FinalBranchReviewer = class { await this.runHeadBoundPhaseCore( artifact, "final-report-publication", - async () => await persistImmutableJson( + async () => await persistJson( store.workflowDirectory, FINAL_BRANCH_REPORT_REF, - report + report, + "immutable" ), request.checkoutPath, checkoutLease @@ -48441,9 +48967,6 @@ var AutopilotControllerError = class extends RuntimeError { } classification; }; -var DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS = 1e4; -var MIN_REQUIRED_CHECKS_POLL_INTERVAL_MS = 100; -var MAX_REQUIRED_CHECKS_POLL_INTERVAL_MS = 6e4; var REQUIRED_TASK_EVIDENCE_REFS2 = [ "decision.json", "manifest.json", @@ -48483,18 +49006,12 @@ function expectedHeadOf(state) { ); } function branchMatchesState2(checkoutPath, state, branch) { - return branch.workflowId === state.workflowId && branch.checkoutPath === checkoutPath && branch.repositoryIdentity === state.repositoryIdentity && branch.baseCommitOid === state.baseCommitOid && branch.branchRef === state.workflowRef && branch.worktreePath === state.worktreePath && branch.branch === state.shipping.branch; + return branch.workflowId === state.workflowId && branch.checkoutPath === checkoutPath && branch.repositoryIdentity === state.repositoryIdentity && branch.baseCommitOid === state.baseCommitOid && branch.branchRef === state.workflowRef && branch.worktreePath === state.worktreePath && branch.branch === state.branch; } function redactedState(state) { const redacted = structuredClone(state); redacted.repositoryIdentity = "[redacted]"; redacted.worktreePath = "[redacted]"; - if (redacted.shipping.prUrl !== null) redacted.shipping.prUrl = "[redacted]"; - for (const observation of redacted.ciObservations) { - for (const check2 of observation.checks) { - if (check2.link !== null) check2.link = "[redacted]"; - } - } return redacted; } function recordedWorkflowFrom(journal) { @@ -48514,7 +49031,7 @@ function recordedWorkflowFrom(journal) { } function initialWorkflowState(args) { return { - stateVersion: "1", + stateVersion: "2", workflowId: args.workflowId, repositoryIdentity: args.branch.repositoryIdentity, baseCommitOid: args.branch.baseCommitOid, @@ -48538,13 +49055,7 @@ function initialWorkflowState(args) { lastEntryHash: null }, finalGate: null, - shipping: { - branch: args.branch.branch, - prNumber: null, - prUrl: null, - ciDeadlineAt: args.ciDeadlineAt - }, - ciObservations: [], + branch: args.branch.branch, cleanup: null, terminal: null, createdAt: args.startedAt, @@ -48560,20 +49071,6 @@ function finalGateFor(report) { eligibilityHash: reportHash }; } -function pullRequestIdentityMatches(pullRequest, target, branch, expectedHead2) { - return Number.isSafeInteger(pullRequest.number) && pullRequest.number > 0 && pullRequest.url.length > 0 && pullRequest.repository === target.repository && pullRequest.baseBranch === branch.baseBranch && pullRequest.headBranch === branch.branch && pullRequest.headCommitOid === expectedHead2; -} -function pullRequestMatches(pullRequest, target, branch, expectedHead2, expectedDraft) { - return pullRequestIdentityMatches(pullRequest, target, branch, expectedHead2) && pullRequest.draft === expectedDraft; -} -function checksAreNonEmptyAndPassing(checks, expectedHead2) { - return checks.result === "passed" && checks.headCommitOid === expectedHead2 && checks.checks.length > 0 && checks.checks.every((check2) => check2.bucket === "pass"); -} -function stateHasPassingChecks(state) { - const observation = state.ciObservations.at(-1); - const expectedHead2 = state.finalGate?.headCommitOid; - return observation !== void 0 && expectedHead2 !== void 0 && checksAreNonEmptyAndPassing(observation, expectedHead2); -} var CLEANUP_INTENT_OPERATION = "cleanup-workflow-branch"; function cleanupIntentKey(headCommitOid) { return `cleanup:${headCommitOid}`; @@ -48591,23 +49088,29 @@ var AutopilotController = class { constructor(dependencies) { this.dependencies = dependencies; this.validator = dependencies.validator ?? validateAutopilotSpec; - this.createWorkflowId = dependencies.workflowId ?? randomUUID10; + this.createWorkflowId = dependencies.workflowId ?? randomUUID9; this.now = dependencies.now ?? (() => (/* @__PURE__ */ new Date()).toISOString()); - const configuredInterval = dependencies.requiredChecksPollIntervalMs ?? DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS; - this.pollIntervalMs = Number.isFinite(configuredInterval) ? Math.min( - MAX_REQUIRED_CHECKS_POLL_INTERVAL_MS, - Math.max(MIN_REQUIRED_CHECKS_POLL_INTERVAL_MS, Math.trunc(configuredInterval)) - ) : DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS; - this.sleep = dependencies.sleep ?? (async (milliseconds) => { - await new Promise((resolve2) => setTimeout(resolve2, milliseconds)); - }); + this.decisionAuthority = dependencies.decisionAuthority ?? (() => decisionAuthority()); } dependencies; validator; createWorkflowId; now; - pollIntervalMs; - sleep; + decisionAuthority; + /** + * Autopilot accepts each task under `autopilot-policy`; it has no person to + * ask. Under the `human` authority it therefore refuses to promote rather + * than spend Producer work that could only halt at the first promotion. The + * promoter enforces the same rule; this only fails fast. + */ + assertPolicyAuthority() { + if (this.decisionAuthority() === "human") { + throw new AutopilotControllerError( + "decision-authority-human", + "CLAUDE_ARCHITECT_DECISION_AUTHORITY=human requires a person for every acceptance; Autopilot records policy decisions and cannot run under it" + ); + } + } async start(checkoutPath, value) { this.throwIfAborted(); const validated = this.validator(value); @@ -48618,16 +49121,19 @@ var AutopilotController = class { { validationErrors: validated.errors } ); } + this.assertPolicyAuthority(); + const identityAvailable = this.dependencies.commitIdentityAvailable ?? (async (path43) => await userCommitEnvironment(path43) !== null); + if (!await identityAvailable(checkoutPath)) { + throw new AutopilotControllerError( + "git-identity-missing", + "promotions are committed under your Git identity; configure user.name and user.email" + ); + } const spec = validated.spec; const startedAt = this.now(); - const startedAtMs = Date.parse(startedAt); - if (!Number.isFinite(startedAtMs)) { + if (!Number.isFinite(Date.parse(startedAt))) { throw new AutopilotControllerError("clock-invalid", "autopilot clock is invalid"); } - const ciDeadlineAt = new Date( - startedAtMs + spec.shipping.requiredChecksTimeoutMs - ).toISOString(); - const ciDeadlineMs = Date.parse(ciDeadlineAt); const workflowId = this.createWorkflowId(); let pendingCleanup = null; let bootstrapBranch = null; @@ -48640,19 +49146,7 @@ var AutopilotController = class { completedCleanup = await this.dependencies.workflowLock.runExclusive( workflowId, async () => { - let target; this.dependencies.emit?.("preflight"); - try { - target = await this.dependencies.hostingAdapter.preflight({ - checkoutPath, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }); - } catch (error51) { - throw new AutopilotControllerError( - classificationOf(error51, "preflight-failed"), - "shipping preflight failed" - ); - } let branch; try { branch = await this.dependencies.branchManager.create({ @@ -48669,19 +49163,12 @@ var AutopilotController = class { "workflow branch creation failed" ); } - if (branch.ownerRepo !== target.repository || branch.remoteUrl !== target.canonicalHttpsUrl) { - throw new AutopilotControllerError( - "repository-identity-mismatch", - "shipping and workflow repository identities differ" - ); - } const store = this.dependencies.workflowStore(workflowId); - let state = await store.create(initialWorkflowState({ + const state = await store.create(initialWorkflowState({ workflowId, spec, branch, - startedAt, - ciDeadlineAt + startedAt })); bootstrapStore = store; bootstrapState = state; @@ -48701,265 +49188,14 @@ var AutopilotController = class { } }); bootstrapCompleted = true; - let expectedHead2 = branch.baseCommitOid; await this.haltIfAborted(store, state); - for (const [index, task] of spec.tasks.entries()) { - if (state.phase === "preflighting") { - state = await store.transition({ - expectedRevision: state.revision, - to: "running-task", - update(draft) { - draft.currentTaskIndex = index; - draft.tasks[index].status = "running"; - } - }); - } - await this.haltIfAborted(store, state); - this.dependencies.emit?.(`task:${task.id}`); - const pipelineResult = await this.dependencies.pipelineRunner.run( - branch.worktreePath, - task.delegation - ).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "pipeline-failed"))); - if (pipelineResult.status === "failed") { - return await this.halt( - store, - state, - pipelineResult.failure === "cancelled" ? "cancelled" : "pipeline-failed" - ); - } - if (pipelineResult.status === "human-decision-required" || pipelineResult.gate.requiresHumanDecision) { - return await this.halt(store, state, "human-decision-required"); - } - await this.haltIfAborted(store, state); - const snapshot = await this.dependencies.reviewSnapshotter.create({ - workflow: state, - branch, - task, - pipelineResult - }).catch(async (error51) => await this.halt( - store, - state, - classificationOf(error51, "candidate-evidence-mismatch") - )); - if (!snapshotMatchesCandidate(expectedHead2, pipelineResult, snapshot)) { - return await this.halt(store, state, "candidate-evidence-mismatch"); - } - await this.haltIfAborted(store, state); - const eligibility = await this.dependencies.eligibilityEvaluator.evaluate({ - workflow: state, - branch, - task, - pipelineResult, - reviewSnapshot: snapshot - }).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "eligibility-red"))); - if (!eligibilityMatchesSnapshot(pipelineResult, snapshot, eligibility)) { - return await this.halt(store, state, "candidate-evidence-mismatch"); - } - if (!eligibility.eligible || eligibility.reasons.length !== 0) { - return await this.halt(store, state, "eligibility-red"); - } - const candidate = candidateFrom(pipelineResult); - const eligibilityHash = autopilotEligibilityRecordHash(eligibility); - state = await store.transition({ - expectedRevision: state.revision, - to: "promoting-task", - update(draft) { - const current = draft.tasks[index]; - current.runId = pipelineResult.runId; - current.candidateManifestHash = candidate.manifestHash; - current.eligibilityHash = eligibilityHash; - } - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.(`promote:${task.id}`); - const promotion = await this.dependencies.promoter.promote({ - workflowId, - runId: pipelineResult.runId, - workflowCheckoutPath: branch.worktreePath, - expectedHead: expectedHead2, - expectedArtifactHash: candidate.manifestHash, - commitMessage: task.commitMessage - }).catch(async (error51) => await this.halt( - store, - state, - classificationOf(error51, "promotion-failed") - )); - if (promotion.status === "rejected") { - return await this.halt(store, state, promotion.classification); - } - expectedHead2 = promotion.commitOid; - const nextPhase = index === spec.tasks.length - 1 ? "final-review" : "running-task"; - state = await store.transition({ - expectedRevision: state.revision, - to: nextPhase, - update(draft) { - const current = draft.tasks[index]; - current.status = "promoted"; - current.promotionCommitOid = promotion.commitOid; - draft.currentTaskIndex = index + 1; - if (nextPhase === "running-task") { - draft.tasks[index + 1].status = "running"; - } - } - }); - await this.haltIfAborted(store, state); - } - await this.haltIfAborted(store, state); - this.dependencies.emit?.("final-review"); - const report = await this.dependencies.finalBranchReviewer.review({ - workflowId, - expectedRevision: state.revision, - taskEvidence: state.tasks.map((task) => ({ - taskId: task.id, - runId: task.runId, - candidateManifestHash: task.candidateManifestHash, - promotionCommitOid: task.promotionCommitOid, - evidenceRefs: [...REQUIRED_TASK_EVIDENCE_REFS2] - })), - autopilotSpec: spec, - checkoutPath: branch.worktreePath - }).catch(async (error51) => await this.halt( + pendingCleanup = await this.resumeActiveWorkflow({ store, state, - classificationOf(error51, "final-review-failed") - )); - if (report.workflowId !== workflowId || report.baseCommitOid !== branch.baseCommitOid || report.headCommitOid !== expectedHead2) { - return await this.halt(store, state, "stale-final-review"); - } - if (!report.eligible || report.status !== "ready-to-ship" || report.reasons.length !== 0) { - return await this.halt( - store, - state, - "human-decision-required", - (draft) => { - draft.finalGate = finalGateFor(report); - } - ); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "pushing", - update(draft) { - draft.finalGate = finalGateFor(report); - } - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.("push"); - const pushed = await this.dependencies.hostingAdapter.pushBranch({ - checkoutPath: branch.worktreePath, - target, - branch: branch.branch, - headCommitOid: expectedHead2, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "push-failed"))); - if (pushed.remoteHead !== expectedHead2) { - return await this.halt(store, state, "push-head-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "creating-draft-pr" - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.("draft-pr"); - const pullRequest = await this.dependencies.hostingAdapter.ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead2, - title: spec.shipping.pullRequestTitle, - body: spec.shipping.pullRequestBody, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt( - store, - state, - classificationOf(error51, "draft-pull-request-failed") - )); - if (!pullRequestMatches(pullRequest, target, branch, expectedHead2, true)) { - return await this.halt(store, state, "draft-pull-request-identity-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "waiting-required-checks", - update(draft) { - draft.shipping.prNumber = pullRequest.number; - draft.shipping.prUrl = pullRequest.url; - } - }); - while (true) { - await this.haltIfAborted(store, state); - const beforePoll = Date.parse(this.now()); - if (!Number.isFinite(beforePoll) || beforePoll >= ciDeadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - const observation = await this.dependencies.hostingAdapter.requiredChecks({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead2, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt( - store, - state, - classificationOf(error51, "required-checks-failed") - )); - this.dependencies.emit?.(`checks:${observation.result === "passed" ? "pass" : observation.result === "failed" ? "red" : observation.result}`); - const observedAt = this.now(); - const observedAtMs = Date.parse(observedAt); - state = await store.update({ - expectedRevision: state.revision, - update(draft) { - draft.ciObservations.push({ - observedAt, - result: observation.result, - headCommitOid: observation.headCommitOid, - checks: structuredClone(observation.checks) - }); - } - }); - await this.haltIfAborted(store, state); - if (!Number.isFinite(observedAtMs) || observedAtMs >= ciDeadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - if (checksAreNonEmptyAndPassing(observation, expectedHead2)) break; - if (observation.result === "missing" || observation.checks.length === 0) { - return await this.halt(store, state, "required-checks-missing"); - } - if (observation.result === "failed" || observation.checks.some((check2) => check2.bucket !== "pass" && check2.bucket !== "pending")) { - return await this.halt(store, state, "required-checks-red"); - } - const remainingMs = ciDeadlineMs - observedAtMs; - await this.sleep(Math.min(this.pollIntervalMs, remainingMs)).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "checks-wait-failed"))); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "marking-ready" - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.("mark-ready"); - const readyPullRequest = await this.dependencies.hostingAdapter.markReady({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead2, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "mark-ready-failed"))); - if (!pullRequestMatches(readyPullRequest, target, branch, expectedHead2, false) || readyPullRequest.number !== pullRequest.number || readyPullRequest.url !== pullRequest.url) { - return await this.halt(store, state, "mark-ready-identity-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "cleaning-up" + spec, + branch, + expectedHead: branch.baseCommitOid }); - await this.haltIfAborted(store, state); - const cleanup = await this.cleanupBranch(store, state, branch, expectedHead2); - pendingCleanup = { - store, - state, - headCommitOid: expectedHead2, - pullRequest: readyPullRequest, - cleanup - }; return pendingCleanup; } ); @@ -49015,8 +49251,7 @@ var AutopilotController = class { return { ...result, status: "ready-for-human-review", - headCommitOid: completedCleanup.headCommitOid, - pullRequest: structuredClone(completedCleanup.pullRequest) + headCommitOid: completedCleanup.headCommitOid }; } async status(checkoutPath, workflowId) { @@ -49047,6 +49282,7 @@ var AutopilotController = class { let state = await store.read(); await this.assertRepositoryIdentity(checkoutPath, workflowId, state); if (isTerminal2(state)) return state; + if (state.phase === "preflighting" || state.phase === "running-task" || state.phase === "promoting-task") this.assertPolicyAuthority(); await store.adoptLease(); await this.haltIfAborted(store, state); const recordedWorkflow = recordedWorkflowFrom(await store.readIntentJournal()); @@ -49078,30 +49314,11 @@ var AutopilotController = class { ); } } - let target; - try { - target = await this.dependencies.hostingAdapter.preflight({ - checkoutPath, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }); - } catch (error51) { - throw new AutopilotControllerError( - classificationOf(error51, "preflight-failed"), - "shipping preflight failed" - ); - } - if (branch.ownerRepo !== target.repository || branch.remoteUrl !== target.canonicalHttpsUrl) { - throw new AutopilotControllerError( - "repository-identity-mismatch", - "shipping and workflow repository identities differ" - ); - } const resumed = await this.resumeActiveWorkflow({ store, state, spec: validated.spec, branch, - target, expectedHead: expectedHead2 }); pendingCleanup = resumed; @@ -49140,7 +49357,7 @@ var AutopilotController = class { } } async resumeActiveWorkflow(args) { - const { store, spec, branch, target } = args; + const { store, spec, branch } = args; let state = args.state; let expectedHead2 = args.expectedHead; while (state.phase === "preflighting" || state.phase === "running-task" || state.phase === "promoting-task") { @@ -49273,7 +49490,7 @@ var AutopilotController = class { if (report.workflowId !== state.workflowId || report.baseCommitOid !== branch.baseCommitOid || report.headCommitOid !== expectedHead2) { return await this.halt(store, state, "stale-final-review"); } - if (!report.eligible || report.status !== "ready-to-ship" || report.reasons.length !== 0) { + if (!report.eligible || report.status !== "ready-for-human-review" || report.reasons.length !== 0) { return await this.halt( store, state, @@ -49285,182 +49502,12 @@ var AutopilotController = class { } state = await store.transition({ expectedRevision: state.revision, - to: "pushing", + to: "cleaning-up", update(draft) { draft.finalGate = finalGateFor(report); } }); } - if (state.phase === "pushing") { - await this.haltIfAborted(store, state); - this.dependencies.emit?.("push"); - const pushed = await this.dependencies.hostingAdapter.pushBranch({ - checkoutPath: branch.worktreePath, - target, - branch: branch.branch, - headCommitOid: expectedHead2, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "push-failed"))); - if (pushed.remoteHead !== expectedHead2) { - return await this.halt(store, state, "push-head-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "creating-draft-pr" - }); - } - let pullRequest; - if (state.phase === "creating-draft-pr") { - await this.haltIfAborted(store, state); - this.dependencies.emit?.("draft-pr"); - pullRequest = await this.dependencies.hostingAdapter.ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead2, - title: spec.shipping.pullRequestTitle, - body: spec.shipping.pullRequestBody, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt( - store, - state, - classificationOf(error51, "draft-pull-request-failed") - )); - if (!pullRequestMatches(pullRequest, target, branch, expectedHead2, true)) { - return await this.halt(store, state, "draft-pull-request-identity-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "waiting-required-checks", - update(draft) { - draft.shipping.prNumber = pullRequest.number; - draft.shipping.prUrl = pullRequest.url; - } - }); - } else { - if (state.shipping.prNumber === null || state.shipping.prUrl === null) { - throw new AutopilotControllerError( - "workflow-state-mismatch", - "shipping identity is incomplete" - ); - } - pullRequest = { - number: state.shipping.prNumber, - url: state.shipping.prUrl, - repository: target.repository, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead2, - draft: state.phase !== "cleaning-up" - }; - if (state.phase === "marking-ready" && !stateHasPassingChecks(state)) { - return await this.halt(store, state, "required-checks-proof-missing"); - } - if (state.phase === "waiting-required-checks" || state.phase === "marking-ready") { - const establishedPullRequest = await this.dependencies.hostingAdapter.ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead2, - title: spec.shipping.pullRequestTitle, - body: spec.shipping.pullRequestBody, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt( - store, - state, - classificationOf(error51, "draft-pull-request-failed") - )); - if (!pullRequestIdentityMatches( - establishedPullRequest, - target, - branch, - expectedHead2 - ) || establishedPullRequest.number !== pullRequest.number || establishedPullRequest.url !== pullRequest.url) { - return await this.halt(store, state, "draft-pull-request-identity-mismatch"); - } - pullRequest = establishedPullRequest; - if (!pullRequest.draft) { - if (!stateHasPassingChecks(state)) { - return await this.halt(store, state, "required-checks-proof-missing"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "cleaning-up" - }); - } - } - } - if (state.phase === "waiting-required-checks") { - const deadlineMs = Date.parse(state.shipping.ciDeadlineAt); - if (!Number.isFinite(deadlineMs)) { - return await this.halt(store, state, "required-checks-timeout"); - } - while (true) { - await this.haltIfAborted(store, state); - const beforePoll = Date.parse(this.now()); - if (!Number.isFinite(beforePoll) || beforePoll >= deadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - const observation = await this.dependencies.hostingAdapter.requiredChecks({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead2, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "required-checks-failed"))); - this.dependencies.emit?.(`checks:${observation.result === "passed" ? "pass" : observation.result === "failed" ? "red" : observation.result}`); - const observedAt = this.now(); - const observedAtMs = Date.parse(observedAt); - state = await store.update({ - expectedRevision: state.revision, - update(draft) { - draft.ciObservations.push({ - observedAt, - result: observation.result, - headCommitOid: observation.headCommitOid, - checks: structuredClone(observation.checks) - }); - } - }); - await this.haltIfAborted(store, state); - if (!Number.isFinite(observedAtMs) || observedAtMs >= deadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - if (checksAreNonEmptyAndPassing(observation, expectedHead2)) break; - if (observation.result === "missing" || observation.checks.length === 0) { - return await this.halt(store, state, "required-checks-missing"); - } - if (observation.result === "failed" || observation.checks.some((check2) => check2.bucket !== "pass" && check2.bucket !== "pending")) { - return await this.halt(store, state, "required-checks-red"); - } - const remainingMs = deadlineMs - observedAtMs; - await this.sleep(Math.min(this.pollIntervalMs, remainingMs)).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "checks-wait-failed"))); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "marking-ready" - }); - } - if (state.phase === "marking-ready") { - await this.haltIfAborted(store, state); - this.dependencies.emit?.("mark-ready"); - const readyPullRequest = await this.dependencies.hostingAdapter.markReady({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead2, - ...this.dependencies.abortSignal === void 0 ? {} : { signal: this.dependencies.abortSignal } - }).catch(async (error51) => await this.halt(store, state, classificationOf(error51, "mark-ready-failed"))); - if (!pullRequestMatches(readyPullRequest, target, branch, expectedHead2, false) || readyPullRequest.number !== pullRequest.number || readyPullRequest.url !== pullRequest.url) { - return await this.halt(store, state, "mark-ready-identity-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "cleaning-up" - }); - } if (state.phase !== "cleaning-up") { throw new AutopilotControllerError( "resume-phase-unproven", @@ -49474,7 +49521,7 @@ var AutopilotController = class { branch, expectedHead2 ); - return { store, state, headCommitOid: expectedHead2, pullRequest, cleanup }; + return { store, state, headCommitOid: expectedHead2, cleanup }; } async cleanupBranch(store, state, branch, expectedHead2) { const key = cleanupIntentKey(expectedHead2); @@ -49491,7 +49538,11 @@ var AutopilotController = class { }); } this.dependencies.emit?.("cleanup"); - const cleanup = await this.dependencies.branchManager.cleanup(branch, expectedHead2).catch(() => ({ ok: false, classification: "cleanup-failed" })); + const cleanup = await this.dependencies.branchManager.cleanup( + branch, + expectedHead2, + { retainBranch: true } + ).catch(() => ({ ok: false, classification: "cleanup-failed" })); if (cleanup.ok && cleanup.worktreeRemoved && cleanup.refsRemoved) { await store.completeIntent({ expectedRevision: state.revision, @@ -49537,30 +49588,30 @@ var AutopilotController = class { async finishCleanup(context, lockReleased, releaseError) { const worktreeRemoved = context.cleanup.ok && context.cleanup.worktreeRemoved; const refsRemoved = context.cleanup.ok && context.cleanup.refsRemoved; - const succeeded6 = worktreeRemoved && refsRemoved && lockReleased; + const succeeded = worktreeRemoved && refsRemoved && lockReleased; const classification = releaseError ?? "cleanup-failed"; const completedAt = this.now(); const next = await context.store.transition({ expectedRevision: context.state.revision, - to: succeeded6 ? "ready-for-human-review" : "failed", + to: succeeded ? "ready-for-human-review" : "failed", update(draft) { draft.cleanup = { - status: succeeded6 ? "succeeded" : "failed", + status: succeeded ? "succeeded" : "failed", worktreeRemoved, lockReleased, - error: succeeded6 ? null : classification, + error: succeeded ? null : classification, completedAt }; draft.terminal = { - classification: succeeded6 ? "ready-for-human-review" : "failed", - reason: succeeded6 ? null : classification, + classification: succeeded ? "ready-for-human-review" : "failed", + reason: succeeded ? null : classification, evidenceRefs: draft.finalGate === null ? [] : [draft.finalGate.reportRef], completedAt }; } }); await context.store.releaseLease(); - if (!succeeded6) throw new AutopilotControllerError(classification); + if (!succeeded) throw new AutopilotControllerError(classification); return next; } }; @@ -49571,9 +49622,6 @@ import { createHash as createHash13 } from "node:crypto"; // src/integrate/controlled-integrator.ts var CANDIDATE_REF = /^refs\/claude-architect\/candidates\/[A-Za-z0-9][A-Za-z0-9._-]*$/; var OBJECT_ID2 = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; -function succeeded4(result) { - return result.exitCode === 0; -} function aborted2(detail) { return { integration: "aborted", detail }; } @@ -49619,7 +49667,7 @@ async function stageCandidateTreeWithLock(args, ownership) { "--quiet", `${args.artifact.anchorRef}^{commit}` ]); - if (!succeeded4(anchor) || anchor.stdout.trim() !== args.artifact.candidateCommitOid) { + if (!gitSucceeded(anchor) || anchor.stdout.trim() !== args.artifact.candidateCommitOid) { return complete(aborted2("candidate-anchor-mismatch")); } const candidateTree = await git(canonical, [ @@ -49627,7 +49675,7 @@ async function stageCandidateTreeWithLock(args, ownership) { "--verify", `${args.artifact.candidateCommitOid}^{tree}` ]); - if (!succeeded4(candidateTree) || candidateTree.stdout.trim() !== args.artifact.candidateTreeOid) { + if (!gitSucceeded(candidateTree) || candidateTree.stdout.trim() !== args.artifact.candidateTreeOid) { return complete(aborted2("candidate-tree-mismatch")); } const identity = await structuralVerify({ @@ -49642,7 +49690,7 @@ async function stageCandidateTreeWithLock(args, ownership) { return complete(aborted2("artifact-identity-mismatch")); } const refreshed = await git(canonical, ["update-index", "-q", "--refresh"]); - if (!succeeded4(refreshed)) { + if (!gitSucceeded(refreshed)) { return complete({ integration: "conflicted", detail: "index-refresh-failed" }); } const applied = await git(canonical, [ @@ -49652,7 +49700,7 @@ async function stageCandidateTreeWithLock(args, ownership) { args.artifact.baseCommitOid, args.artifact.candidateTreeOid ]); - if (!succeeded4(applied)) { + if (!gitSucceeded(applied)) { return complete({ integration: "conflicted", detail: "candidate-apply-conflict" }); } const stagedTree = await git(canonical, ["write-tree"]); @@ -49666,7 +49714,7 @@ async function stageCandidateTreeWithLock(args, ownership) { "--ignore-submodules=none", "--no-renames" ]); - if (!succeeded4(stagedTree) || stagedTree.stdout.trim() !== args.artifact.candidateTreeOid || !succeeded4(worktreeDiff) || !succeeded4(head) || head.stdout.trim() !== args.artifact.baseCommitOid || !succeeded4(status) || !statusMatchesArtifact(status.stdout, args.artifact.changedPaths)) { + if (!gitSucceeded(stagedTree) || stagedTree.stdout.trim() !== args.artifact.candidateTreeOid || !gitSucceeded(worktreeDiff) || !gitSucceeded(head) || head.stdout.trim() !== args.artifact.baseCommitOid || !gitSucceeded(status) || !statusMatchesArtifact(status.stdout, args.artifact.changedPaths)) { return complete({ integration: "conflicted", detail: "post-apply-divergence" }); } return complete({ integration: "applied", detail: "candidate tree applied" }); @@ -49692,7 +49740,7 @@ async function applyCandidateTree(args) { args.artifact.anchorRef, args.artifact.candidateCommitOid ]); - if (!succeeded4(deleted)) { + if (!gitSucceeded(deleted)) { return { integration: "applied", detail: "candidate tree applied; candidate anchor delete failed" @@ -49703,30 +49751,26 @@ async function applyCandidateTree(args) { if (args.borrowedCheckoutLock !== void 0) { return await executeWithLock(args.borrowedCheckoutLock, "borrowed"); } - let terminalResult = null; - try { - return await safety.withCheckoutLease(args.repoRoot, async (lock) => { - terminalResult = await executeWithLock(lock, "owned"); - return terminalResult; - }); - } catch (error51) { - if (terminalResult !== null) { - terminalResult.detail = `${terminalResult.detail}; checkout lock release failed`; - return terminalResult; + return await safety.withCheckoutLease( + args.repoRoot, + (lock) => executeWithLock(lock, "owned"), + { + // The terminal result already happened; a failed release must stay + // visible without erasing it. + onReleaseError: (_releaseError, result) => ({ + ...result, + detail: `${result.detail}; checkout lock release failed` + }) } - throw error51; - } + ); } // src/autopilot/candidate-promoter.ts var OBJECT_ID3 = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; -var SHA2564 = /^[0-9a-f]{64}$/u; +var SHA2563 = /^[0-9a-f]{64}$/u; function safeCommitMessage(message) { return message.trim().length > 0 && Buffer.byteLength(message, "utf8") <= 200 && !/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/u.test(message) && !/\bco-authored-by\s*:/iu.test(message) && !/\bgenerated(?:-|\s+)(?:by|with)\b/iu.test(message) && !/\b(?:ai|claude|codex|chatgpt|copilot|gemini|llm)[ -]generated\b/iu.test(message); } -function succeeded5(result) { - return result.exitCode === 0 && result.truncated?.stdout !== true && result.truncated?.stderr !== true; -} function rejected(classification) { return { status: "rejected", classification }; } @@ -49771,6 +49815,7 @@ var PROMOTION_CLASSIFICATION_RECORD = { "journal-failed": true, "anchor-deletion-failed": true, "lock-release-failed": true, + "checkout-busy": true, "human-decision-required": true }; var PROMOTION_CLASSIFICATIONS = new Set( @@ -49790,6 +49835,7 @@ var CandidatePromoter = class { artifactStore; stageCandidate; now; + decisionAuthority; constructor(dependencies = {}) { this.runGit = dependencies.git ?? git; this.platformServices = dependencies.platformServices ?? getPlatformServices(); @@ -49798,6 +49844,7 @@ var CandidatePromoter = class { this.artifactStore = dependencies.artifactStore ?? ((runId) => new ArtifactStore(runId)); this.stageCandidate = dependencies.stageCandidate ?? stageCandidateTreeUnderLock; this.now = dependencies.now ?? (() => (/* @__PURE__ */ new Date()).toISOString()); + this.decisionAuthority = dependencies.decisionAuthority ?? (() => decisionAuthority()); } async proveCommit(checkout, commitOid, treeOid, parentOid, message) { const [tree, parents, body] = await Promise.all([ @@ -49809,8 +49856,8 @@ var CandidatePromoter = class { this.runGit(checkout, ["rev-list", "--parents", "-n", "1", commitOid]), this.runGit(checkout, ["log", "-1", "--format=%B", commitOid]) ]); - const lineage = succeeded5(parents) ? parents.stdout.trim().split(/\s+/u) : []; - return succeeded5(tree) && tree.stdout.trim() === treeOid && lineage.length === 2 && lineage[0] === commitOid && lineage[1] === parentOid && succeeded5(body) && body.stdout.trimEnd() === message; + const lineage = gitSucceeded(parents) ? parents.stdout.trim().split(/\s+/u) : []; + return gitSucceeded(tree) && tree.stdout.trim() === treeOid && lineage.length === 2 && lineage[0] === commitOid && lineage[1] === parentOid && gitSucceeded(body) && body.stdout.trimEnd() === message; } async deleteAnchor(checkout, artifact) { const current = await this.runGit(checkout, [ @@ -49820,10 +49867,10 @@ var CandidatePromoter = class { artifact.anchorRef ]); if (current.exitCode === 1 && current.stdout === "") return true; - if (!succeeded5(current) || current.stdout.trim().split(/\s/u)[0] !== artifact.candidateCommitOid) { + if (!gitSucceeded(current) || current.stdout.trim().split(/\s/u)[0] !== artifact.candidateCommitOid) { return false; } - return succeeded5(await this.runGit(checkout, [ + return gitSucceeded(await this.runGit(checkout, [ "update-ref", "--no-deref", "-d", @@ -49848,7 +49895,7 @@ var CandidatePromoter = class { "--no-renames" ]) ]); - return succeeded5(directRef) && directRef.stdout.trim().split(/\s/u)[0] === commitOid && succeeded5(head) && head.stdout.trim() === commitOid && succeeded5(index) && index.stdout.trim() === treeOid && succeeded5(diff) && succeeded5(status) && status.stdout === ""; + return gitSucceeded(directRef) && directRef.stdout.trim().split(/\s/u)[0] === commitOid && gitSucceeded(head) && head.stdout.trim() === commitOid && gitSucceeded(index) && index.stdout.trim() === treeOid && gitSucceeded(diff) && gitSucceeded(status) && status.stdout === ""; } async proveStagedCandidate(identity, artifact) { const [head, branch, index, diff, status] = await Promise.all([ @@ -49865,7 +49912,7 @@ var CandidatePromoter = class { "--no-renames" ]) ]); - return succeeded5(head) && head.stdout.trim() === artifact.baseCommitOid && succeeded5(branch) && branch.stdout.trim() === identity.branchRef && succeeded5(index) && index.stdout.trim() === artifact.candidateTreeOid && succeeded5(diff) && succeeded5(status) && statusMatchesArtifact(status.stdout, artifact.changedPaths); + return gitSucceeded(head) && head.stdout.trim() === artifact.baseCommitOid && gitSucceeded(branch) && branch.stdout.trim() === identity.branchRef && gitSucceeded(index) && index.stdout.trim() === artifact.candidateTreeOid && gitSucceeded(diff) && gitSucceeded(status) && statusMatchesArtifact(status.stdout, artifact.changedPaths); } async ensureAcceptedDecision(artifactStore, runId, artifact, eligibility, eligibilityHash) { try { @@ -49880,8 +49927,9 @@ var CandidatePromoter = class { } } async promote(request) { - if (!OBJECT_ID3.test(request.expectedHead) || !SHA2564.test(request.expectedArtifactHash) || request.workflowCheckoutPath.length === 0) return rejected("invalid-request"); + if (!OBJECT_ID3.test(request.expectedHead) || !SHA2563.test(request.expectedArtifactHash) || request.workflowCheckoutPath.length === 0) return rejected("invalid-request"); if (!safeCommitMessage(request.commitMessage)) return rejected("invalid-commit-message"); + if (this.decisionAuthority() === "human") return rejected("human-decision-required"); const workflowStore = this.workflowStore(request.workflowId); const artifactStore = this.artifactStore(request.runId); let workflow; @@ -50027,7 +50075,7 @@ var CandidatePromoter = class { request.workflowCheckoutPath, ["rev-parse", "--verify", "HEAD"] ); - if (!succeeded5(currentHead)) { + if (!gitSucceeded(currentHead)) { return { kind: "rejected", classification: "human-decision-required", @@ -50093,19 +50141,6 @@ var CandidatePromoter = class { journalFailure: false }; } - if (!await this.ensureAcceptedDecision( - artifactStore, - request.runId, - artifact, - eligibility, - eligibilityHash - )) { - return { - kind: "rejected", - classification: "decision-conflict", - journalFailure: true - }; - } const staged = await this.stageCandidate({ repoRoot: request.workflowCheckoutPath, artifact, @@ -50124,7 +50159,8 @@ var CandidatePromoter = class { journalFailure: true }; } - } else if (!await this.ensureAcceptedDecision( + } + if (!await this.ensureAcceptedDecision( artifactStore, request.runId, artifact, @@ -50144,11 +50180,11 @@ var CandidatePromoter = class { journalFailure: false }; } - const [author, committer] = await Promise.all([ - this.runGit(request.workflowCheckoutPath, ["var", "GIT_AUTHOR_IDENT"]), - this.runGit(request.workflowCheckoutPath, ["var", "GIT_COMMITTER_IDENT"]) - ]); - if (!succeeded5(author) || !succeeded5(committer)) { + const identityEnv = await userCommitEnvironment( + request.workflowCheckoutPath, + this.runGit + ); + if (identityEnv === null) { return { kind: "rejected", classification: "git-identity-missing", @@ -50162,9 +50198,9 @@ var CandidatePromoter = class { request.expectedHead, "-m", request.commitMessage - ]); + ], { env: identityEnv }); const commitOid = created.stdout.trim(); - if (!succeeded5(created) || !OBJECT_ID3.test(commitOid)) { + if (!gitSucceeded(created) || !OBJECT_ID3.test(commitOid)) { return { kind: "rejected", classification: "commit-creation-failed", @@ -50191,7 +50227,7 @@ var CandidatePromoter = class { commitOid, request.expectedHead ]); - if (!succeeded5(updated)) { + if (!gitSucceeded(updated)) { return { kind: "rejected", classification: "human-decision-required", @@ -50247,7 +50283,7 @@ var CandidatePromoter = class { reason: redact(String(error51)) }); } else if (!enteredLease) { - return finishFailure("branch-identity-changed"); + return finishFailure(isLockContention(error51) ? "checkout-busy" : "branch-identity-changed"); } else { throw error51; } @@ -50271,214 +50307,14 @@ function specSha256(spec) { } // src/runtime/attempt-runtime.ts -import { randomUUID as randomUUID12 } from "node:crypto"; +import { randomUUID as randomUUID11 } from "node:crypto"; import { rm as rm12 } from "node:fs/promises"; -// src/git/candidate-tree.ts -import { lstat as lstat17, mkdtemp as mkdtemp3, rm as rm11 } from "node:fs/promises"; -import { tmpdir as tmpdir6 } from "node:os"; -import path26 from "node:path"; -var MAX_DIAGNOSTIC_LENGTH5 = 2e3; -var MAX_REJECT_PATHS = 25; -var BINARY_PATCH_PAYLOAD_MARKER = "[[BINARY_PATCH_PAYLOAD_OMITTED]]"; -function gitFailure3(action, result) { - const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH5); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit4(cwd, args, indexFile) { - const result = await git(cwd, args, indexFile); - if (result.truncated?.stdout === true || result.truncated?.stderr === true) { - throw new RuntimeError(`git ${args[0] ?? "command"} output exceeded the runtime bound`, { - command: args[0] ?? "command", - truncated: result.truncated - }); - } - if (result.exitCode !== 0) throw gitFailure3(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} -function parsePorcelainPaths(output, kind) { - const fields = splitNul(output); - const paths = []; - for (let index = 0; index < fields.length; index += 1) { - const entry = fields[index]; - const status = entry.slice(0, 2); - const entryPath = entry.slice(3); - if (kind === "ignored" !== (status === "!!")) { - if (status.includes("R")) index += 1; - continue; - } - paths.push(entryPath); - if (status.includes("R")) { - const sourcePath = fields[index + 1]; - if (sourcePath !== void 0) paths.push(sourcePath); - index += 1; - } - } - return [...new Set(paths)]; -} -async function inventoryWorktree(worktreePath) { - const changed = await checkedGit4(worktreePath, [ - "status", - "--porcelain=v1", - "-z", - "--untracked-files=all" - ]); - const ignored = await checkedGit4(worktreePath, [ - "status", - "--porcelain=v1", - "-z", - "--ignored", - "--untracked-files=all" - ]); - return { - changedPaths: parsePorcelainPaths(changed, "changed"), - ignoredPaths: parsePorcelainPaths(ignored, "ignored") - }; -} -function isAllowed2(pathname, writeAllowlist, forbiddenScope, opaqueDirectory = false) { - const scopePaths = opaqueDirectory ? [pathname, `${pathname}/`] : [pathname]; - return writeAllowlist.some((pattern) => scopePaths.some((candidate) => globMatches(pattern, candidate))) && !forbiddenScope.some((pattern) => scopePaths.some((candidate) => globMatches(pattern, candidate, true))); -} -async function advisoryLstatScan(worktreePath, changedPaths) { - const symlinkResults = await Promise.all(changedPaths.map(async (changedPath) => { - try { - return (await lstat17(path26.resolve(worktreePath, changedPath))).isSymbolicLink(); - } catch (error51) { - if (error51.code === "ENOENT") return false; - throw error51; - } - })); - return symlinkResults.some(Boolean); -} -function sanitizeReviewPatch(patch) { - const sanitizedLines = []; - let omittingBinaryPayload = false; - for (const line of patch.split(/\r?\n/)) { - if (line === "GIT binary patch") { - sanitizedLines.push(line, BINARY_PATCH_PAYLOAD_MARKER); - omittingBinaryPayload = true; - continue; - } - if (omittingBinaryPayload) { - if (!line.startsWith("diff --git ")) continue; - omittingBinaryPayload = false; - } - sanitizedLines.push(line); - } - return redact(sanitizedLines.join("\n")); -} -async function freezeCandidate(args) { - const inventory = await inventoryWorktree(args.worktreePath); - const outOfScope = inventory.changedPaths.filter((changedPath) => !isAllowed2(changedPath, args.writeAllowlist, args.forbiddenScope)); - if (outOfScope.length > 0) { - return { ok: false, reason: "out-of-scope-write", paths: outOfScope.slice(0, MAX_REJECT_PATHS) }; - } - if (await advisoryLstatScan(args.worktreePath, inventory.changedPaths)) { - return { ok: false, reason: "modified-symlink" }; - } - const indexDirectory = await mkdtemp3(path26.join(tmpdir6(), "claude-architect-index-")); - const indexFile = path26.join(indexDirectory, "index"); - try { - await checkedGit4(args.worktreePath, ["read-tree", args.baseCommitOid], indexFile); - if (inventory.changedPaths.length > 0) { - const literalPathspecs = inventory.changedPaths.map((changedPath) => `:(literal)${changedPath}`); - await checkedGit4(args.worktreePath, ["add", "--all", "--", ...literalPathspecs], indexFile); - } - const candidateTreeOid = (await checkedGit4(args.worktreePath, ["write-tree"], indexFile)).trim(); - const baseTreeOid = (await checkedGit4( - args.worktreePath, - ["rev-parse", `${args.baseCommitOid}^{tree}`] - )).trim(); - if (candidateTreeOid === baseTreeOid) return { ok: false, reason: "empty-candidate" }; - const rawDiff = parseRawDiff(await checkedGit4(args.worktreePath, [ - "diff-tree", - "-r", - "--no-commit-id", - "--no-renames", - "--raw", - "-z", - args.baseCommitOid, - candidateTreeOid - ])); - const frozenOutOfScope = rawDiff.filter((entry) => !isAllowed2( - entry.path, - args.writeAllowlist, - args.forbiddenScope, - entry.oldMode === "160000" || entry.newMode === "160000" - )).map((entry) => entry.path); - if (frozenOutOfScope.length > 0) { - return { - ok: false, - reason: "out-of-scope-write", - paths: frozenOutOfScope.slice(0, MAX_REJECT_PATHS) - }; - } - if (rawDiff.some((entry) => [entry.oldMode, entry.newMode].some((mode) => mode === "120000" || mode === "160000"))) { - return { ok: false, reason: "modified-symlink" }; - } - const nameStatusOutput = await checkedGit4(args.repoRoot, [ - "diff-tree", - "-r", - "--no-commit-id", - "--no-renames", - "--name-status", - "-z", - args.baseCommitOid, - candidateTreeOid - ]); - const treeOutput = await checkedGit4( - args.repoRoot, - ["ls-tree", "-r", "-z", candidateTreeOid] - ); - const { changedPaths, manifestHash } = computeChangedPathManifest({ - rawDiff, - nameStatusOutput, - treeOutput - }); - const patch = sanitizeReviewPatch(await checkedGit4(args.repoRoot, [ - "diff", - "--no-ext-diff", - "--no-textconv", - "--binary", - "--full-index", - args.baseCommitOid, - candidateTreeOid - ])); - const anchorRef = `refs/claude-architect/candidates/${args.runId}`; - const candidateCommitOid = (await checkedGit4(args.repoRoot, [ - "commit-tree", - candidateTreeOid, - "-p", - args.baseCommitOid, - "-m", - `candidate ${args.runId}` - ])).trim(); - await checkedGit4(args.repoRoot, ["update-ref", anchorRef, candidateCommitOid]); - return { - ok: true, - artifact: { - baseCommitOid: args.baseCommitOid, - candidateTreeOid, - candidateCommitOid, - anchorRef, - manifestHash, - changedPaths, - patch - }, - evidence: { - ignoredPaths: inventory.ignoredPaths.map((ignoredPath) => redact(ignoredPath)).sort((left, right) => left < right ? -1 : left > right ? 1 : 0) - } - }; - } finally { - await rm11(indexDirectory, { recursive: true, force: true }); - } -} - // src/verify/baseline-verifier.ts -import { randomUUID as randomUUID11 } from "node:crypto"; -import { readFile as readFile7 } from "node:fs/promises"; +import { randomUUID as randomUUID10 } from "node:crypto"; +import { readFile as readFile6 } from "node:fs/promises"; import { basename } from "node:path"; -import path27 from "node:path"; +import path29 from "node:path"; function throwIfAborted(signal) { if (!signal?.aborted) return; throw new DOMException("Baseline verification was cancelled", "AbortError"); @@ -50561,7 +50397,7 @@ function shellCommandInvokesVitest(command, scripts, visitedScripts) { } async function packageScriptInvokesVitest(cwd, scriptName) { try { - const parsed = JSON.parse(await readFile7(path27.join(cwd, "package.json"), "utf8")); + const parsed = JSON.parse(await readFile6(path29.join(cwd, "package.json"), "utf8")); if (parsed === null || typeof parsed !== "object" || !("scripts" in parsed)) return false; const scripts = parsed.scripts; if (scripts === null || typeof scripts !== "object") return false; @@ -50572,9 +50408,7 @@ async function packageScriptInvokesVitest(cwd, scriptName) { /* @__PURE__ */ new Set([scriptName]) ); } catch (error51) { - if (typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT") { - return false; - } + if (isMissing(error51)) return false; throw error51; } } @@ -50630,7 +50464,7 @@ async function verifyBaseline(args) { // A runId gives recovery a deterministic, reclaimable name; without one // (only unit callers), fall back to a unique id so repeated same-commit // fixtures cannot collide on a shared worktrees root. - `baseline-${args.runId ?? args.verificationId?.() ?? randomUUID11()}`, + `baseline-${args.runId ?? args.verificationId?.() ?? randomUUID10()}`, ps, args.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: args.borrowedCheckoutLease } ); @@ -50735,7 +50569,7 @@ async function verifyBaseline(args) { } // src/runtime/producer-preflight.ts -import path28 from "node:path"; +import path30 from "node:path"; var PREFLIGHT_PROBE_FILE = "claude-architect-preflight.txt"; var PREFLIGHT_TIMEOUT_MS = 18e4; var PREFLIGHT_OUTPUT_LIMIT = 256 * 1024; @@ -50843,7 +50677,7 @@ async function runProducerPreflight(args) { let contents; try { const probeBytes = await readStableRegularFile( - path28.join(worktree.path, PREFLIGHT_PROBE_FILE), + path30.join(worktree.path, PREFLIGHT_PROBE_FILE), BigInt(PROBE_FILE_LIMIT) ); if (probeBytes === null) throw new RuntimeError("the Producer probe file is not stable"); @@ -50895,14 +50729,14 @@ async function runProducerPreflight(args) { } // src/runtime/reproducibility.ts -import { readFile as readFile8 } from "node:fs/promises"; +import { readFile as readFile7 } from "node:fs/promises"; var REPOSITORY_INSTRUCTION_PATHS = ["AGENTS.md", "CLAUDE.md"]; -function gitFailure4(action, result) { +function gitFailure2(action, result) { const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, 2e3); return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); } function assertCompleteGitOutput(action, result) { - if (result.exitCode !== 0) throw gitFailure4(action, result); + if (result.exitCode !== 0) throw gitFailure2(action, result); if (result.truncated?.stdout === true) { throw new RuntimeError(`${action} output exceeded the runtime limit`); } @@ -50949,11 +50783,11 @@ function defaultVerifierModuleUrls() { ]; } function isMissingModule(error51) { - const code = error51.code; + const code = errorCode(error51); return code === "ENOENT" || code === "ENOTDIR"; } async function collectPackagedVerifier(dependencies) { - const readModule = dependencies.readModule ?? ((url2) => readFile8(url2)); + const readModule = dependencies.readModule ?? ((url2) => readFile7(url2)); const candidates = dependencies.verifierModuleUrls ?? defaultVerifierModuleUrls(); let lastMissingError; for (const candidate of candidates) { @@ -51136,7 +50970,9 @@ async function archiveTerminal(context) { configurationProfile: context.profile, temporaryHomeApplied: context.temporaryHomeApplied }, - verificationPolicy: context.evidence.verificationPolicy ?? [] + // Absent stays absent: "the verifier recorded nothing" must not read as + // "no command ran", which the decision policy treats as confined. + ...context.evidence.verificationPolicy === void 0 ? {} : { verificationPolicy: context.evidence.verificationPolicy } }, repositoryInstructions: context.repositoryInstructions, prompt: context.invocation?.stdin ?? `${context.spec.objective} @@ -51195,7 +51031,7 @@ async function runAttempt(checkoutPath, spec, deps) { const producerRegistry = deps.producerRegistry ?? registry2; const now = deps.now ?? Date.now; const startedAtMs = now(); - const runId = (deps.runId ?? randomUUID12)(); + const runId = (deps.runId ?? randomUUID11)(); const store = new ArtifactStore(runId); const inferredSlices = Array.isArray(spec.slices) ? spec.slices.length : 0; const statusContext = deps.runStatus ?? { @@ -51753,14 +51589,13 @@ function evaluateGates(input) { let requiresHumanDecision = false; const dispositionsById = new Map(input.dispositions.map((d) => [d.findingId, d])); for (const finding of input.findings) { - if (finding.severity === "nit") continue; + if (finding.severity === "nit" || finding.severity === "minor") continue; const disposition = dispositionsById.get(finding.id); if (!disposition) { reasons.push(`finding ${finding.id} (${finding.severity}) has no disposition`); - if (finding.severity === "blocker" || finding.severity === "major") requiresHumanDecision = true; + requiresHumanDecision = true; continue; } - if (finding.severity === "minor") continue; if (RESOLVING.has(disposition.disposition)) { if (disposition.disposition === "fixed" && !disposition.commit) { reasons.push(`finding ${finding.id} marked fixed without a commit`); @@ -51875,9 +51710,9 @@ function routeSlice(input) { } // src/pipeline/slice-composer.ts -import { mkdtemp as mkdtemp4, rm as rm13 } from "node:fs/promises"; -import { tmpdir as tmpdir7 } from "node:os"; -import path29 from "node:path"; +import { mkdtemp as mkdtemp5, rm as rm13 } from "node:fs/promises"; +import { tmpdir as tmpdir8 } from "node:os"; +import path31 from "node:path"; var NULL_OID = "0000000000000000000000000000000000000000"; function parseRawDiffEntries(raw) { const fields = raw.split("\0"); @@ -51931,8 +51766,8 @@ async function composeSliceOntoHead(args) { `slice ${args.sliceIndex} changed paths already written by its wave: ${collisions.join(", ")}` ); } - const indexRoot = await mkdtemp4(path29.join(tmpdir7(), "ca-compose-")); - const indexFile = path29.join(indexRoot, "index"); + const indexRoot = await mkdtemp5(path31.join(tmpdir8(), "ca-compose-")); + const indexFile = path31.join(indexRoot, "index"); try { const options = { ...args.objectReadOptions, indexFile }; await checked(args.checkoutPath, ["read-tree", args.head], options, runGit); @@ -52099,50 +51934,46 @@ async function runFix(args) { } // src/pipeline/candidate-verifier.ts -function gitFailure5(action, result) { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit5(cwd, args, options) { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure5(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} +var SKIP_MARKERS = [ + /\b(?:it|test|describe|context|suite)\.(?:skip|todo)\(/u, + /\bx(?:it|describe|test|context)\(/u, + /@(?:pytest\.mark\.(?:skip|skipif|xfail)|unittest\.(?:skip|skipIf|skipUnless|expectedFailure))\b/u, + /\b(?:pytest|self)\.skip(?:Test)?\(/u, + /\bt\.Skip(?:Now|f)?\(/u, + /#\[ignore\b/u, + /@(?:Disabled|Ignore)\b/u, + /\[Ignore\b|\bSkip\s*=\s*"/u, + /^\s*(?:skip|pending)(?:\s*\(|\s+["'])/u +]; function analyzeWeakenedTests(diff, allowedTestDeletions = [], deletedPaths) { let testsDeleted = 0; let testsSkipped = 0; const authorizedTestDeletions = []; + const recordDeletion = (deletedPath) => { + if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { + authorizedTestDeletions.push(deletedPath); + } else { + testsDeleted++; + } + }; let currentFileIsTest = false; let currentPath = null; for (const line of diff.split("\n")) { - if (deletedPaths === void 0 && /^deleted file mode/.test(line)) { - if (currentFileIsTest && currentPath !== null) { - const deletedPath = currentPath; - if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } - } + if (line.startsWith("diff --git ")) { + currentPath = /^diff --git a\/(\S+) b\/\S+$/u.exec(line)?.[1] ?? null; + currentFileIsTest = currentPath !== null ? isTestPath(currentPath) : /test|spec/u.test(line); + continue; } - const diffHeader = /^diff --git a\/(\S+) b\/\S+$/.exec(line); - if (diffHeader !== null) { - currentPath = diffHeader[1] ?? null; - currentFileIsTest = currentPath !== null && /(^|\/)tests?\/|\.test\.|\.spec\./.test(currentPath); - } else if (/^diff --git /.test(line)) { - currentPath = null; - currentFileIsTest = /(^|\/)tests?\/|\.test\.|\.spec\./.test(line); + if (!currentFileIsTest) continue; + if (deletedPaths === void 0 && line.startsWith("deleted file mode") && currentPath !== null) { + recordDeletion(currentPath); + } else if (line.startsWith("+") && !line.startsWith("+++")) { + const added = line.slice(1); + if (SKIP_MARKERS.some((marker) => marker.test(added))) testsSkipped++; } - if (currentFileIsTest && /^\+.*\b(it|test|describe)\.(skip|todo)\(/.test(line)) testsSkipped++; - if (currentFileIsTest && /^\+.*\bxit\(|^\+.*\bxdescribe\(/.test(line)) testsSkipped++; } for (const deletedPath of deletedPaths ?? []) { - if (!/(^|\/)tests?\/|\.test\.|\.spec\./.test(deletedPath)) continue; - if (allowedTestDeletions.some((pattern) => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } + if (isTestPath(deletedPath)) recordDeletion(deletedPath); } return { testsDeleted, testsSkipped, authorizedTestDeletions }; } @@ -52167,7 +51998,7 @@ function parseDeletedPaths(nameStatus) { async function candidateArtifact(args) { const artifact = { baseCommitOid: args.baselineCommit, - candidateTreeOid: (await checkedGit5( + candidateTreeOid: (await gitChecked( args.worktreePath, ["rev-parse", `${args.candidateCommit}^{tree}`] )).trim(), @@ -52175,7 +52006,11 @@ async function candidateArtifact(args) { anchorRef: args.anchorRef, manifestHash: "", changedPaths: [], - patch: args.diffText + patch: await candidateReviewPatch( + args.worktreePath, + args.baselineCommit, + args.candidateCommit + ) }; const canonical = await recomputeManifest({ worktreePath: args.worktreePath, @@ -52205,21 +52040,16 @@ async function verifyCandidate(args) { commit: args.candidateCommit, cleanupFailureMessage: "pipeline verification worktree could not be cleaned up", run: async (worktreePath) => { - const [diffText, , nameStatus, status, ancestry] = await Promise.all([ - checkedGit5(worktreePath, ["diff", `${args.baselineCommit}..${args.candidateCommit}`]), - checkedGit5(worktreePath, [ - "diff", - "--name-only", - `${args.baselineCommit}..${args.candidateCommit}` - ]), - checkedGit5(worktreePath, [ + const [diffText, nameStatus, status, ancestry] = await Promise.all([ + reviewDiff(worktreePath, args.baselineCommit, args.candidateCommit), + gitChecked(worktreePath, [ "diff", "--name-status", "--no-renames", "-z", `${args.baselineCommit}..${args.candidateCommit}` ]), - checkedGit5(worktreePath, ["status", "--porcelain"]), + gitChecked(worktreePath, ["status", "--porcelain"]), git(worktreePath, [ "merge-base", "--is-ancestor", @@ -52231,8 +52061,7 @@ async function verifyCandidate(args) { worktreePath, baselineCommit: args.baselineCommit, candidateCommit: args.candidateCommit, - anchorRef: args.attempt.candidate?.anchorRef ?? "", - diffText + anchorRef: args.attempt.candidate?.anchorRef ?? "" }); const verifier = new AcceptanceVerifier({ mode: "composed-slice" }); const acceptance = await verifier.verify({ @@ -52247,7 +52076,7 @@ async function verifyCandidate(args) { verificationId: () => `${args.attempt.runId}-${namespace}pipeline`, logNamePrefix: `${namespace}pipeline-verification` }); - const scopeViolations = artifact.changedPaths.filter((change) => !isAllowed( + const scopeViolations = artifact.changedPaths.filter((change) => !isAllowed2( change.path, args.spec.writeAllowlist, args.spec.forbiddenScope, @@ -52294,16 +52123,7 @@ async function verifyCandidate(args) { } // src/pipeline/candidate-provenance.ts -import path30 from "node:path"; -function gitFailure6(action, result) { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit6(cwd, args, options) { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure6(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} +import path32 from "node:path"; function privateObjectReadOptions(access6) { return { env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: access6.privateObjectsDir } @@ -52311,8 +52131,8 @@ function privateObjectReadOptions(access6) { } async function importPromotedObjects(args) { const privateObjects = privateObjectReadOptions(args.access); - const packPrefix = path30.join(args.access.sharedObjectsDir, "pack", "pack"); - await checkedGit6( + const packPrefix = path32.join(args.access.sharedObjectsDir, "pack", "pack"); + await gitChecked( args.checkoutPath, ["pack-objects", "--revs", packPrefix], { @@ -52322,9 +52142,9 @@ async function importPromotedObjects(args) { ` } ); - await checkedGit6(args.checkoutPath, ["cat-file", "-e", `${args.promotedCommit}^{commit}`]); - await checkedGit6(args.checkoutPath, ["rev-parse", `${args.promotedCommit}^{tree}`]); - await checkedGit6(args.checkoutPath, [ + await gitChecked(args.checkoutPath, ["cat-file", "-e", `${args.promotedCommit}^{commit}`]); + await gitChecked(args.checkoutPath, ["rev-parse", `${args.promotedCommit}^{tree}`]); + await gitChecked(args.checkoutPath, [ "rev-list", "--objects", args.promotedCommit, @@ -52461,15 +52281,6 @@ function scopeSpecToSlice(spec, slice) { delete scoped.slices; return scoped; } -function gitFailure7(action, result) { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit7(cwd, args, options) { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure7(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} function temporarySliceRef(runId, index, attempt) { return `${SLICE_REF_PREFIX}${runId}/slice-${index}-attempt-${attempt}`; } @@ -52481,7 +52292,7 @@ async function createTemporarySliceRef(checkoutPath, temporaryRef) { temporaryRef.oid, "0".repeat(temporaryRef.oid.length) ]); - if (result.exitCode !== 0) throw gitFailure7("create temporary slice ref", result); + if (result.exitCode !== 0) throw gitFailure("create temporary slice ref", result); } async function cleanupTemporarySliceRefs(checkoutPath, temporaryRefs) { const errors = []; @@ -52495,7 +52306,7 @@ async function cleanupTemporarySliceRefs(checkoutPath, temporaryRefs) { temporaryRef.oid ]); if (result.exitCode !== 0) { - errors.push(gitFailure7("delete temporary slice ref", result)); + errors.push(gitFailure("delete temporary slice ref", result)); } } catch (error51) { errors.push(error51); @@ -52555,10 +52366,7 @@ async function runSliceReview(args) { commit: args.candidateCommit, cleanupFailureMessage: "slice review failed and its worktree could not be cleaned up", run: async (worktreePath) => { - const diffText = await checkedGit7(worktreePath, [ - "diff", - `${args.baselineCommit}..${args.candidateCommit}` - ]); + const diffText = await reviewDiff(worktreePath, args.baselineCommit, args.candidateCommit); const reviewRun = await runReviews({ reviewers: args.reviewers, spec: args.spec, @@ -53054,12 +52862,12 @@ async function runAdvisorStage(args) { } } const report = outcome.ok ? redactRecord(outcome.report) : failureReport(outcome.failure, outcome.failedRoleLogRef); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: archivedPipelineResult, reviewSnapshot: archivedReviewSnapshot, advisor: report, evaluatedAt: args.evaluatedAt - })); + }); await transitionRunStatusSafely(statusStore, args.runId, "gating", { role: "advisor" }); @@ -53095,17 +52903,7 @@ async function runAdvisorStage(args) { } // src/pipeline/pipeline-runtime.ts -var schemas6 = loadSchemas(); var CANDIDATE_REF_PREFIX2 = "refs/claude-architect/candidates/"; -function gitFailure8(action, result) { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2e3); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit8(cwd, args, options) { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure8(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} function failedResult(attempt, rounds, finalCandidateCommit, reason, failure3 = "producer-failure", increments = [], slices = [], haltedSliceIndex = null) { return { runId: attempt.runId, @@ -53186,7 +52984,7 @@ async function archiveSlicedFailure(args) { candidate.anchorRef, candidate.candidateCommitOid ]); - if (deleted.exitCode !== 0) throw gitFailure8("delete sliced candidate anchor", deleted); + if (deleted.exitCode !== 0) throw gitFailure("delete sliced candidate anchor", deleted); } const failedAttempt = { ...args.attempt, @@ -53228,77 +53026,44 @@ async function archiveSliceExecutionError(args) { ); } } -async function candidateArtifact2(args) { - const artifact = { - baseCommitOid: args.baselineCommit, - candidateTreeOid: (await checkedGit8( - args.worktreePath, - ["rev-parse", `${args.candidateCommit}^{tree}`] - )).trim(), - candidateCommitOid: args.candidateCommit, - anchorRef: args.anchorRef, - manifestHash: "", - changedPaths: [], - patch: args.diffText - }; - const canonical = await recomputeManifest({ - worktreePath: args.worktreePath, - baseCommitOid: args.baselineCommit, - artifact - }); - if (canonical.manifestHash === null) { - throw new RuntimeError("final candidate paths collide under case folding"); - } - return { - ...artifact, - changedPaths: canonical.changedPaths, - manifestHash: canonical.manifestHash - }; -} async function promoteFinalCandidate(args) { + const treeLookup = await git( + args.checkoutPath, + ["rev-parse", "--verify", "--quiet", `${args.candidateCommit}^{tree}`] + ); + if (!gitSucceeded(treeLookup)) { + const missing = treeLookup.exitCode === 1 && treeLookup.stdout.trim() === ""; + return missing ? { ok: false, failure: "sandbox-violation", reason: "candidate commit is missing from the git object store" } : { ok: false, failure: "environment-defect", reason: "candidate tree could not be read from the git object store" }; + } + const finalTree = treeLookup.stdout.trim(); let canonicalCommit; try { - const objectReadOptions = args.privateObjectAccess === void 0 ? void 0 : privateObjectReadOptions(args.privateObjectAccess); - const finalTree = (await checkedGit8( - args.checkoutPath, - ["rev-parse", `${args.candidateCommit}^{tree}`], - objectReadOptions - )).trim(); - canonicalCommit = (await checkedGit8(args.checkoutPath, [ + canonicalCommit = (await gitChecked(args.checkoutPath, [ "commit-tree", finalTree, "-p", args.baselineCommit, "-m", `candidate ${args.attempt.runId}` - ], objectReadOptions)).trim(); - if (args.privateObjectAccess !== void 0) { - await importPromotedObjects({ - checkoutPath: args.checkoutPath, - baselineCommit: args.baselineCommit, - promotedCommit: canonicalCommit, - access: args.privateObjectAccess - }); - } + ])).trim(); } catch { - return null; + return { + ok: false, + failure: "environment-defect", + reason: "candidate could not be rebuilt in the shared git object store" + }; } - await checkedGit8(args.checkoutPath, [ + await gitChecked(args.checkoutPath, [ "update-ref", args.initialCandidate.anchorRef, canonicalCommit, args.initialCandidate.candidateCommitOid ]); - const diffText = await checkedGit8( - args.checkoutPath, - ["diff", `${args.baselineCommit}..${canonicalCommit}`] - ); - const candidate = await candidateArtifact2({ + const candidate = await candidateArtifact({ worktreePath: args.checkoutPath, baselineCommit: args.baselineCommit, candidateCommit: canonicalCommit, - anchorRef: args.initialCandidate.anchorRef, - diffText + anchorRef: args.initialCandidate.anchorRef }); const manifest = await args.store.readManifest(); if (manifest === null) throw new RuntimeError("run manifest is missing during promotion"); @@ -53307,7 +53072,7 @@ async function promoteFinalCandidate(args) { result: finalAttempt, manifest: { ...manifest, candidateManifestHash: candidate.manifestHash } }); - return { attempt: finalAttempt, candidateCommit: canonicalCommit }; + return { ok: true, attempt: finalAttempt, candidateCommit: canonicalCommit }; } async function runPipeline(checkoutPath, spec, deps) { const ps = deps.ps ?? getPlatformServices(); @@ -53395,10 +53160,9 @@ async function salvagePipelineFailure(context, deps, state, args) { initialCandidate: state.finalAttempt.candidate, baselineCommit: state.baselineCommit, candidateCommit: salvagedCommit, - store, - ...state.gitObjectAccess === null ? {} : { privateObjectAccess: state.gitObjectAccess } + store }); - if (promoted === null) return await fallback(); + if (!promoted.ok) return await fallback(); salvagedAttempt = promoted.attempt; salvagedCommit = promoted.candidateCommit; } @@ -53512,11 +53276,8 @@ async function resolveHaltedSlicePhase(context, deps, state, phase) { candidateCommit: state.currentCandidateCommit, store }); - if (promoted === null) { - return await archiveHalt( - "partial halt candidate could not be promoted from the git object store", - "sandbox-violation" - ); + if (!promoted.ok) { + return await archiveHalt(`partial halt ${promoted.reason}`, promoted.failure); } state.finalAttempt = promoted.attempt; state.currentCandidateCommit = promoted.candidateCommit; @@ -53553,126 +53314,142 @@ async function resolveHaltedSlicePhase(context, deps, state, phase) { await store.writePipelineArtifact("pipeline-result", haltResult); return haltResult; } -async function runIncrementPhase(context, deps, state, worktreePath, maxIncrements) { - const { checkoutPath, spec, store } = context; +async function withRoleWorktree(context, commit, label, run) { + return await withManagedWorktree({ + manager: new WorktreeManager( + context.checkoutPath, + `${context.runId}-${label}`, + context.ps, + context.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: context.borrowedCheckoutLease } + ), + commit, + cleanupFailureMessage: "pipeline role worktree could not be cleaned up", + run + }); +} +async function adoptWriterCommit(args) { + const provenanceFailure = await args.validateProvenance(); + if (provenanceFailure !== null) return provenanceFailure; + if (args.candidateCommit === args.previousCandidateCommit) return null; try { - state.gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + await importPromotedObjects({ + checkoutPath: args.context.checkoutPath, + baselineCommit: args.previousCandidateCommit, + promotedCommit: args.candidateCommit, + access: args.gitObjectAccess + }); } catch { - return terminal(failedAtCurrentCandidate( - state, - "increment git object isolation could not be established", - "sandbox-violation" - )); + return { + failure: "environment-defect", + reason: `${args.phaseLabel} objects could not be imported into the shared git object store` + }; } - const gitObjectAccess = state.gitObjectAccess; - const privateObjects = privateObjectReadOptions(gitObjectAccess); - try { - for (let increment = 2; increment <= maxIncrements; increment += 1) { - if (deps.abortSignal?.aborted === true) { - return terminal(failedAtCurrentCandidate( - state, - `cancelled before increment ${increment}`, - "cancelled" - )); - } - await context.notePhase(`increment ${increment}/${maxIncrements}`); - const previousCandidateCommit = state.currentCandidateCommit; - const diffText = await checkedGit8(worktreePath, [ - "diff", - `${state.baselineCommit}..${state.currentCandidateCommit}` - ], privateObjects); - const incrementRun = await runIncrement({ - spec, - pkg: { - spec, - baselineCommit: state.baselineCommit, - candidateCommit: state.currentCandidateCommit, - candidateDiff: diffText, - testEvidence: state.frozenTestEvidence, - progress: composeProgressNotes(state.increments.at(-1)?.report ?? state.attempt) - }, - worktreePath, - deps, - runId: state.attempt.runId, - increment, - store, - gitObjectAccess, - ...context.runStart === void 0 ? {} : { runStart: context.runStart } - }); - if (!incrementRun.ok) { - return terminal(failedAtCurrentCandidate( - state, - `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, - incrementRun.failure - )); - } - const report = redactRecord(incrementRun.report); - await store.writePipelineArtifact(`increment-${increment}`, report); - const provenanceFailure = await validateCandidateProvenance({ - worktreePath, - previousCandidateCommit, - candidateCommit: report.candidateCommit, - gitObjectAccess - }); - if (provenanceFailure !== null) { - return terminal(failedAtCurrentCandidate( - state, - provenanceFailure.reason, - provenanceFailure.failure - )); - } - const [previousTree, candidateTree] = await Promise.all([ - checkedGit8(worktreePath, ["rev-parse", `${previousCandidateCommit}^{tree}`], privateObjects), - checkedGit8(worktreePath, ["rev-parse", `${report.candidateCommit}^{tree}`], privateObjects) - ]); - const progressed = previousTree.trim() !== candidateTree.trim(); - if (report.candidateCommit !== previousCandidateCommit) { + return null; +} +async function runIncrementPhase(context, deps, state, maxIncrements) { + const { checkoutPath, spec, store } = context; + for (let increment = 2; increment <= maxIncrements; increment += 1) { + if (deps.abortSignal?.aborted === true) { + return terminal(failedAtCurrentCandidate( + state, + `cancelled before increment ${increment}`, + "cancelled" + )); + } + await context.notePhase(`increment ${increment}/${maxIncrements}`); + const previousCandidateCommit = state.currentCandidateCommit; + const outcome = await withRoleWorktree( + context, + previousCandidateCommit, + `increment-${increment}`, + async (worktreePath) => { + let gitObjectAccess; try { - await importPromotedObjects({ - checkoutPath, - baselineCommit: previousCandidateCommit, - promotedCommit: report.candidateCommit, - access: gitObjectAccess - }); + gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); } catch { return terminal(failedAtCurrentCandidate( state, - "increment objects could not be imported into the shared git object store", + "increment git object isolation could not be established", "sandbox-violation" )); } + const diffText = await reviewDiff(checkoutPath, state.baselineCommit, previousCandidateCommit); + let incrementRun; + try { + incrementRun = await runIncrement({ + spec, + pkg: { + spec, + baselineCommit: state.baselineCommit, + candidateCommit: previousCandidateCommit, + candidateDiff: diffText, + testEvidence: state.frozenTestEvidence, + progress: composeProgressNotes(state.increments.at(-1)?.report ?? state.attempt) + }, + worktreePath, + deps, + runId: state.attempt.runId, + increment, + store, + gitObjectAccess, + ...context.runStart === void 0 ? {} : { runStart: context.runStart } + }); + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment phase failed unexpectedly", + "producer-failure" + )); + } + if (!incrementRun.ok) { + return terminal(failedAtCurrentCandidate( + state, + `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, + incrementRun.failure + )); + } + const report = redactRecord(incrementRun.report); + await store.writePipelineArtifact(`increment-${increment}`, report); + const adoptionFailure = await adoptWriterCommit({ + context, + gitObjectAccess, + previousCandidateCommit, + candidateCommit: report.candidateCommit, + phaseLabel: "increment", + validateProvenance: () => validateCandidateProvenance({ + worktreePath, + previousCandidateCommit, + candidateCommit: report.candidateCommit, + gitObjectAccess + }) + }); + if (adoptionFailure !== null) { + return terminal(failedAtCurrentCandidate( + state, + adoptionFailure.reason, + adoptionFailure.failure + )); + } + const [previousTree, candidateTree] = await Promise.all([ + gitChecked(checkoutPath, ["rev-parse", `${previousCandidateCommit}^{tree}`]), + gitChecked(checkoutPath, ["rev-parse", `${report.candidateCommit}^{tree}`]) + ]); + state.currentCandidateCommit = report.candidateCommit; + state.increments.push({ increment, report, roleLogRefs: incrementRun.roleLogRefs }); + if (report.status === "complete") state.incrementOutcome = "complete"; + else if (report.status === "blocked") state.incrementOutcome = "blocked"; + else if (previousTree.trim() === candidateTree.trim()) state.incrementOutcome = "stalled"; + return CONTINUE; } - state.currentCandidateCommit = report.candidateCommit; - state.increments.push({ - increment, - report, - roleLogRefs: incrementRun.roleLogRefs - }); - if (report.status === "complete") { - state.incrementOutcome = "complete"; - break; - } - if (report.status === "blocked") { - state.incrementOutcome = "blocked"; - break; - } - if (!progressed) { - state.incrementOutcome = "stalled"; - break; - } - } - state.incrementOutcome ??= "budget-exhausted"; - } catch { - return terminal(failedAtCurrentCandidate( - state, - "increment phase failed unexpectedly", - "producer-failure" - )); + ); + if (outcome.state === "terminal") return outcome; + if (state.incrementOutcome !== void 0) break; } + state.incrementOutcome ??= "budget-exhausted"; return CONTINUE; } -async function runReviewRounds(context, deps, state, worktreePath, reviewers, maxRounds) { - const { spec, store } = context; +async function runReviewRounds(context, deps, state, reviewers, maxRounds) { + const { checkoutPath, spec, store } = context; for (let round = 1; round <= maxRounds; round += 1) { if (deps.abortSignal?.aborted === true) { return terminal(failedAtCurrentCandidate( @@ -53682,28 +53459,31 @@ async function runReviewRounds(context, deps, state, worktreePath, reviewers, ma )); } await context.notePhase(`review round ${round}/${maxRounds}`); - const diffText = await checkedGit8(worktreePath, [ - "diff", - `${state.baselineCommit}..${state.currentCandidateCommit}` - ], state.gitObjectAccess === null ? void 0 : privateObjectReadOptions(state.gitObjectAccess)); + const reviewedCommit = state.currentCandidateCommit; + const diffText = await reviewDiff(checkoutPath, state.baselineCommit, reviewedCommit); const pkg = { spec, baselineCommit: state.baselineCommit, - candidateCommit: state.currentCandidateCommit, + candidateCommit: reviewedCommit, candidateDiff: diffText, testEvidence: state.frozenTestEvidence }; - const reviewRun = await runReviews({ - reviewers, - spec, - pkg, - worktreePath, - deps, - runId: state.attempt.runId, - round, - store, - onReviewer: (role) => context.emitStatus("reviewing", { round, role }) - }); + const reviewRun = await withRoleWorktree( + context, + reviewedCommit, + `round-${round}-review`, + (worktreePath) => runReviews({ + reviewers, + spec, + pkg, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + onReviewer: (role) => context.emitStatus("reviewing", { round, role }) + }) + ); if (!reviewRun.ok) { return terminal(await salvagePipelineFailure(context, deps, state, { reason: `review phase did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, @@ -53733,75 +53513,84 @@ async function runReviewRounds(context, deps, state, worktreePath, reviewers, ma }; state.rounds.push(roundRecord); if (!blocking && approved) break; - try { - state.gitObjectAccess ??= await resolveLinkedWorktreeWritableRoots(worktreePath); - } catch { - return terminal(await archivePipelineFailure(context, state, { - reason: "fixer git object isolation could not be established", - failure: "sandbox-violation" - })); - } await context.emitStatus("fixing", { round, role: "fixer" }); await context.notePhase(`round ${round}: applying fixes`); - const fixRun = await runFix({ - spec, - pkg: { ...pkg, findings: consolidated.findings }, - worktreePath, - deps, - runId: state.attempt.runId, - round, - store, - gitObjectAccess: state.gitObjectAccess, - ...context.runStart === void 0 ? {} : { runStart: context.runStart } - }); - if (!fixRun.ok) { - return terminal(await salvagePipelineFailure(context, deps, state, { - reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, - failure: fixRun.failure - })); - } - const { fix } = fixRun; - await store.writePipelineArtifact(`round-${round}-fix`, fix); - const provenanceFailure = await validateFixProvenance({ - worktreePath, - previousCandidateCommit: state.currentCandidateCommit, - fix, - gitObjectAccess: state.gitObjectAccess - }); - if (provenanceFailure !== null) { - return terminal(await archivePipelineFailure(context, state, { - reason: provenanceFailure.reason, - failure: provenanceFailure.failure - })); - } - state.currentCandidateCommit = fix.candidateCommit; - roundRecord.fix = fix; - roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; + const fixOutcome = await withRoleWorktree( + context, + reviewedCommit, + `round-${round}-fix`, + async (worktreePath) => { + let gitObjectAccess; + try { + gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + return terminal(await archivePipelineFailure(context, state, { + reason: "fixer git object isolation could not be established", + failure: "sandbox-violation" + })); + } + const fixRun = await runFix({ + spec, + pkg: { ...pkg, findings: consolidated.findings }, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + gitObjectAccess, + ...context.runStart === void 0 ? {} : { runStart: context.runStart } + }); + if (!fixRun.ok) { + return terminal(await salvagePipelineFailure(context, deps, state, { + reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, + failure: fixRun.failure + })); + } + const { fix } = fixRun; + await store.writePipelineArtifact(`round-${round}-fix`, fix); + const adoptionFailure = await adoptWriterCommit({ + context, + gitObjectAccess, + previousCandidateCommit: reviewedCommit, + candidateCommit: fix.candidateCommit, + phaseLabel: "fixer", + validateProvenance: () => validateFixProvenance({ + worktreePath, + previousCandidateCommit: reviewedCommit, + fix, + gitObjectAccess + }) + }); + if (adoptionFailure !== null) { + return terminal(await archivePipelineFailure(context, state, { + reason: adoptionFailure.reason, + failure: adoptionFailure.failure + })); + } + state.currentCandidateCommit = fix.candidateCommit; + roundRecord.fix = fix; + roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; + return CONTINUE; + } + ); + if (fixOutcome.state === "terminal") return fixOutcome; } return CONTINUE; } async function promoteReviewedCandidate(context, state) { if (state.currentCandidateCommit === state.initialCandidate.candidateCommitOid) return CONTINUE; - if (state.gitObjectAccess === null && !state.sliced) { - return terminal(failedAtCurrentCandidate( - state, - "fixer git object isolation state is missing during promotion", - "sandbox-violation" - )); - } const promoted = await promoteFinalCandidate({ checkoutPath: context.checkoutPath, attempt: state.attempt, initialCandidate: state.initialCandidate, baselineCommit: state.baselineCommit, candidateCommit: state.currentCandidateCommit, - store: context.store, - ...state.gitObjectAccess === null ? {} : { privateObjectAccess: state.gitObjectAccess } + store: context.store }); - if (promoted === null) { + if (!promoted.ok) { return terminal(await archivePipelineFailure(context, state, { - reason: state.sliced ? "sliced candidate could not be promoted from the shared git object store" : "fixer objects could not be imported into the shared git object store", - failure: "sandbox-violation" + reason: `${state.sliced ? "sliced" : "fixer"} ${promoted.reason}`, + failure: promoted.failure })); } state.finalAttempt = promoted.attempt; @@ -54033,7 +53822,6 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko currentCandidateCommit: attempt.candidate.candidateCommitOid, pipelineSlices: [], incrementOutcome: void 0, - gitObjectAccess: null, frozenTestEvidence: testEvidence(attempt), authoritySafeToRelease: !sliced }; @@ -54075,9 +53863,9 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko let initialPerSliceReview = null; const initialRoleLogRefs = attemptLogRefs(attempt); if (reviewConfig.perSlice === true) { - let reviewed; + let reviewed2; try { - reviewed = await runSliceReview({ + reviewed2 = await runSliceReview({ checkoutPath, spec: initialSpec, deps, @@ -54093,8 +53881,8 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } catch (error51) { return await failSliceExecution(error51, []); } - initialPerSliceReview = reviewed.review; - initialRoleLogRefs.push(...reviewed.roleLogRefs); + initialPerSliceReview = reviewed2.review; + initialRoleLogRefs.push(...reviewed2.roleLogRefs); } const completedSlices = []; let phase; @@ -54139,29 +53927,14 @@ async function runPipelineWithLease(checkoutPath, spec, deps, ps, borrowedChecko } state.frozenTestEvidence = sliceTestEvidence(phase.slices); } - const candidateWorktree = await new WorktreeManager( - checkoutPath, - sliced ? `${attempt.runId}-composed-review` : `${attempt.runId}-pipeline`, - ps, - deps.borrowedCheckoutLease === void 0 ? {} : { borrowedCheckoutLease: deps.borrowedCheckoutLease } - ).create(state.currentCandidateCommit); - try { - if (maxIncrements > 1) { - const outcome = await runIncrementPhase(context, deps, state, candidateWorktree.path, maxIncrements); - if (outcome.state === "terminal") return outcome.result; - } - const reviewed = await runReviewRounds(context, deps, state, candidateWorktree.path, reviewers, maxRounds); - if (reviewed.state === "terminal") return reviewed.result; - const promoted = await promoteReviewedCandidate(context, state); - if (promoted.state === "terminal") return promoted.result; - } finally { - const cleanupError = await cleanupWorktree(candidateWorktree); - if (cleanupError !== null) { - logger.warn("pipeline round worktree could not be cleaned up", { - error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)) - }); - } + if (maxIncrements > 1) { + const outcome = await runIncrementPhase(context, deps, state, maxIncrements); + if (outcome.state === "terminal") return outcome.result; } + const reviewed = await runReviewRounds(context, deps, state, reviewers, maxRounds); + if (reviewed.state === "terminal") return reviewed.result; + const promoted = await promoteReviewedCandidate(context, state); + if (promoted.state === "terminal") return promoted.result; return await finalizePipelineGate(context, deps, state, maxRounds); } catch (error51) { let terminalError = error51; @@ -54225,793 +53998,23 @@ var INTEGRABLE_DECISION_AUTHORITIES = [ "autopilot-policy" ]; -// src/ship/github-cli-adapter.ts -import { chmod as chmod2, rm as rm14 } from "node:fs/promises"; -import path31 from "node:path"; -var MINIMUM_GH_VERSION = [2, 96, 0]; -var OID2 = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; -var REPOSITORY_COMPONENT = /^[A-Za-z0-9_.-]+$/u; -var MAX_OUTPUT_BYTES = 1e6; -var COMMAND_TIMEOUT_MS = 6e4; -var CREDENTIAL_HELPER_ARGS = [ - "-c", - "credential.helper=", - "-c", - "credential.helper=!gh auth git-credential" -]; -var HostingAdapterError = class extends Error { - constructor(classification, primaryClassification) { - super(classification); - this.classification = classification; - this.primaryClassification = primaryClassification; - this.name = "HostingAdapterError"; - } - classification; - primaryClassification; -}; -function fail3(classification) { - throw new HostingAdapterError(classification); -} -function failCommand(error51, classification) { - if (error51 instanceof HostingAdapterError && error51.classification === "cancelled") throw error51; - fail3(classification); -} -function cleanExit(result) { - return result.exitCode === 0 && result.timedOut !== true && result.cancelled !== true && result.spawnError === void 0 && result.truncated?.stdout !== true && result.truncated?.stderr !== true; -} -function assertNotCancelled(result) { - if (result.cancelled === true) fail3("cancelled"); -} -function requireCleanExit(result, classification) { - assertNotCancelled(result); - if (!cleanExit(result)) fail3(classification); -} -function commandEnvironment2() { - const environment = { - PATH: process.env.PATH ?? "", - GH_PROMPT_DISABLED: "1", - GIT_TERMINAL_PROMPT: "0" - }; - for (const name of [ - "HOME", - "XDG_CONFIG_HOME", - "GH_CONFIG_DIR", - "GH_TOKEN", - "GITHUB_TOKEN" - ]) { - const value = process.env[name]; - if (value !== void 0) environment[name] = value; - } - return environment; -} -function githubCredentialEnvironment() { - const environment = {}; - for (const name of ["GH_TOKEN", "GITHUB_TOKEN"]) { - const value = process.env[name]; - if (value !== void 0) environment[name] = value; - } - if (process.env.GH_CONFIG_DIR !== void 0) { - environment.GH_CONFIG_DIR = process.env.GH_CONFIG_DIR; - } else if (process.platform === "win32" && process.env.APPDATA !== void 0) { - environment.GH_CONFIG_DIR = path31.join(process.env.APPDATA, "GitHub CLI"); - } else if (process.env.XDG_CONFIG_HOME !== void 0) { - environment.GH_CONFIG_DIR = path31.join(process.env.XDG_CONFIG_HOME, "gh"); - } else if (process.env.HOME !== void 0) { - environment.GH_CONFIG_DIR = path31.join(process.env.HOME, ".config", "gh"); - } - return environment; -} -function isolatedGitEnvironment(repository, withGithubCredentials = false) { - const nullDevice = process.platform === "win32" ? "NUL" : "/dev/null"; - return { - PATH: process.env.PATH ?? "", - GIT_CONFIG_GLOBAL: nullDevice, - GIT_CONFIG_SYSTEM: nullDevice, - GIT_CONFIG_NOSYSTEM: "1", - GIT_CONFIG_COUNT: "0", - GIT_CONFIG_PARAMETERS: "", - GIT_TERMINAL_PROMPT: "0", - HOME: repository, - XDG_CONFIG_HOME: repository, - ...withGithubCredentials ? githubCredentialEnvironment() : {} - }; -} -function toCommandResult(exit) { - return { - exitCode: exit.exitCode, - stdout: exit.stdout, - stderr: exit.stderr, - timedOut: exit.timedOut, - cancelled: exit.cancelled, - truncated: { ...exit.truncated }, - ...exit.spawnError === void 0 ? {} : { spawnError: exit.spawnError } - }; -} -function createHostingCommandRunner(platformServices = getPlatformServices()) { - return async (request) => { - const executable = await platformServices.resolveExecutable({ name: request.executable }); - const exit = await supervise(platformServices, { - executable, - args: request.args, - cwd: request.cwd, - env: request.env, - timeoutMs: request.timeoutMs, - maxOutputBytes: request.maxOutputBytes - }, {}); - return toCommandResult(exit); - }; -} -function parseVersion3(output) { - const firstLine = output.split(/\r?\n/u, 1)[0] ?? ""; - const match = /^gh version (\d+)\.(\d+)\.(\d+)(?:\s|$)/u.exec(firstLine); - if (match === null) return null; - const parsed = match.slice(1).map((value) => Number.parseInt(value, 10)); - if (parsed.some((value) => !Number.isSafeInteger(value))) return null; - return [parsed[0], parsed[1], parsed[2]]; -} -function versionAtLeast(actual, minimum) { - for (let index = 0; index < minimum.length; index += 1) { - if (actual[index] > minimum[index]) return true; - if (actual[index] < minimum[index]) return false; - } - return true; -} -function canonicalRepository(value) { - if (/[%\0\r\n]/u.test(value)) return null; - const components = value.split("/"); - if (components.length !== 2) return null; - if (components.some((component) => !REPOSITORY_COMPONENT.test(component) || component === "." || component === "..")) return null; - return `${components[0].toLowerCase()}/${components[1].toLowerCase()}`; -} -function canonicalGithubUrl2(raw) { - if (/[\0\r\n]/u.test(raw)) return null; - let parsed; - try { - parsed = new URL(raw); - } catch { - return null; - } - if (parsed.protocol !== "https:" || parsed.hostname.toLowerCase() !== "github.com" || parsed.port !== "" || parsed.username !== "" || parsed.password !== "" || parsed.search !== "" || parsed.hash !== "" || parsed.pathname.includes("%") || parsed.pathname.includes("//") || parsed.pathname.endsWith("/")) return null; - const pathname = parsed.pathname.slice(1); - const withoutSuffix = pathname.endsWith(".git") ? pathname.slice(0, -4) : pathname; - const repository = canonicalRepository(withoutSuffix); - if (repository === null) return null; - return { repository, url: `https://github.com/${repository}.git` }; -} -function validBranch(branch) { - if (branch.length < 1 || branch.length > 240 || branch.startsWith("-") || branch.startsWith("/") || branch.endsWith("/") || branch.endsWith(".") || branch === "@" || branch.includes("..") || branch.includes("@{") || branch.includes("//")) return false; - return !/[\0-\x20\x7f~^:?*[\\]/u.test(branch) && branch.split("/").every((component) => component !== "" && !component.startsWith(".") && !component.endsWith(".lock")); -} -function validCheckoutPath(checkoutPath) { - return checkoutPath.length > 0 && !/[\0\r\n]/u.test(checkoutPath); -} -function validTarget(target) { - const repository = canonicalRepository(target.repository); - const url2 = canonicalGithubUrl2(target.canonicalHttpsUrl); - return target.provider === "github" && repository !== null && target.repository === repository && url2 !== null && url2.repository === repository && url2.url === target.canonicalHttpsUrl; -} -function parseRemoteHead(output, branchRef) { - if (output === "") return null; - const lines = output.split("\n").filter((line) => line !== ""); - if (lines.length !== 1) return void 0; - const match = /^(\S+)\t(\S+)$/u.exec(lines[0]); - if (match === null || !OID2.test(match[1]) || match[2] !== branchRef) return void 0; - return match[1]; -} -function parseBundledHead(output, branchRef) { - const lines = output.split(/\r?\n/u).filter((line) => line !== ""); - if (lines.length !== 1) return void 0; - const match = /^(\S+) (\S+)$/u.exec(lines[0]); - if (match === null || !OID2.test(match[1]) || match[2] !== branchRef) return void 0; - return match[1]; -} -var PR_JSON_FIELDS = "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft"; -var CHECK_JSON_FIELDS = "bucket,name,state,link"; -var MAX_TITLE_BYTES = 256; -var MAX_BODY_BYTES = 65536; -var MAX_CHECK_FIELD_BYTES = 4096; -function boundedOutput(result) { - return result.timedOut !== true && result.cancelled !== true && result.spawnError === void 0 && result.truncated?.stdout !== true && result.truncated?.stderr !== true && Buffer.byteLength(result.stdout, "utf8") <= MAX_OUTPUT_BYTES && Buffer.byteLength(result.stderr, "utf8") <= MAX_OUTPUT_BYTES; -} -function validPullRequestText(title, body) { - if (typeof title !== "string" || typeof body !== "string") return false; - const titleBytes = Buffer.byteLength(title, "utf8"); - const bodyBytes = Buffer.byteLength(body, "utf8"); - return titleBytes > 0 && titleBytes <= MAX_TITLE_BYTES && bodyBytes <= MAX_BODY_BYTES && !/[\u0000-\u001f\u007f-\u009f]/u.test(title) && !/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/u.test(body); -} -function validPullRequestNumber(value) { - return Number.isSafeInteger(value) && value > 0; -} -function parseJson(output) { - if (Buffer.byteLength(output, "utf8") > MAX_OUTPUT_BYTES) return void 0; - try { - return JSON.parse(output); - } catch { - return void 0; - } -} -function pullRequestUrl(repository, number4) { - return `https://github.com/${repository}/pull/${number4}`; -} -function canonicalPullRequestUrl(raw, repository, number4) { - if (/[\0\r\n%]/u.test(raw)) return void 0; - let parsed; - try { - parsed = new URL(raw); - } catch { - return void 0; - } - const components = parsed.pathname.split("/"); - const urlRepository = canonicalRepository(`${components[1] ?? ""}/${components[2] ?? ""}`); - if (parsed.protocol !== "https:" || parsed.hostname.toLowerCase() !== "github.com" || parsed.port !== "" || parsed.username !== "" || parsed.password !== "" || parsed.search !== "" || parsed.hash !== "" || components.length !== 5 || components[3] !== "pull" || components[4] !== String(number4) || urlRepository !== repository) return void 0; - return pullRequestUrl(repository, number4); -} -function parsePullRequestIdentity(value, target) { - if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0; - const record2 = value; - if (typeof record2.number !== "number" || !validPullRequestNumber(record2.number) || typeof record2.url !== "string" || typeof record2.baseRefName !== "string" || typeof record2.headRefName !== "string" || typeof record2.headRefOid !== "string" || typeof record2.isDraft !== "boolean" || typeof record2.headRepository !== "object" || record2.headRepository === null || Array.isArray(record2.headRepository)) return void 0; - const headRepository = record2.headRepository; - if (typeof headRepository.nameWithOwner !== "string") return void 0; - const repository = canonicalRepository(headRepository.nameWithOwner); - const url2 = canonicalPullRequestUrl(record2.url, target.repository, record2.number); - if (repository === null || repository !== target.repository || url2 === void 0 || !validBranch(record2.baseRefName) || !validBranch(record2.headRefName) || !OID2.test(record2.headRefOid)) return void 0; - return { - number: record2.number, - url: url2, - repository, - baseBranch: record2.baseRefName, - headBranch: record2.headRefName, - headCommitOid: record2.headRefOid, - draft: record2.isDraft - }; -} -function samePullRequestIdentity(actual, expected) { - return actual.number === expected.number && actual.url === expected.url && actual.repository === expected.repository && actual.baseBranch === expected.baseBranch && actual.headBranch === expected.headBranch && actual.headCommitOid === expected.headCommitOid && actual.draft === expected.draft; -} -function pullRequestKey(repository, number4) { - return `${repository}#${number4}`; -} -function parseCreatedPullRequestNumber(output, repository) { - const trimmed = output.endsWith("\r\n") ? output.slice(0, -2) : output.endsWith("\n") ? output.slice(0, -1) : output; - const prefix = `https://github.com/${repository}/pull/`; - if (!trimmed.startsWith(prefix) || trimmed.includes("\n") || trimmed.includes("\r")) { - return void 0; - } - const numberText = trimmed.slice(prefix.length); - if (!/^[1-9]\d*$/u.test(numberText)) return void 0; - const number4 = Number(numberText); - return validPullRequestNumber(number4) ? number4 : void 0; -} -function validCheckField(value) { - return Buffer.byteLength(value, "utf8") <= MAX_CHECK_FIELD_BYTES && !/[\u0000-\u001f\u007f-\u009f]/u.test(value); -} -function parseRequiredChecks(output) { - const parsed = parseJson(output); - if (!Array.isArray(parsed)) return void 0; - const checks = []; - for (const value of parsed) { - if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0; - const record2 = value; - if (Object.keys(record2).some((key) => !["bucket", "name", "state", "link"].includes(key)) || typeof record2.bucket !== "string" || !["pass", "pending", "fail", "cancel", "skipping"].includes(record2.bucket) || typeof record2.name !== "string" || record2.name.length === 0 || !validCheckField(record2.name) || typeof record2.state !== "string" || record2.state.length === 0 || !validCheckField(record2.state) || !validCheckState(record2.bucket, record2.state) || record2.link !== null && typeof record2.link !== "string" || typeof record2.link === "string" && !validCheckField(record2.link)) return void 0; - checks.push({ - bucket: record2.bucket, - name: record2.name, - state: record2.state, - link: record2.link - }); - } - return checks; -} -function validCheckState(bucket, state) { - switch (bucket) { - case "pass": - return state === "SUCCESS"; - case "pending": - return ["EXPECTED", "IN_PROGRESS", "PENDING", "QUEUED", "REQUESTED", "WAITING"].includes(state); - case "fail": - return [ - "ACTION_REQUIRED", - "ERROR", - "FAILURE", - "STALE", - "STARTUP_FAILURE", - "TIMED_OUT" - ].includes(state); - case "cancel": - return state === "CANCELLED"; - case "skipping": - return ["NEUTRAL", "SKIPPED"].includes(state); - default: - return false; - } -} -var GitHubCliAdapter = class { - runner; - platformServices; - pullRequests = /* @__PURE__ */ new Map(); - constructor() { - this.platformServices = getPlatformServices(); - this.runner = createHostingCommandRunner(this.platformServices); - } - run(executable, args, cwd, env, signal) { - if (signal?.aborted) fail3("cancelled"); - return this.runner({ - executable, - args, - cwd, - env, - timeoutMs: COMMAND_TIMEOUT_MS, - maxOutputBytes: MAX_OUTPUT_BYTES - }); - } - async preflight(request) { - if (!validCheckoutPath(request.checkoutPath) || request.expectedRepository !== void 0 && canonicalRepository(request.expectedRepository) === null) { - fail3("preflight-repository-identity-mismatch"); - } - if (request.signal?.aborted) fail3("cancelled"); - let version2; - try { - version2 = await this.run( - "gh", - ["version"], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "preflight-gh-unavailable"); - } - requireCleanExit(version2, "preflight-gh-unavailable"); - const parsedVersion = parseVersion3(version2.stdout); - if (parsedVersion === null) fail3("preflight-gh-version-invalid"); - if (!versionAtLeast(parsedVersion, MINIMUM_GH_VERSION)) { - fail3("preflight-gh-version-unsupported"); - } - let auth; - try { - auth = await this.run( - "gh", - ["auth", "status", "--hostname", "github.com"], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "preflight-auth-failed"); - } - requireCleanExit(auth, "preflight-auth-failed"); - let repositoryView; - try { - repositoryView = await this.run( - "gh", - ["repo", "view", "--json", "nameWithOwner,url"], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "preflight-repository-query-failed"); - } - requireCleanExit(repositoryView, "preflight-repository-query-failed"); - let parsed; - try { - parsed = JSON.parse(repositoryView.stdout); - } catch { - fail3("preflight-repository-response-invalid"); - } - if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) { - fail3("preflight-repository-response-invalid"); - } - const record2 = parsed; - if (Object.keys(record2).some((key) => key !== "nameWithOwner" && key !== "url") || typeof record2.nameWithOwner !== "string" || typeof record2.url !== "string") { - fail3("preflight-repository-response-invalid"); - } - const repository = canonicalRepository(record2.nameWithOwner); - if (repository === null) fail3("preflight-repository-response-invalid"); - const canonicalUrl = canonicalGithubUrl2(record2.url); - if (canonicalUrl === null) fail3("preflight-repository-url-invalid"); - if (canonicalUrl.repository !== repository) fail3("preflight-repository-identity-mismatch"); - if (request.expectedRepository !== void 0) { - const expected = canonicalRepository(request.expectedRepository); - if (expected === null || expected !== repository) { - fail3("preflight-repository-identity-mismatch"); - } - } - return { - provider: "github", - repository, - canonicalHttpsUrl: canonicalUrl.url - }; - } - async pushBranch(request) { - if (!validCheckoutPath(request.checkoutPath) || !validTarget(request.target) || !validBranch(request.branch) || !OID2.test(request.headCommitOid)) fail3("push-request-invalid"); - if (request.signal?.aborted) fail3("cancelled"); - let quarantine; - try { - quarantine = await this.platformServices.createSecureTempDirectory(); - await chmod2(quarantine, 448); - } catch { - if (quarantine !== void 0) { - try { - await rm14(quarantine, { recursive: true }); - } catch { - throw new HostingAdapterError( - "push-quarantine-cleanup-failed", - "push-quarantine-create-failed" - ); - } - } - fail3("push-quarantine-create-failed"); - } - const environment = isolatedGitEnvironment(quarantine); - const remoteEnvironment = isolatedGitEnvironment(quarantine, true); - const branchRef = `refs/heads/${request.branch}`; - const bundlePath = path31.join(quarantine, "branch.bundle"); - let outcome; - let failure3; - try { - let result = await this.run( - "git", - [ - "init", - "--bare", - "--quiet", - ...request.headCommitOid.length === 64 ? ["--object-format=sha256"] : [], - "." - ], - quarantine, - environment, - request.signal - ); - requireCleanExit(result, "push-quarantine-init-failed"); - result = await this.run( - "git", - ["bundle", "create", bundlePath, branchRef], - request.checkoutPath, - environment, - request.signal - ); - requireCleanExit(result, "push-bundle-create-failed"); - result = await this.run( - "git", - ["bundle", "unbundle", bundlePath], - quarantine, - environment, - request.signal - ); - requireCleanExit(result, "push-bundle-import-failed"); - if (parseBundledHead(result.stdout, branchRef) !== request.headCommitOid) { - fail3("push-imported-oid-mismatch"); - } - result = await this.run( - "git", - ["rev-parse", "--verify", `${request.headCommitOid}^{commit}`], - quarantine, - environment, - request.signal - ); - assertNotCancelled(result); - if (!cleanExit(result) || result.stdout.trim() !== request.headCommitOid) { - fail3("push-imported-oid-mismatch"); - } - result = await this.run( - "git", - ["update-ref", branchRef, request.headCommitOid, "0".repeat(request.headCommitOid.length)], - quarantine, - environment, - request.signal - ); - requireCleanExit(result, "push-imported-oid-mismatch"); - result = await this.run( - "git", - [...CREDENTIAL_HELPER_ARGS, "ls-remote", "--heads", request.target.canonicalHttpsUrl, branchRef], - quarantine, - remoteEnvironment, - request.signal - ); - requireCleanExit(result, "push-remote-precheck-failed"); - const remoteHead = parseRemoteHead(result.stdout, branchRef); - if (remoteHead === void 0) fail3("push-remote-response-invalid"); - if (remoteHead !== null && remoteHead !== request.headCommitOid) { - fail3("push-remote-head-mismatch"); - } - if (remoteHead === request.headCommitOid) { - outcome = { remoteHead }; - } else { - result = await this.run( - "git", - [ - ...CREDENTIAL_HELPER_ARGS, - "push", - request.target.canonicalHttpsUrl, - `${branchRef}:${branchRef}` - ], - quarantine, - remoteEnvironment, - request.signal - ); - requireCleanExit(result, "push-command-failed"); - outcome = { remoteHead: request.headCommitOid }; - } - } catch (error51) { - failure3 = error51 instanceof HostingAdapterError ? error51 : new HostingAdapterError("push-command-failed"); - } - try { - await rm14(quarantine, { recursive: true }); - } catch { - throw new HostingAdapterError("push-quarantine-cleanup-failed", failure3?.classification); - } - if (failure3 !== void 0) throw failure3; - return outcome; - } - async ensureDraftPullRequest(request) { - if (!validCheckoutPath(request.checkoutPath) || !validTarget(request.target) || !validBranch(request.baseBranch) || !validBranch(request.headBranch) || !OID2.test(request.headCommitOid) || !validPullRequestText(request.title, request.body)) { - fail3("draft-pull-request-request-invalid"); - } - if (request.signal?.aborted) fail3("cancelled"); - let listed; - try { - listed = await this.run( - "gh", - [ - "pr", - "list", - "--repo", - request.target.repository, - "--base", - request.baseBranch, - "--head", - request.headBranch, - "--state", - "open", - "--json", - PR_JSON_FIELDS - ], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "draft-pull-request-list-failed"); - } - assertNotCancelled(listed); - if (!cleanExit(listed) || !boundedOutput(listed)) { - fail3("draft-pull-request-list-failed"); - } - const parsedList = parseJson(listed.stdout); - if (!Array.isArray(parsedList)) fail3("draft-pull-request-response-invalid"); - const identities = parsedList.map((value) => parsePullRequestIdentity(value, request.target)); - if (identities.some((identity2) => identity2 === void 0)) { - fail3("draft-pull-request-identity-mismatch"); - } - if (identities.length > 1) fail3("draft-pull-request-ambiguous"); - if (identities.length === 1) { - const identity2 = identities[0]; - if (identity2.baseBranch !== request.baseBranch || identity2.headBranch !== request.headBranch) { - fail3("draft-pull-request-identity-mismatch"); - } - if (identity2.headCommitOid !== request.headCommitOid) { - fail3("draft-pull-request-head-mismatch"); - } - const key2 = pullRequestKey(identity2.repository, identity2.number); - this.pullRequests.set(key2, identity2); - return identity2; - } - let created; - try { - created = await this.run( - "gh", - [ - "pr", - "create", - "--repo", - request.target.repository, - "--base", - request.baseBranch, - "--head", - request.headBranch, - "--draft", - "--title", - request.title, - "--body", - request.body - ], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "draft-pull-request-create-failed"); - } - assertNotCancelled(created); - if (!cleanExit(created) || !boundedOutput(created)) { - fail3("draft-pull-request-create-failed"); - } - const createdNumber = parseCreatedPullRequestNumber( - created.stdout, - request.target.repository - ); - if (createdNumber === void 0) fail3("draft-pull-request-response-invalid"); - const identity = await this.viewPullRequest( - request.checkoutPath, - request.target, - createdNumber, - "draft-pull-request-create-failed", - "draft-pull-request-response-invalid", - request.signal - ); - if (identity.baseBranch !== request.baseBranch || identity.headBranch !== request.headBranch || identity.headCommitOid !== request.headCommitOid || !identity.draft) fail3("draft-pull-request-identity-mismatch"); - const key = pullRequestKey(identity.repository, identity.number); - this.pullRequests.set(key, identity); - return identity; - } - async requiredChecks(request) { - if (!validCheckoutPath(request.checkoutPath) || !validTarget(request.target) || !validPullRequestNumber(request.pullRequestNumber) || !OID2.test(request.headCommitOid)) { - fail3("required-checks-request-invalid"); - } - if (request.signal?.aborted) fail3("cancelled"); - const key = pullRequestKey(request.target.repository, request.pullRequestNumber); - const expected = this.pullRequests.get(key); - if (expected === void 0) fail3("required-checks-identity-not-established"); - const before = await this.viewPullRequest( - request.checkoutPath, - request.target, - request.pullRequestNumber, - "required-checks-identity-query-failed", - "required-checks-identity-response-invalid", - request.signal - ).catch((error51) => { - throw error51; - }); - if (!samePullRequestIdentity(before, expected)) { - fail3("required-checks-identity-mismatch"); - } - if (before.headCommitOid !== request.headCommitOid) { - fail3("required-checks-head-mismatch"); - } - let result; - try { - result = await this.run( - "gh", - [ - "pr", - "checks", - String(request.pullRequestNumber), - "--repo", - request.target.repository, - "--required", - "--json", - CHECK_JSON_FIELDS - ], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "required-checks-command-failed"); - } - if (!boundedOutput(result) || ![0, 1, 8].includes(result.exitCode ?? -1)) { - fail3("required-checks-command-failed"); - } - const after = await this.viewPullRequest( - request.checkoutPath, - request.target, - request.pullRequestNumber, - "required-checks-identity-query-failed", - "required-checks-identity-response-invalid", - request.signal - ); - if (after.headCommitOid !== request.headCommitOid) { - fail3("required-checks-head-mismatch"); - } - if (!samePullRequestIdentity(after, before)) { - fail3("required-checks-identity-mismatch"); - } - const checks = parseRequiredChecks(result.stdout); - if (checks === void 0) fail3("required-checks-response-invalid"); - const aggregate = checks.length === 0 ? "missing" : checks.some((check2) => ["fail", "cancel", "skipping"].includes(check2.bucket)) ? "failed" : checks.some((check2) => check2.bucket === "pending") ? "pending" : "passed"; - const expectedExitCode = checks.length === 0 ? 1 : checks.some((check2) => check2.bucket === "fail" || check2.bucket === "cancel") ? 1 : checks.some((check2) => check2.bucket === "pending") ? 8 : 0; - if (result.exitCode !== expectedExitCode) fail3("required-checks-response-invalid"); - return { result: aggregate, headCommitOid: request.headCommitOid, checks }; - } - async markReady(request) { - if (!validCheckoutPath(request.checkoutPath) || !validTarget(request.target) || !validPullRequestNumber(request.pullRequestNumber) || !OID2.test(request.headCommitOid)) { - fail3("mark-ready-request-invalid"); - } - if (request.signal?.aborted) fail3("cancelled"); - const key = pullRequestKey(request.target.repository, request.pullRequestNumber); - const expected = this.pullRequests.get(key); - if (expected === void 0) fail3("mark-ready-identity-not-established"); - const checks = await this.requiredChecks({ - checkoutPath: request.checkoutPath, - target: request.target, - pullRequestNumber: request.pullRequestNumber, - headCommitOid: request.headCommitOid, - ...request.signal === void 0 ? {} : { signal: request.signal } - }); - if (checks.result !== "passed" || checks.headCommitOid !== request.headCommitOid || checks.checks.length === 0 || checks.checks.some((check2) => check2.bucket !== "pass")) { - fail3("mark-ready-checks-not-passed"); - } - let ready; - try { - ready = await this.run( - "gh", - [ - "pr", - "ready", - String(request.pullRequestNumber), - "--repo", - request.target.repository - ], - request.checkoutPath, - commandEnvironment2(), - request.signal - ); - } catch (error51) { - failCommand(error51, "mark-ready-command-failed"); - } - if (!cleanExit(ready) || !boundedOutput(ready)) fail3("mark-ready-command-failed"); - const updated = await this.viewPullRequest( - request.checkoutPath, - request.target, - request.pullRequestNumber, - "mark-ready-identity-query-failed", - "mark-ready-identity-response-invalid", - request.signal - ); - const readyExpected = { ...expected, draft: false }; - if (!samePullRequestIdentity(updated, readyExpected)) { - fail3("mark-ready-identity-mismatch"); - } - this.pullRequests.delete(key); - return updated; - } - async viewPullRequest(checkoutPath, target, number4, queryFailure, responseFailure, signal) { - let viewed; - try { - viewed = await this.run( - "gh", - [ - "pr", - "view", - String(number4), - "--repo", - target.repository, - "--json", - PR_JSON_FIELDS - ], - checkoutPath, - commandEnvironment2(), - signal - ); - } catch (error51) { - failCommand(error51, queryFailure); - } - assertNotCancelled(viewed); - if (!cleanExit(viewed) || !boundedOutput(viewed)) fail3(queryFailure); - const identity = parsePullRequestIdentity(parseJson(viewed.stdout), target); - if (identity === void 0 || identity.number !== number4) fail3(responseFailure); - return identity; - } -}; - // src/mcp/allowlist-sufficiency.ts -import { readFile as readFile9 } from "node:fs/promises"; -import path32 from "node:path"; +import { readFile as readFile8 } from "node:fs/promises"; +import path33 from "node:path"; var SOURCE_EXTENSIONS = /* @__PURE__ */ new Set([".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"]); var MAX_GAPS = 25; var MAX_FILE_BYTES = 512 * 1024; var IMPORT_SPECIFIER = /(?:\bfrom\s*|\bimport\s*\(\s*|\brequire\s*\(\s*)["']([^"']+)["']/gu; function toPosix(candidate) { - return candidate.split(path32.sep).join("/"); + return candidate.split(path33.sep).join("/"); } -function isTestPath(candidate) { +function isTestPath2(candidate) { return /(?:^|\/)tests?\//u.test(candidate) || /\.(?:test|spec)\.[cm]?[jt]sx?$/u.test(candidate); } function resolveImport(fromPath, specifier, tracked) { if (!specifier.startsWith(".")) return null; - const base = toPosix(path32.posix.normalize( - path32.posix.join(path32.posix.dirname(toPosix(fromPath)), specifier) + const base = toPosix(path33.posix.normalize( + path33.posix.join(path33.posix.dirname(toPosix(fromPath)), specifier) )); if (base.startsWith("..")) return null; const rewrites = [ @@ -55030,21 +54033,21 @@ function resolveImport(fromPath, specifier, tracked) { } async function checkAllowlistSufficiency(repoRoot, spec, deps = {}) { const listed = await (deps.git ?? git)(repoRoot, ["ls-files", "-z"]); - if (listed.exitCode !== 0) return { allowlisted: 0, gaps: [], omitted: 0 }; + if (!gitSucceeded(listed)) return { allowlisted: 0, gaps: [], omitted: 0 }; const tracked = new Set( gitNulRecords(listed.stdout, "Git tracked-file list").filter((entry) => entry.length > 0) ); const inScope = (candidate) => spec.writeAllowlist.some((pattern) => globMatches(pattern, candidate)) && !spec.forbiddenScope.some((pattern) => globMatches(pattern, candidate)); const allowlisted = new Set([...tracked].filter(inScope)); if (allowlisted.size === 0) return { allowlisted: 0, gaps: [], omitted: 0 }; - const read = deps.readFile ?? (async (target) => readFile9(target, "utf8")); + const read = deps.readFile ?? (async (target) => readFile8(target, "utf8")); const gaps = []; for (const candidate of tracked) { if (allowlisted.has(candidate)) continue; - if (!SOURCE_EXTENSIONS.has(path32.posix.extname(candidate))) continue; + if (!SOURCE_EXTENSIONS.has(path33.posix.extname(candidate))) continue; let contents; try { - contents = (await read(path32.join(repoRoot, candidate))).slice(0, MAX_FILE_BYTES); + contents = (await read(path33.join(repoRoot, candidate))).slice(0, MAX_FILE_BYTES); } catch { continue; } @@ -55056,7 +54059,7 @@ async function checkAllowlistSufficiency(repoRoot, spec, deps = {}) { if (imports.size > 0) gaps.push({ path: candidate, imports: [...imports].sort() }); } gaps.sort((left, right) => { - const byKind = Number(isTestPath(right.path)) - Number(isTestPath(left.path)); + const byKind = Number(isTestPath2(right.path)) - Number(isTestPath2(left.path)); return byKind !== 0 ? byKind : left.path.localeCompare(right.path); }); return { @@ -55233,7 +54236,6 @@ function createAutopilotController(deps) { branchManager, workflowStore }), - hostingAdapter: new GitHubCliAdapter(), ...deps.abortSignal === void 0 ? {} : { abortSignal: deps.abortSignal }, emit: (event) => deps.onProgress?.(event) }); @@ -55649,47 +54651,8 @@ async function handleReviewCandidate(checkoutPath, runId, deps = {}, expectedSpe } } function decisionAdvisoryForRun(run) { - const refused = run.result.evidence.pipelineGateRefused; - const incomplete = run.result.evidence.pipelineReviewIncomplete; - const rawCleared = run.result.evidence.pipelineGateCleared; - const warnings = []; - if (isRecord8(refused) && Array.isArray(refused.reasons)) { - warnings.push( - `the pipeline gate did NOT clear this candidate: ${refused.reasons.filter((r) => typeof r === "string").join("; ")}` - ); - } - if (isRecord8(incomplete) && typeof incomplete.reason === "string") { - warnings.push(`the pipeline could not complete its own review: ${incomplete.reason}`); - } - const plainDelegate = run.result.evidence.plainDelegate === true && refused === void 0 && incomplete === void 0 && rawCleared === void 0; - let gateCleared = false; - if (plainDelegate) { - gateCleared = true; - } else if (rawCleared === void 0) { - if (warnings.length === 0) { - warnings.push("the pipeline gate clearance record is missing"); - } - } else { - try { - const cleared = parsePipelineGateCleared(rawCleared); - if (cleared.requiresHumanDecision === true) { - warnings.push("the pipeline gate clearance record requires a human decision"); - } else if (cleared.candidateCommitOid !== run.result.candidate?.candidateCommitOid) { - warnings.push( - "the pipeline gate clearance record does not match the archived candidate commit" - ); - } else { - gateCleared = true; - } - } catch { - warnings.push("the pipeline gate clearance record is malformed"); - } - } - return { - warnings, - verifiedClean: run.result.status === "verified-candidate" && run.result.failure === null && gateCleared, - unreadable: false - }; + const verdict = runDecision.verdictFor(run.snapshot, "autonomous"); + return verdict.state === "accepted" ? { warnings: [], verifiedClean: true, unreadable: false } : { warnings: verdict.reasons, verifiedClean: false, unreadable: false }; } async function handleDecideCandidate(checkoutPath, runId, decision, expectedArtifactHash, deps = {}) { try { @@ -55764,7 +54727,7 @@ async function handleIntegrateCandidate(checkoutPath, runId, expectedArtifactHas if (!INTEGRABLE_DECISION_AUTHORITIES.includes(decision.authority)) { return { integration: "aborted", detail: "accepted-decision-not-confirmed" }; } - if (decision.candidateManifestHash != null && decision.candidateManifestHash !== expectedArtifactHash) { + if (decision.candidateManifestHash !== expectedArtifactHash) { return { integration: "aborted", detail: "decision-artifact-mismatch" }; } return (deps.applyCandidateTree ?? applyCandidateTree)({ @@ -55783,48 +54746,97 @@ async function handleIntegrateCandidate(checkoutPath, runId, expectedArtifactHas } } +// src/mcp/jev-screen.ts +var JEV_ENV = "CLAUDE_ARCHITECT_JEV"; +var JEV_KEY_ENV = "TYPESAFE_API_KEY"; +var JEV_ENDPOINT = "https://api.typesafe.ai/v1/systemone"; +var JEV_TIMEOUT_MS = 15e3; +var MAX_PATCH_CHARS = 5e4; +var MAX_PATHS = 200; +var CONCERN_THRESHOLD = 0.4; +var QUESTIONS = { + weakens_verification: { + type: "noul", + instructions: "Does `patch` weaken, skip, or delete tests, assertions, lint rules, type checks, or CI checks, instead of changing the code under test?" + }, + security_sensitive: { + type: "noul", + instructions: "Does `patch` add credential or secret access, outbound network calls, obfuscated or encoded code, shell command construction from input, or remove permission, authentication, or sandbox checks?" + } +}; +var CONCERN_TEXT = { + weakens_verification: "an independent screen (Jev) flagged the candidate as weakening verification", + security_sensitive: "an independent screen (Jev) flagged security-sensitive changes in the candidate" +}; +async function jevScreen(candidate, options = {}) { + const env = options.env ?? process.env; + if (env[JEV_ENV] !== "on") return { status: "disabled" }; + const key = env[JEV_KEY_ENV]; + if (key === void 0 || key === "") { + return { status: "unavailable", reason: `${JEV_KEY_ENV} is not set` }; + } + const patch = redact(candidate.patch); + const state = { + changedPaths: candidate.changedPaths.slice(0, MAX_PATHS).map((change) => change.path), + patch: patch.slice(0, MAX_PATCH_CHARS), + patchTruncated: patch.length > MAX_PATCH_CHARS + }; + let body; + try { + const response = await (options.fetch ?? globalThis.fetch)(JEV_ENDPOINT, { + method: "POST", + headers: { authorization: `Bearer ${key}`, "content-type": "application/json" }, + body: JSON.stringify({ model: "jev-latest", state, questions: QUESTIONS }), + signal: AbortSignal.timeout(JEV_TIMEOUT_MS) + }); + if (!response.ok) return { status: "unavailable", reason: `HTTP ${response.status}` }; + body = await response.json(); + } catch (error51) { + return { status: "unavailable", reason: error51 instanceof Error ? error51.name : "request failed" }; + } + const answers = body?.answers; + const reasons = []; + for (const id of Object.keys(QUESTIONS)) { + const noul = answers?.[id]?.noul; + if (typeof noul !== "number" || !Number.isFinite(noul) || noul < 0 || noul > 1) { + return { status: "unavailable", reason: "malformed answer" }; + } + if (noul >= CONCERN_THRESHOLD) reasons.push(`${CONCERN_TEXT[id]} (p=${noul.toFixed(2)})`); + } + return reasons.length === 0 ? { status: "clear" } : { status: "concern", reasons }; +} + // src/runtime/recovery-manager.ts -import { createHash as createHash16, randomUUID as randomUUID13 } from "node:crypto"; -import { constants as constants14 } from "node:fs"; -import { - lstat as lstat18, - link as link8, - mkdir as mkdir9, - open as open14, - readdir as readdir8, - realpath as realpath13, - rename as rename7 -} from "node:fs/promises"; -import path33 from "node:path"; +import { createHash as createHash18 } from "node:crypto"; +import { mkdir as mkdir10, readdir as readdir13, realpath as realpath20 } from "node:fs/promises"; +import path41 from "node:path"; +import nodeProcess8 from "node:process"; + +// src/runtime/recovery-shared.ts +import { createHash as createHash15 } from "node:crypto"; +import { constants as constants15 } from "node:fs"; +import { lstat as lstat18, realpath as realpath14 } from "node:fs/promises"; +import path34 from "node:path"; import nodeProcess7 from "node:process"; -var NO_FOLLOW8 = constants14.O_NOFOLLOW ?? 0; +var NO_FOLLOW8 = constants15.O_NOFOLLOW ?? 0; var MAX_STATE_FILE_BYTES2 = 8e6; var MAX_STATE_FILE_BYTES_BIGINT2 = BigInt(MAX_STATE_FILE_BYTES2); var SAFE_RUN_ID2 = /^[a-z0-9][a-z0-9._-]*$/; var WORKFLOW_WORKTREE_NAME = /^workflow-([0-9a-f]{32})(?:-final)?$/; var LEGACY_FINAL_WORKTREE_NAME = /^final-([0-9a-f]{24})$/; var WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; -var OID3 = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; +var OID2 = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; var CANDIDATE_REF_PREFIX3 = "refs/claude-architect/candidates/"; var BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; var MAX_QUARANTINE_REASON_BYTES = 2e3; var MAX_QUARANTINE_RECORD_BYTES = 4096; var MAX_WORKTREE_SWEEP_ISSUES = 100; -function errorCode10(error51) { - return error51.code; -} -function isMissing4(error51) { - return errorCode10(error51) === "ENOENT"; -} function isPlainDirectory3(metadata) { return metadata.isDirectory() && !metadata.isSymbolicLink(); } function sameManagedIdentity(left, right) { return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; } -function sameIdentity5(metadata, expected) { - return metadata.dev === expected.dev && metadata.ino === expected.ino && metadata.birthtimeNs === expected.birthtimeNs; -} function validateRunId(runId) { if (typeof runId !== "string" || !SAFE_RUN_ID2.test(runId)) { throw new RuntimeError("recovery record has an invalid run id"); @@ -55833,19 +54845,19 @@ function validateRunId(runId) { async function stateRoot() { const configured = nodeProcess7.env.CLAUDE_PLUGIN_DATA ?? (nodeProcess7.env.NODE_ENV === "test" ? nodeProcess7.env.CLAUDE_ARCHITECT_STATE_DIR : void 0); if (configured === void 0) return null; - const root = path33.resolve(resolveStateDir()); + const root = path34.resolve(resolveStateDir()); try { const metadata = await lstat18(root, { bigint: true }); if (!isPlainDirectory3(metadata) || metadata.birthtimeNs <= 0n) { throw new RuntimeError("plugin data directory must be a stable plain directory during recovery"); } - const canonicalRoot = await realpath13(root); + const canonicalRoot = await realpath14(root); const settled = await lstat18(canonicalRoot, { bigint: true }); if (!isPlainDirectory3(settled) || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs) { throw new RuntimeError("plugin data directory identity changed during canonicalization"); } const privateIdentity = await assertPrivateRecoveryDirectory(canonicalRoot); - if (!sameIdentity5(privateIdentity, { + if (!sameDirectoryIdentity(privateIdentity, { dev: metadata.dev, ino: metadata.ino, birthtimeNs: metadata.birthtimeNs @@ -55854,7 +54866,7 @@ async function stateRoot() { } return canonicalRoot; } catch (error51) { - if (isMissing4(error51)) return null; + if (isMissing(error51)) return null; throw error51; } } @@ -55866,61 +54878,9 @@ async function readBoundedRegularFile2(filename) { } return contents.toString("utf8"); } catch (error51) { - if (isMissing4(error51)) return null; - throw error51; - } -} -async function readCleanupJournal(filename) { - let handle; - try { - handle = await open14(filename, constants14.O_RDONLY | NO_FOLLOW8); - } catch (error51) { - if (isMissing4(error51)) return { text: null, tornTail: false }; + if (isMissing(error51)) return null; throw error51; } - let result; - let primaryError; - try { - const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat18(filename, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { - throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); - } - const bytes = await readHandleBytes3(handle, Number(metadata.size)); - const repeatedBytes = await readHandleBytes3(handle, Number(metadata.size)); - const settledMetadata = await handle.stat({ bigint: true }); - const settledNamedMetadata = await lstat18(filename, { bigint: true }); - if (bytes.byteLength > MAX_STATE_FILE_BYTES2 || settledMetadata.size > MAX_STATE_FILE_BYTES_BIGINT2) { - throw new RuntimeError("cleanup journal exceeds its size limit during read"); - } - if (!settledMetadata.isFile() || settledMetadata.nlink !== 1n || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.size !== metadata.size || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !settledNamedMetadata.isFile() || settledNamedMetadata.isSymbolicLink() || settledNamedMetadata.nlink !== 1n || settledNamedMetadata.dev !== metadata.dev || settledNamedMetadata.ino !== metadata.ino || settledNamedMetadata.birthtimeNs !== metadata.birthtimeNs || settledNamedMetadata.size !== metadata.size || settledNamedMetadata.mtimeNs !== metadata.mtimeNs || settledNamedMetadata.ctimeNs !== metadata.ctimeNs || BigInt(bytes.byteLength) !== metadata.size || !repeatedBytes.equals(bytes)) { - throw new RuntimeError("cleanup journal changed during read"); - } - const text = bytes.toString("utf8"); - if (text === "" || text.endsWith("\n")) { - result = { text, tornTail: false }; - } else { - const finalNewline = text.lastIndexOf("\n"); - const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); - result = { text: completePrefix, tornTail: true }; - } - } catch (error51) { - primaryError = error51; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== void 0) { - throw new AggregateError( - [primaryError, closeError], - "cleanup journal read failed and its handle could not be closed" - ); - } - throw closeError; - } - if (primaryError !== void 0) throw primaryError; - if (result === void 0) throw new RuntimeError("cleanup journal read produced no result"); - return result; } async function assertPrivateRecoveryDirectory(directory) { return await ensurePrivateDirectory(directory, { @@ -55941,7 +54901,7 @@ async function plainDirectoryIdentity2(directory) { birthtimeNs: metadata.birthtimeNs }; } catch (error51) { - if (isMissing4(error51)) return null; + if (isMissing(error51)) return null; throw error51; } } @@ -55957,10 +54917,10 @@ function parseRunStart(text, expectedRunId) { } const record2 = value; validateRunId(record2.runId); - if (record2.runId !== expectedRunId || typeof record2.lockKey !== "string" || !/^[0-9a-f]{64}$/.test(record2.lockKey) || typeof record2.canonicalCommonDir !== "string" || !path33.isAbsolute(record2.canonicalCommonDir) || record2.pid !== null && (record2.pid === void 0 || !Number.isSafeInteger(record2.pid) || record2.pid <= 1) || record2.processToken !== void 0 && record2.processToken !== null && typeof record2.processToken !== "string" || typeof record2.startedAt !== "string" || !Number.isFinite(Date.parse(record2.startedAt))) { + if (record2.runId !== expectedRunId || typeof record2.lockKey !== "string" || !/^[0-9a-f]{64}$/.test(record2.lockKey) || typeof record2.canonicalCommonDir !== "string" || !path34.isAbsolute(record2.canonicalCommonDir) || record2.pid !== null && (record2.pid === void 0 || !Number.isSafeInteger(record2.pid) || record2.pid <= 1) || record2.processToken !== void 0 && record2.processToken !== null && typeof record2.processToken !== "string" || typeof record2.startedAt !== "string" || !Number.isFinite(Date.parse(record2.startedAt))) { throw new RuntimeError("run-start recovery record is malformed"); } - const expectedLockKey = createHash16("sha256").update(record2.canonicalCommonDir).digest("hex"); + const expectedLockKey = createHash15("sha256").update(record2.canonicalCommonDir).digest("hex"); if (record2.lockKey !== expectedLockKey) { throw new RuntimeError("run-start lock key does not match its canonical common directory"); } @@ -55980,7 +54940,7 @@ function runGitError(action, result) { return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); } async function validateGitCommonDir(commonDir) { - const canonical = await realpath13(commonDir); + const canonical = await realpath14(commonDir); if (canonical !== commonDir) { throw new RuntimeError("recorded Git common directory is no longer canonical"); } @@ -55990,7 +54950,7 @@ async function validateGitCommonDir(commonDir) { "--git-common-dir" ]); if (result.exitCode !== 0) throw runGitError("validate Git common directory", result); - const reported = await realpath13(gitPathOutput( + const reported = await realpath14(gitPathOutput( result.stdout, "Git common directory" )); @@ -56000,16 +54960,16 @@ async function validateGitCommonDir(commonDir) { return canonical; } async function validateRepositoryRoot(repoRoot) { - if (!path33.isAbsolute(repoRoot)) { + if (!path34.isAbsolute(repoRoot)) { throw new RuntimeError("cleanup journal repository root is not absolute"); } - const canonical = await realpath13(repoRoot); + const canonical = await realpath14(repoRoot); if (canonical !== repoRoot) { throw new RuntimeError("cleanup journal repository root is no longer canonical"); } const result = await git(canonical, ["rev-parse", "--show-toplevel"]); if (result.exitCode !== 0) throw runGitError("validate cleanup repository", result); - if (await realpath13(gitPathOutput(result.stdout, "Git repository root")) !== canonical) { + if (await realpath14(gitPathOutput(result.stdout, "Git repository root")) !== canonical) { throw new RuntimeError("cleanup journal repository root is not the repository top level"); } return canonical; @@ -56022,7 +54982,7 @@ async function readDirectRef(repoRoot, ref, runGit = git) { if (symbolic.exitCode !== 1) throw runGitError("inspect symbolic Git ref", symbolic); const direct = await runGit(repoRoot, ["rev-parse", "--verify", "--quiet", ref]); if (direct.exitCode === 1) return null; - if (direct.exitCode !== 0 || !OID3.test(direct.stdout.trim())) { + if (direct.exitCode !== 0 || !OID2.test(direct.stdout.trim())) { throw runGitError("inspect Git ref", direct); } return direct.stdout.trim(); @@ -56031,77 +54991,92 @@ async function deleteExactRef(repoRoot, ref, oid, runGit = git) { const result = await runGit(repoRoot, ["update-ref", "--no-deref", "-d", ref, oid]); if (result.exitCode !== 0) throw runGitError("delete recovery Git ref", result); } -async function removeStaleCandidateAnchor(repoRoot, runId) { - const ref = `${CANDIDATE_REF_PREFIX3}${runId}`; - const oid = await readDirectRef(repoRoot, ref); - if (oid !== null) await deleteExactRef(repoRoot, ref, oid); -} -async function archiveInterruptedPipeline(store, result) { - if (result.status !== "verified-candidate") return; - const manifest = await store.readManifest(); - if (manifest === null) { - throw new RuntimeError("run manifest is missing while recovering interrupted pipeline"); +async function readHandleBytes3(handle, size) { + const contents = Buffer.alloc(size); + let offset = 0; + while (offset < size) { + const { bytesRead } = await handle.read( + contents, + offset, + size - offset, + offset + ); + if (bytesRead === 0) break; + offset += bytesRead; } - const failed = { - ...result, - status: "failed", - failure: "verification-failure", - summary: "Delegation pipeline was interrupted before trusted gates completed.", - unresolvedIssues: [ - ...result.unresolvedIssues, - "pipeline-interrupted-before-terminal-cleanup" - ], - evidence: { - ...result.evidence, - pipelineRecovery: "interrupted-before-terminal-cleanup" - } + return contents.subarray(0, offset); +} +function worktreeSweepIssue(worktreePath, error51, repositoryIdentity) { + return { + worktreePath, + reason: boundedRedactedDiagnostic(error51, MAX_QUARANTINE_REASON_BYTES), + ...repositoryIdentity === void 0 ? {} : { repositoryIdentity } }; - await store.promoteTerminalArtifacts({ result: failed, manifest }); } -function escapeRegex3(value) { - return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); +function boundedWorktreeSweepIssues(issues, worktreesRoot) { + if (issues.length <= MAX_WORKTREE_SWEEP_ISSUES) return issues; + const retained = issues.slice(0, MAX_WORKTREE_SWEEP_ISSUES - 1); + return [...retained, { + worktreePath: worktreesRoot, + reason: `${issues.length - retained.length} additional worktree sweep issues omitted` + }]; } -async function temporarySliceRefs(repoRoot, runId, runGit) { - const prefix = `${SLICE_REF_PREFIX}${runId}/`; - const listed = await runGit(repoRoot, [ - "for-each-ref", - "--format=%(refname)%09%(objectname)", - prefix - ]); - if (listed.exitCode !== 0) throw runGitError("enumerate temporary slice refs", listed); - const expectedName = new RegExp( - `^${escapeRegex3(prefix)}slice-[1-9][0-9]*-attempt-(?:0|[1-9][0-9]*)$` - ); - const refs = []; - for (const line of listed.stdout.split("\n").filter(Boolean)) { - const fields = line.split(" "); - if (fields.length !== 2 || fields[0] === void 0 || !expectedName.test(fields[0])) { - throw new RuntimeError("temporary slice ref name is malformed during recovery"); + +// src/runtime/recovery-prune-journal.ts +import { constants as constants16 } from "node:fs"; +import { lstat as lstat19, open as open16, realpath as realpath15 } from "node:fs/promises"; +import path35 from "node:path"; +async function readCleanupJournal(filename) { + let handle; + try { + handle = await open16(filename, constants16.O_RDONLY | NO_FOLLOW8); + } catch (error51) { + if (isMissing(error51)) return { text: null, tornTail: false }; + throw error51; + } + let result; + let primaryError; + try { + const metadata = await handle.stat({ bigint: true }); + const namedMetadata = await lstat19(filename, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { + throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); } - if (fields[1] === void 0 || !OID3.test(fields[1])) { - throw new RuntimeError("temporary slice ref OID is malformed during recovery"); + const bytes = await readHandleBytes3(handle, Number(metadata.size)); + const repeatedBytes = await readHandleBytes3(handle, Number(metadata.size)); + const settledMetadata = await handle.stat({ bigint: true }); + const settledNamedMetadata = await lstat19(filename, { bigint: true }); + if (bytes.byteLength > MAX_STATE_FILE_BYTES2 || settledMetadata.size > MAX_STATE_FILE_BYTES_BIGINT2) { + throw new RuntimeError("cleanup journal exceeds its size limit during read"); } - const object3 = await runGit(repoRoot, ["cat-file", "-t", fields[1]], { - env: { GIT_NO_REPLACE_OBJECTS: "1" } - }); - if (object3.exitCode !== 0 || object3.stdout.trim() !== "commit") { - throw new RuntimeError("temporary slice ref does not identify a commit during recovery"); + if (!settledMetadata.isFile() || settledMetadata.nlink !== 1n || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.size !== metadata.size || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !settledNamedMetadata.isFile() || settledNamedMetadata.isSymbolicLink() || settledNamedMetadata.nlink !== 1n || settledNamedMetadata.dev !== metadata.dev || settledNamedMetadata.ino !== metadata.ino || settledNamedMetadata.birthtimeNs !== metadata.birthtimeNs || settledNamedMetadata.size !== metadata.size || settledNamedMetadata.mtimeNs !== metadata.mtimeNs || settledNamedMetadata.ctimeNs !== metadata.ctimeNs || BigInt(bytes.byteLength) !== metadata.size || !repeatedBytes.equals(bytes)) { + throw new RuntimeError("cleanup journal changed during read"); } - refs.push({ ref: fields[0], oid: fields[1] }); - } - for (const temporaryRef of refs) { - const current = await readDirectRef(repoRoot, temporaryRef.ref, runGit); - if (current !== temporaryRef.oid) { - throw new RuntimeError("temporary slice ref moved during recovery"); + const text = bytes.toString("utf8"); + if (text === "" || text.endsWith("\n")) { + result = { text, tornTail: false }; + } else { + const finalNewline = text.lastIndexOf("\n"); + const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); + result = { text: completePrefix, tornTail: true }; } + } catch (error51) { + primaryError = error51; } - return refs; -} -async function cleanupTemporarySliceRefs2(repoRoot, runId, runGit) { - const refs = await temporarySliceRefs(repoRoot, runId, runGit); - for (const temporaryRef of refs) { - await deleteExactRef(repoRoot, temporaryRef.ref, temporaryRef.oid, runGit); + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== void 0) { + throw new AggregateError( + [primaryError, closeError], + "cleanup journal read failed and its handle could not be closed" + ); + } + throw closeError; } + if (primaryError !== void 0) throw primaryError; + if (result === void 0) throw new RuntimeError("cleanup journal read produced no result"); + return result; } function parseCleanupRecord(line) { let value; @@ -56129,7 +55104,7 @@ function parseCleanupRecord(line) { const hasRepository = typeof record2.repoRoot === "string" && typeof record2.anchorRef === "string" && typeof record2.candidateCommitOid === "string"; const repositoryOnly = typeof record2.repoRoot === "string" && record2.anchorRef === null && record2.backupRef === null && record2.candidateCommitOid === null; const noRepository = record2.repoRoot === null && record2.anchorRef === null && record2.backupRef === null && record2.candidateCommitOid === null; - if (!noRepository && !repositoryOnly && (!hasRepository || record2.anchorRef !== `${CANDIDATE_REF_PREFIX3}${record2.runId}` || !OID3.test(record2.candidateCommitOid) || record2.backupRef !== null && record2.backupRef !== `${BACKUP_REF_PREFIX}${record2.runId}`)) { + if (!noRepository && !repositoryOnly && (!hasRepository || record2.anchorRef !== `${CANDIDATE_REF_PREFIX3}${record2.runId}` || !OID2.test(record2.candidateCommitOid) || record2.backupRef !== null && record2.backupRef !== `${BACKUP_REF_PREFIX}${record2.runId}`)) { throw new RuntimeError("cleanup journal Git metadata is malformed"); } return record2; @@ -56138,6 +55113,242 @@ function cleanupOutcome(record2) { if (record2.repoRoot === null || record2.anchorRef === null) return "not-applicable"; return record2.backupRef === null ? "already-absent" : "deleted"; } +async function removePlainDirectory(directory, expected, platformServices) { + const metadata = await lstat19(directory, { bigint: true }); + if (!isPlainDirectory3(metadata) || !sameDirectoryIdentity(metadata, expected)) { + throw new RuntimeError("recovery directory identity changed before removal"); + } + await emptyBoundDirectory(directory, expected, platformServices); + await removeBoundEmptyDirectory(directory, expected, platformServices); +} +async function createExactRef(repoRoot, ref, oid) { + const result = await git(repoRoot, [ + "update-ref", + "--no-deref", + ref, + oid, + "0".repeat(oid.length) + ]); + if (result.exitCode !== 0) throw runGitError("create recovery Git ref", result); +} +async function appendCleanupRecord(runsRoot, record2) { + const journalLock = await getPlatformServices().acquireCleanupJournalLock(); + try { + const identity = await plainDirectoryIdentity2(runsRoot); + if (identity === null) throw new RuntimeError("cleanup journal root disappeared"); + const filename = path35.join(runsRoot, "cleanup.ndjson"); + const handle = await open16( + filename, + constants16.O_WRONLY | constants16.O_CREAT | constants16.O_APPEND | NO_FOLLOW8, + 384 + ); + try { + const metadata = await handle.stat(); + const currentRoot2 = await lstat19(runsRoot, { bigint: true }); + if (!metadata.isFile() || !isPlainDirectory3(currentRoot2) || !sameDirectoryIdentity(currentRoot2, identity)) { + throw new RuntimeError("cleanup journal identity changed during recovery"); + } + await handle.writeFile(`${JSON.stringify(record2)} +`, "utf8"); + await handle.sync(); + } finally { + await handle.close(); + } + const currentRoot = await lstat19(runsRoot, { bigint: true }); + if (!isPlainDirectory3(currentRoot) || !sameDirectoryIdentity(currentRoot, identity)) { + throw new RuntimeError("cleanup journal root changed after recovery append"); + } + } finally { + await journalLock.release(); + } +} +async function reconcileCleanupRefs(record2, action) { + const outcome = cleanupOutcome(record2); + if (outcome === "not-applicable") return outcome; + const repoRoot = await validateRepositoryRoot(record2.repoRoot); + const anchorRef = record2.anchorRef; + const candidateOid = record2.candidateCommitOid; + let anchorOid = await readDirectRef(repoRoot, anchorRef); + if (anchorOid !== null && anchorOid !== candidateOid) { + throw new RuntimeError("candidate anchor moved during interrupted prune recovery"); + } + if (outcome === "already-absent") { + if (anchorOid !== null) { + throw new RuntimeError("candidate anchor unexpectedly reappeared during prune recovery"); + } + return outcome; + } + const backupRef = record2.backupRef; + let backupOid = await readDirectRef(repoRoot, backupRef); + if (backupOid !== null && backupOid !== candidateOid) { + throw new RuntimeError("candidate prune backup moved during recovery"); + } + if (action === "finish") { + if (anchorOid !== null && backupOid === null) { + await createExactRef(repoRoot, backupRef, candidateOid); + backupOid = candidateOid; + } + if (anchorOid !== null) { + await deleteExactRef(repoRoot, anchorRef, candidateOid); + anchorOid = null; + } + return outcome; + } + if (anchorOid === null) { + if (backupOid === null) { + throw new RuntimeError("cannot restore candidate anchor without its prune backup"); + } + await createExactRef(repoRoot, anchorRef, candidateOid); + anchorOid = candidateOid; + } + if (backupOid !== null) await deleteExactRef(repoRoot, backupRef, candidateOid); + return outcome; +} +async function commitCleanupRefs(record2) { + if (cleanupOutcome(record2) !== "deleted") return; + const repoRoot = await validateRepositoryRoot(record2.repoRoot); + const backupOid = await readDirectRef(repoRoot, record2.backupRef); + if (backupOid === null) return; + if (backupOid !== record2.candidateCommitOid) { + throw new RuntimeError("candidate prune backup moved before cleanup commit"); + } + await deleteExactRef(repoRoot, record2.backupRef, backupOid); +} +async function readPendingCleanupRecords(runsRoot) { + const { text, tornTail } = await readCleanupJournal(path35.join(runsRoot, "cleanup.ndjson")); + const pending = /* @__PURE__ */ new Map(); + if (text === null || text === "") return { pending, tornTail }; + const completeText = text.endsWith("\n") ? text.slice(0, -1) : text; + for (const line of completeText.split("\n")) { + if (line.trim() === "") throw new RuntimeError("cleanup journal contains a blank record"); + const record2 = parseCleanupRecord(line); + if (record2.event === "prune-cleanup-intent") pending.set(record2.runId, record2); + else pending.delete(record2.runId); + } + return { pending, tornTail }; +} +async function truncateCleanupTornTail(filename) { + let handle; + try { + handle = await open16(filename, constants16.O_RDWR | NO_FOLLOW8); + } catch (error51) { + if (isMissing(error51)) return; + throw error51; + } + try { + const metadata = await handle.stat({ bigint: true }); + const namedMetadata = await lstat19(filename, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { + throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); + } + const bytes = await readHandleBytes3(handle, Number(metadata.size)); + const text = bytes.toString("utf8"); + if (text === "" || text.endsWith("\n")) return; + const settled = await handle.stat({ bigint: true }); + const settledNamed = await lstat19(filename, { bigint: true }); + if (BigInt(bytes.byteLength) !== metadata.size || !settled.isFile() || settled.nlink !== 1n || settled.size !== metadata.size || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size) { + throw new RuntimeError("cleanup journal changed during torn-tail repair"); + } + const finalNewline = text.lastIndexOf("\n"); + const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); + await handle.truncate(Buffer.byteLength(completePrefix, "utf8")); + await handle.sync(); + } finally { + await handle?.close(); + } +} +async function repositoryRootExists(repoRoot) { + if (!path35.isAbsolute(repoRoot)) return true; + try { + await realpath15(repoRoot); + return true; + } catch (error51) { + if (isMissing(error51)) return false; + throw error51; + } +} +async function reconcileRepoAbsentPrune(runsRoot, record2, platformServices) { + const runDirectory = path35.join(runsRoot, record2.runId); + const quarantinePath = path35.join(runsRoot, record2.quarantineName); + const runIdentity = await plainDirectoryIdentity2(runDirectory); + const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); + if (runIdentity !== null && quarantineIdentity !== null) { + throw new RuntimeError("both retained and quarantined run archives exist during recovery"); + } + const action = runIdentity !== null ? "rollback" : "finish"; + if (action === "finish" && quarantineIdentity !== null) { + await removePlainDirectory(quarantinePath, quarantineIdentity, platformServices); + } + await appendCleanupRecord(runsRoot, { + ...record2, + event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", + anchorCleanup: "already-absent", + recordedAt: (/* @__PURE__ */ new Date()).toISOString() + }); +} +async function replayInterruptedPrunes(runsRoot, ps) { + let pending; + const journalLock = await getPlatformServices().acquireCleanupJournalLock(); + try { + const read = await readPendingCleanupRecords(runsRoot); + if (read.tornTail) await truncateCleanupTornTail(path35.join(runsRoot, "cleanup.ndjson")); + pending = read.pending; + } finally { + await journalLock.release(); + } + for (const record2 of [...pending.values()].sort((left, right) => left.runId.localeCompare(right.runId))) { + if (record2.repoRoot === null) continue; + if (!await repositoryRootExists(record2.repoRoot)) { + await reconcileRepoAbsentPrune(runsRoot, record2, ps); + continue; + } + const repoRoot = await validateRepositoryRoot(record2.repoRoot); + const commonResult = await git(repoRoot, [ + "rev-parse", + "--path-format=absolute", + "--git-common-dir" + ]); + if (commonResult.exitCode !== 0) { + throw runGitError("resolve cleanup repository identity", commonResult); + } + const repositoryIdentity = await realpath15(gitPathOutput( + commonResult.stdout, + "cleanup repository identity" + )); + await platformSafety.withRecoveryLease(repoRoot, async (lease) => { + if (lease.repositoryIdentity !== repositoryIdentity) { + throw new RuntimeError("checkout lease repository identity changed during prune recovery"); + } + const runDirectory = path35.join(runsRoot, record2.runId); + const quarantinePath = path35.join(runsRoot, record2.quarantineName); + const runIdentity = await plainDirectoryIdentity2(runDirectory); + const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); + if (runIdentity !== null && quarantineIdentity !== null) { + throw new RuntimeError("both retained and quarantined run archives exist during recovery"); + } + const action = runIdentity !== null ? "rollback" : "finish"; + const outcome = await reconcileCleanupRefs(record2, action); + if (action === "finish") { + if (quarantineIdentity !== null) { + await removePlainDirectory(quarantinePath, quarantineIdentity, ps); + } + await commitCleanupRefs(record2); + } + await appendCleanupRecord(runsRoot, { + ...record2, + event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", + anchorCleanup: outcome, + recordedAt: (/* @__PURE__ */ new Date()).toISOString() + }); + }); + } +} + +// src/runtime/recovery-quarantine.ts +import { randomUUID as randomUUID12 } from "node:crypto"; +import { constants as constants17 } from "node:fs"; +import { lstat as lstat20, link as link6, open as open17, rename as rename7 } from "node:fs/promises"; +import path36 from "node:path"; function boundedQuarantineReason(error51) { return boundedRedactedDiagnostic(error51, MAX_QUARANTINE_REASON_BYTES); } @@ -56184,14 +55395,14 @@ async function readRecoveryQuarantineJournal(runsRoot) { if (rootIdentity === null) { throw new RuntimeError("recovery quarantine journal root disappeared"); } - const filename = path33.join(runsRoot, "recovery-quarantine.ndjson"); + const filename = path36.join(runsRoot, "recovery-quarantine.ndjson"); let expectedMetadata; try { - expectedMetadata = await lstat18(filename, { bigint: true }); + expectedMetadata = await lstat20(filename, { bigint: true }); } catch (error51) { - if (!isMissing4(error51)) throw error51; - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (!isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, rootIdentity)) { + if (!isMissing(error51)) throw error51; + const currentRoot = await lstat20(runsRoot, { bigint: true }); + if (!isPlainDirectory3(currentRoot) || !sameDirectoryIdentity(currentRoot, rootIdentity)) { throw new RuntimeError("recovery quarantine journal root changed during missing read"); } return { @@ -56206,15 +55417,15 @@ async function readRecoveryQuarantineJournal(runsRoot) { } let handle; try { - handle = await open14(filename, constants14.O_RDONLY | NO_FOLLOW8); + handle = await open17(filename, constants17.O_RDONLY | NO_FOLLOW8); } catch (error51) { - if (!isMissing4(error51)) throw error51; + if (!isMissing(error51)) throw error51; try { - await lstat18(filename); + await lstat20(filename); } catch (namedError) { - if (isMissing4(namedError)) { - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (isPlainDirectory3(currentRoot) && sameIdentity5(currentRoot, rootIdentity)) { + if (isMissing(namedError)) { + const currentRoot = await lstat20(runsRoot, { bigint: true }); + if (isPlainDirectory3(currentRoot) && sameDirectoryIdentity(currentRoot, rootIdentity)) { return { bytes: Buffer.alloc(0), runIds: /* @__PURE__ */ new Set(), @@ -56231,9 +55442,9 @@ async function readRecoveryQuarantineJournal(runsRoot) { let primaryError; try { const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat18(filename, { bigint: true }); - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || metadata.size !== expectedMetadata.size || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.size !== metadata.size || namedMetadata.dev !== expectedMetadata.dev || namedMetadata.ino !== expectedMetadata.ino || namedMetadata.birthtimeNs !== expectedMetadata.birthtimeNs || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, rootIdentity)) { + const namedMetadata = await lstat20(filename, { bigint: true }); + const currentRoot = await lstat20(runsRoot, { bigint: true }); + if (!metadata.isFile() || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || metadata.size !== expectedMetadata.size || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.size !== metadata.size || namedMetadata.dev !== expectedMetadata.dev || namedMetadata.ino !== expectedMetadata.ino || namedMetadata.birthtimeNs !== expectedMetadata.birthtimeNs || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || !isPlainDirectory3(currentRoot) || !sameDirectoryIdentity(currentRoot, rootIdentity)) { throw new RuntimeError("recovery quarantine journal changed during read"); } journalIdentity = { @@ -56243,9 +55454,9 @@ async function readRecoveryQuarantineJournal(runsRoot) { }; bytes = await readHandleBytes3(handle, Number(metadata.size)); const settledHandle = await handle.stat({ bigint: true }); - const settledMetadata = await lstat18(filename, { bigint: true }); - const settledRoot = await lstat18(runsRoot, { bigint: true }); - if (!settledHandle.isFile() || settledHandle.nlink !== 1n || settledHandle.size !== metadata.size || settledHandle.dev !== metadata.dev || settledHandle.ino !== metadata.ino || settledHandle.birthtimeNs !== metadata.birthtimeNs || settledHandle.mtimeNs !== metadata.mtimeNs || settledHandle.ctimeNs !== metadata.ctimeNs || !settledMetadata.isFile() || settledMetadata.isSymbolicLink() || settledMetadata.nlink !== 1n || settledMetadata.size !== BigInt(bytes.byteLength) || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !isPlainDirectory3(settledRoot) || !sameIdentity5(settledRoot, rootIdentity)) { + const settledMetadata = await lstat20(filename, { bigint: true }); + const settledRoot = await lstat20(runsRoot, { bigint: true }); + if (!settledHandle.isFile() || settledHandle.nlink !== 1n || settledHandle.size !== metadata.size || settledHandle.dev !== metadata.dev || settledHandle.ino !== metadata.ino || settledHandle.birthtimeNs !== metadata.birthtimeNs || settledHandle.mtimeNs !== metadata.mtimeNs || settledHandle.ctimeNs !== metadata.ctimeNs || !settledMetadata.isFile() || settledMetadata.isSymbolicLink() || settledMetadata.nlink !== 1n || settledMetadata.size !== BigInt(bytes.byteLength) || settledMetadata.dev !== metadata.dev || settledMetadata.ino !== metadata.ino || settledMetadata.birthtimeNs !== metadata.birthtimeNs || settledMetadata.mtimeNs !== metadata.mtimeNs || settledMetadata.ctimeNs !== metadata.ctimeNs || !isPlainDirectory3(settledRoot) || !sameDirectoryIdentity(settledRoot, rootIdentity)) { throw new RuntimeError("recovery quarantine journal changed after read"); } } catch (error51) { @@ -56277,9 +55488,9 @@ async function syncRecoveryDirectory(directory) { await syncDirectoryMetadata(directory); } async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes) { - const temporaryPath = path33.join( + const temporaryPath = path36.join( runsRoot, - `.recovery-quarantine-journal-${randomUUID13()}.tmp` + `.recovery-quarantine-journal-${randomUUID12()}.tmp` ); let handle; let temporaryCreated = false; @@ -56288,9 +55499,9 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne let temporaryIdentity; let primaryError; try { - handle = await open14( + handle = await open17( temporaryPath, - constants14.O_RDWR | constants14.O_CREAT | constants14.O_EXCL | NO_FOLLOW8, + constants17.O_RDWR | constants17.O_CREAT | constants17.O_EXCL | NO_FOLLOW8, 384 ); temporaryCreated = true; @@ -56300,9 +55511,9 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne ino: metadata.ino, birthtimeNs: metadata.birthtimeNs }; - const namedMetadata = await lstat18(temporaryPath, { bigint: true }); - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, snapshot.rootIdentity)) { + const namedMetadata = await lstat20(temporaryPath, { bigint: true }); + const currentRoot = await lstat20(runsRoot, { bigint: true }); + if (!metadata.isFile() || metadata.nlink !== 1n || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !isPlainDirectory3(currentRoot) || !sameDirectoryIdentity(currentRoot, snapshot.rootIdentity)) { throw new RuntimeError("recovery quarantine journal temp changed during creation"); } await handle.writeFile(nextBytes); @@ -56351,7 +55562,7 @@ async function publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, ne throw new RuntimeError("recovery quarantine journal changed before publication"); } if (snapshot.journalIdentity === null) { - await link8(temporaryPath, filename); + await link6(temporaryPath, filename); linkedPublication = true; await validatePublishedLock( temporaryPath, @@ -56422,7 +55633,7 @@ async function appendRecoveryQuarantineRecord(runsRoot, record2) { if (lineBytes > MAX_QUARANTINE_RECORD_BYTES) { throw new RuntimeError("recovery quarantine record exceeds its size limit"); } - const filename = path33.join(runsRoot, "recovery-quarantine.ndjson"); + const filename = path36.join(runsRoot, "recovery-quarantine.ndjson"); const snapshot = await readRecoveryQuarantineJournal(runsRoot); if (snapshot.runIds.has(record2.runId)) { await syncRecoveryDirectory(runsRoot); @@ -56439,8 +55650,8 @@ async function appendRecoveryQuarantineRecord(runsRoot, record2) { await publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes); } async function quarantineRun(runsRoot, runId, error51) { - const runDirectory = path33.join(runsRoot, runId); - const quarantinePath = path33.join(runsRoot, `.poisoned-${runId}`); + const runDirectory = path36.join(runsRoot, runId); + const quarantinePath = path36.join(runsRoot, `.poisoned-${runId}`); const runsIdentity = await plainDirectoryIdentity2(runsRoot); if (runsIdentity === null) throw new RuntimeError("recovery runs root disappeared"); let runIdentity = null; @@ -56455,8 +55666,8 @@ async function quarantineRun(runsRoot, runId, error51) { await rename7(runDirectory, quarantinePath); renamed = true; const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (quarantineIdentity === null || quarantineIdentity.dev !== runIdentity.dev || quarantineIdentity.ino !== runIdentity.ino || quarantineIdentity.birthtimeNs !== runIdentity.birthtimeNs || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, runsIdentity)) { + const currentRoot = await lstat20(runsRoot, { bigint: true }); + if (quarantineIdentity === null || quarantineIdentity.dev !== runIdentity.dev || quarantineIdentity.ino !== runIdentity.ino || quarantineIdentity.birthtimeNs !== runIdentity.birthtimeNs || !isPlainDirectory3(currentRoot) || !sameDirectoryIdentity(currentRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery run identity changed during quarantine"); } const record2 = { @@ -56475,21 +55686,21 @@ async function quarantineRun(runsRoot, runId, error51) { const errors = [error51, quarantineError]; if (renamed && !journaled && runIdentity !== null) { try { - const quarantineMetadata = await lstat18(quarantinePath, { bigint: true }); - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (!isPlainDirectory3(quarantineMetadata) || !sameIdentity5(quarantineMetadata, runIdentity) || await plainDirectoryIdentity2(runDirectory) !== null || !isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, runsIdentity)) { + const quarantineMetadata = await lstat20(quarantinePath, { bigint: true }); + const currentRoot = await lstat20(runsRoot, { bigint: true }); + if (!isPlainDirectory3(quarantineMetadata) || !sameDirectoryIdentity(quarantineMetadata, runIdentity) || await plainDirectoryIdentity2(runDirectory) !== null || !isPlainDirectory3(currentRoot) || !sameDirectoryIdentity(currentRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery rollback identity or destination is unsafe"); } await rename7(quarantinePath, runDirectory); - const restoredMetadata = await lstat18(runDirectory, { bigint: true }); - const restoredRoot = await lstat18(runsRoot, { bigint: true }); - if (!isPlainDirectory3(restoredMetadata) || !sameIdentity5(restoredMetadata, runIdentity) || !isPlainDirectory3(restoredRoot) || !sameIdentity5(restoredRoot, runsIdentity)) { + const restoredMetadata = await lstat20(runDirectory, { bigint: true }); + const restoredRoot = await lstat20(runsRoot, { bigint: true }); + if (!isPlainDirectory3(restoredMetadata) || !sameDirectoryIdentity(restoredMetadata, runIdentity) || !isPlainDirectory3(restoredRoot) || !sameDirectoryIdentity(restoredRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery rollback identity changed"); } await syncRecoveryDirectory(runsRoot); - const settledMetadata = await lstat18(runDirectory, { bigint: true }); - const settledRoot = await lstat18(runsRoot, { bigint: true }); - if (!isPlainDirectory3(settledMetadata) || !sameIdentity5(settledMetadata, runIdentity) || !isPlainDirectory3(settledRoot) || !sameIdentity5(settledRoot, runsIdentity)) { + const settledMetadata = await lstat20(runDirectory, { bigint: true }); + const settledRoot = await lstat20(runsRoot, { bigint: true }); + if (!isPlainDirectory3(settledMetadata) || !sameDirectoryIdentity(settledMetadata, runIdentity) || !isPlainDirectory3(settledRoot) || !sameDirectoryIdentity(settledRoot, runsIdentity)) { throw new RuntimeError("poisoned recovery rollback changed after directory sync"); } } catch (rollbackError) { @@ -56499,242 +55710,88 @@ async function quarantineRun(runsRoot, runId, error51) { throw new AggregateError(errors, "run recovery failed and quarantine did not complete"); } } -async function removePlainDirectory(directory, expected, platformServices) { - const metadata = await lstat18(directory, { bigint: true }); - if (!isPlainDirectory3(metadata) || !sameIdentity5(metadata, expected)) { - throw new RuntimeError("recovery directory identity changed before removal"); - } - await emptyBoundDirectory(directory, expected, platformServices); - await removeBoundEmptyDirectory(directory, expected, platformServices); -} -async function createExactRef(repoRoot, ref, oid) { - const result = await git(repoRoot, [ - "update-ref", - "--no-deref", - ref, - oid, - "0".repeat(oid.length) - ]); - if (result.exitCode !== 0) throw runGitError("create recovery Git ref", result); -} -async function appendCleanupRecord(runsRoot, record2) { - const journalLock = await getPlatformServices().acquireCleanupJournalLock(); - try { - const identity = await plainDirectoryIdentity2(runsRoot); - if (identity === null) throw new RuntimeError("cleanup journal root disappeared"); - const filename = path33.join(runsRoot, "cleanup.ndjson"); - const handle = await open14( - filename, - constants14.O_WRONLY | constants14.O_CREAT | constants14.O_APPEND | NO_FOLLOW8, - 384 - ); - try { - const metadata = await handle.stat(); - const currentRoot2 = await lstat18(runsRoot, { bigint: true }); - if (!metadata.isFile() || !isPlainDirectory3(currentRoot2) || !sameIdentity5(currentRoot2, identity)) { - throw new RuntimeError("cleanup journal identity changed during recovery"); - } - await handle.writeFile(`${JSON.stringify(record2)} -`, "utf8"); - await handle.sync(); - } finally { - await handle.close(); - } - const currentRoot = await lstat18(runsRoot, { bigint: true }); - if (!isPlainDirectory3(currentRoot) || !sameIdentity5(currentRoot, identity)) { - throw new RuntimeError("cleanup journal root changed after recovery append"); - } - } finally { - await journalLock.release(); - } + +// src/runtime/recovery-runs.ts +import { lstat as lstat21, readdir as readdir9, realpath as realpath16 } from "node:fs/promises"; +import path37 from "node:path"; +async function removeStaleCandidateAnchor(repoRoot, runId) { + const ref = `${CANDIDATE_REF_PREFIX3}${runId}`; + const oid = await readDirectRef(repoRoot, ref); + if (oid !== null) await deleteExactRef(repoRoot, ref, oid); } -async function reconcileCleanupRefs(record2, action) { - const outcome = cleanupOutcome(record2); - if (outcome === "not-applicable") return outcome; - const repoRoot = await validateRepositoryRoot(record2.repoRoot); - const anchorRef = record2.anchorRef; - const candidateOid = record2.candidateCommitOid; - let anchorOid = await readDirectRef(repoRoot, anchorRef); - if (anchorOid !== null && anchorOid !== candidateOid) { - throw new RuntimeError("candidate anchor moved during interrupted prune recovery"); - } - if (outcome === "already-absent") { - if (anchorOid !== null) { - throw new RuntimeError("candidate anchor unexpectedly reappeared during prune recovery"); - } - return outcome; - } - const backupRef = record2.backupRef; - let backupOid = await readDirectRef(repoRoot, backupRef); - if (backupOid !== null && backupOid !== candidateOid) { - throw new RuntimeError("candidate prune backup moved during recovery"); - } - if (action === "finish") { - if (anchorOid !== null && backupOid === null) { - await createExactRef(repoRoot, backupRef, candidateOid); - backupOid = candidateOid; - } - if (anchorOid !== null) { - await deleteExactRef(repoRoot, anchorRef, candidateOid); - anchorOid = null; - } - return outcome; +async function archiveInterruptedPipeline(store, result) { + if (result.status !== "verified-candidate") return; + const manifest = await store.readManifest(); + if (manifest === null) { + throw new RuntimeError("run manifest is missing while recovering interrupted pipeline"); } - if (anchorOid === null) { - if (backupOid === null) { - throw new RuntimeError("cannot restore candidate anchor without its prune backup"); + const failed = { + ...result, + status: "failed", + failure: "verification-failure", + summary: "Delegation pipeline was interrupted before trusted gates completed.", + unresolvedIssues: [ + ...result.unresolvedIssues, + "pipeline-interrupted-before-terminal-cleanup" + ], + evidence: { + ...result.evidence, + pipelineRecovery: "interrupted-before-terminal-cleanup" } - await createExactRef(repoRoot, anchorRef, candidateOid); - anchorOid = candidateOid; - } - if (backupOid !== null) await deleteExactRef(repoRoot, backupRef, candidateOid); - return outcome; -} -async function commitCleanupRefs(record2) { - if (cleanupOutcome(record2) !== "deleted") return; - const repoRoot = await validateRepositoryRoot(record2.repoRoot); - const backupOid = await readDirectRef(repoRoot, record2.backupRef); - if (backupOid === null) return; - if (backupOid !== record2.candidateCommitOid) { - throw new RuntimeError("candidate prune backup moved before cleanup commit"); - } - await deleteExactRef(repoRoot, record2.backupRef, backupOid); + }; + await store.promoteTerminalArtifacts({ result: failed, manifest }); } -async function readPendingCleanupRecords(runsRoot) { - const { text, tornTail } = await readCleanupJournal(path33.join(runsRoot, "cleanup.ndjson")); - const pending = /* @__PURE__ */ new Map(); - if (text === null || text === "") return { pending, tornTail }; - const completeText = text.endsWith("\n") ? text.slice(0, -1) : text; - for (const line of completeText.split("\n")) { - if (line.trim() === "") throw new RuntimeError("cleanup journal contains a blank record"); - const record2 = parseCleanupRecord(line); - if (record2.event === "prune-cleanup-intent") pending.set(record2.runId, record2); - else pending.delete(record2.runId); - } - return { pending, tornTail }; +function escapeRegex3(value) { + return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); } -async function truncateCleanupTornTail(filename) { - let handle; - try { - handle = await open14(filename, constants14.O_RDWR | NO_FOLLOW8); - } catch (error51) { - if (isMissing4(error51)) return; - throw error51; - } - try { - const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat18(filename, { bigint: true }); - if (!metadata.isFile() || metadata.nlink !== 1n || metadata.size > MAX_STATE_FILE_BYTES_BIGINT2 || !namedMetadata.isFile() || namedMetadata.isSymbolicLink() || namedMetadata.nlink !== 1n || namedMetadata.dev !== metadata.dev || namedMetadata.ino !== metadata.ino || namedMetadata.birthtimeNs !== metadata.birthtimeNs || namedMetadata.size !== metadata.size) { - throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); +async function temporarySliceRefs(repoRoot, runId, runGit) { + const prefix = `${SLICE_REF_PREFIX}${runId}/`; + const listed = await runGit(repoRoot, [ + "for-each-ref", + "--format=%(refname)%09%(objectname)", + prefix + ]); + if (listed.exitCode !== 0) throw runGitError("enumerate temporary slice refs", listed); + const expectedName = new RegExp( + `^${escapeRegex3(prefix)}slice-[1-9][0-9]*-attempt-(?:0|[1-9][0-9]*)$` + ); + const refs = []; + for (const line of listed.stdout.split("\n").filter(Boolean)) { + const fields = line.split(" "); + if (fields.length !== 2 || fields[0] === void 0 || !expectedName.test(fields[0])) { + throw new RuntimeError("temporary slice ref name is malformed during recovery"); } - const bytes = await readHandleBytes3(handle, Number(metadata.size)); - const text = bytes.toString("utf8"); - if (text === "" || text.endsWith("\n")) return; - const settled = await handle.stat({ bigint: true }); - const settledNamed = await lstat18(filename, { bigint: true }); - if (BigInt(bytes.byteLength) !== metadata.size || !settled.isFile() || settled.nlink !== 1n || settled.size !== metadata.size || settled.dev !== metadata.dev || settled.ino !== metadata.ino || settled.birthtimeNs !== metadata.birthtimeNs || settled.mtimeNs !== metadata.mtimeNs || settled.ctimeNs !== metadata.ctimeNs || !settledNamed.isFile() || settledNamed.isSymbolicLink() || settledNamed.nlink !== 1n || settledNamed.dev !== metadata.dev || settledNamed.ino !== metadata.ino || settledNamed.birthtimeNs !== metadata.birthtimeNs || settledNamed.size !== metadata.size) { - throw new RuntimeError("cleanup journal changed during torn-tail repair"); + if (fields[1] === void 0 || !OID2.test(fields[1])) { + throw new RuntimeError("temporary slice ref OID is malformed during recovery"); } - const finalNewline = text.lastIndexOf("\n"); - const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); - await handle.truncate(Buffer.byteLength(completePrefix, "utf8")); - await handle.sync(); - } finally { - await handle?.close(); - } -} -async function repositoryRootExists(repoRoot) { - if (!path33.isAbsolute(repoRoot)) return true; - try { - await realpath13(repoRoot); - return true; - } catch (error51) { - if (isMissing4(error51)) return false; - throw error51; - } -} -async function reconcileRepoAbsentPrune(runsRoot, record2, platformServices) { - const runDirectory = path33.join(runsRoot, record2.runId); - const quarantinePath = path33.join(runsRoot, record2.quarantineName); - const runIdentity = await plainDirectoryIdentity2(runDirectory); - const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); - if (runIdentity !== null && quarantineIdentity !== null) { - throw new RuntimeError("both retained and quarantined run archives exist during recovery"); + const object3 = await runGit(repoRoot, ["cat-file", "-t", fields[1]], { + env: { GIT_NO_REPLACE_OBJECTS: "1" } + }); + if (object3.exitCode !== 0 || object3.stdout.trim() !== "commit") { + throw new RuntimeError("temporary slice ref does not identify a commit during recovery"); + } + refs.push({ ref: fields[0], oid: fields[1] }); } - const action = runIdentity !== null ? "rollback" : "finish"; - if (action === "finish" && quarantineIdentity !== null) { - await removePlainDirectory(quarantinePath, quarantineIdentity, platformServices); + for (const temporaryRef of refs) { + const current = await readDirectRef(repoRoot, temporaryRef.ref, runGit); + if (current !== temporaryRef.oid) { + throw new RuntimeError("temporary slice ref moved during recovery"); + } } - await appendCleanupRecord(runsRoot, { - ...record2, - event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", - anchorCleanup: "already-absent", - recordedAt: (/* @__PURE__ */ new Date()).toISOString() - }); + return refs; } -async function replayInterruptedPrunes(runsRoot, ps) { - let pending; - const journalLock = await getPlatformServices().acquireCleanupJournalLock(); - try { - const read = await readPendingCleanupRecords(runsRoot); - if (read.tornTail) await truncateCleanupTornTail(path33.join(runsRoot, "cleanup.ndjson")); - pending = read.pending; - } finally { - await journalLock.release(); - } - for (const record2 of [...pending.values()].sort((left, right) => left.runId.localeCompare(right.runId))) { - if (record2.repoRoot === null) continue; - if (!await repositoryRootExists(record2.repoRoot)) { - await reconcileRepoAbsentPrune(runsRoot, record2, ps); - continue; - } - const repoRoot = await validateRepositoryRoot(record2.repoRoot); - const commonResult = await git(repoRoot, [ - "rev-parse", - "--path-format=absolute", - "--git-common-dir" - ]); - if (commonResult.exitCode !== 0) { - throw runGitError("resolve cleanup repository identity", commonResult); - } - const repositoryIdentity = await realpath13(gitPathOutput( - commonResult.stdout, - "cleanup repository identity" - )); - await platformSafety.withRecoveryLease(repoRoot, async (lease) => { - if (lease.repositoryIdentity !== repositoryIdentity) { - throw new RuntimeError("checkout lease repository identity changed during prune recovery"); - } - const runDirectory = path33.join(runsRoot, record2.runId); - const quarantinePath = path33.join(runsRoot, record2.quarantineName); - const runIdentity = await plainDirectoryIdentity2(runDirectory); - const quarantineIdentity = await plainDirectoryIdentity2(quarantinePath); - if (runIdentity !== null && quarantineIdentity !== null) { - throw new RuntimeError("both retained and quarantined run archives exist during recovery"); - } - const action = runIdentity !== null ? "rollback" : "finish"; - const outcome = await reconcileCleanupRefs(record2, action); - if (action === "finish") { - if (quarantineIdentity !== null) { - await removePlainDirectory(quarantinePath, quarantineIdentity, ps); - } - await commitCleanupRefs(record2); - } - await appendCleanupRecord(runsRoot, { - ...record2, - event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", - anchorCleanup: outcome, - recordedAt: (/* @__PURE__ */ new Date()).toISOString() - }); - }); +async function cleanupTemporarySliceRefs2(repoRoot, runId, runGit) { + const refs = await temporarySliceRefs(repoRoot, runId, runGit); + for (const temporaryRef of refs) { + await deleteExactRef(repoRoot, temporaryRef.ref, temporaryRef.oid, runGit); } } async function managedWorktreeMarkerIsPresent(worktreePath) { let marker; try { - marker = await lstat18(path33.join(worktreePath, ".git"), { bigint: true }); + marker = await lstat21(path37.join(worktreePath, ".git"), { bigint: true }); } catch (error51) { - if (isMissing4(error51)) return false; + if (isMissing(error51)) return false; throw error51; } if (!marker.isFile() || marker.isSymbolicLink() || marker.nlink !== 1n) { @@ -56764,7 +55821,7 @@ async function removeManagedWorktreeUnderLease(commonDir, worktreePath, expected resolved.stdout, "managed worktree common directory" ); - if (!path33.isAbsolute(reportedCommonDir) || await realpath13(reportedCommonDir) !== commonDir) { + if (!path37.isAbsolute(reportedCommonDir) || await realpath16(reportedCommonDir) !== commonDir) { throw new RuntimeError("managed worktree belongs to a different repository"); } } @@ -56793,14 +55850,26 @@ function mostSpecificKnownRunClaim(knownRunIds, managedId) { } return owner; } -async function cleanupRunWorktreesUnderLease(root, commonDir, runId, runGit, knownRunIds) { - const worktreesRoot = path33.join(root, "worktrees"); - const worktreesIdentity = await plainDirectoryIdentity2(worktreesRoot); - if (worktreesIdentity !== null) { - const entries = await readdir8(worktreesRoot, { withFileTypes: true }); +async function canonicalManagedRoots() { + const { roots } = await managedWorktreeRoots(); + const canonical = []; + for (const root of roots) { + try { + canonical.push(await canonicalizeWorktreePath(root, true)); + } catch (error51) { + if (!isMissing(error51)) throw error51; + } + } + return canonical; +} +async function cleanupRunWorktreesUnderLease(commonDir, runId, runGit, knownRunIds) { + const managedRoots = await canonicalManagedRoots(); + for (const worktreesRoot of managedRoots) { + if (await plainDirectoryIdentity2(worktreesRoot) === null) continue; + const entries = await readdir9(worktreesRoot, { withFileTypes: true }); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { if (!entry.isDirectory() || entry.isSymbolicLink() || !runClaimsWorktree(runId, entry.name) || mostSpecificKnownRunClaim(knownRunIds, entry.name) !== runId) continue; - const worktreePath = path33.join(worktreesRoot, entry.name); + const worktreePath = path37.join(worktreesRoot, entry.name); const identity = await managedWorktreeDirectoryIdentity(worktreePath); if (identity !== null) { await removeManagedWorktreeUnderLease(commonDir, worktreePath, identity, runGit); @@ -56811,23 +55880,16 @@ async function cleanupRunWorktreesUnderLease(root, commonDir, runId, runGit, kno if (listed.exitCode !== 0 || listed.truncated?.stdout === true || listed.truncated?.stderr === true) { throw runGitError("enumerate missing run worktree registrations", listed); } - const canonicalWorktreesRoot = worktreesIdentity === null ? path33.join(await realpath13(root), "worktrees") : await realpath13(worktreesRoot); for (const field of gitNulRecords(listed.stdout, "missing-run Git worktree list")) { if (!field.startsWith("worktree ")) continue; - const reportedWorktreePath = path33.resolve(field.slice("worktree ".length)); - let worktreePath; - try { - worktreePath = await canonicalizeWorktreePath(reportedWorktreePath, true); - } catch (error51) { - if (!isMissing4(error51) || worktreesIdentity !== null) throw error51; - const reportedRoot = path33.dirname(reportedWorktreePath); - worktreePath = path33.join( - await realpath13(path33.dirname(reportedRoot)), - path33.basename(reportedRoot), - path33.basename(reportedWorktreePath) - ); - } - if (!platformPathsEqual(path33.dirname(worktreePath), canonicalWorktreesRoot) || !runClaimsWorktree(runId, path33.basename(worktreePath)) || mostSpecificKnownRunClaim(knownRunIds, path33.basename(worktreePath)) !== runId || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; + const worktreePath = await canonicalizeWorktreePath( + path37.resolve(field.slice("worktree ".length)), + true + ).catch((error51) => { + if (isMissing(error51)) return null; + throw error51; + }); + if (worktreePath === null || !managedRoots.some((root) => platformPathsEqual(path37.dirname(worktreePath), root)) || !runClaimsWorktree(runId, path37.basename(worktreePath)) || mostSpecificKnownRunClaim(knownRunIds, path37.basename(worktreePath)) !== runId || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; await removeMissingRegisteredWorktree(commonDir, worktreePath, { git: runGit }); } } @@ -56854,7 +55916,7 @@ async function recoverRun(record2, root, ps, isProcessAlive2, runGit = git, work "recovery", "startup recovery reclaimed unfinished run\n" ); - await cleanupRunWorktreesUnderLease(root, commonDir, record2.runId, runGit, knownRunIds); + await cleanupRunWorktreesUnderLease(commonDir, record2.runId, runGit, knownRunIds); await cleanupTemporarySliceRefs2(commonDir, record2.runId, runGit); await removeStaleCandidateAnchor(commonDir, record2.runId); await store.writeResult({ @@ -56881,23 +55943,15 @@ async function recoverRun(record2, root, ps, isProcessAlive2, runGit = git, work }); return "recovered"; } -async function readHandleBytes3(handle, size) { - const contents = Buffer.alloc(size); - let offset = 0; - while (offset < size) { - const { bytesRead } = await handle.read( - contents, - offset, - size - offset, - offset - ); - if (bytesRead === 0) break; - offset += bytesRead; - } - return contents.subarray(0, offset); +function runClaimsWorktree(runId, managedId) { + return managedId === runId || managedId.startsWith(`${runId}-`) || managedId === `baseline-${runId}` || managedId.startsWith(`baseline-${runId}-`) || managedId === `verify-${runId}` || managedId.startsWith(`verify-${runId}-`); } + +// src/runtime/recovery-worktree-removals.ts +import { lstat as lstat22, readdir as readdir10, realpath as realpath17, rename as rename8 } from "node:fs/promises"; +import path38 from "node:path"; async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath) { - const backlink = await readStableRegularFile(path33.join(registrationPath, "gitdir"), 32768n); + const backlink = await readStableRegularFile(path38.join(registrationPath, "gitdir"), 32768n); if (backlink === null) { throw new RuntimeError("worktree registration backlink is absent or unstable"); } @@ -56905,11 +55959,11 @@ async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath backlink.toString("utf8"), "worktree registration backlink" ); - if (!path33.isAbsolute(reportedDotGit) || path33.basename(reportedDotGit) !== ".git") { + if (!path38.isAbsolute(reportedDotGit) || path38.basename(reportedDotGit) !== ".git") { throw new RuntimeError("worktree registration backlink is malformed"); } const [reportedPhysicalPath, canonicalExpectedPhysicalPath] = await Promise.all([ - canonicalizeWorktreePath(path33.dirname(reportedDotGit), true), + canonicalizeWorktreePath(path38.dirname(reportedDotGit), true), canonicalizeWorktreePath(expectedPhysicalPath, true) ]); if (!platformPathsEqual(reportedPhysicalPath, canonicalExpectedPhysicalPath)) { @@ -56918,11 +55972,11 @@ async function assertRegistrationBacklink(registrationPath, expectedPhysicalPath } async function findCreationRegistration(registrationRoot, physicalPath) { const matches = []; - for (const entry of await readdir8(registrationRoot, { withFileTypes: true })) { + for (const entry of await readdir10(registrationRoot, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path33.join(registrationRoot, entry.name); + const registrationPath = path38.join(registrationRoot, entry.name); const contents = await readStableRegularFile( - path33.join(registrationPath, "gitdir"), + path38.join(registrationPath, "gitdir"), 32768n ); if (contents === null) continue; @@ -56932,7 +55986,7 @@ async function findCreationRegistration(registrationRoot, physicalPath) { } catch { continue; } - if (path33.isAbsolute(backlink) && path33.basename(backlink) === ".git" && platformPathsEqual(path33.resolve(path33.dirname(backlink)), physicalPath)) { + if (path38.isAbsolute(backlink) && path38.basename(backlink) === ".git" && platformPathsEqual(path38.resolve(path38.dirname(backlink)), physicalPath)) { matches.push(registrationPath); } } @@ -56941,13 +55995,18 @@ async function findCreationRegistration(registrationRoot, physicalPath) { } return matches[0] ?? null; } -async function findCreationPhysicalRoot(stateDirectory, expected) { +async function findCreationPhysicalRoot(expectedRoot, expected) { + const identity = await managedWorktreeDirectoryIdentity(expectedRoot); + if (identity !== null && sameManagedIdentity(identity, expected)) return expectedRoot; + const stateDirectory = path38.dirname(expectedRoot); const matches = []; - for (const entry of await readdir8(stateDirectory, { withFileTypes: true })) { + for (const entry of await readdir10(stateDirectory, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path33.join(stateDirectory, entry.name); - const identity = await managedWorktreeDirectoryIdentity(candidate); - if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); + const candidate = path38.join(stateDirectory, entry.name); + const candidateIdentity = await managedWorktreeDirectoryIdentity(candidate); + if (candidateIdentity !== null && sameManagedIdentity(candidateIdentity, expected)) { + matches.push(candidate); + } } if (matches.length > 1) { throw new RuntimeError("worktree creation root identity is ambiguous"); @@ -56956,9 +56015,9 @@ async function findCreationPhysicalRoot(stateDirectory, expected) { } async function findManagedChildByIdentity(root, expected) { const matches = []; - for (const entry of await readdir8(root, { withFileTypes: true })) { + for (const entry of await readdir10(root, { withFileTypes: true })) { if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path33.join(root, entry.name); + const candidate = path38.join(root, entry.name); const identity = await managedWorktreeDirectoryIdentity(candidate); if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); } @@ -56967,17 +56026,20 @@ async function findManagedChildByIdentity(root, expected) { } return matches[0] ?? null; } -async function recoverWorktreeCreationIntent(manifestPath, manifest, platformServices, syncDirectory4, temporaryPath, temporaryKind) { +async function recoverWorktreeCreationIntent(manifestPath, manifest, platformServices, syncDirectory, temporaryPath, temporaryKind) { const root = await stateRoot(); if (root === null) throw new RuntimeError("runtime state root is unavailable"); - const expectedPhysicalRootPath = path33.join(root, "worktrees"); - if (!path33.isAbsolute(manifest.physicalPath) || path33.resolve(manifest.physicalPath) !== manifest.physicalPath || !platformPathsEqual(path33.dirname(manifest.physicalPath), expectedPhysicalRootPath) || path33.basename(manifest.physicalPath) === "" || !path33.isAbsolute(manifest.physicalQuarantinePath) || path33.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath || !platformPathsEqual( - path33.dirname(manifest.physicalQuarantinePath), + const expectedPhysicalRootPath = path38.dirname(manifest.physicalPath); + if (!await isManagedWorktreeRoot(expectedPhysicalRootPath)) { + throw new RuntimeError("worktree creation intent names an unmanaged root"); + } + if (!path38.isAbsolute(manifest.physicalPath) || path38.resolve(manifest.physicalPath) !== manifest.physicalPath || !platformPathsEqual(path38.dirname(manifest.physicalPath), expectedPhysicalRootPath) || path38.basename(manifest.physicalPath) === "" || !path38.isAbsolute(manifest.physicalQuarantinePath) || path38.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath || !platformPathsEqual( + path38.dirname(manifest.physicalQuarantinePath), expectedPhysicalRootPath - ) || path33.basename(manifest.physicalQuarantinePath) !== `.create-${path33.basename(manifest.physicalPath)}-${manifest.transactionId}` || !path33.isAbsolute(manifest.commonDir) || !path33.isAbsolute(manifest.registrationRoot) || !path33.isAbsolute(manifest.quarantineRoot) || !path33.isAbsolute(manifest.quarantinePath) || !platformPathsEqual( + ) || path38.basename(manifest.physicalQuarantinePath) !== `.create-${path38.basename(manifest.physicalPath)}-${manifest.transactionId}` || !path38.isAbsolute(manifest.commonDir) || !path38.isAbsolute(manifest.registrationRoot) || !path38.isAbsolute(manifest.quarantineRoot) || !path38.isAbsolute(manifest.quarantinePath) || !platformPathsEqual( manifest.registrationRoot, - path33.join(manifest.commonDir, "worktrees") - ) || !platformPathsEqual(path33.dirname(manifest.quarantinePath), manifest.quarantineRoot) || path33.basename(manifest.quarantinePath) !== `.remove-registration-creation-${manifest.transactionId}`) { + path38.join(manifest.commonDir, "worktrees") + ) || !platformPathsEqual(path38.dirname(manifest.quarantinePath), manifest.quarantineRoot) || path38.basename(manifest.quarantinePath) !== `.remove-registration-creation-${manifest.transactionId}`) { throw new RuntimeError("worktree creation intent paths are inconsistent"); } const expectedCommonDir = { @@ -57000,9 +56062,9 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer ino: BigInt(manifest.quarantineRootIno), birthtimeNs: BigInt(manifest.quarantineRootBirthtimeNs) }; - const commonDir = await realpath13(manifest.commonDir); - const registrationRoot = await realpath13(manifest.registrationRoot); - const quarantineRoot = await realpath13(manifest.quarantineRoot); + const commonDir = await realpath17(manifest.commonDir); + const registrationRoot = await realpath17(manifest.registrationRoot); + const quarantineRoot = await realpath17(manifest.quarantineRoot); const [commonIdentity, registrationRootIdentity, quarantineRootIdentity] = await Promise.all([ managedWorktreeDirectoryIdentity(commonDir), managedWorktreeDirectoryIdentity(registrationRoot), @@ -57029,17 +56091,20 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer if (lockedManifest === null || JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { throw new RuntimeError("worktree creation intent changed before recovery lease"); } - const physicalRoot = await findCreationPhysicalRoot(root, expectedPhysicalRoot); + const physicalRoot = await findCreationPhysicalRoot( + expectedPhysicalRootPath, + expectedPhysicalRoot + ); if (physicalRoot === null) { - throw new RuntimeError("worktree creation root moved outside the managed state directory"); + throw new RuntimeError("worktree creation root moved outside its managed namespace"); } const expectedPhysical = manifest.physicalPresent ? { dev: BigInt(manifest.physicalDev), ino: BigInt(manifest.physicalIno), birthtimeNs: BigInt(manifest.physicalBirthtimeNs) } : null; - const finalPhysicalPath = physicalRoot === null ? null : path33.join(physicalRoot, path33.basename(manifest.physicalPath)); - const stagedPhysicalPath = physicalRoot === null ? null : path33.join(physicalRoot, path33.basename(manifest.physicalQuarantinePath)); + const finalPhysicalPath = physicalRoot === null ? null : path38.join(physicalRoot, path38.basename(manifest.physicalPath)); + const stagedPhysicalPath = physicalRoot === null ? null : path38.join(physicalRoot, path38.basename(manifest.physicalQuarantinePath)); const [finalPhysicalIdentity, stagedPhysicalIdentity] = await Promise.all([ finalPhysicalPath === null ? null : managedWorktreeDirectoryIdentity(finalPhysicalPath), stagedPhysicalPath === null ? null : managedWorktreeDirectoryIdentity(stagedPhysicalPath) @@ -57073,8 +56138,8 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer throw new RuntimeError("worktree creation registration disappeared"); } await assertRegistrationBacklink(activeRegistration, manifest.physicalPath); - await rename7(activeRegistration, manifest.quarantinePath); - await Promise.all([syncDirectory4(registrationRoot), syncDirectory4(quarantineRoot)]); + await rename8(activeRegistration, manifest.quarantinePath); + await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); if (await managedWorktreeDirectoryIdentity(activeRegistration) !== null) { throw new RuntimeError("worktree creation registration reappeared after staging"); } @@ -57092,7 +56157,7 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer await emptyBoundDirectory(physicalPath, removalIdentity, platformServices); } await removeBoundEmptyDirectory(physicalPath, removalIdentity, platformServices); - await syncDirectory4(physicalRoot); + await syncDirectory(physicalRoot); const settledRoot = await managedWorktreeDirectoryIdentity(physicalRoot); if (settledRoot === null || !sameManagedIdentity(settledRoot, expectedPhysicalRoot)) { throw new RuntimeError("worktree creation root changed during recovery"); @@ -57106,39 +56171,42 @@ async function recoverWorktreeCreationIntent(manifestPath, manifest, platformSer { processSupervisor: platformServices } ); } - await Promise.all([syncDirectory4(registrationRoot), syncDirectory4(quarantineRoot)]); + await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); }); } -async function recoverPendingWorktreeRemovals(platformServices = getPlatformServices(), syncDirectory4 = syncDirectoryMetadata) { +async function recoverPendingWorktreeRemovals(platformServices = getPlatformServices(), syncDirectory = syncDirectoryMetadata) { const { pending, issues } = await readPendingWorktreeRemovalManifests(); for (const { manifestPath, manifest, temporaryPath, temporaryKind } of pending) { let recoveryError; let repositoryIdentity; try { if (manifest.phase === "creation-intent") { - repositoryIdentity = await realpath13(manifest.commonDir); + repositoryIdentity = await realpath17(manifest.commonDir); await recoverWorktreeCreationIntent( manifestPath, manifest, platformServices, - syncDirectory4, + syncDirectory, temporaryPath, temporaryKind ); continue; } - const commonDir = await realpath13(manifest.commonDir); + const commonDir = await realpath17(manifest.commonDir); repositoryIdentity = commonDir; - const expectedRegistrationRoot = path33.join(commonDir, "worktrees"); - const registrationRoot = await realpath13(expectedRegistrationRoot); - const expectedQuarantineRoot = path33.join( + const expectedRegistrationRoot = path38.join(commonDir, "worktrees"); + const registrationRoot = await realpath17(expectedRegistrationRoot); + const expectedQuarantineRoot = path38.join( commonDir, WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY ); - const quarantineRoot = await realpath13(expectedQuarantineRoot); - const quarantineMetadata = await lstat18(quarantineRoot, { bigint: true }); - const physicalRoot = await realpath13(path33.resolve(resolveStateDir(), "worktrees")); + const quarantineRoot = await realpath17(expectedQuarantineRoot); + const quarantineMetadata = await lstat22(quarantineRoot, { bigint: true }); + const physicalRoot = await realpath17(path38.dirname(manifest.physicalPath)); + if (!await isManagedWorktreeRoot(physicalRoot)) { + throw new RuntimeError("worktree removal manifest names an unmanaged root"); + } const commonDirIdentity = await managedWorktreeDirectoryIdentity(commonDir); const registrationRootIdentity = await managedWorktreeDirectoryIdentity(registrationRoot); const quarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); @@ -57180,9 +56248,9 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ) ]); } - const manifestPhysicalRoot = await realpath13(path33.dirname(manifest.physicalPath)); - const manifestPhysicalQuarantineRoot = await realpath13( - path33.dirname(manifest.physicalQuarantinePath) + const manifestPhysicalRoot = await realpath17(path38.dirname(manifest.physicalPath)); + const manifestPhysicalQuarantineRoot = await realpath17( + path38.dirname(manifest.physicalQuarantinePath) ); const assertRemovalRootsUnchanged = async () => { const currentCommonDir = await managedWorktreeDirectoryIdentity(commonDir); @@ -57195,7 +56263,7 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ }; const syncRemovalRoots = async () => { for (const directory of [physicalRoot, registrationRoot, quarantineRoot]) { - await syncDirectory4(directory); + await syncDirectory(directory); } await assertRemovalRootsUnchanged(); }; @@ -57313,13 +56381,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "registrationPath is not absolute", - path33.isAbsolute(manifest.registrationPath), + path38.isAbsolute(manifest.registrationPath), manifest.registrationPath ); checkManifestConsistency( "registrationPath is not normalized", - path33.resolve(manifest.registrationPath) === manifest.registrationPath, - path33.resolve(manifest.registrationPath), + path38.resolve(manifest.registrationPath) === manifest.registrationPath, + path38.resolve(manifest.registrationPath), manifest.registrationPath ); checkManifestConsistency( @@ -57330,13 +56398,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "quarantinePath is not absolute", - path33.isAbsolute(manifest.quarantinePath), + path38.isAbsolute(manifest.quarantinePath), manifest.quarantinePath ); checkManifestConsistency( "quarantinePath is not normalized", - path33.resolve(manifest.quarantinePath) === manifest.quarantinePath, - path33.resolve(manifest.quarantinePath), + path38.resolve(manifest.quarantinePath) === manifest.quarantinePath, + path38.resolve(manifest.quarantinePath), manifest.quarantinePath ); checkManifestConsistency( @@ -57347,13 +56415,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalPath is not absolute", - path33.isAbsolute(manifest.physicalPath), + path38.isAbsolute(manifest.physicalPath), manifest.physicalPath ); checkManifestConsistency( "physicalPath is not normalized", - path33.resolve(manifest.physicalPath) === manifest.physicalPath, - path33.resolve(manifest.physicalPath), + path38.resolve(manifest.physicalPath) === manifest.physicalPath, + path38.resolve(manifest.physicalPath), manifest.physicalPath ); checkManifestConsistency( @@ -57364,13 +56432,13 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalQuarantinePath is not absolute", - path33.isAbsolute(manifest.physicalQuarantinePath), + path38.isAbsolute(manifest.physicalQuarantinePath), manifest.physicalQuarantinePath ); checkManifestConsistency( "physicalQuarantinePath is not normalized", - path33.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, - path33.resolve(manifest.physicalQuarantinePath), + path38.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, + path38.resolve(manifest.physicalQuarantinePath), manifest.physicalQuarantinePath ); checkManifestConsistency( @@ -57381,21 +56449,21 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "registrationPath parent mismatch", - platformPathsEqual(path33.dirname(manifest.registrationPath), registrationRoot), - path33.dirname(manifest.registrationPath), + platformPathsEqual(path38.dirname(manifest.registrationPath), registrationRoot), + path38.dirname(manifest.registrationPath), registrationRoot ); checkManifestConsistency( "quarantinePath parent mismatch", - platformPathsEqual(path33.dirname(manifest.quarantinePath), quarantineRoot), - path33.dirname(manifest.quarantinePath), + platformPathsEqual(path38.dirname(manifest.quarantinePath), quarantineRoot), + path38.dirname(manifest.quarantinePath), quarantineRoot ); checkManifestConsistency( "quarantinePath name mismatch", - path33.basename(manifest.quarantinePath) === `.remove-registration-${path33.basename(manifest.registrationPath)}-${manifest.transactionId}`, - path33.basename(manifest.quarantinePath), - `.remove-registration-${path33.basename(manifest.registrationPath)}-${manifest.transactionId}` + path38.basename(manifest.quarantinePath) === `.remove-registration-${path38.basename(manifest.registrationPath)}-${manifest.transactionId}`, + path38.basename(manifest.quarantinePath), + `.remove-registration-${path38.basename(manifest.registrationPath)}-${manifest.transactionId}` ); checkManifestConsistency( "physicalPath parent mismatch", @@ -57411,9 +56479,9 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ ); checkManifestConsistency( "physicalQuarantinePath name mismatch", - path33.basename(manifest.physicalQuarantinePath) === `.remove-${path33.basename(manifest.physicalPath)}-${manifest.transactionId}`, - path33.basename(manifest.physicalQuarantinePath), - `.remove-${path33.basename(manifest.physicalPath)}-${manifest.transactionId}` + path38.basename(manifest.physicalQuarantinePath) === `.remove-${path38.basename(manifest.physicalPath)}-${manifest.transactionId}`, + path38.basename(manifest.physicalQuarantinePath), + `.remove-${path38.basename(manifest.physicalPath)}-${manifest.transactionId}` ); if (manifest.phase === "creation-root-changed") { throw new RuntimeError("worktree creation root changed and requires manual resolution"); @@ -57513,7 +56581,7 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ throw new RuntimeError("physical worktree rollback state is inconsistent"); } await assertRemovalRootsUnchanged(); - await rename7(manifest.physicalQuarantinePath, manifest.physicalPath); + await rename8(manifest.physicalQuarantinePath, manifest.physicalPath); const restoredPhysical = await managedWorktreeDirectoryIdentity(manifest.physicalPath); const settledPhysicalQuarantine = await managedWorktreeDirectoryIdentity( manifest.physicalQuarantinePath @@ -57521,7 +56589,7 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ if (restoredPhysical === null || !sameManagedIdentity(restoredPhysical, expectedPhysicalIdentity) || settledPhysicalQuarantine !== null) { throw new RuntimeError("physical worktree rollback identity changed"); } - await syncDirectory4(physicalRoot); + await syncDirectory(physicalRoot); await assertRemovalRootsUnchanged(); } if (quarantineIdentity !== null) { @@ -57549,7 +56617,7 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ throw new RuntimeError("started worktree removal state is inconsistent"); } await assertRemovalRootsUnchanged(); - await rename7(manifest.physicalPath, manifest.physicalQuarantinePath); + await rename8(manifest.physicalPath, manifest.physicalQuarantinePath); physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( manifest.physicalQuarantinePath @@ -57557,7 +56625,7 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ if (physicalIdentity !== null || physicalQuarantineIdentity === null || !sameManagedIdentity(physicalQuarantineIdentity, expectedPhysicalIdentity)) { throw new RuntimeError("started worktree removal quarantine identity changed"); } - await syncDirectory4(physicalRoot); + await syncDirectory(physicalRoot); await assertRemovalRootsUnchanged(); } if (physicalQuarantineIdentity !== null) { @@ -57600,335 +56668,16 @@ async function recoverPendingWorktreeRemovals(platformServices = getPlatformServ } return issues; } -function worktreeSweepIssue(worktreePath, error51, repositoryIdentity) { - return { - worktreePath, - reason: boundedRedactedDiagnostic(error51, MAX_QUARANTINE_REASON_BYTES), - ...repositoryIdentity === void 0 ? {} : { repositoryIdentity } - }; -} -function boundedWorktreeSweepIssues(issues, worktreesRoot) { - if (issues.length <= MAX_WORKTREE_SWEEP_ISSUES) return issues; - const retained = issues.slice(0, MAX_WORKTREE_SWEEP_ISSUES - 1); - return [...retained, { - worktreePath: worktreesRoot, - reason: `${issues.length - retained.length} additional worktree sweep issues omitted` - }]; -} -function runClaimsWorktree(runId, managedId) { - return managedId === runId || managedId.startsWith(`${runId}-`) || managedId === `baseline-${runId}` || managedId.startsWith(`baseline-${runId}-`) || managedId === `verify-${runId}` || managedId.startsWith(`verify-${runId}-`); -} -var MALFORMED_WORKFLOW_OWNERSHIP = ""; -async function workflowOwnershipRecords(root) { - const ownershipRoot = path33.join(root, "autopilot-branches"); - if (await plainDirectoryIdentity2(ownershipRoot) === null) return /* @__PURE__ */ new Map(); - const records = /* @__PURE__ */ new Map(); - for (const entry of await readdir8(ownershipRoot, { withFileTypes: true })) { - const match = WORKFLOW_OWNERSHIP_NAME.exec(entry.name); - if (match === null || !entry.isFile() || entry.isSymbolicLink()) { - throw new RuntimeError("workflow ownership directory contains a malformed entry"); - } - const ownershipPath = path33.join(ownershipRoot, entry.name); - const filenamePrefix = match[1].slice(0, 32); - records.set(filenamePrefix, [...records.get(filenamePrefix) ?? [], ownershipPath]); - let workflowId; - try { - workflowId = await workflowOwnershipRecordWorkflowId(ownershipPath); - } catch { - records.set(MALFORMED_WORKFLOW_OWNERSHIP, [ - ...records.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? [], - ownershipPath - ]); - continue; - } - const expectedPrefix = createHash16("sha256").update(workflowId).digest("hex").slice(0, 32); - if (expectedPrefix !== filenamePrefix) { - records.set(expectedPrefix, [...records.get(expectedPrefix) ?? [], ownershipPath]); - } - const legacyPrefix = createHash16("sha256").update(JSON.stringify(workflowId)).digest("hex").slice(0, 24); - records.set(`legacy:${legacyPrefix}`, [ - ...records.get(`legacy:${legacyPrefix}`) ?? [], - ownershipPath - ]); - } - return records; -} -async function workflowClaimMustBePreserved(root, claim, isProcessAlive2, getProcessStartToken) { - const store = new WorkflowStore(claim.workflowId, { - stateDirectory: root, - isProcessAlive: isProcessAlive2, - getProcessStartToken - }); - let state; - try { - state = await store.read(); - } catch { - return true; - } - if (!TERMINAL_PHASES.has(state.phase)) return true; - const branchOwnerStatus = !isProcessAlive2(claim.bootstrapOwner.pid) ? Promise.resolve("dead") : claim.bootstrapOwner.processToken === null ? Promise.resolve("unverifiable") : lockOwnerStatus( - { - pid: claim.bootstrapOwner.pid, - processToken: claim.bootstrapOwner.processToken - }, - isProcessAlive2, - getProcessStartToken - ).catch(() => "unverifiable"); - const [workflowOwner, branchOwner] = await Promise.all([ - observeWorkflowLease(store, isProcessAlive2, getProcessStartToken), - branchOwnerStatus - ]); - return workflowOwner.presence === "present" && workflowOwner.status !== "dead" || branchOwner !== "dead"; -} -async function finalMaterializationMustBePreserved(root, claim, isProcessAlive2, getProcessStartToken) { - const store = new WorkflowStore(claim.workflowId, { - stateDirectory: root, - isProcessAlive: isProcessAlive2, - getProcessStartToken - }); - try { - await store.read(); - const owner = await observeWorkflowLease(store, isProcessAlive2, getProcessStartToken); - return owner.presence === "present" && owner.status !== "dead"; - } catch { - return true; - } -} -async function sweepOrphanWorktrees(args) { - const issues = []; - const worktreesRoot = path33.join(args.root, "worktrees"); - let entries; - let stateRootIdentity; - let worktreesRootIdentity; - try { - if (await plainDirectoryIdentity2(worktreesRoot) === null) return issues; - [stateRootIdentity, worktreesRootIdentity] = await Promise.all([ - assertPrivateRecoveryDirectory(args.root), - assertPrivateRecoveryDirectory(worktreesRoot) - ]); - entries = await readdir8(worktreesRoot, { withFileTypes: true }); - const [settledStateRoot, settledWorktreesRoot] = await Promise.all([ - plainDirectoryIdentity2(args.root), - plainDirectoryIdentity2(worktreesRoot) - ]); - if (settledStateRoot === null || settledWorktreesRoot === null || !sameIdentity5(settledStateRoot, stateRootIdentity) || !sameIdentity5(settledWorktreesRoot, worktreesRootIdentity)) { - throw new RuntimeError("managed worktree namespace identity changed during sweep setup"); - } - } catch (error51) { - return [worktreeSweepIssue(worktreesRoot, error51)]; - } - let ownershipRecords = /* @__PURE__ */ new Map(); - let ownershipLookupError; - try { - ownershipRecords = await workflowOwnershipRecords(args.root); - } catch (error51) { - ownershipLookupError = error51; - } - for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const worktreePath = path33.join(worktreesRoot, entry.name); - if (!entry.isDirectory() || entry.isSymbolicLink()) { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError("managed worktree namespace contains a non-directory entry") - )); - continue; - } - let expectedIdentity; - try { - const identity = await managedWorktreeDirectoryIdentity(worktreePath); - if (identity === null) continue; - expectedIdentity = identity; - } catch (error51) { - issues.push(worktreeSweepIssue(worktreePath, error51)); - continue; - } - if ([...args.claimedRunIds].some((runId) => runClaimsWorktree(runId, entry.name))) continue; - try { - if (!await managedWorktreeMarkerIsPresent(worktreePath)) { - throw new RuntimeError("orphan worktree repository marker is missing"); - } - } catch (error51) { - issues.push(worktreeSweepIssue(worktreePath, error51)); - continue; - } - const workflowMatch = WORKFLOW_WORKTREE_NAME.exec(entry.name); - const legacyFinalMatch = LEGACY_FINAL_WORKTREE_NAME.exec(entry.name); - const finalMaterialization = legacyFinalMatch !== null || workflowMatch !== null && entry.name.endsWith("-final"); - const workflowOwnershipKey = workflowMatch?.[1] ?? (legacyFinalMatch === null ? null : `legacy:${legacyFinalMatch[1]}`); - if (workflowMatch !== null && !finalMaterialization && args.claimedWorkflowPrefixes.has(workflowMatch[1])) continue; - if (workflowOwnershipKey !== null) { - if (ownershipLookupError !== void 0) { - issues.push(worktreeSweepIssue(worktreePath, ownershipLookupError)); - continue; - } - const candidates = ownershipRecords.get(workflowOwnershipKey) ?? []; - const malformedRecords = ownershipRecords.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; - if (malformedRecords.length > 0) { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError("workflow ownership lookup is ambiguous because a record is malformed") - )); - continue; - } - if (candidates.length > 1) { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError("workflow worktree ownership lookup is ambiguous") - )); - continue; - } - if (candidates.length === 1) { - try { - const claim = await workflowWorktreeOwnershipClaim(candidates[0], worktreePath); - const preserve = finalMaterialization ? await finalMaterializationMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken - ) : await workflowClaimMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken - ); - if (preserve) continue; - } catch (error51) { - issues.push(worktreeSweepIssue(worktreePath, error51)); - continue; - } - } - } - let commonDir; - try { - const resolved = await args.runGit(worktreePath, [ - "rev-parse", - "--path-format=absolute", - "--git-common-dir" - ]); - if (resolved.truncated?.stdout === true || resolved.truncated?.stderr === true) { - throw new RuntimeError("worktree repository lookup was truncated"); - } - if (resolved.exitCode !== 0) { - throw runGitError("resolve worktree repository", resolved); - } - const reportedCommonDir = gitPathOutput( - resolved.stdout, - "startup worktree common directory" - ); - if (!path33.isAbsolute(reportedCommonDir)) { - throw new RuntimeError("worktree repository lookup returned a non-absolute path"); - } - commonDir = await realpath13(reportedCommonDir); - } catch (error51) { - issues.push(worktreeSweepIssue(worktreePath, error51)); - continue; - } - const lockKey = createHash16("sha256").update(commonDir).digest("hex"); - let lease = null; - let contention; - try { - lease = await createOwnedLock( - path33.join(args.locksRoot, `${lockKey}.lock`), - args.ownerContents - ); - if (lease === null) { - contention = await reclaimDeadLock( - path33.join(args.locksRoot, `${lockKey}.lock`), - args.isProcessAlive, - args.getProcessStartToken - ); - if (contention === "reclaimed") { - lease = await createOwnedLock( - path33.join(args.locksRoot, `${lockKey}.lock`), - args.ownerContents - ); - } - } - } catch (error51) { - issues.push(worktreeSweepIssue(worktreePath, error51, commonDir)); - continue; - } - if (lease === null) { - if (contention === "malformed" || contention === "unverifiable") { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError(`${contention} checkout lease owner`), - commonDir - )); - } - continue; - } - let cleanupError; - try { - const currentIdentity = await managedWorktreeDirectoryIdentity(worktreePath); - if (currentIdentity !== null) { - if (currentIdentity.dev !== expectedIdentity.dev || currentIdentity.ino !== expectedIdentity.ino || currentIdentity.birthtimeNs !== expectedIdentity.birthtimeNs) { - throw new RuntimeError("worktree directory identity changed after lease acquisition"); - } - let workflowClaimed = false; - if (workflowOwnershipKey !== null) { - const refreshedOwnership = await workflowOwnershipRecords(args.root); - const refreshedCandidates = refreshedOwnership.get(workflowOwnershipKey) ?? []; - const refreshedMalformed = refreshedOwnership.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; - if (refreshedMalformed.length > 0) { - throw new RuntimeError( - "workflow ownership lookup became ambiguous because a record is malformed" - ); - } - if (refreshedCandidates.length > 1) { - throw new RuntimeError("workflow worktree ownership lookup became ambiguous"); - } - if (refreshedCandidates.length === 1) { - const claim = await workflowWorktreeOwnershipClaim( - refreshedCandidates[0], - worktreePath - ); - workflowClaimed = finalMaterialization ? await finalMaterializationMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken - ) : await workflowClaimMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken - ); - } - } - if (!workflowClaimed) { - const [currentStateRoot, currentWorktreesRoot] = await Promise.all([ - assertPrivateRecoveryDirectory(args.root), - assertPrivateRecoveryDirectory(worktreesRoot) - ]); - if (!sameIdentity5(currentStateRoot, stateRootIdentity) || !sameIdentity5(currentWorktreesRoot, worktreesRootIdentity)) { - throw new RuntimeError("managed worktree namespace changed before orphan removal"); - } - await removeManagedWorktreeUnderLease( - commonDir, - worktreePath, - expectedIdentity, - args.runGit - ); - } - } - } catch (error51) { - cleanupError = error51; - } - try { - await releaseOwnedLock(lease); - } catch (releaseError) { - cleanupError = cleanupError === void 0 ? releaseError : new AggregateError( - [cleanupError, releaseError], - "worktree sweep failed and its checkout lease could not be released" - ); - } - if (cleanupError !== void 0) { - issues.push(worktreeSweepIssue(worktreePath, cleanupError, commonDir)); - } - } - return issues; -} + +// src/runtime/recovery-worktree-sweep.ts +import { createHash as createHash17 } from "node:crypto"; +import { readdir as readdir12, realpath as realpath19 } from "node:fs/promises"; +import path40 from "node:path"; + +// src/runtime/recovery-autopilot.ts +import { createHash as createHash16 } from "node:crypto"; +import { lstat as lstat23, readdir as readdir11, realpath as realpath18 } from "node:fs/promises"; +import path39 from "node:path"; function exactObjectKeys(value, expected) { const actual = Object.keys(value).sort(); const sortedExpected = [...expected].sort(); @@ -57959,7 +56708,7 @@ async function observeWorkflowLease(store, isProcessAlive2, getProcessStartToken } function branchOwnershipPath(root, workflowId) { const name = createHash16("sha256").update(workflowId).digest("hex"); - return path33.join(root, "autopilot-branches", `${name}.json`); + return path39.join(root, "autopilot-branches", `${name}.json`); } async function observeWorkflowBranch(root, workflowId, manager, isProcessAlive2, getProcessStartToken) { const registration = await readBoundedRegularFile2(branchOwnershipPath(root, workflowId)).catch(() => void 0); @@ -57986,10 +56735,10 @@ async function observeWorkflowBranch(root, workflowId, manager, isProcessAlive2, function isWorkflowBranchIdentity(value) { if (typeof value !== "object" || value === null || Array.isArray(value)) return false; const identity = value; - return identity.ownershipVersion === "1" && typeof identity.workflowId === "string" && SAFE_WORKFLOW_ID.test(identity.workflowId) && typeof identity.checkoutPath === "string" && typeof identity.gitCommonDir === "string" && typeof identity.repositoryIdentity === "string" && typeof identity.worktreePath === "string" && typeof identity.worktreeGitDir === "string" && typeof identity.branch === "string" && identity.branchRef === `refs/heads/${identity.branch}` && identity.baseRef === `refs/claude-architect/autopilot/${identity.workflowId}/base` && typeof identity.baseBranch === "string" && typeof identity.baseCommitOid === "string" && OID3.test(identity.baseCommitOid) && identity.remote === "origin" && typeof identity.remoteUrl === "string" && typeof identity.ownerRepo === "string"; + return identity.ownershipVersion === "1" && typeof identity.workflowId === "string" && SAFE_WORKFLOW_ID.test(identity.workflowId) && typeof identity.checkoutPath === "string" && typeof identity.gitCommonDir === "string" && typeof identity.repositoryIdentity === "string" && typeof identity.worktreePath === "string" && typeof identity.worktreeGitDir === "string" && typeof identity.branch === "string" && identity.branchRef === `refs/heads/${identity.branch}` && identity.baseRef === `refs/claude-architect/autopilot/${identity.workflowId}/base` && typeof identity.baseBranch === "string" && typeof identity.baseCommitOid === "string" && OID2.test(identity.baseCommitOid) && identity.remote === "origin" && typeof identity.remoteUrl === "string" && typeof identity.ownerRepo === "string"; } function branchMatchesWorkflowState(branch, state) { - return branch.workflowId === state.workflowId && branch.repositoryIdentity === state.repositoryIdentity && branch.baseCommitOid === state.baseCommitOid && branch.branchRef === state.workflowRef && branch.worktreePath === state.worktreePath && branch.branch === state.shipping.branch; + return branch.workflowId === state.workflowId && branch.repositoryIdentity === state.repositoryIdentity && branch.baseCommitOid === state.baseCommitOid && branch.branchRef === state.workflowRef && branch.worktreePath === state.worktreePath && branch.branch === state.branch; } function sameWorkflowBranch(left, right) { return left.ownershipVersion === right.ownershipVersion && left.workflowId === right.workflowId && left.checkoutPath === right.checkoutPath && left.gitCommonDir === right.gitCommonDir && left.repositoryIdentity === right.repositoryIdentity && left.worktreePath === right.worktreePath && left.worktreeGitDir === right.worktreeGitDir && left.branch === right.branch && left.branchRef === right.branchRef && left.baseRef === right.baseRef && left.baseBranch === right.baseBranch && left.baseCommitOid === right.baseCommitOid && left.remote === right.remote && left.remoteUrl === right.remoteUrl && left.ownerRepo === right.ownerRepo; @@ -58021,61 +56770,15 @@ function recordedBranch(journal, state) { } function expectedWorkflowHead(state) { const head = state.tasks.slice(0, state.currentTaskIndex + 1).reduce((current, task) => task.promotionCommitOid ?? current, state.baseCommitOid); - return OID3.test(head) ? head : null; -} -function cleanupIntent(journal, expectedHead2) { - const key = `cleanup:${expectedHead2}`; - const intent = journal.intents.find((status) => status.intent.operation === "cleanup-workflow-branch" && status.intent.idempotencyKey === key); - if (intent === void 0 || intent.intent.expectedIdentities.headCommitOid !== expectedHead2 || intent.completion?.failure !== null && intent.completion !== null) return null; - if (intent.completion !== null) { - const completion = intent.completion.completion; - if (typeof completion !== "object" || completion === null || Array.isArray(completion) || completion.worktreeRemoved !== true || completion.refsRemoved !== true) return null; - } - return intent; + return OID2.test(head) ? head : null; } async function isAbsent(filename) { try { - await lstat18(filename); + await lstat23(filename); return false; } catch (error51) { - return isMissing4(error51) ? true : null; - } -} -async function cleanupIsDirectlyObserved(branch, runGit) { - if (await isAbsent(branch.worktreePath) !== true) return false; - let canonicalCheckout; - let canonicalCommonDir; - try { - canonicalCheckout = await realpath13(branch.checkoutPath); - canonicalCommonDir = await realpath13(branch.gitCommonDir); - } catch { - return false; - } - if (canonicalCheckout !== branch.checkoutPath || canonicalCommonDir !== branch.gitCommonDir) { - return false; + return isMissing(error51) ? true : null; } - const [commonDir, worktrees, branchRef, baseRef] = await Promise.all([ - runGit(branch.checkoutPath, ["rev-parse", "--path-format=absolute", "--git-common-dir"]), - runGit(branch.checkoutPath, ["worktree", "list", "--porcelain", "-z"]), - runGit(branch.checkoutPath, ["show-ref", "--verify", "--quiet", branch.branchRef]), - runGit(branch.checkoutPath, ["show-ref", "--verify", "--quiet", branch.baseRef]) - ]); - if ([commonDir, worktrees, branchRef, baseRef].some((result) => result.truncated?.stdout === true || result.truncated?.stderr === true) || commonDir.exitCode !== 0 || worktrees.exitCode !== 0 || branchRef.exitCode !== 1 || baseRef.exitCode !== 1) return false; - let observedCommonDir; - try { - observedCommonDir = await realpath13(gitPathOutput( - commonDir.stdout, - "disposed workflow common directory" - )); - } catch { - return false; - } - if (observedCommonDir !== branch.gitCommonDir) return false; - return await findWorktreeRegistration( - gitNulRecords(worktrees.stdout, "cleanup-observation Git worktree list"), - branch.worktreePath, - true - ) === -1; } async function activeBranchIsDirectlyObserved(branch, expectedHead2, runGit) { let canonicalCheckout; @@ -58083,9 +56786,9 @@ async function activeBranchIsDirectlyObserved(branch, expectedHead2, runGit) { let canonicalCommonDir; try { [canonicalCheckout, canonicalWorktree, canonicalCommonDir] = await Promise.all([ - realpath13(branch.checkoutPath), - realpath13(branch.worktreePath), - realpath13(branch.gitCommonDir) + realpath18(branch.checkoutPath), + realpath18(branch.worktreePath), + realpath18(branch.gitCommonDir) ]); } catch { return false; @@ -58108,7 +56811,7 @@ async function activeBranchIsDirectlyObserved(branch, expectedHead2, runGit) { if ([commonDir, worktrees, symbolic, head, base, status, remote].some((result) => result.truncated?.stdout === true || result.truncated?.stderr === true) || commonDir.exitCode !== 0 || worktrees.exitCode !== 0 || symbolic.exitCode !== 0 || head.exitCode !== 0 || base.exitCode !== 0 || status.exitCode !== 0 || remote.exitCode !== 0) return false; let observedCommonDir; try { - observedCommonDir = await realpath13(gitPathOutput( + observedCommonDir = await realpath18(gitPathOutput( commonDir.stdout, "active workflow common directory" )); @@ -58128,11 +56831,11 @@ async function activeBranchIsDirectlyObserved(branch, expectedHead2, runGit) { } async function workflowIds(root, issues) { const ids = /* @__PURE__ */ new Set(); - const workflowsRoot = path33.join(root, "workflows"); + const workflowsRoot = path39.join(root, "workflows"); let workflowEntries = []; try { const workflowsIdentity = await plainDirectoryIdentity2(workflowsRoot); - workflowEntries = workflowsIdentity === null ? [] : await readdir8(workflowsRoot, { withFileTypes: true }); + workflowEntries = workflowsIdentity === null ? [] : await readdir11(workflowsRoot, { withFileTypes: true }); } catch (error51) { issues.push(worktreeSweepIssue(workflowsRoot, error51)); } @@ -58141,11 +56844,11 @@ async function workflowIds(root, issues) { ids.add(entry.name); } } - const branchesRoot = path33.join(root, "autopilot-branches"); + const branchesRoot = path39.join(root, "autopilot-branches"); let branchEntries = []; try { const branchesIdentity = await plainDirectoryIdentity2(branchesRoot); - branchEntries = branchesIdentity === null ? [] : await readdir8(branchesRoot, { withFileTypes: true }); + branchEntries = branchesIdentity === null ? [] : await readdir11(branchesRoot, { withFileTypes: true }); } catch (error51) { issues.push(worktreeSweepIssue(branchesRoot, error51)); } @@ -58153,7 +56856,7 @@ async function workflowIds(root, issues) { if (!entry.isFile() || entry.isSymbolicLink() || !/^[0-9a-f]{64}\.json$/u.test(entry.name)) { continue; } - const ownershipPath = path33.join(branchesRoot, entry.name); + const ownershipPath = path39.join(branchesRoot, entry.name); let text; let value; try { @@ -58168,56 +56871,12 @@ async function workflowIds(root, issues) { } if (typeof value !== "object" || value === null || Array.isArray(value)) continue; const workflowId = value.workflowId; - if (typeof workflowId === "string" && SAFE_WORKFLOW_ID.test(workflowId) && entry.name === path33.basename(branchOwnershipPath(root, workflowId))) { + if (typeof workflowId === "string" && SAFE_WORKFLOW_ID.test(workflowId) && entry.name === path39.basename(branchOwnershipPath(root, workflowId))) { ids.add(workflowId); } } return [...ids].sort((left, right) => left.localeCompare(right)); } -async function finalizeObservedWorkflow(store, state, expectedHead2) { - await store.adoptLease(); - let primaryError; - try { - await store.completeIntent({ - expectedRevision: state.revision, - idempotencyKey: `cleanup:${expectedHead2}`, - completion: { worktreeRemoved: true, refsRemoved: true } - }); - const completedAt = (/* @__PURE__ */ new Date()).toISOString(); - await store.transition({ - expectedRevision: state.revision, - to: "ready-for-human-review", - update(draft) { - draft.cleanup = { - status: "succeeded", - worktreeRemoved: true, - lockReleased: true, - error: null, - completedAt - }; - draft.terminal = { - classification: "ready-for-human-review", - reason: null, - evidenceRefs: draft.finalGate === null ? [] : [draft.finalGate.reportRef], - completedAt - }; - } - }); - } catch (error51) { - primaryError = error51; - throw error51; - } finally { - try { - await store.releaseLease(); - } catch (releaseError) { - if (primaryError === void 0) throw releaseError; - throw new AggregateError( - [primaryError, releaseError], - "workflow finalization failed and its adopted lease could not be released" - ); - } - } -} async function recoverAutopilotWorkflows(root, dependencies, workflowIssues) { const results = []; const branchManager = new WorkflowBranchManager({ git: dependencies.runGit }); @@ -58287,15 +56946,11 @@ async function recoverAutopilotWorkflows(root, dependencies, workflowIssues) { continue; } if (state.phase === "cleaning-up") { - const expectedHead3 = expectedWorkflowHead(state); - const intent = expectedHead3 === null ? null : cleanupIntent(journal, expectedHead3); - const directlyObserved = expectedHead3 !== null && state.finalGate?.headCommitOid === expectedHead3 && branch.presence === "absent" && await isAbsent(branchOwnershipPath(root, workflowId)) === true && await cleanupIsDirectlyObserved(recorded, dependencies.runGit); - if (expectedHead3 === null || intent === null || !directlyObserved) { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - await finalizeObservedWorkflow(store, state, expectedHead3); - results.push({ workflowId, disposition: "finalize" }); + const foreignBranch = branch.presence === "present" && (branch.identity === null || !sameWorkflowBranch(branch.identity, recorded)); + results.push({ + workflowId, + disposition: foreignBranch ? "human-decision-required" : "resume" + }); continue; } if (branch.presence !== "present" || branch.identity === null || branch.ownerStatus !== "dead" || !sameWorkflowBranch(branch.identity, recorded)) { @@ -58318,22 +56973,355 @@ async function recoverAutopilotWorkflows(root, dependencies, workflowIssues) { } return results; } + +// src/runtime/recovery-worktree-sweep.ts +var MALFORMED_WORKFLOW_OWNERSHIP = ""; +async function workflowOwnershipRecords(root) { + const ownershipRoot = path40.join(root, "autopilot-branches"); + if (await plainDirectoryIdentity2(ownershipRoot) === null) return /* @__PURE__ */ new Map(); + const records = /* @__PURE__ */ new Map(); + for (const entry of await readdir12(ownershipRoot, { withFileTypes: true })) { + const match = WORKFLOW_OWNERSHIP_NAME.exec(entry.name); + if (match === null || !entry.isFile() || entry.isSymbolicLink()) { + throw new RuntimeError("workflow ownership directory contains a malformed entry"); + } + const ownershipPath = path40.join(ownershipRoot, entry.name); + const filenamePrefix = match[1].slice(0, 32); + records.set(filenamePrefix, [...records.get(filenamePrefix) ?? [], ownershipPath]); + let workflowId; + try { + workflowId = await workflowOwnershipRecordWorkflowId(ownershipPath); + } catch { + records.set(MALFORMED_WORKFLOW_OWNERSHIP, [ + ...records.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? [], + ownershipPath + ]); + continue; + } + const expectedPrefix = createHash17("sha256").update(workflowId).digest("hex").slice(0, 32); + if (expectedPrefix !== filenamePrefix) { + records.set(expectedPrefix, [...records.get(expectedPrefix) ?? [], ownershipPath]); + } + const legacyPrefix = createHash17("sha256").update(JSON.stringify(workflowId)).digest("hex").slice(0, 24); + records.set(`legacy:${legacyPrefix}`, [ + ...records.get(`legacy:${legacyPrefix}`) ?? [], + ownershipPath + ]); + } + return records; +} +async function workflowClaimMustBePreserved(root, claim, isProcessAlive2, getProcessStartToken) { + const store = new WorkflowStore(claim.workflowId, { + stateDirectory: root, + isProcessAlive: isProcessAlive2, + getProcessStartToken + }); + let state; + try { + state = await store.read(); + } catch { + return true; + } + if (!TERMINAL_PHASES.has(state.phase)) return true; + const branchOwnerStatus = !isProcessAlive2(claim.bootstrapOwner.pid) ? Promise.resolve("dead") : claim.bootstrapOwner.processToken === null ? Promise.resolve("unverifiable") : lockOwnerStatus( + { + pid: claim.bootstrapOwner.pid, + processToken: claim.bootstrapOwner.processToken + }, + isProcessAlive2, + getProcessStartToken + ).catch(() => "unverifiable"); + const [workflowOwner, branchOwner] = await Promise.all([ + observeWorkflowLease(store, isProcessAlive2, getProcessStartToken), + branchOwnerStatus + ]); + return workflowOwner.presence === "present" && workflowOwner.status !== "dead" || branchOwner !== "dead"; +} +async function finalMaterializationMustBePreserved(root, claim, isProcessAlive2, getProcessStartToken) { + const store = new WorkflowStore(claim.workflowId, { + stateDirectory: root, + isProcessAlive: isProcessAlive2, + getProcessStartToken + }); + try { + await store.read(); + const owner = await observeWorkflowLease(store, isProcessAlive2, getProcessStartToken); + return owner.presence === "present" && owner.status !== "dead"; + } catch { + return true; + } +} +async function sweepOrphanWorktrees(args) { + const { roots, malformed } = await managedWorktreeRoots(); + const issues = malformed.map((record2) => worktreeSweepIssue( + record2, + new RuntimeError("managed worktree root record is malformed") + )); + const legacyRoot = path40.join(args.root, "worktrees"); + for (const worktreesRoot of [legacyRoot, ...roots.filter(isManagedWorktreeNamespace)]) { + issues.push(...await sweepOrphanWorktreeRoot(args, worktreesRoot, worktreesRoot === legacyRoot)); + } + return issues; +} +async function sweepRootParentIdentity(worktreesRoot, legacy) { + const parent = path40.dirname(worktreesRoot); + if (legacy) return await assertPrivateRecoveryDirectory(parent); + const identity = await plainDirectoryIdentity2(parent); + if (identity === null) throw new RuntimeError("checkout worktrees directory disappeared"); + return identity; +} +async function sweepOrphanWorktreeRoot(args, worktreesRoot, legacy) { + const issues = []; + let entries; + let stateRootIdentity; + let worktreesRootIdentity; + try { + if (await plainDirectoryIdentity2(worktreesRoot) === null) return issues; + [stateRootIdentity, worktreesRootIdentity] = await Promise.all([ + sweepRootParentIdentity(worktreesRoot, legacy), + assertPrivateRecoveryDirectory(worktreesRoot) + ]); + entries = (await readdir12(worktreesRoot, { withFileTypes: true })).filter((entry) => legacy || !isNamespaceControlEntry(entry.name)); + const [settledStateRoot, settledWorktreesRoot] = await Promise.all([ + plainDirectoryIdentity2(path40.dirname(worktreesRoot)), + plainDirectoryIdentity2(worktreesRoot) + ]); + if (settledStateRoot === null || settledWorktreesRoot === null || !sameDirectoryIdentity(settledStateRoot, stateRootIdentity) || !sameDirectoryIdentity(settledWorktreesRoot, worktreesRootIdentity)) { + throw new RuntimeError("managed worktree namespace identity changed during sweep setup"); + } + } catch (error51) { + return [worktreeSweepIssue(worktreesRoot, error51)]; + } + let ownershipRecords = /* @__PURE__ */ new Map(); + let ownershipLookupError; + try { + ownershipRecords = await workflowOwnershipRecords(args.root); + } catch (error51) { + ownershipLookupError = error51; + } + for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { + const worktreePath = path40.join(worktreesRoot, entry.name); + if (!entry.isDirectory() || entry.isSymbolicLink()) { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError("managed worktree namespace contains a non-directory entry") + )); + continue; + } + let expectedIdentity; + try { + const identity = await managedWorktreeDirectoryIdentity(worktreePath); + if (identity === null) continue; + expectedIdentity = identity; + } catch (error51) { + issues.push(worktreeSweepIssue(worktreePath, error51)); + continue; + } + if ([...args.claimedRunIds].some((runId) => runClaimsWorktree(runId, entry.name))) continue; + try { + if (!await managedWorktreeMarkerIsPresent(worktreePath)) { + throw new RuntimeError("orphan worktree repository marker is missing"); + } + } catch (error51) { + issues.push(worktreeSweepIssue(worktreePath, error51)); + continue; + } + const workflowMatch = WORKFLOW_WORKTREE_NAME.exec(entry.name); + const legacyFinalMatch = LEGACY_FINAL_WORKTREE_NAME.exec(entry.name); + const finalMaterialization = legacyFinalMatch !== null || workflowMatch !== null && entry.name.endsWith("-final"); + const workflowOwnershipKey = workflowMatch?.[1] ?? (legacyFinalMatch === null ? null : `legacy:${legacyFinalMatch[1]}`); + if (workflowMatch !== null && !finalMaterialization && args.claimedWorkflowPrefixes.has(workflowMatch[1])) continue; + if (workflowOwnershipKey !== null) { + if (ownershipLookupError !== void 0) { + issues.push(worktreeSweepIssue(worktreePath, ownershipLookupError)); + continue; + } + const candidates = ownershipRecords.get(workflowOwnershipKey) ?? []; + const malformedRecords = ownershipRecords.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; + if (malformedRecords.length > 0) { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError("workflow ownership lookup is ambiguous because a record is malformed") + )); + continue; + } + if (candidates.length > 1) { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError("workflow worktree ownership lookup is ambiguous") + )); + continue; + } + if (candidates.length === 1) { + try { + const claim = await workflowWorktreeOwnershipClaim(candidates[0], worktreePath); + const preserve = finalMaterialization ? await finalMaterializationMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken + ) : await workflowClaimMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken + ); + if (preserve) continue; + } catch (error51) { + issues.push(worktreeSweepIssue(worktreePath, error51)); + continue; + } + } + } + let commonDir; + try { + const resolved = await args.runGit(worktreePath, [ + "rev-parse", + "--path-format=absolute", + "--git-common-dir" + ]); + if (resolved.truncated?.stdout === true || resolved.truncated?.stderr === true) { + throw new RuntimeError("worktree repository lookup was truncated"); + } + if (resolved.exitCode !== 0) { + throw runGitError("resolve worktree repository", resolved); + } + const reportedCommonDir = gitPathOutput( + resolved.stdout, + "startup worktree common directory" + ); + if (!path40.isAbsolute(reportedCommonDir)) { + throw new RuntimeError("worktree repository lookup returned a non-absolute path"); + } + commonDir = await realpath19(reportedCommonDir); + } catch (error51) { + issues.push(worktreeSweepIssue(worktreePath, error51)); + continue; + } + const lockKey = createHash17("sha256").update(commonDir).digest("hex"); + let lease = null; + let contention; + try { + lease = await createOwnedLock( + path40.join(args.locksRoot, `${lockKey}.lock`), + args.ownerContents + ); + if (lease === null) { + contention = await reclaimDeadLock( + path40.join(args.locksRoot, `${lockKey}.lock`), + args.isProcessAlive, + args.getProcessStartToken + ); + if (contention === "reclaimed") { + lease = await createOwnedLock( + path40.join(args.locksRoot, `${lockKey}.lock`), + args.ownerContents + ); + } + } + } catch (error51) { + issues.push(worktreeSweepIssue(worktreePath, error51, commonDir)); + continue; + } + if (lease === null) { + if (contention === "malformed" || contention === "unverifiable") { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError(`${contention} checkout lease owner`), + commonDir + )); + } + continue; + } + let cleanupError; + try { + const currentIdentity = await managedWorktreeDirectoryIdentity(worktreePath); + if (currentIdentity !== null) { + if (currentIdentity.dev !== expectedIdentity.dev || currentIdentity.ino !== expectedIdentity.ino || currentIdentity.birthtimeNs !== expectedIdentity.birthtimeNs) { + throw new RuntimeError("worktree directory identity changed after lease acquisition"); + } + let workflowClaimed = false; + if (workflowOwnershipKey !== null) { + const refreshedOwnership = await workflowOwnershipRecords(args.root); + const refreshedCandidates = refreshedOwnership.get(workflowOwnershipKey) ?? []; + const refreshedMalformed = refreshedOwnership.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; + if (refreshedMalformed.length > 0) { + throw new RuntimeError( + "workflow ownership lookup became ambiguous because a record is malformed" + ); + } + if (refreshedCandidates.length > 1) { + throw new RuntimeError("workflow worktree ownership lookup became ambiguous"); + } + if (refreshedCandidates.length === 1) { + const claim = await workflowWorktreeOwnershipClaim( + refreshedCandidates[0], + worktreePath + ); + workflowClaimed = finalMaterialization ? await finalMaterializationMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken + ) : await workflowClaimMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken + ); + } + } + if (!workflowClaimed) { + const [currentStateRoot, currentWorktreesRoot] = await Promise.all([ + sweepRootParentIdentity(worktreesRoot, legacy), + assertPrivateRecoveryDirectory(worktreesRoot) + ]); + if (!sameDirectoryIdentity(currentStateRoot, stateRootIdentity) || !sameDirectoryIdentity(currentWorktreesRoot, worktreesRootIdentity)) { + throw new RuntimeError("managed worktree namespace changed before orphan removal"); + } + await removeManagedWorktreeUnderLease( + commonDir, + worktreePath, + expectedIdentity, + args.runGit + ); + } + } + } catch (error51) { + cleanupError = error51; + } + try { + await releaseOwnedLock(lease); + } catch (releaseError) { + cleanupError = cleanupError === void 0 ? releaseError : new AggregateError( + [cleanupError, releaseError], + "worktree sweep failed and its checkout lease could not be released" + ); + } + if (cleanupError !== void 0) { + issues.push(worktreeSweepIssue(worktreePath, cleanupError, commonDir)); + } + } + return issues; +} + +// src/runtime/recovery-manager.ts async function reclaimPendingRemovalLocks(locksRoot, isProcessAlive2, getProcessStartToken) { const { pending } = await readPendingWorktreeRemovalManifests(); const seen = /* @__PURE__ */ new Set(); for (const { manifest } of pending) { let commonDir; try { - commonDir = await realpath13(manifest.commonDir); + commonDir = await realpath20(manifest.commonDir); } catch { continue; } if (!platformPathsEqual(commonDir, manifest.commonDir)) continue; - const key = createHash16("sha256").update(commonDir).digest("hex"); + const key = createHash18("sha256").update(commonDir).digest("hex"); if (seen.has(key)) continue; seen.add(key); await reclaimDeadLock( - path33.join(locksRoot, `${key}.lock`), + path41.join(locksRoot, `${key}.lock`), isProcessAlive2, getProcessStartToken ); @@ -58345,16 +57333,16 @@ async function recoverStaleRuns(dependencies = {}) { const isProcessAlive2 = dependencies.isProcessAlive ?? defaultIsProcessAlive; const runGit = dependencies.git ?? git; if (root === null) return { recovered: [], quarantined: [] }; - const locksRoot = path33.join(root, "locks"); - await mkdir9(locksRoot, { recursive: true }); + const locksRoot = path41.join(root, "locks"); + await mkdir10(locksRoot, { recursive: true }); if (await plainDirectoryIdentity2(locksRoot) === null) { throw new RuntimeError("recovery locks directory disappeared"); } const ownerContents = Buffer.from(JSON.stringify({ - pid: nodeProcess7.pid, - processToken: await ps.getProcessStartToken(nodeProcess7.pid) + pid: nodeProcess8.pid, + processToken: await ps.getProcessStartToken(nodeProcess8.pid) })); - const recoveryLockPath = path33.join(locksRoot, "recovery.lock"); + const recoveryLockPath = path41.join(locksRoot, "recovery.lock"); const recoveryLock = await acquireOwnedLock( recoveryLockPath, ownerContents, @@ -58373,11 +57361,11 @@ async function recoverStaleRuns(dependencies = {}) { } let primaryError; try { - const runsRoot = path33.join(root, "runs"); + const runsRoot = path41.join(root, "runs"); const runsIdentity = await plainDirectoryIdentity2(runsRoot); if (runsIdentity !== null) { await reclaimDeadLock( - path33.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), + path41.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), isProcessAlive2, (pid) => ps.getProcessStartToken(pid) ); @@ -58398,7 +57386,7 @@ async function recoverStaleRuns(dependencies = {}) { const claimedRunIds = new Set(journaledQuarantines); const knownRunIds = new Set(journaledQuarantines); if (runsIdentity !== null) { - const runEntries = await readdir8(runsRoot, { withFileTypes: true }); + const runEntries = await readdir13(runsRoot, { withFileTypes: true }); for (const entry of runEntries) { if (entry.isDirectory() && !entry.isSymbolicLink() && SAFE_RUN_ID2.test(entry.name)) { knownRunIds.add(entry.name); @@ -58417,8 +57405,8 @@ async function recoverStaleRuns(dependencies = {}) { } if (!entry.isDirectory() || entry.isSymbolicLink() || !SAFE_RUN_ID2.test(entry.name)) continue; try { - const runDirectory = path33.join(runsRoot, entry.name); - const runStartText = await readBoundedRegularFile2(path33.join(runDirectory, "run-start.json")); + const runDirectory = path41.join(runsRoot, entry.name); + const runStartText = await readBoundedRegularFile2(path41.join(runDirectory, "run-start.json")); if (runStartText === null) { claimedRunIds.add(entry.name); continue; @@ -58445,7 +57433,7 @@ async function recoverStaleRuns(dependencies = {}) { continue; } const checkoutLock = await acquireOwnedLock( - path33.join(locksRoot, `${record2.lockKey}.lock`), + path41.join(locksRoot, `${record2.lockKey}.lock`), ownerContents, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -58459,7 +57447,7 @@ async function recoverStaleRuns(dependencies = {}) { let cleanupDeferred = false; try { const lockedRunStartText = await readBoundedRegularFile2( - path33.join(runDirectory, "run-start.json") + path41.join(runDirectory, "run-start.json") ); if (lockedRunStartText === null) { throw new RuntimeError("run-start recovery record disappeared during recovery"); @@ -58477,7 +57465,6 @@ async function recoverStaleRuns(dependencies = {}) { const commonDir = await validateGitCommonDir(lockedRecord.canonicalCommonDir); if (lockedMarker === null) { await cleanupRunWorktreesUnderLease( - root, commonDir, entry.name, runGit, @@ -58493,7 +57480,6 @@ async function recoverStaleRuns(dependencies = {}) { if (lockedMarkerStatus === "dead") { if (lockedMarker.sliced) await archiveInterruptedPipeline(store, lockedResult); await cleanupRunWorktreesUnderLease( - root, commonDir, entry.name, runGit, @@ -58566,7 +57552,7 @@ async function recoverStaleRuns(dependencies = {}) { } for (const { record: record2, runStartText } of stale) { const checkoutLock = await acquireOwnedLock( - path33.join(locksRoot, `${record2.lockKey}.lock`), + path41.join(locksRoot, `${record2.lockKey}.lock`), ownerContents, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -58581,7 +57567,7 @@ async function recoverStaleRuns(dependencies = {}) { let becameLive = false; try { const lockedRunStartText = await readBoundedRegularFile2( - path33.join(runsRoot, record2.runId, "run-start.json") + path41.join(runsRoot, record2.runId, "run-start.json") ); if (lockedRunStartText === null) { throw new RuntimeError("run-start recovery record disappeared before stale recovery"); @@ -58633,7 +57619,7 @@ async function recoverStaleRuns(dependencies = {}) { } recovered.push(record2.runId); } - await reclaimLocks( + await reclaimDeadCheckoutLocks( locksRoot, isProcessAlive2, (pid) => ps.getProcessStartToken(pid) @@ -58646,9 +57632,9 @@ async function recoverStaleRuns(dependencies = {}) { }, workflowRecoveryIssues); const claimedWorkflowPrefixes = /* @__PURE__ */ new Set(); for (const { workflowId } of workflows) { - if (SAFE_WORKFLOW_ID.test(workflowId) && await plainDirectoryIdentity2(path33.join(root, "workflows", workflowId)) !== null) { + if (SAFE_WORKFLOW_ID.test(workflowId) && await plainDirectoryIdentity2(path41.join(root, "workflows", workflowId)) !== null) { claimedWorkflowPrefixes.add( - createHash16("sha256").update(workflowId).digest("hex").slice(0, 32) + createHash18("sha256").update(workflowId).digest("hex").slice(0, 32) ); } } @@ -58671,7 +57657,7 @@ async function recoverStaleRuns(dependencies = {}) { ...terminalCleanupIssues, ...workflowRecoveryIssues, ...orphanWorktreeIssues - ], path33.join(root, "worktrees")); + ], path41.join(root, "worktrees")); const result = workflows.length === 0 ? { recovered, quarantined } : { recovered, quarantined, workflows }; return worktreeSweepIssues.length === 0 ? result : { ...result, worktreeSweepIssues }; } catch (error51) { @@ -59018,7 +58004,7 @@ async function createServer(dependencies = {}) { (issue2) => issue2.repositoryIdentity !== void 0 ); const unattributedWorktrees = unresolvedSweepIssues.filter( - (issue2) => issue2.repositoryIdentity === void 0 && path34.basename(path34.dirname(issue2.worktreePath)) === "worktrees" + (issue2) => issue2.repositoryIdentity === void 0 && (path42.basename(path42.dirname(issue2.worktreePath)) === "worktrees" || isManagedWorktreeNamespace(path42.dirname(issue2.worktreePath))) ); if (attributed.length === 0 && unattributedWorktrees.length === 0) return; const canonical = await (dependencies.ps ?? getPlatformServices()).canonicalizePath(checkoutPath); @@ -59141,11 +58127,11 @@ async function createServer(dependencies = {}) { "autopilotStart", { title: "Start an autopilot workflow", - description: "Validate an Autopilot Spec and run its verified workflow.", + description: "Validate an Autopilot Spec and run its verified workflow to a final-reviewed local branch. It never pushes or opens a pull request; hand the branch to the No Mistakes delivery gate.", inputSchema: autopilotStartInputSchema, outputSchema: autopilotOutput, // The most consequential tool on the surface: runs Producers, creates - // branches and worktrees, promotes commits, pushes, and opens a PR. + // branches and worktrees, and promotes commits onto the workflow branch. annotations: { destructiveHint: true, idempotentHint: false, readOnlyHint: false } }, async ({ checkoutPath, spec, protocolVersion }, extra) => { @@ -59186,7 +58172,7 @@ async function createServer(dependencies = {}) { description: "Resume a recoverable autopilot workflow from durable state.", inputSchema: autopilotWorkflowInputSchema, outputSchema: autopilotOutput, - // Continues the same shipping workflow from durable state. + // Continues the same workflow from durable state. annotations: { destructiveHint: true, idempotentHint: false, readOnlyHint: false } }, async ({ checkoutPath, workflowId, protocolVersion }, extra) => { @@ -59250,10 +58236,23 @@ async function createServer(dependencies = {}) { snapshot, (dependencies.decisionAuthority ?? decisionAuthority)() ); + let reasons = verdict.state === "accepted" ? advisory.warnings : verdict.reasons; if (verdict.state === "accepted" && effectiveDecision === "accepted") { - return "policy-autonomous"; + const candidate = snapshot.result?.candidate; + if (candidate == null) { + throw new RuntimeError("accepted verdict without a frozen candidate"); + } + const screen = await (dependencies.jevScreen ?? jevScreen)(candidate); + if (screen.status === "unavailable") { + logger.warn("independent candidate screen unavailable; deterministic verdict stands", { + event: "jev-screen-unavailable", + runId: effectiveRunId, + reason: screen.reason + }); + } + if (screen.status !== "concern") return "policy-autonomous"; + reasons = screen.reasons; } - const reasons = verdict.state === "accepted" ? advisory.warnings : verdict.reasons; const confirmed = await confirmWithHuman( server, effectiveRunId, diff --git a/runtime/watchdog.mjs b/runtime/watchdog.mjs index b6200ab..12587c2 100644 --- a/runtime/watchdog.mjs +++ b/runtime/watchdog.mjs @@ -1,6 +1,11 @@ // This dependency-free entrypoint must remain parseable by Node.js 20 so it can supervise producer // processes independently of the bundled runtime. It kills the producer process group when the MCP // server that launched it is no longer alive. +// +// POSIX contract: the runtime spawns this watchdog as the leader of a new process group, and the +// producer stays in that same group. Every tree teardown — the supervisor's SIGKILL escalation and +// startup recovery, which both signal the watchdog's group — therefore reaches the producer too. A +// producer in a group of its own survived the uncatchable SIGKILL that removed its watchdog. import { spawn } from "node:child_process"; const POLL_INTERVAL_MS = 5_000; @@ -14,27 +19,36 @@ if (separator !== "--" || command === undefined) { } const supervisorPid = Number(supervisorArg); -// POSIX: detach so the child leads its own process group and a negative-PID -// signal reaches the whole tree. Windows has no POSIX process groups or -// signals, so spawn attached and terminate the child directly (Windows -// process-tree teardown is handled separately by the Job Object helper). +// Windows has no POSIX process groups or signals; its process-tree teardown is +// handled separately by the Job Object helper. const isWindows = process.platform === "win32"; -const child = spawn(command, args, { detached: !isWindows, stdio: "inherit" }); +const child = spawn(command, args, { stdio: "inherit" }); let supervisorGone = false; let terminationTimer = null; -function killChildGroup(signal) { +function signalChild(signal) { + try { + process.kill(child.pid, signal); + } catch { + // The child has already exited. + } +} + +// The whole group: this watchdog, the producer, and everything it spawned. +function killTree(signal) { try { if (isWindows) process.kill(child.pid, signal); - else process.kill(-child.pid, signal); + else process.kill(-process.pid, signal); } catch { - // The child process group has already exited. + // The group has already exited. } } +// A signal sent to the group already reached the producer; one sent to this +// process alone is relayed so the producer can shut down cleanly. const signalHandlers = new Map(FORWARDED_SIGNALS.map(signal => [ signal, - () => killChildGroup(signal), + () => signalChild(signal), ])); for (const [signal, handler] of signalHandlers) process.on(signal, handler); @@ -44,10 +58,8 @@ const poll = setInterval(() => { process.kill(supervisorPid, 0); } catch { supervisorGone = true; - killChildGroup("SIGTERM"); - terminationTimer = setTimeout(() => { - if (child.exitCode === null && child.signalCode === null) killChildGroup("SIGKILL"); - }, TERMINATION_GRACE_MS); + killTree("SIGTERM"); + terminationTimer = setTimeout(() => killTree("SIGKILL"), TERMINATION_GRACE_MS); } }, POLL_INTERVAL_MS); @@ -64,6 +76,9 @@ child.once("error", () => { child.once("exit", (code, signal) => { cleanup(); + // An orphaned tree is torn down completely: the producer's own children must + // not outlive it just because the producer exited within the grace period. + if (supervisorGone) killTree("SIGKILL"); if (signal !== null) { process.kill(process.pid, signal); return; diff --git a/skills/delegate/SKILL.md b/skills/delegate/SKILL.md index 45da79d..a15645d 100644 --- a/skills/delegate/SKILL.md +++ b/skills/delegate/SKILL.md @@ -6,7 +6,7 @@ description: Let Claude Architect route a versioned implementation spec through # Delegate ```claude-architect-protocol -PROTOCOL_VERSION: 2.0.0 +PROTOCOL_VERSION: 3.0.0 ``` The current session is the architect: it owns requirements, the Delegation Spec, Producer selection, review, and acceptance. Producers are untrusted — their output is only a candidate until the runtime freezes it, independently verifies it, and the architect reviews the exact anchored bytes. @@ -117,15 +117,16 @@ integration before an accepted decision, or substitute a different artifact hash Project-scoped permission settings become active only after the human grants Claude Code workspace trust. They can allow the three autopilot tools, but they cannot override managed `ask` or `deny` policy. “No mid-loop prompts” is therefore conditional: it applies only after workspace trust, when all three tool calls are allowed and no higher-precedence policy, controller halt, or ambiguity requires the human. -1. Call `autopilotStart` with `checkoutPath`, the complete Autopilot Spec as `spec`, and `protocolVersion: "2.0.0"` copied from this skill's marker. Do not attempt a workflow start against a dirty checkout. +1. Call `autopilotStart` with `checkoutPath`, the complete Autopilot Spec as `spec`, and `protocolVersion: "3.0.0"` copied from this skill's marker. Do not attempt a workflow start against a dirty checkout. 2. If validation returns `validationErrors`, repair only the reported spec defects and resubmit. A protocol mismatch means the installed plugin must be updated and reloaded; never guess across versions. A report with `laneEligibility.edit=false`, or any other ineligible or unconfined lane, fails closed with the structured diagnostic. -3. Record the returned `workflowId`. Call `autopilotStatus` with `checkoutPath`, that `workflowId`, and `protocolVersion: "2.0.0"` for read-only monitoring. Report only persisted phases and bounded progress supplied by the runtime; never infer completion from a phase name or Producer output. -4. After a host or process interruption, call `autopilotResume` with `checkoutPath`, the same `workflowId`, and `protocolVersion: "2.0.0"`. Resume replays durable observed state; it does not authorize a second workflow or waive a failed gate. -5. During autopilot, do not construct Autopilot Eligibility, synthesize a Candidate Decision, call separate review/decision/integration tools, run Git or `gh`, push, create or edit a PR, mark a PR ready, merge, or delete a branch. The controller owns policy, promotion, cumulative final review, exact-head push, draft-PR identity, required-check polling, ready transition, cleanup, and recovery. - -The controller may proceed without a mid-loop prompt only while every eligibility and -shipping gate remains objectively proven. Autopilot is autonomous only up to a PR ready -for human review: it never merges, deploys, releases, or deletes the remote branch. +3. Record the returned `workflowId`. Call `autopilotStatus` with `checkoutPath`, that `workflowId`, and `protocolVersion: "3.0.0"` for read-only monitoring. Report only persisted phases and bounded progress supplied by the runtime; never infer completion from a phase name or Producer output. +4. After a host or process interruption, call `autopilotResume` with `checkoutPath`, the same `workflowId`, and `protocolVersion: "3.0.0"`. Resume replays durable observed state; it does not authorize a second workflow or waive a failed gate. +5. During autopilot, do not construct Autopilot Eligibility, synthesize a Candidate Decision, call separate review/decision/integration tools, run Git or `gh`, push, create or edit a PR, merge, or delete a branch. The controller owns policy, promotion, cumulative final review, cleanup, and recovery. It refuses to start under `CLAUDE_ARCHITECT_DECISION_AUTHORITY=human` (`decision-authority-human`) and without a configured Git identity (`git-identity-missing`), because promotions are committed under the user's name. + +The controller may proceed without a mid-loop prompt only while every eligibility gate +remains objectively proven. Autopilot is autonomous only up to a final-reviewed local +branch: it never pushes, opens a PR, merges, deploys, or releases. Deliver that branch +through the repository's delivery gate only with the human's approval. Interpret `ready-for-human-review`, `human-decision-required`, `failed`, and `cancelled` exactly as [docs/autopilot-terminal-states.md](../../docs/autopilot-terminal-states.md) defines them; every one is terminal, and none authorizes improvised continuation. @@ -147,7 +148,7 @@ pre-start validation or spec-identity error. Announcement wording and what the h call count does and does not mean: [docs/delegation-monitoring.md](../../docs/delegation-monitoring.md). -1. Call `validateDelegationSpec` with the exact Delegation Spec and `protocolVersion: "2.0.0"` copied from this skill's `PROTOCOL_VERSION` marker. This read-only call starts no Producer. Keep its runtime-returned `specSha256` as the identity of the spec you dispatch. Never hash the spec file or reimplement the canonicalization algorithm; file bytes and object key order are not the runtime's canonical wire identity. +1. Call `validateDelegationSpec` with the exact Delegation Spec and `protocolVersion: "3.0.0"` copied from this skill's `PROTOCOL_VERSION` marker. This read-only call starts no Producer. Keep its runtime-returned `specSha256` as the identity of the spec you dispatch. Never hash the spec file or reimplement the canonicalization algorithm; file bytes and object key order are not the runtime's canonical wire identity. 2. When validation returns `ok:false` with `validationErrors`, repair only the reported spec defects and revalidate. This repair loop must not touch a Producer. 3. Call `delegate` through `mcp__plugin_claude-architect_runtime__delegate` with `checkoutPath`, the validated candidate spec, the same `protocolVersion`, and `expectedSpecSha256` set to the runtime-returned `specSha256`. The runtime compares that identity before it touches the checkout or starts a Producer. 4. When dispatch returns `ok:false` with `validationErrors`, repair only the reported defects, revalidate for the replacement digest, and resubmit — this catches a spec changed after validation without touching a Producer. @@ -206,7 +207,7 @@ behavior existing code depends on). Use plain `delegate` only for trivial tasks Build the spec exactly as for `delegate`, optionally adding `review` (`reviewers` defaults to `[correctness, systems]`, `maxRounds` to `2`, and `focus` is reviewer-only -guidance). Call it with `checkoutPath`, `spec`, `protocolVersion: "2.0.0"`, and +guidance). Call it with `checkoutPath`, `spec`, `protocolVersion: "3.0.0"`, and `expectedSpecSha256` set to the runtime-returned digest, then read the returned evidence bundle: attempt result, per-round review reports and consolidated findings, fix dispositions, verification report, and gate reasons. diff --git a/skills/subagent-driven-delegation/SKILL.md b/skills/subagent-driven-delegation/SKILL.md index a4bddbe..ba0c176 100644 --- a/skills/subagent-driven-delegation/SKILL.md +++ b/skills/subagent-driven-delegation/SKILL.md @@ -6,7 +6,7 @@ description: Execute an implementation plan with the Superpowers subagent-driven # Subagent-Driven Delegation ```claude-architect-protocol -PROTOCOL_VERSION: 2.0.0 +PROTOCOL_VERSION: 3.0.0 ``` Superpowers `subagent-driven-development` (SDD) dispatches a fresh implementer subagent per task, reviews each task, and reviews the whole branch at the end. This skill runs that same loop with one substitution: **the implementer is a Claude Architect delegation, not a generic subagent.** Each task becomes a versioned Delegation Spec executed by an untrusted Producer in an isolated worktree, frozen as a Candidate Artifact, and independently verified by the runtime before any reviewer sees it. diff --git a/src/autopilot/autopilot-controller.ts b/src/autopilot/autopilot-controller.ts index fb16fa7..99c663f 100644 --- a/src/autopilot/autopilot-controller.ts +++ b/src/autopilot/autopilot-controller.ts @@ -1,4 +1,6 @@ import { randomUUID } from "node:crypto"; +import { userCommitEnvironment } from "../git/git-exec.js"; +import { decisionAuthority, type DecisionAuthority } from "../mcp/decision-authority.js"; import type { PipelineResult } from "../pipeline/pipeline-runtime.js"; import type { AutopilotSpec, AutopilotTaskSpec } from "../protocol/autopilot-spec.js"; import { @@ -6,12 +8,6 @@ import { type ValidateAutopilotResult, } from "../protocol/spec-validator.js"; import type { ReviewSnapshot } from "../runtime/review-snapshot.js"; -import type { - HostingAdapter, - HostingTarget, - PullRequestIdentity, - RequiredChecksResult, -} from "../ship/hosting-adapter.js"; import { RuntimeError } from "../util/errors.js"; import { autopilotEligibilityRecordHash, @@ -44,10 +40,6 @@ export type AutopilotControllerEvent = | `task:${string}` | `promote:${string}` | "final-review" - | "push" - | "draft-pr" - | `checks:${string}` - | "mark-ready" | "cleanup" | "ready"; @@ -129,17 +121,20 @@ export interface AutopilotControllerDependencies { eligibilityEvaluator: EligibilityEvaluator; promoter: Pick; finalBranchReviewer: Pick; - hostingAdapter: HostingAdapter; - requiredChecksPollIntervalMs?: number; - sleep?: (milliseconds: number) => Promise; abortSignal?: AbortSignal; emit?: (event: AutopilotControllerEvent) => void; + decisionAuthority?: () => DecisionAuthority; + /** Whether promotions in this checkout can carry the user's Git identity. */ + commitIdentityAvailable?: (checkoutPath: string) => Promise; } +/** + * Autopilot ends at a final-reviewed local branch. Pushing it and opening a + * pull request belong to the No Mistakes delivery gate, not to this runtime. + */ export type AutopilotStartResult = AutopilotWorkflowState & { status: "ready-for-human-review"; headCommitOid: string; - pullRequest: PullRequestIdentity; }; export type AutopilotStatusResult = AutopilotWorkflowState; @@ -148,7 +143,6 @@ interface CleanupContext { store: WorkflowStorePort; state: AutopilotWorkflowState; headCommitOid: string; - pullRequest: PullRequestIdentity; cleanup: BranchCleanupResult; } @@ -157,9 +151,6 @@ interface RecordedWorkflow { branch: WorkflowBranchIdentity | null; } -const DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS = 10_000; -const MIN_REQUIRED_CHECKS_POLL_INTERVAL_MS = 100; -const MAX_REQUIRED_CHECKS_POLL_INTERVAL_MS = 60_000; const REQUIRED_TASK_EVIDENCE_REFS = [ "decision.json", "manifest.json", @@ -252,19 +243,13 @@ function branchMatchesState( && branch.baseCommitOid === state.baseCommitOid && branch.branchRef === state.workflowRef && branch.worktreePath === state.worktreePath - && branch.branch === state.shipping.branch; + && branch.branch === state.branch; } function redactedState(state: AutopilotWorkflowState): AutopilotStatusResult { const redacted = structuredClone(state); redacted.repositoryIdentity = "[redacted]"; redacted.worktreePath = "[redacted]"; - if (redacted.shipping.prUrl !== null) redacted.shipping.prUrl = "[redacted]"; - for (const observation of redacted.ciObservations) { - for (const check of observation.checks) { - if (check.link !== null) check.link = "[redacted]"; - } - } return redacted; } @@ -294,10 +279,9 @@ function initialWorkflowState(args: { spec: AutopilotSpec; branch: WorkflowBranchIdentity; startedAt: string; - ciDeadlineAt: string; }): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId: args.workflowId, repositoryIdentity: args.branch.repositoryIdentity, baseCommitOid: args.branch.baseCommitOid, @@ -321,13 +305,7 @@ function initialWorkflowState(args: { lastEntryHash: null, }, finalGate: null, - shipping: { - branch: args.branch.branch, - prNumber: null, - prUrl: null, - ciDeadlineAt: args.ciDeadlineAt, - }, - ciObservations: [], + branch: args.branch.branch, cleanup: null, terminal: null, createdAt: args.startedAt, @@ -345,50 +323,6 @@ function finalGateFor(report: FinalBranchReport) { }; } -function pullRequestIdentityMatches( - pullRequest: PullRequestIdentity, - target: HostingTarget, - branch: WorkflowBranchIdentity, - expectedHead: string, -): boolean { - return Number.isSafeInteger(pullRequest.number) - && pullRequest.number > 0 - && pullRequest.url.length > 0 - && pullRequest.repository === target.repository - && pullRequest.baseBranch === branch.baseBranch - && pullRequest.headBranch === branch.branch - && pullRequest.headCommitOid === expectedHead; -} - -function pullRequestMatches( - pullRequest: PullRequestIdentity, - target: HostingTarget, - branch: WorkflowBranchIdentity, - expectedHead: string, - expectedDraft: boolean, -): boolean { - return pullRequestIdentityMatches(pullRequest, target, branch, expectedHead) - && pullRequest.draft === expectedDraft; -} - -function checksAreNonEmptyAndPassing( - checks: RequiredChecksResult, - expectedHead: string, -): boolean { - return checks.result === "passed" - && checks.headCommitOid === expectedHead - && checks.checks.length > 0 - && checks.checks.every(check => check.bucket === "pass"); -} - -function stateHasPassingChecks(state: AutopilotWorkflowState): boolean { - const observation = state.ciObservations.at(-1); - const expectedHead = state.finalGate?.headCommitOid; - return observation !== undefined - && expectedHead !== undefined - && checksAreNonEmptyAndPassing(observation, expectedHead); -} - const CLEANUP_INTENT_OPERATION = "cleanup-workflow-branch"; function cleanupIntentKey(headCommitOid: string): string { @@ -413,24 +347,29 @@ export class AutopilotController { private readonly validator: (value: unknown) => ValidateAutopilotResult; private readonly createWorkflowId: () => string; private readonly now: () => string; - private readonly pollIntervalMs: number; - private readonly sleep: (milliseconds: number) => Promise; + private readonly decisionAuthority: () => DecisionAuthority; constructor(private readonly dependencies: AutopilotControllerDependencies) { this.validator = dependencies.validator ?? validateAutopilotSpec; this.createWorkflowId = dependencies.workflowId ?? randomUUID; this.now = dependencies.now ?? (() => new Date().toISOString()); - const configuredInterval = dependencies.requiredChecksPollIntervalMs - ?? DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS; - this.pollIntervalMs = Number.isFinite(configuredInterval) - ? Math.min( - MAX_REQUIRED_CHECKS_POLL_INTERVAL_MS, - Math.max(MIN_REQUIRED_CHECKS_POLL_INTERVAL_MS, Math.trunc(configuredInterval)), - ) - : DEFAULT_REQUIRED_CHECKS_POLL_INTERVAL_MS; - this.sleep = dependencies.sleep ?? (async milliseconds => { - await new Promise(resolve => setTimeout(resolve, milliseconds)); - }); + this.decisionAuthority = dependencies.decisionAuthority ?? (() => decisionAuthority()); + } + + /** + * Autopilot accepts each task under `autopilot-policy`; it has no person to + * ask. Under the `human` authority it therefore refuses to promote rather + * than spend Producer work that could only halt at the first promotion. The + * promoter enforces the same rule; this only fails fast. + */ + private assertPolicyAuthority(): void { + if (this.decisionAuthority() === "human") { + throw new AutopilotControllerError( + "decision-authority-human", + "CLAUDE_ARCHITECT_DECISION_AUTHORITY=human requires a person for every acceptance; " + + "Autopilot records policy decisions and cannot run under it", + ); + } } async start(checkoutPath: string, value: unknown): Promise { @@ -444,16 +383,20 @@ export class AutopilotController { ); } + this.assertPolicyAuthority(); + const identityAvailable = this.dependencies.commitIdentityAvailable + ?? (async (path: string) => await userCommitEnvironment(path) !== null); + if (!await identityAvailable(checkoutPath)) { + throw new AutopilotControllerError( + "git-identity-missing", + "promotions are committed under your Git identity; configure user.name and user.email", + ); + } const spec = validated.spec; const startedAt = this.now(); - const startedAtMs = Date.parse(startedAt); - if (!Number.isFinite(startedAtMs)) { + if (!Number.isFinite(Date.parse(startedAt))) { throw new AutopilotControllerError("clock-invalid", "autopilot clock is invalid"); } - const ciDeadlineAt = new Date( - startedAtMs + spec.shipping.requiredChecksTimeoutMs, - ).toISOString(); - const ciDeadlineMs = Date.parse(ciDeadlineAt); const workflowId = this.createWorkflowId(); // Widened deliberately, like the bootstrap locals above: this is assigned // inside the locked closure, which control-flow analysis cannot see, so a @@ -473,22 +416,7 @@ export class AutopilotController { completedCleanup = await this.dependencies.workflowLock.runExclusive( workflowId, async (): Promise => { - let target: HostingTarget; this.dependencies.emit?.("preflight"); - try { - target = await this.dependencies.hostingAdapter.preflight({ - checkoutPath, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }); - } catch (error) { - throw new AutopilotControllerError( - classificationOf(error, "preflight-failed"), - "shipping preflight failed", - ); - } - let branch: WorkflowBranchIdentity; try { branch = await this.dependencies.branchManager.create({ @@ -505,21 +433,12 @@ export class AutopilotController { "workflow branch creation failed", ); } - if (branch.ownerRepo !== target.repository - || branch.remoteUrl !== target.canonicalHttpsUrl) { - throw new AutopilotControllerError( - "repository-identity-mismatch", - "shipping and workflow repository identities differ", - ); - } - const store = this.dependencies.workflowStore(workflowId); - let state = await store.create(initialWorkflowState({ + const state = await store.create(initialWorkflowState({ workflowId, spec, branch, startedAt, - ciDeadlineAt, })); bootstrapStore = store; bootstrapState = state; @@ -539,300 +458,15 @@ export class AutopilotController { } as unknown as WorkflowJournalJson, }); bootstrapCompleted = true; - let expectedHead = branch.baseCommitOid; - await this.haltIfAborted(store, state); - - for (const [index, task] of spec.tasks.entries()) { - if (state.phase === "preflighting") { - state = await store.transition({ - expectedRevision: state.revision, - to: "running-task", - update(draft) { - draft.currentTaskIndex = index; - draft.tasks[index]!.status = "running"; - }, - }); - } - - await this.haltIfAborted(store, state); - this.dependencies.emit?.(`task:${task.id}`); - const pipelineResult = await this.dependencies.pipelineRunner.run( - branch.worktreePath, - task.delegation, - ).catch(async error => - await this.halt(store, state, classificationOf(error, "pipeline-failed"))); - if (pipelineResult.status === "failed") { - return await this.halt(store, state, - pipelineResult.failure === "cancelled" ? "cancelled" : "pipeline-failed"); - } - if (pipelineResult.status === "human-decision-required" - || pipelineResult.gate.requiresHumanDecision) { - return await this.halt(store, state, "human-decision-required"); - } - - await this.haltIfAborted(store, state); - const snapshot = await this.dependencies.reviewSnapshotter.create({ - workflow: state, - branch, - task, - pipelineResult, - }).catch(async error => - await this.halt( - store, - state, - classificationOf(error, "candidate-evidence-mismatch"), - )); - if (!snapshotMatchesCandidate(expectedHead, pipelineResult, snapshot)) { - return await this.halt(store, state, "candidate-evidence-mismatch"); - } - await this.haltIfAborted(store, state); - const eligibility = await this.dependencies.eligibilityEvaluator.evaluate({ - workflow: state, - branch, - task, - pipelineResult, - reviewSnapshot: snapshot, - }).catch(async error => - await this.halt(store, state, classificationOf(error, "eligibility-red"))); - if (!eligibilityMatchesSnapshot(pipelineResult, snapshot, eligibility)) { - return await this.halt(store, state, "candidate-evidence-mismatch"); - } - if (!eligibility.eligible || eligibility.reasons.length !== 0) { - return await this.halt(store, state, "eligibility-red"); - } - - const candidate = candidateFrom(pipelineResult)!; - const eligibilityHash = autopilotEligibilityRecordHash(eligibility); - state = await store.transition({ - expectedRevision: state.revision, - to: "promoting-task", - update(draft) { - const current = draft.tasks[index]!; - current.runId = pipelineResult.runId; - current.candidateManifestHash = candidate.manifestHash; - current.eligibilityHash = eligibilityHash; - }, - }); - - await this.haltIfAborted(store, state); - this.dependencies.emit?.(`promote:${task.id}`); - const promotion = await this.dependencies.promoter.promote({ - workflowId, - runId: pipelineResult.runId, - workflowCheckoutPath: branch.worktreePath, - expectedHead, - expectedArtifactHash: candidate.manifestHash, - commitMessage: task.commitMessage, - }).catch(async error => - await this.halt( - store, - state, - classificationOf(error, "promotion-failed"), - )); - if (promotion.status === "rejected") { - return await this.halt(store, state, promotion.classification); - } - - expectedHead = promotion.commitOid; - const nextPhase = index === spec.tasks.length - 1 ? "final-review" : "running-task"; - state = await store.transition({ - expectedRevision: state.revision, - to: nextPhase, - update(draft) { - const current = draft.tasks[index]!; - current.status = "promoted"; - current.promotionCommitOid = promotion.commitOid; - draft.currentTaskIndex = index + 1; - if (nextPhase === "running-task") { - draft.tasks[index + 1]!.status = "running"; - } - }, - }); - await this.haltIfAborted(store, state); - } - await this.haltIfAborted(store, state); - this.dependencies.emit?.("final-review"); - const report = await this.dependencies.finalBranchReviewer.review({ - workflowId, - expectedRevision: state.revision, - taskEvidence: state.tasks.map(task => ({ - taskId: task.id, - runId: task.runId!, - candidateManifestHash: task.candidateManifestHash!, - promotionCommitOid: task.promotionCommitOid!, - evidenceRefs: [...REQUIRED_TASK_EVIDENCE_REFS], - })), - autopilotSpec: spec, - checkoutPath: branch.worktreePath, - }).catch(async error => - await this.halt( - store, - state, - classificationOf(error, "final-review-failed"), - )); - if (report.workflowId !== workflowId - || report.baseCommitOid !== branch.baseCommitOid - || report.headCommitOid !== expectedHead) { - return await this.halt(store, state, "stale-final-review"); - } - if (!report.eligible - || report.status !== "ready-to-ship" - || report.reasons.length !== 0) { - return await this.halt( - store, - state, - "human-decision-required", - draft => { draft.finalGate = finalGateFor(report); }, - ); - } - - state = await store.transition({ - expectedRevision: state.revision, - to: "pushing", - update(draft) { draft.finalGate = finalGateFor(report); }, - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.("push"); - const pushed = await this.dependencies.hostingAdapter.pushBranch({ - checkoutPath: branch.worktreePath, - target, - branch: branch.branch, - headCommitOid: expectedHead, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt(store, state, classificationOf(error, "push-failed"))); - if (pushed.remoteHead !== expectedHead) { - return await this.halt(store, state, "push-head-mismatch"); - } - - state = await store.transition({ - expectedRevision: state.revision, - to: "creating-draft-pr", - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.("draft-pr"); - const pullRequest = await this.dependencies.hostingAdapter.ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead, - title: spec.shipping.pullRequestTitle, - body: spec.shipping.pullRequestBody, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt( - store, - state, - classificationOf(error, "draft-pull-request-failed"), - )); - if (!pullRequestMatches(pullRequest, target, branch, expectedHead, true)) { - return await this.halt(store, state, "draft-pull-request-identity-mismatch"); - } - - state = await store.transition({ - expectedRevision: state.revision, - to: "waiting-required-checks", - update(draft) { - draft.shipping.prNumber = pullRequest.number; - draft.shipping.prUrl = pullRequest.url; - }, - }); - - while (true) { - await this.haltIfAborted(store, state); - const beforePoll = Date.parse(this.now()); - if (!Number.isFinite(beforePoll) || beforePoll >= ciDeadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - const observation = await this.dependencies.hostingAdapter.requiredChecks({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt( - store, - state, - classificationOf(error, "required-checks-failed"), - )); - this.dependencies.emit?.(`checks:${observation.result === "passed" - ? "pass" - : observation.result === "failed" ? "red" : observation.result}`); - const observedAt = this.now(); - const observedAtMs = Date.parse(observedAt); - state = await store.update({ - expectedRevision: state.revision, - update(draft) { - draft.ciObservations.push({ - observedAt, - result: observation.result, - headCommitOid: observation.headCommitOid, - checks: structuredClone(observation.checks), - }); - }, - }); - await this.haltIfAborted(store, state); - if (!Number.isFinite(observedAtMs) || observedAtMs >= ciDeadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - if (checksAreNonEmptyAndPassing(observation, expectedHead)) break; - if (observation.result === "missing" || observation.checks.length === 0) { - return await this.halt(store, state, "required-checks-missing"); - } - if (observation.result === "failed" - || observation.checks.some(check => - check.bucket !== "pass" && check.bucket !== "pending")) { - return await this.halt(store, state, "required-checks-red"); - } - const remainingMs = ciDeadlineMs - observedAtMs; - await this.sleep(Math.min(this.pollIntervalMs, remainingMs)).catch(async error => - await this.halt(store, state, classificationOf(error, "checks-wait-failed"))); - } - - state = await store.transition({ - expectedRevision: state.revision, - to: "marking-ready", - }); - await this.haltIfAborted(store, state); - this.dependencies.emit?.("mark-ready"); - const readyPullRequest = await this.dependencies.hostingAdapter.markReady({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt(store, state, classificationOf(error, "mark-ready-failed"))); - if (!pullRequestMatches(readyPullRequest, target, branch, expectedHead, false) - || readyPullRequest.number !== pullRequest.number - || readyPullRequest.url !== pullRequest.url) { - return await this.halt(store, state, "mark-ready-identity-mismatch"); - } - - state = await store.transition({ - expectedRevision: state.revision, - to: "cleaning-up", - }); - await this.haltIfAborted(store, state); - const cleanup = await this.cleanupBranch(store, state, branch, expectedHead); - pendingCleanup = { + // From here a fresh start and a resume are the same state machine. + pendingCleanup = await this.resumeActiveWorkflow({ store, state, - headCommitOid: expectedHead, - pullRequest: readyPullRequest, - cleanup, - }; + spec, + branch, + expectedHead: branch.baseCommitOid, + }); return pendingCleanup; }); } catch (error) { @@ -895,7 +529,6 @@ export class AutopilotController { ...result, status: "ready-for-human-review", headCommitOid: completedCleanup.headCommitOid, - pullRequest: structuredClone(completedCleanup.pullRequest), }; } @@ -938,6 +571,12 @@ export class AutopilotController { let state = await store.read(); await this.assertRepositoryIdentity(checkoutPath, workflowId, state); if (isTerminal(state)) return state; + // Only phases that still promote record an acceptance. A workflow in + // final review or cleanup has accepted everything already; refusing it + // would strand a promoted branch. + if (state.phase === "preflighting" + || state.phase === "running-task" + || state.phase === "promoting-task") this.assertPolicyAuthority(); await store.adoptLease(); await this.haltIfAborted(store, state); @@ -975,34 +614,11 @@ export class AutopilotController { } } - let target: HostingTarget; - try { - target = await this.dependencies.hostingAdapter.preflight({ - checkoutPath, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }); - } catch (error) { - throw new AutopilotControllerError( - classificationOf(error, "preflight-failed"), - "shipping preflight failed", - ); - } - if (branch.ownerRepo !== target.repository - || branch.remoteUrl !== target.canonicalHttpsUrl) { - throw new AutopilotControllerError( - "repository-identity-mismatch", - "shipping and workflow repository identities differ", - ); - } - const resumed = await this.resumeActiveWorkflow({ store, state, spec: validated.spec, branch, - target, expectedHead, }); pendingCleanup = resumed; @@ -1052,10 +668,9 @@ export class AutopilotController { state: AutopilotWorkflowState; spec: AutopilotSpec; branch: WorkflowBranchIdentity; - target: HostingTarget; expectedHead: string; }): Promise { - const { store, spec, branch, target } = args; + const { store, spec, branch } = args; let state = args.state; let expectedHead = args.expectedHead; @@ -1199,7 +814,7 @@ export class AutopilotController { || report.headCommitOid !== expectedHead) { return await this.halt(store, state, "stale-final-review"); } - if (!report.eligible || report.status !== "ready-to-ship" || report.reasons.length !== 0) { + if (!report.eligible || report.status !== "ready-for-human-review" || report.reasons.length !== 0) { return await this.halt( store, state, @@ -1207,209 +822,10 @@ export class AutopilotController { draft => { draft.finalGate = finalGateFor(report); }, ); } - state = await store.transition({ - expectedRevision: state.revision, - to: "pushing", - update(draft) { draft.finalGate = finalGateFor(report); }, - }); - } - - if (state.phase === "pushing") { - await this.haltIfAborted(store, state); - this.dependencies.emit?.("push"); - const pushed = await this.dependencies.hostingAdapter.pushBranch({ - checkoutPath: branch.worktreePath, - target, - branch: branch.branch, - headCommitOid: expectedHead, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt(store, state, classificationOf(error, "push-failed"))); - if (pushed.remoteHead !== expectedHead) { - return await this.halt(store, state, "push-head-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "creating-draft-pr", - }); - } - - let pullRequest: PullRequestIdentity; - if (state.phase === "creating-draft-pr") { - await this.haltIfAborted(store, state); - this.dependencies.emit?.("draft-pr"); - pullRequest = await this.dependencies.hostingAdapter.ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead, - title: spec.shipping.pullRequestTitle, - body: spec.shipping.pullRequestBody, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt( - store, - state, - classificationOf(error, "draft-pull-request-failed"), - )); - if (!pullRequestMatches(pullRequest, target, branch, expectedHead, true)) { - return await this.halt(store, state, "draft-pull-request-identity-mismatch"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "waiting-required-checks", - update(draft) { - draft.shipping.prNumber = pullRequest.number; - draft.shipping.prUrl = pullRequest.url; - }, - }); - } else { - if (state.shipping.prNumber === null || state.shipping.prUrl === null) { - throw new AutopilotControllerError( - "workflow-state-mismatch", - "shipping identity is incomplete", - ); - } - pullRequest = { - number: state.shipping.prNumber, - url: state.shipping.prUrl, - repository: target.repository, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead, - draft: state.phase !== "cleaning-up", - }; - if (state.phase === "marking-ready" && !stateHasPassingChecks(state)) { - return await this.halt(store, state, "required-checks-proof-missing"); - } - if (state.phase === "waiting-required-checks" || state.phase === "marking-ready") { - const establishedPullRequest = await this.dependencies.hostingAdapter - .ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target, - baseBranch: branch.baseBranch, - headBranch: branch.branch, - headCommitOid: expectedHead, - title: spec.shipping.pullRequestTitle, - body: spec.shipping.pullRequestBody, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }) - .catch(async error => - await this.halt( - store, - state, - classificationOf(error, "draft-pull-request-failed"), - )); - if (!pullRequestIdentityMatches( - establishedPullRequest, - target, - branch, - expectedHead, - ) || establishedPullRequest.number !== pullRequest.number - || establishedPullRequest.url !== pullRequest.url) { - return await this.halt(store, state, "draft-pull-request-identity-mismatch"); - } - pullRequest = establishedPullRequest; - if (!pullRequest.draft) { - if (!stateHasPassingChecks(state)) { - return await this.halt(store, state, "required-checks-proof-missing"); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "cleaning-up", - }); - } - } - } - - if (state.phase === "waiting-required-checks") { - const deadlineMs = Date.parse(state.shipping.ciDeadlineAt); - if (!Number.isFinite(deadlineMs)) { - return await this.halt(store, state, "required-checks-timeout"); - } - while (true) { - await this.haltIfAborted(store, state); - const beforePoll = Date.parse(this.now()); - if (!Number.isFinite(beforePoll) || beforePoll >= deadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - const observation = await this.dependencies.hostingAdapter.requiredChecks({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt(store, state, classificationOf(error, "required-checks-failed"))); - this.dependencies.emit?.(`checks:${observation.result === "passed" - ? "pass" - : observation.result === "failed" ? "red" : observation.result}`); - const observedAt = this.now(); - const observedAtMs = Date.parse(observedAt); - state = await store.update({ - expectedRevision: state.revision, - update(draft) { - draft.ciObservations.push({ - observedAt, - result: observation.result, - headCommitOid: observation.headCommitOid, - checks: structuredClone(observation.checks), - }); - }, - }); - await this.haltIfAborted(store, state); - if (!Number.isFinite(observedAtMs) || observedAtMs >= deadlineMs) { - return await this.halt(store, state, "required-checks-timeout"); - } - if (checksAreNonEmptyAndPassing(observation, expectedHead)) break; - if (observation.result === "missing" || observation.checks.length === 0) { - return await this.halt(store, state, "required-checks-missing"); - } - if (observation.result === "failed" - || observation.checks.some(check => - check.bucket !== "pass" && check.bucket !== "pending")) { - return await this.halt(store, state, "required-checks-red"); - } - const remainingMs = deadlineMs - observedAtMs; - await this.sleep(Math.min(this.pollIntervalMs, remainingMs)).catch(async error => - await this.halt(store, state, classificationOf(error, "checks-wait-failed"))); - } - state = await store.transition({ - expectedRevision: state.revision, - to: "marking-ready", - }); - } - - if (state.phase === "marking-ready") { - await this.haltIfAborted(store, state); - this.dependencies.emit?.("mark-ready"); - const readyPullRequest = await this.dependencies.hostingAdapter.markReady({ - checkoutPath: branch.worktreePath, - target, - pullRequestNumber: pullRequest.number, - headCommitOid: expectedHead, - ...(this.dependencies.abortSignal === undefined - ? {} - : { signal: this.dependencies.abortSignal }), - }).catch(async error => - await this.halt(store, state, classificationOf(error, "mark-ready-failed"))); - if (!pullRequestMatches(readyPullRequest, target, branch, expectedHead, false) - || readyPullRequest.number !== pullRequest.number - || readyPullRequest.url !== pullRequest.url) { - return await this.halt(store, state, "mark-ready-identity-mismatch"); - } state = await store.transition({ expectedRevision: state.revision, to: "cleaning-up", + update(draft) { draft.finalGate = finalGateFor(report); }, }); } @@ -1426,7 +842,7 @@ export class AutopilotController { branch, expectedHead, ); - return { store, state, headCommitOid: expectedHead, pullRequest, cleanup }; + return { store, state, headCommitOid: expectedHead, cleanup }; } private async cleanupBranch( @@ -1453,8 +869,13 @@ export class AutopilotController { } this.dependencies.emit?.("cleanup"); - const cleanup = await this.dependencies.branchManager.cleanup(branch, expectedHead) - .catch((): BranchCleanupResult => ({ ok: false, classification: "cleanup-failed" })); + // The final-reviewed branch is the hand-off; only the worktree and the + // workflow's private base ref are removed. + const cleanup = await this.dependencies.branchManager.cleanup( + branch, + expectedHead, + { retainBranch: true }, + ).catch((): BranchCleanupResult => ({ ok: false, classification: "cleanup-failed" })); if (cleanup.ok && cleanup.worktreeRemoved && cleanup.refsRemoved) { await store.completeIntent({ expectedRevision: state.revision, diff --git a/src/autopilot/autopilot-eligibility.ts b/src/autopilot/autopilot-eligibility.ts index 2c9a27f..e9bcf48 100644 --- a/src/autopilot/autopilot-eligibility.ts +++ b/src/autopilot/autopilot-eligibility.ts @@ -1,17 +1,13 @@ import { createHash } from "node:crypto"; import { manifestHashOf } from "../git/changed-path-manifest.js"; -import type { AttemptResult } from "../protocol/attempt-result.js"; import type { AutopilotDecisionEligibilityV1 } from "../protocol/candidate-decision.js"; -import type { PipelineResult, PipelineVerificationReport } from "../pipeline/pipeline-runtime.js"; -import type { AdvisorReport, Finding, ReviewReport } from "../pipeline/report-types.js"; -import type { GateResult } from "../pipeline/gates.js"; +import type { PipelineResult } from "../pipeline/pipeline-runtime.js"; +import type { AdvisorReport } from "../pipeline/report-types.js"; import { reviewSnapshotHash as hashReviewSnapshot, type ReviewSnapshot, } from "../runtime/review-snapshot.js"; -const SHA256 = /^[0-9a-f]{64}$/u; - export interface AutopilotEligibilityRecord { recordVersion: "1"; policyVersion: "1"; @@ -28,37 +24,12 @@ export interface AutopilotEligibilityRecord { evaluatedAt: string; } -export interface EligibilityReview { - reviewer: string; - report: ReviewReport; -} - -/** A normalized, caller-independent description of the complete frozen evidence. */ -export interface AutopilotEligibilityInput { - runId: string; - status: PipelineResult["status"]; - gate: GateResult; - attemptStatus: AttemptResult["status"]; - verification: PipelineVerificationReport | null; - finalReviews: EligibilityReview[]; - finalFindings: Finding[]; - finalFixReReviewed: boolean; - advisor: AdvisorReport; - baseCommitOid: string; - candidateCommitOid: string; - candidateTreeOid: string; - candidateManifestHash: string; - reviewRunId: string; - reviewBaseCommitOid: string; - reviewCandidateCommitOid: string; - reviewCandidateTreeOid: string; - reviewManifestHash: string; - reviewSnapshotHash: string; - pipelineResultHash: string; - advisorReportHash: string; - evaluatedAt: string; +/** The complete frozen evidence one eligibility record is derived from. */ +export interface AutopilotEligibilityEvidence { pipelineResult: PipelineResult; reviewSnapshot: ReviewSnapshot; + advisor: AdvisorReport; + evaluatedAt: string; } function canonicalJsonValue(value: unknown): string { @@ -115,64 +86,31 @@ function addReason(reasons: string[], reason: string): void { if (!reasons.includes(reason)) reasons.push(reason); } -function hashesAgree(actual: string, expected: string): boolean { - return SHA256.test(actual) && actual === expected; -} - -export function eligibilityInputFromArtifacts(args: { - pipelineResult: PipelineResult; - reviewSnapshot: ReviewSnapshot; - advisor: AdvisorReport; - evaluatedAt: string; -}): AutopilotEligibilityInput { - const { pipelineResult, reviewSnapshot, advisor } = args; - const candidate = pipelineResult.attempt.candidate; - const lastRound = pipelineResult.rounds.at(-1); - return { - runId: pipelineResult.runId, - status: pipelineResult.status, - gate: structuredClone(pipelineResult.gate), - attemptStatus: pipelineResult.attempt.status, - verification: pipelineResult.verification === null - ? null - : structuredClone(pipelineResult.verification), - finalReviews: structuredClone(lastRound?.reviews ?? []), - finalFindings: structuredClone(lastRound?.consolidated.findings ?? []), - finalFixReReviewed: lastRound?.fix === null, - advisor: structuredClone(advisor), - baseCommitOid: candidate?.baseCommitOid ?? reviewSnapshot.baseCommitOid, - candidateCommitOid: candidate?.candidateCommitOid ?? reviewSnapshot.candidateCommitOid, - candidateTreeOid: candidate?.candidateTreeOid ?? reviewSnapshot.candidateTreeOid, - candidateManifestHash: candidate?.manifestHash ?? reviewSnapshot.manifestHash, - reviewRunId: reviewSnapshot.runId, - reviewBaseCommitOid: reviewSnapshot.baseCommitOid, - reviewCandidateCommitOid: reviewSnapshot.candidateCommitOid, - reviewCandidateTreeOid: reviewSnapshot.candidateTreeOid, - reviewManifestHash: reviewSnapshot.manifestHash, - reviewSnapshotHash: hashReviewSnapshot(reviewSnapshot), - pipelineResultHash: pipelineResultHash(pipelineResult), - advisorReportHash: advisorReportHash(advisor), - evaluatedAt: args.evaluatedAt, - pipelineResult: structuredClone(pipelineResult), - reviewSnapshot: structuredClone(reviewSnapshot), - }; -} - -/** Pure, deterministic derivation. No caller-supplied eligibility is accepted. */ +/** + * Pure, deterministic derivation from the frozen evidence itself. Every field + * of the record is computed here, so no caller-supplied projection or hash can + * disagree with the artifacts it describes. + */ export function evaluateAutopilotEligibility( - input: AutopilotEligibilityInput, + evidence: AutopilotEligibilityEvidence, ): AutopilotEligibilityRecord { + const { pipelineResult, reviewSnapshot, advisor } = evidence; const reasons: string[] = []; + const candidate = pipelineResult.attempt.candidate; + const lastRound = pipelineResult.rounds.at(-1); + const gate = pipelineResult.gate; - if (input.status !== "decision-ready") addReason(reasons, "pipeline status is not decision-ready"); - if (!input.gate.decisionReady) addReason(reasons, "pipeline gate is not decision-ready"); - if (input.gate.requiresHumanDecision) addReason(reasons, "pipeline gate requires human decision"); - for (const reason of input.gate.reasons) addReason(reasons, `pipeline gate: ${reason}`); - if (input.attemptStatus !== "verified-candidate") { + if (pipelineResult.status !== "decision-ready") { + addReason(reasons, "pipeline status is not decision-ready"); + } + if (!gate.decisionReady) addReason(reasons, "pipeline gate is not decision-ready"); + if (gate.requiresHumanDecision) addReason(reasons, "pipeline gate requires human decision"); + for (const reason of gate.reasons) addReason(reasons, `pipeline gate: ${reason}`); + if (pipelineResult.attempt.status !== "verified-candidate") { addReason(reasons, "attempt is not a verified candidate"); } - const verification = input.verification; + const verification = pipelineResult.verification; if (verification === null) { addReason(reasons, "trusted verification is missing"); } else { @@ -193,8 +131,9 @@ export function evaluateAutopilotEligibility( } } + const finalReviews = lastRound?.reviews ?? []; for (const reviewer of ["correctness", "systems"] as const) { - const report = input.finalReviews.find(review => review.reviewer === reviewer)?.report; + const report = finalReviews.find(review => review.reviewer === reviewer)?.report; if (report?.verdict !== "approve") { addReason(reasons, `final ${reviewer} review does not approve`); } @@ -202,74 +141,41 @@ export function evaluateAutopilotEligibility( addReason(reasons, `final ${reviewer} review has coverage gaps`); } } - if (input.finalFindings.some(finding => + if ((lastRound?.consolidated.findings ?? []).some(finding => finding.severity === "blocker" || finding.severity === "major")) { addReason(reasons, "final review contains blocker or major findings"); } - if (!input.finalFixReReviewed) addReason(reasons, "final fix was not independently re-reviewed"); + if (lastRound?.fix !== null) addReason(reasons, "final fix was not independently re-reviewed"); - if (input.advisor.verdict !== "approve") addReason(reasons, "advisor does not approve"); - if (input.advisor.risks.some(risk => risk.severity === "blocker" || risk.severity === "major")) { + if (advisor.verdict !== "approve") addReason(reasons, "advisor does not approve"); + if (advisor.risks.some(risk => risk.severity === "blocker" || risk.severity === "major")) { addReason(reasons, "advisor reported blocker or major risk"); } - if (input.advisor.coverageGaps.length > 0) addReason(reasons, "advisor reported coverage gaps"); - - if (input.runId !== input.reviewRunId) addReason(reasons, "review snapshot run id mismatch"); - if (input.baseCommitOid !== input.reviewBaseCommitOid) { - addReason(reasons, "review snapshot base commit mismatch"); - } - if (input.candidateCommitOid !== input.reviewCandidateCommitOid) { - addReason(reasons, "review snapshot candidate commit mismatch"); - } - if (input.candidateTreeOid !== input.reviewCandidateTreeOid) { - addReason(reasons, "review snapshot candidate tree mismatch"); - } - if (input.candidateManifestHash !== input.reviewManifestHash) { - addReason(reasons, "review snapshot candidate manifest mismatch"); - } + if (advisor.coverageGaps.length > 0) addReason(reasons, "advisor reported coverage gaps"); - if (!SHA256.test(input.reviewSnapshotHash)) addReason(reasons, "review snapshot hash is invalid"); - if (!SHA256.test(input.pipelineResultHash)) addReason(reasons, "pipeline result hash is invalid"); - if (!SHA256.test(input.advisorReportHash)) addReason(reasons, "advisor report hash is invalid"); - if (input.reviewSnapshot === undefined) { - addReason(reasons, "review snapshot source artifact is missing"); + // The review snapshot is produced independently of the pipeline, so its + // binding to the pipeline's candidate is a real check, not a restatement. + if (candidate === null) { + addReason(reasons, "pipeline result has no candidate"); } else { - try { - if (!hashesAgree(input.reviewSnapshotHash, hashReviewSnapshot(input.reviewSnapshot))) { - addReason(reasons, "review snapshot hash mismatch"); - } - } catch { - addReason(reasons, "review snapshot is malformed"); + if (pipelineResult.runId !== reviewSnapshot.runId) { + addReason(reasons, "review snapshot run id mismatch"); + } + if (candidate.baseCommitOid !== reviewSnapshot.baseCommitOid) { + addReason(reasons, "review snapshot base commit mismatch"); + } + if (candidate.candidateCommitOid !== reviewSnapshot.candidateCommitOid) { + addReason(reasons, "review snapshot candidate commit mismatch"); + } + if (candidate.candidateTreeOid !== reviewSnapshot.candidateTreeOid) { + addReason(reasons, "review snapshot candidate tree mismatch"); + } + if (candidate.manifestHash !== reviewSnapshot.manifestHash) { + addReason(reasons, "review snapshot candidate manifest mismatch"); } - } - if (input.pipelineResult === undefined) { - addReason(reasons, "pipeline result source artifact is missing"); - } else { try { - if (!hashesAgree(input.pipelineResultHash, pipelineResultHash(input.pipelineResult))) { - addReason(reasons, "pipeline result hash mismatch"); - } - const sourceLastRound = input.pipelineResult.rounds.at(-1); - if (input.pipelineResult.status !== input.status - || input.pipelineResult.attempt.status !== input.attemptStatus - || canonicalArtifactHash(input.pipelineResult.gate) !== canonicalArtifactHash(input.gate) - || canonicalArtifactHash(input.pipelineResult.verification) !== canonicalArtifactHash(input.verification) - || canonicalArtifactHash(sourceLastRound?.reviews ?? []) - !== canonicalArtifactHash(input.finalReviews) - || canonicalArtifactHash(sourceLastRound?.consolidated.findings ?? []) - !== canonicalArtifactHash(input.finalFindings) - || (sourceLastRound?.fix === null) !== input.finalFixReReviewed) { - addReason(reasons, "pipeline result eligibility projection mismatch"); - } - const candidate = input.pipelineResult.attempt.candidate; - if (input.pipelineResult.runId !== input.runId - || input.pipelineResult.attempt.runId !== input.runId - || input.pipelineResult.finalCandidateCommit !== input.candidateCommitOid - || candidate === null - || candidate.baseCommitOid !== input.baseCommitOid - || candidate.candidateCommitOid !== input.candidateCommitOid - || candidate.candidateTreeOid !== input.candidateTreeOid - || candidate.manifestHash !== input.candidateManifestHash + if (pipelineResult.attempt.runId !== pipelineResult.runId + || pipelineResult.finalCandidateCommit !== candidate.candidateCommitOid || manifestHashOf(candidate.changedPaths) !== candidate.manifestHash) { addReason(reasons, "pipeline result candidate binding mismatch"); } @@ -277,10 +183,22 @@ export function evaluateAutopilotEligibility( addReason(reasons, "pipeline result is malformed"); } } + + let reviewSnapshotHash = ""; + let resultHash = ""; + let advisorHash = ""; + try { + reviewSnapshotHash = hashReviewSnapshot(reviewSnapshot); + } catch { + addReason(reasons, "review snapshot is malformed"); + } try { - if (!hashesAgree(input.advisorReportHash, advisorReportHash(input.advisor))) { - addReason(reasons, "advisor report hash mismatch"); - } + resultHash = pipelineResultHash(pipelineResult); + } catch { + addReason(reasons, "pipeline result is malformed"); + } + try { + advisorHash = advisorReportHash(advisor); } catch { addReason(reasons, "advisor report is malformed"); } @@ -288,16 +206,16 @@ export function evaluateAutopilotEligibility( return { recordVersion: "1", policyVersion: "1", - runId: input.runId, + runId: pipelineResult.runId, eligible: reasons.length === 0, reasons, - baseCommitOid: input.baseCommitOid, - candidateCommitOid: input.candidateCommitOid, - candidateTreeOid: input.candidateTreeOid, - candidateManifestHash: input.candidateManifestHash, - reviewSnapshotHash: input.reviewSnapshotHash, - pipelineResultHash: input.pipelineResultHash, - advisorReportHash: input.advisorReportHash, - evaluatedAt: input.evaluatedAt, + baseCommitOid: candidate?.baseCommitOid ?? reviewSnapshot.baseCommitOid, + candidateCommitOid: candidate?.candidateCommitOid ?? reviewSnapshot.candidateCommitOid, + candidateTreeOid: candidate?.candidateTreeOid ?? reviewSnapshot.candidateTreeOid, + candidateManifestHash: candidate?.manifestHash ?? reviewSnapshot.manifestHash, + reviewSnapshotHash, + pipelineResultHash: resultHash, + advisorReportHash: advisorHash, + evaluatedAt: evidence.evaluatedAt, }; } diff --git a/src/autopilot/branch-manager.ts b/src/autopilot/branch-manager.ts index 95ecedf..13cb92f 100644 --- a/src/autopilot/branch-manager.ts +++ b/src/autopilot/branch-manager.ts @@ -1,4 +1,5 @@ import { createHash, randomUUID } from "node:crypto"; +import { gitSucceeded as succeeded } from "../git/checked-git.js"; import { constants } from "node:fs"; import { chmod, link, lstat, mkdir, mkdtemp, open, realpath, rm } from "node:fs/promises"; import path from "node:path"; @@ -90,9 +91,7 @@ interface WorkflowBranchRegistration extends WorkflowBranchIdentity { export type BranchRevalidationClassification = | "ownership-mismatch" | "repository-identity-changed" - | "remote-identity-changed" | "base-ref-changed" - | "remote-base-changed" | "worktree-missing" | "worktree-path-changed" | "worktree-registration-changed" @@ -107,10 +106,20 @@ export type BranchRevalidationResult = | { ok: true } | { ok: false; classification: BranchRevalidationClassification }; +/** + * Postconditions, not actions: `worktreeRemoved` and `refsRemoved` say the + * worktree and every ref cleanup owns are gone, whether this call removed + * them or an interrupted earlier call already had. + */ export type BranchCleanupResult = | { ok: true; worktreeRemoved: boolean; refsRemoved: boolean } | { ok: false; classification: "cleanup-failed" }; +export interface BranchCleanupOptions { + /** Keep the workflow branch itself: it is the final-reviewed hand-off. */ + retainBranch?: boolean; +} + export class WorkflowBranchError extends RuntimeError { constructor(readonly classification: string, message = classification) { super(message, { classification }); @@ -123,11 +132,6 @@ interface RemoteIdentity { ownerRepo: string; } -function succeeded(result: GitResult): boolean { - return result.exitCode === 0 - && result.truncated?.stdout !== true - && result.truncated?.stderr !== true; -} function transportFailure(action: string): GitResult { return { exitCode: 2, stdout: "", stderr: `${action} failed in isolated transport` }; @@ -522,15 +526,6 @@ export async function workflowWorktreeOwnershipClaim( }; } -/** Validate a durable workflow registration as the owner of one managed worktree. */ -export async function workflowOwnershipClaimsWorktree( - ownershipPath: string, - worktreePath: string, -): Promise { - await workflowWorktreeOwnershipClaim(ownershipPath, worktreePath); - return true; -} - function operationFailure(action: string, result: GitResult): never { const diagnostic = boundedRedactedDiagnostic( (result.stderr || result.stdout).trim(), @@ -697,7 +692,6 @@ export class WorkflowBranchManager { let fetchedOidForCleanup: string | undefined; let completedIdentity: WorkflowBranchIdentity | undefined; let operationError: unknown; - const workflowHash = createHash("sha256").update(request.workflowId).digest("hex"); const remoteIdentity = await this.resolveRemote(initial.canonical); const safety = new PlatformSafety(this.platformServices as PlatformServices); try { @@ -906,16 +900,6 @@ export class WorkflowBranchManager { return { ok: false, classification: "worktree-path-changed" }; } - let remoteIdentity: RemoteIdentity; - try { - remoteIdentity = await this.resolveRemote(identity.checkoutPath); - } catch { - return { ok: false, classification: "remote-identity-changed" }; - } - if (remoteIdentity.url !== identity.remoteUrl || remoteIdentity.ownerRepo !== identity.ownerRepo) { - return { ok: false, classification: "remote-identity-changed" }; - } - const registered = await this.runGit(identity.checkoutPath, [ "worktree", "list", "--porcelain", "-z", ]); @@ -960,17 +944,6 @@ export class WorkflowBranchManager { if (!succeeded(base) || base.stdout.trim() !== identity.baseCommitOid) { return { ok: false, classification: "base-ref-changed" }; } - const remote = await this.remoteTransport.listHeads(identity.checkoutPath, identity.remoteUrl); - if (!succeeded(remote)) return { ok: false, classification: "git-command-failed" }; - let remoteHeads: Map; - try { - remoteHeads = parseRemoteHeads(remote.stdout); - } catch { - return { ok: false, classification: "git-command-failed" }; - } - if (remoteHeads.get(identity.baseBranch) !== identity.baseCommitOid) { - return { ok: false, classification: "remote-base-changed" }; - } return { ok: true }; } @@ -1047,10 +1020,9 @@ export class WorkflowBranchManager { identity: WorkflowBranchIdentity, expectedHead: string, checkoutLease: CheckoutLock, + retainBranch: boolean, ): Promise { - if (!await this.readOwnership(identity)) { - return { ok: false, classification: "cleanup-failed" }; - } + const owned = await this.readOwnership(identity); const checkout = await this.platformServices.canonicalizePath(identity.checkoutPath); if (checkout.gitCommonDir !== identity.gitCommonDir) { return { ok: false, classification: "cleanup-failed" }; @@ -1128,24 +1100,39 @@ export class WorkflowBranchManager { const basePresence = await this.runGit(identity.checkoutPath, [ "show-ref", "--verify", "--quiet", identity.baseRef, ]); - const refsPresent = branchPresence.exitCode === 0 && basePresence.exitCode === 0; - const refsAbsent = branchPresence.exitCode === 1 && basePresence.exitCode === 1; - if ((!refsPresent && !refsAbsent) || (refsAbsent && registrationPresent)) { + const presenceKnown = (exitCode: number | null): boolean => exitCode === 0 || exitCode === 1; + if (!presenceKnown(branchPresence.exitCode) || !presenceKnown(basePresence.exitCode)) { return { ok: false, classification: "cleanup-failed" }; } - if (refsPresent) { - const branch = await this.runGit(identity.checkoutPath, [ - "rev-parse", "--verify", identity.branchRef, - ]); - const base = await this.runGit(identity.checkoutPath, [ - "rev-parse", "--verify", identity.baseRef, - ]); - if (!succeeded(branch) - || !succeeded(base) - || branch.stdout.trim() !== expectedHead - || base.stdout.trim() !== identity.baseCommitOid) { - return { ok: false, classification: "cleanup-failed" }; - } + const branchPresent = branchPresence.exitCode === 0; + const basePresent = basePresence.exitCode === 0; + if (retainBranch) { + // The hand-off branch must survive at exactly the reviewed head. + if (!branchPresent) return { ok: false, classification: "cleanup-failed" }; + } else if (branchPresent !== basePresent || (!branchPresent && registrationPresent)) { + return { ok: false, classification: "cleanup-failed" }; + } + const [branch, base] = await Promise.all([ + branchPresent + ? this.runGit(identity.checkoutPath, ["rev-parse", "--verify", identity.branchRef]) + : null, + basePresent + ? this.runGit(identity.checkoutPath, ["rev-parse", "--verify", identity.baseRef]) + : null, + ]); + if ((branch !== null && (!succeeded(branch) || branch.stdout.trim() !== expectedHead)) + || (base !== null && (!succeeded(base) || base.stdout.trim() !== identity.baseCommitOid))) { + return { ok: false, classification: "cleanup-failed" }; + } + const removeBranch = branchPresent && !retainBranch; + const nothingLeft = !registrationPresent && !basePresent && !removeBranch; + // An interrupted cleanup can remove the ownership record before its + // journal entry lands. With nothing left to remove, that is completion, + // not a foreign workflow; with anything left, ownership is required. + if (!owned) { + return nothingLeft + ? { ok: true, worktreeRemoved: true, refsRemoved: true } + : { ok: false, classification: "cleanup-failed" }; } const manager = new WorktreeManager( @@ -1167,12 +1154,12 @@ export class WorkflowBranchManager { ); } } - if (refsPresent) { + if (basePresent || removeBranch) { const refs = await this.runGit(identity.checkoutPath, ["update-ref", "--stdin"], { stdin: [ "start", - `delete ${identity.branchRef} ${expectedHead}`, - `delete ${identity.baseRef} ${identity.baseCommitOid}`, + ...(removeBranch ? [`delete ${identity.branchRef} ${expectedHead}`] : []), + ...(basePresent ? [`delete ${identity.baseRef} ${identity.baseCommitOid}`] : []), "prepare", "commit", "", @@ -1181,16 +1168,13 @@ export class WorkflowBranchManager { if (!succeeded(refs)) return { ok: false, classification: "cleanup-failed" }; } await this.removeOwnership(this.ownershipPath(identity.workflowId)); - return { - ok: true, - worktreeRemoved: registrationPresent, - refsRemoved: refsPresent, - }; + return { ok: true, worktreeRemoved: true, refsRemoved: true }; } async cleanup( identity: WorkflowBranchIdentity, expectedHead = identity.baseCommitOid, + options: BranchCleanupOptions = {}, ): Promise { if (!isOid(expectedHead) || !isOid(identity.baseCommitOid) @@ -1207,7 +1191,7 @@ export class WorkflowBranchManager { if (lock.repositoryIdentity !== identity.repositoryIdentity) { return { ok: false, classification: "cleanup-failed" }; } - return await this.cleanupLocked(identity, expectedHead, lock); + return await this.cleanupLocked(identity, expectedHead, lock, options.retainBranch === true); }, { onReleaseError: (releaseError, res) => { logger.warn("checkout lock release failed after workflow branch cleanup", { diff --git a/src/autopilot/candidate-promoter.ts b/src/autopilot/candidate-promoter.ts index aed9e40..069e8b6 100644 --- a/src/autopilot/candidate-promoter.ts +++ b/src/autopilot/candidate-promoter.ts @@ -1,5 +1,6 @@ import { createHash } from "node:crypto"; -import { git, type GitResult } from "../git/git-exec.js"; +import { gitSucceeded as succeeded } from "../git/checked-git.js"; +import { git, userCommitEnvironment } from "../git/git-exec.js"; import { stageCandidateTreeUnderLock, statusMatchesArtifact, @@ -10,6 +11,8 @@ import { getPlatformServices } from "../platform/select-platform.js"; import type { PipelineResult } from "../pipeline/pipeline-runtime.js"; import type { CandidateArtifact } from "../protocol/attempt-result.js"; import { ArtifactStore } from "../runtime/artifact-store.js"; +import { decisionAuthority, type DecisionAuthority } from "../mcp/decision-authority.js"; +import { isLockContention } from "../platform/lock-ownership.js"; import { PlatformSafety } from "../platform/platform-safety.js"; import { redact } from "../runtime/redaction.js"; import { reviewSnapshotHash } from "../runtime/review-snapshot.js"; @@ -43,6 +46,7 @@ export type PromotionClassification = | "evidence-mismatch" | "decision-conflict" | "branch-identity-changed" + | "checkout-busy" | "dirty-worktree" | "head-changed" | "apply-conflict" @@ -77,6 +81,7 @@ export interface CandidatePromoterDependencies { artifactStore?: (runId: string) => ArtifactStore; stageCandidate?: typeof stageCandidateTreeUnderLock; now?: () => string; + decisionAuthority?: () => DecisionAuthority; } function safeCommitMessage(message: string): boolean { @@ -88,11 +93,6 @@ function safeCommitMessage(message: string): boolean { && !/\b(?:ai|claude|codex|chatgpt|copilot|gemini|llm)[ -]generated\b/iu.test(message); } -function succeeded(result: GitResult): boolean { - return result.exitCode === 0 - && result.truncated?.stdout !== true - && result.truncated?.stderr !== true; -} function rejected(classification: PromotionClassification): PromotionResult { return { status: "rejected", classification }; @@ -165,6 +165,7 @@ const PROMOTION_CLASSIFICATION_RECORD = { "journal-failed": true, "anchor-deletion-failed": true, "lock-release-failed": true, + "checkout-busy": true, "human-decision-required": true, } as const satisfies Record; const PROMOTION_CLASSIFICATIONS: ReadonlySet = new Set( @@ -188,6 +189,7 @@ export class CandidatePromoter { private readonly artifactStore: (runId: string) => ArtifactStore; private readonly stageCandidate: typeof stageCandidateTreeUnderLock; private readonly now: () => string; + private readonly decisionAuthority: () => DecisionAuthority; constructor(dependencies: CandidatePromoterDependencies = {}) { this.runGit = dependencies.git ?? git; @@ -198,6 +200,7 @@ export class CandidatePromoter { this.artifactStore = dependencies.artifactStore ?? (runId => new ArtifactStore(runId)); this.stageCandidate = dependencies.stageCandidate ?? stageCandidateTreeUnderLock; this.now = dependencies.now ?? (() => new Date().toISOString()); + this.decisionAuthority = dependencies.decisionAuthority ?? (() => decisionAuthority()); } private async proveCommit( @@ -310,6 +313,9 @@ export class CandidatePromoter { || !SHA256.test(request.expectedArtifactHash) || request.workflowCheckoutPath.length === 0) return rejected("invalid-request"); if (!safeCommitMessage(request.commitMessage)) return rejected("invalid-commit-message"); + // Promotion records an `autopilot-policy` acceptance. Under the `human` + // authority no acceptance may be recorded without a person. + if (this.decisionAuthority() === "human") return rejected("human-decision-required"); const workflowStore = this.workflowStore(request.workflowId); const artifactStore = this.artifactStore(request.runId); @@ -518,13 +524,6 @@ export class CandidatePromoter { journalFailure: false, }; } - if (!await this.ensureAcceptedDecision( - artifactStore, request.runId, artifact, eligibility, eligibilityHash, - )) { - return { - kind: "rejected", classification: "decision-conflict", journalFailure: true, - }; - } const staged = await this.stageCandidate({ repoRoot: request.workflowCheckoutPath, artifact, @@ -542,7 +541,11 @@ export class CandidatePromoter { kind: "rejected", classification: classifyStage(staged), journalFailure: true, }; } - } else if (!await this.ensureAcceptedDecision( + } + // Recorded only once the exact bytes are staged, so a conflicted or + // failed stage never leaves an acceptance behind for bytes that were + // not applied. A crash after staging lands here again via recovery. + if (!await this.ensureAcceptedDecision( artifactStore, request.runId, artifact, eligibility, eligibilityHash, )) { return { @@ -554,11 +557,12 @@ export class CandidatePromoter { kind: "rejected", classification: "human-decision-required", journalFailure: false, }; } - const [author, committer] = await Promise.all([ - this.runGit(request.workflowCheckoutPath, ["var", "GIT_AUTHOR_IDENT"]), - this.runGit(request.workflowCheckoutPath, ["var", "GIT_COMMITTER_IDENT"]), - ]); - if (!succeeded(author) || !succeeded(committer)) { + // The promoted commit is handed off under the user's name, so it + // carries their identity rather than the runtime's fixed one. + const identityEnv = await userCommitEnvironment( + request.workflowCheckoutPath, this.runGit, + ); + if (identityEnv === null) { return { kind: "rejected", classification: "git-identity-missing", journalFailure: true, }; @@ -566,7 +570,7 @@ export class CandidatePromoter { const created = await this.runGit(request.workflowCheckoutPath, [ "commit-tree", artifact.candidateTreeOid, "-p", request.expectedHead, "-m", request.commitMessage, - ]); + ], { env: identityEnv }); const commitOid = created.stdout.trim(); if (!succeeded(created) || !OBJECT_ID.test(commitOid)) { return { @@ -636,7 +640,8 @@ export class CandidatePromoter { reason: redact(String(error)), }); } else if (!enteredLease) { - return finishFailure("branch-identity-changed"); + // Contention is transient and says nothing about branch identity. + return finishFailure(isLockContention(error) ? "checkout-busy" : "branch-identity-changed"); } else { throw error; } diff --git a/src/autopilot/final-branch-reviewer.ts b/src/autopilot/final-branch-reviewer.ts index 25c4651..c419e97 100644 --- a/src/autopilot/final-branch-reviewer.ts +++ b/src/autopilot/final-branch-reviewer.ts @@ -1,15 +1,15 @@ -import { createHash, randomUUID } from "node:crypto"; +import { createHash } from "node:crypto"; +import { reviewDiffArgs, gitSucceeded as succeeded } from "../git/checked-git.js"; import { constants } from "node:fs"; -import { link, lstat, open, readFile, rm } from "node:fs/promises"; +import { open } from "node:fs/promises"; import type { FileHandle } from "node:fs/promises"; import path from "node:path"; import { computeChangedPathManifest, parseRawDiff, } from "../git/changed-path-manifest.js"; -import { git, type GitResult } from "../git/git-exec.js"; -import { syncDirectoryMetadata } from "../platform/durable-directory.js"; -import { globMatches } from "../util/glob.js"; +import { git } from "../git/git-exec.js"; +import { openDurableDirectorySession, writeAtomic } from "../platform/durable-write.js"; import { WorktreeManager } from "../runtime/worktree-manager.js"; import { PlatformSafety } from "../platform/platform-safety.js"; import { assertNoPendingWorktreeRemovalForRepository } from "../runtime/worktree-removal-manifest.js"; @@ -37,7 +37,7 @@ import { type RoleRunResult, } from "../pipeline/role-runner.js"; import { extractJson } from "../pipeline/structured-output.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; import { autopilotEligibilityRecordHash, canonicalArtifactHash, @@ -76,7 +76,7 @@ export const FINAL_SYSTEMS_REVIEW_REF = "final-review-systems.json"; export const FINAL_ADVISOR_REF = "final-advisor.json"; export interface FinalBranchReport { - reportVersion: "1"; + reportVersion: "2"; workflowId: string; baseCommitOid: string; headCommitOid: string; @@ -87,7 +87,7 @@ export interface FinalBranchReport { taskEvidenceHashes: string[]; eligible: boolean; reasons: string[]; - status: "ready-to-ship" | "human-decision-required"; + status: "ready-for-human-review" | "human-decision-required"; evaluatedAt: string; } @@ -203,11 +203,6 @@ type StructuredFinalRole = "reviewer-correctness" | "reviewer-systems" | "adviso const schemas = loadSchemas(); -function succeeded(result: GitResult): boolean { - return result.exitCode === 0 - && result.truncated?.stdout !== true - && result.truncated?.stderr !== true; -} function fail( classification: FinalBranchReviewClassification, @@ -383,6 +378,20 @@ function evidenceHash(content: string): string { return createHash("sha256").update(content, "utf8").digest("hex"); } +/** + * Every structured artifact a task archived — so an undeclared repair still + * reaches the final review — but not the Producer role transcripts under + * `logs/`, unless the task declared one. Final reviewers judge the branch + * without sharing implementer context, and transcripts dominate the size cap. + */ +function reviewEvidenceRefs(archived: string[], declared: string[]): string[] { + return normalizedEvidenceRefs( + [...archived.filter(reference => !reference.startsWith("logs/")), ...declared], + false, + MAX_TASK_EVIDENCE_REFS, + ); +} + async function freezeTaskEvidence( evidence: FinalBranchTaskEvidence[], evidenceStore: ( @@ -406,8 +415,9 @@ async function freezeTaskEvidence( || task.evidenceRefs.some(reference => !archivedReferences.includes(reference))) { fail("missing-task-evidence", `task evidence archive is incomplete: ${task.taskId}`); } + const frozenReferences = reviewEvidenceRefs(archivedReferences, task.evidenceRefs); let frozenBytes = 0; - const frozen = await Promise.all(archivedReferences.map(async reference => { + const frozen = await Promise.all(frozenReferences.map(async reference => { let content: string | null; try { content = await store.readEvidence(reference); @@ -439,7 +449,7 @@ async function freezeTaskEvidence( if (JSON.stringify(finalReferences) !== JSON.stringify(archivedReferences)) { fail("missing-task-evidence", `task evidence archive changed: ${task.taskId}`); } - return { ...task, evidenceRefs: archivedReferences, evidence: frozen }; + return { ...task, evidenceRefs: frozenReferences, evidence: frozen }; })); } @@ -462,7 +472,8 @@ async function assertTaskEvidenceCurrent( fail("missing-task-evidence", `task evidence archive is unavailable: ${task.taskId}`); } if (task.evidence.length !== task.evidenceRefs.length - || JSON.stringify(archivedReferences) !== JSON.stringify(task.evidenceRefs) + || JSON.stringify(reviewEvidenceRefs(archivedReferences, task.evidenceRefs)) + !== JSON.stringify(task.evidenceRefs) || task.evidence.some((item, index) => item.reference !== task.evidenceRefs[index])) { fail("missing-task-evidence", "frozen task evidence index is inconsistent"); } @@ -769,51 +780,31 @@ function freezePackage(value: T): T { return value; } -async function persistImmutableJson( +/** + * Durably write one workflow JSON record. `immutable` records are commit + * points: an existing different record is a conflict, never overwritten. + * `replaceable` records are evidence the commit point binds by hash, so a + * review interrupted before its report rewrites them on resume. + */ +async function persistJson( workflowDirectory: string, reference: string, value: unknown, + mode: "immutable" | "replaceable", ): Promise { - const destination = path.join(workflowDirectory, reference); - const temporary = path.join(workflowDirectory, `.${reference}.${randomUUID()}.tmp`); const serialized = `${JSON.stringify(value, null, 2)}\n`; - let handle: FileHandle | undefined; - let temporaryExists = false; try { - handle = await open( - temporary, - constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, - 0o600, - ); - temporaryExists = true; - await handle.writeFile(serialized, "utf8"); - await handle.sync(); - await handle.close(); - handle = undefined; + const session = await openDurableDirectorySession(workflowDirectory, { + description: "workflow directory", + create: false, + }); try { - await link(temporary, destination); - } catch (error) { - if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error; - const metadata = await lstat(destination); - if (!metadata.isFile() - || metadata.isSymbolicLink() - || metadata.nlink !== 1 - || await readFile(destination, "utf8") !== serialized) { - fail("artifact-persistence-failed", `a different ${reference} already exists`); - } - } - await rm(temporary); - temporaryExists = false; - await syncDirectoryMetadata(workflowDirectory); - if (await readFile(destination, "utf8") !== serialized) { - fail("artifact-persistence-failed", `${reference} was not durably persisted`); + await writeAtomic(session, reference, serialized, mode === "immutable" ? "immutable" : "replace"); + } finally { + await session.close(); } - } catch (error) { - if (error instanceof FinalBranchReviewError) throw error; + } catch { fail("artifact-persistence-failed", `failed to persist ${reference}`); - } finally { - await handle?.close(); - if (temporaryExists) await rm(temporary, { force: true }); } } @@ -821,52 +812,47 @@ async function persistFrozenArtifact( workflowDirectory: string, artifact: CumulativeBranchArtifact, ): Promise { - const destination = path.join(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF); - const temporary = path.join( - workflowDirectory, - `.${FINAL_BRANCH_ARTIFACT_REF}.${randomUUID()}.tmp`, - ); - const serialized = `${JSON.stringify(artifact, null, 2)}\n`; + await persistJson(workflowDirectory, FINAL_BRANCH_ARTIFACT_REF, artifact, "immutable"); +} + +/** + * The report is the review's commit point. One already published for this + * exact artifact means a previous run finished; resume returns it instead of + * re-running roles whose fresh output could never match it. + */ +async function readPublishedReport( + workflowDirectory: string, + artifact: CumulativeBranchArtifact, +): Promise { let handle: FileHandle | undefined; - let temporaryExists = false; try { - handle = await open( - temporary, - constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, - 0o600, - ); - temporaryExists = true; - await handle.writeFile(serialized, "utf8"); - await handle.sync(); - await handle.close(); - handle = undefined; - try { - await link(temporary, destination); - } catch (error) { - if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error; - const metadata = await lstat(destination); - if (!metadata.isFile() - || metadata.isSymbolicLink() - || metadata.nlink !== 1 - || await readFile(destination, "utf8") !== serialized) { - fail("artifact-persistence-failed", "a different final branch artifact already exists"); - } + handle = await open(path.join(workflowDirectory, FINAL_BRANCH_REPORT_REF), constants.O_RDONLY | NO_FOLLOW); + } catch (error) { + if (isMissing(error)) return null; + fail("artifact-persistence-failed", "final branch report is unavailable"); + } + try { + const metadata = await handle.stat(); + if (!metadata.isFile() || metadata.nlink !== 1 + || metadata.size > MAX_FINAL_BRANCH_ARTIFACT_BYTES) { + fail("artifact-persistence-failed", "final branch report is not a safe regular file"); } - await rm(temporary); - temporaryExists = false; - await syncDirectoryMetadata(workflowDirectory); - const persisted = JSON.parse(await readFile(destination, "utf8")) as CumulativeBranchArtifact; - const { branchArtifactHash, ...unhashed } = persisted; - if (branchArtifactHash !== artifact.branchArtifactHash - || branchArtifactHashOf(unhashed) !== artifact.branchArtifactHash) { - fail("artifact-persistence-failed", "final branch artifact was not durably persisted"); + const report = JSON.parse(await handle.readFile("utf8")) as FinalBranchReport; + if (report.reportVersion !== "2") { + fail("artifact-persistence-failed", "final branch report version is unsupported"); } + if (report.workflowId !== artifact.workflowId + || report.baseCommitOid !== artifact.baseCommitOid + || report.headCommitOid !== artifact.headCommitOid + || report.branchArtifactHash !== artifact.branchArtifactHash) { + fail("artifact-persistence-failed", "a final branch report for a different artifact exists"); + } + return report; } catch (error) { if (error instanceof FinalBranchReviewError) throw error; - fail("artifact-persistence-failed", "failed to persist final branch artifact"); + fail("artifact-persistence-failed", "final branch report is unreadable"); } finally { - await handle?.close(); - if (temporaryExists) await rm(temporary, { force: true }); + await handle.close(); } } @@ -1016,10 +1002,11 @@ export class FinalBranchReviewer { state.baseCommitOid, headTreeOid, ]), checkedGit(this.runGit, state.worktreePath, ["ls-tree", "-r", "-z", headTreeOid]), - checkedGit(this.runGit, state.worktreePath, [ - "diff", "--no-ext-diff", "--no-textconv", "--binary", "--full-index", - state.baseCommitOid, headTreeOid, - ]), + checkedGit( + this.runGit, + state.worktreePath, + reviewDiffArgs(state.baseCommitOid, headTreeOid, ["--binary", "--full-index"]), + ), ]); const manifest = computeChangedPathManifest({ rawDiff, nameStatusOutput, treeOutput }); await revalidateHead(state.worktreePath, headCommitOid, this.runGit, headTreeOid); @@ -1270,6 +1257,8 @@ export class FinalBranchReviewer { || canonicalArtifactHash(request.autopilotSpec) !== state.autopilotSpecHash) { fail("workflow-state-mismatch", "final review specification does not match workflow state"); } + const published = await readPublishedReport(store.workflowDirectory, artifact); + if (published !== null) return published; const spec = finalDelegationSpec(request.autopilotSpec); const reasons: string[] = []; let verification = failedVerification("final verification did not run"); @@ -1302,18 +1291,20 @@ export class FinalBranchReviewer { } verificationReasons(verification, spec, this.platformServices, reasons); + // Each piece of evidence appears once: reviewers read the diff and the + // final verification; only the advisor reads the frozen branch artifact, + // whose task evidence is already inside it. const frozenEvidence = freezePackage({ autopilotSpec: structuredClone(request.autopilotSpec), artifact: structuredClone(artifact), verification: structuredClone(verification), - taskEvidence: structuredClone(artifact.taskEvidence), }); const pkg = freezePackage({ spec, baselineCommit: artifact.baseCommitOid, candidateCommit: artifact.headCommitOid, candidateDiff: artifact.patch, - testEvidence: JSON.stringify(frozenEvidence), + testEvidence: JSON.stringify(verification), advisorEvidence: frozenEvidence, }); const runStructuredFinalRole = async ( @@ -1370,7 +1361,7 @@ export class FinalBranchReviewer { const reviewReports = [correctness, systems]; const report: FinalBranchReport = { - reportVersion: "1", + reportVersion: "2", workflowId: artifact.workflowId, baseCommitOid: artifact.baseCommitOid, headCommitOid: artifact.headCommitOid, @@ -1381,21 +1372,17 @@ export class FinalBranchReviewer { taskEvidenceHashes: artifact.taskEvidence.map(evidence => canonicalArtifactHash(evidence)), eligible: reasons.length === 0, reasons, - status: reasons.length === 0 ? "ready-to-ship" : "human-decision-required", + status: reasons.length === 0 ? "ready-for-human-review" : "human-decision-required", evaluatedAt: this.now(), }; await this.runHeadBoundPhaseCore( artifact, "final-evidence-publication", async () => { - await persistImmutableJson(store.workflowDirectory, FINAL_VERIFICATION_REF, verification); - await persistImmutableJson( - store.workflowDirectory, - FINAL_CORRECTNESS_REVIEW_REF, - correctness, - ); - await persistImmutableJson(store.workflowDirectory, FINAL_SYSTEMS_REVIEW_REF, systems); - await persistImmutableJson(store.workflowDirectory, FINAL_ADVISOR_REF, advisor); + await persistJson(store.workflowDirectory, FINAL_VERIFICATION_REF, verification, "replaceable"); + await persistJson(store.workflowDirectory, FINAL_CORRECTNESS_REVIEW_REF, correctness, "replaceable"); + await persistJson(store.workflowDirectory, FINAL_SYSTEMS_REVIEW_REF, systems, "replaceable"); + await persistJson(store.workflowDirectory, FINAL_ADVISOR_REF, advisor, "replaceable"); }, request.checkoutPath, checkoutLease, @@ -1403,10 +1390,11 @@ export class FinalBranchReviewer { await this.runHeadBoundPhaseCore( artifact, "final-report-publication", - async () => await persistImmutableJson( + async () => await persistJson( store.workflowDirectory, FINAL_BRANCH_REPORT_REF, report, + "immutable", ), request.checkoutPath, checkoutLease, diff --git a/src/autopilot/types.ts b/src/autopilot/types.ts index 1174e6a..9eecf8e 100644 --- a/src/autopilot/types.ts +++ b/src/autopilot/types.ts @@ -3,10 +3,6 @@ export type AutopilotPhase = | "running-task" | "promoting-task" | "final-review" - | "pushing" - | "creating-draft-pr" - | "waiting-required-checks" - | "marking-ready" | "cleaning-up" | "ready-for-human-review" | "human-decision-required" @@ -23,7 +19,7 @@ export interface AutopilotTaskState { } export interface AutopilotWorkflowState { - stateVersion: "1"; + stateVersion: "2"; workflowId: string; repositoryIdentity: string; baseCommitOid: string; @@ -45,23 +41,8 @@ export interface AutopilotWorkflowState { headCommitOid: string; eligibilityHash: string; } | null; - shipping: { - branch: string; - prNumber: number | null; - prUrl: string | null; - ciDeadlineAt: string; - }; - ciObservations: Array<{ - observedAt: string; - result: "missing" | "pending" | "failed" | "passed"; - headCommitOid: string; - checks: Array<{ - bucket: "pass" | "pending" | "fail" | "cancel" | "skipping"; - name: string; - state: string; - link: string | null; - }>; - }>; + /** The local workflow branch handed to the delivery gate once final-reviewed. */ + branch: string; cleanup: { status: "succeeded" | "failed"; worktreeRemoved: boolean; diff --git a/src/autopilot/workflow-store.ts b/src/autopilot/workflow-store.ts index af9ecbd..d9bf50d 100644 --- a/src/autopilot/workflow-store.ts +++ b/src/autopilot/workflow-store.ts @@ -15,8 +15,9 @@ import path from "node:path"; import { getPlatformServices } from "../platform/select-platform.js"; import { loadSchemas } from "../protocol/schema-loader.js"; import { resolveStateDir } from "../runtime/state-dir.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode, isMissing } from "../util/errors.js"; import type { AutopilotPhase, AutopilotWorkflowState } from "./types.js"; +import { flushDirectory } from "../platform/durable-directory.js"; const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; const MAX_WRITER_LOCK_BYTES = 512; @@ -101,21 +102,7 @@ export const LEGAL_WORKFLOW_PHASE_EDGES: Readonly< "failed", "cancelled", ], - "final-review": ["pushing", "human-decision-required", "failed", "cancelled"], - pushing: ["creating-draft-pr", "human-decision-required", "failed", "cancelled"], - "creating-draft-pr": [ - "waiting-required-checks", - "human-decision-required", - "failed", - "cancelled", - ], - "waiting-required-checks": [ - "marking-ready", - "human-decision-required", - "failed", - "cancelled", - ], - "marking-ready": ["cleaning-up", "human-decision-required", "failed", "cancelled"], + "final-review": ["cleaning-up", "human-decision-required", "failed", "cancelled"], "cleaning-up": ["ready-for-human-review", "human-decision-required", "failed", "cancelled"], "ready-for-human-review": [], "human-decision-required": [], @@ -216,14 +203,6 @@ function workflowError(message: string, toolError: string): RuntimeError { return new RuntimeError(message, { toolError }); } -function errorCode(error: unknown): string | undefined { - return (error as NodeJS.ErrnoException).code; -} - -function isMissing(error: unknown): boolean { - return errorCode(error) === "ENOENT"; -} - function isPlainDirectory(metadata: Stats): boolean { return metadata.isDirectory() && !metadata.isSymbolicLink(); } @@ -339,20 +318,6 @@ async function assertDirectoryIdentity( } } -async function syncDirectory(directory: string): Promise { - let handle: FileHandle | undefined; - try { - handle = await open(directory, constants.O_RDONLY | NO_FOLLOW); - await handle.sync(); - } catch (error) { - const unsupportedOnWindows = process.platform === "win32" - && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode(error) ?? ""); - if (!unsupportedOnWindows) throw error; - } finally { - await handle?.close(); - } -} - async function readHandleBytes(handle: FileHandle, size: number): Promise { const bytes = Buffer.alloc(size); let offset = 0; @@ -370,6 +335,47 @@ async function readHandleBytes(handle: FileHandle, size: number): Promise RuntimeError; oversized: () => RuntimeError; changed: () => RuntimeError }, +): Promise<{ bytes: Buffer; metadata: Stats }> { + const metadata = await handle.stat(); + const named = await lstat(filename); + if (metadata.isFile() && metadata.size > limits.maxBytes) throw errors.oversized(); + if (!metadata.isFile() + || metadata.nlink !== 1 + || metadata.size < limits.minBytes + || !named.isFile() + || named.isSymbolicLink() + || named.nlink !== 1 + || named.dev !== metadata.dev + || named.ino !== metadata.ino + || named.size !== metadata.size) throw errors.unsafe(); + const first = await readHandleBytes(handle, metadata.size); + const second = await readHandleBytes(handle, metadata.size); + const settled = await handle.stat(); + const settledNamed = await lstat(filename); + if (!first.equals(second) + || !settled.isFile() + || settled.nlink !== 1 + || settled.size !== metadata.size + || settled.mtimeMs !== metadata.mtimeMs + || settled.ctimeMs !== metadata.ctimeMs + || !settledNamed.isFile() + || settledNamed.isSymbolicLink() + || settledNamed.dev !== metadata.dev + || settledNamed.ino !== metadata.ino + || settledNamed.size !== metadata.size) throw errors.changed(); + return { bytes: first, metadata }; +} + function assertWorkflowId(workflowId: string): void { if (!SAFE_WORKFLOW_ID.test(workflowId)) { throw workflowError("workflow id is not a safe path component", "invalid-workflow-state"); @@ -410,6 +416,13 @@ function assertSemanticState(state: AutopilotWorkflowState, workflowId: string): const validateWorkflowState = loadSchemas().autopilotWorkflowState; function validateState(value: unknown, workflowId: string): AutopilotWorkflowState { + if (isRecord(value) && value.stateVersion === "1") { + throw workflowError( + "workflow was created by a runtime that shipped branches itself (state v1); " + + "finish or cancel it with that runtime, or start a new workflow", + "workflow-state-version-unsupported", + ); + } if (!validateWorkflowState(value)) { throw workflowError("workflow state does not match its schema", "invalid-workflow-state"); } @@ -1010,7 +1023,7 @@ export class WorkflowStore { next.autopilotSpecHash = current.autopilotSpecHash; next.intentJournal = structuredClone(current.intentJournal); next.createdAt = current.createdAt; - next.shipping.ciDeadlineAt = current.shipping.ciDeadlineAt; + next.branch = current.branch; next.revision = current.revision + 1; next.phase = transitionTo ?? current.phase; next.updatedAt = this.now(); @@ -1131,7 +1144,7 @@ export class WorkflowStore { if (identity === undefined) { throw workflowError("workflow owner was not created", "unsafe-workflow-owner"); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return structuredClone(record); } @@ -1150,33 +1163,17 @@ export class WorkflowStore { throw error; } try { - const metadata = await handle.stat(); - const named = await lstat(this.ownerPath); - if (!metadata.isFile() - || metadata.nlink !== 1 - || metadata.size < 1 - || metadata.size > MAX_WORKFLOW_OWNER_BYTES - || !named.isFile() - || named.isSymbolicLink() - || named.nlink !== 1 - || named.dev !== metadata.dev - || named.ino !== metadata.ino - || named.size !== metadata.size) { - throw workflowError("workflow owner is unsafe", "unsafe-workflow-owner"); - } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); - const settled = await handle.stat(); - const settledNamed = await lstat(this.ownerPath); - if (!first.equals(second) - || settled.size !== metadata.size - || settled.mtimeMs !== metadata.mtimeMs - || settled.ctimeMs !== metadata.ctimeMs - || settledNamed.dev !== metadata.dev - || settledNamed.ino !== metadata.ino - || settledNamed.size !== metadata.size) { - throw workflowError("workflow owner changed during read", "unsafe-workflow-owner"); - } + const unsafe = () => workflowError("workflow owner is unsafe", "unsafe-workflow-owner"); + const { bytes: first, metadata } = await readSingleLinkFile( + handle, + this.ownerPath, + { minBytes: 1, maxBytes: MAX_WORKFLOW_OWNER_BYTES }, + { + unsafe, + oversized: unsafe, + changed: () => workflowError("workflow owner changed during read", "unsafe-workflow-owner"), + }, + ); return { dev: metadata.dev, ino: metadata.ino, @@ -1235,7 +1232,7 @@ export class WorkflowStore { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return true; } @@ -1310,7 +1307,7 @@ export class WorkflowStore { ownerPath, record, }; - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); break; } if (lockIdentity === undefined) { @@ -1331,7 +1328,7 @@ export class WorkflowStore { if (lockIdentity !== undefined) { await this.retireWriterLock(lockIdentity, directory); await rm(lockIdentity.ownerPath, { force: true }); - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); } } catch (cleanupError) { if (operationError === undefined) throw cleanupError; @@ -1424,7 +1421,7 @@ export class WorkflowStore { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return true; } @@ -1473,7 +1470,7 @@ export class WorkflowStore { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); return true; } @@ -1547,7 +1544,7 @@ export class WorkflowStore { } await rm(artifact.filePath); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } @@ -1563,40 +1560,17 @@ export class WorkflowStore { if (isMissing(error)) return null; throw error; } - const metadata = await handle.stat(); - const named = await lstat(this.statePath); - if (!metadata.isFile() - || metadata.nlink !== 1 - || metadata.size > this.maxStateBytes - || !named.isFile() - || named.isSymbolicLink() - || named.nlink !== 1 - || named.dev !== metadata.dev - || named.ino !== metadata.ino - || named.size !== metadata.size) { - throw workflowError( - "workflow state must be a bounded regular single-link file", - metadata.size > this.maxStateBytes - ? "workflow-state-too-large" - : "unsafe-workflow-state", - ); - } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); - const settled = await handle.stat(); - const settledNamed = await lstat(this.statePath); - if (!first.equals(second) - || !settled.isFile() - || settled.nlink !== 1 - || settled.size !== metadata.size - || settled.mtimeMs !== metadata.mtimeMs - || settled.ctimeMs !== metadata.ctimeMs - || !settledNamed.isFile() - || settledNamed.isSymbolicLink() - || settledNamed.dev !== metadata.dev - || settledNamed.ino !== metadata.ino) { - throw workflowError("workflow state changed during read", "unsafe-workflow-state"); - } + const message = "workflow state must be a bounded regular single-link file"; + const { bytes: first } = await readSingleLinkFile( + handle, + this.statePath, + { minBytes: 0, maxBytes: this.maxStateBytes }, + { + unsafe: () => workflowError(message, "unsafe-workflow-state"), + oversized: () => workflowError(message, "workflow-state-too-large"), + changed: () => workflowError("workflow state changed during read", "unsafe-workflow-state"), + }, + ); let parsed: unknown; try { parsed = JSON.parse(first.toString("utf8")) as unknown; @@ -1701,38 +1675,17 @@ export class WorkflowStore { } throw error; } - const metadata = await handle.stat(); - const named = await lstat(this.journalPath); - if (!metadata.isFile() - || metadata.nlink !== 1 - || metadata.size > this.maxJournalBytes - || !named.isFile() - || named.isSymbolicLink() - || named.nlink !== 1 - || named.dev !== metadata.dev - || named.ino !== metadata.ino - || named.size !== metadata.size) { - throw workflowError( - "workflow journal must be a bounded regular single-link file", - metadata.size > this.maxJournalBytes - ? "workflow-journal-too-large" - : "unsafe-workflow-state", - ); - } - const first = await readHandleBytes(handle, metadata.size); - const second = await readHandleBytes(handle, metadata.size); - const settled = await handle.stat(); - const settledNamed = await lstat(this.journalPath); - if (!first.equals(second) - || settled.size !== metadata.size - || settled.mtimeMs !== metadata.mtimeMs - || settled.ctimeMs !== metadata.ctimeMs - || !settledNamed.isFile() - || settledNamed.isSymbolicLink() - || settledNamed.dev !== metadata.dev - || settledNamed.ino !== metadata.ino) { - throw workflowError("workflow journal changed during read", "unsafe-workflow-state"); - } + const message = "workflow journal must be a bounded regular single-link file"; + const { bytes: first, metadata } = await readSingleLinkFile( + handle, + this.journalPath, + { minBytes: 0, maxBytes: this.maxJournalBytes }, + { + unsafe: () => workflowError(message, "unsafe-workflow-state"), + oversized: () => workflowError(message, "workflow-journal-too-large"), + changed: () => workflowError("workflow journal changed during read", "unsafe-workflow-state"), + }, + ); const finalNewline = first.lastIndexOf(0x0a); const tornTail = first.byteLength > 0 && finalNewline !== first.byteLength - 1; const completeByteLength = tornTail ? finalNewline + 1 : first.byteLength; @@ -1790,7 +1743,7 @@ export class WorkflowStore { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } @@ -1831,7 +1784,7 @@ export class WorkflowStore { } finally { await handle.close(); } - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } @@ -1912,7 +1865,7 @@ export class WorkflowStore { await rename(publicationPath, this.statePath); publicationExists = false; await this.assertPublishedState(bytes, temporaryIdentity); - await syncDirectory(this.workflowDirectory); + await flushDirectory(this.workflowDirectory); await assertDirectoryIdentity(this.workflowDirectory, directory); } finally { await handle?.close(); diff --git a/src/git/candidate-tree.ts b/src/git/candidate-tree.ts index c12e84e..d896392 100644 --- a/src/git/candidate-tree.ts +++ b/src/git/candidate-tree.ts @@ -3,12 +3,12 @@ import { tmpdir } from "node:os"; import path from "node:path"; import type { CandidateArtifact } from "../protocol/attempt-result.js"; import { redact } from "../runtime/redaction.js"; -import { RuntimeError } from "../util/errors.js"; import { globMatches } from "../util/glob.js"; -import { git, type GitResult } from "./git-exec.js"; +import { isMissing } from "../util/errors.js"; +import { gitChecked, reviewDiffArgs } from "./checked-git.js"; +import type { GitExecOptions } from "./git-exec.js"; import { computeChangedPathManifest, parseRawDiff, splitNul } from "./changed-path-manifest.js"; -const MAX_DIAGNOSTIC_LENGTH = 2_000; const MAX_REJECT_PATHS = 25; const BINARY_PATCH_PAYLOAD_MARKER = "[[BINARY_PATCH_PAYLOAD_OMITTED]]"; @@ -36,25 +36,12 @@ interface WorktreeInventory { ignoredPaths: string[]; } -function gitFailure(action: string, result: GitResult): RuntimeError { - const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} - async function checkedGit( cwd: string, args: string[], indexFile?: string, ): Promise { - const result = await git(cwd, args, indexFile); - if (result.truncated?.stdout === true || result.truncated?.stderr === true) { - throw new RuntimeError(`git ${args[0] ?? "command"} output exceeded the runtime bound`, { - command: args[0] ?? "command", - truncated: result.truncated, - }); - } - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; + return await gitChecked(cwd, args, indexFile === undefined ? undefined : { indexFile }); } function parsePorcelainPaths(output: string, kind: "changed" | "ignored"): string[] { @@ -117,14 +104,14 @@ async function advisoryLstatScan(worktreePath: string, changedPaths: string[]): try { return (await lstat(path.resolve(worktreePath, changedPath))).isSymbolicLink(); } catch (error) { - if ((error as NodeJS.ErrnoException).code === "ENOENT") return false; + if (isMissing(error)) return false; throw error; } })); return symlinkResults.some(Boolean); } -function sanitizeReviewPatch(patch: string): string { +export function sanitizeReviewPatch(patch: string): string { const sanitizedLines: string[] = []; let omittingBinaryPayload = false; for (const line of patch.split(/\r?\n/)) { @@ -142,6 +129,24 @@ function sanitizeReviewPatch(patch: string): string { return redact(sanitizedLines.join("\n")); } +/** + * The archived, human-reviewed patch of a candidate: attributes from the + * trusted base (see `reviewDiffArgs`), binary payloads omitted, secrets + * redacted. Every producer of `CandidateArtifact.patch` uses this. + */ +export async function candidateReviewPatch( + cwd: string, + baseCommitOid: string, + candidate: string, + options?: GitExecOptions, +): Promise { + return sanitizeReviewPatch(await gitChecked( + cwd, + reviewDiffArgs(baseCommitOid, candidate, ["--binary", "--full-index"]), + options, + )); +} + export async function freezeCandidate(args: FreezeCandidateArgs): Promise { const inventory = await inventoryWorktree(args.worktreePath); const outOfScope = inventory.changedPaths.filter(changedPath => @@ -219,15 +224,7 @@ export async function freezeCandidate(args: FreezeCandidateArgs): Promise { + const result = await git(cwd, args, options); + const command = gitSubcommand(args) ?? "command"; + if (result.exitCode !== 0) throw gitFailure(`git ${command}`, result); + if (!gitSucceeded(result)) { + throw new RuntimeError(`git ${command} output exceeded the runtime bound`, { + command, + truncated: result.truncated, + }); + } + return result.stdout; +} + +/** + * The diff a reviewer reads. Attributes come from the trusted base commit, so a + * Producer-committed `.gitattributes` cannot mark source as binary (`-diff`) + * and hide it; genuinely binary content is still detected from its bytes. + * Diff drivers never run on Producer bytes. + */ +export function reviewDiffArgs(base: string, head: string, extra: string[] = []): string[] { + return [ + `--attr-source=${base}`, + "diff", + "--no-color", + "--no-ext-diff", + "--no-textconv", + ...extra, + base, + head, + "--", + ]; +} + +export async function reviewDiff( + cwd: string, + base: string, + head: string, + options?: GitExecOptions, +): Promise { + return await gitChecked(cwd, reviewDiffArgs(base, head), options); +} diff --git a/src/git/git-exec.ts b/src/git/git-exec.ts index ea1ee78..7396d54 100644 --- a/src/git/git-exec.ts +++ b/src/git/git-exec.ts @@ -1,3 +1,4 @@ +import path from "node:path"; import { getPlatformServices } from "../platform/select-platform.js"; import type { PlatformServices, ResolvedExecutable } from "../platform/platform-services.js"; import { supervise } from "../platform/process-supervisor.js"; @@ -14,6 +15,140 @@ export interface GitExecOptions { env?: Record; stdin?: string; maxOutputBytes?: number; + /** + * Read the user's configured identity instead of the runtime's fixed one. + * Only `git var GIT_AUTHOR_IDENT|GIT_COMMITTER_IDENT` may use it: those read + * configuration and execute nothing, so user and system config are safe to + * consult for them and for nothing else. + */ + userIdentity?: boolean; +} + +const RUNTIME_IDENTITY = { + GIT_AUTHOR_NAME: "claude-architect", + GIT_AUTHOR_EMAIL: "runtime@claude-architect.invalid", + GIT_COMMITTER_NAME: "claude-architect", + GIT_COMMITTER_EMAIL: "runtime@claude-architect.invalid", + GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z", + GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z", +}; +/** The caller's own config selection, honored where user config is read. */ +function userConfigEnvironment(): Record { + const environment: Record = {}; + for (const key of ["GIT_CONFIG_GLOBAL", "GIT_CONFIG_SYSTEM", "GIT_CONFIG_NOSYSTEM"]) { + const value = process.env[key]; + if (value !== undefined) environment[key] = value; + } + return environment; +} + +const IDENTITY_VARIABLES = new Set(["GIT_AUTHOR_IDENT", "GIT_COMMITTER_IDENT"]); +const IDENT_LINE = /^([^<>\n]+) <([^<>\n]*)> (\d+ [+-]\d{4})$/; + +/** + * Commit environment for a commit that leaves the runtime (a promotion on the + * workflow branch): the user's own author and committer, dated now. Internal + * commits keep the fixed deterministic identity. `null` means Git has no usable + * identity. + */ +export async function userCommitEnvironment( + cwd: string, + run: typeof git = git, +): Promise | null> { + const environment: Record = {}; + for (const [role, variable] of [ + ["AUTHOR", "GIT_AUTHOR_IDENT"], + ["COMMITTER", "GIT_COMMITTER_IDENT"], + ] as const) { + const result = await run(cwd, ["var", variable], { userIdentity: true }); + const match = result.exitCode === 0 && result.truncated?.stdout !== true + ? IDENT_LINE.exec(result.stdout.trim()) + : null; + if (match === null) return null; + environment[`GIT_${role}_NAME`] = match[1]!.trim(); + environment[`GIT_${role}_EMAIL`] = match[2]!; + environment[`GIT_${role}_DATE`] = match[3]!; + } + return environment; +} + +/** + * The Git administrative directories of a linked worktree, captured by the + * trusted runtime before any Producer runs in it. + */ +export interface PinnedGitDirectory { + gitDir: string; + commonDir: string; +} + +/** + * A linked worktree finds its repository through the `.git` pointer file inside + * the checkout, and a Producer can rewrite that file to aim Git at a repository + * whose configuration runs commands. Once a worktree is pinned, every Git call + * whose cwd lies inside it names its administrative directories explicitly, so + * the pointer is never consulted again. Keys are resolved worktree paths. + */ +const pinnedWorktrees = new Map(); + +export function pinWorktreeGitDirectory(worktreePath: string, pin: PinnedGitDirectory): void { + pinnedWorktrees.set(path.resolve(worktreePath), { ...pin }); +} + +export function unpinWorktreeGitDirectory(worktreePath: string): void { + pinnedWorktrees.delete(path.resolve(worktreePath)); +} + +/** The pinned administrative directories of a managed worktree, if any. */ +export function pinnedWorktreeGitDirectory(worktreePath: string): PinnedGitDirectory | undefined { + const pin = pinnedWorktrees.get(path.resolve(worktreePath)); + return pin === undefined ? undefined : { ...pin }; +} + +function pinnedEnvironment(cwd: string): Record { + const resolved = path.resolve(cwd); + for (const [workTree, pin] of pinnedWorktrees) { + if (resolved === workTree || resolved.startsWith(`${workTree}${path.sep}`)) { + return { GIT_DIR: pin.gitDir, GIT_COMMON_DIR: pin.commonDir, GIT_WORK_TREE: workTree }; + } + } + return {}; +} + +/** + * Porcelain commands that honor `diff..textconv` or an external diff. + * A Producer can bind any path to a configured driver through `.gitattributes`, + * so these never run a driver on the runtime's behalf. + */ +const DRIVER_HONORING_COMMANDS = new Set(["diff", "log", "show", "format-patch", "blame"]); + +const DEFAULT_MAX_OUTPUT_BYTES = 8_000_000; +/** + * Index listings scale with the repository (~60 bytes per tracked file), so + * the default bound truncated them past ~150k files and every caller failed + * closed on large monorepos. Truncation still fails closed above this bound. + */ +const INDEX_LISTING_MAX_BYTES = 512 * 1024 * 1024; + +/** Index of the Git subcommand, past global options (`-c`/`-C` take a value). */ +function subcommandIndex(args: readonly string[]): number { + let index = 0; + while (index < args.length && args[index]!.startsWith("-")) { + index += args[index] === "-c" || args[index] === "-C" ? 2 : 1; + } + return index; +} + +export function gitSubcommand(args: readonly string[]): string | undefined { + return args[subcommandIndex(args)]; +} + +function withoutDiffDrivers(args: string[]): string[] { + const index = subcommandIndex(args); + const command = args[index]; + if (command === undefined || !DRIVER_HONORING_COMMANDS.has(command)) return args; + const flags = command === "blame" ? ["--no-textconv"] : ["--no-textconv", "--no-ext-diff"]; + const missing = flags.filter(flag => !args.includes(flag)); + return [...args.slice(0, index + 1), ...missing, ...args.slice(index + 1)]; } const FILTER_KEY_PATTERN = "^filter\\..*\\.(clean|smudge|process|required)$"; @@ -117,25 +252,32 @@ export async function git( const options = typeof indexFileOrOptions === "string" ? { indexFile: indexFileOrOptions } : indexFileOrOptions ?? {}; - const maxOutputBytes = options.maxOutputBytes ?? 8_000_000; + if (options.userIdentity === true + && !(args.length === 2 && args[0] === "var" && IDENTITY_VARIABLES.has(args[1]!))) { + return { + stdout: "", + stderr: "userIdentity is limited to git var of a commit identity\n", + exitCode: 2, + }; + } + const maxOutputBytes = options.maxOutputBytes + ?? (gitSubcommand(args) === "ls-files" ? INDEX_LISTING_MAX_BYTES : DEFAULT_MAX_OUTPUT_BYTES); const env: Record = { PATH: process.env.PATH ?? "", - GIT_CONFIG_GLOBAL: "/dev/null", - GIT_CONFIG_SYSTEM: "/dev/null", - GIT_CONFIG_NOSYSTEM: "1", + ...(options.userIdentity === true ? userConfigEnvironment() : { + GIT_CONFIG_GLOBAL: nullDevice, + GIT_CONFIG_SYSTEM: nullDevice, + GIT_CONFIG_NOSYSTEM: "1", + }), GIT_ATTR_NOSYSTEM: "1", GIT_OPTIONAL_LOCKS: "0", GIT_TERMINAL_PROMPT: "0", ...(process.env.HOME ? { HOME: process.env.HOME } : {}), ...(process.env.XDG_CONFIG_HOME ? { XDG_CONFIG_HOME: process.env.XDG_CONFIG_HOME } : {}), - GIT_AUTHOR_NAME: "claude-architect", - GIT_AUTHOR_EMAIL: "runtime@claude-architect.invalid", - GIT_COMMITTER_NAME: "claude-architect", - GIT_COMMITTER_EMAIL: "runtime@claude-architect.invalid", - GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z", - GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z", + ...(options.userIdentity === true ? {} : RUNTIME_IDENTITY), ...(options.indexFile ? { GIT_INDEX_FILE: options.indexFile } : {}), ...options.env, + ...pinnedEnvironment(cwd), }; const hardeningArgs = [ "-c", `core.hooksPath=${nullDevice}`, @@ -188,7 +330,14 @@ export async function git( if (neutralizations.error !== undefined) return neutralizations.error; const exit = await supervise(platformServices, { executable, - args: [...hardeningArgs, ...(neutralizations.args ?? []), ...args], + args: [ + ...hardeningArgs, + ...(neutralizations.args ?? []), + // Never let Git guess `user@host` from the machine: an identity the user + // did not configure must surface as missing. + ...(options.userIdentity === true ? ["-c", "user.useConfigOnly=true"] : []), + ...withoutDiffDrivers(args), + ], cwd, env, ...(options.stdin === undefined ? {} : { stdin: options.stdin }), diff --git a/src/git/repo-preconditions.ts b/src/git/repo-preconditions.ts index c97ef02..512ae5d 100644 --- a/src/git/repo-preconditions.ts +++ b/src/git/repo-preconditions.ts @@ -1,8 +1,9 @@ import { access, lstat, opendir, readlink, realpath } from "node:fs/promises"; +import { gitSucceeded as succeeded } from "./checked-git.js"; import path from "node:path"; import { getPlatformServices } from "../platform/select-platform.js"; import { canonicalizeForScope } from "../platform/windows-platform-services.js"; -import { git, type GitResult } from "./git-exec.js"; +import { git } from "./git-exec.js"; import { gitPathOutput } from "./git-output.js"; export interface PreconditionOptions { @@ -33,9 +34,6 @@ const MAX_NESTED_REPOSITORY_SCAN_ENTRIES = 10_000; export type InProgressOperationResult = "clear" | "in-progress" | "scan-failed"; -function succeeded(result: GitResult): boolean { - return result.exitCode === 0; -} async function exists(filePath: string): Promise { try { diff --git a/src/git/worktree-registration.ts b/src/git/worktree-registration.ts index 6aca821..6ae973a 100644 --- a/src/git/worktree-registration.ts +++ b/src/git/worktree-registration.ts @@ -1,6 +1,6 @@ import { realpath } from "node:fs/promises"; import path from "node:path"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; import { platformPathsEqual } from "../util/platform-path.js"; export async function canonicalizeWorktreePath( @@ -14,7 +14,7 @@ export async function canonicalizeWorktreePath( try { return await realpath(resolved); } catch (error) { - if (!allowMissing || (error as NodeJS.ErrnoException).code !== "ENOENT") throw error; + if (!allowMissing || !isMissing(error)) throw error; } const missingSegments: string[] = []; let ancestor = resolved; @@ -28,7 +28,7 @@ export async function canonicalizeWorktreePath( try { return path.join(await realpath(ancestor), ...missingSegments); } catch (error) { - if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; + if (!isMissing(error)) throw error; } } } @@ -55,7 +55,7 @@ export async function findWorktreeRegistration( allowMissing, ); } catch (error) { - if ((error as NodeJS.ErrnoException).code === "ENOENT") continue; + if (isMissing(error)) continue; throw error; } if (platformPathsEqual(reported, expected)) return index; diff --git a/src/integrate/controlled-integrator.ts b/src/integrate/controlled-integrator.ts index 080ff05..f381716 100644 --- a/src/integrate/controlled-integrator.ts +++ b/src/integrate/controlled-integrator.ts @@ -1,4 +1,5 @@ -import { git, type GitResult } from "../git/git-exec.js"; +import { git } from "../git/git-exec.js"; +import { gitSucceeded as succeeded } from "../git/checked-git.js"; import { checkPreconditions } from "../git/repo-preconditions.js"; import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; import { PlatformSafety } from "../platform/platform-safety.js"; @@ -33,9 +34,6 @@ export interface IntegrationResult { const CANDIDATE_REF = /^refs\/claude-architect\/candidates\/[A-Za-z0-9][A-Za-z0-9._-]*$/; const OBJECT_ID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; -function succeeded(result: GitResult): boolean { - return result.exitCode === 0; -} function aborted(detail: string): IntegrationResult { return { integration: "aborted", detail }; @@ -198,19 +196,18 @@ export async function applyCandidateTree(args: ApplyCandidateTreeArgs): Promise< return await executeWithLock(args.borrowedCheckoutLock, "borrowed"); } - let terminalResult: IntegrationResult | null = null; - try { - return await safety.withCheckoutLease(args.repoRoot, async (lock) => { - terminalResult = await executeWithLock(lock, "owned"); - return terminalResult; - }); - } catch (error) { - if (terminalResult !== null) { - (terminalResult as IntegrationResult).detail = `${(terminalResult as IntegrationResult).detail}; checkout lock release failed`; - return terminalResult; - } - throw error; - } + return await safety.withCheckoutLease( + args.repoRoot, + lock => executeWithLock(lock, "owned"), + { + // The terminal result already happened; a failed release must stay + // visible without erasing it. + onReleaseError: (_releaseError, result) => ({ + ...result, + detail: `${result.detail}; checkout lock release failed`, + }), + }, + ); } diff --git a/src/mcp/allowlist-sufficiency.ts b/src/mcp/allowlist-sufficiency.ts index 086c514..12dcee9 100644 --- a/src/mcp/allowlist-sufficiency.ts +++ b/src/mcp/allowlist-sufficiency.ts @@ -1,5 +1,6 @@ import { readFile } from "node:fs/promises"; import path from "node:path"; +import { gitSucceeded } from "../git/checked-git.js"; import { git as runGit } from "../git/git-exec.js"; import { gitNulRecords } from "../git/git-output.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; @@ -78,7 +79,8 @@ export async function checkAllowlistSufficiency( deps: AllowlistSufficiencyDependencies = {}, ): Promise { const listed = await (deps.git ?? runGit)(repoRoot, ["ls-files", "-z"]); - if (listed.exitCode !== 0) return { allowlisted: 0, gaps: [], omitted: 0 }; + // A truncated listing would silently hide gaps; treat it like a failure. + if (!gitSucceeded(listed)) return { allowlisted: 0, gaps: [], omitted: 0 }; const tracked = new Set( gitNulRecords(listed.stdout, "Git tracked-file list").filter(entry => entry.length > 0), ); diff --git a/src/mcp/decision-authority.ts b/src/mcp/decision-authority.ts index c2974b8..71170f6 100644 --- a/src/mcp/decision-authority.ts +++ b/src/mcp/decision-authority.ts @@ -40,35 +40,3 @@ export function decisionAuthority( ); return "human"; } - -export interface AutonomousEligibility { - eligible: boolean; - /** Why autonomy was refused, for the caller's diagnostic. Empty if eligible. */ - reasons: string[]; -} - -/** - * Decide whether this candidate may be accepted without a person. - * - * Every condition is positive and objective. An unreadable archive refuses - * rather than falling through to a prompt: under autonomous policy a client may - * not advertise elicitation at all, so a silent downgrade would dead-end the run - * with no path forward. Refusing here names the problem instead. - */ -export function autonomousEligibility( - authority: DecisionAuthority, - advisory: { warnings: string[]; verifiedClean: boolean; unreadable: boolean }, -): AutonomousEligibility { - if (authority !== "autonomous") { - return { eligible: false, reasons: [`decision authority is "${authority}"`] }; - } - const reasons: string[] = []; - if (advisory.unreadable) reasons.push("the candidate archive could not be read"); - else { - if (!advisory.verifiedClean) { - reasons.push("the candidate is not an independently verified result"); - } - reasons.push(...advisory.warnings); - } - return { eligible: reasons.length === 0, reasons }; -} diff --git a/src/mcp/doctor.ts b/src/mcp/doctor.ts index eb18059..86c8c48 100644 --- a/src/mcp/doctor.ts +++ b/src/mcp/doctor.ts @@ -35,10 +35,10 @@ import { probeCowSupport } from "../verify/dependency-link.js"; import { checkLiveBundle, type LiveBundleStatus } from "./live-bundle.js"; import { CHECKOUT_LOCK_NAME_PATTERN } from "../platform/lock-ownership.js"; +import { errorCode } from "../util/errors.js"; const POSIX_HOME_PATH = /\/(?:Users|home)\/[^/\\\s"']+(?:\/[^/\\\s"']+)*/g; const WINDOWS_HOME_PATH = /[A-Za-z]:\\Users\\[^/\\\s"']+(?:\\[^/\\\s"']+)*/gi; -const CHECKOUT_LOCK_NAME = CHECKOUT_LOCK_NAME_PATTERN; const MAX_CHECKOUT_LOCK_BYTES = 4_096; const MAX_AUTOPILOT_OWNER_BYTES = 1_024; const MAX_AUTOPILOT_REGISTRATION_BYTES = 32_768; @@ -53,8 +53,6 @@ const AUTOPILOT_ISSUE_ORDER = [ "autopilot-worktree-orphaned", "autopilot-branch-mismatch", "autopilot-promotion-incomplete", - "autopilot-remote-recovery-required", - "autopilot-pr-recovery-required", "autopilot-state-malformed", "autopilot-scan-truncated", ] as const; @@ -131,8 +129,14 @@ function gitVersion(stdout: string): string | null { return /^git version ([^\s]+)(?:\s|$)/u.exec(stdout.trim())?.[1] ?? null; } -function errorCode(error: unknown): string | undefined { - return (error as NodeJS.ErrnoException).code; +/** + * Review diffs read attributes from the trusted base with `--attr-source`, + * which Git added in 2.40. An older Git fails those diffs closed, so say why. + */ +function gitMeetsFloor(version: string): boolean { + const [major, minor] = version.split(".").map(part => Number.parseInt(part, 10)); + if (!Number.isInteger(major) || !Number.isInteger(minor)) return false; + return major! > 2 || (major === 2 && minor! >= 40); } function defaultIsProcessAlive(pid: number): boolean { @@ -198,7 +202,7 @@ async function checkoutLockIssues( const issues = new Set(); for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const match = CHECKOUT_LOCK_NAME.exec(entry.name); + const match = CHECKOUT_LOCK_NAME_PATTERN.exec(entry.name); if (match === null || match[1] === CLEANUP_JOURNAL_LOCK_KEY) continue; if (!entry.isFile() || entry.isSymbolicLink()) { issues.add("checkout-lock-malformed"); @@ -500,7 +504,7 @@ function branchMatchesState( && registration.baseCommitOid === state.baseCommitOid && registration.branchRef === state.workflowRef && registration.worktreePath === state.worktreePath - && registration.branch === state.shipping.branch; + && registration.branch === state.branch; } function expectedHead(state: AutopilotWorkflowState | null, registration: WorkflowBranchIdentity) { @@ -637,13 +641,6 @@ async function autopilotIssues( ); if (bootstrapStatus !== leaseStatus) issues.add("autopilot-state-malformed"); } - if (leaseStatus === "dead" && state.phase === "pushing") { - issues.add("autopilot-remote-recovery-required"); - } - if (leaseStatus === "dead" - && (state.phase === "creating-draft-pr" || state.phase === "marking-ready")) { - issues.add("autopilot-pr-recovery-required"); - } let worktreeExists = false; try { @@ -747,6 +744,7 @@ export async function doctor(deps: DoctorDependencies = {}): Promise = { + weakens_verification: "an independent screen (Jev) flagged the candidate as weakening verification", + security_sensitive: "an independent screen (Jev) flagged security-sensitive changes in the candidate", +}; + +export type JevScreenResult = + | { status: "disabled" } + | { status: "unavailable"; reason: string } + | { status: "clear" } + | { status: "concern"; reasons: string[] }; + +export interface JevScreenOptions { + env?: NodeJS.ProcessEnv; + fetch?: typeof globalThis.fetch; +} + +export type JevScreen = (candidate: CandidateArtifact) => Promise; + +export async function jevScreen( + candidate: CandidateArtifact, + options: JevScreenOptions = {}, +): Promise { + const env = options.env ?? process.env; + if (env[JEV_ENV] !== "on") return { status: "disabled" }; + const key = env[JEV_KEY_ENV]; + if (key === undefined || key === "") { + return { status: "unavailable", reason: `${JEV_KEY_ENV} is not set` }; + } + const patch = redact(candidate.patch); + const state = { + changedPaths: candidate.changedPaths.slice(0, MAX_PATHS).map(change => change.path), + patch: patch.slice(0, MAX_PATCH_CHARS), + patchTruncated: patch.length > MAX_PATCH_CHARS, + }; + let body: unknown; + try { + // One attempt: a retry here would only delay a decision the deterministic + // gates have already made, and an outage must never block it. + const response = await (options.fetch ?? globalThis.fetch)(JEV_ENDPOINT, { + method: "POST", + headers: { authorization: `Bearer ${key}`, "content-type": "application/json" }, + body: JSON.stringify({ model: "jev-latest", state, questions: QUESTIONS }), + signal: AbortSignal.timeout(JEV_TIMEOUT_MS), + }); + if (!response.ok) return { status: "unavailable", reason: `HTTP ${response.status}` }; + body = await response.json(); + } catch (error) { + return { status: "unavailable", reason: error instanceof Error ? error.name : "request failed" }; + } + const answers = (body as { answers?: Record } | null)?.answers; + const reasons: string[] = []; + for (const id of Object.keys(QUESTIONS) as (keyof typeof QUESTIONS)[]) { + const noul = answers?.[id]?.noul; + if (typeof noul !== "number" || !Number.isFinite(noul) || noul < 0 || noul > 1) { + return { status: "unavailable", reason: "malformed answer" }; + } + if (noul >= CONCERN_THRESHOLD) reasons.push(`${CONCERN_TEXT[id]} (p=${noul.toFixed(2)})`); + } + return reasons.length === 0 ? { status: "clear" } : { status: "concern", reasons }; +} diff --git a/src/mcp/server.ts b/src/mcp/server.ts index 0b7ba0c..e9b2203 100644 --- a/src/mcp/server.ts +++ b/src/mcp/server.ts @@ -1,4 +1,5 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { isManagedWorktreeNamespace } from "../runtime/managed-worktree-root.js"; import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; import type { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js"; @@ -28,16 +29,18 @@ import { type ToolDependencies, } from "./tools.js"; import { - autonomousEligibility, decisionAuthority, DECISION_AUTHORITY_ENV, type DecisionAuthority, } from "./decision-authority.js"; import { runDecision } from "../runtime/run-decision.js"; -import { recoverStaleRuns, type WorktreeSweepIssue } from "../runtime/recovery-manager.js"; +import { jevScreen, type JevScreen } from "./jev-screen.js"; +import { recoverStaleRuns } from "../runtime/recovery-manager.js"; +import type { WorktreeSweepIssue } from "../runtime/recovery-shared.js"; import { pruneRuns } from "../runtime/artifact-store.js"; import { boundedRedactedDiagnostic, redact } from "../runtime/redaction.js"; import { RuntimeError } from "../util/errors.js"; +import { logger } from "../util/logger.js"; import { getPlatformServices } from "../platform/select-platform.js"; import { platformPathsEqual } from "../util/platform-path.js"; import { git } from "../git/git-exec.js"; @@ -288,6 +291,8 @@ export type ServerDependencies = ToolDependencies & DoctorDependencies & GitRead transport?: Transport; /** Test seam for the configured decision authority. */ decisionAuthority?: () => DecisionAuthority; + /** Test seam for the optional independent candidate screen. */ + jevScreen?: JevScreen; }; /** @@ -463,7 +468,8 @@ export async function createServer( ); const unattributedWorktrees = unresolvedSweepIssues.filter(issue => issue.repositoryIdentity === undefined - && path.basename(path.dirname(issue.worktreePath)) === "worktrees", + && (path.basename(path.dirname(issue.worktreePath)) === "worktrees" + || isManagedWorktreeNamespace(path.dirname(issue.worktreePath))), ); if (attributed.length === 0 && unattributedWorktrees.length === 0) return; const canonical = await (dependencies.ps ?? getPlatformServices()) @@ -592,11 +598,13 @@ export async function createServer( "autopilotStart", { title: "Start an autopilot workflow", - description: "Validate an Autopilot Spec and run its verified workflow.", + description: "Validate an Autopilot Spec and run its verified workflow to a " + + "final-reviewed local branch. It never pushes or opens a pull request; hand the " + + "branch to the No Mistakes delivery gate.", inputSchema: autopilotStartInputSchema, outputSchema: autopilotOutput, // The most consequential tool on the surface: runs Producers, creates - // branches and worktrees, promotes commits, pushes, and opens a PR. + // branches and worktrees, and promotes commits onto the workflow branch. annotations: { destructiveHint: true, idempotentHint: false, readOnlyHint: false }, }, async ({ checkoutPath, spec, protocolVersion }, extra) => { @@ -635,7 +643,7 @@ export async function createServer( description: "Resume a recoverable autopilot workflow from durable state.", inputSchema: autopilotWorkflowInputSchema, outputSchema: autopilotOutput, - // Continues the same shipping workflow from durable state. + // Continues the same workflow from durable state. annotations: { destructiveHint: true, idempotentHint: false, readOnlyHint: false }, }, async ({ checkoutPath, workflowId, protocolVersion }, extra) => { @@ -709,10 +717,24 @@ export async function createServer( // Eligibility says the runtime proved everything it can prove about // the candidate; it says nothing about the verdict. The policy may // only accept, so every other verdict is a human override. + let reasons = verdict.state === "accepted" ? advisory.warnings : verdict.reasons; if (verdict.state === "accepted" && effectiveDecision === "accepted") { - return "policy-autonomous"; + // The optional screen may only withdraw autonomy, never grant it. + const candidate = snapshot.result?.candidate; + if (candidate == null) { + throw new RuntimeError("accepted verdict without a frozen candidate"); + } + const screen = await (dependencies.jevScreen ?? jevScreen)(candidate); + if (screen.status === "unavailable") { + logger.warn("independent candidate screen unavailable; deterministic verdict stands", { + event: "jev-screen-unavailable", + runId: effectiveRunId, + reason: screen.reason, + }); + } + if (screen.status !== "concern") return "policy-autonomous"; + reasons = screen.reasons; } - const reasons = verdict.state === "accepted" ? advisory.warnings : verdict.reasons; const confirmed = await confirmWithHuman( server, effectiveRunId, diff --git a/src/mcp/tools.ts b/src/mcp/tools.ts index aa3f3a9..cc6872b 100644 --- a/src/mcp/tools.ts +++ b/src/mcp/tools.ts @@ -1,4 +1,3 @@ -import { createHash } from "node:crypto"; import { AutopilotController, AutopilotControllerError, @@ -26,10 +25,7 @@ import { type CandidateDecisionV2, type HumanCandidateDecisionV2, } from "../protocol/candidate-decision.js"; -import { - type PipelineGateCleared, - parsePipelineGateCleared, -} from "../protocol/pipeline-gate-cleared.js"; +import type { PipelineGateCleared } from "../protocol/pipeline-gate-cleared.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { checkVersionCompat } from "../protocol/schema-loader.js"; import { specSha256 } from "../protocol/spec-hash.js"; @@ -56,6 +52,7 @@ import { import type { RunManifest } from "../runtime/run-manifest.js"; import { readRunDecisionSnapshot, + runDecision, type RunDecisionSnapshot, } from "../runtime/run-decision.js"; import { PlatformSafety } from "../platform/platform-safety.js"; @@ -64,7 +61,6 @@ import { NestedDelegationError, RuntimeError } from "../util/errors.js"; import { logger } from "../util/logger.js"; import { AcceptanceVerifier } from "../verify/acceptance-verifier.js"; import { runAdvisorStage } from "../pipeline/advisor-stage.js"; -import { GitHubCliAdapter } from "../ship/github-cli-adapter.js"; import { allowlistSufficiencyDiagnostic, checkAllowlistSufficiency, @@ -229,17 +225,6 @@ function runtimeError(message: string, error: string): RuntimeError { return new RuntimeError(message, { toolError: error }); } -class LifecycleLockReleaseError extends AggregateError { - constructor(readonly primaryError: unknown, releaseError: unknown) { - const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); - super( - [primaryError, releaseError], - `${primaryMessage}; checkout lock release failed`, - ); - this.name = "LifecycleLockReleaseError"; - } -} - function errorResult(error: unknown): ToolErrorResult { const classified = error instanceof AggregateError && error.errors.length > 0 ? error.errors[0] @@ -341,7 +326,6 @@ function createAutopilotController(deps: ToolDependencies): Pick< branchManager, workflowStore, }), - hostingAdapter: new GitHubCliAdapter(), ...(deps.abortSignal === undefined ? {} : { abortSignal: deps.abortSignal }), emit: (event: AutopilotControllerEvent) => deps.onProgress?.(event), }); @@ -988,81 +972,24 @@ export async function handleReviewCandidate( * one at exactly the moment that matters. */ export interface DecisionAdvisory { - /** Human-readable cautions to show whoever confirms the decision. */ + /** Why a person must decide; empty when the runtime proved everything it can. */ warnings: string[]; - /** - * The run is an independently verified candidate carrying no failure, and - * either (a) a durable pipeline-gate clearance bound to its archived - * candidate commit, or (b) a recorded `plainDelegate` provenance marker with - * no pipeline evidence — a plain `delegate` run never enters the pipeline - * gate, so there is nothing to clear or refuse, and its independent - * verification result is the only signal there is. An archive carrying - * neither the marker nor gate evidence proves nothing about its provenance - * and requires a human. This is deliberately not "warnings.length === 0": partial or - * malformed pipeline evidence (a refused gate, a mid-review salvage, a - * clearance record that doesn't match the archived commit) still refuses, - * because that IS positive evidence something did not go cleanly. - */ + /** `verdictFor` would accept this candidate under the autonomous authority. */ verifiedClean: boolean; /** * The archive could not be read, so nothing about this candidate is known. - * Distinct from "verified false" — the difference decides whether autonomous - * acceptance may proceed or must refuse. + * Distinct from "verified false" — an unreadable archive refuses rather than + * presenting an unknown candidate as a clean one. */ unreadable: boolean; } +/** The advisory is the acceptance rule's own verdict; there is no second rule. */ function decisionAdvisoryForRun(run: ArchivedRun): DecisionAdvisory { - const refused = run.result.evidence.pipelineGateRefused; - const incomplete = run.result.evidence.pipelineReviewIncomplete; - const rawCleared = run.result.evidence.pipelineGateCleared; - const warnings: string[] = []; - if (isRecord(refused) && Array.isArray(refused.reasons)) { - warnings.push( - `the pipeline gate did NOT clear this candidate: ${ - refused.reasons.filter(r => typeof r === "string").join("; ")}`, - ); - } - if (isRecord(incomplete) && typeof incomplete.reason === "string") { - warnings.push(`the pipeline could not complete its own review: ${incomplete.reason}`); - } - // A plain `delegate` run records `plainDelegate: true` in its archived - // evidence at the terminal-archive funnel; pipeline-managed attempts never - // do. Autonomy keys on that positive marker plus the absence of every - // pipeline evidence key — an archive carrying neither the marker nor gate - // evidence proves nothing about its provenance and requires a human. - const plainDelegate = run.result.evidence.plainDelegate === true - && refused === undefined && incomplete === undefined && rawCleared === undefined; - let gateCleared = false; - if (plainDelegate) { - gateCleared = true; - } else if (rawCleared === undefined) { - if (warnings.length === 0) { - warnings.push("the pipeline gate clearance record is missing"); - } - } else { - try { - const cleared = parsePipelineGateCleared(rawCleared); - if (cleared.requiresHumanDecision === true) { - warnings.push("the pipeline gate clearance record requires a human decision"); - } else if (cleared.candidateCommitOid !== run.result.candidate?.candidateCommitOid) { - warnings.push( - "the pipeline gate clearance record does not match the archived candidate commit", - ); - } else { - gateCleared = true; - } - } catch { - warnings.push("the pipeline gate clearance record is malformed"); - } - } - return { - warnings, - verifiedClean: run.result.status === "verified-candidate" - && run.result.failure === null - && gateCleared, - unreadable: false, - }; + const verdict = runDecision.verdictFor(run.snapshot, "autonomous"); + return verdict.state === "accepted" + ? { warnings: [], verifiedClean: true, unreadable: false } + : { warnings: verdict.reasons, verifiedClean: false, unreadable: false }; } export async function readDecisionAdvisory( @@ -1190,12 +1117,10 @@ export async function handleIntegrateCandidate( if (!(INTEGRABLE_DECISION_AUTHORITIES as readonly string[]).includes(decision.authority)) { return { integration: "aborted", detail: "accepted-decision-not-confirmed" }; } - // An acceptance is a judgement about one specific candidate. When the - // record names the artifact it was made about, refuse to spend it on a - // different one. Records written before provenance existed carry no hash; - // those fall through to the hash check inside applyCandidateTree. - if (decision.candidateManifestHash != null - && decision.candidateManifestHash !== expectedArtifactHash) { + // An acceptance is a judgement about one specific candidate, so it is + // spent only on the artifact it names. A legacy record that names none + // says nothing about which bytes were accepted and is refused too. + if (decision.candidateManifestHash !== expectedArtifactHash) { return { integration: "aborted", detail: "decision-artifact-mismatch" }; } return (deps.applyCandidateTree ?? applyTree)({ diff --git a/src/pipeline/advisor-stage.ts b/src/pipeline/advisor-stage.ts index e4acd71..3ab1c8f 100644 --- a/src/pipeline/advisor-stage.ts +++ b/src/pipeline/advisor-stage.ts @@ -1,7 +1,6 @@ import { advisorReportHash, canonicalArtifactHash, - eligibilityInputFromArtifacts, evaluateAutopilotEligibility, pipelineResultHash, type AutopilotEligibilityRecord, @@ -236,12 +235,12 @@ export async function runAdvisorStage(args: RunAdvisorStageArgs): Promise { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} export function privateObjectReadOptions(access: LinkedWorktreeGitAccess): { env: { GIT_ALTERNATE_OBJECT_DIRECTORIES: string }; diff --git a/src/pipeline/candidate-verifier.ts b/src/pipeline/candidate-verifier.ts index 456d724..4dfe9e0 100644 --- a/src/pipeline/candidate-verifier.ts +++ b/src/pipeline/candidate-verifier.ts @@ -1,4 +1,6 @@ -import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; +import { git } from "../git/git-exec.js"; +import { gitChecked as checkedGit, reviewDiff } from "../git/checked-git.js"; +import { candidateReviewPatch } from "../git/candidate-tree.js"; import { RuntimeError } from "../util/errors.js"; import { globMatches } from "../util/glob.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; @@ -13,7 +15,7 @@ import { recomputeManifest, } from "../verify/structural-verifier.js"; import { AcceptanceVerifier } from "../verify/acceptance-verifier.js"; -import type { VerificationReport } from "./report-types.js"; +import { isTestPath } from "../verify/verification-inputs.js"; export interface WeakenedTestEvidence { testsDeleted: number; @@ -21,20 +23,26 @@ export interface WeakenedTestEvidence { authorizedTestDeletions: string[]; } -function gitFailure(action: string, result: GitResult): RuntimeError { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit( - cwd: string, - args: string[], - options?: GitExecOptions, -): Promise { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} + +/** + * Added lines that disable a test, per ecosystem: JS/TS (it/test/describe + * .skip/.todo, xit, xdescribe), Python (pytest/unittest skip markers), Go + * (t.Skip), Rust (#[ignore]), JVM (@Disabled/@Ignore), .NET ([Ignore], Skip =), + * and RSpec (skip/pending). Anything else is out of reach of a line scan, which + * is why verification inputs a candidate touches also route to a person. + */ +const SKIP_MARKERS: readonly RegExp[] = [ + /\b(?:it|test|describe|context|suite)\.(?:skip|todo)\(/u, + /\bx(?:it|describe|test|context)\(/u, + /@(?:pytest\.mark\.(?:skip|skipif|xfail)|unittest\.(?:skip|skipIf|skipUnless|expectedFailure))\b/u, + /\b(?:pytest|self)\.skip(?:Test)?\(/u, + /\bt\.Skip(?:Now|f)?\(/u, + /#\[ignore\b/u, + /@(?:Disabled|Ignore)\b/u, + /\[Ignore\b|\bSkip\s*=\s*"/u, + /^\s*(?:skip|pending)(?:\s*\(|\s+["'])/u, +]; export function analyzeWeakenedTests( diff: string, @@ -44,38 +52,31 @@ export function analyzeWeakenedTests( let testsDeleted = 0; let testsSkipped = 0; const authorizedTestDeletions: string[] = []; + const recordDeletion = (deletedPath: string): void => { + if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { + authorizedTestDeletions.push(deletedPath); + } else { + testsDeleted++; + } + }; let currentFileIsTest = false; let currentPath: string | null = null; for (const line of diff.split("\n")) { - if (deletedPaths === undefined && /^deleted file mode/.test(line)) { - if (currentFileIsTest && currentPath !== null) { - const deletedPath = currentPath; - if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } - } + if (line.startsWith("diff --git ")) { + currentPath = /^diff --git a\/(\S+) b\/\S+$/u.exec(line)?.[1] ?? null; + currentFileIsTest = currentPath !== null ? isTestPath(currentPath) : /test|spec/u.test(line); + continue; } - const diffHeader = /^diff --git a\/(\S+) b\/\S+$/.exec(line); - if (diffHeader !== null) { - currentPath = diffHeader[1] ?? null; - currentFileIsTest = currentPath !== null - && /(^|\/)tests?\/|\.test\.|\.spec\./.test(currentPath); - } else if (/^diff --git /.test(line)) { - currentPath = null; - currentFileIsTest = /(^|\/)tests?\/|\.test\.|\.spec\./.test(line); + if (!currentFileIsTest) continue; + if (deletedPaths === undefined && line.startsWith("deleted file mode") && currentPath !== null) { + recordDeletion(currentPath); + } else if (line.startsWith("+") && !line.startsWith("+++")) { + const added = line.slice(1); + if (SKIP_MARKERS.some(marker => marker.test(added))) testsSkipped++; } - if (currentFileIsTest && /^\+.*\b(it|test|describe)\.(skip|todo)\(/.test(line)) testsSkipped++; - if (currentFileIsTest && /^\+.*\bxit\(|^\+.*\bxdescribe\(/.test(line)) testsSkipped++; } for (const deletedPath of deletedPaths ?? []) { - if (!/(^|\/)tests?\/|\.test\.|\.spec\./.test(deletedPath)) continue; - if (allowedTestDeletions.some(pattern => globMatches(pattern, deletedPath))) { - authorizedTestDeletions.push(deletedPath); - } else { - testsDeleted++; - } + if (isTestPath(deletedPath)) recordDeletion(deletedPath); } return { testsDeleted, testsSkipped, authorizedTestDeletions }; } @@ -112,12 +113,11 @@ export function parseDeletedPaths(nameStatus: string): string[] { return deletedPaths; } -async function candidateArtifact(args: { +export async function candidateArtifact(args: { worktreePath: string; baselineCommit: string; candidateCommit: string; anchorRef: string; - diffText: string; }): Promise { const artifact: CandidateArtifact = { baseCommitOid: args.baselineCommit, @@ -129,7 +129,11 @@ async function candidateArtifact(args: { anchorRef: args.anchorRef, manifestHash: "", changedPaths: [], - patch: args.diffText, + patch: await candidateReviewPatch( + args.worktreePath, + args.baselineCommit, + args.candidateCommit, + ), }; const canonical = await recomputeManifest({ worktreePath: args.worktreePath, @@ -176,13 +180,8 @@ export async function verifyCandidate(args: { commit: args.candidateCommit, cleanupFailureMessage: "pipeline verification worktree could not be cleaned up", run: async worktreePath => { - const [diffText, , nameStatus, status, ancestry] = await Promise.all([ - checkedGit(worktreePath, ["diff", `${args.baselineCommit}..${args.candidateCommit}`]), - checkedGit(worktreePath, [ - "diff", - "--name-only", - `${args.baselineCommit}..${args.candidateCommit}`, - ]), + const [diffText, nameStatus, status, ancestry] = await Promise.all([ + reviewDiff(worktreePath, args.baselineCommit, args.candidateCommit), checkedGit(worktreePath, [ "diff", "--name-status", @@ -203,7 +202,6 @@ export async function verifyCandidate(args: { baselineCommit: args.baselineCommit, candidateCommit: args.candidateCommit, anchorRef: args.attempt.candidate?.anchorRef ?? "", - diffText, }); const verifier = new AcceptanceVerifier({ mode: "composed-slice" }); const acceptance = await verifier.verify({ diff --git a/src/pipeline/gates.ts b/src/pipeline/gates.ts index e094860..9ce34e1 100644 --- a/src/pipeline/gates.ts +++ b/src/pipeline/gates.ts @@ -33,14 +33,15 @@ export function evaluateGates(input: GateInput): GateResult { const dispositionsById = new Map(input.dispositions.map((d) => [d.findingId, d])); for (const finding of input.findings) { - if (finding.severity === "nit") continue; // nits never block + // Minors and nits never block (role-prompts rubric). An approving final + // round runs no fixer, so its minors carry no disposition by design. + if (finding.severity === "nit" || finding.severity === "minor") continue; const disposition = dispositionsById.get(finding.id); if (!disposition) { reasons.push(`finding ${finding.id} (${finding.severity}) has no disposition`); - if (finding.severity === "blocker" || finding.severity === "major") requiresHumanDecision = true; + requiresHumanDecision = true; continue; } - if (finding.severity === "minor") continue; // dispositioned minors never block if (RESOLVING.has(disposition.disposition)) { if (disposition.disposition === "fixed" && !disposition.commit) { reasons.push(`finding ${finding.id} marked fixed without a commit`); diff --git a/src/pipeline/pipeline-roles.ts b/src/pipeline/pipeline-roles.ts index c691ae7..ab0dbf3 100644 --- a/src/pipeline/pipeline-roles.ts +++ b/src/pipeline/pipeline-roles.ts @@ -16,7 +16,7 @@ import type { ReviewReport, } from "./report-types.js"; import type { FailureClassification } from "../protocol/attempt-result.js"; -import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; +import type { PlatformServices } from "../platform/platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; import type { ProducerRegistry } from "../producers/producer-registry.js"; diff --git a/src/pipeline/pipeline-runtime.ts b/src/pipeline/pipeline-runtime.ts index ae166bb..8f44af7 100644 --- a/src/pipeline/pipeline-runtime.ts +++ b/src/pipeline/pipeline-runtime.ts @@ -1,6 +1,6 @@ -import path from "node:path"; -import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; -import { WorktreeManager, cleanupWorktree } from "../runtime/worktree-manager.js"; +import { gitChecked as checkedGit, gitFailure, gitSucceeded, reviewDiff } from "../git/checked-git.js"; +import { git } from "../git/git-exec.js"; +import { WorktreeManager, withManagedWorktree } from "../runtime/worktree-manager.js"; import { PlatformSafety } from "../platform/platform-safety.js"; import type { ProducerRuntime } from "../producers/producer-runtime.js"; import type { RunDecision } from "../runtime/run-decision.js"; @@ -22,7 +22,6 @@ import { type ReviewerKind, } from "../protocol/delegation-spec.js"; import { specSha256 } from "../protocol/spec-hash.js"; -import { loadSchemas } from "../protocol/schema-loader.js"; import type { ProducerRegistry } from "../producers/producer-registry.js"; import { runAttempt as defaultRunAttempt, @@ -33,16 +32,12 @@ import { type PipelineActiveMarker, } from "../runtime/artifact-store.js"; import { redact, redactRecord } from "../runtime/redaction.js"; -import { logger } from "../util/logger.js"; import type { RunStartContext } from "../runtime/run-start.js"; import { transitionRunStatusSafely, writeRunStatusSafely, } from "../runtime/run-status.js"; import { RuntimeError } from "../util/errors.js"; -import { - recomputeManifest, -} from "../verify/structural-verifier.js"; import { consolidate, detectNonConvergence, type ConsolidationResult } from "./consolidator.js"; import { evaluateGates, type GateResult, type IncrementOutcome } from "./gates.js"; import type { @@ -68,6 +63,7 @@ import { type ReviewConfig, } from "./slice-runner.js"; import { + candidateArtifact, verifyCandidate, detectWeakenedTests, } from "./candidate-verifier.js"; @@ -75,7 +71,7 @@ import { importPromotedObjects, validateCandidateProvenance, validateFixProvenance, - privateObjectReadOptions, + type CandidateProvenanceFailure, } from "./candidate-provenance.js"; import { runIncrement, @@ -159,25 +155,11 @@ export interface PipelineDependencies extends AttemptRuntimeDependencies { ) => Promise; } -const schemas = loadSchemas(); const CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; -function gitFailure(action: string, result: GitResult): RuntimeError { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit( - cwd: string, - args: string[], - options?: GitExecOptions, -): Promise { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} @@ -334,40 +316,6 @@ async function archiveSliceExecutionError(args: { } } -async function candidateArtifact(args: { - worktreePath: string; - baselineCommit: string; - candidateCommit: string; - anchorRef: string; - diffText: string; -}): Promise { - const artifact: CandidateArtifact = { - baseCommitOid: args.baselineCommit, - candidateTreeOid: (await checkedGit( - args.worktreePath, - ["rev-parse", `${args.candidateCommit}^{tree}`], - )).trim(), - candidateCommitOid: args.candidateCommit, - anchorRef: args.anchorRef, - manifestHash: "", - changedPaths: [], - patch: args.diffText, - }; - const canonical = await recomputeManifest({ - worktreePath: args.worktreePath, - baseCommitOid: args.baselineCommit, - artifact, - }); - if (canonical.manifestHash === null) { - throw new RuntimeError("final candidate paths collide under case folding"); - } - return { - ...artifact, - changedPaths: canonical.changedPaths, - manifestHash: canonical.manifestHash, - }; -} - async function promoteFinalCandidate(args: { checkoutPath: string; attempt: AttemptResult; @@ -375,18 +323,27 @@ async function promoteFinalCandidate(args: { baselineCommit: string; candidateCommit: string; store: ArtifactStore; - privateObjectAccess?: LinkedWorktreeGitAccess; -}): Promise<{ attempt: AttemptResult; candidateCommit: string } | null> { +}): Promise< + | { ok: true; attempt: AttemptResult; candidateCommit: string } + | { ok: false; failure: FailureClassification; reason: string } +> { + // Every writer's objects were imported into the shared store before its + // worktree was removed, so promotion reads the shared store only. + const treeLookup = await git( + args.checkoutPath, + ["rev-parse", "--verify", "--quiet", `${args.candidateCommit}^{tree}`], + ); + if (!gitSucceeded(treeLookup)) { + // `--quiet` makes a missing object a bare exit 1: the Producer reported a + // commit its isolated store never held. Anything else is the host failing. + const missing = treeLookup.exitCode === 1 && treeLookup.stdout.trim() === ""; + return missing + ? { ok: false, failure: "sandbox-violation", reason: "candidate commit is missing from the git object store" } + : { ok: false, failure: "environment-defect", reason: "candidate tree could not be read from the git object store" }; + } + const finalTree = treeLookup.stdout.trim(); let canonicalCommit: string; try { - const objectReadOptions = args.privateObjectAccess === undefined - ? undefined - : privateObjectReadOptions(args.privateObjectAccess); - const finalTree = (await checkedGit( - args.checkoutPath, - ["rev-parse", `${args.candidateCommit}^{tree}`], - objectReadOptions, - )).trim(); canonicalCommit = (await checkedGit(args.checkoutPath, [ "commit-tree", finalTree, @@ -394,17 +351,14 @@ async function promoteFinalCandidate(args: { args.baselineCommit, "-m", `candidate ${args.attempt.runId}`, - ], objectReadOptions)).trim(); - if (args.privateObjectAccess !== undefined) { - await importPromotedObjects({ - checkoutPath: args.checkoutPath, - baselineCommit: args.baselineCommit, - promotedCommit: canonicalCommit, - access: args.privateObjectAccess, - }); - } + ])).trim(); } catch { - return null; + // The candidate exists; the host could not rebuild it. + return { + ok: false, + failure: "environment-defect", + reason: "candidate could not be rebuilt in the shared git object store", + }; } await checkedGit(args.checkoutPath, [ "update-ref", @@ -412,16 +366,11 @@ async function promoteFinalCandidate(args: { canonicalCommit, args.initialCandidate.candidateCommitOid, ]); - const diffText = await checkedGit( - args.checkoutPath, - ["diff", `${args.baselineCommit}..${canonicalCommit}`], - ); const candidate = await candidateArtifact({ worktreePath: args.checkoutPath, baselineCommit: args.baselineCommit, candidateCommit: canonicalCommit, anchorRef: args.initialCandidate.anchorRef, - diffText, }); const manifest = await args.store.readManifest(); if (manifest === null) throw new RuntimeError("run manifest is missing during promotion"); @@ -430,7 +379,7 @@ async function promoteFinalCandidate(args: { result: finalAttempt, manifest: { ...manifest, candidateManifestHash: candidate.manifestHash }, }); - return { attempt: finalAttempt, candidateCommit: canonicalCommit }; + return { ok: true, attempt: finalAttempt, candidateCommit: canonicalCommit }; } @@ -498,7 +447,6 @@ interface PipelineRunState { currentCandidateCommit: string; pipelineSlices: PipelineSlice[]; incrementOutcome: IncrementOutcome | undefined; - gitObjectAccess: LinkedWorktreeGitAccess | null; frozenTestEvidence: string; authoritySafeToRelease: boolean; } @@ -591,11 +539,8 @@ async function salvagePipelineFailure( baselineCommit: state.baselineCommit, candidateCommit: salvagedCommit, store, - ...(state.gitObjectAccess === null - ? {} - : { privateObjectAccess: state.gitObjectAccess }), }); - if (promoted === null) return await fallback(); + if (!promoted.ok) return await fallback(); salvagedAttempt = promoted.attempt; salvagedCommit = promoted.candidateCommit; } @@ -736,11 +681,8 @@ async function resolveHaltedSlicePhase( candidateCommit: state.currentCandidateCommit, store, }); - if (promoted === null) { - return await archiveHalt( - "partial halt candidate could not be promoted from the git object store", - "sandbox-violation", - ); + if (!promoted.ok) { + return await archiveHalt(`partial halt ${promoted.reason}`, promoted.failure); } state.finalAttempt = promoted.attempt; state.currentCandidateCommit = promoted.candidateCommit; @@ -778,136 +720,175 @@ async function resolveHaltedSlicePhase( return haltResult; } +/** + * Run one role in its own fresh worktree at `commit`. Every writer — each + * increment and each fix — starts clean (AGENTS.md: fresh context in a fresh + * isolated worktree), so nothing one Producer left behind, tracked or not, can + * reach the next. + */ +async function withRoleWorktree( + context: RunContext, + commit: string, + label: string, + run: (worktreePath: string) => Promise, +): Promise { + return await withManagedWorktree({ + manager: new WorktreeManager( + context.checkoutPath, + `${context.runId}-${label}`, + context.ps, + context.borrowedCheckoutLease === undefined + ? {} + : { borrowedCheckoutLease: context.borrowedCheckoutLease }, + ), + commit, + cleanupFailureMessage: "pipeline role worktree could not be cleaned up", + run, + }); +} + +/** + * A writer's commits live in its worktree's private object store, which goes + * away with the worktree. Validate them, then import them into the shared + * store while the worktree still exists. + */ +async function adoptWriterCommit(args: { + context: RunContext; + gitObjectAccess: LinkedWorktreeGitAccess; + previousCandidateCommit: string; + candidateCommit: string; + phaseLabel: string; + validateProvenance: () => Promise; +}): Promise { + const provenanceFailure = await args.validateProvenance(); + if (provenanceFailure !== null) return provenanceFailure; + if (args.candidateCommit === args.previousCandidateCommit) return null; + try { + await importPromotedObjects({ + checkoutPath: args.context.checkoutPath, + baselineCommit: args.previousCandidateCommit, + promotedCommit: args.candidateCommit, + access: args.gitObjectAccess, + }); + } catch { + return { + failure: "environment-defect", + reason: `${args.phaseLabel} objects could not be imported into the shared git object store`, + }; + } + return null; +} + /** Increments two through `maxIncrements`, each continuing the previous candidate. */ async function runIncrementPhase( context: RunContext, deps: PipelineDependencies, state: PipelineRunState, - worktreePath: string, maxIncrements: number, ): Promise { const { checkoutPath, spec, store } = context; - try { - state.gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); - } catch { - return terminal(failedAtCurrentCandidate( - state, - "increment git object isolation could not be established", - "sandbox-violation", - )); - } - const gitObjectAccess = state.gitObjectAccess; - const privateObjects = privateObjectReadOptions(gitObjectAccess); - - try { - for (let increment = 2; increment <= maxIncrements; increment += 1) { - // A cancellation that lands between Producer runs must stop the - // pipeline here. Otherwise the loop keeps launching Producers even - // though the caller has already given up on the run. - if (deps.abortSignal?.aborted === true) { - return terminal(failedAtCurrentCandidate( - state, - `cancelled before increment ${increment}`, - "cancelled", - )); - } - await context.notePhase(`increment ${increment}/${maxIncrements}`); - const previousCandidateCommit = state.currentCandidateCommit; - const diffText = await checkedGit(worktreePath, [ - "diff", - `${state.baselineCommit}..${state.currentCandidateCommit}`, - ], privateObjects); - const incrementRun = await runIncrement({ - spec, - pkg: { - spec, - baselineCommit: state.baselineCommit, - candidateCommit: state.currentCandidateCommit, - candidateDiff: diffText, - testEvidence: state.frozenTestEvidence, - progress: composeProgressNotes(state.increments.at(-1)?.report ?? state.attempt), - }, - worktreePath, - deps, - runId: state.attempt.runId, - increment, - store, - gitObjectAccess, - ...(context.runStart === undefined ? {} : { runStart: context.runStart }), - }); - if (!incrementRun.ok) { - return terminal(failedAtCurrentCandidate( - state, - `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, - incrementRun.failure, - )); - } - - const report = redactRecord(incrementRun.report); - await store.writePipelineArtifact(`increment-${increment}`, report); - const provenanceFailure = await validateCandidateProvenance({ - worktreePath, - previousCandidateCommit, - candidateCommit: report.candidateCommit, - gitObjectAccess, - }); - if (provenanceFailure !== null) { - return terminal(failedAtCurrentCandidate( - state, - provenanceFailure.reason, - provenanceFailure.failure, - )); - } - - const [previousTree, candidateTree] = await Promise.all([ - checkedGit(worktreePath, ["rev-parse", `${previousCandidateCommit}^{tree}`], privateObjects), - checkedGit(worktreePath, ["rev-parse", `${report.candidateCommit}^{tree}`], privateObjects), - ]); - const progressed = previousTree.trim() !== candidateTree.trim(); - if (report.candidateCommit !== previousCandidateCommit) { + for (let increment = 2; increment <= maxIncrements; increment += 1) { + // A cancellation that lands between Producer runs must stop the pipeline + // here. Otherwise the loop keeps launching Producers even though the + // caller has already given up on the run. + if (deps.abortSignal?.aborted === true) { + return terminal(failedAtCurrentCandidate( + state, + `cancelled before increment ${increment}`, + "cancelled", + )); + } + await context.notePhase(`increment ${increment}/${maxIncrements}`); + const previousCandidateCommit = state.currentCandidateCommit; + const outcome = await withRoleWorktree( + context, + previousCandidateCommit, + `increment-${increment}`, + async (worktreePath): Promise => { + let gitObjectAccess: LinkedWorktreeGitAccess; try { - await importPromotedObjects({ - checkoutPath, - baselineCommit: previousCandidateCommit, - promotedCommit: report.candidateCommit, - access: gitObjectAccess, - }); + gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); } catch { return terminal(failedAtCurrentCandidate( state, - "increment objects could not be imported into the shared git object store", + "increment git object isolation could not be established", "sandbox-violation", )); } - } - state.currentCandidateCommit = report.candidateCommit; - state.increments.push({ - increment, - report, - roleLogRefs: incrementRun.roleLogRefs, - }); + const diffText = await reviewDiff(checkoutPath, state.baselineCommit, previousCandidateCommit); + let incrementRun; + try { + incrementRun = await runIncrement({ + spec, + pkg: { + spec, + baselineCommit: state.baselineCommit, + candidateCommit: previousCandidateCommit, + candidateDiff: diffText, + testEvidence: state.frozenTestEvidence, + progress: composeProgressNotes(state.increments.at(-1)?.report ?? state.attempt), + }, + worktreePath, + deps, + runId: state.attempt.runId, + increment, + store, + gitObjectAccess, + ...(context.runStart === undefined ? {} : { runStart: context.runStart }), + }); + } catch { + return terminal(failedAtCurrentCandidate( + state, + "increment phase failed unexpectedly", + "producer-failure", + )); + } + if (!incrementRun.ok) { + return terminal(failedAtCurrentCandidate( + state, + `increment phase did not produce valid structured output (see ${incrementRun.failedRoleLogRef})`, + incrementRun.failure, + )); + } - if (report.status === "complete") { - state.incrementOutcome = "complete"; - break; - } - if (report.status === "blocked") { - state.incrementOutcome = "blocked"; - break; - } - if (!progressed) { - state.incrementOutcome = "stalled"; - break; - } - } - state.incrementOutcome ??= "budget-exhausted"; - } catch { - return terminal(failedAtCurrentCandidate( - state, - "increment phase failed unexpectedly", - "producer-failure", - )); + const report = redactRecord(incrementRun.report); + await store.writePipelineArtifact(`increment-${increment}`, report); + const adoptionFailure = await adoptWriterCommit({ + context, + gitObjectAccess, + previousCandidateCommit, + candidateCommit: report.candidateCommit, + phaseLabel: "increment", + validateProvenance: () => validateCandidateProvenance({ + worktreePath, + previousCandidateCommit, + candidateCommit: report.candidateCommit, + gitObjectAccess, + }), + }); + if (adoptionFailure !== null) { + return terminal(failedAtCurrentCandidate( + state, + adoptionFailure.reason, + adoptionFailure.failure, + )); + } + const [previousTree, candidateTree] = await Promise.all([ + checkedGit(checkoutPath, ["rev-parse", `${previousCandidateCommit}^{tree}`]), + checkedGit(checkoutPath, ["rev-parse", `${report.candidateCommit}^{tree}`]), + ]); + state.currentCandidateCommit = report.candidateCommit; + state.increments.push({ increment, report, roleLogRefs: incrementRun.roleLogRefs }); + if (report.status === "complete") state.incrementOutcome = "complete"; + else if (report.status === "blocked") state.incrementOutcome = "blocked"; + else if (previousTree.trim() === candidateTree.trim()) state.incrementOutcome = "stalled"; + return CONTINUE; + }, + ); + if (outcome.state === "terminal") return outcome; + if (state.incrementOutcome !== undefined) break; } + state.incrementOutcome ??= "budget-exhausted"; return CONTINUE; } @@ -916,11 +897,10 @@ async function runReviewRounds( context: RunContext, deps: PipelineDependencies, state: PipelineRunState, - worktreePath: string, reviewers: ReviewerKind[], maxRounds: number, ): Promise { - const { spec, store } = context; + const { checkoutPath, spec, store } = context; for (let round = 1; round <= maxRounds; round += 1) { if (deps.abortSignal?.aborted === true) { return terminal(failedAtCurrentCandidate( @@ -930,28 +910,31 @@ async function runReviewRounds( )); } await context.notePhase(`review round ${round}/${maxRounds}`); - const diffText = await checkedGit(worktreePath, [ - "diff", - `${state.baselineCommit}..${state.currentCandidateCommit}`, - ], state.gitObjectAccess === null ? undefined : privateObjectReadOptions(state.gitObjectAccess)); + const reviewedCommit = state.currentCandidateCommit; + const diffText = await reviewDiff(checkoutPath, state.baselineCommit, reviewedCommit); const pkg: RolePackage = { spec, baselineCommit: state.baselineCommit, - candidateCommit: state.currentCandidateCommit, + candidateCommit: reviewedCommit, candidateDiff: diffText, testEvidence: state.frozenTestEvidence, }; - const reviewRun = await runReviews({ - reviewers, - spec, - pkg, - worktreePath, - deps, - runId: state.attempt.runId, - round, - store, - onReviewer: role => context.emitStatus("reviewing", { round, role }), - }); + const reviewRun = await withRoleWorktree( + context, + reviewedCommit, + `round-${round}-review`, + worktreePath => runReviews({ + reviewers, + spec, + pkg, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + onReviewer: role => context.emitStatus("reviewing", { round, role }), + }), + ); if (!reviewRun.ok) { return terminal(await salvagePipelineFailure(context, deps, state, { reason: `review phase did not produce valid structured output (see ${reviewRun.failedRoleLogRef})`, @@ -987,53 +970,69 @@ async function runReviewRounds( state.rounds.push(roundRecord); if (!blocking && approved) break; - try { - state.gitObjectAccess ??= await resolveLinkedWorktreeWritableRoots(worktreePath); - } catch { - return terminal(await archivePipelineFailure(context, state, { - reason: "fixer git object isolation could not be established", - failure: "sandbox-violation", - })); - } - await context.emitStatus("fixing", { round, role: "fixer" }); await context.notePhase(`round ${round}: applying fixes`); - const fixRun = await runFix({ - spec, - pkg: { ...pkg, findings: consolidated.findings }, - worktreePath, - deps, - runId: state.attempt.runId, - round, - store, - gitObjectAccess: state.gitObjectAccess, - ...(context.runStart === undefined ? {} : { runStart: context.runStart }), - }); - if (!fixRun.ok) { - // The fix never landed, so the bytes here are the last reviewed - // candidate — salvage them rather than losing the whole round. - return terminal(await salvagePipelineFailure(context, deps, state, { - reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, - failure: fixRun.failure, - })); - } - const { fix } = fixRun; - await store.writePipelineArtifact(`round-${round}-fix`, fix); - const provenanceFailure = await validateFixProvenance({ - worktreePath, - previousCandidateCommit: state.currentCandidateCommit, - fix, - gitObjectAccess: state.gitObjectAccess, - }); - if (provenanceFailure !== null) { - return terminal(await archivePipelineFailure(context, state, { - reason: provenanceFailure.reason, - failure: provenanceFailure.failure, - })); - } - state.currentCandidateCommit = fix.candidateCommit; - roundRecord.fix = fix; - roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; + const fixOutcome = await withRoleWorktree( + context, + reviewedCommit, + `round-${round}-fix`, + async (worktreePath): Promise => { + let gitObjectAccess: LinkedWorktreeGitAccess; + try { + gitObjectAccess = await resolveLinkedWorktreeWritableRoots(worktreePath); + } catch { + return terminal(await archivePipelineFailure(context, state, { + reason: "fixer git object isolation could not be established", + failure: "sandbox-violation", + })); + } + const fixRun = await runFix({ + spec, + pkg: { ...pkg, findings: consolidated.findings }, + worktreePath, + deps, + runId: state.attempt.runId, + round, + store, + gitObjectAccess, + ...(context.runStart === undefined ? {} : { runStart: context.runStart }), + }); + if (!fixRun.ok) { + // The fix never landed, so the reviewed bytes are the last + // candidate — salvage them rather than losing the whole round. + return terminal(await salvagePipelineFailure(context, deps, state, { + reason: `fix phase did not produce valid structured output (see ${fixRun.failedRoleLogRef})`, + failure: fixRun.failure, + })); + } + const { fix } = fixRun; + await store.writePipelineArtifact(`round-${round}-fix`, fix); + const adoptionFailure = await adoptWriterCommit({ + context, + gitObjectAccess, + previousCandidateCommit: reviewedCommit, + candidateCommit: fix.candidateCommit, + phaseLabel: "fixer", + validateProvenance: () => validateFixProvenance({ + worktreePath, + previousCandidateCommit: reviewedCommit, + fix, + gitObjectAccess, + }), + }); + if (adoptionFailure !== null) { + return terminal(await archivePipelineFailure(context, state, { + reason: adoptionFailure.reason, + failure: adoptionFailure.failure, + })); + } + state.currentCandidateCommit = fix.candidateCommit; + roundRecord.fix = fix; + roundRecord.roleLogRefs = [...reviewRun.roleLogRefs, ...fixRun.roleLogRefs]; + return CONTINUE; + }, + ); + if (fixOutcome.state === "terminal") return fixOutcome; } return CONTINUE; } @@ -1044,13 +1043,6 @@ async function promoteReviewedCandidate( state: PipelineRunState, ): Promise { if (state.currentCandidateCommit === state.initialCandidate.candidateCommitOid) return CONTINUE; - if (state.gitObjectAccess === null && !state.sliced) { - return terminal(failedAtCurrentCandidate( - state, - "fixer git object isolation state is missing during promotion", - "sandbox-violation", - )); - } const promoted = await promoteFinalCandidate({ checkoutPath: context.checkoutPath, attempt: state.attempt, @@ -1058,14 +1050,11 @@ async function promoteReviewedCandidate( baselineCommit: state.baselineCommit, candidateCommit: state.currentCandidateCommit, store: context.store, - ...(state.gitObjectAccess === null ? {} : { privateObjectAccess: state.gitObjectAccess }), }); - if (promoted === null) { + if (!promoted.ok) { return terminal(await archivePipelineFailure(context, state, { - reason: state.sliced - ? "sliced candidate could not be promoted from the shared git object store" - : "fixer objects could not be imported into the shared git object store", - failure: "sandbox-violation", + reason: `${state.sliced ? "sliced" : "fixer"} ${promoted.reason}`, + failure: promoted.failure, })); } state.finalAttempt = promoted.attempt; @@ -1335,7 +1324,6 @@ async function runPipelineWithLease( currentCandidateCommit: attempt.candidate.candidateCommitOid, pipelineSlices: [], incrementOutcome: undefined, - gitObjectAccess: null, frozenTestEvidence: testEvidence(attempt), authoritySafeToRelease: !sliced, }; @@ -1450,31 +1438,14 @@ async function runPipelineWithLease( state.frozenTestEvidence = sliceTestEvidence(phase.slices); } - const candidateWorktree = await new WorktreeManager( - checkoutPath, - sliced ? `${attempt.runId}-composed-review` : `${attempt.runId}-pipeline`, - ps, - deps.borrowedCheckoutLease === undefined - ? {} - : { borrowedCheckoutLease: deps.borrowedCheckoutLease }, - ).create(state.currentCandidateCommit); - try { - if (maxIncrements > 1) { - const outcome = await runIncrementPhase(context, deps, state, candidateWorktree.path, maxIncrements); - if (outcome.state === "terminal") return outcome.result; - } - const reviewed = await runReviewRounds(context, deps, state, candidateWorktree.path, reviewers, maxRounds); - if (reviewed.state === "terminal") return reviewed.result; - const promoted = await promoteReviewedCandidate(context, state); - if (promoted.state === "terminal") return promoted.result; - } finally { - const cleanupError = await cleanupWorktree(candidateWorktree); - if (cleanupError !== null) { - logger.warn("pipeline round worktree could not be cleaned up", { - error: redact(cleanupError instanceof Error ? cleanupError.message : String(cleanupError)), - }); - } + if (maxIncrements > 1) { + const outcome = await runIncrementPhase(context, deps, state, maxIncrements); + if (outcome.state === "terminal") return outcome.result; } + const reviewed = await runReviewRounds(context, deps, state, reviewers, maxRounds); + if (reviewed.state === "terminal") return reviewed.result; + const promoted = await promoteReviewedCandidate(context, state); + if (promoted.state === "terminal") return promoted.result; return await finalizePipelineGate(context, deps, state, maxRounds); } catch (error) { diff --git a/src/pipeline/role-runner.ts b/src/pipeline/role-runner.ts index d65fef8..ca7facd 100644 --- a/src/pipeline/role-runner.ts +++ b/src/pipeline/role-runner.ts @@ -52,19 +52,7 @@ export const READ_ONLY_ROLES: ReadonlySet = new Set( "verifier", "advisor", ]); -const MAX_PRODUCER_OUTPUT_BYTES = 1_000_000; -function preCancelledExit(): SupervisedExit { - return { - exitCode: null, - signal: null, - timedOut: false, - cancelled: true, - stdout: "", - stderr: "", - truncated: { stdout: false, stderr: false }, - }; -} function definedEnvironment( environment: Record | undefined, diff --git a/src/pipeline/slice-runner.ts b/src/pipeline/slice-runner.ts index 1e9e5fd..2a15ff1 100644 --- a/src/pipeline/slice-runner.ts +++ b/src/pipeline/slice-runner.ts @@ -1,4 +1,4 @@ -import path from "node:path"; +import { gitFailure, reviewDiff } from "../git/checked-git.js"; import type { Slice, DelegationSpec } from "../protocol/delegation-spec.js"; import type { AttemptResult, FailureClassification } from "../protocol/attempt-result.js"; import { consolidate, type ConsolidationResult } from "./consolidator.js"; @@ -9,7 +9,6 @@ import { composeSliceOntoHead } from "./slice-composer.js"; import type { PlatformServices } from "../platform/platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; import type { RunContext } from "./run-context.js"; -import type { PipelineRole } from "./role-prompts.js"; import type { ReviewerKind } from "../protocol/delegation-spec.js"; import { WorktreeManager, withManagedWorktree } from "../runtime/worktree-manager.js"; import { @@ -45,7 +44,7 @@ import { importPromotedObjects, validateCandidateProvenance, } from "./candidate-provenance.js"; -import { git, type GitExecOptions, type GitResult } from "../git/git-exec.js"; +import { git } from "../git/git-exec.js"; import { SLICE_REF_PREFIX } from "../git/ref-namespace.js"; import { RuntimeError } from "../util/errors.js"; import type { ArtifactStore } from "../runtime/artifact-store.js"; @@ -82,20 +81,7 @@ export function scopeSpecToSlice(spec: DelegationSpec, slice: Slice): Delegation return scoped; } -function gitFailure(action: string, result: GitResult): RuntimeError { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit( - cwd: string, - args: string[], - options?: GitExecOptions, -): Promise { - const result = await git(cwd, args, options); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} export function temporarySliceRef(runId: string, index: number, attempt: number): string { return `${SLICE_REF_PREFIX}${runId}/slice-${index}-attempt-${attempt}`; @@ -220,10 +206,7 @@ export async function runSliceReview(args: { commit: args.candidateCommit, cleanupFailureMessage: "slice review failed and its worktree could not be cleaned up", run: async worktreePath => { - const diffText = await checkedGit(worktreePath, [ - "diff", - `${args.baselineCommit}..${args.candidateCommit}`, - ]); + const diffText = await reviewDiff(worktreePath, args.baselineCommit, args.candidateCommit); const reviewRun = await runReviews({ reviewers: args.reviewers, spec: args.spec, @@ -297,11 +280,6 @@ export interface SlicePhaseResult { temporarySliceRefs?: TemporarySliceRef[] | undefined; } -interface SliceOutcome { - slice: PipelineSlice; - advanced: boolean; -} - export interface ReviewConfig { perSlice?: boolean | undefined; diff --git a/src/platform/bound-directory-cleanup.ts b/src/platform/bound-directory-cleanup.ts index 7da38c3..d557401 100644 --- a/src/platform/bound-directory-cleanup.ts +++ b/src/platform/bound-directory-cleanup.ts @@ -79,19 +79,68 @@ const sameIdentity = (left, right) => left.dev === right.dev && left.birthtimeNs === right.birthtimeNs && left.isDirectory() === right.isDirectory() && left.isSymbolicLink() === right.isSymbolicLink(); -const darwinHandlePath = fd => { +// One lsof spawn resolves a whole batch of handles; per-directory spawns made +// large trees (node_modules) blow the cleanup budget. +const darwinHandlePaths = fds => { const output = execFileSync("/usr/sbin/lsof", [ - "-a", "-p", String(process.pid), "-d", String(fd), "-F0pn", - ], { encoding: "utf8", env: {}, maxBuffer: 16_384, timeout: 5_000 }); - const match = /(?:^|[\n\u0000])n([^\u0000]*)\u0000/u.exec(output); - if (match === null) process.exit(50); - return match[1]; + "-a", "-p", String(process.pid), "-d", fds.join(","), "-F0pn", + ], { encoding: "utf8", env: {}, maxBuffer: 1_048_576, timeout: 5_000 }); + const paths = new Map(); + for (const match of output.matchAll(/(?:^|[\n\u0000])f(\d+)\u0000n([^\u0000]*)\u0000/gu)) { + if (paths.has(match[1])) process.exit(50); + paths.set(match[1], match[2]); + } + if (fds.some(fd => !paths.has(String(fd)))) process.exit(50); + return paths; +}; +const identityKey = stats => stats.dev + ":" + stats.ino + ":" + stats.birthtimeNs; +const DIRECTORY_BATCH = 64; +const removeDarwinBoundDirectories = async directories => { + for (let start = 0; start < directories.length; start += DIRECTORY_BATCH) { + const batch = directories.slice(start, start + DIRECTORY_BATCH); + const handles = []; + try { + for (const [entry, expected] of batch) { + const handle = await open(entry, constants.O_RDONLY | (constants.O_NOFOLLOW || 0)); + handles.push(handle); + if (!sameIdentity(await handle.stat({ bigint: true }), expected)) process.exit(51); + } + const fds = handles.map(handle => handle.fd); + const originalPaths = darwinHandlePaths(fds); + for (const [index, [entry, expected]] of batch.entries()) { + if (!sameIdentity(await lstat(entry, { bigint: true }), expected)) process.exit(61); + await rmdir(entry); + if (!sameIdentity(await handles[index].stat({ bigint: true }), expected)) process.exit(53); + } + const removedPaths = darwinHandlePaths(fds); + for (const fd of fds) { + if (removedPaths.get(String(fd)) !== originalPaths.get(String(fd))) process.exit(55); + } + } finally { + for (const handle of handles) await handle.close(); + } + const removed = new Set(batch.map(([, expected]) => identityKey(expected))); + for (const sibling of await readdir(".")) { + if (removed.has(identityKey(await lstat(sibling, { bigint: true })))) process.exit(46); + } + } }; +const removeBoundDirectories = async directories => { + if (process.platform === "darwin") { + await removeDarwinBoundDirectories(directories); + return; + } + for (const [entry, expected] of directories) { + await removeBoundEntry(entry, expected, true); + for (const sibling of await readdir(".")) { + if (sameIdentity(await lstat(sibling, { bigint: true }), expected)) process.exit(46); + } + } +}; +// darwin resolves directory handles in batches (removeDarwinBoundDirectories). const boundHandlePath = async fd => process.platform === "linux" ? await readlink("/proc/self/fd/" + fd) - : process.platform === "darwin" - ? darwinHandlePath(fd) - : null; + : null; const removeBoundUnopenedEntry = async (entry, expected) => { const tombstone = ".remove-symlink-" + randomUUID(); await rename(entry, tombstone); @@ -192,6 +241,7 @@ const removeBoundEntry = async (entry, expected, directory) => { }; const emptyBoundDirectory = async expected => { if (!sameIdentity(await lstat(".", { bigint: true }), expected)) process.exit(41); + const emptiedDirectories = []; for (const entry of await readdir(".")) { const child = await lstat(entry, { bigint: true }); if (child.birthtimeNs <= 0n) process.exit(42); @@ -209,10 +259,7 @@ const emptyBoundDirectory = async expected => { process.chdir(".."); if (!sameIdentity(await lstat(".", { bigint: true }), parent)) process.exit(44); if (!sameIdentity(await lstat(entry, { bigint: true }), child)) process.exit(45); - await removeBoundEntry(entry, child, true); - for (const sibling of await readdir(".")) { - if (sameIdentity(await lstat(sibling, { bigint: true }), child)) process.exit(46); - } + emptiedDirectories.push([entry, child]); } else { if (!sameIdentity(await lstat(entry, { bigint: true }), child)) process.exit(47); if (!child.isFile() || child.isSymbolicLink()) { @@ -222,6 +269,7 @@ const emptyBoundDirectory = async expected => { } } } + await removeBoundDirectories(emptiedDirectories); if (!sameIdentity(await lstat(".", { bigint: true }), expected)) process.exit(48); }; (async () => { diff --git a/src/platform/durable-directory.ts b/src/platform/durable-directory.ts index 81ebb05..3a40c18 100644 --- a/src/platform/durable-directory.ts +++ b/src/platform/durable-directory.ts @@ -6,7 +6,7 @@ import { supervise } from "./process-supervisor.js"; import { getPlatformServices } from "./select-platform.js"; import { resolveWindowsFilesystemHelper } from "./windows-filesystem-helper.js"; import { windowsEssentialEnvironment } from "./windows-env.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode } from "../util/errors.js"; const WINDOWS_DIRECTORY_SYNC_TIMEOUT_MS = 30_000; const WINDOWS_UNSUPPORTED_DIRECTORY_CODES = new Set(["EISDIR", "EINVAL", "ENOTSUP", "EPERM"]); @@ -217,10 +217,6 @@ export interface DirectorySyncDependencies { ) => Promise; } -function errorCode(error: unknown): string | undefined { - return (error as NodeJS.ErrnoException).code; -} - async function closeDirectoryHandle(handle: FileHandle | undefined, primaryError: unknown) { try { await handle?.close(); @@ -269,6 +265,31 @@ async function syncWindowsDirectoryMetadata( } /** Flush directory-entry metadata after a rename, link, or unlink. */ +/** + * Flush a directory entry on the hot write paths (artifact, workflow and + * run-start records). Unlike {@link syncDirectoryMetadata} it neither proves + * identity nor spawns the Windows helper: on Windows, where a directory handle + * cannot be flushed, it is a no-op rather than a process per write. + */ +export async function flushDirectory(directory: string): Promise { + let handle: FileHandle | undefined; + try { + handle = await open(directory, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0)); + await handle.sync(); + } catch (error) { + const unsupportedOnWindows = process.platform === "win32" + && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode(error) ?? ""); + if (!unsupportedOnWindows) throw error; + } finally { + await handle?.close(); + } +} + +/** Exact identity: same device, inode and birth time. */ +export function sameDirectoryIdentity(left: DirectoryIdentity, right: DirectoryIdentity): boolean { + return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; +} + export async function syncDirectoryMetadata( directory: string, dependencies: DirectorySyncDependencies = {}, diff --git a/src/platform/durable-write.ts b/src/platform/durable-write.ts index 99e61ab..2029276 100644 --- a/src/platform/durable-write.ts +++ b/src/platform/durable-write.ts @@ -217,6 +217,13 @@ export async function writeAtomic( } catch (error) { if (!isAlreadyPresent(error)) throw error; await session.assertIdentity(); + // Compare only against a regular file: a symlink planted at the name + // must not stand in for the committed record. The link count is not + // checked, since a crash between link and temp removal leaves two. + const present = await lstat(destination, { bigint: true }); + if (!present.isFile() || present.isSymbolicLink()) { + throw new RuntimeError(`archive entry is not a plain file: ${name}`); + } const existing = await readFile(destination); const expected = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : bytes; if (!existing.equals(expected)) { diff --git a/src/platform/lock-ownership.ts b/src/platform/lock-ownership.ts index 2e40de7..1ceacdd 100644 --- a/src/platform/lock-ownership.ts +++ b/src/platform/lock-ownership.ts @@ -4,17 +4,17 @@ import { link, lstat, open, readdir, readFile, rm, type FileHandle } from "node: import path from "node:path"; import nodeProcess from "node:process"; import { resolveStateDir } from "../runtime/state-dir.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode, isMissing } from "../util/errors.js"; import { logger } from "../util/logger.js"; import type { DirectoryIdentity } from "./durable-directory.js"; import type { CheckoutLock, LockOwnerAnnotation } from "./platform-services.js"; +import { sameDirectoryIdentity } from "./durable-directory.js"; const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; const MAX_STATE_FILE_BYTES = 1_000_000; const MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); export const CHECKOUT_LOCK_NAME_PATTERN = /^([0-9a-f]{64})\.lock$/; -export const LOCK_NAME = CHECKOUT_LOCK_NAME_PATTERN; const LOCK_RETRY_MS = 30; const LOCK_TIMEOUT_MS = nodeProcess.platform === "win32" ? 15_000 : 2500; @@ -43,16 +43,6 @@ export type LockOwnerStatus = "dead" | "live" | "unverifiable"; export type DeadLockReclaimResult = "reclaimed" | "live" | "unverifiable" | "malformed" | "contended"; export type ExpectedLockRemoval = "removed" | "absent" | "changed"; -function isMissing(error: unknown): boolean { - return errorCode(error) === "ENOENT"; -} - - -function errorCode(error: unknown): string | undefined { - return typeof error === "object" && error !== null && "code" in error - ? String((error as { code?: unknown }).code) - : undefined; -} function delay(ms: number): Promise { return new Promise(resolve => setTimeout(resolve, ms)); @@ -69,13 +59,6 @@ function isPlainDirectory(metadata: { return metadata.isDirectory() && !metadata.isSymbolicLink(); } -function sameIdentity( - left: { dev: bigint; ino: bigint; birthtimeNs: bigint }, - right: { dev: bigint; ino: bigint; birthtimeNs: bigint }, -): boolean { - return left.dev === right.dev && left.ino === right.ino && left.birthtimeNs === right.birthtimeNs; -} - export async function plainDirectoryIdentity(directoryPath: string): Promise { try { const metadata = await lstat(directoryPath, { bigint: true }); @@ -172,7 +155,7 @@ export async function removeLockIfUnchanged( const beforeMetadata = await handle.stat({ bigint: true }); if (!beforeMetadata.isFile() || beforeMetadata.isSymbolicLink() - || !sameIdentity(beforeMetadata, expectedIdentity) + || !sameDirectoryIdentity(beforeMetadata, expectedIdentity) || beforeMetadata.nlink !== BigInt(expectedLinks) || beforeMetadata.size !== BigInt(expectedContents.byteLength)) { return false; @@ -262,8 +245,6 @@ export async function reclaimDeadCheckoutLocks( } -export const reclaimLocks = reclaimDeadCheckoutLocks; - export async function lockIsOwnedByLiveProcess( locksRoot: string, @@ -363,6 +344,13 @@ export async function describeLockContention( return `it is held by live pid ${owner.pid}${self}${extras}`; } +/** The classification every lock-acquisition timeout carries. */ +export const LOCK_CONTENDED = "lock-contended"; + +export function isLockContention(error: unknown): boolean { + return error instanceof RuntimeError && error.detail?.classification === LOCK_CONTENDED; +} + export async function withLockContentionDetail( error: unknown, key: string, @@ -425,7 +413,10 @@ export async function acquireWxFileLock( } catch (error) { if (errorCode(error) !== "EEXIST") throw error; if (Date.now() >= deadline) { - throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { key }); + throw new RuntimeError(timeoutMessage ?? `lock is held: ${key}`, { + key, + classification: LOCK_CONTENDED, + }); } await delay(LOCK_RETRY_MS); } @@ -437,7 +428,7 @@ export async function validateLockParentIdentity( expectedIdentity: DirectoryIdentity, ): Promise { const metadata = await lstat(parentPath, { bigint: true }); - if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expectedIdentity)) { + if (!isPlainDirectory(metadata) || !sameDirectoryIdentity(metadata, expectedIdentity)) { throw new RuntimeError("recovery lock parent identity changed"); } } @@ -459,7 +450,7 @@ function isExpectedLockMetadata( return metadata.isFile() && !metadata.isSymbolicLink() && metadata.nlink === BigInt(expectedLinks) - && sameIdentity(metadata, expectedIdentity) + && sameDirectoryIdentity(metadata, expectedIdentity) && metadata.size === BigInt(expectedSize) && metadata.size <= MAX_STATE_FILE_BYTES_BIGINT; } @@ -549,7 +540,7 @@ export async function pathNamesLockIdentity( const metadata = await lstat(filename, { bigint: true }); return metadata.isFile() && !metadata.isSymbolicLink() - && sameIdentity(metadata, expectedIdentity); + && sameDirectoryIdentity(metadata, expectedIdentity); } catch (error) { if (isMissing(error)) return false; throw error; diff --git a/src/platform/platform-safety.ts b/src/platform/platform-safety.ts index d01dec8..2d01981 100644 --- a/src/platform/platform-safety.ts +++ b/src/platform/platform-safety.ts @@ -36,37 +36,32 @@ export class PlatformSafety { ...(options?.runId === undefined ? {} : { runId: options.runId }), }); - let primaryError: unknown; - let result: T | undefined; - let completed = false; + let result: T; try { // 1. Ambiguity gate under the acquired lease await this.assertAmbiguityGate(lease.repositoryIdentity); // 2. Execute caller logic under the lease result = await fn(lease); - completed = true; - return result; - } catch (error) { - primaryError = error; - throw error; - } finally { + } catch (primaryError) { try { await lease.release(); } catch (releaseError) { - if (completed && options?.onReleaseError !== undefined) { - result = options.onReleaseError(releaseError, result as T); - } else if (primaryError !== undefined) { - const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); - throw new AggregateError( - [primaryError, releaseError], - `${primaryMessage}; checkout lock release failed`, - ); - } else { - throw releaseError; - } + const primaryMessage = primaryError instanceof Error ? primaryError.message : String(primaryError); + throw new AggregateError( + [primaryError, releaseError], + `${primaryMessage}; checkout lock release failed`, + ); } + throw primaryError; + } + try { + await lease.release(); + } catch (releaseError) { + if (options?.onReleaseError === undefined) throw releaseError; + return options.onReleaseError(releaseError, result); } + return result; } async withRecoveryLease( diff --git a/src/platform/posix-platform-services.ts b/src/platform/posix-platform-services.ts index 32c45d8..5d83de5 100644 --- a/src/platform/posix-platform-services.ts +++ b/src/platform/posix-platform-services.ts @@ -4,10 +4,9 @@ import { constants, promises as fs } from "node:fs"; import { tmpdir } from "node:os"; import path from "node:path"; import nodeProcess from "node:process"; -import { resolveStateDir } from "../runtime/state-dir.js"; import { BoundedBuffer } from "../util/bounded-buffer.js"; import { gitPathOutput } from "../git/git-output.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode } from "../util/errors.js"; import { logger } from "../util/logger.js"; import type { CanonicalPath, CheckoutLock, ExecutableRequest, FileLock, LockOwnerAnnotation, PlatformServices, @@ -33,11 +32,6 @@ export { export const CLEANUP_JOURNAL_LOCK_KEY = createHash("sha256").update("claude-architect:cleanup-journal:v1").digest("hex"); -function errorCode(error: unknown): string | undefined { - return typeof error === "object" && error !== null && "code" in error - ? String(error.code) : undefined; -} - async function gitCommonDir(cwd: string): Promise { diff --git a/src/platform/sandbox/seatbelt.ts b/src/platform/sandbox/seatbelt.ts index 3a0ac66..feca109 100644 --- a/src/platform/sandbox/seatbelt.ts +++ b/src/platform/sandbox/seatbelt.ts @@ -8,6 +8,8 @@ export interface SeatbeltPolicy { tempHome: string | null; allowNetwork: boolean; extraWritableRoots?: string[]; + /** false confines temporary files to `tempHome` instead of the shared tmp roots. */ + sharedTemp?: boolean; } /** @@ -148,12 +150,43 @@ function inheritedStateWritablePaths( return [...declared]; } +/** + * Credential stores an untrusted process never needs. Reads are otherwise + * allowed (toolchains, caches, the Producer's own login state), and network is + * allowed for model traffic, so these are the secrets that would be worth + * exfiltrating. A tool that needs one of them is not a delegated workload. + */ +const CREDENTIAL_PATHS = [ + ".ssh", + ".aws", + ".azure", + ".gnupg", + ".kube", + ".docker", + ".netrc", + ".git-credentials", + ".config/gh", + ".config/gcloud", +]; + +function credentialReadDenials(): string[] { + const home = process.env.HOME ?? homedir(); + if (!isAbsolute(home) || resolve(home) === "/") return []; + return [...new Set(CREDENTIAL_PATHS.flatMap(entry => { + const candidate = resolve(home, entry); + try { + return [candidate, realpathSync(candidate)]; + } catch { + return [candidate]; + } + }))]; +} + function buildProfile(policy: SeatbeltPolicy, additionalWritable: string[]): string { const writable = [...new Set([ policy.worktreePath, policy.tempHome, - process.env.TMPDIR ?? "/private/tmp", - "/private/tmp", + ...(policy.sharedTemp === false ? [] : [process.env.TMPDIR ?? "/private/tmp", "/private/tmp"]), "/dev", ...(policy.extraWritableRoots ?? []), ...additionalWritable, @@ -172,6 +205,7 @@ function buildProfile(policy: SeatbeltPolicy, additionalWritable: string[]): str "(deny file-write*)", ...writable.map(path => `(allow file-write* (subpath ${sbPath(path)}))`), '(allow file-write* (literal "/dev/null") (literal "/dev/tty"))', + ...credentialReadDenials().map(path => `(deny file-read* (subpath ${sbPath(path)}))`), ]; if (!policy.allowNetwork) lines.push("(deny network*)"); return lines.join("\n"); @@ -202,3 +236,20 @@ export function wrapInvocationWithSeatbelt( args: ["-p", profile, ...inner], }; } + +/** + * Confine a trusted-runtime command (project verification) that executes + * Producer-authored code: writes only to its worktree and scratch directory. + */ +export function seatbeltArgv( + policy: { worktreePath: string; scratchDir: string }, + argv: readonly string[], +): { command: string; args: string[] } { + const profile = buildProfile({ + worktreePath: policy.worktreePath, + tempHome: policy.scratchDir, + allowNetwork: true, + sharedTemp: false, + }, []); + return { command: "/usr/bin/sandbox-exec", args: ["-p", profile, ...argv] }; +} diff --git a/src/producers/claude-adapter.ts b/src/producers/claude-adapter.ts index 086ccf5..e07acf4 100644 --- a/src/producers/claude-adapter.ts +++ b/src/producers/claude-adapter.ts @@ -2,7 +2,7 @@ import { homedir } from "node:os"; import { join } from "node:path"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import type { ResolvedExecutable } from "../platform/platform-services.js"; -import { parseSemver, probeOsConfinedCli, runVersionProbe } from "./cli-probe.js"; +import { probeOsConfinedCli, runVersionProbe } from "./cli-probe.js"; import { defaultHasOauthAccount, isProducerAuthenticated, diff --git a/src/producers/codex-adapter.ts b/src/producers/codex-adapter.ts index 985fe62..b91a8f0 100644 --- a/src/producers/codex-adapter.ts +++ b/src/producers/codex-adapter.ts @@ -2,7 +2,6 @@ import { execFileSync } from "node:child_process"; import { existsSync, realpathSync } from "node:fs"; import { homedir, tmpdir } from "node:os"; import { join } from "node:path"; -import type { ResolvedExecutable } from "../platform/platform-services.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { probeOsConfinedCli } from "./cli-probe.js"; import type { diff --git a/src/producers/plain-text.ts b/src/producers/plain-text.ts index aef4104..e92910f 100644 --- a/src/producers/plain-text.ts +++ b/src/producers/plain-text.ts @@ -1,7 +1,6 @@ import { open } from "node:fs/promises"; import type { ResolvedExecutable, SupervisedExit } from "../platform/platform-services.js"; import { SANDBOX_BACKENDS } from "../platform/sandbox/backends.js"; -import type { DelegationSpec } from "../protocol/delegation-spec.js"; import type { AdapterEvent, ProbeContext } from "./producer-adapter.js"; export { EDIT_ACTION_PREAMBLE, diff --git a/src/protocol/autopilot-spec.ts b/src/protocol/autopilot-spec.ts index 73ffbd3..68bd1b1 100644 --- a/src/protocol/autopilot-spec.ts +++ b/src/protocol/autopilot-spec.ts @@ -6,21 +6,11 @@ export interface AutopilotTaskSpec { delegation: DelegationSpec; } -export interface AutopilotShippingSpec { - provider: "github"; - draft: true; - markReadyWhenRequiredChecksPass: true; - requiredChecksTimeoutMs: number; - pullRequestTitle: string; - pullRequestBody: string; -} - export interface AutopilotSpec { - specVersion: "1"; + specVersion: "2"; topic: string; base: { remote: "origin"; branch: "main" }; tasks: AutopilotTaskSpec[]; finalSuccessCriteria: string[]; finalVerification: DelegationSpec["verification"]; - shipping: AutopilotShippingSpec; } diff --git a/src/protocol/schema-loader.ts b/src/protocol/schema-loader.ts index 5aaf181..5216eaf 100644 --- a/src/protocol/schema-loader.ts +++ b/src/protocol/schema-loader.ts @@ -1,6 +1,6 @@ import { Ajv2020, type ValidateFunction } from "ajv/dist/2020.js"; import specSchema from "../../runtime/schemas/delegation-spec.v1.json" with { type: "json" }; -import autopilotSpecSchema from "../../runtime/schemas/autopilot-spec.v1.json" with { type: "json" }; +import autopilotSpecSchema from "../../runtime/schemas/autopilot-spec.v2.json" with { type: "json" }; import candidateDecisionSchema from "../../runtime/schemas/candidate-decision.v2.json" with { type: "json" }; import resultSchema from "../../runtime/schemas/attempt-result.v1.json" with { type: "json" }; import reviewSchema from "../../runtime/schemas/review-report.v1.json" with { type: "json" }; @@ -9,7 +9,7 @@ import incrementSchema from "../../runtime/schemas/increment-report.v1.json" wit import verificationSchema from "../../runtime/schemas/verification-report.v1.json" with { type: "json" }; import advisorSchema from "../../runtime/schemas/advisor-report.v1.json" with { type: "json" }; import autopilotEligibilitySchema from "../../runtime/schemas/autopilot-eligibility.v1.json" with { type: "json" }; -import autopilotWorkflowStateSchema from "../../runtime/schemas/autopilot-workflow-state.v1.json" with { type: "json" }; +import autopilotWorkflowStateSchema from "../../runtime/schemas/autopilot-workflow-state.v2.json" with { type: "json" }; import runStatusSchema from "../../runtime/schemas/run-status.v1.json" with { type: "json" }; import pipelineGateClearedSchema from "../../runtime/schemas/pipeline-gate-cleared.v1.json" with { type: "json" }; diff --git a/src/protocol/spec-validator.ts b/src/protocol/spec-validator.ts index 5781877..24fb386 100644 --- a/src/protocol/spec-validator.ts +++ b/src/protocol/spec-validator.ts @@ -268,6 +268,16 @@ function taskIdForDelegationPath( } export function validateAutopilotSpec(input: unknown): ValidateAutopilotResult { + if (isRecord(input) && input.specVersion === "1") { + return { + ok: false, + errors: [{ + path: "#/specVersion", + message: "autopilot spec v1 is unsupported: Autopilot now ends at a final-reviewed " + + "local branch; remove `shipping` and set specVersion to \"2\"", + }], + }; + } const schemaValid = schemas.autopilotSpec(input); const errors: ValidationError[] = (schemas.autopilotSpec.errors ?? []) .filter(error => taskIdForDelegationPath(input, error.instancePath) === undefined) diff --git a/src/protocol/versions.ts b/src/protocol/versions.ts index 4ec4f03..dc0749c 100644 --- a/src/protocol/versions.ts +++ b/src/protocol/versions.ts @@ -1,5 +1,5 @@ -export const PROTOCOL_VERSION = "2.0.0" as const; // MCP tool contract version +export const PROTOCOL_VERSION = "3.0.0" as const; // MCP tool contract version export const DELEGATION_SPEC_VERSION = "1" as const; // wire schema major -export const AUTOPILOT_SPEC_VERSION = "1" as const; +export const AUTOPILOT_SPEC_VERSION = "2" as const; export const ATTEMPT_RESULT_VERSION = "1" as const; export const RUNTIME_VERSION = "0.52.0" as const; // mirrors plugin.json at release diff --git a/src/runtime/artifact-store.ts b/src/runtime/artifact-store.ts index b21928b..497f9b6 100644 --- a/src/runtime/artifact-store.ts +++ b/src/runtime/artifact-store.ts @@ -1,7 +1,6 @@ import { randomUUID } from "node:crypto"; import { constants } from "node:fs"; import { - link, lstat, mkdir, open, @@ -34,7 +33,7 @@ import { } from "../protocol/pipeline-gate-cleared.js"; import type { VerificationCommand } from "../protocol/delegation-spec.js"; import { loadSchemas } from "../protocol/schema-loader.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode, isMissing } from "../util/errors.js"; import { containsRegisteredSecret, containsRegisteredSecretValue, @@ -54,12 +53,11 @@ import { import { resolveStateDir } from "./state-dir.js"; import { getPlatformServices } from "../platform/select-platform.js"; import { PlatformSafety, platformSafety, openDurableDirectorySession } from "../platform/platform-safety.js"; -import type { CheckoutLock, PlatformServices } from "../platform/platform-services.js"; +import type { PlatformServices } from "../platform/platform-services.js"; import { advisorReportHash, autopilotDecisionEligibilityProjection, canonicalArtifactHash, - eligibilityInputFromArtifacts, evaluateAutopilotEligibility, pipelineResultHash, type AutopilotEligibilityRecord, @@ -67,6 +65,7 @@ import { import type { PipelineResult } from "../pipeline/pipeline-runtime.js"; import type { AdvisorReport } from "../pipeline/report-types.js"; import type { RunStatus } from "./run-status.js"; +import { flushDirectory } from "../platform/durable-directory.js"; const SAFE_COMPONENT = /^[A-Za-z0-9][A-Za-z0-9._-]*$/; const WINDOWS_RESERVED_COMPONENT = /^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i; @@ -200,14 +199,6 @@ export function validateComponent(value: string, kind: "run id" | "log name"): v } } -function errorCode(error: unknown): string | undefined { - return (error as NodeJS.ErrnoException).code; -} - -function isMissing(error: unknown): boolean { - return errorCode(error) === "ENOENT"; -} - function isAlreadyPresent(error: unknown): boolean { return errorCode(error) === "EEXIST"; } @@ -253,7 +244,7 @@ async function ensurePlainDirectory(directory: string): Promise { - let handle; - try { - handle = await open(directory, constants.O_RDONLY | NO_FOLLOW); - await handle.sync(); - } catch (error) { - const unsupportedOnWindows = process.platform === "win32" - && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode(error) ?? ""); - if (!unsupportedOnWindows) throw error; - } finally { - await handle?.close(); - } -} - async function readRegularFile( filename: string, parentIdentity?: DirectoryIdentity, @@ -1261,12 +1238,12 @@ export class ArtifactStore { this.readAdvisorReport(), ]); if (pipelineResult === null || reviewSnapshot === null || advisorReport === null) return null; - return evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + return evaluateAutopilotEligibility({ pipelineResult, reviewSnapshot, advisor: advisorReport, evaluatedAt: record.evaluatedAt, - })); + }); } /** @@ -1308,12 +1285,12 @@ export class ArtifactStore { throw new RuntimeError("advisor report cannot be safely persisted after redaction"); } const record = validateAutopilotEligibilityRecord(structuredClone(args.eligibility), this.runId); - const expected = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const expected = evaluateAutopilotEligibility({ pipelineResult: archivedPipelineResult, reviewSnapshot: archivedReviewSnapshot, advisor: sanitizedReport, evaluatedAt: record.evaluatedAt, - })); + }); if (canonicalArtifactHash(expected) !== canonicalArtifactHash(record)) { throw new RuntimeError("post-pipeline eligibility was not derived from the supplied frozen evidence"); } @@ -1649,7 +1626,7 @@ export class ArtifactStore { await handle.close(); } await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); - await syncDirectory(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); } finally { await journalLock.release(); @@ -1686,11 +1663,11 @@ export class ArtifactStore { await assertDirectoryIdentity(entry.directory, entry.identity); await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); await rename(entry.directory, quarantinePath); - await syncDirectory(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); await assertDirectoryIdentity(quarantinePath, entry.identity); await rm(quarantinePath, { recursive: true, force: false }); - await syncDirectory(this.runsRoot); + await flushDirectory(this.runsRoot); await this.appendCleanupRecord({ event: "prune-cleanup-complete", runId: entry.runId, @@ -1730,7 +1707,6 @@ export class ArtifactStore { let transaction: AnchorCleanupTransaction | null = null; let runsRootIdentity: DirectoryIdentity | null = null; let archiveRemovalCommitted = false; - let lease: CheckoutLock | null = null; try { // Fast path: never wait on a checkout lease for a run that still // advertises a live pipeline. Refuse before canonicalizing or locking. @@ -1765,8 +1741,7 @@ export class ArtifactStore { return; } const safety = new PlatformSafety(platformServices); - await safety.withCheckoutLease(canonical.canonical, async (acquiredLease) => { - lease = acquiredLease; + await safety.withCheckoutLease(canonical.canonical, async () => { await assertDirectoryIdentity(entry.directory, entry.identity); // Re-establish authority under the lease: the manifest, terminal // result, and active marker may all have changed while we waited. @@ -1813,12 +1788,12 @@ export class ArtifactStore { await assertDirectoryIdentity(entry.directory, entry.identity); await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); await rename(entry.directory, quarantinePath); - await syncDirectory(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity(this.runsRoot, runsRootIdentity); await assertDirectoryIdentity(quarantinePath, entry.identity); archiveRemovalCommitted = true; await rm(quarantinePath, { recursive: true, force: false }); - await syncDirectory(this.runsRoot); + await flushDirectory(this.runsRoot); await transaction.commit(); await this.appendCleanupRecord({ event: "prune-cleanup-complete", @@ -1861,7 +1836,7 @@ export class ArtifactStore { await assertDirectoryIdentity(this.runsRoot, expectedRunsRoot); await assertDirectoryIdentity(quarantinePath, entry.identity); await rename(quarantinePath, entry.directory); - await syncDirectory(this.runsRoot); + await flushDirectory(this.runsRoot); await assertDirectoryIdentity(this.runsRoot, expectedRunsRoot); await assertDirectoryIdentity(entry.directory, entry.identity); } else if (runDirectoryExists) { diff --git a/src/runtime/attempt-runtime.ts b/src/runtime/attempt-runtime.ts index 7b5593f..992264f 100644 --- a/src/runtime/attempt-runtime.ts +++ b/src/runtime/attempt-runtime.ts @@ -1,4 +1,4 @@ -import { createHash, randomUUID } from "node:crypto"; +import { randomUUID } from "node:crypto"; import { rm } from "node:fs/promises"; import { freezeCandidate } from "../git/candidate-tree.js"; import { git } from "../git/git-exec.js"; @@ -10,7 +10,6 @@ import type { PlatformServices, SupervisedExit, } from "../platform/platform-services.js"; -import { supervise } from "../platform/process-supervisor.js"; import { selectSandboxBackend } from "../platform/sandbox/backends.js"; import { getPlatformServices } from "../platform/select-platform.js"; import type { @@ -23,7 +22,6 @@ import type { import { classifyFailure } from "../protocol/attempt-result.js"; import type { DelegationSpec } from "../protocol/delegation-spec.js"; import { specSha256 } from "../protocol/spec-hash.js"; -import { probeAll } from "../producers/capability-probe.js"; import { detectEnvironmentType, type CapabilityReport, @@ -42,7 +40,6 @@ import { logger } from "../util/logger.js"; import { verifyBaseline } from "../verify/baseline-verifier.js"; import { ArtifactStore } from "./artifact-store.js"; import { - buildEnvironment, registerSensitiveEnvironment, type BuiltEnvironment, type EnvProvenance, @@ -60,10 +57,8 @@ import { } from "./run-manifest.js"; import { initializeRunStart, - parentDeathWatchdogInvocation, type RunStartContext, type RunStartRecord, - withRunStartPidRecording, } from "./run-start.js"; import { writeRunStatusSafely, @@ -71,7 +66,6 @@ import { type RunStatusPhase, } from "./run-status.js"; -const MAX_PRODUCER_OUTPUT_BYTES = 1_000_000; const MAX_SNAPSHOT_DIFF_BYTES = 100_000; // Best-effort salvage evidence for attempts that end without a frozen candidate @@ -234,17 +228,6 @@ function producerLog(exit: SupervisedExit | null): string { ].join("\n"); } -function preCancelledExit(): SupervisedExit { - return { - exitCode: null, - signal: null, - timedOut: false, - cancelled: true, - stdout: "", - stderr: "", - truncated: { stdout: false, stderr: false }, - }; -} async function archiveTerminal(context: TerminalContext): Promise { @@ -298,7 +281,11 @@ async function archiveTerminal(context: TerminalContext): Promise configurationProfile: context.profile, temporaryHomeApplied: context.temporaryHomeApplied, }), - verificationPolicy: context.evidence.verificationPolicy ?? [], + // Absent stays absent: "the verifier recorded nothing" must not read as + // "no command ran", which the decision policy treats as confined. + ...(context.evidence.verificationPolicy === undefined + ? {} + : { verificationPolicy: context.evidence.verificationPolicy }), }, repositoryInstructions: context.repositoryInstructions, prompt: context.invocation?.stdin ?? `${context.spec.objective}\n${context.spec.context}`, diff --git a/src/runtime/environment-policy.ts b/src/runtime/environment-policy.ts index 5343483..d0cbf91 100644 --- a/src/runtime/environment-policy.ts +++ b/src/runtime/environment-policy.ts @@ -209,6 +209,10 @@ export function buildEnvironment( } for (const [name, value] of Object.entries(args.specAdditions ?? {})) { + // HOME, PATH, TMPDIR and the rest are the confinement's own inputs. + if (provenance.get(name) === "platform") { + throw new RuntimeError(`delegation environment may not override ${JSON.stringify(name)}`); + } setEnvironmentValue(env, provenance, name, value, "spec"); } @@ -220,6 +224,16 @@ export function buildEnvironment( "platform", ); const environmentSecretRegistration = registerSensitiveEnvironment(env); + // Name patterns cannot recognize every vendor's credential variable, so any + // value an adapter or the spec chose to hand the Producer is redacted from + // runtime output. Absolute paths are locations, not secrets, and redacting + // them would destroy diagnostics. + const passedValueRegistration = combineSecretRegistrations( + [...provenance.entries()] + .filter(([name, source]) => + (source === "adapter" || source === "spec") && !path.isAbsolute(env[name] ?? "")) + .map(([name]) => registerSecretValue(env[name] ?? "")), + ); return { env, @@ -229,6 +243,7 @@ export function buildEnvironment( secretRegistration: combineSecretRegistrations([ hostSecretRegistration, environmentSecretRegistration, + passedValueRegistration, ]), }; } catch (error) { diff --git a/src/runtime/managed-worktree-root.ts b/src/runtime/managed-worktree-root.ts new file mode 100644 index 0000000..d6ee171 --- /dev/null +++ b/src/runtime/managed-worktree-root.ts @@ -0,0 +1,212 @@ +import { createHash } from "node:crypto"; +import { constants } from "node:fs"; +import { lstat, mkdir, open, readdir, realpath } from "node:fs/promises"; +import path from "node:path"; +import { ensurePrivateDirectory, syncDirectoryMetadata } from "../platform/durable-directory.js"; +import { openDurableDirectorySession, writeAtomic } from "../platform/durable-write.js"; +import { RuntimeError, errorCode, isMissing } from "../util/errors.js"; +import { platformPathsEqual } from "../util/platform-path.js"; +import { readStableRegularFile } from "../util/stable-file.js"; +import type { git } from "../git/git-exec.js"; +import { resolveStateDir } from "./state-dir.js"; + +/** + * Managed worktrees live beside the checkout they were made from, in a + * namespace the runtime owns exclusively: + * + * /.worktrees/claude-architect/ + * + * `.worktrees/` itself is shared with the user and never modified beyond being + * created; only the `claude-architect` namespace is private, self-ignoring, and + * swept by recovery. Each namespace is recorded in the state directory so + * startup recovery can find orphans without knowing which checkouts exist. + */ +export const WORKTREES_DIRECTORY = ".worktrees"; +export const WORKTREE_NAMESPACE = "claude-architect"; + +const IGNORE_FILE = ".gitignore"; +const IGNORE_CONTENTS = "*\n"; +const ROOT_RECORDS_DIRECTORY = "worktree-roots"; +const MAX_ROOT_RECORD_BYTES = 4_096n; +const ROOT_RECORD_NAME = /^[0-9a-f]{64}$/u; + +export function managedWorktreeRootFor(checkoutRoot: string): string { + return path.join(path.resolve(checkoutRoot), WORKTREES_DIRECTORY, WORKTREE_NAMESPACE); +} + +/** + * One namespace per repository, in its main checkout, so a delegation started + * from a linked worktree (including a managed one) never nests worktrees + * inside another checkout. Git lists the main worktree first; a bare + * repository has none, so its namespace stays beside the given checkout. + */ +export async function repositoryNamespaceRoot( + checkoutRoot: string, + runGit: typeof git, +): Promise { + const listed = await runGit(checkoutRoot, ["worktree", "list", "--porcelain", "-z"]); + if (listed.exitCode !== 0 + || listed.truncated?.stdout === true + || listed.truncated?.stderr === true) { + throw new RuntimeError("repository worktrees could not be listed"); + } + const records = listed.stdout.split("\0"); + const main = records[0]; + if (main === undefined || !main.startsWith("worktree ")) { + throw new RuntimeError("repository main worktree could not be identified"); + } + const firstBlockEnd = records.indexOf(""); + const firstBlock = records.slice(0, firstBlockEnd === -1 ? records.length : firstBlockEnd); + const base = firstBlock.includes("bare") ? checkoutRoot : main.slice("worktree ".length); + return managedWorktreeRootFor(await realpath(base)); +} + +/** Pre-0.53 runtimes kept every managed worktree under the state directory. */ +export function legacyManagedWorktreeRoot(stateRoot: string = resolveStateDir()): string { + return path.join(path.resolve(stateRoot), "worktrees"); +} + +export function isManagedWorktreeNamespace(root: string): boolean { + return path.basename(root) === WORKTREE_NAMESPACE + && path.basename(path.dirname(root)) === WORKTREES_DIRECTORY; +} + +/** Entries in a managed root that are part of the namespace, not worktrees. */ +export function isNamespaceControlEntry(name: string): boolean { + return name === IGNORE_FILE; +} + +function rootRecordName(root: string): string { + return createHash("sha256").update(root).digest("hex"); +} + +async function plainDirectory(directory: string, description: string): Promise { + const metadata = await lstat(directory); + if (!metadata.isDirectory() || metadata.isSymbolicLink()) { + throw new RuntimeError(`${description} must be a plain directory`); + } +} + +/** + * Create (or validate) the private namespace for one checkout, make it ignore + * itself so the checkout stays clean, and record it for recovery. Idempotent. + */ +export async function prepareManagedWorktreeRoot( + root: string, + options: { syncDirectory?: (directory: string) => Promise } = {}, +) { + if (!isManagedWorktreeNamespace(root) || !path.isAbsolute(root)) { + throw new RuntimeError("managed worktree root is outside the managed namespace"); + } + const shared = path.dirname(root); + try { + await mkdir(shared); + } catch (error) { + if (errorCode(error) !== "EEXIST") throw error; + } + await plainDirectory(shared, "checkout worktrees directory"); + const identity = await ensurePrivateDirectory(root, { + description: "managed worktree root", + migratePermissions: true, + ...(options.syncDirectory === undefined ? {} : { syncDirectory: options.syncDirectory }), + }); + await ensureNamespaceIgnored(root, options.syncDirectory ?? syncDirectoryMetadata); + await recordManagedWorktreeRoot(root, options); + return identity; +} + +async function ensureNamespaceIgnored( + root: string, + syncDirectory: (directory: string) => Promise, +): Promise { + const ignorePath = path.join(root, IGNORE_FILE); + try { + const handle = await open( + ignorePath, + constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW ?? 0), + 0o600, + ); + try { + await handle.writeFile(IGNORE_CONTENTS, "utf8"); + await handle.sync(); + } finally { + await handle.close(); + } + await syncDirectory(root); + } catch (error) { + if (errorCode(error) !== "EEXIST") throw error; + } + const existing = await readStableRegularFile(ignorePath, MAX_ROOT_RECORD_BYTES); + if (existing === null || existing.toString("utf8") !== IGNORE_CONTENTS) { + throw new RuntimeError("managed worktree root ignore file was replaced"); + } +} + +async function recordManagedWorktreeRoot( + root: string, + options: { syncDirectory?: (directory: string) => Promise }, +): Promise { + const session = await openDurableDirectorySession( + path.join(resolveStateDir(), ROOT_RECORDS_DIRECTORY), + { + description: "managed worktree root records", + privateDirectory: true, + create: true, + ...(options.syncDirectory === undefined + ? {} + : { policy: { syncDirectory: options.syncDirectory } }), + }, + ); + try { + await writeAtomic(session, rootRecordName(root), `${root}\n`, "immutable"); + } finally { + await session.close(); + } +} + +/** + * Every managed worktree root recovery must sweep: the legacy state-directory + * root plus each recorded checkout namespace that still exists. A record that + * does not name its own key, or names a path outside the namespace, is + * reported rather than trusted. + */ +export async function managedWorktreeRoots(): Promise<{ roots: string[]; malformed: string[] }> { + const roots = [legacyManagedWorktreeRoot()]; + const malformed: string[] = []; + const recordsDirectory = path.join(resolveStateDir(), ROOT_RECORDS_DIRECTORY); + let names: string[]; + try { + names = await readdir(recordsDirectory); + } catch (error) { + if (isMissing(error)) return { roots, malformed }; + throw error; + } + for (const name of names.sort()) { + if (name.startsWith(".")) continue; + const recordPath = path.join(recordsDirectory, name); + const bytes = ROOT_RECORD_NAME.test(name) + ? await readStableRegularFile(recordPath, MAX_ROOT_RECORD_BYTES) + : null; + const root = bytes?.toString("utf8").replace(/\n$/u, "") ?? ""; + if (bytes === null + || !path.isAbsolute(root) + || path.resolve(root) !== root + || !isManagedWorktreeNamespace(root) + || rootRecordName(root) !== name) { + malformed.push(recordPath); + continue; + } + roots.push(root); + } + return { roots, malformed }; +} + +/** True when `root` is the legacy root or a recorded checkout namespace. */ +export async function isManagedWorktreeRoot(root: string): Promise { + const legacy = legacyManagedWorktreeRoot(); + const canonicalLegacy = await realpath(legacy).catch(() => legacy); + if (platformPathsEqual(root, legacy) || platformPathsEqual(root, canonicalLegacy)) return true; + if (!isManagedWorktreeNamespace(root)) return false; + const { roots } = await managedWorktreeRoots(); + return roots.some(candidate => platformPathsEqual(candidate, root)); +} diff --git a/src/runtime/recovery-autopilot.ts b/src/runtime/recovery-autopilot.ts new file mode 100644 index 0000000..c59c595 --- /dev/null +++ b/src/runtime/recovery-autopilot.ts @@ -0,0 +1,515 @@ +import { createHash } from "node:crypto"; +import type { Dirent } from "node:fs"; +import { lstat, readdir, realpath } from "node:fs/promises"; +import path from "node:path"; +import { + WorkflowBranchManager, + type WorkflowBranchIdentity, + type WorkflowBranchBootstrapOwnerRecord, +} from "../autopilot/branch-manager.js"; +import type { AutopilotWorkflowState } from "../autopilot/types.js"; +import { + SAFE_WORKFLOW_ID, + TERMINAL_PHASES, + WorkflowStore, + type WorkflowIntentJournal, + type WorkflowOwnerRecord, +} from "../autopilot/workflow-store.js"; +import { git } from "../git/git-exec.js"; +import { gitNulRecords, gitPathOutput } from "../git/git-output.js"; +import { findWorktreeRegistration } from "../git/worktree-registration.js"; +import { lockOwnerStatus, type LockOwnerStatus } from "../platform/lock-ownership.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; +import { + OID, + type WorktreeSweepIssue, + readBoundedRegularFile, + plainDirectoryIdentity, + worktreeSweepIssue, +} from "./recovery-shared.js"; + +export type AutopilotRecoveryDisposition = + | "live-preserve" + | "resume" + | "dispose" + | "human-decision-required"; + +export interface AutopilotRecoveryResult { + workflowId: string; + disposition: AutopilotRecoveryDisposition; +} + +type OwnerObservation = + | { presence: "absent" } + | { presence: "present"; status: LockOwnerStatus }; + +interface BranchObservation { + presence: "absent" | "present" | "ambiguous"; + identity: WorkflowBranchIdentity | null; + owner: WorkflowBranchBootstrapOwnerRecord | null; + ownerStatus: LockOwnerStatus | null; +} + +function exactObjectKeys(value: Record, expected: readonly string[]): boolean { + const actual = Object.keys(value).sort(); + const sortedExpected = [...expected].sort(); + return actual.length === sortedExpected.length + && actual.every((key, index) => key === sortedExpected[index]); +} + +function parseWorkflowLease(text: string, workflowId: string): WorkflowOwnerRecord | null { + let value: unknown; + try { + value = JSON.parse(text) as unknown; + } catch { + return null; + } + if (typeof value !== "object" || value === null || Array.isArray(value)) return null; + const record = value as Record; + if (!exactObjectKeys(record, ["workflowId", "pid", "processToken", "acquiredAt"]) + || record.workflowId !== workflowId + || !Number.isSafeInteger(record.pid) + || (record.pid as number) < 1 + || (record.processToken !== null + && (typeof record.processToken !== "string" + || record.processToken.length < 1 + || record.processToken.length > 256)) + || typeof record.acquiredAt !== "string" + || Number.isNaN(Date.parse(record.acquiredAt))) return null; + return record as unknown as WorkflowOwnerRecord; +} + +export async function observeWorkflowLease( + store: WorkflowStore, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + const text = await readBoundedRegularFile(store.ownerPath).catch(() => undefined); + if (text === undefined) return { presence: "present", status: "unverifiable" }; + if (text === null) return { presence: "absent" }; + const record = parseWorkflowLease(text, store.workflowId); + if (record === null) return { presence: "present", status: "unverifiable" }; + return { + presence: "present", + status: await lockOwnerStatus(record, isProcessAlive, getProcessStartToken) + .catch((): LockOwnerStatus => "unverifiable"), + }; +} + +function branchOwnershipPath(root: string, workflowId: string): string { + const name = createHash("sha256").update(workflowId).digest("hex"); + return path.join(root, "autopilot-branches", `${name}.json`); +} + +async function observeWorkflowBranch( + root: string, + workflowId: string, + manager: WorkflowBranchManager, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + const registration = await readBoundedRegularFile(branchOwnershipPath(root, workflowId)) + .catch(() => undefined); + if (registration === undefined) { + return { presence: "ambiguous", identity: null, owner: null, ownerStatus: null }; + } + if (registration === null) { + return { presence: "absent", identity: null, owner: null, ownerStatus: null }; + } + const [identity, owner] = await Promise.all([ + manager.load(workflowId), + manager.readBootstrapOwner(workflowId), + ]).catch(() => [null, null] as const); + if (identity === null || owner === null) { + return { presence: "ambiguous", identity: null, owner: null, ownerStatus: null }; + } + return { + presence: "present", + identity, + owner, + ownerStatus: await lockOwnerStatus(owner, isProcessAlive, getProcessStartToken) + .catch((): LockOwnerStatus => "unverifiable"), + }; +} + +function isWorkflowBranchIdentity(value: unknown): value is WorkflowBranchIdentity { + if (typeof value !== "object" || value === null || Array.isArray(value)) return false; + const identity = value as Partial; + return identity.ownershipVersion === "1" + && typeof identity.workflowId === "string" + && SAFE_WORKFLOW_ID.test(identity.workflowId) + && typeof identity.checkoutPath === "string" + && typeof identity.gitCommonDir === "string" + && typeof identity.repositoryIdentity === "string" + && typeof identity.worktreePath === "string" + && typeof identity.worktreeGitDir === "string" + && typeof identity.branch === "string" + && identity.branchRef === `refs/heads/${identity.branch}` + && identity.baseRef === `refs/claude-architect/autopilot/${identity.workflowId}/base` + && typeof identity.baseBranch === "string" + && typeof identity.baseCommitOid === "string" + && OID.test(identity.baseCommitOid) + && identity.remote === "origin" + && typeof identity.remoteUrl === "string" + && typeof identity.ownerRepo === "string"; +} + +function branchMatchesWorkflowState( + branch: WorkflowBranchIdentity, + state: AutopilotWorkflowState, +): boolean { + return branch.workflowId === state.workflowId + && branch.repositoryIdentity === state.repositoryIdentity + && branch.baseCommitOid === state.baseCommitOid + && branch.branchRef === state.workflowRef + && branch.worktreePath === state.worktreePath + && branch.branch === state.branch; +} + +function sameWorkflowBranch( + left: WorkflowBranchIdentity, + right: WorkflowBranchIdentity, +): boolean { + return left.ownershipVersion === right.ownershipVersion + && left.workflowId === right.workflowId + && left.checkoutPath === right.checkoutPath + && left.gitCommonDir === right.gitCommonDir + && left.repositoryIdentity === right.repositoryIdentity + && left.worktreePath === right.worktreePath + && left.worktreeGitDir === right.worktreeGitDir + && left.branch === right.branch + && left.branchRef === right.branchRef + && left.baseRef === right.baseRef + && left.baseBranch === right.baseBranch + && left.baseCommitOid === right.baseCommitOid + && left.remote === right.remote + && left.remoteUrl === right.remoteUrl + && left.ownerRepo === right.ownerRepo; +} + +function canonicalGithubRemote(raw: string): string | null { + let parsed: URL; + try { + parsed = new URL(raw); + } catch { + return null; + } + if (parsed.protocol !== "https:" + || parsed.hostname.toLowerCase() !== "github.com" + || parsed.port !== "" + || parsed.username !== "" + || parsed.password !== "" + || parsed.search !== "" + || parsed.hash !== "" + || parsed.pathname.includes("%") + || parsed.pathname.endsWith("/") + || parsed.pathname.includes("//")) return null; + const components = parsed.pathname.slice(1).split("/"); + if (components.length !== 2) return null; + const owner = components[0]!; + const repository = components[1]!.endsWith(".git") + ? components[1]!.slice(0, -4) + : components[1]!; + const component = /^[A-Za-z0-9_.-]+$/u; + if (!component.test(owner) + || !component.test(repository) + || owner === "." + || owner === ".." + || repository === "." + || repository === "..") return null; + return `https://github.com/${owner.toLowerCase()}/${repository.toLowerCase()}.git`; +} + +function recordedBranch( + journal: WorkflowIntentJournal, + state: AutopilotWorkflowState, +): WorkflowBranchIdentity | null { + const recorded = journal.intents.find(status => + status.intent.operation === "record-workflow-spec" + && status.intent.idempotencyKey === "workflow-spec"); + const completion = recorded?.completion?.completion; + if (typeof completion !== "object" || completion === null || Array.isArray(completion)) { + return null; + } + const branch = (completion as { branch?: unknown }).branch; + return isWorkflowBranchIdentity(branch) && branchMatchesWorkflowState(branch, state) + ? branch + : null; +} + +function expectedWorkflowHead(state: AutopilotWorkflowState): string | null { + const head = state.tasks + .slice(0, state.currentTaskIndex + 1) + .reduce((current, task) => task.promotionCommitOid ?? current, state.baseCommitOid); + return OID.test(head) ? head : null; +} + +async function isAbsent(filename: string): Promise { + try { + await lstat(filename); + return false; + } catch (error) { + return isMissing(error) ? true : null; + } +} + +async function activeBranchIsDirectlyObserved( + branch: WorkflowBranchIdentity, + expectedHead: string, + runGit: typeof git, +): Promise { + let canonicalCheckout: string; + let canonicalWorktree: string; + let canonicalCommonDir: string; + try { + [canonicalCheckout, canonicalWorktree, canonicalCommonDir] = await Promise.all([ + realpath(branch.checkoutPath), + realpath(branch.worktreePath), + realpath(branch.gitCommonDir), + ]); + } catch { + return false; + } + if (canonicalCheckout !== branch.checkoutPath + || canonicalWorktree !== branch.worktreePath + || canonicalCommonDir !== branch.gitCommonDir) return false; + + const [commonDir, worktrees, symbolic, head, base, status, remote] = await Promise.all([ + runGit(branch.checkoutPath, ["rev-parse", "--path-format=absolute", "--git-common-dir"]), + runGit(branch.checkoutPath, ["worktree", "list", "--porcelain", "-z"]), + runGit(branch.worktreePath, ["symbolic-ref", "--quiet", "--short", "HEAD"]), + runGit(branch.worktreePath, ["rev-parse", "--verify", "HEAD"]), + runGit(branch.checkoutPath, ["rev-parse", "--verify", branch.baseRef]), + runGit(branch.worktreePath, [ + "status", "--porcelain=v1", "--untracked-files=all", "--ignore-submodules=none", + ]), + runGit(branch.checkoutPath, ["config", "--get", "remote.origin.url"]), + ]); + if ([commonDir, worktrees, symbolic, head, base, status, remote].some(result => + result.truncated?.stdout === true || result.truncated?.stderr === true) + || commonDir.exitCode !== 0 + || worktrees.exitCode !== 0 + || symbolic.exitCode !== 0 + || head.exitCode !== 0 + || base.exitCode !== 0 + || status.exitCode !== 0 + || remote.exitCode !== 0) return false; + let observedCommonDir: string; + try { + observedCommonDir = await realpath(gitPathOutput( + commonDir.stdout, + "active workflow common directory", + )); + } catch { + return false; + } + if (observedCommonDir !== branch.gitCommonDir + || symbolic.stdout.trim() !== branch.branch + || head.stdout.trim() !== expectedHead + || base.stdout.trim() !== branch.baseCommitOid + || status.stdout !== "" + || canonicalGithubRemote(remote.stdout.trim()) !== branch.remoteUrl) return false; + + const fields = gitNulRecords(worktrees.stdout, "active-branch Git worktree list"); + const registrationIndex = await findWorktreeRegistration(fields, branch.worktreePath); + if (registrationIndex === -1) return false; + const nextRegistration = fields.findIndex((field, index) => + index > registrationIndex && field.startsWith("worktree ")); + const registration = fields.slice( + registrationIndex + 1, + nextRegistration === -1 ? undefined : nextRegistration, + ); + return registration.includes(`HEAD ${expectedHead}`) + && registration.includes(`branch ${branch.branchRef}`); +} + +async function workflowIds( + root: string, + issues: WorktreeSweepIssue[], +): Promise { + const ids = new Set(); + const workflowsRoot = path.join(root, "workflows"); + let workflowEntries: Dirent[] = []; + try { + const workflowsIdentity = await plainDirectoryIdentity(workflowsRoot); + workflowEntries = workflowsIdentity === null + ? [] + : await readdir(workflowsRoot, { withFileTypes: true }); + } catch (error) { + issues.push(worktreeSweepIssue(workflowsRoot, error)); + } + for (const entry of workflowEntries) { + if (entry.isDirectory() && !entry.isSymbolicLink() && SAFE_WORKFLOW_ID.test(entry.name)) { + ids.add(entry.name); + } + } + + const branchesRoot = path.join(root, "autopilot-branches"); + let branchEntries: Dirent[] = []; + try { + const branchesIdentity = await plainDirectoryIdentity(branchesRoot); + branchEntries = branchesIdentity === null + ? [] + : await readdir(branchesRoot, { withFileTypes: true }); + } catch (error) { + issues.push(worktreeSweepIssue(branchesRoot, error)); + } + for (const entry of branchEntries) { + if (!entry.isFile() || entry.isSymbolicLink() || !/^[0-9a-f]{64}\.json$/u.test(entry.name)) { + continue; + } + const ownershipPath = path.join(branchesRoot, entry.name); + let text: string | null; + let value: unknown; + try { + text = await readBoundedRegularFile(ownershipPath); + if (text === null) { + throw new RuntimeError("workflow ownership record is absent or unstable"); + } + value = JSON.parse(text) as unknown; + } catch (error) { + issues.push(worktreeSweepIssue(ownershipPath, error)); + continue; + } + if (typeof value !== "object" || value === null || Array.isArray(value)) continue; + const workflowId = (value as { workflowId?: unknown }).workflowId; + if (typeof workflowId === "string" + && SAFE_WORKFLOW_ID.test(workflowId) + && entry.name === path.basename(branchOwnershipPath(root, workflowId))) { + ids.add(workflowId); + } + } + return [...ids].sort((left, right) => left.localeCompare(right)); +} + +export async function recoverAutopilotWorkflows( + root: string, + dependencies: { + isProcessAlive: (pid: number) => boolean; + getProcessStartToken: (pid: number) => Promise; + runGit: typeof git; + }, + workflowIssues: WorktreeSweepIssue[], +): Promise { + const results: AutopilotRecoveryResult[] = []; + const branchManager = new WorkflowBranchManager({ git: dependencies.runGit }); + // Isolate every workflow: the run loop below already quarantines per entry, + // but a throw here (branch cleanup, finalization) propagated all the way out + // of recoverStaleRuns and discarded the dispositions already computed for + // earlier workflows. Because the failure is deterministic — same dead owner, + // same on-disk evidence — every later startup aborted at the same workflow. + for (const workflowId of await workflowIds(root, workflowIssues)) { + try { + const store = new WorkflowStore(workflowId, { + stateDirectory: root, + isProcessAlive: dependencies.isProcessAlive, + getProcessStartToken: dependencies.getProcessStartToken, + }); + const [lease, branch] = await Promise.all([ + observeWorkflowLease( + store, + dependencies.isProcessAlive, + dependencies.getProcessStartToken, + ), + observeWorkflowBranch( + root, + workflowId, + branchManager, + dependencies.isProcessAlive, + dependencies.getProcessStartToken, + ), + ]); + + if ((lease.presence === "present" && lease.status === "live") + || branch.ownerStatus === "live") { + results.push({ workflowId, disposition: "live-preserve" }); + continue; + } + + const stateAbsent = await isAbsent(store.statePath); + if (stateAbsent === true) { + if (branch.presence === "present" && branch.ownerStatus === "dead" + && branch.identity !== null) { + const cleanup = await branchManager.cleanup(branch.identity, branch.identity.baseCommitOid); + results.push({ + workflowId, + disposition: cleanup.ok && cleanup.worktreeRemoved && cleanup.refsRemoved + ? "dispose" + : "human-decision-required", + }); + } else { + results.push({ workflowId, disposition: "human-decision-required" }); + } + continue; + } + if (stateAbsent !== false) { + results.push({ workflowId, disposition: "human-decision-required" }); + continue; + } + + let state: AutopilotWorkflowState; + let journal: WorkflowIntentJournal; + try { + [state, journal] = await Promise.all([store.read(), store.readIntentJournal()]); + } catch { + results.push({ workflowId, disposition: "human-decision-required" }); + continue; + } + if (TERMINAL_PHASES.has(state.phase)) { + if ((lease.presence === "present" && lease.status === "unverifiable") + || branch.ownerStatus === "unverifiable") { + results.push({ workflowId, disposition: "human-decision-required" }); + } + continue; + } + if (lease.presence !== "present" || lease.status !== "dead" + || branch.presence === "ambiguous" + || branch.ownerStatus === "unverifiable") { + results.push({ workflowId, disposition: "human-decision-required" }); + continue; + } + + const recorded = recordedBranch(journal, state); + if (recorded === null) { + results.push({ workflowId, disposition: "human-decision-required" }); + continue; + } + if (state.phase === "cleaning-up") { + // Cleanup is finished by the controller's own resume, whose branch + // manager revalidates every identity under the checkout lease before it + // removes anything. Recovery only establishes that the workflow is + // abandoned and belongs to the recorded branch; a second proof of the + // same crash window here could disagree with the one that acts. + const foreignBranch = branch.presence === "present" + && (branch.identity === null || !sameWorkflowBranch(branch.identity, recorded)); + results.push({ + workflowId, + disposition: foreignBranch ? "human-decision-required" : "resume", + }); + continue; + } + + if (branch.presence !== "present" + || branch.identity === null + || branch.ownerStatus !== "dead" + || !sameWorkflowBranch(branch.identity, recorded)) { + results.push({ workflowId, disposition: "human-decision-required" }); + continue; + } + const expectedHead = expectedWorkflowHead(state); + if (expectedHead === null + || !await activeBranchIsDirectlyObserved( + branch.identity, + expectedHead, + dependencies.runGit, + )) { + results.push({ workflowId, disposition: "human-decision-required" }); + continue; + } + results.push({ workflowId, disposition: "resume" }); + } catch { + results.push({ workflowId, disposition: "human-decision-required" }); + } + } + return results; +} diff --git a/src/runtime/recovery-manager.ts b/src/runtime/recovery-manager.ts index 733e20d..bee8daf 100644 --- a/src/runtime/recovery-manager.ts +++ b/src/runtime/recovery-manager.ts @@ -1,163 +1,51 @@ -import { createHash, randomUUID } from "node:crypto"; -import { constants, type Dirent } from "node:fs"; -import { - lstat, - link, - mkdir, - open, - readdir, - realpath, - rename, - rm, -} from "node:fs/promises"; +import { createHash } from "node:crypto"; +import { mkdir, readdir, realpath } from "node:fs/promises"; import path from "node:path"; import nodeProcess from "node:process"; -import { - WorkflowBranchManager, - workflowOwnershipRecordWorkflowId, - workflowWorktreeOwnershipClaim, - type WorkflowWorktreeOwnershipClaim, - type WorkflowBranchIdentity, - type WorkflowBranchBootstrapOwnerRecord, -} from "../autopilot/branch-manager.js"; -import type { AutopilotWorkflowState } from "../autopilot/types.js"; -import { - SAFE_WORKFLOW_ID, - TERMINAL_PHASES, - WorkflowStore, - type WorkflowIntentJournal, - type WorkflowOwnerRecord, -} from "../autopilot/workflow-store.js"; -import { git, type GitResult } from "../git/git-exec.js"; -import { SLICE_REF_PREFIX } from "../git/ref-namespace.js"; -import { gitNulRecords, gitPathOutput } from "../git/git-output.js"; -import { - canonicalizeWorktreePath, - findWorktreeRegistration, -} from "../git/worktree-registration.js"; -import { - managedWorktreeDirectoryIdentity, - removeMissingRegisteredWorktree, - removeQuarantinedDirectory, - removeRegisteredWorktree, - restoreStagedRegistration, - WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY, - type ManagedWorktreeDirectoryIdentity, -} from "./worktree-manager.js"; +import { SAFE_WORKFLOW_ID } from "../autopilot/workflow-store.js"; +import { git } from "../git/git-exec.js"; import { lockOwnerStatus, - parseLockOwner, type LockOwnerStatus, - type LockOwner, - type AcquiredLock, - type DeadLockReclaimResult, reclaimDeadLock, reclaimDeadCheckoutLocks, - reclaimLocks, lockIsOwnedByLiveProcess, - validateOwnedLockState, - validatePublishedLock, - removeExpectedLockPath, - cleanupOwnedLockPaths, - createOwnedLock, acquireOwnedLock, releaseOwnedLock, defaultIsProcessAlive, } from "../platform/lock-ownership.js"; -import { platformSafety } from "../platform/platform-safety.js"; import type { PlatformServices } from "../platform/platform-services.js"; import { CLEANUP_JOURNAL_LOCK_KEY } from "../platform/posix-platform-services.js"; import { getPlatformServices } from "../platform/select-platform.js"; -import { - emptyBoundDirectory, - removeBoundEmptyDirectory, -} from "../platform/bound-directory-cleanup.js"; -import type { AttemptResult } from "../protocol/attempt-result.js"; -import { - assertWindowsPrivateDirectory, - ensurePrivateDirectory, - syncDirectoryMetadata, -} from "../platform/durable-directory.js"; import { RuntimeError } from "../util/errors.js"; -import { logger } from "../util/logger.js"; import { platformPathsEqual } from "../util/platform-path.js"; -import { readStableRegularFile } from "../util/stable-file.js"; import { ArtifactStore } from "./artifact-store.js"; -import { boundedRedactedDiagnostic } from "./redaction.js"; -import { resolveStateDir } from "./state-dir.js"; +import { readPendingWorktreeRemovalManifests } from "./worktree-removal-manifest.js"; import { - readPendingWorktreeRemovalManifests, - readWorktreeRemovalManifest, - removeWorktreeRemovalManifest, - settleLinkedWorktreeRemovalManifest, - type WorktreeRemovalManifest, - type WorktreeRemovalManifestIssue, -} from "./worktree-removal-manifest.js"; - -const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; -const MAX_STATE_FILE_BYTES = 8_000_000; -const MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); -const SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]*$/; -const WORKFLOW_WORKTREE_NAME = /^workflow-([0-9a-f]{32})(?:-final)?$/; -const LEGACY_FINAL_WORKTREE_NAME = /^final-([0-9a-f]{24})$/; -const WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; -const OID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; -const CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; -const BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; -const MAX_QUARANTINE_REASON_BYTES = 2_000; -const MAX_QUARANTINE_RECORD_BYTES = 4_096; -const MAX_WORKTREE_SWEEP_ISSUES = 100; - -interface RunStartRecord { - runId: string; - lockKey: string; - canonicalCommonDir: string; - pid: number | null; - processToken: string | null; - startedAt: string; -} - -type PruneReason = "max-age" | "max-bytes"; -type AnchorCleanup = "not-applicable" | "deleted" | "already-absent"; - -interface CleanupRecord { - event: "prune-cleanup-intent" | "prune-cleanup-complete" | "prune-cleanup-rollback"; - runId: string; - reason: PruneReason; - anchorCleanup: AnchorCleanup | "pending"; - archiveBytes: number; - quarantineName: string; - repoRoot: string | null; - anchorRef: string | null; - backupRef: string | null; - candidateCommitOid: string | null; - recordedAt: string; -} - -interface CleanupJournalRead { - text: string | null; - tornTail: boolean; -} - -interface RecoveryQuarantineRecord { - event: "recovery-quarantine"; - runId: string; - reason: string; - recordedAt: string; -} - -interface DirectoryIdentity { - dev: bigint; - ino: bigint; - birthtimeNs: bigint; -} - -interface RecoveryQuarantineSnapshot { - bytes: Buffer; - runIds: Set; - rootIdentity: DirectoryIdentity; - journalIdentity: DirectoryIdentity | null; -} + SAFE_RUN_ID, + type RunStartRecord, + type WorktreeSweepIssue, + validateRunId, + stateRoot, + readBoundedRegularFile, + plainDirectoryIdentity, + parseRunStart, + validateTerminalResult, + validateGitCommonDir, + worktreeSweepIssue, + boundedWorktreeSweepIssues, +} from "./recovery-shared.js"; +import { replayInterruptedPrunes } from "./recovery-prune-journal.js"; +import { readRecoveryQuarantineJournal, quarantineRun } from "./recovery-quarantine.js"; +import { + archiveInterruptedPipeline, + cleanupTemporarySliceRefs, + cleanupRunWorktreesUnderLease, + recoverRun, +} from "./recovery-runs.js"; +import { recoverPendingWorktreeRemovals } from "./recovery-worktree-removals.js"; +import { sweepOrphanWorktrees } from "./recovery-worktree-sweep.js"; +import { type AutopilotRecoveryResult, recoverAutopilotWorkflows } from "./recovery-autopilot.js"; export interface RecoveryDependencies { /** @@ -173,18 +61,6 @@ export interface RecoveryDependencies { git?: typeof git; } -export type AutopilotRecoveryDisposition = - | "live-preserve" - | "resume" - | "finalize" - | "dispose" - | "human-decision-required"; - -export interface AutopilotRecoveryResult { - workflowId: string; - disposition: AutopilotRecoveryDisposition; -} - export interface RecoveryResult { recovered: string[]; quarantined: string[]; @@ -192,3355 +68,6 @@ export interface RecoveryResult { worktreeSweepIssues?: WorktreeSweepIssue[]; } -export interface WorktreeSweepIssue { - worktreePath: string; - reason: string; - repositoryIdentity?: string; -} - - -function errorCode(error: unknown): string | undefined { - return (error as NodeJS.ErrnoException).code; -} - -function isMissing(error: unknown): boolean { - return errorCode(error) === "ENOENT"; -} - -function isPlainDirectory(metadata: { - isDirectory(): boolean; - isSymbolicLink(): boolean; -}): boolean { - return metadata.isDirectory() && !metadata.isSymbolicLink(); -} - -function sameManagedIdentity( - left: ManagedWorktreeDirectoryIdentity, - right: ManagedWorktreeDirectoryIdentity, -): boolean { - return left.dev === right.dev - && left.ino === right.ino - && left.birthtimeNs === right.birthtimeNs; -} - -function sameIdentity( - metadata: { dev: bigint; ino: bigint; birthtimeNs: bigint }, - expected: DirectoryIdentity, -): boolean { - return metadata.dev === expected.dev - && metadata.ino === expected.ino - && metadata.birthtimeNs === expected.birthtimeNs; -} - -function validateRunId(runId: unknown): asserts runId is string { - if (typeof runId !== "string" || !SAFE_RUN_ID.test(runId)) { - throw new RuntimeError("recovery record has an invalid run id"); - } -} - -async function stateRoot(): Promise { - const configured = nodeProcess.env.CLAUDE_PLUGIN_DATA - ?? (nodeProcess.env.NODE_ENV === "test" - ? nodeProcess.env.CLAUDE_ARCHITECT_STATE_DIR - : undefined); - if (configured === undefined) return null; - const root = path.resolve(resolveStateDir()); - try { - const metadata = await lstat(root, { bigint: true }); - if (!isPlainDirectory(metadata) || metadata.birthtimeNs <= 0n) { - throw new RuntimeError("plugin data directory must be a stable plain directory during recovery"); - } - const canonicalRoot = await realpath(root); - const settled = await lstat(canonicalRoot, { bigint: true }); - if (!isPlainDirectory(settled) - || settled.dev !== metadata.dev - || settled.ino !== metadata.ino - || settled.birthtimeNs !== metadata.birthtimeNs) { - throw new RuntimeError("plugin data directory identity changed during canonicalization"); - } - const privateIdentity = await assertPrivateRecoveryDirectory(canonicalRoot); - if (!sameIdentity(privateIdentity, { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs, - })) { - throw new RuntimeError("plugin data directory identity changed during privacy validation"); - } - return canonicalRoot; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } -} - -async function readBoundedRegularFile(filename: string): Promise { - try { - const contents = await readStableRegularFile(filename, MAX_STATE_FILE_BYTES_BIGINT); - if (contents === null) { - throw new RuntimeError("recovery state entry is not a stable bounded regular file"); - } - return contents.toString("utf8"); - } catch (error) { - if (isMissing(error)) return null; - throw error; - } -} - -async function readCleanupJournal(filename: string): Promise { - let handle; - try { - handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); - } catch (error) { - if (isMissing(error)) return { text: null, tornTail: false }; - throw error; - } - - let result: CleanupJournalRead | undefined; - let primaryError: unknown; - try { - const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat(filename, { bigint: true }); - if (!metadata.isFile() - || metadata.nlink !== 1n - || metadata.size > MAX_STATE_FILE_BYTES_BIGINT - || !namedMetadata.isFile() - || namedMetadata.isSymbolicLink() - || namedMetadata.nlink !== 1n - || namedMetadata.dev !== metadata.dev - || namedMetadata.ino !== metadata.ino - || namedMetadata.birthtimeNs !== metadata.birthtimeNs - || namedMetadata.size !== metadata.size) { - throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); - } - const bytes = await readHandleBytes(handle, Number(metadata.size)); - const repeatedBytes = await readHandleBytes(handle, Number(metadata.size)); - const settledMetadata = await handle.stat({ bigint: true }); - const settledNamedMetadata = await lstat(filename, { bigint: true }); - if (bytes.byteLength > MAX_STATE_FILE_BYTES - || settledMetadata.size > MAX_STATE_FILE_BYTES_BIGINT) { - throw new RuntimeError("cleanup journal exceeds its size limit during read"); - } - if (!settledMetadata.isFile() - || settledMetadata.nlink !== 1n - || settledMetadata.dev !== metadata.dev - || settledMetadata.ino !== metadata.ino - || settledMetadata.birthtimeNs !== metadata.birthtimeNs - || settledMetadata.size !== metadata.size - || settledMetadata.mtimeNs !== metadata.mtimeNs - || settledMetadata.ctimeNs !== metadata.ctimeNs - || !settledNamedMetadata.isFile() - || settledNamedMetadata.isSymbolicLink() - || settledNamedMetadata.nlink !== 1n - || settledNamedMetadata.dev !== metadata.dev - || settledNamedMetadata.ino !== metadata.ino - || settledNamedMetadata.birthtimeNs !== metadata.birthtimeNs - || settledNamedMetadata.size !== metadata.size - || settledNamedMetadata.mtimeNs !== metadata.mtimeNs - || settledNamedMetadata.ctimeNs !== metadata.ctimeNs - || BigInt(bytes.byteLength) !== metadata.size - || !repeatedBytes.equals(bytes)) { - throw new RuntimeError("cleanup journal changed during read"); - } - const text = bytes.toString("utf8"); - if (text === "" || text.endsWith("\n")) { - result = { text, tornTail: false }; - } else { - const finalNewline = text.lastIndexOf("\n"); - const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); - result = { text: completePrefix, tornTail: true }; - } - } catch (error) { - primaryError = error; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== undefined) { - throw new AggregateError( - [primaryError, closeError], - "cleanup journal read failed and its handle could not be closed", - ); - } - throw closeError; - } - if (primaryError !== undefined) throw primaryError; - if (result === undefined) throw new RuntimeError("cleanup journal read produced no result"); - return result; -} - -async function assertPrivateRecoveryDirectory(directory: string): Promise { - return await ensurePrivateDirectory(directory, { - description: "recovery directory", - create: false, - migratePermissions: true, - }); -} - -async function plainDirectoryIdentity(directory: string): Promise { - try { - const metadata = await lstat(directory, { bigint: true }); - if (!isPlainDirectory(metadata)) { - throw new RuntimeError("recovery directory must not be a symbolic link"); - } - return { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs, - }; - } catch (error) { - if (isMissing(error)) return null; - throw error; - } -} - -function parseRunStart(text: string, expectedRunId: string): RunStartRecord { - let value: unknown; - try { - value = JSON.parse(text); - } catch (cause) { - throw new RuntimeError("run-start recovery record is invalid JSON", { cause }); - } - if (typeof value !== "object" || value === null) { - throw new RuntimeError("run-start recovery record must be an object"); - } - const record = value as Partial; - validateRunId(record.runId); - if (record.runId !== expectedRunId - || typeof record.lockKey !== "string" - || !/^[0-9a-f]{64}$/.test(record.lockKey) - || typeof record.canonicalCommonDir !== "string" - || !path.isAbsolute(record.canonicalCommonDir) - || (record.pid !== null - && (record.pid === undefined || !Number.isSafeInteger(record.pid) || record.pid <= 1)) - || (record.processToken !== undefined - && record.processToken !== null - && typeof record.processToken !== "string") - || typeof record.startedAt !== "string" - || !Number.isFinite(Date.parse(record.startedAt))) { - throw new RuntimeError("run-start recovery record is malformed"); - } - const expectedLockKey = createHash("sha256") - .update(record.canonicalCommonDir) - .digest("hex"); - if (record.lockKey !== expectedLockKey) { - throw new RuntimeError("run-start lock key does not match its canonical common directory"); - } - return { ...record, processToken: record.processToken ?? null } as RunStartRecord; -} - -function validateTerminalResult(result: unknown, runId: string): void { - if (typeof result !== "object" || result === null) { - throw new RuntimeError("terminal attempt result is malformed during recovery"); - } - const value = result as { resultVersion?: unknown; runId?: unknown; status?: unknown }; - if (value.resultVersion !== "1" - || value.runId !== runId - || typeof value.status !== "string" - || !["unavailable", "failed", "cancelled", "verified-candidate"].includes(value.status)) { - throw new RuntimeError("terminal attempt result is malformed during recovery"); - } -} - -function runGitError(action: string, result: GitResult): RuntimeError { - const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} - -async function validateGitCommonDir(commonDir: string): Promise { - const canonical = await realpath(commonDir); - if (canonical !== commonDir) { - throw new RuntimeError("recorded Git common directory is no longer canonical"); - } - const result = await git(canonical, [ - "rev-parse", - "--path-format=absolute", - "--git-common-dir", - ]); - if (result.exitCode !== 0) throw runGitError("validate Git common directory", result); - const reported = await realpath(gitPathOutput( - result.stdout, - "Git common directory", - )); - if (reported !== canonical) { - throw new RuntimeError("recorded Git common directory no longer identifies the repository"); - } - return canonical; -} - -async function validateRepositoryRoot(repoRoot: string): Promise { - if (!path.isAbsolute(repoRoot)) { - throw new RuntimeError("cleanup journal repository root is not absolute"); - } - const canonical = await realpath(repoRoot); - if (canonical !== repoRoot) { - throw new RuntimeError("cleanup journal repository root is no longer canonical"); - } - const result = await git(canonical, ["rev-parse", "--show-toplevel"]); - if (result.exitCode !== 0) throw runGitError("validate cleanup repository", result); - if (await realpath(gitPathOutput(result.stdout, "Git repository root")) !== canonical) { - throw new RuntimeError("cleanup journal repository root is not the repository top level"); - } - return canonical; -} - -async function readDirectRef( - repoRoot: string, - ref: string, - runGit: typeof git = git, -): Promise { - const symbolic = await runGit(repoRoot, ["symbolic-ref", "--quiet", ref]); - if (symbolic.exitCode === 0) { - throw new RuntimeError("recovery refuses to mutate a symbolic Git ref"); - } - if (symbolic.exitCode !== 1) throw runGitError("inspect symbolic Git ref", symbolic); - const direct = await runGit(repoRoot, ["rev-parse", "--verify", "--quiet", ref]); - if (direct.exitCode === 1) return null; - if (direct.exitCode !== 0 || !OID.test(direct.stdout.trim())) { - throw runGitError("inspect Git ref", direct); - } - return direct.stdout.trim(); -} - -async function deleteExactRef( - repoRoot: string, - ref: string, - oid: string, - runGit: typeof git = git, -): Promise { - const result = await runGit(repoRoot, ["update-ref", "--no-deref", "-d", ref, oid]); - if (result.exitCode !== 0) throw runGitError("delete recovery Git ref", result); -} - -async function removeStaleCandidateAnchor(repoRoot: string, runId: string): Promise { - const ref = `${CANDIDATE_REF_PREFIX}${runId}`; - const oid = await readDirectRef(repoRoot, ref); - if (oid !== null) await deleteExactRef(repoRoot, ref, oid); -} - -async function archiveInterruptedPipeline( - store: ArtifactStore, - result: AttemptResult, -): Promise { - if (result.status !== "verified-candidate") return; - const manifest = await store.readManifest(); - if (manifest === null) { - throw new RuntimeError("run manifest is missing while recovering interrupted pipeline"); - } - const failed: AttemptResult = { - ...result, - status: "failed", - failure: "verification-failure", - summary: "Delegation pipeline was interrupted before trusted gates completed.", - unresolvedIssues: [ - ...result.unresolvedIssues, - "pipeline-interrupted-before-terminal-cleanup", - ], - evidence: { - ...result.evidence, - pipelineRecovery: "interrupted-before-terminal-cleanup", - }, - }; - await store.promoteTerminalArtifacts({ result: failed, manifest }); -} - -function escapeRegex(value: string): string { - return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); -} - -interface TemporarySliceRef { - ref: string; - oid: string; -} - -async function temporarySliceRefs( - repoRoot: string, - runId: string, - runGit: typeof git, -): Promise { - const prefix = `${SLICE_REF_PREFIX}${runId}/`; - const listed = await runGit(repoRoot, [ - "for-each-ref", - "--format=%(refname)%09%(objectname)", - prefix, - ]); - if (listed.exitCode !== 0) throw runGitError("enumerate temporary slice refs", listed); - const expectedName = new RegExp( - `^${escapeRegex(prefix)}slice-[1-9][0-9]*-attempt-(?:0|[1-9][0-9]*)$`, - ); - const refs: TemporarySliceRef[] = []; - for (const line of listed.stdout.split("\n").filter(Boolean)) { - const fields = line.split("\t"); - if (fields.length !== 2 || fields[0] === undefined || !expectedName.test(fields[0])) { - throw new RuntimeError("temporary slice ref name is malformed during recovery"); - } - if (fields[1] === undefined || !OID.test(fields[1])) { - throw new RuntimeError("temporary slice ref OID is malformed during recovery"); - } - const object = await runGit(repoRoot, ["cat-file", "-t", fields[1]], { - env: { GIT_NO_REPLACE_OBJECTS: "1" }, - }); - if (object.exitCode !== 0 || object.stdout.trim() !== "commit") { - throw new RuntimeError("temporary slice ref does not identify a commit during recovery"); - } - refs.push({ ref: fields[0], oid: fields[1] }); - } - for (const temporaryRef of refs) { - const current = await readDirectRef(repoRoot, temporaryRef.ref, runGit); - if (current !== temporaryRef.oid) { - throw new RuntimeError("temporary slice ref moved during recovery"); - } - } - return refs; -} - -async function cleanupTemporarySliceRefs( - repoRoot: string, - runId: string, - runGit: typeof git, -): Promise { - const refs = await temporarySliceRefs(repoRoot, runId, runGit); - for (const temporaryRef of refs) { - await deleteExactRef(repoRoot, temporaryRef.ref, temporaryRef.oid, runGit); - } -} - -function parseCleanupRecord(line: string): CleanupRecord { - let value: unknown; - try { - value = JSON.parse(line); - } catch (cause) { - throw new RuntimeError("cleanup journal contains invalid JSON", { cause }); - } - if (typeof value !== "object" || value === null) { - throw new RuntimeError("cleanup journal record must be an object"); - } - const record = value as Partial; - validateRunId(record.runId); - if (!(["prune-cleanup-intent", "prune-cleanup-complete", "prune-cleanup-rollback"] as const) - .includes(record.event as CleanupRecord["event"]) - || !(["max-age", "max-bytes"] as const).includes(record.reason as PruneReason) - || !(["pending", "not-applicable", "deleted", "already-absent"] as const) - .includes(record.anchorCleanup as CleanupRecord["anchorCleanup"]) - || !Number.isSafeInteger(record.archiveBytes) - || (record.archiveBytes ?? -1) < 0 - || typeof record.quarantineName !== "string" - || record.quarantineName !== `.prune-${record.runId}-${record.quarantineName - .slice(`.prune-${record.runId}-`.length)}` - || !/^\.prune-[a-z0-9][a-z0-9._-]*-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test( - record.quarantineName, - ) - || typeof record.recordedAt !== "string" - || !Number.isFinite(Date.parse(record.recordedAt))) { - throw new RuntimeError("cleanup journal record is malformed"); - } - if (record.event === "prune-cleanup-intent" && record.anchorCleanup !== "pending") { - throw new RuntimeError("cleanup intent must remain pending until reconciled"); - } - if (record.event !== "prune-cleanup-intent" && record.anchorCleanup === "pending") { - throw new RuntimeError("terminal cleanup journal record cannot remain pending"); - } - - const hasRepository = typeof record.repoRoot === "string" - && typeof record.anchorRef === "string" - && typeof record.candidateCommitOid === "string"; - // A candidate-null prune records the repository root for lease serialization - // but has no anchor to reconcile: repoRoot set, every Git ref field null. - const repositoryOnly = typeof record.repoRoot === "string" - && record.anchorRef === null - && record.backupRef === null - && record.candidateCommitOid === null; - const noRepository = record.repoRoot === null - && record.anchorRef === null - && record.backupRef === null - && record.candidateCommitOid === null; - if (!noRepository && !repositoryOnly && (!hasRepository - || record.anchorRef !== `${CANDIDATE_REF_PREFIX}${record.runId}` - || !OID.test(record.candidateCommitOid as string) - || (record.backupRef !== null - && record.backupRef !== `${BACKUP_REF_PREFIX}${record.runId}`))) { - throw new RuntimeError("cleanup journal Git metadata is malformed"); - } - return record as CleanupRecord; -} - -function cleanupOutcome(record: CleanupRecord): AnchorCleanup { - if (record.repoRoot === null || record.anchorRef === null) return "not-applicable"; - return record.backupRef === null ? "already-absent" : "deleted"; -} - -function boundedQuarantineReason(error: unknown): string { - return boundedRedactedDiagnostic(error, MAX_QUARANTINE_REASON_BYTES); -} - -function parseRecoveryQuarantineRecord(line: string): RecoveryQuarantineRecord { - if (Buffer.byteLength(`${line}\n`, "utf8") > MAX_QUARANTINE_RECORD_BYTES) { - throw new RuntimeError("recovery quarantine journal record exceeds its size limit"); - } - let value: unknown; - try { - value = JSON.parse(line); - } catch (cause) { - throw new RuntimeError("recovery quarantine journal contains invalid JSON", { cause }); - } - if (typeof value !== "object" || value === null) { - throw new RuntimeError("recovery quarantine journal record must be an object"); - } - const record = value as Partial; - validateRunId(record.runId); - if (Object.keys(value).sort().join(",") !== "event,reason,recordedAt,runId" - || record.event !== "recovery-quarantine" - || typeof record.reason !== "string" - || Buffer.byteLength(record.reason, "utf8") > MAX_QUARANTINE_REASON_BYTES - || typeof record.recordedAt !== "string" - || !Number.isFinite(Date.parse(record.recordedAt))) { - throw new RuntimeError("recovery quarantine journal record is malformed"); - } - return record as RecoveryQuarantineRecord; -} - -function parseRecoveryQuarantineJournal(bytes: Buffer): Set { - const text = bytes.toString("utf8"); - const runIds = new Set(); - if (text === "") return runIds; - if (!text.endsWith("\n")) { - throw new RuntimeError("recovery quarantine journal has a torn final record"); - } - for (const line of text.slice(0, -1).split("\n")) { - if (line === "") throw new RuntimeError("recovery quarantine journal contains a blank record"); - const record = parseRecoveryQuarantineRecord(line); - if (runIds.has(record.runId)) { - throw new RuntimeError("duplicate recovery quarantine runId"); - } - runIds.add(record.runId); - } - return runIds; -} - -async function readRecoveryQuarantineJournal( - runsRoot: string, -): Promise { - const rootIdentity = await plainDirectoryIdentity(runsRoot); - if (rootIdentity === null) { - throw new RuntimeError("recovery quarantine journal root disappeared"); - } - const filename = path.join(runsRoot, "recovery-quarantine.ndjson"); - let expectedMetadata; - try { - expectedMetadata = await lstat(filename, { bigint: true }); - } catch (error) { - if (!isMissing(error)) throw error; - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (!isPlainDirectory(currentRoot) || !sameIdentity(currentRoot, rootIdentity)) { - throw new RuntimeError("recovery quarantine journal root changed during missing read"); - } - return { - bytes: Buffer.alloc(0), - runIds: new Set(), - rootIdentity, - journalIdentity: null, - }; - } - if (!expectedMetadata.isFile() - || expectedMetadata.isSymbolicLink() - || expectedMetadata.nlink !== 1n - || expectedMetadata.size > MAX_STATE_FILE_BYTES_BIGINT) { - throw new RuntimeError("recovery quarantine journal is not a bounded regular file"); - } - let handle; - try { - handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); - } catch (error) { - if (!isMissing(error)) throw error; - try { - await lstat(filename); - } catch (namedError) { - if (isMissing(namedError)) { - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (isPlainDirectory(currentRoot) && sameIdentity(currentRoot, rootIdentity)) { - return { - bytes: Buffer.alloc(0), - runIds: new Set(), - rootIdentity, - journalIdentity: null, - }; - } - } - } - throw new RuntimeError("recovery quarantine journal changed before read", { cause: error }); - } - let bytes: Buffer | undefined; - let journalIdentity: DirectoryIdentity | undefined; - let primaryError: unknown; - try { - const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat(filename, { bigint: true }); - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (!metadata.isFile() - || metadata.size > MAX_STATE_FILE_BYTES_BIGINT - || metadata.size !== expectedMetadata.size - || metadata.nlink !== 1n - || !namedMetadata.isFile() - || namedMetadata.isSymbolicLink() - || namedMetadata.nlink !== 1n - || namedMetadata.size !== metadata.size - || namedMetadata.dev !== expectedMetadata.dev - || namedMetadata.ino !== expectedMetadata.ino - || namedMetadata.birthtimeNs !== expectedMetadata.birthtimeNs - || namedMetadata.dev !== metadata.dev - || namedMetadata.ino !== metadata.ino - || namedMetadata.birthtimeNs !== metadata.birthtimeNs - || !isPlainDirectory(currentRoot) - || !sameIdentity(currentRoot, rootIdentity)) { - throw new RuntimeError("recovery quarantine journal changed during read"); - } - journalIdentity = { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs, - }; - bytes = await readHandleBytes(handle, Number(metadata.size)); - const settledHandle = await handle.stat({ bigint: true }); - const settledMetadata = await lstat(filename, { bigint: true }); - const settledRoot = await lstat(runsRoot, { bigint: true }); - if (!settledHandle.isFile() - || settledHandle.nlink !== 1n - || settledHandle.size !== metadata.size - || settledHandle.dev !== metadata.dev - || settledHandle.ino !== metadata.ino - || settledHandle.birthtimeNs !== metadata.birthtimeNs - || settledHandle.mtimeNs !== metadata.mtimeNs - || settledHandle.ctimeNs !== metadata.ctimeNs - || !settledMetadata.isFile() - || settledMetadata.isSymbolicLink() - || settledMetadata.nlink !== 1n - || settledMetadata.size !== BigInt(bytes.byteLength) - || settledMetadata.dev !== metadata.dev - || settledMetadata.ino !== metadata.ino - || settledMetadata.birthtimeNs !== metadata.birthtimeNs - || settledMetadata.mtimeNs !== metadata.mtimeNs - || settledMetadata.ctimeNs !== metadata.ctimeNs - || !isPlainDirectory(settledRoot) - || !sameIdentity(settledRoot, rootIdentity)) { - throw new RuntimeError("recovery quarantine journal changed after read"); - } - } catch (error) { - primaryError = error; - } - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== undefined) { - throw new AggregateError( - [primaryError, closeError], - "recovery quarantine journal read failed and its handle could not be closed", - ); - } - throw closeError; - } - if (primaryError !== undefined) throw primaryError; - if (bytes === undefined || journalIdentity === undefined) { - throw new RuntimeError("recovery quarantine journal read produced no content"); - } - return { - bytes, - runIds: parseRecoveryQuarantineJournal(bytes), - rootIdentity, - journalIdentity, - }; -} - -async function syncRecoveryDirectory(directory: string): Promise { - await syncDirectoryMetadata(directory); -} - -async function publishRecoveryQuarantineJournal( - runsRoot: string, - filename: string, - snapshot: RecoveryQuarantineSnapshot, - nextBytes: Buffer, -): Promise { - const temporaryPath = path.join( - runsRoot, - `.recovery-quarantine-journal-${randomUUID()}.tmp`, - ); - let handle; - let temporaryCreated = false; - let temporaryConsumed = false; - let linkedPublication = false; - let temporaryIdentity: DirectoryIdentity | undefined; - let primaryError: unknown; - try { - handle = await open( - temporaryPath, - constants.O_RDWR | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, - 0o600, - ); - temporaryCreated = true; - const metadata = await handle.stat({ bigint: true }); - temporaryIdentity = { - dev: metadata.dev, - ino: metadata.ino, - birthtimeNs: metadata.birthtimeNs, - }; - const namedMetadata = await lstat(temporaryPath, { bigint: true }); - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (!metadata.isFile() - || metadata.nlink !== 1n - || !namedMetadata.isFile() - || namedMetadata.isSymbolicLink() - || namedMetadata.nlink !== 1n - || namedMetadata.dev !== metadata.dev - || namedMetadata.ino !== metadata.ino - || namedMetadata.birthtimeNs !== metadata.birthtimeNs - || metadata.size > MAX_STATE_FILE_BYTES_BIGINT - || !isPlainDirectory(currentRoot) - || !sameIdentity(currentRoot, snapshot.rootIdentity)) { - throw new RuntimeError("recovery quarantine journal temp changed during creation"); - } - await handle.writeFile(nextBytes); - await handle.sync(); - await validateOwnedLockState( - handle, - [temporaryPath], - temporaryIdentity, - nextBytes, - 1, - runsRoot, - snapshot.rootIdentity, - ); - } catch (error) { - primaryError = error; - } - if (handle !== undefined) { - try { - await handle.close(); - } catch (closeError) { - if (primaryError !== undefined) { - primaryError = new AggregateError( - [primaryError, closeError], - "recovery quarantine journal temp failed and its handle could not be closed", - ); - } else { - primaryError = closeError; - } - } - } - if (primaryError === undefined) { - try { - if (temporaryIdentity === undefined) { - throw new RuntimeError("recovery quarantine journal temp identity is unavailable"); - } - await validatePublishedLock( - temporaryPath, - temporaryIdentity, - nextBytes, - runsRoot, - snapshot.rootIdentity, - ); - const currentSnapshot = await readRecoveryQuarantineJournal(runsRoot); - const sameJournalIdentity = snapshot.journalIdentity === null - ? currentSnapshot.journalIdentity === null - : currentSnapshot.journalIdentity !== null - && currentSnapshot.journalIdentity.dev === snapshot.journalIdentity.dev - && currentSnapshot.journalIdentity.ino === snapshot.journalIdentity.ino - && currentSnapshot.journalIdentity.birthtimeNs === snapshot.journalIdentity.birthtimeNs; - if (currentSnapshot.rootIdentity.dev !== snapshot.rootIdentity.dev - || currentSnapshot.rootIdentity.ino !== snapshot.rootIdentity.ino - || currentSnapshot.rootIdentity.birthtimeNs !== snapshot.rootIdentity.birthtimeNs - || !sameJournalIdentity - || !currentSnapshot.bytes.equals(snapshot.bytes)) { - throw new RuntimeError("recovery quarantine journal changed before publication"); - } - if (snapshot.journalIdentity === null) { - await link(temporaryPath, filename); - linkedPublication = true; - await validatePublishedLock( - temporaryPath, - temporaryIdentity, - nextBytes, - runsRoot, - snapshot.rootIdentity, - 2, - [temporaryPath, filename], - ); - const removal = await removeExpectedLockPath( - temporaryPath, - temporaryIdentity, - nextBytes, - 2, - ); - if (removal === "changed") { - throw new RuntimeError("recovery quarantine journal temp changed before unlink"); - } - temporaryConsumed = true; - } else { - await rename(temporaryPath, filename); - temporaryConsumed = true; - } - } catch (error) { - primaryError = error; - } - } - const cleanupErrors: unknown[] = []; - if (temporaryCreated && !temporaryConsumed) { - if (temporaryIdentity === undefined) { - cleanupErrors.push(new RuntimeError( - "recovery quarantine journal temp identity is unavailable for cleanup", - )); - } else { - cleanupErrors.push(...await cleanupOwnedLockPaths( - runsRoot, - snapshot.rootIdentity, - temporaryPath, - filename, - temporaryIdentity, - nextBytes, - linkedPublication, - )); - } - } - if (primaryError !== undefined && cleanupErrors.length > 0) { - throw new AggregateError( - [primaryError, ...cleanupErrors], - "recovery quarantine journal publication and temp cleanup failed", - ); - } - if (primaryError !== undefined) throw primaryError; - if (cleanupErrors.length === 1) throw cleanupErrors[0]; - if (cleanupErrors.length > 1) { - throw new AggregateError(cleanupErrors, "recovery quarantine journal temp cleanup failed"); - } - - const publishedSnapshot = await readRecoveryQuarantineJournal(runsRoot); - if (temporaryIdentity === undefined - || publishedSnapshot.journalIdentity === null - || publishedSnapshot.journalIdentity.dev !== temporaryIdentity.dev - || publishedSnapshot.journalIdentity.ino !== temporaryIdentity.ino - || publishedSnapshot.journalIdentity.birthtimeNs !== temporaryIdentity.birthtimeNs - || publishedSnapshot.rootIdentity.dev !== snapshot.rootIdentity.dev - || publishedSnapshot.rootIdentity.ino !== snapshot.rootIdentity.ino - || publishedSnapshot.rootIdentity.birthtimeNs !== snapshot.rootIdentity.birthtimeNs - || !publishedSnapshot.bytes.equals(nextBytes)) { - throw new RuntimeError("recovery quarantine journal changed after publication"); - } - await syncRecoveryDirectory(runsRoot); -} - -async function appendRecoveryQuarantineRecord( - runsRoot: string, - record: RecoveryQuarantineRecord, -): Promise { - const line = `${JSON.stringify(record)}\n`; - const lineBytes = Buffer.byteLength(line, "utf8"); - if (lineBytes > MAX_QUARANTINE_RECORD_BYTES) { - throw new RuntimeError("recovery quarantine record exceeds its size limit"); - } - const filename = path.join(runsRoot, "recovery-quarantine.ndjson"); - const snapshot = await readRecoveryQuarantineJournal(runsRoot); - if (snapshot.runIds.has(record.runId)) { - await syncRecoveryDirectory(runsRoot); - const settledSnapshot = await readRecoveryQuarantineJournal(runsRoot); - if (settledSnapshot.rootIdentity.dev !== snapshot.rootIdentity.dev - || settledSnapshot.rootIdentity.ino !== snapshot.rootIdentity.ino - || settledSnapshot.rootIdentity.birthtimeNs !== snapshot.rootIdentity.birthtimeNs - || settledSnapshot.journalIdentity === null - || snapshot.journalIdentity === null - || settledSnapshot.journalIdentity.dev !== snapshot.journalIdentity.dev - || settledSnapshot.journalIdentity.ino !== snapshot.journalIdentity.ino - || settledSnapshot.journalIdentity.birthtimeNs !== snapshot.journalIdentity.birthtimeNs - || !settledSnapshot.bytes.equals(snapshot.bytes)) { - throw new RuntimeError("recovery quarantine journal changed after retry sync"); - } - return; - } - const nextBytes = Buffer.concat([snapshot.bytes, Buffer.from(line, "utf8")]); - if (nextBytes.byteLength > MAX_STATE_FILE_BYTES) { - throw new RuntimeError("recovery quarantine journal exceeds its size limit"); - } - await publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes); -} - -async function quarantineRun( - runsRoot: string, - runId: string, - error: unknown, -): Promise { - const runDirectory = path.join(runsRoot, runId); - const quarantinePath = path.join(runsRoot, `.poisoned-${runId}`); - const runsIdentity = await plainDirectoryIdentity(runsRoot); - if (runsIdentity === null) throw new RuntimeError("recovery runs root disappeared"); - let runIdentity: DirectoryIdentity | null = null; - let renamed = false; - let journaled = false; - try { - runIdentity = await plainDirectoryIdentity(runDirectory); - if (runIdentity === null) throw new RuntimeError("poisoned recovery run disappeared"); - if (await plainDirectoryIdentity(quarantinePath) !== null) { - throw new RuntimeError("poisoned recovery quarantine already exists"); - } - await rename(runDirectory, quarantinePath); - renamed = true; - const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (quarantineIdentity === null - || quarantineIdentity.dev !== runIdentity.dev - || quarantineIdentity.ino !== runIdentity.ino - || quarantineIdentity.birthtimeNs !== runIdentity.birthtimeNs - || !isPlainDirectory(currentRoot) - || !sameIdentity(currentRoot, runsIdentity)) { - throw new RuntimeError("poisoned recovery run identity changed during quarantine"); - } - const record: RecoveryQuarantineRecord = { - event: "recovery-quarantine", - runId, - reason: boundedQuarantineReason(error), - recordedAt: new Date().toISOString(), - }; - await appendRecoveryQuarantineRecord(runsRoot, record); - journaled = true; - logger.warn("startup recovery quarantined poisoned run", { - runId, - reason: record.reason, - }); - } catch (quarantineError) { - const errors = [error, quarantineError]; - if (renamed && !journaled && runIdentity !== null) { - try { - const quarantineMetadata = await lstat(quarantinePath, { bigint: true }); - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (!isPlainDirectory(quarantineMetadata) - || !sameIdentity(quarantineMetadata, runIdentity) - || await plainDirectoryIdentity(runDirectory) !== null - || !isPlainDirectory(currentRoot) - || !sameIdentity(currentRoot, runsIdentity)) { - throw new RuntimeError("poisoned recovery rollback identity or destination is unsafe"); - } - await rename(quarantinePath, runDirectory); - const restoredMetadata = await lstat(runDirectory, { bigint: true }); - const restoredRoot = await lstat(runsRoot, { bigint: true }); - if (!isPlainDirectory(restoredMetadata) - || !sameIdentity(restoredMetadata, runIdentity) - || !isPlainDirectory(restoredRoot) - || !sameIdentity(restoredRoot, runsIdentity)) { - throw new RuntimeError("poisoned recovery rollback identity changed"); - } - await syncRecoveryDirectory(runsRoot); - const settledMetadata = await lstat(runDirectory, { bigint: true }); - const settledRoot = await lstat(runsRoot, { bigint: true }); - if (!isPlainDirectory(settledMetadata) - || !sameIdentity(settledMetadata, runIdentity) - || !isPlainDirectory(settledRoot) - || !sameIdentity(settledRoot, runsIdentity)) { - throw new RuntimeError("poisoned recovery rollback changed after directory sync"); - } - } catch (rollbackError) { - errors.push(rollbackError); - } - } - throw new AggregateError(errors, "run recovery failed and quarantine did not complete"); - } -} - -async function removePlainDirectory( - directory: string, - expected: DirectoryIdentity, - platformServices: PlatformServices, -): Promise { - const metadata = await lstat(directory, { bigint: true }); - if (!isPlainDirectory(metadata) || !sameIdentity(metadata, expected)) { - throw new RuntimeError("recovery directory identity changed before removal"); - } - await emptyBoundDirectory(directory, expected, platformServices); - await removeBoundEmptyDirectory(directory, expected, platformServices); -} - -async function createExactRef(repoRoot: string, ref: string, oid: string): Promise { - const result = await git(repoRoot, [ - "update-ref", - "--no-deref", - ref, - oid, - "0".repeat(oid.length), - ]); - if (result.exitCode !== 0) throw runGitError("create recovery Git ref", result); -} - -async function appendCleanupRecord(runsRoot: string, record: CleanupRecord): Promise { - // Same shared-journal mutex the prune writer holds: a completion/rollback append - // can never interleave with a concurrent intent append or a torn-tail truncation. - const journalLock = await getPlatformServices().acquireCleanupJournalLock(); - try { - const identity = await plainDirectoryIdentity(runsRoot); - if (identity === null) throw new RuntimeError("cleanup journal root disappeared"); - const filename = path.join(runsRoot, "cleanup.ndjson"); - const handle = await open( - filename, - constants.O_WRONLY | constants.O_CREAT | constants.O_APPEND | NO_FOLLOW, - 0o600, - ); - try { - const metadata = await handle.stat(); - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (!metadata.isFile() || !isPlainDirectory(currentRoot) || !sameIdentity(currentRoot, identity)) { - throw new RuntimeError("cleanup journal identity changed during recovery"); - } - await handle.writeFile(`${JSON.stringify(record)}\n`, "utf8"); - await handle.sync(); - } finally { - await handle.close(); - } - const currentRoot = await lstat(runsRoot, { bigint: true }); - if (!isPlainDirectory(currentRoot) || !sameIdentity(currentRoot, identity)) { - throw new RuntimeError("cleanup journal root changed after recovery append"); - } - } finally { - await journalLock.release(); - } -} - -async function reconcileCleanupRefs( - record: CleanupRecord, - action: "finish" | "rollback", -): Promise { - const outcome = cleanupOutcome(record); - if (outcome === "not-applicable") return outcome; - const repoRoot = await validateRepositoryRoot(record.repoRoot!); - const anchorRef = record.anchorRef!; - const candidateOid = record.candidateCommitOid!; - let anchorOid = await readDirectRef(repoRoot, anchorRef); - if (anchorOid !== null && anchorOid !== candidateOid) { - throw new RuntimeError("candidate anchor moved during interrupted prune recovery"); - } - if (outcome === "already-absent") { - if (anchorOid !== null) { - throw new RuntimeError("candidate anchor unexpectedly reappeared during prune recovery"); - } - return outcome; - } - - const backupRef = record.backupRef!; - let backupOid = await readDirectRef(repoRoot, backupRef); - if (backupOid !== null && backupOid !== candidateOid) { - throw new RuntimeError("candidate prune backup moved during recovery"); - } - if (action === "finish") { - if (anchorOid !== null && backupOid === null) { - await createExactRef(repoRoot, backupRef, candidateOid); - backupOid = candidateOid; - } - if (anchorOid !== null) { - await deleteExactRef(repoRoot, anchorRef, candidateOid); - anchorOid = null; - } - return outcome; - } - - if (anchorOid === null) { - if (backupOid === null) { - throw new RuntimeError("cannot restore candidate anchor without its prune backup"); - } - await createExactRef(repoRoot, anchorRef, candidateOid); - anchorOid = candidateOid; - } - if (backupOid !== null) await deleteExactRef(repoRoot, backupRef, candidateOid); - return outcome; -} - -async function commitCleanupRefs(record: CleanupRecord): Promise { - if (cleanupOutcome(record) !== "deleted") return; - const repoRoot = await validateRepositoryRoot(record.repoRoot!); - const backupOid = await readDirectRef(repoRoot, record.backupRef!); - if (backupOid === null) return; - if (backupOid !== record.candidateCommitOid) { - throw new RuntimeError("candidate prune backup moved before cleanup commit"); - } - await deleteExactRef(repoRoot, record.backupRef!, backupOid); -} - -async function readPendingCleanupRecords( - runsRoot: string, -): Promise<{ pending: Map; tornTail: boolean }> { - const { text, tornTail } = await readCleanupJournal(path.join(runsRoot, "cleanup.ndjson")); - const pending = new Map(); - if (text === null || text === "") return { pending, tornTail }; - const completeText = text.endsWith("\n") ? text.slice(0, -1) : text; - for (const line of completeText.split("\n")) { - if (line.trim() === "") throw new RuntimeError("cleanup journal contains a blank record"); - const record = parseCleanupRecord(line); - if (record.event === "prune-cleanup-intent") pending.set(record.runId, record); - else pending.delete(record.runId); - } - return { pending, tornTail }; -} - -// A torn trailing record is an intent whose durable write was interrupted before -// any Git ref was mutated (the prune writer journals intent, fsyncs, then mutates), -// so the fragment is safe to discard. The reader validates read-only and reports the -// torn tail; the completing replay removes it here before appending, so a completion -// record can never concatenate onto the fragment and corrupt the journal. -async function truncateCleanupTornTail(filename: string): Promise { - let handle; - try { - handle = await open(filename, constants.O_RDWR | NO_FOLLOW); - } catch (error) { - if (isMissing(error)) return; - throw error; - } - try { - const metadata = await handle.stat({ bigint: true }); - const namedMetadata = await lstat(filename, { bigint: true }); - if (!metadata.isFile() - || metadata.nlink !== 1n - || metadata.size > MAX_STATE_FILE_BYTES_BIGINT - || !namedMetadata.isFile() - || namedMetadata.isSymbolicLink() - || namedMetadata.nlink !== 1n - || namedMetadata.dev !== metadata.dev - || namedMetadata.ino !== metadata.ino - || namedMetadata.birthtimeNs !== metadata.birthtimeNs - || namedMetadata.size !== metadata.size) { - throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); - } - const bytes = await readHandleBytes(handle, Number(metadata.size)); - const text = bytes.toString("utf8"); - if (text === "" || text.endsWith("\n")) return; - // A concurrent live prune may append+fsync a fresh intent between the reader's - // scan and this truncate. Re-validate that we read exactly the stat'd bytes and - // that the journal has not grown or changed since, and fail closed rather than - // truncate away a durably-journaled intent (matches the reader's stability gate). - const settled = await handle.stat({ bigint: true }); - const settledNamed = await lstat(filename, { bigint: true }); - if (BigInt(bytes.byteLength) !== metadata.size - || !settled.isFile() - || settled.nlink !== 1n - || settled.size !== metadata.size - || settled.dev !== metadata.dev - || settled.ino !== metadata.ino - || settled.birthtimeNs !== metadata.birthtimeNs - || settled.mtimeNs !== metadata.mtimeNs - || settled.ctimeNs !== metadata.ctimeNs - || !settledNamed.isFile() - || settledNamed.isSymbolicLink() - || settledNamed.nlink !== 1n - || settledNamed.dev !== metadata.dev - || settledNamed.ino !== metadata.ino - || settledNamed.birthtimeNs !== metadata.birthtimeNs - || settledNamed.size !== metadata.size) { - throw new RuntimeError("cleanup journal changed during torn-tail repair"); - } - const finalNewline = text.lastIndexOf("\n"); - const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); - await handle.truncate(Buffer.byteLength(completePrefix, "utf8")); - await handle.sync(); - } finally { - await handle?.close(); - } -} - -async function repositoryRootExists(repoRoot: string): Promise { - // A non-absolute repoRoot is a malformed record, not a deleted repository: realpath - // would resolve it against the process CWD and could report a corrupt record as "gone", - // fail-open routing it into the repo-absent reconcile path. Report it present so it falls - // through to validateRepositoryRoot's absoluteness rejection and stays fail-closed, - // matching how every other anomalous cleanup record halts recovery for investigation. - if (!path.isAbsolute(repoRoot)) return true; - try { - await realpath(repoRoot); - return true; - } catch (error) { - if (isMissing(error)) return false; - throw error; - } -} - -// Complete an interrupted prune whose repository was deleted after the intent was -// written. The candidate anchor and prune-backup refs died with the repository, so -// there is nothing to reconcile in Git; only the archive must converge. The checkout -// lease is intentionally skipped: it serializes Git-ref reconciliation, and this path -// performs none — a vanished repository cannot host a racing integration, and recovery -// already holds the global recovery lock. -// -// Limit of the lease-skip: the normal path's per-repo checkout lease also guarantees at -// most one pending intent per run, so a shadowed quarantine can never be orphaned. This -// path drops that lease, so IF prune were ever wired to run concurrently across processes -// (it has no such caller today — the checkout lease is prune's only cross-process guard), -// two repo-gone intents for one run could interleave and a crash after the losing rename -// could strand a quarantine dir that no surviving pending intent references. That is a -// disk-only leak, never a double-free (rename is atomic) or fail-open. Closing it needs a -// recovery sweep of `.prune-*` dirs unmatched by any pending intent; do that before wiring -// concurrent multi-process prune, not before. -async function reconcileRepoAbsentPrune( - runsRoot: string, - record: CleanupRecord, - platformServices: PlatformServices, -): Promise { - const runDirectory = path.join(runsRoot, record.runId); - const quarantinePath = path.join(runsRoot, record.quarantineName); - const runIdentity = await plainDirectoryIdentity(runDirectory); - const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); - if (runIdentity !== null && quarantineIdentity !== null) { - throw new RuntimeError("both retained and quarantined run archives exist during recovery"); - } - // Same discriminator as the normal path: a retained run rolls back (nothing was - // removed), a quarantined run finishes (remove the archive that was moved aside). - const action = runIdentity !== null ? "rollback" : "finish"; - if (action === "finish" && quarantineIdentity !== null) { - await removePlainDirectory(quarantinePath, quarantineIdentity, platformServices); - } - await appendCleanupRecord(runsRoot, { - ...record, - event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", - anchorCleanup: "already-absent", - recordedAt: new Date().toISOString(), - }); -} - -async function replayInterruptedPrunes( - runsRoot: string, - ps: PlatformServices, -): Promise { - // Read the journal and repair a torn tail as one critical section under the shared - // journal mutex, so no concurrent append can land between the read and the truncate - // (which would otherwise be erased). Completion appends below re-take the same lock. - let pending: Map; - const journalLock = await getPlatformServices().acquireCleanupJournalLock(); - try { - const read = await readPendingCleanupRecords(runsRoot); - if (read.tornTail) await truncateCleanupTornTail(path.join(runsRoot, "cleanup.ndjson")); - pending = read.pending; - } finally { - await journalLock.release(); - } - for (const record of [...pending.values()].sort((left, right) => - left.runId.localeCompare(right.runId))) { - // A repoRoot-less legacy intent has neither anchor nor repository to lock. - if (record.repoRoot === null) continue; - // A crash can strand a pending intent whose repository was deleted afterward. - // Reconcile its archive without Git and move on; otherwise validateRepositoryRoot - // below throws and aborts the entire recovery pass — a permanent block, because - // replayInterruptedPrunes runs before every other recovery step. - // - // The boundary is deliberately filesystem-definitive absence (realpath ENOENT), the - // expected "the user deleted their repo" lifecycle event. A repoRoot that still - // exists but is no longer the canonical repository (its .git removed, replaced by a - // file, moved so it is non-canonical, or a transient git error) is NOT treated as - // gone: it stays fail-closed through validateRepositoryRoot below, matching how every - // other anomalous cleanup record halts recovery for investigation. Widening this to - // "any validation failure" would fail open — a transient git hiccup would wrongly - // reclaim the archive and orphan a real repository's refs. - if (!(await repositoryRootExists(record.repoRoot))) { - await reconcileRepoAbsentPrune(runsRoot, record, ps); - continue; - } - // Serialize the archive/anchor reconciliation against the checkout - // lifecycle: hold the repository's checkout lease exactly as prune did. - const repoRoot = await validateRepositoryRoot(record.repoRoot); - const commonResult = await git(repoRoot, [ - "rev-parse", - "--path-format=absolute", - "--git-common-dir", - ]); - if (commonResult.exitCode !== 0) { - throw runGitError("resolve cleanup repository identity", commonResult); - } - const repositoryIdentity = await realpath(gitPathOutput( - commonResult.stdout, - "cleanup repository identity", - )); - await platformSafety.withRecoveryLease(repoRoot, async (lease) => { - if (lease.repositoryIdentity !== repositoryIdentity) { - throw new RuntimeError("checkout lease repository identity changed during prune recovery"); - } - const runDirectory = path.join(runsRoot, record.runId); - const quarantinePath = path.join(runsRoot, record.quarantineName); - const runIdentity = await plainDirectoryIdentity(runDirectory); - const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); - if (runIdentity !== null && quarantineIdentity !== null) { - throw new RuntimeError("both retained and quarantined run archives exist during recovery"); - } - const action = runIdentity !== null ? "rollback" : "finish"; - const outcome = await reconcileCleanupRefs(record, action); - if (action === "finish") { - if (quarantineIdentity !== null) { - await removePlainDirectory(quarantinePath, quarantineIdentity, ps); - } - await commitCleanupRefs(record); - } - await appendCleanupRecord(runsRoot, { - ...record, - event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", - anchorCleanup: outcome, - recordedAt: new Date().toISOString(), - }); - }); - } -} - - -async function managedWorktreeMarkerIsPresent(worktreePath: string): Promise { - let marker; - try { - marker = await lstat(path.join(worktreePath, ".git"), { bigint: true }); - } catch (error) { - if (isMissing(error)) return false; - throw error; - } - if (!marker.isFile() || marker.isSymbolicLink() || marker.nlink !== 1n) { - throw new RuntimeError("managed worktree repository marker is ambiguous"); - } - return true; -} - -async function removeManagedWorktreeUnderLease( - commonDir: string, - worktreePath: string, - expectedIdentity: ManagedWorktreeDirectoryIdentity, - runGit: typeof git, -): Promise { - const currentIdentity = await managedWorktreeDirectoryIdentity(worktreePath); - if (currentIdentity === null) return; - if (currentIdentity.dev !== expectedIdentity.dev - || currentIdentity.ino !== expectedIdentity.ino - || currentIdentity.birthtimeNs !== expectedIdentity.birthtimeNs) { - throw new RuntimeError("worktree directory identity changed under checkout lease"); - } - if (await managedWorktreeMarkerIsPresent(worktreePath)) { - const resolved = await runGit(worktreePath, [ - "rev-parse", "--path-format=absolute", "--git-common-dir", - ]); - if (resolved.truncated?.stdout === true || resolved.truncated?.stderr === true) { - throw new RuntimeError("worktree repository lookup was truncated under checkout lease"); - } - if (resolved.exitCode !== 0) { - throw runGitError("resolve worktree repository under checkout lease", resolved); - } - const reportedCommonDir = gitPathOutput( - resolved.stdout, - "managed worktree common directory", - ); - if (!path.isAbsolute(reportedCommonDir) - || await realpath(reportedCommonDir) !== commonDir) { - throw new RuntimeError("managed worktree belongs to a different repository"); - } - } - const listed = await runGit(commonDir, ["worktree", "list", "--porcelain", "-z"]); - if (listed.exitCode !== 0 - || listed.truncated?.stdout === true - || listed.truncated?.stderr === true) { - throw runGitError("recheck worktree registration", listed); - } - const registered = await findWorktreeRegistration( - gitNulRecords(listed.stdout, "rechecked Git worktree list"), - worktreePath, - ) !== -1; - if (!registered) { - throw new RuntimeError("managed worktree registration is absent"); - } - await removeRegisteredWorktree( - commonDir, - worktreePath, - { git: runGit }, - expectedIdentity, - ); -} - -function mostSpecificKnownRunClaim( - knownRunIds: ReadonlySet, - managedId: string, -): string | undefined { - let owner: string | undefined; - for (const runId of knownRunIds) { - if (runClaimsWorktree(runId, managedId) - && (owner === undefined || runId.length > owner.length)) owner = runId; - } - return owner; -} - -async function cleanupRunWorktreesUnderLease( - root: string, - commonDir: string, - runId: string, - runGit: typeof git, - knownRunIds: ReadonlySet, -): Promise { - const worktreesRoot = path.join(root, "worktrees"); - const worktreesIdentity = await plainDirectoryIdentity(worktreesRoot); - if (worktreesIdentity !== null) { - const entries = await readdir(worktreesRoot, { withFileTypes: true }); - for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - if (!entry.isDirectory() - || entry.isSymbolicLink() - || !runClaimsWorktree(runId, entry.name) - || mostSpecificKnownRunClaim(knownRunIds, entry.name) !== runId) continue; - const worktreePath = path.join(worktreesRoot, entry.name); - const identity = await managedWorktreeDirectoryIdentity(worktreePath); - if (identity !== null) { - await removeManagedWorktreeUnderLease(commonDir, worktreePath, identity, runGit); - } - } - } - - // A crash or external removal can erase the physical directory before its - // exact Git registration is cleaned. Such a path cannot be discovered by - // scanning the state directory, so inspect this run's known repository while - // its checkout lease is held and remove only registrations in the managed - // root whose complete run-id boundary matches. - const listed = await runGit(commonDir, ["worktree", "list", "--porcelain", "-z"]); - if (listed.exitCode !== 0 - || listed.truncated?.stdout === true - || listed.truncated?.stderr === true) { - throw runGitError("enumerate missing run worktree registrations", listed); - } - const canonicalWorktreesRoot = worktreesIdentity === null - ? path.join(await realpath(root), "worktrees") - : await realpath(worktreesRoot); - for (const field of gitNulRecords(listed.stdout, "missing-run Git worktree list")) { - if (!field.startsWith("worktree ")) continue; - const reportedWorktreePath = path.resolve(field.slice("worktree ".length)); - let worktreePath: string; - try { - worktreePath = await canonicalizeWorktreePath(reportedWorktreePath, true); - } catch (error) { - if (!isMissing(error) || worktreesIdentity !== null) throw error; - const reportedRoot = path.dirname(reportedWorktreePath); - worktreePath = path.join( - await realpath(path.dirname(reportedRoot)), - path.basename(reportedRoot), - path.basename(reportedWorktreePath), - ); - } - if (!platformPathsEqual(path.dirname(worktreePath), canonicalWorktreesRoot) - || !runClaimsWorktree(runId, path.basename(worktreePath)) - || mostSpecificKnownRunClaim(knownRunIds, path.basename(worktreePath)) !== runId - || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; - await removeMissingRegisteredWorktree(commonDir, worktreePath, { git: runGit }); - } -} - -async function recoverRun( - record: RunStartRecord, - root: string, - ps: Pick, - isProcessAlive: (pid: number) => boolean, - runGit: typeof git = git, - worktreeCleanupAllowed = true, - knownRunIds: ReadonlySet = new Set([record.runId]), -): Promise<"recovered" | "live-preserve"> { - if (record.pid !== null && isProcessAlive(record.pid)) { - if (record.processToken === null) return "live-preserve"; - let observedToken: string | null; - try { - observedToken = await ps.getProcessStartToken(record.pid); - } catch { - return "live-preserve"; - } - if (observedToken === null) return "live-preserve"; - if (observedToken === record.processToken) { - await ps.terminateProcessTreeByPid(record.pid, record.processToken); - } - } - if (!worktreeCleanupAllowed) { - throw new RuntimeError("pending worktree removal ambiguity deferred stale-run cleanup"); - } - const commonDir = await validateGitCommonDir(record.canonicalCommonDir); - const store = new ArtifactStore(record.runId); - const logsRef = await store.writeLog( - "recovery", - "startup recovery reclaimed unfinished run\n", - ); - await cleanupRunWorktreesUnderLease(root, commonDir, record.runId, runGit, knownRunIds); - await cleanupTemporarySliceRefs(commonDir, record.runId, runGit); - await removeStaleCandidateAnchor(commonDir, record.runId); - await store.writeResult({ - resultVersion: "1", - runId: record.runId, - status: "cancelled", - failure: "cancelled", - summary: "Interrupted attempt was cancelled during startup recovery.", - producerSummary: null, - candidate: null, - requestedVerification: [], - executedVerification: [], - unresolvedIssues: ["attempt-interrupted-before-terminal-result"], - evidence: { - recovery: "startup-stale-run", - originalStartedAt: record.startedAt, - }, - logsRef, - producerId: null, - producerVersion: null, - producerModel: null, - durationMs: 0, - sessionId: null, - }); - return "recovered"; -} - -async function readHandleBytes( - handle: Awaited>, - size: number, -): Promise { - const contents = Buffer.alloc(size); - let offset = 0; - while (offset < size) { - const { bytesRead } = await handle.read( - contents, - offset, - size - offset, - offset, - ); - if (bytesRead === 0) break; - offset += bytesRead; - } - return contents.subarray(0, offset); -} - - -async function assertRegistrationBacklink( - registrationPath: string, - expectedPhysicalPath: string, -): Promise { - const backlink = await readStableRegularFile(path.join(registrationPath, "gitdir"), 32_768n); - if (backlink === null) { - throw new RuntimeError("worktree registration backlink is absent or unstable"); - } - const reportedDotGit = gitPathOutput( - backlink.toString("utf8"), - "worktree registration backlink", - ); - if (!path.isAbsolute(reportedDotGit) || path.basename(reportedDotGit) !== ".git") { - throw new RuntimeError("worktree registration backlink is malformed"); - } - const [reportedPhysicalPath, canonicalExpectedPhysicalPath] = await Promise.all([ - canonicalizeWorktreePath(path.dirname(reportedDotGit), true), - canonicalizeWorktreePath(expectedPhysicalPath, true), - ]); - if (!platformPathsEqual(reportedPhysicalPath, canonicalExpectedPhysicalPath)) { - throw new RuntimeError("worktree registration backlink names a different physical worktree"); - } -} - -async function findCreationRegistration( - registrationRoot: string, - physicalPath: string, -): Promise { - const matches: string[] = []; - for (const entry of await readdir(registrationRoot, { withFileTypes: true })) { - if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const registrationPath = path.join(registrationRoot, entry.name); - const contents = await readStableRegularFile( - path.join(registrationPath, "gitdir"), - 32_768n, - ); - if (contents === null) continue; - let backlink: string; - try { - backlink = gitPathOutput(contents.toString("utf8"), "creation registration backlink"); - } catch { - continue; - } - if (path.isAbsolute(backlink) - && path.basename(backlink) === ".git" - && platformPathsEqual(path.resolve(path.dirname(backlink)), physicalPath)) { - matches.push(registrationPath); - } - } - if (matches.length > 1) { - throw new RuntimeError("worktree creation registration is ambiguous"); - } - return matches[0] ?? null; -} - -async function findCreationPhysicalRoot( - stateDirectory: string, - expected: ManagedWorktreeDirectoryIdentity, -): Promise { - const matches: string[] = []; - for (const entry of await readdir(stateDirectory, { withFileTypes: true })) { - if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path.join(stateDirectory, entry.name); - const identity = await managedWorktreeDirectoryIdentity(candidate); - if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); - } - if (matches.length > 1) { - throw new RuntimeError("worktree creation root identity is ambiguous"); - } - return matches[0] ?? null; -} - -async function findManagedChildByIdentity( - root: string, - expected: ManagedWorktreeDirectoryIdentity, -): Promise { - const matches: string[] = []; - for (const entry of await readdir(root, { withFileTypes: true })) { - if (!entry.isDirectory() || entry.isSymbolicLink()) continue; - const candidate = path.join(root, entry.name); - const identity = await managedWorktreeDirectoryIdentity(candidate); - if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); - } - if (matches.length > 1) { - throw new RuntimeError("managed directory identity appears at multiple paths"); - } - return matches[0] ?? null; -} - -async function recoverWorktreeCreationIntent( - manifestPath: string, - manifest: WorktreeRemovalManifest, - platformServices: PlatformServices, - syncDirectory: (directory: string) => Promise, - temporaryPath?: string, - temporaryKind?: "linked", -): Promise { - const root = await stateRoot(); - if (root === null) throw new RuntimeError("runtime state root is unavailable"); - const expectedPhysicalRootPath = path.join(root, "worktrees"); - if (!path.isAbsolute(manifest.physicalPath) - || path.resolve(manifest.physicalPath) !== manifest.physicalPath - || !platformPathsEqual(path.dirname(manifest.physicalPath), expectedPhysicalRootPath) - || path.basename(manifest.physicalPath) === "" - || !path.isAbsolute(manifest.physicalQuarantinePath) - || path.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath - || !platformPathsEqual( - path.dirname(manifest.physicalQuarantinePath), - expectedPhysicalRootPath, - ) - || path.basename(manifest.physicalQuarantinePath) - !== `.create-${path.basename(manifest.physicalPath)}-${manifest.transactionId}` - || !path.isAbsolute(manifest.commonDir) - || !path.isAbsolute(manifest.registrationRoot) - || !path.isAbsolute(manifest.quarantineRoot) - || !path.isAbsolute(manifest.quarantinePath) - || !platformPathsEqual( - manifest.registrationRoot, - path.join(manifest.commonDir, "worktrees"), - ) - || !platformPathsEqual(path.dirname(manifest.quarantinePath), manifest.quarantineRoot) - || path.basename(manifest.quarantinePath) - !== `.remove-registration-creation-${manifest.transactionId}`) { - throw new RuntimeError("worktree creation intent paths are inconsistent"); - } - const expectedCommonDir = { - dev: BigInt(manifest.commonDirDev), - ino: BigInt(manifest.commonDirIno), - birthtimeNs: BigInt(manifest.commonDirBirthtimeNs), - }; - const expectedPhysicalRoot = { - dev: BigInt(manifest.physicalRootDev), - ino: BigInt(manifest.physicalRootIno), - birthtimeNs: BigInt(manifest.physicalRootBirthtimeNs), - }; - const expectedRegistrationRoot = { - dev: BigInt(manifest.registrationRootDev), - ino: BigInt(manifest.registrationRootIno), - birthtimeNs: BigInt(manifest.registrationRootBirthtimeNs), - }; - const expectedQuarantineRoot = { - dev: BigInt(manifest.quarantineRootDev), - ino: BigInt(manifest.quarantineRootIno), - birthtimeNs: BigInt(manifest.quarantineRootBirthtimeNs), - }; - const commonDir = await realpath(manifest.commonDir); - const registrationRoot = await realpath(manifest.registrationRoot); - const quarantineRoot = await realpath(manifest.quarantineRoot); - const [commonIdentity, registrationRootIdentity, quarantineRootIdentity] = - await Promise.all([ - managedWorktreeDirectoryIdentity(commonDir), - managedWorktreeDirectoryIdentity(registrationRoot), - managedWorktreeDirectoryIdentity(quarantineRoot), - ]); - if (!platformPathsEqual(commonDir, manifest.commonDir) - || !platformPathsEqual(registrationRoot, manifest.registrationRoot) - || !platformPathsEqual(quarantineRoot, manifest.quarantineRoot) - || commonIdentity === null - || !sameManagedIdentity(commonIdentity, expectedCommonDir) - || registrationRootIdentity === null - || !sameManagedIdentity(registrationRootIdentity, expectedRegistrationRoot) - || quarantineRootIdentity === null - || !sameManagedIdentity(quarantineRootIdentity, expectedQuarantineRoot)) { - throw new RuntimeError("worktree creation intent repository identity changed"); - } - - await platformSafety.withRecoveryLease(commonDir, async (lease) => { - if (!platformPathsEqual(lease.repositoryIdentity, commonDir)) { - throw new RuntimeError("worktree creation recovery lease identity mismatch"); - } - if (temporaryPath !== undefined && temporaryKind === "linked") { - await settleLinkedWorktreeRemovalManifest( - manifestPath, - temporaryPath, - manifest.transactionId, - ); - } - const lockedManifest = await readWorktreeRemovalManifest( - manifestPath, - manifest.transactionId, - ); - if (lockedManifest === null - || JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { - throw new RuntimeError("worktree creation intent changed before recovery lease"); - } - const physicalRoot = await findCreationPhysicalRoot(root, expectedPhysicalRoot); - if (physicalRoot === null) { - throw new RuntimeError("worktree creation root moved outside the managed state directory"); - } - const expectedPhysical = manifest.physicalPresent - ? { - dev: BigInt(manifest.physicalDev), - ino: BigInt(manifest.physicalIno), - birthtimeNs: BigInt(manifest.physicalBirthtimeNs), - } - : null; - const finalPhysicalPath = physicalRoot === null - ? null - : path.join(physicalRoot, path.basename(manifest.physicalPath)); - const stagedPhysicalPath = physicalRoot === null - ? null - : path.join(physicalRoot, path.basename(manifest.physicalQuarantinePath)); - const [finalPhysicalIdentity, stagedPhysicalIdentity] = await Promise.all([ - finalPhysicalPath === null - ? null - : managedWorktreeDirectoryIdentity(finalPhysicalPath), - stagedPhysicalPath === null - ? null - : managedWorktreeDirectoryIdentity(stagedPhysicalPath), - ]); - if (finalPhysicalIdentity !== null && stagedPhysicalIdentity !== null) { - throw new RuntimeError("worktree creation placeholder exists at two paths"); - } - const physicalPath = finalPhysicalIdentity !== null - ? finalPhysicalPath - : stagedPhysicalIdentity !== null - ? stagedPhysicalPath - : null; - const physicalIdentity = finalPhysicalIdentity ?? stagedPhysicalIdentity; - if (expectedPhysical === null) { - if (finalPhysicalIdentity !== null) { - throw new RuntimeError("unbound final worktree creation path appeared"); - } - } else if (physicalIdentity !== null - && !sameManagedIdentity(physicalIdentity, expectedPhysical)) { - throw new RuntimeError("worktree creation physical identity changed"); - } - - const activeRegistration = await findCreationRegistration( - registrationRoot, - manifest.physicalPath, - ); - let quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); - if (activeRegistration !== null && quarantineIdentity !== null) { - throw new RuntimeError("worktree creation registration exists at two paths"); - } - if (expectedPhysical === null - && (activeRegistration !== null || quarantineIdentity !== null)) { - throw new RuntimeError("unbound worktree creation acquired a Git registration"); - } - if (activeRegistration !== null) { - const registrationIdentity = await managedWorktreeDirectoryIdentity(activeRegistration); - if (registrationIdentity === null) { - throw new RuntimeError("worktree creation registration disappeared"); - } - await assertRegistrationBacklink(activeRegistration, manifest.physicalPath); - await rename(activeRegistration, manifest.quarantinePath); - await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); - if (await managedWorktreeDirectoryIdentity(activeRegistration) !== null) { - throw new RuntimeError("worktree creation registration reappeared after staging"); - } - quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); - if (quarantineIdentity === null - || !sameManagedIdentity(quarantineIdentity, registrationIdentity)) { - throw new RuntimeError("worktree creation registration changed during staging"); - } - } - if (quarantineIdentity !== null) { - await assertRegistrationBacklink(manifest.quarantinePath, manifest.physicalPath); - } - - const removalIdentity = expectedPhysical ?? stagedPhysicalIdentity; - if (physicalPath !== null && physicalIdentity !== null && removalIdentity !== null) { - if (expectedPhysical !== null) { - await emptyBoundDirectory(physicalPath, removalIdentity, platformServices); - } - await removeBoundEmptyDirectory(physicalPath, removalIdentity, platformServices); - await syncDirectory(physicalRoot); - const settledRoot = await managedWorktreeDirectoryIdentity(physicalRoot!); - if (settledRoot === null || !sameManagedIdentity(settledRoot, expectedPhysicalRoot)) { - throw new RuntimeError("worktree creation root changed during recovery"); - } - } - if (quarantineIdentity !== null) { - await removeQuarantinedDirectory( - quarantineRoot, - manifest.quarantinePath, - quarantineIdentity, - { processSupervisor: platformServices }, - ); - } - await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); - await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - }); -} - - -export async function recoverPendingWorktreeRemovals( - platformServices: PlatformServices = getPlatformServices(), - syncDirectory: (directory: string) => Promise = syncDirectoryMetadata, -): Promise { - const { pending, issues } = await readPendingWorktreeRemovalManifests(); - for (const { manifestPath, manifest, temporaryPath, temporaryKind } of pending) { - let recoveryError: unknown; - let repositoryIdentity: string | undefined; - try { - if (manifest.phase === "creation-intent") { - repositoryIdentity = await realpath(manifest.commonDir); - await recoverWorktreeCreationIntent( - manifestPath, - manifest, - platformServices, - syncDirectory, - temporaryPath, - temporaryKind, - ); - continue; - } - const commonDir = await realpath(manifest.commonDir); - repositoryIdentity = commonDir; - const expectedRegistrationRoot = path.join(commonDir, "worktrees"); - const registrationRoot = await realpath(expectedRegistrationRoot); - const expectedQuarantineRoot = path.join( - commonDir, - WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY, - ); - const quarantineRoot = await realpath(expectedQuarantineRoot); - const quarantineMetadata = await lstat(quarantineRoot, { bigint: true }); - const physicalRoot = await realpath(path.resolve(resolveStateDir(), "worktrees")); - const commonDirIdentity = await managedWorktreeDirectoryIdentity(commonDir); - const registrationRootIdentity = await managedWorktreeDirectoryIdentity(registrationRoot); - const quarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); - const physicalRootIdentity = await managedWorktreeDirectoryIdentity(physicalRoot); - const expectedCommonDirIdentity: ManagedWorktreeDirectoryIdentity = { - dev: BigInt(manifest.commonDirDev), - ino: BigInt(manifest.commonDirIno), - birthtimeNs: BigInt(manifest.commonDirBirthtimeNs), - }; - const expectedRegistrationRootIdentity: ManagedWorktreeDirectoryIdentity = { - dev: BigInt(manifest.registrationRootDev), - ino: BigInt(manifest.registrationRootIno), - birthtimeNs: BigInt(manifest.registrationRootBirthtimeNs), - }; - const expectedQuarantineRootIdentity: ManagedWorktreeDirectoryIdentity = { - dev: BigInt(manifest.quarantineRootDev), - ino: BigInt(manifest.quarantineRootIno), - birthtimeNs: BigInt(manifest.quarantineRootBirthtimeNs), - }; - const expectedPhysicalRootIdentity: ManagedWorktreeDirectoryIdentity = { - dev: BigInt(manifest.physicalRootDev), - ino: BigInt(manifest.physicalRootIno), - birthtimeNs: BigInt(manifest.physicalRootBirthtimeNs), - }; - if (process.platform === "win32") { - if (registrationRootIdentity === null - || quarantineRootIdentity === null - || physicalRootIdentity === null) { - throw new RuntimeError("worktree removal root identity is unavailable on Windows"); - } - await Promise.all([ - assertWindowsPrivateDirectory( - quarantineRoot, - quarantineRootIdentity, - platformServices, - ), - assertWindowsPrivateDirectory( - physicalRoot, - physicalRootIdentity, - platformServices, - ), - ]); - } - const manifestPhysicalRoot = await realpath(path.dirname(manifest.physicalPath)); - const manifestPhysicalQuarantineRoot = await realpath( - path.dirname(manifest.physicalQuarantinePath), - ); - const assertRemovalRootsUnchanged = async () => { - const currentCommonDir = await managedWorktreeDirectoryIdentity(commonDir); - const currentRegistrationRoot = await managedWorktreeDirectoryIdentity(registrationRoot); - const currentQuarantineRoot = await managedWorktreeDirectoryIdentity(quarantineRoot); - const currentPhysicalRoot = await managedWorktreeDirectoryIdentity(physicalRoot); - if (commonDirIdentity === null - || currentCommonDir === null - || !sameManagedIdentity(currentCommonDir, commonDirIdentity) - || registrationRootIdentity === null - || quarantineRootIdentity === null - || physicalRootIdentity === null - || currentRegistrationRoot === null - || currentQuarantineRoot === null - || currentPhysicalRoot === null - || !sameManagedIdentity(currentRegistrationRoot, registrationRootIdentity) - || !sameManagedIdentity(currentQuarantineRoot, quarantineRootIdentity) - || !sameManagedIdentity(currentPhysicalRoot, physicalRootIdentity)) { - throw new RuntimeError("worktree removal root identity changed"); - } - }; - const syncRemovalRoots = async () => { - for (const directory of [physicalRoot, registrationRoot, quarantineRoot]) { - await syncDirectory(directory); - } - await assertRemovalRootsUnchanged(); - }; - const uid = process.getuid?.(); - const checkManifestConsistency = ( - tag: string, - ok: boolean, - ...operands: unknown[] - ) => { - if (ok) return; - const detail = operands.length === 0 - ? "" - : ` (${operands.map(operand => boundedRedactedDiagnostic( - JSON.stringify(operand, (_key, value) => - typeof value === "bigint" ? value.toString() : value), - 256, - )).join(" vs ")})`; - throw new RuntimeError( - `worktree removal manifest paths are inconsistent: ${tag}${detail}`, - ); - }; - checkManifestConsistency( - "quarantineRoot directory mismatch", - quarantineMetadata.isDirectory(), - quarantineMetadata.isDirectory(), - true, - ); - checkManifestConsistency( - "quarantineRoot symlink mismatch", - !quarantineMetadata.isSymbolicLink(), - quarantineMetadata.isSymbolicLink(), - false, - ); - if (process.platform !== "win32") { - checkManifestConsistency("quarantineRoot owner unavailable", uid !== undefined, uid); - checkManifestConsistency( - "quarantineRoot owner mismatch", - quarantineMetadata.uid === BigInt(uid!), - quarantineMetadata.uid, - uid, - ); - checkManifestConsistency( - "quarantineRoot mode mismatch", - (quarantineMetadata.mode & 0o077n) === 0n, - quarantineMetadata.mode & 0o077n, - 0, - ); - } - checkManifestConsistency( - "commonDir identity unavailable", - commonDirIdentity !== null, - commonDirIdentity, - ); - checkManifestConsistency( - "commonDir identity mismatch", - sameManagedIdentity(commonDirIdentity!, expectedCommonDirIdentity), - commonDirIdentity, - expectedCommonDirIdentity, - ); - checkManifestConsistency( - "registrationRoot identity unavailable", - registrationRootIdentity !== null, - registrationRootIdentity, - ); - checkManifestConsistency( - "registrationRoot identity mismatch", - sameManagedIdentity(registrationRootIdentity!, expectedRegistrationRootIdentity), - registrationRootIdentity, - expectedRegistrationRootIdentity, - ); - checkManifestConsistency( - "quarantineRoot identity unavailable", - quarantineRootIdentity !== null, - quarantineRootIdentity, - ); - checkManifestConsistency( - "quarantineRoot identity mismatch", - sameManagedIdentity(quarantineRootIdentity!, expectedQuarantineRootIdentity), - quarantineRootIdentity, - expectedQuarantineRootIdentity, - ); - checkManifestConsistency( - "physicalRoot identity unavailable", - physicalRootIdentity !== null, - physicalRootIdentity, - ); - checkManifestConsistency( - "physicalRoot identity mismatch", - sameManagedIdentity(physicalRootIdentity!, expectedPhysicalRootIdentity), - physicalRootIdentity, - expectedPhysicalRootIdentity, - ); - checkManifestConsistency( - "commonDir mismatch", - platformPathsEqual(commonDir, manifest.commonDir), - commonDir, - manifest.commonDir, - ); - checkManifestConsistency( - "derived registrationRoot mismatch", - platformPathsEqual(registrationRoot, expectedRegistrationRoot), - registrationRoot, - expectedRegistrationRoot, - ); - checkManifestConsistency( - "derived quarantineRoot mismatch", - platformPathsEqual(quarantineRoot, expectedQuarantineRoot), - quarantineRoot, - expectedQuarantineRoot, - ); - checkManifestConsistency( - "registrationRoot mismatch", - platformPathsEqual(registrationRoot, manifest.registrationRoot), - registrationRoot, - manifest.registrationRoot, - ); - checkManifestConsistency( - "quarantineRoot mismatch", - platformPathsEqual(quarantineRoot, manifest.quarantineRoot), - quarantineRoot, - manifest.quarantineRoot, - ); - checkManifestConsistency( - "registrationPath is not absolute", - path.isAbsolute(manifest.registrationPath), - manifest.registrationPath, - ); - checkManifestConsistency( - "registrationPath is not normalized", - path.resolve(manifest.registrationPath) === manifest.registrationPath, - path.resolve(manifest.registrationPath), - manifest.registrationPath, - ); - checkManifestConsistency( - "registrationPath equals registrationRoot", - !platformPathsEqual(manifest.registrationPath, registrationRoot), - manifest.registrationPath, - registrationRoot, - ); - checkManifestConsistency( - "quarantinePath is not absolute", - path.isAbsolute(manifest.quarantinePath), - manifest.quarantinePath, - ); - checkManifestConsistency( - "quarantinePath is not normalized", - path.resolve(manifest.quarantinePath) === manifest.quarantinePath, - path.resolve(manifest.quarantinePath), - manifest.quarantinePath, - ); - checkManifestConsistency( - "quarantinePath equals quarantineRoot", - !platformPathsEqual(manifest.quarantinePath, quarantineRoot), - manifest.quarantinePath, - quarantineRoot, - ); - checkManifestConsistency( - "physicalPath is not absolute", - path.isAbsolute(manifest.physicalPath), - manifest.physicalPath, - ); - checkManifestConsistency( - "physicalPath is not normalized", - path.resolve(manifest.physicalPath) === manifest.physicalPath, - path.resolve(manifest.physicalPath), - manifest.physicalPath, - ); - checkManifestConsistency( - "physicalPath equals physicalRoot", - !platformPathsEqual(manifest.physicalPath, physicalRoot), - manifest.physicalPath, - physicalRoot, - ); - checkManifestConsistency( - "physicalQuarantinePath is not absolute", - path.isAbsolute(manifest.physicalQuarantinePath), - manifest.physicalQuarantinePath, - ); - checkManifestConsistency( - "physicalQuarantinePath is not normalized", - path.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, - path.resolve(manifest.physicalQuarantinePath), - manifest.physicalQuarantinePath, - ); - checkManifestConsistency( - "physicalQuarantinePath equals physicalRoot", - !platformPathsEqual(manifest.physicalQuarantinePath, physicalRoot), - manifest.physicalQuarantinePath, - physicalRoot, - ); - checkManifestConsistency( - "registrationPath parent mismatch", - platformPathsEqual(path.dirname(manifest.registrationPath), registrationRoot), - path.dirname(manifest.registrationPath), - registrationRoot, - ); - checkManifestConsistency( - "quarantinePath parent mismatch", - platformPathsEqual(path.dirname(manifest.quarantinePath), quarantineRoot), - path.dirname(manifest.quarantinePath), - quarantineRoot, - ); - checkManifestConsistency( - "quarantinePath name mismatch", - path.basename(manifest.quarantinePath) - === `.remove-registration-${path.basename(manifest.registrationPath)}-${manifest.transactionId}`, - path.basename(manifest.quarantinePath), - `.remove-registration-${path.basename(manifest.registrationPath)}-${manifest.transactionId}`, - ); - checkManifestConsistency( - "physicalPath parent mismatch", - platformPathsEqual(manifestPhysicalRoot, physicalRoot), - manifestPhysicalRoot, - physicalRoot, - ); - checkManifestConsistency( - "physicalQuarantinePath parent mismatch", - platformPathsEqual(manifestPhysicalQuarantineRoot, physicalRoot), - manifestPhysicalQuarantineRoot, - physicalRoot, - ); - checkManifestConsistency( - "physicalQuarantinePath name mismatch", - path.basename(manifest.physicalQuarantinePath) - === `.remove-${path.basename(manifest.physicalPath)}-${manifest.transactionId}`, - path.basename(manifest.physicalQuarantinePath), - `.remove-${path.basename(manifest.physicalPath)}-${manifest.transactionId}`, - ); - if (manifest.phase === "creation-root-changed") { - throw new RuntimeError("worktree creation root changed and requires manual resolution"); - } - const expectedRegistrationIdentity = { - dev: BigInt(manifest.registrationDev), - ino: BigInt(manifest.registrationIno), - birthtimeNs: BigInt(manifest.registrationBirthtimeNs), - }; - const expectedPhysicalIdentity = manifest.physicalPresent - ? { - dev: BigInt(manifest.physicalDev), - ino: BigInt(manifest.physicalIno), - birthtimeNs: BigInt(manifest.physicalBirthtimeNs), - } - : null; - await platformSafety.withRecoveryLease(commonDir, async (lease) => { - if (lease.repositoryIdentity !== commonDir) { - throw new RuntimeError("worktree removal recovery lease identity mismatch"); - } - - if (temporaryPath !== undefined && temporaryKind === "linked") { - await settleLinkedWorktreeRemovalManifest( - manifestPath, - temporaryPath, - manifest.transactionId, - ); - } - const lockedManifest = await readWorktreeRemovalManifest( - manifestPath, - manifest.transactionId, - ); - if (lockedManifest === null) return; - if (JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { - throw new RuntimeError("worktree removal manifest changed before recovery lease"); - } - const registrationIdentity = await managedWorktreeDirectoryIdentity( - manifest.registrationPath, - ); - const quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); - let physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); - let physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( - manifest.physicalQuarantinePath, - ); - await assertRemovalRootsUnchanged(); - if (registrationIdentity !== null && quarantineIdentity !== null) { - throw new RuntimeError("worktree removal registration exists at two paths"); - } - if (physicalIdentity !== null && physicalQuarantineIdentity !== null) { - throw new RuntimeError("physical worktree exists at two paths during removal recovery"); - } - if (registrationIdentity !== null - && (registrationIdentity.dev !== expectedRegistrationIdentity.dev - || registrationIdentity.ino !== expectedRegistrationIdentity.ino - || registrationIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { - throw new RuntimeError("worktree removal registration identity changed"); - } - if (quarantineIdentity !== null - && (quarantineIdentity.dev !== expectedRegistrationIdentity.dev - || quarantineIdentity.ino !== expectedRegistrationIdentity.ino - || quarantineIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { - throw new RuntimeError("worktree removal quarantine identity changed"); - } - if (expectedPhysicalIdentity === null) { - if (physicalIdentity !== null || physicalQuarantineIdentity !== null) { - throw new RuntimeError("stale worktree physical path reappeared during removal recovery"); - } - } else { - if (physicalIdentity !== null - && (physicalIdentity.dev !== expectedPhysicalIdentity.dev - || physicalIdentity.ino !== expectedPhysicalIdentity.ino - || physicalIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { - throw new RuntimeError("physical worktree identity changed during removal recovery"); - } - if (physicalQuarantineIdentity !== null - && (physicalQuarantineIdentity.dev !== expectedPhysicalIdentity.dev - || physicalQuarantineIdentity.ino !== expectedPhysicalIdentity.ino - || physicalQuarantineIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { - throw new RuntimeError("physical worktree quarantine identity changed"); - } - if (physicalIdentity === null && physicalQuarantineIdentity === null) { - const displacedPhysicalPath = await findManagedChildByIdentity( - physicalRoot, - expectedPhysicalIdentity, - ); - if (displacedPhysicalPath !== null) { - throw new RuntimeError( - "physical worktree moved away from both recorded removal paths", - ); - } - } - } - - const activeRegistrationPath = quarantineIdentity !== null - ? manifest.quarantinePath - : registrationIdentity !== null - ? manifest.registrationPath - : null; - if (activeRegistrationPath === null && manifest.phase !== "physical-removed") { - throw new RuntimeError("worktree removal registration disappeared before commit"); - } - if (activeRegistrationPath !== null && manifest.phase !== "physical-removed") { - await assertRegistrationBacklink(activeRegistrationPath, manifest.physicalPath); - } - - if (manifest.phase === "physical-removed" - && (physicalIdentity !== null || physicalQuarantineIdentity !== null)) { - throw new RuntimeError("committed physical worktree removal reappeared"); - } - if (manifest.phase === "physical-removal-intent" - && manifest.physicalPresent - && physicalIdentity === null - && physicalQuarantineIdentity === null) { - throw new RuntimeError( - "intended physical worktree removal has no provable original or quarantine", - ); - } - const rollback = manifest.phase === "registration-intent" - ? !manifest.physicalPresent || physicalIdentity !== null - : manifest.phase === "physical-removal-intent" - ? (manifest.physicalPresent - ? physicalIdentity !== null || physicalQuarantineIdentity !== null - : physicalIdentity === null && physicalQuarantineIdentity === null) - : manifest.phase === "registration-staged" - && (manifest.physicalPresent - ? physicalIdentity !== null - : physicalIdentity === null && physicalQuarantineIdentity === null); - if (rollback) { - if (manifest.phase === "physical-removal-intent" - && physicalQuarantineIdentity !== null) { - if (expectedPhysicalIdentity === null || physicalIdentity !== null) { - throw new RuntimeError("physical worktree rollback state is inconsistent"); - } - await assertRemovalRootsUnchanged(); - await rename(manifest.physicalQuarantinePath, manifest.physicalPath); - const restoredPhysical = await managedWorktreeDirectoryIdentity(manifest.physicalPath); - const settledPhysicalQuarantine = await managedWorktreeDirectoryIdentity( - manifest.physicalQuarantinePath, - ); - if (restoredPhysical === null - || !sameManagedIdentity(restoredPhysical, expectedPhysicalIdentity) - || settledPhysicalQuarantine !== null) { - throw new RuntimeError("physical worktree rollback identity changed"); - } - await syncDirectory(physicalRoot); - await assertRemovalRootsUnchanged(); - } - if (quarantineIdentity !== null) { - await restoreStagedRegistration( - registrationRoot, - manifest.registrationPath, - quarantineRoot, - manifest.quarantinePath, - expectedRegistrationIdentity, - expectedRegistrationRootIdentity, - expectedQuarantineRootIdentity, - { processSupervisor: platformServices }, - ); - } else if (registrationIdentity === null) { - throw new RuntimeError("pre-commit worktree registration disappeared"); - } - await syncRemovalRoots(); - await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - } else { - if (manifest.phase === "registration-staged") { - throw new RuntimeError("staged worktree removal physical state is inconsistent"); - } - if (manifest.phase === "physical-removal-started" - && physicalIdentity !== null) { - if (registrationIdentity !== null - || expectedPhysicalIdentity === null - || physicalQuarantineIdentity !== null) { - throw new RuntimeError("started worktree removal state is inconsistent"); - } - await assertRemovalRootsUnchanged(); - await rename(manifest.physicalPath, manifest.physicalQuarantinePath); - physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); - physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( - manifest.physicalQuarantinePath, - ); - if (physicalIdentity !== null - || physicalQuarantineIdentity === null - || !sameManagedIdentity(physicalQuarantineIdentity, expectedPhysicalIdentity)) { - throw new RuntimeError("started worktree removal quarantine identity changed"); - } - await syncDirectory(physicalRoot); - await assertRemovalRootsUnchanged(); - } - if (physicalQuarantineIdentity !== null) { - if (registrationIdentity !== null || expectedPhysicalIdentity === null) { - throw new RuntimeError("quarantined worktree removal state is inconsistent"); - } - await removeQuarantinedDirectory( - physicalRoot, - manifest.physicalQuarantinePath, - expectedPhysicalIdentity, - { processSupervisor: platformServices }, - ); - physicalQuarantineIdentity = null; - } - if (registrationIdentity !== null) { - throw new RuntimeError("removed physical worktree retained a live registration"); - } - if (quarantineIdentity !== null) { - await removeQuarantinedDirectory( - quarantineRoot, - manifest.quarantinePath, - expectedRegistrationIdentity, - { processSupervisor: platformServices }, - ); - } - await syncRemovalRoots(); - await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); - } - }); - } catch (error) { - recoveryError = error; - } - - - if (recoveryError !== undefined) { - issues.push({ - manifestPath, - error: recoveryError, - ...(repositoryIdentity === undefined ? {} : { repositoryIdentity }), - }); - } - } - return issues; -} - -function worktreeSweepIssue( - worktreePath: string, - error: unknown, - repositoryIdentity?: string, -): WorktreeSweepIssue { - return { - worktreePath, - reason: boundedRedactedDiagnostic(error, MAX_QUARANTINE_REASON_BYTES), - ...(repositoryIdentity === undefined ? {} : { repositoryIdentity }), - }; -} - -function boundedWorktreeSweepIssues( - issues: WorktreeSweepIssue[], - worktreesRoot: string, -): WorktreeSweepIssue[] { - if (issues.length <= MAX_WORKTREE_SWEEP_ISSUES) return issues; - const retained = issues.slice(0, MAX_WORKTREE_SWEEP_ISSUES - 1); - return [...retained, { - worktreePath: worktreesRoot, - reason: `${issues.length - retained.length} additional worktree sweep issues omitted`, - }]; -} - -function runClaimsWorktree(runId: string, managedId: string): boolean { - // Worktree phase names are intentionally open-ended: adding a new trusted - // phase must not make recovery delete it merely because this scanner's enum - // was not updated. Run IDs are safe, collision-resistant identifiers, and - // each supported namespace uses an explicit boundary after the full ID. - return managedId === runId - || managedId.startsWith(`${runId}-`) - || managedId === `baseline-${runId}` - || managedId.startsWith(`baseline-${runId}-`) - || managedId === `verify-${runId}` - || managedId.startsWith(`verify-${runId}-`); -} - -const MALFORMED_WORKFLOW_OWNERSHIP = ""; - -async function workflowOwnershipRecords( - root: string, -): Promise> { - const ownershipRoot = path.join(root, "autopilot-branches"); - if (await plainDirectoryIdentity(ownershipRoot) === null) return new Map(); - const records = new Map(); - for (const entry of await readdir(ownershipRoot, { withFileTypes: true })) { - const match = WORKFLOW_OWNERSHIP_NAME.exec(entry.name); - if (match === null || !entry.isFile() || entry.isSymbolicLink()) { - throw new RuntimeError("workflow ownership directory contains a malformed entry"); - } - const ownershipPath = path.join(ownershipRoot, entry.name); - const filenamePrefix = match[1]!.slice(0, 32); - records.set(filenamePrefix, [...(records.get(filenamePrefix) ?? []), ownershipPath]); - let workflowId: string; - try { - workflowId = await workflowOwnershipRecordWorkflowId(ownershipPath); - } catch { - records.set(MALFORMED_WORKFLOW_OWNERSHIP, [ - ...(records.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []), - ownershipPath, - ]); - continue; - } - const expectedPrefix = createHash("sha256").update(workflowId).digest("hex").slice(0, 32); - if (expectedPrefix !== filenamePrefix) { - records.set(expectedPrefix, [...(records.get(expectedPrefix) ?? []), ownershipPath]); - } - const legacyPrefix = createHash("sha256") - .update(JSON.stringify(workflowId)).digest("hex").slice(0, 24); - records.set(`legacy:${legacyPrefix}`, [ - ...(records.get(`legacy:${legacyPrefix}`) ?? []), - ownershipPath, - ]); - } - return records; -} - -async function workflowClaimMustBePreserved( - root: string, - claim: WorkflowWorktreeOwnershipClaim, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - const store = new WorkflowStore(claim.workflowId, { - stateDirectory: root, - isProcessAlive, - getProcessStartToken, - }); - let state: AutopilotWorkflowState; - try { - state = await store.read(); - } catch { - return true; - } - if (!TERMINAL_PHASES.has(state.phase)) return true; - const branchOwnerStatus = !isProcessAlive(claim.bootstrapOwner.pid) - ? Promise.resolve("dead") - : claim.bootstrapOwner.processToken === null - ? Promise.resolve("unverifiable") - : lockOwnerStatus( - { - pid: claim.bootstrapOwner.pid, - processToken: claim.bootstrapOwner.processToken, - }, - isProcessAlive, - getProcessStartToken, - ).catch((): LockOwnerStatus => "unverifiable"); - const [workflowOwner, branchOwner] = await Promise.all([ - observeWorkflowLease(store, isProcessAlive, getProcessStartToken), - branchOwnerStatus, - ]); - return (workflowOwner.presence === "present" && workflowOwner.status !== "dead") - || branchOwner !== "dead"; -} - -async function finalMaterializationMustBePreserved( - root: string, - claim: WorkflowWorktreeOwnershipClaim, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - const store = new WorkflowStore(claim.workflowId, { - stateDirectory: root, - isProcessAlive, - getProcessStartToken, - }); - try { - await store.read(); - const owner = await observeWorkflowLease(store, isProcessAlive, getProcessStartToken); - return owner.presence === "present" && owner.status !== "dead"; - } catch { - return true; - } -} - -async function sweepOrphanWorktrees(args: { - root: string; - locksRoot: string; - claimedRunIds: ReadonlySet; - claimedWorkflowPrefixes: ReadonlySet; - ownerContents: Buffer; - isProcessAlive: (pid: number) => boolean; - getProcessStartToken: (pid: number) => Promise; - runGit: typeof git; -}): Promise { - const issues: WorktreeSweepIssue[] = []; - const worktreesRoot = path.join(args.root, "worktrees"); - let entries; - let stateRootIdentity: DirectoryIdentity; - let worktreesRootIdentity: DirectoryIdentity; - try { - if (await plainDirectoryIdentity(worktreesRoot) === null) return issues; - [stateRootIdentity, worktreesRootIdentity] = await Promise.all([ - assertPrivateRecoveryDirectory(args.root), - assertPrivateRecoveryDirectory(worktreesRoot), - ]); - entries = await readdir(worktreesRoot, { withFileTypes: true }); - const [settledStateRoot, settledWorktreesRoot] = await Promise.all([ - plainDirectoryIdentity(args.root), - plainDirectoryIdentity(worktreesRoot), - ]); - if (settledStateRoot === null - || settledWorktreesRoot === null - || !sameIdentity(settledStateRoot, stateRootIdentity) - || !sameIdentity(settledWorktreesRoot, worktreesRootIdentity)) { - throw new RuntimeError("managed worktree namespace identity changed during sweep setup"); - } - } catch (error) { - return [worktreeSweepIssue(worktreesRoot, error)]; - } - - let ownershipRecords = new Map(); - let ownershipLookupError: unknown; - try { - ownershipRecords = await workflowOwnershipRecords(args.root); - } catch (error) { - ownershipLookupError = error; - } - for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { - const worktreePath = path.join(worktreesRoot, entry.name); - if (!entry.isDirectory() || entry.isSymbolicLink()) { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError("managed worktree namespace contains a non-directory entry"), - )); - continue; - } - let expectedIdentity: ManagedWorktreeDirectoryIdentity; - try { - const identity = await managedWorktreeDirectoryIdentity(worktreePath); - if (identity === null) continue; - expectedIdentity = identity; - } catch (error) { - issues.push(worktreeSweepIssue(worktreePath, error)); - continue; - } - - if ([...args.claimedRunIds].some(runId => runClaimsWorktree(runId, entry.name))) continue; - - try { - if (!await managedWorktreeMarkerIsPresent(worktreePath)) { - throw new RuntimeError("orphan worktree repository marker is missing"); - } - } catch (error) { - issues.push(worktreeSweepIssue(worktreePath, error)); - continue; - } - - const workflowMatch = WORKFLOW_WORKTREE_NAME.exec(entry.name); - const legacyFinalMatch = LEGACY_FINAL_WORKTREE_NAME.exec(entry.name); - const finalMaterialization = legacyFinalMatch !== null - || (workflowMatch !== null && entry.name.endsWith("-final")); - const workflowOwnershipKey = workflowMatch?.[1] - ?? (legacyFinalMatch === null ? null : `legacy:${legacyFinalMatch[1]}`); - if (workflowMatch !== null - && !finalMaterialization - && args.claimedWorkflowPrefixes.has(workflowMatch[1]!)) continue; - if (workflowOwnershipKey !== null) { - if (ownershipLookupError !== undefined) { - issues.push(worktreeSweepIssue(worktreePath, ownershipLookupError)); - continue; - } - const candidates = ownershipRecords.get(workflowOwnershipKey) ?? []; - const malformedRecords = ownershipRecords.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; - if (malformedRecords.length > 0) { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError("workflow ownership lookup is ambiguous because a record is malformed"), - )); - continue; - } - if (candidates.length > 1) { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError("workflow worktree ownership lookup is ambiguous"), - )); - continue; - } - if (candidates.length === 1) { - try { - const claim = await workflowWorktreeOwnershipClaim(candidates[0]!, worktreePath); - const preserve = finalMaterialization - ? await finalMaterializationMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken, - ) - : await workflowClaimMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken, - ); - if (preserve) continue; - } catch (error) { - issues.push(worktreeSweepIssue(worktreePath, error)); - continue; - } - } - } - - let commonDir: string; - try { - const resolved = await args.runGit(worktreePath, [ - "rev-parse", "--path-format=absolute", "--git-common-dir", - ]); - if (resolved.truncated?.stdout === true || resolved.truncated?.stderr === true) { - throw new RuntimeError("worktree repository lookup was truncated"); - } - if (resolved.exitCode !== 0) { - throw runGitError("resolve worktree repository", resolved); - } - const reportedCommonDir = gitPathOutput( - resolved.stdout, - "startup worktree common directory", - ); - if (!path.isAbsolute(reportedCommonDir)) { - throw new RuntimeError("worktree repository lookup returned a non-absolute path"); - } - commonDir = await realpath(reportedCommonDir); - } catch (error) { - issues.push(worktreeSweepIssue(worktreePath, error)); - continue; - } - - const lockKey = createHash("sha256").update(commonDir).digest("hex"); - let lease: AcquiredLock | null = null; - let contention: DeadLockReclaimResult | undefined; - try { - lease = await createOwnedLock( - path.join(args.locksRoot, `${lockKey}.lock`), - args.ownerContents, - ); - if (lease === null) { - contention = await reclaimDeadLock( - path.join(args.locksRoot, `${lockKey}.lock`), - args.isProcessAlive, - args.getProcessStartToken, - ); - if (contention === "reclaimed") { - lease = await createOwnedLock( - path.join(args.locksRoot, `${lockKey}.lock`), - args.ownerContents, - ); - } - } - } catch (error) { - issues.push(worktreeSweepIssue(worktreePath, error, commonDir)); - continue; - } - if (lease === null) { - if (contention === "malformed" || contention === "unverifiable") { - issues.push(worktreeSweepIssue( - worktreePath, - new RuntimeError(`${contention} checkout lease owner`), - commonDir, - )); - } - continue; - } - - let cleanupError: unknown; - try { - const currentIdentity = await managedWorktreeDirectoryIdentity(worktreePath); - if (currentIdentity !== null) { - if (currentIdentity.dev !== expectedIdentity.dev - || currentIdentity.ino !== expectedIdentity.ino - || currentIdentity.birthtimeNs !== expectedIdentity.birthtimeNs) { - throw new RuntimeError("worktree directory identity changed after lease acquisition"); - } - let workflowClaimed = false; - if (workflowOwnershipKey !== null) { - const refreshedOwnership = await workflowOwnershipRecords(args.root); - const refreshedCandidates = refreshedOwnership.get(workflowOwnershipKey) ?? []; - const refreshedMalformed = refreshedOwnership.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; - if (refreshedMalformed.length > 0) { - throw new RuntimeError( - "workflow ownership lookup became ambiguous because a record is malformed", - ); - } - if (refreshedCandidates.length > 1) { - throw new RuntimeError("workflow worktree ownership lookup became ambiguous"); - } - if (refreshedCandidates.length === 1) { - const claim = await workflowWorktreeOwnershipClaim( - refreshedCandidates[0]!, - worktreePath, - ); - workflowClaimed = finalMaterialization - ? await finalMaterializationMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken, - ) - : await workflowClaimMustBePreserved( - args.root, - claim, - args.isProcessAlive, - args.getProcessStartToken, - ); - } - } - if (!workflowClaimed) { - const [currentStateRoot, currentWorktreesRoot] = await Promise.all([ - assertPrivateRecoveryDirectory(args.root), - assertPrivateRecoveryDirectory(worktreesRoot), - ]); - if (!sameIdentity(currentStateRoot, stateRootIdentity) - || !sameIdentity(currentWorktreesRoot, worktreesRootIdentity)) { - throw new RuntimeError("managed worktree namespace changed before orphan removal"); - } - await removeManagedWorktreeUnderLease( - commonDir, - worktreePath, - expectedIdentity, - args.runGit, - ); - } - } - } catch (error) { - cleanupError = error; - } - try { - await releaseOwnedLock(lease); - } catch (releaseError) { - cleanupError = cleanupError === undefined - ? releaseError - : new AggregateError( - [cleanupError, releaseError], - "worktree sweep failed and its checkout lease could not be released", - ); - } - if (cleanupError !== undefined) { - issues.push(worktreeSweepIssue(worktreePath, cleanupError, commonDir)); - } - } - - return issues; -} - - - - -type OwnerObservation = - | { presence: "absent" } - | { presence: "present"; status: LockOwnerStatus }; - -interface BranchObservation { - presence: "absent" | "present" | "ambiguous"; - identity: WorkflowBranchIdentity | null; - owner: WorkflowBranchBootstrapOwnerRecord | null; - ownerStatus: LockOwnerStatus | null; -} - -function exactObjectKeys(value: Record, expected: readonly string[]): boolean { - const actual = Object.keys(value).sort(); - const sortedExpected = [...expected].sort(); - return actual.length === sortedExpected.length - && actual.every((key, index) => key === sortedExpected[index]); -} - -function parseWorkflowLease(text: string, workflowId: string): WorkflowOwnerRecord | null { - let value: unknown; - try { - value = JSON.parse(text) as unknown; - } catch { - return null; - } - if (typeof value !== "object" || value === null || Array.isArray(value)) return null; - const record = value as Record; - if (!exactObjectKeys(record, ["workflowId", "pid", "processToken", "acquiredAt"]) - || record.workflowId !== workflowId - || !Number.isSafeInteger(record.pid) - || (record.pid as number) < 1 - || (record.processToken !== null - && (typeof record.processToken !== "string" - || record.processToken.length < 1 - || record.processToken.length > 256)) - || typeof record.acquiredAt !== "string" - || Number.isNaN(Date.parse(record.acquiredAt))) return null; - return record as unknown as WorkflowOwnerRecord; -} - -async function observeWorkflowLease( - store: WorkflowStore, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - const text = await readBoundedRegularFile(store.ownerPath).catch(() => undefined); - if (text === undefined) return { presence: "present", status: "unverifiable" }; - if (text === null) return { presence: "absent" }; - const record = parseWorkflowLease(text, store.workflowId); - if (record === null) return { presence: "present", status: "unverifiable" }; - return { - presence: "present", - status: await lockOwnerStatus(record, isProcessAlive, getProcessStartToken) - .catch((): LockOwnerStatus => "unverifiable"), - }; -} - -function branchOwnershipPath(root: string, workflowId: string): string { - const name = createHash("sha256").update(workflowId).digest("hex"); - return path.join(root, "autopilot-branches", `${name}.json`); -} - -async function observeWorkflowBranch( - root: string, - workflowId: string, - manager: WorkflowBranchManager, - isProcessAlive: (pid: number) => boolean, - getProcessStartToken: (pid: number) => Promise, -): Promise { - const registration = await readBoundedRegularFile(branchOwnershipPath(root, workflowId)) - .catch(() => undefined); - if (registration === undefined) { - return { presence: "ambiguous", identity: null, owner: null, ownerStatus: null }; - } - if (registration === null) { - return { presence: "absent", identity: null, owner: null, ownerStatus: null }; - } - const [identity, owner] = await Promise.all([ - manager.load(workflowId), - manager.readBootstrapOwner(workflowId), - ]).catch(() => [null, null] as const); - if (identity === null || owner === null) { - return { presence: "ambiguous", identity: null, owner: null, ownerStatus: null }; - } - return { - presence: "present", - identity, - owner, - ownerStatus: await lockOwnerStatus(owner, isProcessAlive, getProcessStartToken) - .catch((): LockOwnerStatus => "unverifiable"), - }; -} - -function isWorkflowBranchIdentity(value: unknown): value is WorkflowBranchIdentity { - if (typeof value !== "object" || value === null || Array.isArray(value)) return false; - const identity = value as Partial; - return identity.ownershipVersion === "1" - && typeof identity.workflowId === "string" - && SAFE_WORKFLOW_ID.test(identity.workflowId) - && typeof identity.checkoutPath === "string" - && typeof identity.gitCommonDir === "string" - && typeof identity.repositoryIdentity === "string" - && typeof identity.worktreePath === "string" - && typeof identity.worktreeGitDir === "string" - && typeof identity.branch === "string" - && identity.branchRef === `refs/heads/${identity.branch}` - && identity.baseRef === `refs/claude-architect/autopilot/${identity.workflowId}/base` - && typeof identity.baseBranch === "string" - && typeof identity.baseCommitOid === "string" - && OID.test(identity.baseCommitOid) - && identity.remote === "origin" - && typeof identity.remoteUrl === "string" - && typeof identity.ownerRepo === "string"; -} - -function branchMatchesWorkflowState( - branch: WorkflowBranchIdentity, - state: AutopilotWorkflowState, -): boolean { - return branch.workflowId === state.workflowId - && branch.repositoryIdentity === state.repositoryIdentity - && branch.baseCommitOid === state.baseCommitOid - && branch.branchRef === state.workflowRef - && branch.worktreePath === state.worktreePath - && branch.branch === state.shipping.branch; -} - -function sameWorkflowBranch( - left: WorkflowBranchIdentity, - right: WorkflowBranchIdentity, -): boolean { - return left.ownershipVersion === right.ownershipVersion - && left.workflowId === right.workflowId - && left.checkoutPath === right.checkoutPath - && left.gitCommonDir === right.gitCommonDir - && left.repositoryIdentity === right.repositoryIdentity - && left.worktreePath === right.worktreePath - && left.worktreeGitDir === right.worktreeGitDir - && left.branch === right.branch - && left.branchRef === right.branchRef - && left.baseRef === right.baseRef - && left.baseBranch === right.baseBranch - && left.baseCommitOid === right.baseCommitOid - && left.remote === right.remote - && left.remoteUrl === right.remoteUrl - && left.ownerRepo === right.ownerRepo; -} - -function canonicalGithubRemote(raw: string): string | null { - let parsed: URL; - try { - parsed = new URL(raw); - } catch { - return null; - } - if (parsed.protocol !== "https:" - || parsed.hostname.toLowerCase() !== "github.com" - || parsed.port !== "" - || parsed.username !== "" - || parsed.password !== "" - || parsed.search !== "" - || parsed.hash !== "" - || parsed.pathname.includes("%") - || parsed.pathname.endsWith("/") - || parsed.pathname.includes("//")) return null; - const components = parsed.pathname.slice(1).split("/"); - if (components.length !== 2) return null; - const owner = components[0]!; - const repository = components[1]!.endsWith(".git") - ? components[1]!.slice(0, -4) - : components[1]!; - const component = /^[A-Za-z0-9_.-]+$/u; - if (!component.test(owner) - || !component.test(repository) - || owner === "." - || owner === ".." - || repository === "." - || repository === "..") return null; - return `https://github.com/${owner.toLowerCase()}/${repository.toLowerCase()}.git`; -} - -function recordedBranch( - journal: WorkflowIntentJournal, - state: AutopilotWorkflowState, -): WorkflowBranchIdentity | null { - const recorded = journal.intents.find(status => - status.intent.operation === "record-workflow-spec" - && status.intent.idempotencyKey === "workflow-spec"); - const completion = recorded?.completion?.completion; - if (typeof completion !== "object" || completion === null || Array.isArray(completion)) { - return null; - } - const branch = (completion as { branch?: unknown }).branch; - return isWorkflowBranchIdentity(branch) && branchMatchesWorkflowState(branch, state) - ? branch - : null; -} - -function expectedWorkflowHead(state: AutopilotWorkflowState): string | null { - const head = state.tasks - .slice(0, state.currentTaskIndex + 1) - .reduce((current, task) => task.promotionCommitOid ?? current, state.baseCommitOid); - return OID.test(head) ? head : null; -} - -function cleanupIntent( - journal: WorkflowIntentJournal, - expectedHead: string, -) { - const key = `cleanup:${expectedHead}`; - const intent = journal.intents.find(status => - status.intent.operation === "cleanup-workflow-branch" - && status.intent.idempotencyKey === key); - if (intent === undefined - || intent.intent.expectedIdentities.headCommitOid !== expectedHead - || intent.completion?.failure !== null && intent.completion !== null) return null; - if (intent.completion !== null) { - const completion = intent.completion.completion; - if (typeof completion !== "object" - || completion === null - || Array.isArray(completion) - || (completion as { worktreeRemoved?: unknown }).worktreeRemoved !== true - || (completion as { refsRemoved?: unknown }).refsRemoved !== true) return null; - } - return intent; -} - -async function isAbsent(filename: string): Promise { - try { - await lstat(filename); - return false; - } catch (error) { - return isMissing(error) ? true : null; - } -} - -async function cleanupIsDirectlyObserved( - branch: WorkflowBranchIdentity, - runGit: typeof git, -): Promise { - if (await isAbsent(branch.worktreePath) !== true) return false; - let canonicalCheckout: string; - let canonicalCommonDir: string; - try { - canonicalCheckout = await realpath(branch.checkoutPath); - canonicalCommonDir = await realpath(branch.gitCommonDir); - } catch { - return false; - } - if (canonicalCheckout !== branch.checkoutPath || canonicalCommonDir !== branch.gitCommonDir) { - return false; - } - const [commonDir, worktrees, branchRef, baseRef] = await Promise.all([ - runGit(branch.checkoutPath, ["rev-parse", "--path-format=absolute", "--git-common-dir"]), - runGit(branch.checkoutPath, ["worktree", "list", "--porcelain", "-z"]), - runGit(branch.checkoutPath, ["show-ref", "--verify", "--quiet", branch.branchRef]), - runGit(branch.checkoutPath, ["show-ref", "--verify", "--quiet", branch.baseRef]), - ]); - if ([commonDir, worktrees, branchRef, baseRef].some(result => - result.truncated?.stdout === true || result.truncated?.stderr === true) - || commonDir.exitCode !== 0 - || worktrees.exitCode !== 0 - || branchRef.exitCode !== 1 - || baseRef.exitCode !== 1) return false; - let observedCommonDir: string; - try { - observedCommonDir = await realpath(gitPathOutput( - commonDir.stdout, - "disposed workflow common directory", - )); - } catch { - return false; - } - if (observedCommonDir !== branch.gitCommonDir) return false; - return await findWorktreeRegistration( - gitNulRecords(worktrees.stdout, "cleanup-observation Git worktree list"), - branch.worktreePath, - true, - ) === -1; -} - -async function activeBranchIsDirectlyObserved( - branch: WorkflowBranchIdentity, - expectedHead: string, - runGit: typeof git, -): Promise { - let canonicalCheckout: string; - let canonicalWorktree: string; - let canonicalCommonDir: string; - try { - [canonicalCheckout, canonicalWorktree, canonicalCommonDir] = await Promise.all([ - realpath(branch.checkoutPath), - realpath(branch.worktreePath), - realpath(branch.gitCommonDir), - ]); - } catch { - return false; - } - if (canonicalCheckout !== branch.checkoutPath - || canonicalWorktree !== branch.worktreePath - || canonicalCommonDir !== branch.gitCommonDir) return false; - - const [commonDir, worktrees, symbolic, head, base, status, remote] = await Promise.all([ - runGit(branch.checkoutPath, ["rev-parse", "--path-format=absolute", "--git-common-dir"]), - runGit(branch.checkoutPath, ["worktree", "list", "--porcelain", "-z"]), - runGit(branch.worktreePath, ["symbolic-ref", "--quiet", "--short", "HEAD"]), - runGit(branch.worktreePath, ["rev-parse", "--verify", "HEAD"]), - runGit(branch.checkoutPath, ["rev-parse", "--verify", branch.baseRef]), - runGit(branch.worktreePath, [ - "status", "--porcelain=v1", "--untracked-files=all", "--ignore-submodules=none", - ]), - runGit(branch.checkoutPath, ["config", "--get", "remote.origin.url"]), - ]); - if ([commonDir, worktrees, symbolic, head, base, status, remote].some(result => - result.truncated?.stdout === true || result.truncated?.stderr === true) - || commonDir.exitCode !== 0 - || worktrees.exitCode !== 0 - || symbolic.exitCode !== 0 - || head.exitCode !== 0 - || base.exitCode !== 0 - || status.exitCode !== 0 - || remote.exitCode !== 0) return false; - let observedCommonDir: string; - try { - observedCommonDir = await realpath(gitPathOutput( - commonDir.stdout, - "active workflow common directory", - )); - } catch { - return false; - } - if (observedCommonDir !== branch.gitCommonDir - || symbolic.stdout.trim() !== branch.branch - || head.stdout.trim() !== expectedHead - || base.stdout.trim() !== branch.baseCommitOid - || status.stdout !== "" - || canonicalGithubRemote(remote.stdout.trim()) !== branch.remoteUrl) return false; - - const fields = gitNulRecords(worktrees.stdout, "active-branch Git worktree list"); - const registrationIndex = await findWorktreeRegistration(fields, branch.worktreePath); - if (registrationIndex === -1) return false; - const nextRegistration = fields.findIndex((field, index) => - index > registrationIndex && field.startsWith("worktree ")); - const registration = fields.slice( - registrationIndex + 1, - nextRegistration === -1 ? undefined : nextRegistration, - ); - return registration.includes(`HEAD ${expectedHead}`) - && registration.includes(`branch ${branch.branchRef}`); -} - -async function workflowIds( - root: string, - issues: WorktreeSweepIssue[], -): Promise { - const ids = new Set(); - const workflowsRoot = path.join(root, "workflows"); - let workflowEntries: Dirent[] = []; - try { - const workflowsIdentity = await plainDirectoryIdentity(workflowsRoot); - workflowEntries = workflowsIdentity === null - ? [] - : await readdir(workflowsRoot, { withFileTypes: true }); - } catch (error) { - issues.push(worktreeSweepIssue(workflowsRoot, error)); - } - for (const entry of workflowEntries) { - if (entry.isDirectory() && !entry.isSymbolicLink() && SAFE_WORKFLOW_ID.test(entry.name)) { - ids.add(entry.name); - } - } - - const branchesRoot = path.join(root, "autopilot-branches"); - let branchEntries: Dirent[] = []; - try { - const branchesIdentity = await plainDirectoryIdentity(branchesRoot); - branchEntries = branchesIdentity === null - ? [] - : await readdir(branchesRoot, { withFileTypes: true }); - } catch (error) { - issues.push(worktreeSweepIssue(branchesRoot, error)); - } - for (const entry of branchEntries) { - if (!entry.isFile() || entry.isSymbolicLink() || !/^[0-9a-f]{64}\.json$/u.test(entry.name)) { - continue; - } - const ownershipPath = path.join(branchesRoot, entry.name); - let text: string | null; - let value: unknown; - try { - text = await readBoundedRegularFile(ownershipPath); - if (text === null) { - throw new RuntimeError("workflow ownership record is absent or unstable"); - } - value = JSON.parse(text) as unknown; - } catch (error) { - issues.push(worktreeSweepIssue(ownershipPath, error)); - continue; - } - if (typeof value !== "object" || value === null || Array.isArray(value)) continue; - const workflowId = (value as { workflowId?: unknown }).workflowId; - if (typeof workflowId === "string" - && SAFE_WORKFLOW_ID.test(workflowId) - && entry.name === path.basename(branchOwnershipPath(root, workflowId))) { - ids.add(workflowId); - } - } - return [...ids].sort((left, right) => left.localeCompare(right)); -} - -async function finalizeObservedWorkflow( - store: WorkflowStore, - state: AutopilotWorkflowState, - expectedHead: string, -): Promise { - await store.adoptLease(); - let primaryError: unknown; - try { - await store.completeIntent({ - expectedRevision: state.revision, - idempotencyKey: `cleanup:${expectedHead}`, - completion: { worktreeRemoved: true, refsRemoved: true }, - }); - const completedAt = new Date().toISOString(); - await store.transition({ - expectedRevision: state.revision, - to: "ready-for-human-review", - update(draft) { - draft.cleanup = { - status: "succeeded", - worktreeRemoved: true, - lockReleased: true, - error: null, - completedAt, - }; - draft.terminal = { - classification: "ready-for-human-review", - reason: null, - evidenceRefs: draft.finalGate === null ? [] : [draft.finalGate.reportRef], - completedAt, - }; - }, - }); - } catch (error) { - primaryError = error; - throw error; - } finally { - try { - await store.releaseLease(); - } catch (releaseError) { - if (primaryError === undefined) throw releaseError; - throw new AggregateError( - [primaryError, releaseError], - "workflow finalization failed and its adopted lease could not be released", - ); - } - } -} - -async function recoverAutopilotWorkflows( - root: string, - dependencies: { - isProcessAlive: (pid: number) => boolean; - getProcessStartToken: (pid: number) => Promise; - runGit: typeof git; - }, - workflowIssues: WorktreeSweepIssue[], -): Promise { - const results: AutopilotRecoveryResult[] = []; - const branchManager = new WorkflowBranchManager({ git: dependencies.runGit }); - // Isolate every workflow: the run loop below already quarantines per entry, - // but a throw here (branch cleanup, finalization) propagated all the way out - // of recoverStaleRuns and discarded the dispositions already computed for - // earlier workflows. Because the failure is deterministic — same dead owner, - // same on-disk evidence — every later startup aborted at the same workflow. - for (const workflowId of await workflowIds(root, workflowIssues)) { - try { - const store = new WorkflowStore(workflowId, { - stateDirectory: root, - isProcessAlive: dependencies.isProcessAlive, - getProcessStartToken: dependencies.getProcessStartToken, - }); - const [lease, branch] = await Promise.all([ - observeWorkflowLease( - store, - dependencies.isProcessAlive, - dependencies.getProcessStartToken, - ), - observeWorkflowBranch( - root, - workflowId, - branchManager, - dependencies.isProcessAlive, - dependencies.getProcessStartToken, - ), - ]); - - if ((lease.presence === "present" && lease.status === "live") - || branch.ownerStatus === "live") { - results.push({ workflowId, disposition: "live-preserve" }); - continue; - } - - const stateAbsent = await isAbsent(store.statePath); - if (stateAbsent === true) { - if (branch.presence === "present" && branch.ownerStatus === "dead" - && branch.identity !== null) { - const cleanup = await branchManager.cleanup(branch.identity, branch.identity.baseCommitOid); - results.push({ - workflowId, - disposition: cleanup.ok && cleanup.worktreeRemoved && cleanup.refsRemoved - ? "dispose" - : "human-decision-required", - }); - } else { - results.push({ workflowId, disposition: "human-decision-required" }); - } - continue; - } - if (stateAbsent !== false) { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - - let state: AutopilotWorkflowState; - let journal: WorkflowIntentJournal; - try { - [state, journal] = await Promise.all([store.read(), store.readIntentJournal()]); - } catch { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - if (TERMINAL_PHASES.has(state.phase)) { - if ((lease.presence === "present" && lease.status === "unverifiable") - || branch.ownerStatus === "unverifiable") { - results.push({ workflowId, disposition: "human-decision-required" }); - } - continue; - } - if (lease.presence !== "present" || lease.status !== "dead" - || branch.presence === "ambiguous" - || branch.ownerStatus === "unverifiable") { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - - const recorded = recordedBranch(journal, state); - if (recorded === null) { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - if (state.phase === "cleaning-up") { - const expectedHead = expectedWorkflowHead(state); - const intent = expectedHead === null ? null : cleanupIntent(journal, expectedHead); - const directlyObserved = expectedHead !== null - && state.finalGate?.headCommitOid === expectedHead - && branch.presence === "absent" - && await isAbsent(branchOwnershipPath(root, workflowId)) === true - && await cleanupIsDirectlyObserved(recorded, dependencies.runGit); - if (expectedHead === null || intent === null || !directlyObserved) { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - await finalizeObservedWorkflow(store, state, expectedHead); - results.push({ workflowId, disposition: "finalize" }); - continue; - } - - if (branch.presence !== "present" - || branch.identity === null - || branch.ownerStatus !== "dead" - || !sameWorkflowBranch(branch.identity, recorded)) { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - const expectedHead = expectedWorkflowHead(state); - if (expectedHead === null - || !await activeBranchIsDirectlyObserved( - branch.identity, - expectedHead, - dependencies.runGit, - )) { - results.push({ workflowId, disposition: "human-decision-required" }); - continue; - } - results.push({ workflowId, disposition: "resume" }); - } catch { - results.push({ workflowId, disposition: "human-decision-required" }); - } - } - return results; -} - async function reclaimPendingRemovalLocks( locksRoot: string, isProcessAlive: (pid: number) => boolean, @@ -3611,10 +138,10 @@ export async function recoverStaleRuns( // rather than deferring them, so no run is skipped for a pending prune. if (runsIdentity !== null) { // A crash can leave the cleanup-journal mutex held by a dead owner. That lock - // is a 64-hex leaf reclaimed by reclaimLocks() near the end of this body, but + // is a 64-hex leaf reclaimed by reclaimDeadCheckoutLocks() near the end of this body, but // replayInterruptedPrunes acquires it first — so without an up-front reclaim a // stale lock would make replay spin to its deadline and throw, aborting recovery - // before reclaimLocks ever runs and permanently blocking every future pass. + // before reclaimDeadCheckoutLocks ever runs and permanently blocking every future pass. await reclaimDeadLock( path.join(locksRoot, `${CLEANUP_JOURNAL_LOCK_KEY}.lock`), isProcessAlive, @@ -3735,7 +262,6 @@ export async function recoverStaleRuns( const commonDir = await validateGitCommonDir(lockedRecord.canonicalCommonDir); if (lockedMarker === null) { await cleanupRunWorktreesUnderLease( - root, commonDir, entry.name, runGit, @@ -3751,7 +277,6 @@ export async function recoverStaleRuns( if (lockedMarkerStatus === "dead") { if (lockedMarker.sliced) await archiveInterruptedPipeline(store, lockedResult); await cleanupRunWorktreesUnderLease( - root, commonDir, entry.name, runGit, @@ -3892,7 +417,7 @@ export async function recoverStaleRuns( } recovered.push(record.runId); } - await reclaimLocks( + await reclaimDeadCheckoutLocks( locksRoot, isProcessAlive, pid => ps.getProcessStartToken(pid), diff --git a/src/runtime/recovery-prune-journal.ts b/src/runtime/recovery-prune-journal.ts new file mode 100644 index 0000000..159050a --- /dev/null +++ b/src/runtime/recovery-prune-journal.ts @@ -0,0 +1,534 @@ +import { constants } from "node:fs"; +import { lstat, open, realpath } from "node:fs/promises"; +import path from "node:path"; +import { git } from "../git/git-exec.js"; +import { gitPathOutput } from "../git/git-output.js"; +import { platformSafety } from "../platform/platform-safety.js"; +import type { PlatformServices } from "../platform/platform-services.js"; +import { getPlatformServices } from "../platform/select-platform.js"; +import { + emptyBoundDirectory, + removeBoundEmptyDirectory, +} from "../platform/bound-directory-cleanup.js"; +import { sameDirectoryIdentity } from "../platform/durable-directory.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; +import { + NO_FOLLOW, + MAX_STATE_FILE_BYTES, + MAX_STATE_FILE_BYTES_BIGINT, + OID, + CANDIDATE_REF_PREFIX, + BACKUP_REF_PREFIX, + type DirectoryIdentity, + isPlainDirectory, + validateRunId, + plainDirectoryIdentity, + runGitError, + validateRepositoryRoot, + readDirectRef, + deleteExactRef, + readHandleBytes, +} from "./recovery-shared.js"; + +type PruneReason = "max-age" | "max-bytes"; +type AnchorCleanup = "not-applicable" | "deleted" | "already-absent"; + +interface CleanupRecord { + event: "prune-cleanup-intent" | "prune-cleanup-complete" | "prune-cleanup-rollback"; + runId: string; + reason: PruneReason; + anchorCleanup: AnchorCleanup | "pending"; + archiveBytes: number; + quarantineName: string; + repoRoot: string | null; + anchorRef: string | null; + backupRef: string | null; + candidateCommitOid: string | null; + recordedAt: string; +} + +interface CleanupJournalRead { + text: string | null; + tornTail: boolean; +} + +async function readCleanupJournal(filename: string): Promise { + let handle; + try { + handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); + } catch (error) { + if (isMissing(error)) return { text: null, tornTail: false }; + throw error; + } + + let result: CleanupJournalRead | undefined; + let primaryError: unknown; + try { + const metadata = await handle.stat({ bigint: true }); + const namedMetadata = await lstat(filename, { bigint: true }); + if (!metadata.isFile() + || metadata.nlink !== 1n + || metadata.size > MAX_STATE_FILE_BYTES_BIGINT + || !namedMetadata.isFile() + || namedMetadata.isSymbolicLink() + || namedMetadata.nlink !== 1n + || namedMetadata.dev !== metadata.dev + || namedMetadata.ino !== metadata.ino + || namedMetadata.birthtimeNs !== metadata.birthtimeNs + || namedMetadata.size !== metadata.size) { + throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); + } + const bytes = await readHandleBytes(handle, Number(metadata.size)); + const repeatedBytes = await readHandleBytes(handle, Number(metadata.size)); + const settledMetadata = await handle.stat({ bigint: true }); + const settledNamedMetadata = await lstat(filename, { bigint: true }); + if (bytes.byteLength > MAX_STATE_FILE_BYTES + || settledMetadata.size > MAX_STATE_FILE_BYTES_BIGINT) { + throw new RuntimeError("cleanup journal exceeds its size limit during read"); + } + if (!settledMetadata.isFile() + || settledMetadata.nlink !== 1n + || settledMetadata.dev !== metadata.dev + || settledMetadata.ino !== metadata.ino + || settledMetadata.birthtimeNs !== metadata.birthtimeNs + || settledMetadata.size !== metadata.size + || settledMetadata.mtimeNs !== metadata.mtimeNs + || settledMetadata.ctimeNs !== metadata.ctimeNs + || !settledNamedMetadata.isFile() + || settledNamedMetadata.isSymbolicLink() + || settledNamedMetadata.nlink !== 1n + || settledNamedMetadata.dev !== metadata.dev + || settledNamedMetadata.ino !== metadata.ino + || settledNamedMetadata.birthtimeNs !== metadata.birthtimeNs + || settledNamedMetadata.size !== metadata.size + || settledNamedMetadata.mtimeNs !== metadata.mtimeNs + || settledNamedMetadata.ctimeNs !== metadata.ctimeNs + || BigInt(bytes.byteLength) !== metadata.size + || !repeatedBytes.equals(bytes)) { + throw new RuntimeError("cleanup journal changed during read"); + } + const text = bytes.toString("utf8"); + if (text === "" || text.endsWith("\n")) { + result = { text, tornTail: false }; + } else { + const finalNewline = text.lastIndexOf("\n"); + const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); + result = { text: completePrefix, tornTail: true }; + } + } catch (error) { + primaryError = error; + } + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== undefined) { + throw new AggregateError( + [primaryError, closeError], + "cleanup journal read failed and its handle could not be closed", + ); + } + throw closeError; + } + if (primaryError !== undefined) throw primaryError; + if (result === undefined) throw new RuntimeError("cleanup journal read produced no result"); + return result; +} + +function parseCleanupRecord(line: string): CleanupRecord { + let value: unknown; + try { + value = JSON.parse(line); + } catch (cause) { + throw new RuntimeError("cleanup journal contains invalid JSON", { cause }); + } + if (typeof value !== "object" || value === null) { + throw new RuntimeError("cleanup journal record must be an object"); + } + const record = value as Partial; + validateRunId(record.runId); + if (!(["prune-cleanup-intent", "prune-cleanup-complete", "prune-cleanup-rollback"] as const) + .includes(record.event as CleanupRecord["event"]) + || !(["max-age", "max-bytes"] as const).includes(record.reason as PruneReason) + || !(["pending", "not-applicable", "deleted", "already-absent"] as const) + .includes(record.anchorCleanup as CleanupRecord["anchorCleanup"]) + || !Number.isSafeInteger(record.archiveBytes) + || (record.archiveBytes ?? -1) < 0 + || typeof record.quarantineName !== "string" + || record.quarantineName !== `.prune-${record.runId}-${record.quarantineName + .slice(`.prune-${record.runId}-`.length)}` + || !/^\.prune-[a-z0-9][a-z0-9._-]*-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test( + record.quarantineName, + ) + || typeof record.recordedAt !== "string" + || !Number.isFinite(Date.parse(record.recordedAt))) { + throw new RuntimeError("cleanup journal record is malformed"); + } + if (record.event === "prune-cleanup-intent" && record.anchorCleanup !== "pending") { + throw new RuntimeError("cleanup intent must remain pending until reconciled"); + } + if (record.event !== "prune-cleanup-intent" && record.anchorCleanup === "pending") { + throw new RuntimeError("terminal cleanup journal record cannot remain pending"); + } + + const hasRepository = typeof record.repoRoot === "string" + && typeof record.anchorRef === "string" + && typeof record.candidateCommitOid === "string"; + // A candidate-null prune records the repository root for lease serialization + // but has no anchor to reconcile: repoRoot set, every Git ref field null. + const repositoryOnly = typeof record.repoRoot === "string" + && record.anchorRef === null + && record.backupRef === null + && record.candidateCommitOid === null; + const noRepository = record.repoRoot === null + && record.anchorRef === null + && record.backupRef === null + && record.candidateCommitOid === null; + if (!noRepository && !repositoryOnly && (!hasRepository + || record.anchorRef !== `${CANDIDATE_REF_PREFIX}${record.runId}` + || !OID.test(record.candidateCommitOid as string) + || (record.backupRef !== null + && record.backupRef !== `${BACKUP_REF_PREFIX}${record.runId}`))) { + throw new RuntimeError("cleanup journal Git metadata is malformed"); + } + return record as CleanupRecord; +} + +function cleanupOutcome(record: CleanupRecord): AnchorCleanup { + if (record.repoRoot === null || record.anchorRef === null) return "not-applicable"; + return record.backupRef === null ? "already-absent" : "deleted"; +} + +async function removePlainDirectory( + directory: string, + expected: DirectoryIdentity, + platformServices: PlatformServices, +): Promise { + const metadata = await lstat(directory, { bigint: true }); + if (!isPlainDirectory(metadata) || !sameDirectoryIdentity(metadata, expected)) { + throw new RuntimeError("recovery directory identity changed before removal"); + } + await emptyBoundDirectory(directory, expected, platformServices); + await removeBoundEmptyDirectory(directory, expected, platformServices); +} + +async function createExactRef(repoRoot: string, ref: string, oid: string): Promise { + const result = await git(repoRoot, [ + "update-ref", + "--no-deref", + ref, + oid, + "0".repeat(oid.length), + ]); + if (result.exitCode !== 0) throw runGitError("create recovery Git ref", result); +} + +async function appendCleanupRecord(runsRoot: string, record: CleanupRecord): Promise { + // Same shared-journal mutex the prune writer holds: a completion/rollback append + // can never interleave with a concurrent intent append or a torn-tail truncation. + const journalLock = await getPlatformServices().acquireCleanupJournalLock(); + try { + const identity = await plainDirectoryIdentity(runsRoot); + if (identity === null) throw new RuntimeError("cleanup journal root disappeared"); + const filename = path.join(runsRoot, "cleanup.ndjson"); + const handle = await open( + filename, + constants.O_WRONLY | constants.O_CREAT | constants.O_APPEND | NO_FOLLOW, + 0o600, + ); + try { + const metadata = await handle.stat(); + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (!metadata.isFile() || !isPlainDirectory(currentRoot) || !sameDirectoryIdentity(currentRoot, identity)) { + throw new RuntimeError("cleanup journal identity changed during recovery"); + } + await handle.writeFile(`${JSON.stringify(record)}\n`, "utf8"); + await handle.sync(); + } finally { + await handle.close(); + } + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (!isPlainDirectory(currentRoot) || !sameDirectoryIdentity(currentRoot, identity)) { + throw new RuntimeError("cleanup journal root changed after recovery append"); + } + } finally { + await journalLock.release(); + } +} + +async function reconcileCleanupRefs( + record: CleanupRecord, + action: "finish" | "rollback", +): Promise { + const outcome = cleanupOutcome(record); + if (outcome === "not-applicable") return outcome; + const repoRoot = await validateRepositoryRoot(record.repoRoot!); + const anchorRef = record.anchorRef!; + const candidateOid = record.candidateCommitOid!; + let anchorOid = await readDirectRef(repoRoot, anchorRef); + if (anchorOid !== null && anchorOid !== candidateOid) { + throw new RuntimeError("candidate anchor moved during interrupted prune recovery"); + } + if (outcome === "already-absent") { + if (anchorOid !== null) { + throw new RuntimeError("candidate anchor unexpectedly reappeared during prune recovery"); + } + return outcome; + } + + const backupRef = record.backupRef!; + let backupOid = await readDirectRef(repoRoot, backupRef); + if (backupOid !== null && backupOid !== candidateOid) { + throw new RuntimeError("candidate prune backup moved during recovery"); + } + if (action === "finish") { + if (anchorOid !== null && backupOid === null) { + await createExactRef(repoRoot, backupRef, candidateOid); + backupOid = candidateOid; + } + if (anchorOid !== null) { + await deleteExactRef(repoRoot, anchorRef, candidateOid); + anchorOid = null; + } + return outcome; + } + + if (anchorOid === null) { + if (backupOid === null) { + throw new RuntimeError("cannot restore candidate anchor without its prune backup"); + } + await createExactRef(repoRoot, anchorRef, candidateOid); + anchorOid = candidateOid; + } + if (backupOid !== null) await deleteExactRef(repoRoot, backupRef, candidateOid); + return outcome; +} + +async function commitCleanupRefs(record: CleanupRecord): Promise { + if (cleanupOutcome(record) !== "deleted") return; + const repoRoot = await validateRepositoryRoot(record.repoRoot!); + const backupOid = await readDirectRef(repoRoot, record.backupRef!); + if (backupOid === null) return; + if (backupOid !== record.candidateCommitOid) { + throw new RuntimeError("candidate prune backup moved before cleanup commit"); + } + await deleteExactRef(repoRoot, record.backupRef!, backupOid); +} + +async function readPendingCleanupRecords( + runsRoot: string, +): Promise<{ pending: Map; tornTail: boolean }> { + const { text, tornTail } = await readCleanupJournal(path.join(runsRoot, "cleanup.ndjson")); + const pending = new Map(); + if (text === null || text === "") return { pending, tornTail }; + const completeText = text.endsWith("\n") ? text.slice(0, -1) : text; + for (const line of completeText.split("\n")) { + if (line.trim() === "") throw new RuntimeError("cleanup journal contains a blank record"); + const record = parseCleanupRecord(line); + if (record.event === "prune-cleanup-intent") pending.set(record.runId, record); + else pending.delete(record.runId); + } + return { pending, tornTail }; +} + +// A torn trailing record is an intent whose durable write was interrupted before +// any Git ref was mutated (the prune writer journals intent, fsyncs, then mutates), +// so the fragment is safe to discard. The reader validates read-only and reports the +// torn tail; the completing replay removes it here before appending, so a completion +// record can never concatenate onto the fragment and corrupt the journal. +async function truncateCleanupTornTail(filename: string): Promise { + let handle; + try { + handle = await open(filename, constants.O_RDWR | NO_FOLLOW); + } catch (error) { + if (isMissing(error)) return; + throw error; + } + try { + const metadata = await handle.stat({ bigint: true }); + const namedMetadata = await lstat(filename, { bigint: true }); + if (!metadata.isFile() + || metadata.nlink !== 1n + || metadata.size > MAX_STATE_FILE_BYTES_BIGINT + || !namedMetadata.isFile() + || namedMetadata.isSymbolicLink() + || namedMetadata.nlink !== 1n + || namedMetadata.dev !== metadata.dev + || namedMetadata.ino !== metadata.ino + || namedMetadata.birthtimeNs !== metadata.birthtimeNs + || namedMetadata.size !== metadata.size) { + throw new RuntimeError("cleanup journal must be a bounded regular single-link file"); + } + const bytes = await readHandleBytes(handle, Number(metadata.size)); + const text = bytes.toString("utf8"); + if (text === "" || text.endsWith("\n")) return; + // A concurrent live prune may append+fsync a fresh intent between the reader's + // scan and this truncate. Re-validate that we read exactly the stat'd bytes and + // that the journal has not grown or changed since, and fail closed rather than + // truncate away a durably-journaled intent (matches the reader's stability gate). + const settled = await handle.stat({ bigint: true }); + const settledNamed = await lstat(filename, { bigint: true }); + if (BigInt(bytes.byteLength) !== metadata.size + || !settled.isFile() + || settled.nlink !== 1n + || settled.size !== metadata.size + || settled.dev !== metadata.dev + || settled.ino !== metadata.ino + || settled.birthtimeNs !== metadata.birthtimeNs + || settled.mtimeNs !== metadata.mtimeNs + || settled.ctimeNs !== metadata.ctimeNs + || !settledNamed.isFile() + || settledNamed.isSymbolicLink() + || settledNamed.nlink !== 1n + || settledNamed.dev !== metadata.dev + || settledNamed.ino !== metadata.ino + || settledNamed.birthtimeNs !== metadata.birthtimeNs + || settledNamed.size !== metadata.size) { + throw new RuntimeError("cleanup journal changed during torn-tail repair"); + } + const finalNewline = text.lastIndexOf("\n"); + const completePrefix = finalNewline === -1 ? "" : text.slice(0, finalNewline + 1); + await handle.truncate(Buffer.byteLength(completePrefix, "utf8")); + await handle.sync(); + } finally { + await handle?.close(); + } +} + +async function repositoryRootExists(repoRoot: string): Promise { + // A non-absolute repoRoot is a malformed record, not a deleted repository: realpath + // would resolve it against the process CWD and could report a corrupt record as "gone", + // fail-open routing it into the repo-absent reconcile path. Report it present so it falls + // through to validateRepositoryRoot's absoluteness rejection and stays fail-closed, + // matching how every other anomalous cleanup record halts recovery for investigation. + if (!path.isAbsolute(repoRoot)) return true; + try { + await realpath(repoRoot); + return true; + } catch (error) { + if (isMissing(error)) return false; + throw error; + } +} + +// Complete an interrupted prune whose repository was deleted after the intent was +// written. The candidate anchor and prune-backup refs died with the repository, so +// there is nothing to reconcile in Git; only the archive must converge. The checkout +// lease is intentionally skipped: it serializes Git-ref reconciliation, and this path +// performs none — a vanished repository cannot host a racing integration, and recovery +// already holds the global recovery lock. +// +// Limit of the lease-skip: the normal path's per-repo checkout lease also guarantees at +// most one pending intent per run, so a shadowed quarantine can never be orphaned. This +// path drops that lease, so IF prune were ever wired to run concurrently across processes +// (it has no such caller today — the checkout lease is prune's only cross-process guard), +// two repo-gone intents for one run could interleave and a crash after the losing rename +// could strand a quarantine dir that no surviving pending intent references. That is a +// disk-only leak, never a double-free (rename is atomic) or fail-open. Closing it needs a +// recovery sweep of `.prune-*` dirs unmatched by any pending intent; do that before wiring +// concurrent multi-process prune, not before. +async function reconcileRepoAbsentPrune( + runsRoot: string, + record: CleanupRecord, + platformServices: PlatformServices, +): Promise { + const runDirectory = path.join(runsRoot, record.runId); + const quarantinePath = path.join(runsRoot, record.quarantineName); + const runIdentity = await plainDirectoryIdentity(runDirectory); + const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); + if (runIdentity !== null && quarantineIdentity !== null) { + throw new RuntimeError("both retained and quarantined run archives exist during recovery"); + } + // Same discriminator as the normal path: a retained run rolls back (nothing was + // removed), a quarantined run finishes (remove the archive that was moved aside). + const action = runIdentity !== null ? "rollback" : "finish"; + if (action === "finish" && quarantineIdentity !== null) { + await removePlainDirectory(quarantinePath, quarantineIdentity, platformServices); + } + await appendCleanupRecord(runsRoot, { + ...record, + event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", + anchorCleanup: "already-absent", + recordedAt: new Date().toISOString(), + }); +} + +export async function replayInterruptedPrunes( + runsRoot: string, + ps: PlatformServices, +): Promise { + // Read the journal and repair a torn tail as one critical section under the shared + // journal mutex, so no concurrent append can land between the read and the truncate + // (which would otherwise be erased). Completion appends below re-take the same lock. + let pending: Map; + const journalLock = await getPlatformServices().acquireCleanupJournalLock(); + try { + const read = await readPendingCleanupRecords(runsRoot); + if (read.tornTail) await truncateCleanupTornTail(path.join(runsRoot, "cleanup.ndjson")); + pending = read.pending; + } finally { + await journalLock.release(); + } + for (const record of [...pending.values()].sort((left, right) => + left.runId.localeCompare(right.runId))) { + // A repoRoot-less legacy intent has neither anchor nor repository to lock. + if (record.repoRoot === null) continue; + // A crash can strand a pending intent whose repository was deleted afterward. + // Reconcile its archive without Git and move on; otherwise validateRepositoryRoot + // below throws and aborts the entire recovery pass — a permanent block, because + // replayInterruptedPrunes runs before every other recovery step. + // + // The boundary is deliberately filesystem-definitive absence (realpath ENOENT), the + // expected "the user deleted their repo" lifecycle event. A repoRoot that still + // exists but is no longer the canonical repository (its .git removed, replaced by a + // file, moved so it is non-canonical, or a transient git error) is NOT treated as + // gone: it stays fail-closed through validateRepositoryRoot below, matching how every + // other anomalous cleanup record halts recovery for investigation. Widening this to + // "any validation failure" would fail open — a transient git hiccup would wrongly + // reclaim the archive and orphan a real repository's refs. + if (!(await repositoryRootExists(record.repoRoot))) { + await reconcileRepoAbsentPrune(runsRoot, record, ps); + continue; + } + // Serialize the archive/anchor reconciliation against the checkout + // lifecycle: hold the repository's checkout lease exactly as prune did. + const repoRoot = await validateRepositoryRoot(record.repoRoot); + const commonResult = await git(repoRoot, [ + "rev-parse", + "--path-format=absolute", + "--git-common-dir", + ]); + if (commonResult.exitCode !== 0) { + throw runGitError("resolve cleanup repository identity", commonResult); + } + const repositoryIdentity = await realpath(gitPathOutput( + commonResult.stdout, + "cleanup repository identity", + )); + await platformSafety.withRecoveryLease(repoRoot, async (lease) => { + if (lease.repositoryIdentity !== repositoryIdentity) { + throw new RuntimeError("checkout lease repository identity changed during prune recovery"); + } + const runDirectory = path.join(runsRoot, record.runId); + const quarantinePath = path.join(runsRoot, record.quarantineName); + const runIdentity = await plainDirectoryIdentity(runDirectory); + const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); + if (runIdentity !== null && quarantineIdentity !== null) { + throw new RuntimeError("both retained and quarantined run archives exist during recovery"); + } + const action = runIdentity !== null ? "rollback" : "finish"; + const outcome = await reconcileCleanupRefs(record, action); + if (action === "finish") { + if (quarantineIdentity !== null) { + await removePlainDirectory(quarantinePath, quarantineIdentity, ps); + } + await commitCleanupRefs(record); + } + await appendCleanupRecord(runsRoot, { + ...record, + event: action === "finish" ? "prune-cleanup-complete" : "prune-cleanup-rollback", + anchorCleanup: outcome, + recordedAt: new Date().toISOString(), + }); + }); + } +} diff --git a/src/runtime/recovery-quarantine.ts b/src/runtime/recovery-quarantine.ts new file mode 100644 index 0000000..0f135cd --- /dev/null +++ b/src/runtime/recovery-quarantine.ts @@ -0,0 +1,513 @@ +import { randomUUID } from "node:crypto"; +import { constants } from "node:fs"; +import { lstat, link, open, rename } from "node:fs/promises"; +import path from "node:path"; +import { + validateOwnedLockState, + validatePublishedLock, + removeExpectedLockPath, + cleanupOwnedLockPaths, +} from "../platform/lock-ownership.js"; +import { sameDirectoryIdentity, syncDirectoryMetadata } from "../platform/durable-directory.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; +import { logger } from "../util/logger.js"; +import { boundedRedactedDiagnostic } from "./redaction.js"; +import { + NO_FOLLOW, + MAX_STATE_FILE_BYTES, + MAX_STATE_FILE_BYTES_BIGINT, + MAX_QUARANTINE_REASON_BYTES, + MAX_QUARANTINE_RECORD_BYTES, + type DirectoryIdentity, + isPlainDirectory, + validateRunId, + plainDirectoryIdentity, + readHandleBytes, +} from "./recovery-shared.js"; + +interface RecoveryQuarantineRecord { + event: "recovery-quarantine"; + runId: string; + reason: string; + recordedAt: string; +} + +interface RecoveryQuarantineSnapshot { + bytes: Buffer; + runIds: Set; + rootIdentity: DirectoryIdentity; + journalIdentity: DirectoryIdentity | null; +} + +function boundedQuarantineReason(error: unknown): string { + return boundedRedactedDiagnostic(error, MAX_QUARANTINE_REASON_BYTES); +} + +function parseRecoveryQuarantineRecord(line: string): RecoveryQuarantineRecord { + if (Buffer.byteLength(`${line}\n`, "utf8") > MAX_QUARANTINE_RECORD_BYTES) { + throw new RuntimeError("recovery quarantine journal record exceeds its size limit"); + } + let value: unknown; + try { + value = JSON.parse(line); + } catch (cause) { + throw new RuntimeError("recovery quarantine journal contains invalid JSON", { cause }); + } + if (typeof value !== "object" || value === null) { + throw new RuntimeError("recovery quarantine journal record must be an object"); + } + const record = value as Partial; + validateRunId(record.runId); + if (Object.keys(value).sort().join(",") !== "event,reason,recordedAt,runId" + || record.event !== "recovery-quarantine" + || typeof record.reason !== "string" + || Buffer.byteLength(record.reason, "utf8") > MAX_QUARANTINE_REASON_BYTES + || typeof record.recordedAt !== "string" + || !Number.isFinite(Date.parse(record.recordedAt))) { + throw new RuntimeError("recovery quarantine journal record is malformed"); + } + return record as RecoveryQuarantineRecord; +} + +function parseRecoveryQuarantineJournal(bytes: Buffer): Set { + const text = bytes.toString("utf8"); + const runIds = new Set(); + if (text === "") return runIds; + if (!text.endsWith("\n")) { + throw new RuntimeError("recovery quarantine journal has a torn final record"); + } + for (const line of text.slice(0, -1).split("\n")) { + if (line === "") throw new RuntimeError("recovery quarantine journal contains a blank record"); + const record = parseRecoveryQuarantineRecord(line); + if (runIds.has(record.runId)) { + throw new RuntimeError("duplicate recovery quarantine runId"); + } + runIds.add(record.runId); + } + return runIds; +} + +export async function readRecoveryQuarantineJournal( + runsRoot: string, +): Promise { + const rootIdentity = await plainDirectoryIdentity(runsRoot); + if (rootIdentity === null) { + throw new RuntimeError("recovery quarantine journal root disappeared"); + } + const filename = path.join(runsRoot, "recovery-quarantine.ndjson"); + let expectedMetadata; + try { + expectedMetadata = await lstat(filename, { bigint: true }); + } catch (error) { + if (!isMissing(error)) throw error; + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (!isPlainDirectory(currentRoot) || !sameDirectoryIdentity(currentRoot, rootIdentity)) { + throw new RuntimeError("recovery quarantine journal root changed during missing read"); + } + return { + bytes: Buffer.alloc(0), + runIds: new Set(), + rootIdentity, + journalIdentity: null, + }; + } + if (!expectedMetadata.isFile() + || expectedMetadata.isSymbolicLink() + || expectedMetadata.nlink !== 1n + || expectedMetadata.size > MAX_STATE_FILE_BYTES_BIGINT) { + throw new RuntimeError("recovery quarantine journal is not a bounded regular file"); + } + let handle; + try { + handle = await open(filename, constants.O_RDONLY | NO_FOLLOW); + } catch (error) { + if (!isMissing(error)) throw error; + try { + await lstat(filename); + } catch (namedError) { + if (isMissing(namedError)) { + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (isPlainDirectory(currentRoot) && sameDirectoryIdentity(currentRoot, rootIdentity)) { + return { + bytes: Buffer.alloc(0), + runIds: new Set(), + rootIdentity, + journalIdentity: null, + }; + } + } + } + throw new RuntimeError("recovery quarantine journal changed before read", { cause: error }); + } + let bytes: Buffer | undefined; + let journalIdentity: DirectoryIdentity | undefined; + let primaryError: unknown; + try { + const metadata = await handle.stat({ bigint: true }); + const namedMetadata = await lstat(filename, { bigint: true }); + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (!metadata.isFile() + || metadata.size > MAX_STATE_FILE_BYTES_BIGINT + || metadata.size !== expectedMetadata.size + || metadata.nlink !== 1n + || !namedMetadata.isFile() + || namedMetadata.isSymbolicLink() + || namedMetadata.nlink !== 1n + || namedMetadata.size !== metadata.size + || namedMetadata.dev !== expectedMetadata.dev + || namedMetadata.ino !== expectedMetadata.ino + || namedMetadata.birthtimeNs !== expectedMetadata.birthtimeNs + || namedMetadata.dev !== metadata.dev + || namedMetadata.ino !== metadata.ino + || namedMetadata.birthtimeNs !== metadata.birthtimeNs + || !isPlainDirectory(currentRoot) + || !sameDirectoryIdentity(currentRoot, rootIdentity)) { + throw new RuntimeError("recovery quarantine journal changed during read"); + } + journalIdentity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + }; + bytes = await readHandleBytes(handle, Number(metadata.size)); + const settledHandle = await handle.stat({ bigint: true }); + const settledMetadata = await lstat(filename, { bigint: true }); + const settledRoot = await lstat(runsRoot, { bigint: true }); + if (!settledHandle.isFile() + || settledHandle.nlink !== 1n + || settledHandle.size !== metadata.size + || settledHandle.dev !== metadata.dev + || settledHandle.ino !== metadata.ino + || settledHandle.birthtimeNs !== metadata.birthtimeNs + || settledHandle.mtimeNs !== metadata.mtimeNs + || settledHandle.ctimeNs !== metadata.ctimeNs + || !settledMetadata.isFile() + || settledMetadata.isSymbolicLink() + || settledMetadata.nlink !== 1n + || settledMetadata.size !== BigInt(bytes.byteLength) + || settledMetadata.dev !== metadata.dev + || settledMetadata.ino !== metadata.ino + || settledMetadata.birthtimeNs !== metadata.birthtimeNs + || settledMetadata.mtimeNs !== metadata.mtimeNs + || settledMetadata.ctimeNs !== metadata.ctimeNs + || !isPlainDirectory(settledRoot) + || !sameDirectoryIdentity(settledRoot, rootIdentity)) { + throw new RuntimeError("recovery quarantine journal changed after read"); + } + } catch (error) { + primaryError = error; + } + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== undefined) { + throw new AggregateError( + [primaryError, closeError], + "recovery quarantine journal read failed and its handle could not be closed", + ); + } + throw closeError; + } + if (primaryError !== undefined) throw primaryError; + if (bytes === undefined || journalIdentity === undefined) { + throw new RuntimeError("recovery quarantine journal read produced no content"); + } + return { + bytes, + runIds: parseRecoveryQuarantineJournal(bytes), + rootIdentity, + journalIdentity, + }; +} + +async function syncRecoveryDirectory(directory: string): Promise { + await syncDirectoryMetadata(directory); +} + +async function publishRecoveryQuarantineJournal( + runsRoot: string, + filename: string, + snapshot: RecoveryQuarantineSnapshot, + nextBytes: Buffer, +): Promise { + const temporaryPath = path.join( + runsRoot, + `.recovery-quarantine-journal-${randomUUID()}.tmp`, + ); + let handle; + let temporaryCreated = false; + let temporaryConsumed = false; + let linkedPublication = false; + let temporaryIdentity: DirectoryIdentity | undefined; + let primaryError: unknown; + try { + handle = await open( + temporaryPath, + constants.O_RDWR | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW, + 0o600, + ); + temporaryCreated = true; + const metadata = await handle.stat({ bigint: true }); + temporaryIdentity = { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + }; + const namedMetadata = await lstat(temporaryPath, { bigint: true }); + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (!metadata.isFile() + || metadata.nlink !== 1n + || !namedMetadata.isFile() + || namedMetadata.isSymbolicLink() + || namedMetadata.nlink !== 1n + || namedMetadata.dev !== metadata.dev + || namedMetadata.ino !== metadata.ino + || namedMetadata.birthtimeNs !== metadata.birthtimeNs + || metadata.size > MAX_STATE_FILE_BYTES_BIGINT + || !isPlainDirectory(currentRoot) + || !sameDirectoryIdentity(currentRoot, snapshot.rootIdentity)) { + throw new RuntimeError("recovery quarantine journal temp changed during creation"); + } + await handle.writeFile(nextBytes); + await handle.sync(); + await validateOwnedLockState( + handle, + [temporaryPath], + temporaryIdentity, + nextBytes, + 1, + runsRoot, + snapshot.rootIdentity, + ); + } catch (error) { + primaryError = error; + } + if (handle !== undefined) { + try { + await handle.close(); + } catch (closeError) { + if (primaryError !== undefined) { + primaryError = new AggregateError( + [primaryError, closeError], + "recovery quarantine journal temp failed and its handle could not be closed", + ); + } else { + primaryError = closeError; + } + } + } + if (primaryError === undefined) { + try { + if (temporaryIdentity === undefined) { + throw new RuntimeError("recovery quarantine journal temp identity is unavailable"); + } + await validatePublishedLock( + temporaryPath, + temporaryIdentity, + nextBytes, + runsRoot, + snapshot.rootIdentity, + ); + const currentSnapshot = await readRecoveryQuarantineJournal(runsRoot); + const sameJournalIdentity = snapshot.journalIdentity === null + ? currentSnapshot.journalIdentity === null + : currentSnapshot.journalIdentity !== null + && currentSnapshot.journalIdentity.dev === snapshot.journalIdentity.dev + && currentSnapshot.journalIdentity.ino === snapshot.journalIdentity.ino + && currentSnapshot.journalIdentity.birthtimeNs === snapshot.journalIdentity.birthtimeNs; + if (currentSnapshot.rootIdentity.dev !== snapshot.rootIdentity.dev + || currentSnapshot.rootIdentity.ino !== snapshot.rootIdentity.ino + || currentSnapshot.rootIdentity.birthtimeNs !== snapshot.rootIdentity.birthtimeNs + || !sameJournalIdentity + || !currentSnapshot.bytes.equals(snapshot.bytes)) { + throw new RuntimeError("recovery quarantine journal changed before publication"); + } + if (snapshot.journalIdentity === null) { + await link(temporaryPath, filename); + linkedPublication = true; + await validatePublishedLock( + temporaryPath, + temporaryIdentity, + nextBytes, + runsRoot, + snapshot.rootIdentity, + 2, + [temporaryPath, filename], + ); + const removal = await removeExpectedLockPath( + temporaryPath, + temporaryIdentity, + nextBytes, + 2, + ); + if (removal === "changed") { + throw new RuntimeError("recovery quarantine journal temp changed before unlink"); + } + temporaryConsumed = true; + } else { + await rename(temporaryPath, filename); + temporaryConsumed = true; + } + } catch (error) { + primaryError = error; + } + } + const cleanupErrors: unknown[] = []; + if (temporaryCreated && !temporaryConsumed) { + if (temporaryIdentity === undefined) { + cleanupErrors.push(new RuntimeError( + "recovery quarantine journal temp identity is unavailable for cleanup", + )); + } else { + cleanupErrors.push(...await cleanupOwnedLockPaths( + runsRoot, + snapshot.rootIdentity, + temporaryPath, + filename, + temporaryIdentity, + nextBytes, + linkedPublication, + )); + } + } + if (primaryError !== undefined && cleanupErrors.length > 0) { + throw new AggregateError( + [primaryError, ...cleanupErrors], + "recovery quarantine journal publication and temp cleanup failed", + ); + } + if (primaryError !== undefined) throw primaryError; + if (cleanupErrors.length === 1) throw cleanupErrors[0]; + if (cleanupErrors.length > 1) { + throw new AggregateError(cleanupErrors, "recovery quarantine journal temp cleanup failed"); + } + + const publishedSnapshot = await readRecoveryQuarantineJournal(runsRoot); + if (temporaryIdentity === undefined + || publishedSnapshot.journalIdentity === null + || publishedSnapshot.journalIdentity.dev !== temporaryIdentity.dev + || publishedSnapshot.journalIdentity.ino !== temporaryIdentity.ino + || publishedSnapshot.journalIdentity.birthtimeNs !== temporaryIdentity.birthtimeNs + || publishedSnapshot.rootIdentity.dev !== snapshot.rootIdentity.dev + || publishedSnapshot.rootIdentity.ino !== snapshot.rootIdentity.ino + || publishedSnapshot.rootIdentity.birthtimeNs !== snapshot.rootIdentity.birthtimeNs + || !publishedSnapshot.bytes.equals(nextBytes)) { + throw new RuntimeError("recovery quarantine journal changed after publication"); + } + await syncRecoveryDirectory(runsRoot); +} + +async function appendRecoveryQuarantineRecord( + runsRoot: string, + record: RecoveryQuarantineRecord, +): Promise { + const line = `${JSON.stringify(record)}\n`; + const lineBytes = Buffer.byteLength(line, "utf8"); + if (lineBytes > MAX_QUARANTINE_RECORD_BYTES) { + throw new RuntimeError("recovery quarantine record exceeds its size limit"); + } + const filename = path.join(runsRoot, "recovery-quarantine.ndjson"); + const snapshot = await readRecoveryQuarantineJournal(runsRoot); + if (snapshot.runIds.has(record.runId)) { + await syncRecoveryDirectory(runsRoot); + const settledSnapshot = await readRecoveryQuarantineJournal(runsRoot); + if (settledSnapshot.rootIdentity.dev !== snapshot.rootIdentity.dev + || settledSnapshot.rootIdentity.ino !== snapshot.rootIdentity.ino + || settledSnapshot.rootIdentity.birthtimeNs !== snapshot.rootIdentity.birthtimeNs + || settledSnapshot.journalIdentity === null + || snapshot.journalIdentity === null + || settledSnapshot.journalIdentity.dev !== snapshot.journalIdentity.dev + || settledSnapshot.journalIdentity.ino !== snapshot.journalIdentity.ino + || settledSnapshot.journalIdentity.birthtimeNs !== snapshot.journalIdentity.birthtimeNs + || !settledSnapshot.bytes.equals(snapshot.bytes)) { + throw new RuntimeError("recovery quarantine journal changed after retry sync"); + } + return; + } + const nextBytes = Buffer.concat([snapshot.bytes, Buffer.from(line, "utf8")]); + if (nextBytes.byteLength > MAX_STATE_FILE_BYTES) { + throw new RuntimeError("recovery quarantine journal exceeds its size limit"); + } + await publishRecoveryQuarantineJournal(runsRoot, filename, snapshot, nextBytes); +} + +export async function quarantineRun( + runsRoot: string, + runId: string, + error: unknown, +): Promise { + const runDirectory = path.join(runsRoot, runId); + const quarantinePath = path.join(runsRoot, `.poisoned-${runId}`); + const runsIdentity = await plainDirectoryIdentity(runsRoot); + if (runsIdentity === null) throw new RuntimeError("recovery runs root disappeared"); + let runIdentity: DirectoryIdentity | null = null; + let renamed = false; + let journaled = false; + try { + runIdentity = await plainDirectoryIdentity(runDirectory); + if (runIdentity === null) throw new RuntimeError("poisoned recovery run disappeared"); + if (await plainDirectoryIdentity(quarantinePath) !== null) { + throw new RuntimeError("poisoned recovery quarantine already exists"); + } + await rename(runDirectory, quarantinePath); + renamed = true; + const quarantineIdentity = await plainDirectoryIdentity(quarantinePath); + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (quarantineIdentity === null + || quarantineIdentity.dev !== runIdentity.dev + || quarantineIdentity.ino !== runIdentity.ino + || quarantineIdentity.birthtimeNs !== runIdentity.birthtimeNs + || !isPlainDirectory(currentRoot) + || !sameDirectoryIdentity(currentRoot, runsIdentity)) { + throw new RuntimeError("poisoned recovery run identity changed during quarantine"); + } + const record: RecoveryQuarantineRecord = { + event: "recovery-quarantine", + runId, + reason: boundedQuarantineReason(error), + recordedAt: new Date().toISOString(), + }; + await appendRecoveryQuarantineRecord(runsRoot, record); + journaled = true; + logger.warn("startup recovery quarantined poisoned run", { + runId, + reason: record.reason, + }); + } catch (quarantineError) { + const errors = [error, quarantineError]; + if (renamed && !journaled && runIdentity !== null) { + try { + const quarantineMetadata = await lstat(quarantinePath, { bigint: true }); + const currentRoot = await lstat(runsRoot, { bigint: true }); + if (!isPlainDirectory(quarantineMetadata) + || !sameDirectoryIdentity(quarantineMetadata, runIdentity) + || await plainDirectoryIdentity(runDirectory) !== null + || !isPlainDirectory(currentRoot) + || !sameDirectoryIdentity(currentRoot, runsIdentity)) { + throw new RuntimeError("poisoned recovery rollback identity or destination is unsafe"); + } + await rename(quarantinePath, runDirectory); + const restoredMetadata = await lstat(runDirectory, { bigint: true }); + const restoredRoot = await lstat(runsRoot, { bigint: true }); + if (!isPlainDirectory(restoredMetadata) + || !sameDirectoryIdentity(restoredMetadata, runIdentity) + || !isPlainDirectory(restoredRoot) + || !sameDirectoryIdentity(restoredRoot, runsIdentity)) { + throw new RuntimeError("poisoned recovery rollback identity changed"); + } + await syncRecoveryDirectory(runsRoot); + const settledMetadata = await lstat(runDirectory, { bigint: true }); + const settledRoot = await lstat(runsRoot, { bigint: true }); + if (!isPlainDirectory(settledMetadata) + || !sameDirectoryIdentity(settledMetadata, runIdentity) + || !isPlainDirectory(settledRoot) + || !sameDirectoryIdentity(settledRoot, runsIdentity)) { + throw new RuntimeError("poisoned recovery rollback changed after directory sync"); + } + } catch (rollbackError) { + errors.push(rollbackError); + } + } + throw new AggregateError(errors, "run recovery failed and quarantine did not complete"); + } +} diff --git a/src/runtime/recovery-runs.ts b/src/runtime/recovery-runs.ts new file mode 100644 index 0000000..9f47b28 --- /dev/null +++ b/src/runtime/recovery-runs.ts @@ -0,0 +1,341 @@ +import { lstat, readdir, realpath } from "node:fs/promises"; +import path from "node:path"; +import { git } from "../git/git-exec.js"; +import { SLICE_REF_PREFIX } from "../git/ref-namespace.js"; +import { gitNulRecords, gitPathOutput } from "../git/git-output.js"; +import { + canonicalizeWorktreePath, + findWorktreeRegistration, +} from "../git/worktree-registration.js"; +import { + managedWorktreeDirectoryIdentity, + removeMissingRegisteredWorktree, + removeRegisteredWorktree, + type ManagedWorktreeDirectoryIdentity, +} from "./worktree-manager.js"; +import type { PlatformServices } from "../platform/platform-services.js"; +import type { AttemptResult } from "../protocol/attempt-result.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; +import { platformPathsEqual } from "../util/platform-path.js"; +import { ArtifactStore } from "./artifact-store.js"; +import { managedWorktreeRoots } from "./managed-worktree-root.js"; +import { + OID, + CANDIDATE_REF_PREFIX, + type RunStartRecord, + plainDirectoryIdentity, + runGitError, + validateGitCommonDir, + readDirectRef, + deleteExactRef, +} from "./recovery-shared.js"; + +async function removeStaleCandidateAnchor(repoRoot: string, runId: string): Promise { + const ref = `${CANDIDATE_REF_PREFIX}${runId}`; + const oid = await readDirectRef(repoRoot, ref); + if (oid !== null) await deleteExactRef(repoRoot, ref, oid); +} + +export async function archiveInterruptedPipeline( + store: ArtifactStore, + result: AttemptResult, +): Promise { + if (result.status !== "verified-candidate") return; + const manifest = await store.readManifest(); + if (manifest === null) { + throw new RuntimeError("run manifest is missing while recovering interrupted pipeline"); + } + const failed: AttemptResult = { + ...result, + status: "failed", + failure: "verification-failure", + summary: "Delegation pipeline was interrupted before trusted gates completed.", + unresolvedIssues: [ + ...result.unresolvedIssues, + "pipeline-interrupted-before-terminal-cleanup", + ], + evidence: { + ...result.evidence, + pipelineRecovery: "interrupted-before-terminal-cleanup", + }, + }; + await store.promoteTerminalArtifacts({ result: failed, manifest }); +} + +function escapeRegex(value: string): string { + return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); +} + +interface TemporarySliceRef { + ref: string; + oid: string; +} + +async function temporarySliceRefs( + repoRoot: string, + runId: string, + runGit: typeof git, +): Promise { + const prefix = `${SLICE_REF_PREFIX}${runId}/`; + const listed = await runGit(repoRoot, [ + "for-each-ref", + "--format=%(refname)%09%(objectname)", + prefix, + ]); + if (listed.exitCode !== 0) throw runGitError("enumerate temporary slice refs", listed); + const expectedName = new RegExp( + `^${escapeRegex(prefix)}slice-[1-9][0-9]*-attempt-(?:0|[1-9][0-9]*)$`, + ); + const refs: TemporarySliceRef[] = []; + for (const line of listed.stdout.split("\n").filter(Boolean)) { + const fields = line.split("\t"); + if (fields.length !== 2 || fields[0] === undefined || !expectedName.test(fields[0])) { + throw new RuntimeError("temporary slice ref name is malformed during recovery"); + } + if (fields[1] === undefined || !OID.test(fields[1])) { + throw new RuntimeError("temporary slice ref OID is malformed during recovery"); + } + const object = await runGit(repoRoot, ["cat-file", "-t", fields[1]], { + env: { GIT_NO_REPLACE_OBJECTS: "1" }, + }); + if (object.exitCode !== 0 || object.stdout.trim() !== "commit") { + throw new RuntimeError("temporary slice ref does not identify a commit during recovery"); + } + refs.push({ ref: fields[0], oid: fields[1] }); + } + for (const temporaryRef of refs) { + const current = await readDirectRef(repoRoot, temporaryRef.ref, runGit); + if (current !== temporaryRef.oid) { + throw new RuntimeError("temporary slice ref moved during recovery"); + } + } + return refs; +} + +export async function cleanupTemporarySliceRefs( + repoRoot: string, + runId: string, + runGit: typeof git, +): Promise { + const refs = await temporarySliceRefs(repoRoot, runId, runGit); + for (const temporaryRef of refs) { + await deleteExactRef(repoRoot, temporaryRef.ref, temporaryRef.oid, runGit); + } +} + +export async function managedWorktreeMarkerIsPresent(worktreePath: string): Promise { + let marker; + try { + marker = await lstat(path.join(worktreePath, ".git"), { bigint: true }); + } catch (error) { + if (isMissing(error)) return false; + throw error; + } + if (!marker.isFile() || marker.isSymbolicLink() || marker.nlink !== 1n) { + throw new RuntimeError("managed worktree repository marker is ambiguous"); + } + return true; +} + +export async function removeManagedWorktreeUnderLease( + commonDir: string, + worktreePath: string, + expectedIdentity: ManagedWorktreeDirectoryIdentity, + runGit: typeof git, +): Promise { + const currentIdentity = await managedWorktreeDirectoryIdentity(worktreePath); + if (currentIdentity === null) return; + if (currentIdentity.dev !== expectedIdentity.dev + || currentIdentity.ino !== expectedIdentity.ino + || currentIdentity.birthtimeNs !== expectedIdentity.birthtimeNs) { + throw new RuntimeError("worktree directory identity changed under checkout lease"); + } + if (await managedWorktreeMarkerIsPresent(worktreePath)) { + const resolved = await runGit(worktreePath, [ + "rev-parse", "--path-format=absolute", "--git-common-dir", + ]); + if (resolved.truncated?.stdout === true || resolved.truncated?.stderr === true) { + throw new RuntimeError("worktree repository lookup was truncated under checkout lease"); + } + if (resolved.exitCode !== 0) { + throw runGitError("resolve worktree repository under checkout lease", resolved); + } + const reportedCommonDir = gitPathOutput( + resolved.stdout, + "managed worktree common directory", + ); + if (!path.isAbsolute(reportedCommonDir) + || await realpath(reportedCommonDir) !== commonDir) { + throw new RuntimeError("managed worktree belongs to a different repository"); + } + } + const listed = await runGit(commonDir, ["worktree", "list", "--porcelain", "-z"]); + if (listed.exitCode !== 0 + || listed.truncated?.stdout === true + || listed.truncated?.stderr === true) { + throw runGitError("recheck worktree registration", listed); + } + const registered = await findWorktreeRegistration( + gitNulRecords(listed.stdout, "rechecked Git worktree list"), + worktreePath, + ) !== -1; + if (!registered) { + throw new RuntimeError("managed worktree registration is absent"); + } + await removeRegisteredWorktree( + commonDir, + worktreePath, + { git: runGit }, + expectedIdentity, + ); +} + +function mostSpecificKnownRunClaim( + knownRunIds: ReadonlySet, + managedId: string, +): string | undefined { + let owner: string | undefined; + for (const runId of knownRunIds) { + if (runClaimsWorktree(runId, managedId) + && (owner === undefined || runId.length > owner.length)) owner = runId; + } + return owner; +} + +async function canonicalManagedRoots(): Promise { + const { roots } = await managedWorktreeRoots(); + const canonical: string[] = []; + for (const root of roots) { + try { + // A vanished root still anchors its stale registrations. + canonical.push(await canonicalizeWorktreePath(root, true)); + } catch (error) { + if (!isMissing(error)) throw error; + } + } + return canonical; +} + +export async function cleanupRunWorktreesUnderLease( + commonDir: string, + runId: string, + runGit: typeof git, + knownRunIds: ReadonlySet, +): Promise { + const managedRoots = await canonicalManagedRoots(); + for (const worktreesRoot of managedRoots) { + if (await plainDirectoryIdentity(worktreesRoot) === null) continue; + const entries = await readdir(worktreesRoot, { withFileTypes: true }); + for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { + if (!entry.isDirectory() + || entry.isSymbolicLink() + || !runClaimsWorktree(runId, entry.name) + || mostSpecificKnownRunClaim(knownRunIds, entry.name) !== runId) continue; + const worktreePath = path.join(worktreesRoot, entry.name); + const identity = await managedWorktreeDirectoryIdentity(worktreePath); + if (identity !== null) { + await removeManagedWorktreeUnderLease(commonDir, worktreePath, identity, runGit); + } + } + } + + // A crash or external removal can erase the physical directory before its + // exact Git registration is cleaned. Such a path cannot be discovered by + // scanning the managed roots, so inspect this run's known repository while + // its checkout lease is held and remove only registrations in a managed + // root whose complete run-id boundary matches. + const listed = await runGit(commonDir, ["worktree", "list", "--porcelain", "-z"]); + if (listed.exitCode !== 0 + || listed.truncated?.stdout === true + || listed.truncated?.stderr === true) { + throw runGitError("enumerate missing run worktree registrations", listed); + } + for (const field of gitNulRecords(listed.stdout, "missing-run Git worktree list")) { + if (!field.startsWith("worktree ")) continue; + const worktreePath = await canonicalizeWorktreePath( + path.resolve(field.slice("worktree ".length)), + true, + ).catch((error: unknown) => { + if (isMissing(error)) return null; + throw error; + }); + if (worktreePath === null + || !managedRoots.some(root => platformPathsEqual(path.dirname(worktreePath), root)) + || !runClaimsWorktree(runId, path.basename(worktreePath)) + || mostSpecificKnownRunClaim(knownRunIds, path.basename(worktreePath)) !== runId + || await managedWorktreeDirectoryIdentity(worktreePath) !== null) continue; + await removeMissingRegisteredWorktree(commonDir, worktreePath, { git: runGit }); + } +} + +export async function recoverRun( + record: RunStartRecord, + root: string, + ps: Pick, + isProcessAlive: (pid: number) => boolean, + runGit: typeof git = git, + worktreeCleanupAllowed = true, + knownRunIds: ReadonlySet = new Set([record.runId]), +): Promise<"recovered" | "live-preserve"> { + if (record.pid !== null && isProcessAlive(record.pid)) { + if (record.processToken === null) return "live-preserve"; + let observedToken: string | null; + try { + observedToken = await ps.getProcessStartToken(record.pid); + } catch { + return "live-preserve"; + } + if (observedToken === null) return "live-preserve"; + if (observedToken === record.processToken) { + await ps.terminateProcessTreeByPid(record.pid, record.processToken); + } + } + if (!worktreeCleanupAllowed) { + throw new RuntimeError("pending worktree removal ambiguity deferred stale-run cleanup"); + } + const commonDir = await validateGitCommonDir(record.canonicalCommonDir); + const store = new ArtifactStore(record.runId); + const logsRef = await store.writeLog( + "recovery", + "startup recovery reclaimed unfinished run\n", + ); + await cleanupRunWorktreesUnderLease(commonDir, record.runId, runGit, knownRunIds); + await cleanupTemporarySliceRefs(commonDir, record.runId, runGit); + await removeStaleCandidateAnchor(commonDir, record.runId); + await store.writeResult({ + resultVersion: "1", + runId: record.runId, + status: "cancelled", + failure: "cancelled", + summary: "Interrupted attempt was cancelled during startup recovery.", + producerSummary: null, + candidate: null, + requestedVerification: [], + executedVerification: [], + unresolvedIssues: ["attempt-interrupted-before-terminal-result"], + evidence: { + recovery: "startup-stale-run", + originalStartedAt: record.startedAt, + }, + logsRef, + producerId: null, + producerVersion: null, + producerModel: null, + durationMs: 0, + sessionId: null, + }); + return "recovered"; +} + +export function runClaimsWorktree(runId: string, managedId: string): boolean { + // Worktree phase names are intentionally open-ended: adding a new trusted + // phase must not make recovery delete it merely because this scanner's enum + // was not updated. Run IDs are safe, collision-resistant identifiers, and + // each supported namespace uses an explicit boundary after the full ID. + return managedId === runId + || managedId.startsWith(`${runId}-`) + || managedId === `baseline-${runId}` + || managedId.startsWith(`baseline-${runId}-`) + || managedId === `verify-${runId}` + || managedId.startsWith(`verify-${runId}-`); +} diff --git a/src/runtime/recovery-shared.ts b/src/runtime/recovery-shared.ts new file mode 100644 index 0000000..f5c83e7 --- /dev/null +++ b/src/runtime/recovery-shared.ts @@ -0,0 +1,306 @@ +import { createHash } from "node:crypto"; +import { constants } from "node:fs"; +import { lstat, open, realpath } from "node:fs/promises"; +import path from "node:path"; +import nodeProcess from "node:process"; +import { git, type GitResult } from "../git/git-exec.js"; +import { gitPathOutput } from "../git/git-output.js"; +import type { ManagedWorktreeDirectoryIdentity } from "./worktree-manager.js"; +import { ensurePrivateDirectory, sameDirectoryIdentity } from "../platform/durable-directory.js"; +import { RuntimeError, isMissing } from "../util/errors.js"; +import { readStableRegularFile } from "../util/stable-file.js"; +import { boundedRedactedDiagnostic } from "./redaction.js"; +import { resolveStateDir } from "./state-dir.js"; + +export const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; +export const MAX_STATE_FILE_BYTES = 8_000_000; +export const MAX_STATE_FILE_BYTES_BIGINT = BigInt(MAX_STATE_FILE_BYTES); +export const SAFE_RUN_ID = /^[a-z0-9][a-z0-9._-]*$/; +export const WORKFLOW_WORKTREE_NAME = /^workflow-([0-9a-f]{32})(?:-final)?$/; +export const LEGACY_FINAL_WORKTREE_NAME = /^final-([0-9a-f]{24})$/; +export const WORKFLOW_OWNERSHIP_NAME = /^([0-9a-f]{64})\.json$/; +export const OID = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/; +export const CANDIDATE_REF_PREFIX = "refs/claude-architect/candidates/"; +export const BACKUP_REF_PREFIX = "refs/claude-architect/prune-backups/"; +export const MAX_QUARANTINE_REASON_BYTES = 2_000; +export const MAX_QUARANTINE_RECORD_BYTES = 4_096; +const MAX_WORKTREE_SWEEP_ISSUES = 100; + +export interface RunStartRecord { + runId: string; + lockKey: string; + canonicalCommonDir: string; + pid: number | null; + processToken: string | null; + startedAt: string; +} + +export interface DirectoryIdentity { + dev: bigint; + ino: bigint; + birthtimeNs: bigint; +} + +export interface WorktreeSweepIssue { + worktreePath: string; + reason: string; + repositoryIdentity?: string; +} + + +export function isPlainDirectory(metadata: { + isDirectory(): boolean; + isSymbolicLink(): boolean; +}): boolean { + return metadata.isDirectory() && !metadata.isSymbolicLink(); +} + +export function sameManagedIdentity( + left: ManagedWorktreeDirectoryIdentity, + right: ManagedWorktreeDirectoryIdentity, +): boolean { + return left.dev === right.dev + && left.ino === right.ino + && left.birthtimeNs === right.birthtimeNs; +} + +export function validateRunId(runId: unknown): asserts runId is string { + if (typeof runId !== "string" || !SAFE_RUN_ID.test(runId)) { + throw new RuntimeError("recovery record has an invalid run id"); + } +} + +export async function stateRoot(): Promise { + const configured = nodeProcess.env.CLAUDE_PLUGIN_DATA + ?? (nodeProcess.env.NODE_ENV === "test" + ? nodeProcess.env.CLAUDE_ARCHITECT_STATE_DIR + : undefined); + if (configured === undefined) return null; + const root = path.resolve(resolveStateDir()); + try { + const metadata = await lstat(root, { bigint: true }); + if (!isPlainDirectory(metadata) || metadata.birthtimeNs <= 0n) { + throw new RuntimeError("plugin data directory must be a stable plain directory during recovery"); + } + const canonicalRoot = await realpath(root); + const settled = await lstat(canonicalRoot, { bigint: true }); + if (!isPlainDirectory(settled) + || settled.dev !== metadata.dev + || settled.ino !== metadata.ino + || settled.birthtimeNs !== metadata.birthtimeNs) { + throw new RuntimeError("plugin data directory identity changed during canonicalization"); + } + const privateIdentity = await assertPrivateRecoveryDirectory(canonicalRoot); + if (!sameDirectoryIdentity(privateIdentity, { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + })) { + throw new RuntimeError("plugin data directory identity changed during privacy validation"); + } + return canonicalRoot; + } catch (error) { + if (isMissing(error)) return null; + throw error; + } +} + +export async function readBoundedRegularFile(filename: string): Promise { + try { + const contents = await readStableRegularFile(filename, MAX_STATE_FILE_BYTES_BIGINT); + if (contents === null) { + throw new RuntimeError("recovery state entry is not a stable bounded regular file"); + } + return contents.toString("utf8"); + } catch (error) { + if (isMissing(error)) return null; + throw error; + } +} + +export async function assertPrivateRecoveryDirectory(directory: string): Promise { + return await ensurePrivateDirectory(directory, { + description: "recovery directory", + create: false, + migratePermissions: true, + }); +} + +export async function plainDirectoryIdentity(directory: string): Promise { + try { + const metadata = await lstat(directory, { bigint: true }); + if (!isPlainDirectory(metadata)) { + throw new RuntimeError("recovery directory must not be a symbolic link"); + } + return { + dev: metadata.dev, + ino: metadata.ino, + birthtimeNs: metadata.birthtimeNs, + }; + } catch (error) { + if (isMissing(error)) return null; + throw error; + } +} + +export function parseRunStart(text: string, expectedRunId: string): RunStartRecord { + let value: unknown; + try { + value = JSON.parse(text); + } catch (cause) { + throw new RuntimeError("run-start recovery record is invalid JSON", { cause }); + } + if (typeof value !== "object" || value === null) { + throw new RuntimeError("run-start recovery record must be an object"); + } + const record = value as Partial; + validateRunId(record.runId); + if (record.runId !== expectedRunId + || typeof record.lockKey !== "string" + || !/^[0-9a-f]{64}$/.test(record.lockKey) + || typeof record.canonicalCommonDir !== "string" + || !path.isAbsolute(record.canonicalCommonDir) + || (record.pid !== null + && (record.pid === undefined || !Number.isSafeInteger(record.pid) || record.pid <= 1)) + || (record.processToken !== undefined + && record.processToken !== null + && typeof record.processToken !== "string") + || typeof record.startedAt !== "string" + || !Number.isFinite(Date.parse(record.startedAt))) { + throw new RuntimeError("run-start recovery record is malformed"); + } + const expectedLockKey = createHash("sha256") + .update(record.canonicalCommonDir) + .digest("hex"); + if (record.lockKey !== expectedLockKey) { + throw new RuntimeError("run-start lock key does not match its canonical common directory"); + } + return { ...record, processToken: record.processToken ?? null } as RunStartRecord; +} + +export function validateTerminalResult(result: unknown, runId: string): void { + if (typeof result !== "object" || result === null) { + throw new RuntimeError("terminal attempt result is malformed during recovery"); + } + const value = result as { resultVersion?: unknown; runId?: unknown; status?: unknown }; + if (value.resultVersion !== "1" + || value.runId !== runId + || typeof value.status !== "string" + || !["unavailable", "failed", "cancelled", "verified-candidate"].includes(value.status)) { + throw new RuntimeError("terminal attempt result is malformed during recovery"); + } +} + +export function runGitError(action: string, result: GitResult): RuntimeError { + const diagnostic = (result.stderr || result.stdout).trim().slice(0, 2_000); + return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); +} + +export async function validateGitCommonDir(commonDir: string): Promise { + const canonical = await realpath(commonDir); + if (canonical !== commonDir) { + throw new RuntimeError("recorded Git common directory is no longer canonical"); + } + const result = await git(canonical, [ + "rev-parse", + "--path-format=absolute", + "--git-common-dir", + ]); + if (result.exitCode !== 0) throw runGitError("validate Git common directory", result); + const reported = await realpath(gitPathOutput( + result.stdout, + "Git common directory", + )); + if (reported !== canonical) { + throw new RuntimeError("recorded Git common directory no longer identifies the repository"); + } + return canonical; +} + +export async function validateRepositoryRoot(repoRoot: string): Promise { + if (!path.isAbsolute(repoRoot)) { + throw new RuntimeError("cleanup journal repository root is not absolute"); + } + const canonical = await realpath(repoRoot); + if (canonical !== repoRoot) { + throw new RuntimeError("cleanup journal repository root is no longer canonical"); + } + const result = await git(canonical, ["rev-parse", "--show-toplevel"]); + if (result.exitCode !== 0) throw runGitError("validate cleanup repository", result); + if (await realpath(gitPathOutput(result.stdout, "Git repository root")) !== canonical) { + throw new RuntimeError("cleanup journal repository root is not the repository top level"); + } + return canonical; +} + +export async function readDirectRef( + repoRoot: string, + ref: string, + runGit: typeof git = git, +): Promise { + const symbolic = await runGit(repoRoot, ["symbolic-ref", "--quiet", ref]); + if (symbolic.exitCode === 0) { + throw new RuntimeError("recovery refuses to mutate a symbolic Git ref"); + } + if (symbolic.exitCode !== 1) throw runGitError("inspect symbolic Git ref", symbolic); + const direct = await runGit(repoRoot, ["rev-parse", "--verify", "--quiet", ref]); + if (direct.exitCode === 1) return null; + if (direct.exitCode !== 0 || !OID.test(direct.stdout.trim())) { + throw runGitError("inspect Git ref", direct); + } + return direct.stdout.trim(); +} + +export async function deleteExactRef( + repoRoot: string, + ref: string, + oid: string, + runGit: typeof git = git, +): Promise { + const result = await runGit(repoRoot, ["update-ref", "--no-deref", "-d", ref, oid]); + if (result.exitCode !== 0) throw runGitError("delete recovery Git ref", result); +} + +export async function readHandleBytes( + handle: Awaited>, + size: number, +): Promise { + const contents = Buffer.alloc(size); + let offset = 0; + while (offset < size) { + const { bytesRead } = await handle.read( + contents, + offset, + size - offset, + offset, + ); + if (bytesRead === 0) break; + offset += bytesRead; + } + return contents.subarray(0, offset); +} + + +export function worktreeSweepIssue( + worktreePath: string, + error: unknown, + repositoryIdentity?: string, +): WorktreeSweepIssue { + return { + worktreePath, + reason: boundedRedactedDiagnostic(error, MAX_QUARANTINE_REASON_BYTES), + ...(repositoryIdentity === undefined ? {} : { repositoryIdentity }), + }; +} + +export function boundedWorktreeSweepIssues( + issues: WorktreeSweepIssue[], + worktreesRoot: string, +): WorktreeSweepIssue[] { + if (issues.length <= MAX_WORKTREE_SWEEP_ISSUES) return issues; + const retained = issues.slice(0, MAX_WORKTREE_SWEEP_ISSUES - 1); + return [...retained, { + worktreePath: worktreesRoot, + reason: `${issues.length - retained.length} additional worktree sweep issues omitted`, + }]; +} diff --git a/src/runtime/recovery-worktree-removals.ts b/src/runtime/recovery-worktree-removals.ts new file mode 100644 index 0000000..dd03efe --- /dev/null +++ b/src/runtime/recovery-worktree-removals.ts @@ -0,0 +1,899 @@ +import { lstat, readdir, realpath, rename } from "node:fs/promises"; +import path from "node:path"; +import { gitPathOutput } from "../git/git-output.js"; +import { canonicalizeWorktreePath } from "../git/worktree-registration.js"; +import { + managedWorktreeDirectoryIdentity, + removeQuarantinedDirectory, + restoreStagedRegistration, + WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY, + type ManagedWorktreeDirectoryIdentity, +} from "./worktree-manager.js"; +import { platformSafety } from "../platform/platform-safety.js"; +import type { PlatformServices } from "../platform/platform-services.js"; +import { getPlatformServices } from "../platform/select-platform.js"; +import { + emptyBoundDirectory, + removeBoundEmptyDirectory, +} from "../platform/bound-directory-cleanup.js"; +import { + assertWindowsPrivateDirectory, + syncDirectoryMetadata, +} from "../platform/durable-directory.js"; +import { RuntimeError } from "../util/errors.js"; +import { platformPathsEqual } from "../util/platform-path.js"; +import { readStableRegularFile } from "../util/stable-file.js"; +import { boundedRedactedDiagnostic } from "./redaction.js"; +import { isManagedWorktreeRoot } from "./managed-worktree-root.js"; +import { + readPendingWorktreeRemovalManifests, + readWorktreeRemovalManifest, + removeWorktreeRemovalManifest, + settleLinkedWorktreeRemovalManifest, + type WorktreeRemovalManifest, + type WorktreeRemovalManifestIssue, +} from "./worktree-removal-manifest.js"; +import { sameManagedIdentity, stateRoot } from "./recovery-shared.js"; + +async function assertRegistrationBacklink( + registrationPath: string, + expectedPhysicalPath: string, +): Promise { + const backlink = await readStableRegularFile(path.join(registrationPath, "gitdir"), 32_768n); + if (backlink === null) { + throw new RuntimeError("worktree registration backlink is absent or unstable"); + } + const reportedDotGit = gitPathOutput( + backlink.toString("utf8"), + "worktree registration backlink", + ); + if (!path.isAbsolute(reportedDotGit) || path.basename(reportedDotGit) !== ".git") { + throw new RuntimeError("worktree registration backlink is malformed"); + } + const [reportedPhysicalPath, canonicalExpectedPhysicalPath] = await Promise.all([ + canonicalizeWorktreePath(path.dirname(reportedDotGit), true), + canonicalizeWorktreePath(expectedPhysicalPath, true), + ]); + if (!platformPathsEqual(reportedPhysicalPath, canonicalExpectedPhysicalPath)) { + throw new RuntimeError("worktree registration backlink names a different physical worktree"); + } +} + +async function findCreationRegistration( + registrationRoot: string, + physicalPath: string, +): Promise { + const matches: string[] = []; + for (const entry of await readdir(registrationRoot, { withFileTypes: true })) { + if (!entry.isDirectory() || entry.isSymbolicLink()) continue; + const registrationPath = path.join(registrationRoot, entry.name); + const contents = await readStableRegularFile( + path.join(registrationPath, "gitdir"), + 32_768n, + ); + if (contents === null) continue; + let backlink: string; + try { + backlink = gitPathOutput(contents.toString("utf8"), "creation registration backlink"); + } catch { + continue; + } + if (path.isAbsolute(backlink) + && path.basename(backlink) === ".git" + && platformPathsEqual(path.resolve(path.dirname(backlink)), physicalPath)) { + matches.push(registrationPath); + } + } + if (matches.length > 1) { + throw new RuntimeError("worktree creation registration is ambiguous"); + } + return matches[0] ?? null; +} + +async function findCreationPhysicalRoot( + expectedRoot: string, + expected: ManagedWorktreeDirectoryIdentity, +): Promise { + const identity = await managedWorktreeDirectoryIdentity(expectedRoot); + if (identity !== null && sameManagedIdentity(identity, expected)) return expectedRoot; + // The root may have been renamed within its parent. Only the recorded + // identity can select a sibling, so a same-named substitute never matches. + const stateDirectory = path.dirname(expectedRoot); + const matches: string[] = []; + for (const entry of await readdir(stateDirectory, { withFileTypes: true })) { + if (!entry.isDirectory() || entry.isSymbolicLink()) continue; + const candidate = path.join(stateDirectory, entry.name); + const candidateIdentity = await managedWorktreeDirectoryIdentity(candidate); + if (candidateIdentity !== null && sameManagedIdentity(candidateIdentity, expected)) { + matches.push(candidate); + } + } + if (matches.length > 1) { + throw new RuntimeError("worktree creation root identity is ambiguous"); + } + return matches[0] ?? null; +} + +async function findManagedChildByIdentity( + root: string, + expected: ManagedWorktreeDirectoryIdentity, +): Promise { + const matches: string[] = []; + for (const entry of await readdir(root, { withFileTypes: true })) { + if (!entry.isDirectory() || entry.isSymbolicLink()) continue; + const candidate = path.join(root, entry.name); + const identity = await managedWorktreeDirectoryIdentity(candidate); + if (identity !== null && sameManagedIdentity(identity, expected)) matches.push(candidate); + } + if (matches.length > 1) { + throw new RuntimeError("managed directory identity appears at multiple paths"); + } + return matches[0] ?? null; +} + +async function recoverWorktreeCreationIntent( + manifestPath: string, + manifest: WorktreeRemovalManifest, + platformServices: PlatformServices, + syncDirectory: (directory: string) => Promise, + temporaryPath?: string, + temporaryKind?: "linked", +): Promise { + const root = await stateRoot(); + if (root === null) throw new RuntimeError("runtime state root is unavailable"); + const expectedPhysicalRootPath = path.dirname(manifest.physicalPath); + if (!await isManagedWorktreeRoot(expectedPhysicalRootPath)) { + throw new RuntimeError("worktree creation intent names an unmanaged root"); + } + if (!path.isAbsolute(manifest.physicalPath) + || path.resolve(manifest.physicalPath) !== manifest.physicalPath + || !platformPathsEqual(path.dirname(manifest.physicalPath), expectedPhysicalRootPath) + || path.basename(manifest.physicalPath) === "" + || !path.isAbsolute(manifest.physicalQuarantinePath) + || path.resolve(manifest.physicalQuarantinePath) !== manifest.physicalQuarantinePath + || !platformPathsEqual( + path.dirname(manifest.physicalQuarantinePath), + expectedPhysicalRootPath, + ) + || path.basename(manifest.physicalQuarantinePath) + !== `.create-${path.basename(manifest.physicalPath)}-${manifest.transactionId}` + || !path.isAbsolute(manifest.commonDir) + || !path.isAbsolute(manifest.registrationRoot) + || !path.isAbsolute(manifest.quarantineRoot) + || !path.isAbsolute(manifest.quarantinePath) + || !platformPathsEqual( + manifest.registrationRoot, + path.join(manifest.commonDir, "worktrees"), + ) + || !platformPathsEqual(path.dirname(manifest.quarantinePath), manifest.quarantineRoot) + || path.basename(manifest.quarantinePath) + !== `.remove-registration-creation-${manifest.transactionId}`) { + throw new RuntimeError("worktree creation intent paths are inconsistent"); + } + const expectedCommonDir = { + dev: BigInt(manifest.commonDirDev), + ino: BigInt(manifest.commonDirIno), + birthtimeNs: BigInt(manifest.commonDirBirthtimeNs), + }; + const expectedPhysicalRoot = { + dev: BigInt(manifest.physicalRootDev), + ino: BigInt(manifest.physicalRootIno), + birthtimeNs: BigInt(manifest.physicalRootBirthtimeNs), + }; + const expectedRegistrationRoot = { + dev: BigInt(manifest.registrationRootDev), + ino: BigInt(manifest.registrationRootIno), + birthtimeNs: BigInt(manifest.registrationRootBirthtimeNs), + }; + const expectedQuarantineRoot = { + dev: BigInt(manifest.quarantineRootDev), + ino: BigInt(manifest.quarantineRootIno), + birthtimeNs: BigInt(manifest.quarantineRootBirthtimeNs), + }; + const commonDir = await realpath(manifest.commonDir); + const registrationRoot = await realpath(manifest.registrationRoot); + const quarantineRoot = await realpath(manifest.quarantineRoot); + const [commonIdentity, registrationRootIdentity, quarantineRootIdentity] = + await Promise.all([ + managedWorktreeDirectoryIdentity(commonDir), + managedWorktreeDirectoryIdentity(registrationRoot), + managedWorktreeDirectoryIdentity(quarantineRoot), + ]); + if (!platformPathsEqual(commonDir, manifest.commonDir) + || !platformPathsEqual(registrationRoot, manifest.registrationRoot) + || !platformPathsEqual(quarantineRoot, manifest.quarantineRoot) + || commonIdentity === null + || !sameManagedIdentity(commonIdentity, expectedCommonDir) + || registrationRootIdentity === null + || !sameManagedIdentity(registrationRootIdentity, expectedRegistrationRoot) + || quarantineRootIdentity === null + || !sameManagedIdentity(quarantineRootIdentity, expectedQuarantineRoot)) { + throw new RuntimeError("worktree creation intent repository identity changed"); + } + + await platformSafety.withRecoveryLease(commonDir, async (lease) => { + if (!platformPathsEqual(lease.repositoryIdentity, commonDir)) { + throw new RuntimeError("worktree creation recovery lease identity mismatch"); + } + if (temporaryPath !== undefined && temporaryKind === "linked") { + await settleLinkedWorktreeRemovalManifest( + manifestPath, + temporaryPath, + manifest.transactionId, + ); + } + const lockedManifest = await readWorktreeRemovalManifest( + manifestPath, + manifest.transactionId, + ); + if (lockedManifest === null + || JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { + throw new RuntimeError("worktree creation intent changed before recovery lease"); + } + const physicalRoot = await findCreationPhysicalRoot( + expectedPhysicalRootPath, + expectedPhysicalRoot, + ); + if (physicalRoot === null) { + throw new RuntimeError("worktree creation root moved outside its managed namespace"); + } + const expectedPhysical = manifest.physicalPresent + ? { + dev: BigInt(manifest.physicalDev), + ino: BigInt(manifest.physicalIno), + birthtimeNs: BigInt(manifest.physicalBirthtimeNs), + } + : null; + const finalPhysicalPath = physicalRoot === null + ? null + : path.join(physicalRoot, path.basename(manifest.physicalPath)); + const stagedPhysicalPath = physicalRoot === null + ? null + : path.join(physicalRoot, path.basename(manifest.physicalQuarantinePath)); + const [finalPhysicalIdentity, stagedPhysicalIdentity] = await Promise.all([ + finalPhysicalPath === null + ? null + : managedWorktreeDirectoryIdentity(finalPhysicalPath), + stagedPhysicalPath === null + ? null + : managedWorktreeDirectoryIdentity(stagedPhysicalPath), + ]); + if (finalPhysicalIdentity !== null && stagedPhysicalIdentity !== null) { + throw new RuntimeError("worktree creation placeholder exists at two paths"); + } + const physicalPath = finalPhysicalIdentity !== null + ? finalPhysicalPath + : stagedPhysicalIdentity !== null + ? stagedPhysicalPath + : null; + const physicalIdentity = finalPhysicalIdentity ?? stagedPhysicalIdentity; + if (expectedPhysical === null) { + if (finalPhysicalIdentity !== null) { + throw new RuntimeError("unbound final worktree creation path appeared"); + } + } else if (physicalIdentity !== null + && !sameManagedIdentity(physicalIdentity, expectedPhysical)) { + throw new RuntimeError("worktree creation physical identity changed"); + } + + const activeRegistration = await findCreationRegistration( + registrationRoot, + manifest.physicalPath, + ); + let quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); + if (activeRegistration !== null && quarantineIdentity !== null) { + throw new RuntimeError("worktree creation registration exists at two paths"); + } + if (expectedPhysical === null + && (activeRegistration !== null || quarantineIdentity !== null)) { + throw new RuntimeError("unbound worktree creation acquired a Git registration"); + } + if (activeRegistration !== null) { + const registrationIdentity = await managedWorktreeDirectoryIdentity(activeRegistration); + if (registrationIdentity === null) { + throw new RuntimeError("worktree creation registration disappeared"); + } + await assertRegistrationBacklink(activeRegistration, manifest.physicalPath); + await rename(activeRegistration, manifest.quarantinePath); + await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); + if (await managedWorktreeDirectoryIdentity(activeRegistration) !== null) { + throw new RuntimeError("worktree creation registration reappeared after staging"); + } + quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); + if (quarantineIdentity === null + || !sameManagedIdentity(quarantineIdentity, registrationIdentity)) { + throw new RuntimeError("worktree creation registration changed during staging"); + } + } + if (quarantineIdentity !== null) { + await assertRegistrationBacklink(manifest.quarantinePath, manifest.physicalPath); + } + + const removalIdentity = expectedPhysical ?? stagedPhysicalIdentity; + if (physicalPath !== null && physicalIdentity !== null && removalIdentity !== null) { + if (expectedPhysical !== null) { + await emptyBoundDirectory(physicalPath, removalIdentity, platformServices); + } + await removeBoundEmptyDirectory(physicalPath, removalIdentity, platformServices); + await syncDirectory(physicalRoot); + const settledRoot = await managedWorktreeDirectoryIdentity(physicalRoot!); + if (settledRoot === null || !sameManagedIdentity(settledRoot, expectedPhysicalRoot)) { + throw new RuntimeError("worktree creation root changed during recovery"); + } + } + if (quarantineIdentity !== null) { + await removeQuarantinedDirectory( + quarantineRoot, + manifest.quarantinePath, + quarantineIdentity, + { processSupervisor: platformServices }, + ); + } + await Promise.all([syncDirectory(registrationRoot), syncDirectory(quarantineRoot)]); + await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); + }); +} + + +export async function recoverPendingWorktreeRemovals( + platformServices: PlatformServices = getPlatformServices(), + syncDirectory: (directory: string) => Promise = syncDirectoryMetadata, +): Promise { + const { pending, issues } = await readPendingWorktreeRemovalManifests(); + for (const { manifestPath, manifest, temporaryPath, temporaryKind } of pending) { + let recoveryError: unknown; + let repositoryIdentity: string | undefined; + try { + if (manifest.phase === "creation-intent") { + repositoryIdentity = await realpath(manifest.commonDir); + await recoverWorktreeCreationIntent( + manifestPath, + manifest, + platformServices, + syncDirectory, + temporaryPath, + temporaryKind, + ); + continue; + } + const commonDir = await realpath(manifest.commonDir); + repositoryIdentity = commonDir; + const expectedRegistrationRoot = path.join(commonDir, "worktrees"); + const registrationRoot = await realpath(expectedRegistrationRoot); + const expectedQuarantineRoot = path.join( + commonDir, + WORKTREE_REGISTRATION_QUARANTINE_DIRECTORY, + ); + const quarantineRoot = await realpath(expectedQuarantineRoot); + const quarantineMetadata = await lstat(quarantineRoot, { bigint: true }); + const physicalRoot = await realpath(path.dirname(manifest.physicalPath)); + if (!await isManagedWorktreeRoot(physicalRoot)) { + throw new RuntimeError("worktree removal manifest names an unmanaged root"); + } + const commonDirIdentity = await managedWorktreeDirectoryIdentity(commonDir); + const registrationRootIdentity = await managedWorktreeDirectoryIdentity(registrationRoot); + const quarantineRootIdentity = await managedWorktreeDirectoryIdentity(quarantineRoot); + const physicalRootIdentity = await managedWorktreeDirectoryIdentity(physicalRoot); + const expectedCommonDirIdentity: ManagedWorktreeDirectoryIdentity = { + dev: BigInt(manifest.commonDirDev), + ino: BigInt(manifest.commonDirIno), + birthtimeNs: BigInt(manifest.commonDirBirthtimeNs), + }; + const expectedRegistrationRootIdentity: ManagedWorktreeDirectoryIdentity = { + dev: BigInt(manifest.registrationRootDev), + ino: BigInt(manifest.registrationRootIno), + birthtimeNs: BigInt(manifest.registrationRootBirthtimeNs), + }; + const expectedQuarantineRootIdentity: ManagedWorktreeDirectoryIdentity = { + dev: BigInt(manifest.quarantineRootDev), + ino: BigInt(manifest.quarantineRootIno), + birthtimeNs: BigInt(manifest.quarantineRootBirthtimeNs), + }; + const expectedPhysicalRootIdentity: ManagedWorktreeDirectoryIdentity = { + dev: BigInt(manifest.physicalRootDev), + ino: BigInt(manifest.physicalRootIno), + birthtimeNs: BigInt(manifest.physicalRootBirthtimeNs), + }; + if (process.platform === "win32") { + if (registrationRootIdentity === null + || quarantineRootIdentity === null + || physicalRootIdentity === null) { + throw new RuntimeError("worktree removal root identity is unavailable on Windows"); + } + await Promise.all([ + assertWindowsPrivateDirectory( + quarantineRoot, + quarantineRootIdentity, + platformServices, + ), + assertWindowsPrivateDirectory( + physicalRoot, + physicalRootIdentity, + platformServices, + ), + ]); + } + const manifestPhysicalRoot = await realpath(path.dirname(manifest.physicalPath)); + const manifestPhysicalQuarantineRoot = await realpath( + path.dirname(manifest.physicalQuarantinePath), + ); + const assertRemovalRootsUnchanged = async () => { + const currentCommonDir = await managedWorktreeDirectoryIdentity(commonDir); + const currentRegistrationRoot = await managedWorktreeDirectoryIdentity(registrationRoot); + const currentQuarantineRoot = await managedWorktreeDirectoryIdentity(quarantineRoot); + const currentPhysicalRoot = await managedWorktreeDirectoryIdentity(physicalRoot); + if (commonDirIdentity === null + || currentCommonDir === null + || !sameManagedIdentity(currentCommonDir, commonDirIdentity) + || registrationRootIdentity === null + || quarantineRootIdentity === null + || physicalRootIdentity === null + || currentRegistrationRoot === null + || currentQuarantineRoot === null + || currentPhysicalRoot === null + || !sameManagedIdentity(currentRegistrationRoot, registrationRootIdentity) + || !sameManagedIdentity(currentQuarantineRoot, quarantineRootIdentity) + || !sameManagedIdentity(currentPhysicalRoot, physicalRootIdentity)) { + throw new RuntimeError("worktree removal root identity changed"); + } + }; + const syncRemovalRoots = async () => { + for (const directory of [physicalRoot, registrationRoot, quarantineRoot]) { + await syncDirectory(directory); + } + await assertRemovalRootsUnchanged(); + }; + const uid = process.getuid?.(); + const checkManifestConsistency = ( + tag: string, + ok: boolean, + ...operands: unknown[] + ) => { + if (ok) return; + const detail = operands.length === 0 + ? "" + : ` (${operands.map(operand => boundedRedactedDiagnostic( + JSON.stringify(operand, (_key, value) => + typeof value === "bigint" ? value.toString() : value), + 256, + )).join(" vs ")})`; + throw new RuntimeError( + `worktree removal manifest paths are inconsistent: ${tag}${detail}`, + ); + }; + checkManifestConsistency( + "quarantineRoot directory mismatch", + quarantineMetadata.isDirectory(), + quarantineMetadata.isDirectory(), + true, + ); + checkManifestConsistency( + "quarantineRoot symlink mismatch", + !quarantineMetadata.isSymbolicLink(), + quarantineMetadata.isSymbolicLink(), + false, + ); + if (process.platform !== "win32") { + checkManifestConsistency("quarantineRoot owner unavailable", uid !== undefined, uid); + checkManifestConsistency( + "quarantineRoot owner mismatch", + quarantineMetadata.uid === BigInt(uid!), + quarantineMetadata.uid, + uid, + ); + checkManifestConsistency( + "quarantineRoot mode mismatch", + (quarantineMetadata.mode & 0o077n) === 0n, + quarantineMetadata.mode & 0o077n, + 0, + ); + } + checkManifestConsistency( + "commonDir identity unavailable", + commonDirIdentity !== null, + commonDirIdentity, + ); + checkManifestConsistency( + "commonDir identity mismatch", + sameManagedIdentity(commonDirIdentity!, expectedCommonDirIdentity), + commonDirIdentity, + expectedCommonDirIdentity, + ); + checkManifestConsistency( + "registrationRoot identity unavailable", + registrationRootIdentity !== null, + registrationRootIdentity, + ); + checkManifestConsistency( + "registrationRoot identity mismatch", + sameManagedIdentity(registrationRootIdentity!, expectedRegistrationRootIdentity), + registrationRootIdentity, + expectedRegistrationRootIdentity, + ); + checkManifestConsistency( + "quarantineRoot identity unavailable", + quarantineRootIdentity !== null, + quarantineRootIdentity, + ); + checkManifestConsistency( + "quarantineRoot identity mismatch", + sameManagedIdentity(quarantineRootIdentity!, expectedQuarantineRootIdentity), + quarantineRootIdentity, + expectedQuarantineRootIdentity, + ); + checkManifestConsistency( + "physicalRoot identity unavailable", + physicalRootIdentity !== null, + physicalRootIdentity, + ); + checkManifestConsistency( + "physicalRoot identity mismatch", + sameManagedIdentity(physicalRootIdentity!, expectedPhysicalRootIdentity), + physicalRootIdentity, + expectedPhysicalRootIdentity, + ); + checkManifestConsistency( + "commonDir mismatch", + platformPathsEqual(commonDir, manifest.commonDir), + commonDir, + manifest.commonDir, + ); + checkManifestConsistency( + "derived registrationRoot mismatch", + platformPathsEqual(registrationRoot, expectedRegistrationRoot), + registrationRoot, + expectedRegistrationRoot, + ); + checkManifestConsistency( + "derived quarantineRoot mismatch", + platformPathsEqual(quarantineRoot, expectedQuarantineRoot), + quarantineRoot, + expectedQuarantineRoot, + ); + checkManifestConsistency( + "registrationRoot mismatch", + platformPathsEqual(registrationRoot, manifest.registrationRoot), + registrationRoot, + manifest.registrationRoot, + ); + checkManifestConsistency( + "quarantineRoot mismatch", + platformPathsEqual(quarantineRoot, manifest.quarantineRoot), + quarantineRoot, + manifest.quarantineRoot, + ); + checkManifestConsistency( + "registrationPath is not absolute", + path.isAbsolute(manifest.registrationPath), + manifest.registrationPath, + ); + checkManifestConsistency( + "registrationPath is not normalized", + path.resolve(manifest.registrationPath) === manifest.registrationPath, + path.resolve(manifest.registrationPath), + manifest.registrationPath, + ); + checkManifestConsistency( + "registrationPath equals registrationRoot", + !platformPathsEqual(manifest.registrationPath, registrationRoot), + manifest.registrationPath, + registrationRoot, + ); + checkManifestConsistency( + "quarantinePath is not absolute", + path.isAbsolute(manifest.quarantinePath), + manifest.quarantinePath, + ); + checkManifestConsistency( + "quarantinePath is not normalized", + path.resolve(manifest.quarantinePath) === manifest.quarantinePath, + path.resolve(manifest.quarantinePath), + manifest.quarantinePath, + ); + checkManifestConsistency( + "quarantinePath equals quarantineRoot", + !platformPathsEqual(manifest.quarantinePath, quarantineRoot), + manifest.quarantinePath, + quarantineRoot, + ); + checkManifestConsistency( + "physicalPath is not absolute", + path.isAbsolute(manifest.physicalPath), + manifest.physicalPath, + ); + checkManifestConsistency( + "physicalPath is not normalized", + path.resolve(manifest.physicalPath) === manifest.physicalPath, + path.resolve(manifest.physicalPath), + manifest.physicalPath, + ); + checkManifestConsistency( + "physicalPath equals physicalRoot", + !platformPathsEqual(manifest.physicalPath, physicalRoot), + manifest.physicalPath, + physicalRoot, + ); + checkManifestConsistency( + "physicalQuarantinePath is not absolute", + path.isAbsolute(manifest.physicalQuarantinePath), + manifest.physicalQuarantinePath, + ); + checkManifestConsistency( + "physicalQuarantinePath is not normalized", + path.resolve(manifest.physicalQuarantinePath) === manifest.physicalQuarantinePath, + path.resolve(manifest.physicalQuarantinePath), + manifest.physicalQuarantinePath, + ); + checkManifestConsistency( + "physicalQuarantinePath equals physicalRoot", + !platformPathsEqual(manifest.physicalQuarantinePath, physicalRoot), + manifest.physicalQuarantinePath, + physicalRoot, + ); + checkManifestConsistency( + "registrationPath parent mismatch", + platformPathsEqual(path.dirname(manifest.registrationPath), registrationRoot), + path.dirname(manifest.registrationPath), + registrationRoot, + ); + checkManifestConsistency( + "quarantinePath parent mismatch", + platformPathsEqual(path.dirname(manifest.quarantinePath), quarantineRoot), + path.dirname(manifest.quarantinePath), + quarantineRoot, + ); + checkManifestConsistency( + "quarantinePath name mismatch", + path.basename(manifest.quarantinePath) + === `.remove-registration-${path.basename(manifest.registrationPath)}-${manifest.transactionId}`, + path.basename(manifest.quarantinePath), + `.remove-registration-${path.basename(manifest.registrationPath)}-${manifest.transactionId}`, + ); + checkManifestConsistency( + "physicalPath parent mismatch", + platformPathsEqual(manifestPhysicalRoot, physicalRoot), + manifestPhysicalRoot, + physicalRoot, + ); + checkManifestConsistency( + "physicalQuarantinePath parent mismatch", + platformPathsEqual(manifestPhysicalQuarantineRoot, physicalRoot), + manifestPhysicalQuarantineRoot, + physicalRoot, + ); + checkManifestConsistency( + "physicalQuarantinePath name mismatch", + path.basename(manifest.physicalQuarantinePath) + === `.remove-${path.basename(manifest.physicalPath)}-${manifest.transactionId}`, + path.basename(manifest.physicalQuarantinePath), + `.remove-${path.basename(manifest.physicalPath)}-${manifest.transactionId}`, + ); + if (manifest.phase === "creation-root-changed") { + throw new RuntimeError("worktree creation root changed and requires manual resolution"); + } + const expectedRegistrationIdentity = { + dev: BigInt(manifest.registrationDev), + ino: BigInt(manifest.registrationIno), + birthtimeNs: BigInt(manifest.registrationBirthtimeNs), + }; + const expectedPhysicalIdentity = manifest.physicalPresent + ? { + dev: BigInt(manifest.physicalDev), + ino: BigInt(manifest.physicalIno), + birthtimeNs: BigInt(manifest.physicalBirthtimeNs), + } + : null; + await platformSafety.withRecoveryLease(commonDir, async (lease) => { + if (lease.repositoryIdentity !== commonDir) { + throw new RuntimeError("worktree removal recovery lease identity mismatch"); + } + + if (temporaryPath !== undefined && temporaryKind === "linked") { + await settleLinkedWorktreeRemovalManifest( + manifestPath, + temporaryPath, + manifest.transactionId, + ); + } + const lockedManifest = await readWorktreeRemovalManifest( + manifestPath, + manifest.transactionId, + ); + if (lockedManifest === null) return; + if (JSON.stringify(lockedManifest) !== JSON.stringify(manifest)) { + throw new RuntimeError("worktree removal manifest changed before recovery lease"); + } + const registrationIdentity = await managedWorktreeDirectoryIdentity( + manifest.registrationPath, + ); + const quarantineIdentity = await managedWorktreeDirectoryIdentity(manifest.quarantinePath); + let physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); + let physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( + manifest.physicalQuarantinePath, + ); + await assertRemovalRootsUnchanged(); + if (registrationIdentity !== null && quarantineIdentity !== null) { + throw new RuntimeError("worktree removal registration exists at two paths"); + } + if (physicalIdentity !== null && physicalQuarantineIdentity !== null) { + throw new RuntimeError("physical worktree exists at two paths during removal recovery"); + } + if (registrationIdentity !== null + && (registrationIdentity.dev !== expectedRegistrationIdentity.dev + || registrationIdentity.ino !== expectedRegistrationIdentity.ino + || registrationIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { + throw new RuntimeError("worktree removal registration identity changed"); + } + if (quarantineIdentity !== null + && (quarantineIdentity.dev !== expectedRegistrationIdentity.dev + || quarantineIdentity.ino !== expectedRegistrationIdentity.ino + || quarantineIdentity.birthtimeNs !== expectedRegistrationIdentity.birthtimeNs)) { + throw new RuntimeError("worktree removal quarantine identity changed"); + } + if (expectedPhysicalIdentity === null) { + if (physicalIdentity !== null || physicalQuarantineIdentity !== null) { + throw new RuntimeError("stale worktree physical path reappeared during removal recovery"); + } + } else { + if (physicalIdentity !== null + && (physicalIdentity.dev !== expectedPhysicalIdentity.dev + || physicalIdentity.ino !== expectedPhysicalIdentity.ino + || physicalIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { + throw new RuntimeError("physical worktree identity changed during removal recovery"); + } + if (physicalQuarantineIdentity !== null + && (physicalQuarantineIdentity.dev !== expectedPhysicalIdentity.dev + || physicalQuarantineIdentity.ino !== expectedPhysicalIdentity.ino + || physicalQuarantineIdentity.birthtimeNs !== expectedPhysicalIdentity.birthtimeNs)) { + throw new RuntimeError("physical worktree quarantine identity changed"); + } + if (physicalIdentity === null && physicalQuarantineIdentity === null) { + const displacedPhysicalPath = await findManagedChildByIdentity( + physicalRoot, + expectedPhysicalIdentity, + ); + if (displacedPhysicalPath !== null) { + throw new RuntimeError( + "physical worktree moved away from both recorded removal paths", + ); + } + } + } + + const activeRegistrationPath = quarantineIdentity !== null + ? manifest.quarantinePath + : registrationIdentity !== null + ? manifest.registrationPath + : null; + if (activeRegistrationPath === null && manifest.phase !== "physical-removed") { + throw new RuntimeError("worktree removal registration disappeared before commit"); + } + if (activeRegistrationPath !== null && manifest.phase !== "physical-removed") { + await assertRegistrationBacklink(activeRegistrationPath, manifest.physicalPath); + } + + if (manifest.phase === "physical-removed" + && (physicalIdentity !== null || physicalQuarantineIdentity !== null)) { + throw new RuntimeError("committed physical worktree removal reappeared"); + } + if (manifest.phase === "physical-removal-intent" + && manifest.physicalPresent + && physicalIdentity === null + && physicalQuarantineIdentity === null) { + throw new RuntimeError( + "intended physical worktree removal has no provable original or quarantine", + ); + } + const rollback = manifest.phase === "registration-intent" + ? !manifest.physicalPresent || physicalIdentity !== null + : manifest.phase === "physical-removal-intent" + ? (manifest.physicalPresent + ? physicalIdentity !== null || physicalQuarantineIdentity !== null + : physicalIdentity === null && physicalQuarantineIdentity === null) + : manifest.phase === "registration-staged" + && (manifest.physicalPresent + ? physicalIdentity !== null + : physicalIdentity === null && physicalQuarantineIdentity === null); + if (rollback) { + if (manifest.phase === "physical-removal-intent" + && physicalQuarantineIdentity !== null) { + if (expectedPhysicalIdentity === null || physicalIdentity !== null) { + throw new RuntimeError("physical worktree rollback state is inconsistent"); + } + await assertRemovalRootsUnchanged(); + await rename(manifest.physicalQuarantinePath, manifest.physicalPath); + const restoredPhysical = await managedWorktreeDirectoryIdentity(manifest.physicalPath); + const settledPhysicalQuarantine = await managedWorktreeDirectoryIdentity( + manifest.physicalQuarantinePath, + ); + if (restoredPhysical === null + || !sameManagedIdentity(restoredPhysical, expectedPhysicalIdentity) + || settledPhysicalQuarantine !== null) { + throw new RuntimeError("physical worktree rollback identity changed"); + } + await syncDirectory(physicalRoot); + await assertRemovalRootsUnchanged(); + } + if (quarantineIdentity !== null) { + await restoreStagedRegistration( + registrationRoot, + manifest.registrationPath, + quarantineRoot, + manifest.quarantinePath, + expectedRegistrationIdentity, + expectedRegistrationRootIdentity, + expectedQuarantineRootIdentity, + { processSupervisor: platformServices }, + ); + } else if (registrationIdentity === null) { + throw new RuntimeError("pre-commit worktree registration disappeared"); + } + await syncRemovalRoots(); + await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); + } else { + if (manifest.phase === "registration-staged") { + throw new RuntimeError("staged worktree removal physical state is inconsistent"); + } + if (manifest.phase === "physical-removal-started" + && physicalIdentity !== null) { + if (registrationIdentity !== null + || expectedPhysicalIdentity === null + || physicalQuarantineIdentity !== null) { + throw new RuntimeError("started worktree removal state is inconsistent"); + } + await assertRemovalRootsUnchanged(); + await rename(manifest.physicalPath, manifest.physicalQuarantinePath); + physicalIdentity = await managedWorktreeDirectoryIdentity(manifest.physicalPath); + physicalQuarantineIdentity = await managedWorktreeDirectoryIdentity( + manifest.physicalQuarantinePath, + ); + if (physicalIdentity !== null + || physicalQuarantineIdentity === null + || !sameManagedIdentity(physicalQuarantineIdentity, expectedPhysicalIdentity)) { + throw new RuntimeError("started worktree removal quarantine identity changed"); + } + await syncDirectory(physicalRoot); + await assertRemovalRootsUnchanged(); + } + if (physicalQuarantineIdentity !== null) { + if (registrationIdentity !== null || expectedPhysicalIdentity === null) { + throw new RuntimeError("quarantined worktree removal state is inconsistent"); + } + await removeQuarantinedDirectory( + physicalRoot, + manifest.physicalQuarantinePath, + expectedPhysicalIdentity, + { processSupervisor: platformServices }, + ); + physicalQuarantineIdentity = null; + } + if (registrationIdentity !== null) { + throw new RuntimeError("removed physical worktree retained a live registration"); + } + if (quarantineIdentity !== null) { + await removeQuarantinedDirectory( + quarantineRoot, + manifest.quarantinePath, + expectedRegistrationIdentity, + { processSupervisor: platformServices }, + ); + } + await syncRemovalRoots(); + await removeWorktreeRemovalManifest(manifestPath, manifest.transactionId); + } + }); + } catch (error) { + recoveryError = error; + } + + + if (recoveryError !== undefined) { + issues.push({ + manifestPath, + error: recoveryError, + ...(repositoryIdentity === undefined ? {} : { repositoryIdentity }), + }); + } + } + return issues; +} diff --git a/src/runtime/recovery-worktree-sweep.ts b/src/runtime/recovery-worktree-sweep.ts new file mode 100644 index 0000000..cefb742 --- /dev/null +++ b/src/runtime/recovery-worktree-sweep.ts @@ -0,0 +1,449 @@ +import { createHash } from "node:crypto"; +import { readdir, realpath } from "node:fs/promises"; +import path from "node:path"; +import { + workflowOwnershipRecordWorkflowId, + workflowWorktreeOwnershipClaim, + type WorkflowWorktreeOwnershipClaim, +} from "../autopilot/branch-manager.js"; +import type { AutopilotWorkflowState } from "../autopilot/types.js"; +import { TERMINAL_PHASES, WorkflowStore } from "../autopilot/workflow-store.js"; +import { git } from "../git/git-exec.js"; +import { gitPathOutput } from "../git/git-output.js"; +import { + managedWorktreeDirectoryIdentity, + type ManagedWorktreeDirectoryIdentity, +} from "./worktree-manager.js"; +import { + lockOwnerStatus, + type LockOwnerStatus, + type AcquiredLock, + type DeadLockReclaimResult, + reclaimDeadLock, + createOwnedLock, + releaseOwnedLock, +} from "../platform/lock-ownership.js"; +import { sameDirectoryIdentity } from "../platform/durable-directory.js"; +import { RuntimeError } from "../util/errors.js"; +import { + isManagedWorktreeNamespace, + isNamespaceControlEntry, + managedWorktreeRoots, +} from "./managed-worktree-root.js"; +import { + WORKFLOW_WORKTREE_NAME, + LEGACY_FINAL_WORKTREE_NAME, + WORKFLOW_OWNERSHIP_NAME, + type DirectoryIdentity, + type WorktreeSweepIssue, + assertPrivateRecoveryDirectory, + plainDirectoryIdentity, + runGitError, + worktreeSweepIssue, +} from "./recovery-shared.js"; +import { + managedWorktreeMarkerIsPresent, + removeManagedWorktreeUnderLease, + runClaimsWorktree, +} from "./recovery-runs.js"; +import { observeWorkflowLease } from "./recovery-autopilot.js"; + +const MALFORMED_WORKFLOW_OWNERSHIP = ""; + +async function workflowOwnershipRecords( + root: string, +): Promise> { + const ownershipRoot = path.join(root, "autopilot-branches"); + if (await plainDirectoryIdentity(ownershipRoot) === null) return new Map(); + const records = new Map(); + for (const entry of await readdir(ownershipRoot, { withFileTypes: true })) { + const match = WORKFLOW_OWNERSHIP_NAME.exec(entry.name); + if (match === null || !entry.isFile() || entry.isSymbolicLink()) { + throw new RuntimeError("workflow ownership directory contains a malformed entry"); + } + const ownershipPath = path.join(ownershipRoot, entry.name); + const filenamePrefix = match[1]!.slice(0, 32); + records.set(filenamePrefix, [...(records.get(filenamePrefix) ?? []), ownershipPath]); + let workflowId: string; + try { + workflowId = await workflowOwnershipRecordWorkflowId(ownershipPath); + } catch { + records.set(MALFORMED_WORKFLOW_OWNERSHIP, [ + ...(records.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []), + ownershipPath, + ]); + continue; + } + const expectedPrefix = createHash("sha256").update(workflowId).digest("hex").slice(0, 32); + if (expectedPrefix !== filenamePrefix) { + records.set(expectedPrefix, [...(records.get(expectedPrefix) ?? []), ownershipPath]); + } + const legacyPrefix = createHash("sha256") + .update(JSON.stringify(workflowId)).digest("hex").slice(0, 24); + records.set(`legacy:${legacyPrefix}`, [ + ...(records.get(`legacy:${legacyPrefix}`) ?? []), + ownershipPath, + ]); + } + return records; +} + +async function workflowClaimMustBePreserved( + root: string, + claim: WorkflowWorktreeOwnershipClaim, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + const store = new WorkflowStore(claim.workflowId, { + stateDirectory: root, + isProcessAlive, + getProcessStartToken, + }); + let state: AutopilotWorkflowState; + try { + state = await store.read(); + } catch { + return true; + } + if (!TERMINAL_PHASES.has(state.phase)) return true; + const branchOwnerStatus = !isProcessAlive(claim.bootstrapOwner.pid) + ? Promise.resolve("dead") + : claim.bootstrapOwner.processToken === null + ? Promise.resolve("unverifiable") + : lockOwnerStatus( + { + pid: claim.bootstrapOwner.pid, + processToken: claim.bootstrapOwner.processToken, + }, + isProcessAlive, + getProcessStartToken, + ).catch((): LockOwnerStatus => "unverifiable"); + const [workflowOwner, branchOwner] = await Promise.all([ + observeWorkflowLease(store, isProcessAlive, getProcessStartToken), + branchOwnerStatus, + ]); + return (workflowOwner.presence === "present" && workflowOwner.status !== "dead") + || branchOwner !== "dead"; +} + +async function finalMaterializationMustBePreserved( + root: string, + claim: WorkflowWorktreeOwnershipClaim, + isProcessAlive: (pid: number) => boolean, + getProcessStartToken: (pid: number) => Promise, +): Promise { + const store = new WorkflowStore(claim.workflowId, { + stateDirectory: root, + isProcessAlive, + getProcessStartToken, + }); + try { + await store.read(); + const owner = await observeWorkflowLease(store, isProcessAlive, getProcessStartToken); + return owner.presence === "present" && owner.status !== "dead"; + } catch { + return true; + } +} + +interface OrphanSweepArgs { + root: string; + locksRoot: string; + claimedRunIds: ReadonlySet; + claimedWorkflowPrefixes: ReadonlySet; + ownerContents: Buffer; + isProcessAlive: (pid: number) => boolean; + getProcessStartToken: (pid: number) => Promise; + runGit: typeof git; +} + +export async function sweepOrphanWorktrees(args: OrphanSweepArgs): Promise { + const { roots, malformed } = await managedWorktreeRoots(); + const issues = malformed.map(record => worktreeSweepIssue( + record, + new RuntimeError("managed worktree root record is malformed"), + )); + const legacyRoot = path.join(args.root, "worktrees"); + for (const worktreesRoot of [legacyRoot, ...roots.filter(isManagedWorktreeNamespace)]) { + issues.push(...await sweepOrphanWorktreeRoot(args, worktreesRoot, worktreesRoot === legacyRoot)); + } + return issues; +} + +/** + * The legacy root sits in the private state directory, so both levels must be + * private. A checkout namespace sits in the user's shared `.worktrees/`; only + * the namespace itself is private, and its parent is bound by identity alone. + */ +async function sweepRootParentIdentity( + worktreesRoot: string, + legacy: boolean, +): Promise { + const parent = path.dirname(worktreesRoot); + if (legacy) return await assertPrivateRecoveryDirectory(parent); + const identity = await plainDirectoryIdentity(parent); + if (identity === null) throw new RuntimeError("checkout worktrees directory disappeared"); + return identity; +} + +async function sweepOrphanWorktreeRoot( + args: OrphanSweepArgs, + worktreesRoot: string, + legacy: boolean, +): Promise { + const issues: WorktreeSweepIssue[] = []; + let entries; + let stateRootIdentity: DirectoryIdentity; + let worktreesRootIdentity: DirectoryIdentity; + try { + if (await plainDirectoryIdentity(worktreesRoot) === null) return issues; + [stateRootIdentity, worktreesRootIdentity] = await Promise.all([ + sweepRootParentIdentity(worktreesRoot, legacy), + assertPrivateRecoveryDirectory(worktreesRoot), + ]); + entries = (await readdir(worktreesRoot, { withFileTypes: true })) + .filter(entry => legacy || !isNamespaceControlEntry(entry.name)); + const [settledStateRoot, settledWorktreesRoot] = await Promise.all([ + plainDirectoryIdentity(path.dirname(worktreesRoot)), + plainDirectoryIdentity(worktreesRoot), + ]); + if (settledStateRoot === null + || settledWorktreesRoot === null + || !sameDirectoryIdentity(settledStateRoot, stateRootIdentity) + || !sameDirectoryIdentity(settledWorktreesRoot, worktreesRootIdentity)) { + throw new RuntimeError("managed worktree namespace identity changed during sweep setup"); + } + } catch (error) { + return [worktreeSweepIssue(worktreesRoot, error)]; + } + + let ownershipRecords = new Map(); + let ownershipLookupError: unknown; + try { + ownershipRecords = await workflowOwnershipRecords(args.root); + } catch (error) { + ownershipLookupError = error; + } + for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) { + const worktreePath = path.join(worktreesRoot, entry.name); + if (!entry.isDirectory() || entry.isSymbolicLink()) { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError("managed worktree namespace contains a non-directory entry"), + )); + continue; + } + let expectedIdentity: ManagedWorktreeDirectoryIdentity; + try { + const identity = await managedWorktreeDirectoryIdentity(worktreePath); + if (identity === null) continue; + expectedIdentity = identity; + } catch (error) { + issues.push(worktreeSweepIssue(worktreePath, error)); + continue; + } + + if ([...args.claimedRunIds].some(runId => runClaimsWorktree(runId, entry.name))) continue; + + try { + if (!await managedWorktreeMarkerIsPresent(worktreePath)) { + throw new RuntimeError("orphan worktree repository marker is missing"); + } + } catch (error) { + issues.push(worktreeSweepIssue(worktreePath, error)); + continue; + } + + const workflowMatch = WORKFLOW_WORKTREE_NAME.exec(entry.name); + const legacyFinalMatch = LEGACY_FINAL_WORKTREE_NAME.exec(entry.name); + const finalMaterialization = legacyFinalMatch !== null + || (workflowMatch !== null && entry.name.endsWith("-final")); + const workflowOwnershipKey = workflowMatch?.[1] + ?? (legacyFinalMatch === null ? null : `legacy:${legacyFinalMatch[1]}`); + if (workflowMatch !== null + && !finalMaterialization + && args.claimedWorkflowPrefixes.has(workflowMatch[1]!)) continue; + if (workflowOwnershipKey !== null) { + if (ownershipLookupError !== undefined) { + issues.push(worktreeSweepIssue(worktreePath, ownershipLookupError)); + continue; + } + const candidates = ownershipRecords.get(workflowOwnershipKey) ?? []; + const malformedRecords = ownershipRecords.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; + if (malformedRecords.length > 0) { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError("workflow ownership lookup is ambiguous because a record is malformed"), + )); + continue; + } + if (candidates.length > 1) { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError("workflow worktree ownership lookup is ambiguous"), + )); + continue; + } + if (candidates.length === 1) { + try { + const claim = await workflowWorktreeOwnershipClaim(candidates[0]!, worktreePath); + const preserve = finalMaterialization + ? await finalMaterializationMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken, + ) + : await workflowClaimMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken, + ); + if (preserve) continue; + } catch (error) { + issues.push(worktreeSweepIssue(worktreePath, error)); + continue; + } + } + } + + let commonDir: string; + try { + const resolved = await args.runGit(worktreePath, [ + "rev-parse", "--path-format=absolute", "--git-common-dir", + ]); + if (resolved.truncated?.stdout === true || resolved.truncated?.stderr === true) { + throw new RuntimeError("worktree repository lookup was truncated"); + } + if (resolved.exitCode !== 0) { + throw runGitError("resolve worktree repository", resolved); + } + const reportedCommonDir = gitPathOutput( + resolved.stdout, + "startup worktree common directory", + ); + if (!path.isAbsolute(reportedCommonDir)) { + throw new RuntimeError("worktree repository lookup returned a non-absolute path"); + } + commonDir = await realpath(reportedCommonDir); + } catch (error) { + issues.push(worktreeSweepIssue(worktreePath, error)); + continue; + } + + const lockKey = createHash("sha256").update(commonDir).digest("hex"); + let lease: AcquiredLock | null = null; + let contention: DeadLockReclaimResult | undefined; + try { + lease = await createOwnedLock( + path.join(args.locksRoot, `${lockKey}.lock`), + args.ownerContents, + ); + if (lease === null) { + contention = await reclaimDeadLock( + path.join(args.locksRoot, `${lockKey}.lock`), + args.isProcessAlive, + args.getProcessStartToken, + ); + if (contention === "reclaimed") { + lease = await createOwnedLock( + path.join(args.locksRoot, `${lockKey}.lock`), + args.ownerContents, + ); + } + } + } catch (error) { + issues.push(worktreeSweepIssue(worktreePath, error, commonDir)); + continue; + } + if (lease === null) { + if (contention === "malformed" || contention === "unverifiable") { + issues.push(worktreeSweepIssue( + worktreePath, + new RuntimeError(`${contention} checkout lease owner`), + commonDir, + )); + } + continue; + } + + let cleanupError: unknown; + try { + const currentIdentity = await managedWorktreeDirectoryIdentity(worktreePath); + if (currentIdentity !== null) { + if (currentIdentity.dev !== expectedIdentity.dev + || currentIdentity.ino !== expectedIdentity.ino + || currentIdentity.birthtimeNs !== expectedIdentity.birthtimeNs) { + throw new RuntimeError("worktree directory identity changed after lease acquisition"); + } + let workflowClaimed = false; + if (workflowOwnershipKey !== null) { + const refreshedOwnership = await workflowOwnershipRecords(args.root); + const refreshedCandidates = refreshedOwnership.get(workflowOwnershipKey) ?? []; + const refreshedMalformed = refreshedOwnership.get(MALFORMED_WORKFLOW_OWNERSHIP) ?? []; + if (refreshedMalformed.length > 0) { + throw new RuntimeError( + "workflow ownership lookup became ambiguous because a record is malformed", + ); + } + if (refreshedCandidates.length > 1) { + throw new RuntimeError("workflow worktree ownership lookup became ambiguous"); + } + if (refreshedCandidates.length === 1) { + const claim = await workflowWorktreeOwnershipClaim( + refreshedCandidates[0]!, + worktreePath, + ); + workflowClaimed = finalMaterialization + ? await finalMaterializationMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken, + ) + : await workflowClaimMustBePreserved( + args.root, + claim, + args.isProcessAlive, + args.getProcessStartToken, + ); + } + } + if (!workflowClaimed) { + const [currentStateRoot, currentWorktreesRoot] = await Promise.all([ + sweepRootParentIdentity(worktreesRoot, legacy), + assertPrivateRecoveryDirectory(worktreesRoot), + ]); + if (!sameDirectoryIdentity(currentStateRoot, stateRootIdentity) + || !sameDirectoryIdentity(currentWorktreesRoot, worktreesRootIdentity)) { + throw new RuntimeError("managed worktree namespace changed before orphan removal"); + } + await removeManagedWorktreeUnderLease( + commonDir, + worktreePath, + expectedIdentity, + args.runGit, + ); + } + } + } catch (error) { + cleanupError = error; + } + try { + await releaseOwnedLock(lease); + } catch (releaseError) { + cleanupError = cleanupError === undefined + ? releaseError + : new AggregateError( + [cleanupError, releaseError], + "worktree sweep failed and its checkout lease could not be released", + ); + } + if (cleanupError !== undefined) { + issues.push(worktreeSweepIssue(worktreePath, cleanupError, commonDir)); + } + } + + return issues; +} diff --git a/src/runtime/reproducibility.ts b/src/runtime/reproducibility.ts index 7e3752b..64d7546 100644 --- a/src/runtime/reproducibility.ts +++ b/src/runtime/reproducibility.ts @@ -1,7 +1,7 @@ import { readFile } from "node:fs/promises"; import { git, type GitResult } from "../git/git-exec.js"; import { RUNTIME_VERSION } from "../protocol/versions.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode } from "../util/errors.js"; import { redact } from "./redaction.js"; import type { PackagedVerifierInput, @@ -85,7 +85,7 @@ function defaultVerifierModuleUrls(): URL[] { } function isMissingModule(error: unknown): boolean { - const code = (error as NodeJS.ErrnoException).code; + const code = errorCode(error); return code === "ENOENT" || code === "ENOTDIR"; } diff --git a/src/runtime/review-snapshot.ts b/src/runtime/review-snapshot.ts index e73cea1..608e9c3 100644 --- a/src/runtime/review-snapshot.ts +++ b/src/runtime/review-snapshot.ts @@ -1,4 +1,6 @@ import { createHash } from "node:crypto"; +import { sanitizeReviewPatch } from "../git/candidate-tree.js"; +import { gitSucceeded, reviewDiffArgs } from "../git/checked-git.js"; import { git as runGit, type GitResult } from "../git/git-exec.js"; import { manifestHashOf } from "../git/changed-path-manifest.js"; import type { PlatformServices } from "../platform/platform-services.js"; @@ -272,21 +274,15 @@ export async function createReviewSnapshot(run: ReviewSnapshotRun): Promise ({ ...change })), evidence: boundEvidence(result.evidence), executedVerification: result.executedVerification.map(outcome => ({ diff --git a/src/runtime/run-decision.ts b/src/runtime/run-decision.ts index 409de16..05d687d 100644 --- a/src/runtime/run-decision.ts +++ b/src/runtime/run-decision.ts @@ -1,11 +1,13 @@ -import { createHash } from "node:crypto"; -import { type AttemptResult, type CandidateArtifact } from "../protocol/attempt-result.js"; +import { manifestHashOf } from "../git/changed-path-manifest.js"; +import { verificationInputPaths } from "../verify/verification-inputs.js"; +import { type AttemptResult } from "../protocol/attempt-result.js"; import { type CandidateDecision } from "../protocol/candidate-decision.js"; import { type PipelineGateCleared, parsePipelineGateCleared, } from "../protocol/pipeline-gate-cleared.js"; import type { PlatformServices } from "../platform/platform-services.js"; +import { SANDBOX_BACKENDS } from "../platform/sandbox/backends.js"; import { type DecisionAuthority, decisionAuthority, @@ -105,7 +107,11 @@ export class RunDecision { }) : Promise.resolve(null); const readSnapshot = typeof store.readReviewSnapshot === "function" - ? store.readReviewSnapshot().catch(() => null) + ? store.readReviewSnapshot().catch(err => { + // A malformed snapshot must not silently skip the evidence-hash check. + coherenceErrors.push(`failed to read review snapshot: ${err instanceof Error ? err.message : String(err)}`); + return null; + }) : Promise.resolve(null); const readGateRecord = typeof store.readPipelineGateCleared === "function" ? store.readPipelineGateCleared().catch(err => { @@ -155,9 +161,12 @@ export class RunDecision { if (manifest.candidateManifestHash !== result.candidate.manifestHash) { coherenceErrors.push("archived candidate manifest hash does not match run manifest"); } - const expectedHash = createHash("sha256") - .update(JSON.stringify(result.candidate.changedPaths)) - .digest("hex"); + let expectedHash: string | null; + try { + expectedHash = manifestHashOf(result.candidate.changedPaths); + } catch { + expectedHash = null; + } if (result.candidate.manifestHash !== expectedHash) { coherenceErrors.push("archived candidate changed paths hash mismatch"); } @@ -271,10 +280,25 @@ export class RunDecision { && snapshot.result.evidence?.pipelineGateCleared === undefined && snapshot.gateRecord === null; + // Unconfined verification ran Producer-authored code with the user's full + // authority; it could have rewritten the very archive being judged here. + if (verificationRanUnconfined(snapshot.manifest)) { + humanReasons.push("project verification ran without OS confinement on this platform"); + } + if (snapshot.gateRecordError) { humanReasons.push(snapshot.gateRecordError); } else if (isPlainDelegate) { - // Plain delegate is judged on verification result alone. + // With no independent review, verification is the only evidence, and it + // proves nothing when the candidate rewrote what verification checks. + const touched = verificationInputPaths( + snapshot.result.candidate.changedPaths.map(change => change.path), + ); + if (touched.length > 0) { + humanReasons.push( + `the candidate changes verification inputs: ${touched.slice(0, 10).join(", ")}`, + ); + } } else if (snapshot.gateRecord === null) { humanReasons.push("the pipeline gate clearance record is missing"); } else if (snapshot.gateRecord.requiresHumanDecision === true) { @@ -294,6 +318,24 @@ export class RunDecision { } } +/** Only a known OS backend counts; an unknown or redacted label is unconfined. */ +const OS_CONFINEMENT: ReadonlySet = new Set( + SANDBOX_BACKENDS.filter(backend => backend.kind === "os").map(backend => backend.id), +); + +function verificationRanUnconfined(manifest: RunManifest): boolean { + const policy = isRecord(manifest.effectivePolicy) + ? manifest.effectivePolicy.verificationPolicy + : undefined; + // A missing record is unknowable, so it fails closed. An empty one means no + // project command executed, so nothing ran outside confinement. + if (!Array.isArray(policy)) return true; + return policy.some(command => + !isRecord(command) + || (command.skipped !== true + && !(typeof command.confinement === "string" && OS_CONFINEMENT.has(command.confinement)))); +} + export const runDecision = new RunDecision(); export async function readRunDecisionSnapshot( diff --git a/src/runtime/run-start.ts b/src/runtime/run-start.ts index d8a8ecc..c824023 100644 --- a/src/runtime/run-start.ts +++ b/src/runtime/run-start.ts @@ -18,6 +18,7 @@ import type { } from "../platform/platform-services.js"; import { RuntimeError } from "../util/errors.js"; import type { ArtifactStore } from "./artifact-store.js"; +import { flushDirectory } from "../platform/durable-directory.js"; const NO_FOLLOW = constants.O_NOFOLLOW ?? 0; @@ -48,10 +49,6 @@ export interface RunStartContext { record: RunStartRecord; } -function errorCode(error: unknown): string | undefined { - return (error as NodeJS.ErrnoException).code; -} - export async function resolveWatchdogPath(): Promise { // Source layout: src/runtime/ → ../../runtime/. // Bundled layout: runtime/server.mjs → ./. @@ -108,20 +105,6 @@ function assertDirectoryIdentity(target: RunStartTarget): Promise { }); } -async function syncDirectory(directory: string): Promise { - let handle; - try { - handle = await open(directory, constants.O_RDONLY | NO_FOLLOW); - await handle.sync(); - } catch (error) { - const unsupportedOnWindows = process.platform === "win32" - && ["EISDIR", "EINVAL", "ENOTSUP", "EPERM"].includes(errorCode(error) ?? ""); - if (!unsupportedOnWindows) throw error; - } finally { - await handle?.close(); - } -} - export async function writeRunStart( target: RunStartTarget, record: RunStartRecord, @@ -142,7 +125,7 @@ export async function writeRunStart( } finally { await handle.close(); } - await syncDirectory(target.canonicalDirectory); + await flushDirectory(target.canonicalDirectory); await assertDirectoryIdentity(target); return; } @@ -167,7 +150,7 @@ export async function writeRunStart( await assertDirectoryIdentity(target); await rename(temporaryPath, destination); created = false; - await syncDirectory(target.canonicalDirectory); + await flushDirectory(target.canonicalDirectory); await assertDirectoryIdentity(target); } finally { await handle?.close(); diff --git a/src/runtime/run-status.ts b/src/runtime/run-status.ts index c047505..8a66936 100644 --- a/src/runtime/run-status.ts +++ b/src/runtime/run-status.ts @@ -82,7 +82,6 @@ export async function transitionRunStatusSafely( export class StatusEmitter { private lastPhase: RunStatusPhase | null = null; - private pendingEphemeral: string | null = null; constructor( private readonly store: RunStatusTransitionStore, @@ -107,7 +106,6 @@ export class StatusEmitter { >> = {}, ): Promise { this.lastPhase = phase; - this.pendingEphemeral = null; await transitionRunStatusSafely(this.store, this.runId, phase, fields); } @@ -116,7 +114,6 @@ export class StatusEmitter { * Coalesced and dispatched to progress listeners without blocking on disk. */ async ephemeral(detail: string): Promise { - this.pendingEphemeral = detail; this.onProgress?.(detail); } } diff --git a/src/runtime/worktree-manager.ts b/src/runtime/worktree-manager.ts index 9bd1d43..1054a1c 100644 --- a/src/runtime/worktree-manager.ts +++ b/src/runtime/worktree-manager.ts @@ -11,6 +11,11 @@ import { getPlatformServices } from "../platform/select-platform.js"; import { PlatformSafety } from "../platform/platform-safety.js"; import { boundedRedactedDiagnostic, redact } from "./redaction.js"; import { resolveStateDir } from "./state-dir.js"; +import { + isManagedWorktreeRoot, + prepareManagedWorktreeRoot as prepareCheckoutWorktreeRoot, + repositoryNamespaceRoot, +} from "./managed-worktree-root.js"; import { coordinateWorktreeRemoval, type StagedWorktreeRegistration, @@ -28,11 +33,17 @@ import { syncDirectoryMetadata, syncDirectoryTreeMetadata, } from "../platform/durable-directory.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode } from "../util/errors.js"; import { logger } from "../util/logger.js"; import { platformPathsEqual } from "../util/platform-path.js"; import { readStableRegularFile } from "../util/stable-file.js"; -import { git, type GitResult } from "../git/git-exec.js"; +import { + git, + type GitResult, + pinnedWorktreeGitDirectory, + pinWorktreeGitDirectory, + unpinWorktreeGitDirectory, +} from "../git/git-exec.js"; import { gitNulRecords, gitPathOutput } from "../git/git-output.js"; import { canonicalizeWorktreePath, @@ -73,12 +84,6 @@ function delay(milliseconds: number): Promise { return new Promise(resolve => setTimeout(resolve, milliseconds)); } -function errorCode(error: unknown): string | undefined { - return typeof error === "object" && error !== null && "code" in error - ? String(error.code) - : undefined; -} - async function syncChangedDirectories( dependencies: WorktreeManagerDependencies, ...directories: string[] @@ -210,15 +215,7 @@ export async function removeQuarantinedDirectory( } async function managedPath(worktreePath: string): Promise<{ root: string; target: string }> { - const root = path.resolve(resolveStateDir(), "worktrees"); const target = path.resolve(worktreePath); - let canonicalRoot: string; - try { - canonicalRoot = await realpath(root); - } catch (error) { - if (errorCode(error) !== "ENOENT") throw error; - canonicalRoot = path.join(await realpath(path.dirname(root)), path.basename(root)); - } let canonicalTarget: string; try { canonicalTarget = await canonicalizeWorktreePath(target, true); @@ -231,8 +228,9 @@ async function managedPath(worktreePath: string): Promise<{ root: string; target path.basename(target), ); } + const canonicalRoot = path.dirname(canonicalTarget); if (platformPathsEqual(canonicalTarget, canonicalRoot) - || !platformPathsEqual(path.dirname(canonicalTarget), canonicalRoot)) { + || !await isManagedWorktreeRoot(canonicalRoot)) { throw new RuntimeError("refusing to remove unmanaged worktree path"); } return { root: canonicalRoot, target: canonicalTarget }; @@ -508,7 +506,12 @@ async function worktreeRegistrationDirectory( worktreePath: string, runGit: typeof git, ): Promise { - const markerRegistrationPath = await worktreeMarkerRegistrationPath(worktreePath); + // A pinned worktree's registration was proven before any Producer ran; its + // `.git` pointer is Producer-writable and may be missing or rewritten. + const pinned = pinnedWorktreeGitDirectory(worktreePath); + const markerRegistrationPath = pinned === undefined + ? await worktreeMarkerRegistrationPath(worktreePath) + : path.resolve(pinned.gitDir); const commonResult = await runGit(repoRoot, [ "rev-parse", "--path-format=absolute", "--git-common-dir", ]); @@ -577,8 +580,15 @@ async function worktreeRegistrationDirectory( contents.toString("utf8"), "worktree registration backlink", ); + const expectedBacklink = pinned === undefined + ? await realpath(path.join(worktreePath, ".git")) + : path.join(await canonicalizeWorktreePath(worktreePath, true), ".git"); + const actualBacklink = pinned === undefined + ? await realpath(backlink) + : path.join(await canonicalizeWorktreePath(path.dirname(backlink), true), ".git"); if (!path.isAbsolute(backlink) - || await realpath(backlink) !== await realpath(path.join(worktreePath, ".git"))) { + || path.basename(backlink) !== ".git" + || !platformPathsEqual(actualBacklink, expectedBacklink)) { throw new RuntimeError("worktree registration backlink does not match the managed path"); } return { @@ -1254,13 +1264,21 @@ export class WorktreeManager { } + private namespaceRoot: string | undefined; + + private async managedRoot(): Promise { + // A read-only lookup of where the namespace lives; every mutating Git + // call still goes through the injectable runner after validation. + this.namespaceRoot ??= await repositoryNamespaceRoot(this.repoRoot, git); + return this.namespaceRoot; + } + private managedWorktreePath( - stateRoot: string = path.resolve(resolveStateDir()), + worktreesRoot: string, ): { worktreesRoot: string; worktreePath: string } { if (!SAFE_MANAGED_ID.test(this.runId)) { throw new RuntimeError("invalid worktree run id"); } - const worktreesRoot = path.resolve(stateRoot, "worktrees"); const worktreePath = path.resolve(worktreesRoot, this.runId); if (worktreePath === worktreesRoot || !worktreePath.startsWith(`${worktreesRoot}${path.sep}`)) { throw new RuntimeError("invalid worktree run id"); @@ -1270,9 +1288,9 @@ export class WorktreeManager { private async prepareManagedWorktreeRoot() { await verifyBoundDirectoryCleanupSupport(this.lockingPlatformServices()); - const configuredStateRoot = path.resolve(resolveStateDir()); const syncDirectory = this.dependencies.syncDirectory ?? syncDirectoryMetadata; - const stateRootIdentity = await ensurePrivateDirectory(configuredStateRoot, { + // Removal manifests and root records live in the private state directory. + await ensurePrivateDirectory(path.resolve(resolveStateDir()), { description: "runtime state root", migratePermissions: true, syncDirectory, @@ -1280,23 +1298,13 @@ export class WorktreeManager { ? {} : { platformServices: this.dependencies.processSupervisor }), }); - const stateRoot = await realpath(configuredStateRoot); - await assertDirectoryIdentity(stateRoot, stateRootIdentity, "runtime state root"); - const { worktreesRoot, worktreePath } = this.managedWorktreePath(stateRoot); - const worktreesRootIdentity = await ensurePrivateDirectory(worktreesRoot, { - description: "managed worktree root", - migratePermissions: true, + const { worktreesRoot, worktreePath } = this.managedWorktreePath(await this.managedRoot()); + const worktreesRootIdentity = await prepareCheckoutWorktreeRoot(worktreesRoot, { syncDirectory, - ...(this.dependencies.processSupervisor === undefined - ? {} - : { platformServices: this.dependencies.processSupervisor }), }); await (this.dependencies.verifyRemovalStorage ?? verifyWorktreeRemovalManifestStorage)(); - await Promise.all([ - assertDirectoryIdentity(stateRoot, stateRootIdentity, "runtime state root"), - assertDirectoryIdentity(worktreesRoot, worktreesRootIdentity, "managed worktree root"), - ]); + await assertDirectoryIdentity(worktreesRoot, worktreesRootIdentity, "managed worktree root"); return { worktreesRoot, worktreePath, @@ -1539,7 +1547,7 @@ export class WorktreeManager { rootIdentity: ManagedWorktreeDirectoryIdentity, identity: ManagedWorktreeDirectoryIdentity, runGit: typeof git, - ): Promise { + ): Promise { const registration = await worktreeRegistrationDirectory( this.repoRoot, worktreePath, @@ -1563,6 +1571,7 @@ export class WorktreeManager { "created Git registration", ), ]); + return registration; } private async finishCreatedWorktree( @@ -1627,8 +1636,9 @@ export class WorktreeManager { new RuntimeError("created worktree replaced its durable placeholder"), ); } + let registration: WorktreeRegistrationDirectory; try { - await this.syncCreatedWorktree( + registration = await this.syncCreatedWorktree( worktreePath, worktreesRoot, rootIdentity, @@ -1658,6 +1668,10 @@ export class WorktreeManager { rootIdentity, identity, ); + pinWorktreeGitDirectory(worktreePath, { + gitDir: registration.path, + commonDir: registration.commonDir, + }); await removeWorktreeRemovalManifest(creation.manifestPath, creation.transactionId); return created; } @@ -1704,8 +1718,9 @@ export class WorktreeManager { new RuntimeError("created worktree replaced its durable placeholder"), ); } + let registration: WorktreeRegistrationDirectory; try { - await this.syncCreatedWorktree( + registration = await this.syncCreatedWorktree( worktreePath, worktreesRoot, rootIdentity, @@ -1735,6 +1750,10 @@ export class WorktreeManager { rootIdentity, identity, ); + pinWorktreeGitDirectory(worktreePath, { + gitDir: registration.path, + commonDir: registration.commonDir, + }); await removeWorktreeRemovalManifest(creation.manifestPath, creation.transactionId); return created; } @@ -1743,18 +1762,15 @@ export class WorktreeManager { worktreePath: string, expectedIdentity?: ManagedWorktreeDirectoryIdentity, ): Promise { - const expectedWorktreePath = this.managedWorktreePath().worktreePath; + const managedRoot = await this.managedRoot(); + const expectedWorktreePath = this.managedWorktreePath(managedRoot).worktreePath; const canonicalWorktreePath = await canonicalizeWorktreePath(worktreePath, true); let canonicalExpectedPath: string; try { canonicalExpectedPath = await canonicalizeWorktreePath(expectedWorktreePath, true); } catch (error) { if (errorCode(error) !== "ENOENT") throw error; - canonicalExpectedPath = path.join( - await realpath(path.resolve(resolveStateDir())), - "worktrees", - path.basename(expectedWorktreePath), - ); + canonicalExpectedPath = path.join(managedRoot, path.basename(expectedWorktreePath)); } if (!platformPathsEqual(canonicalWorktreePath, canonicalExpectedPath)) { throw new RuntimeError("refusing to remove unmanaged worktree path"); @@ -1789,6 +1805,7 @@ export class WorktreeManager { ): Promise { await this.withCheckoutLease(async () => await this.removeUnderLease(worktreePath, expectedIdentity)); + unpinWorktreeGitDirectory(worktreePath); } } diff --git a/src/runtime/worktree-removal-manifest.ts b/src/runtime/worktree-removal-manifest.ts index 5c64f71..1770ea1 100644 --- a/src/runtime/worktree-removal-manifest.ts +++ b/src/runtime/worktree-removal-manifest.ts @@ -15,7 +15,7 @@ import { ensurePrivateDirectory as ensurePlatformPrivateDirectory, syncDirectoryMetadata, } from "../platform/durable-directory.js"; -import { RuntimeError } from "../util/errors.js"; +import { RuntimeError, errorCode } from "../util/errors.js"; import { platformPathsEqual } from "../util/platform-path.js"; import { readStableRegularFile } from "../util/stable-file.js"; import { resolveStateDir } from "./state-dir.js"; @@ -91,12 +91,6 @@ function sameIdentity( && metadata.birthtimeNs === expected.birthtimeNs; } -function errorCode(error: unknown): string | undefined { - return typeof error === "object" && error !== null && "code" in error - ? String(error.code) - : undefined; -} - function manifestRoot(): string { return path.join(resolveStateDir(), MANIFEST_DIRECTORY); } diff --git a/src/ship/github-cli-adapter.ts b/src/ship/github-cli-adapter.ts deleted file mode 100644 index b9fa7b3..0000000 --- a/src/ship/github-cli-adapter.ts +++ /dev/null @@ -1,1112 +0,0 @@ -import { chmod, rm } from "node:fs/promises"; -import path from "node:path"; -import type { PlatformServices, SupervisedExit } from "../platform/platform-services.js"; -import { supervise } from "../platform/process-supervisor.js"; -import { getPlatformServices } from "../platform/select-platform.js"; -import type { - ChecksRequest, - DraftPullRequestRequest, - HostingAdapter, - HostingPreflight, - HostingTarget, - MarkReadyRequest, - PullRequestIdentity, - PushRequest, - RequiredCheck, - RequiredChecksResult, -} from "./hosting-adapter.js"; - -const MINIMUM_GH_VERSION = [2, 96, 0] as const; -const OID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/u; -const REPOSITORY_COMPONENT = /^[A-Za-z0-9_.-]+$/u; -const MAX_OUTPUT_BYTES = 1_000_000; -const COMMAND_TIMEOUT_MS = 60_000; -const CREDENTIAL_HELPER_ARGS = [ - "-c", "credential.helper=", - "-c", "credential.helper=!gh auth git-credential", -] as const; - -export type HostingAdapterErrorClassification = - | "cancelled" - | "preflight-gh-unavailable" - | "preflight-gh-version-invalid" - | "preflight-gh-version-unsupported" - | "preflight-auth-failed" - | "preflight-repository-query-failed" - | "preflight-repository-response-invalid" - | "preflight-repository-url-invalid" - | "preflight-repository-identity-mismatch" - | "push-request-invalid" - | "push-quarantine-create-failed" - | "push-quarantine-init-failed" - | "push-bundle-create-failed" - | "push-bundle-import-failed" - | "push-imported-oid-mismatch" - | "push-remote-precheck-failed" - | "push-remote-response-invalid" - | "push-remote-head-mismatch" - | "push-command-failed" - | "push-quarantine-cleanup-failed" - | "draft-pull-request-request-invalid" - | "draft-pull-request-list-failed" - | "draft-pull-request-response-invalid" - | "draft-pull-request-identity-mismatch" - | "draft-pull-request-head-mismatch" - | "draft-pull-request-ambiguous" - | "draft-pull-request-create-failed" - | "required-checks-request-invalid" - | "required-checks-identity-not-established" - | "required-checks-identity-query-failed" - | "required-checks-identity-response-invalid" - | "required-checks-identity-mismatch" - | "required-checks-head-mismatch" - | "required-checks-command-failed" - | "required-checks-response-invalid" - | "mark-ready-request-invalid" - | "mark-ready-identity-not-established" - | "mark-ready-identity-query-failed" - | "mark-ready-identity-response-invalid" - | "mark-ready-identity-mismatch" - | "mark-ready-checks-not-passed" - | "mark-ready-command-failed" - | "in-memory-preflight-not-configured" - | "in-memory-push-not-configured" - | "in-memory-draft-pull-request-not-configured" - | "in-memory-required-checks-not-configured" - | "in-memory-mark-ready-not-configured"; - -export class HostingAdapterError extends Error { - constructor( - readonly classification: HostingAdapterErrorClassification, - readonly primaryClassification?: HostingAdapterErrorClassification, - ) { - super(classification); - this.name = "HostingAdapterError"; - } -} - -interface HostingCommandRequest { - executable: "gh" | "git"; - args: string[]; - cwd: string; - env: Record; - timeoutMs: number; - maxOutputBytes: number; -} - -interface HostingCommandResult { - exitCode: number | null; - stdout: string; - stderr: string; - timedOut?: boolean; - cancelled?: boolean; - truncated?: { stdout: boolean; stderr: boolean }; - spawnError?: unknown; -} - -type HostingCommandRunner = ( - request: HostingCommandRequest, -) => Promise; - -export interface InMemoryHostingOperations { - preflight?: (request: HostingPreflight) => Promise; - pushBranch?: (request: PushRequest) => Promise<{ remoteHead: string }>; - ensureDraftPullRequest?: ( - request: DraftPullRequestRequest, - ) => Promise; - requiredChecks?: (request: ChecksRequest) => Promise; - markReady?: (request: MarkReadyRequest) => Promise; -} - -function fail(classification: HostingAdapterErrorClassification): never { - throw new HostingAdapterError(classification); -} - -function failCommand( - error: unknown, - classification: HostingAdapterErrorClassification, -): never { - if (error instanceof HostingAdapterError && error.classification === "cancelled") throw error; - fail(classification); -} - -function cleanExit(result: HostingCommandResult): boolean { - return result.exitCode === 0 - && result.timedOut !== true - && result.cancelled !== true - && result.spawnError === undefined - && result.truncated?.stdout !== true - && result.truncated?.stderr !== true; -} - -/** - * A cancelled command is not a substantive remote failure. `cleanExit` folds - * `cancelled` in with a non-zero exit, so an abort landing AFTER spawn used to - * surface as `push-command-failed`, `preflight-auth-failed`, and so on — while - * the `cancelled` classification was only ever produced by the pre-spawn signal - * checks. Autopilot's resume and terminal-state logic depends on that - * distinction, so make it here, before any other classification. - */ -function assertNotCancelled(result: HostingCommandResult): void { - if (result.cancelled === true) fail("cancelled"); -} - -function requireCleanExit( - result: HostingCommandResult, - classification: HostingAdapterErrorClassification, -): void { - assertNotCancelled(result); - if (!cleanExit(result)) fail(classification); -} - -function commandEnvironment(): Record { - const environment: Record = { - PATH: process.env.PATH ?? "", - GH_PROMPT_DISABLED: "1", - GIT_TERMINAL_PROMPT: "0", - }; - for (const name of [ - "HOME", - "XDG_CONFIG_HOME", - "GH_CONFIG_DIR", - "GH_TOKEN", - "GITHUB_TOKEN", - ] as const) { - const value = process.env[name]; - if (value !== undefined) environment[name] = value; - } - return environment; -} - -function githubCredentialEnvironment(): Record { - const environment: Record = {}; - for (const name of ["GH_TOKEN", "GITHUB_TOKEN"] as const) { - const value = process.env[name]; - if (value !== undefined) environment[name] = value; - } - if (process.env.GH_CONFIG_DIR !== undefined) { - environment.GH_CONFIG_DIR = process.env.GH_CONFIG_DIR; - } else if (process.platform === "win32" && process.env.APPDATA !== undefined) { - environment.GH_CONFIG_DIR = path.join(process.env.APPDATA, "GitHub CLI"); - } else if (process.env.XDG_CONFIG_HOME !== undefined) { - environment.GH_CONFIG_DIR = path.join(process.env.XDG_CONFIG_HOME, "gh"); - } else if (process.env.HOME !== undefined) { - environment.GH_CONFIG_DIR = path.join(process.env.HOME, ".config", "gh"); - } - return environment; -} - -function isolatedGitEnvironment( - repository: string, - withGithubCredentials = false, -): Record { - const nullDevice = process.platform === "win32" ? "NUL" : "/dev/null"; - return { - PATH: process.env.PATH ?? "", - GIT_CONFIG_GLOBAL: nullDevice, - GIT_CONFIG_SYSTEM: nullDevice, - GIT_CONFIG_NOSYSTEM: "1", - GIT_CONFIG_COUNT: "0", - GIT_CONFIG_PARAMETERS: "", - GIT_TERMINAL_PROMPT: "0", - HOME: repository, - XDG_CONFIG_HOME: repository, - ...(withGithubCredentials ? githubCredentialEnvironment() : {}), - }; -} - -function toCommandResult(exit: SupervisedExit): HostingCommandResult { - return { - exitCode: exit.exitCode, - stdout: exit.stdout, - stderr: exit.stderr, - timedOut: exit.timedOut, - cancelled: exit.cancelled, - truncated: { ...exit.truncated }, - ...(exit.spawnError === undefined ? {} : { spawnError: exit.spawnError }), - }; -} - -function createHostingCommandRunner( - platformServices: PlatformServices = getPlatformServices(), -): HostingCommandRunner { - return async request => { - const executable = await platformServices.resolveExecutable({ name: request.executable }); - const exit = await supervise(platformServices, { - executable, - args: request.args, - cwd: request.cwd, - env: request.env, - timeoutMs: request.timeoutMs, - maxOutputBytes: request.maxOutputBytes, - }, {}); - return toCommandResult(exit); - }; -} - -function parseVersion(output: string): readonly [number, number, number] | null { - const firstLine = output.split(/\r?\n/u, 1)[0] ?? ""; - const match = /^gh version (\d+)\.(\d+)\.(\d+)(?:\s|$)/u.exec(firstLine); - if (match === null) return null; - const parsed = match.slice(1).map(value => Number.parseInt(value, 10)); - if (parsed.some(value => !Number.isSafeInteger(value))) return null; - return [parsed[0]!, parsed[1]!, parsed[2]!]; -} - -function versionAtLeast( - actual: readonly [number, number, number], - minimum: readonly [number, number, number], -): boolean { - for (let index = 0; index < minimum.length; index += 1) { - if (actual[index]! > minimum[index]!) return true; - if (actual[index]! < minimum[index]!) return false; - } - return true; -} - -function canonicalRepository(value: string): string | null { - if (/[%\0\r\n]/u.test(value)) return null; - const components = value.split("/"); - if (components.length !== 2) return null; - if (components.some(component => !REPOSITORY_COMPONENT.test(component) - || component === "." - || component === "..")) return null; - return `${components[0]!.toLowerCase()}/${components[1]!.toLowerCase()}`; -} - -function canonicalGithubUrl(raw: string): { repository: string; url: string } | null { - if (/[\0\r\n]/u.test(raw)) return null; - let parsed: URL; - try { - parsed = new URL(raw); - } catch { - return null; - } - if (parsed.protocol !== "https:" - || parsed.hostname.toLowerCase() !== "github.com" - || parsed.port !== "" - || parsed.username !== "" - || parsed.password !== "" - || parsed.search !== "" - || parsed.hash !== "" - || parsed.pathname.includes("%") - || parsed.pathname.includes("//") - || parsed.pathname.endsWith("/")) return null; - const pathname = parsed.pathname.slice(1); - const withoutSuffix = pathname.endsWith(".git") ? pathname.slice(0, -4) : pathname; - const repository = canonicalRepository(withoutSuffix); - if (repository === null) return null; - return { repository, url: `https://github.com/${repository}.git` }; -} - -function validBranch(branch: string): boolean { - if (branch.length < 1 - || branch.length > 240 - || branch.startsWith("-") - || branch.startsWith("/") - || branch.endsWith("/") - || branch.endsWith(".") - || branch === "@" - || branch.includes("..") - || branch.includes("@{") - || branch.includes("//")) return false; - return !/[\0-\x20\x7f~^:?*[\\]/u.test(branch) - && branch.split("/").every(component => component !== "" - && !component.startsWith(".") - && !component.endsWith(".lock")); -} - -function validCheckoutPath(checkoutPath: string): boolean { - return checkoutPath.length > 0 && !/[\0\r\n]/u.test(checkoutPath); -} - -function validTarget(target: HostingTarget): boolean { - const repository = canonicalRepository(target.repository); - const url = canonicalGithubUrl(target.canonicalHttpsUrl); - return target.provider === "github" - && repository !== null - && target.repository === repository - && url !== null - && url.repository === repository - && url.url === target.canonicalHttpsUrl; -} - -function parseRemoteHead(output: string, branchRef: string): string | null | undefined { - if (output === "") return null; - const lines = output.split("\n").filter(line => line !== ""); - if (lines.length !== 1) return undefined; - const match = /^(\S+)\t(\S+)$/u.exec(lines[0]!); - if (match === null || !OID.test(match[1]!) || match[2] !== branchRef) return undefined; - return match[1]!; -} - -function parseBundledHead(output: string, branchRef: string): string | undefined { - const lines = output.split(/\r?\n/u).filter(line => line !== ""); - if (lines.length !== 1) return undefined; - const match = /^(\S+) (\S+)$/u.exec(lines[0]!); - if (match === null || !OID.test(match[1]!) || match[2] !== branchRef) return undefined; - return match[1]!; -} - -const PR_JSON_FIELDS = "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft"; -const CHECK_JSON_FIELDS = "bucket,name,state,link"; -const MAX_TITLE_BYTES = 256; -const MAX_BODY_BYTES = 65_536; -const MAX_CHECK_FIELD_BYTES = 4_096; - -function boundedOutput(result: HostingCommandResult): boolean { - return result.timedOut !== true - && result.cancelled !== true - && result.spawnError === undefined - && result.truncated?.stdout !== true - && result.truncated?.stderr !== true - && Buffer.byteLength(result.stdout, "utf8") <= MAX_OUTPUT_BYTES - && Buffer.byteLength(result.stderr, "utf8") <= MAX_OUTPUT_BYTES; -} - -function validPullRequestText(title: unknown, body: unknown): boolean { - if (typeof title !== "string" || typeof body !== "string") return false; - const titleBytes = Buffer.byteLength(title, "utf8"); - const bodyBytes = Buffer.byteLength(body, "utf8"); - return titleBytes > 0 - && titleBytes <= MAX_TITLE_BYTES - && bodyBytes <= MAX_BODY_BYTES - && !/[\u0000-\u001f\u007f-\u009f]/u.test(title) - && !/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/u.test(body); -} - -function validPullRequestNumber(value: number): boolean { - return Number.isSafeInteger(value) && value > 0; -} - -function parseJson(output: string): unknown | undefined { - if (Buffer.byteLength(output, "utf8") > MAX_OUTPUT_BYTES) return undefined; - try { - return JSON.parse(output) as unknown; - } catch { - return undefined; - } -} - -function pullRequestUrl(repository: string, number: number): string { - return `https://github.com/${repository}/pull/${number}`; -} - -function canonicalPullRequestUrl( - raw: string, - repository: string, - number: number, -): string | undefined { - if (/[\0\r\n%]/u.test(raw)) return undefined; - let parsed: URL; - try { - parsed = new URL(raw); - } catch { - return undefined; - } - const components = parsed.pathname.split("/"); - const urlRepository = canonicalRepository(`${components[1] ?? ""}/${components[2] ?? ""}`); - if (parsed.protocol !== "https:" - || parsed.hostname.toLowerCase() !== "github.com" - || parsed.port !== "" - || parsed.username !== "" - || parsed.password !== "" - || parsed.search !== "" - || parsed.hash !== "" - || components.length !== 5 - || components[3] !== "pull" - || components[4] !== String(number) - || urlRepository !== repository) return undefined; - return pullRequestUrl(repository, number); -} - -function parsePullRequestIdentity( - value: unknown, - target: HostingTarget, -): PullRequestIdentity | undefined { - if (typeof value !== "object" || value === null || Array.isArray(value)) return undefined; - const record = value as Record; - if (typeof record.number !== "number" - || !validPullRequestNumber(record.number) - || typeof record.url !== "string" - || typeof record.baseRefName !== "string" - || typeof record.headRefName !== "string" - || typeof record.headRefOid !== "string" - || typeof record.isDraft !== "boolean" - || typeof record.headRepository !== "object" - || record.headRepository === null - || Array.isArray(record.headRepository)) return undefined; - const headRepository = record.headRepository as Record; - if (typeof headRepository.nameWithOwner !== "string") return undefined; - const repository = canonicalRepository(headRepository.nameWithOwner); - const url = canonicalPullRequestUrl(record.url, target.repository, record.number); - if (repository === null - || repository !== target.repository - || url === undefined - || !validBranch(record.baseRefName) - || !validBranch(record.headRefName) - || !OID.test(record.headRefOid)) return undefined; - return { - number: record.number, - url, - repository, - baseBranch: record.baseRefName, - headBranch: record.headRefName, - headCommitOid: record.headRefOid, - draft: record.isDraft, - }; -} - -function samePullRequestIdentity( - actual: PullRequestIdentity, - expected: PullRequestIdentity, -): boolean { - return actual.number === expected.number - && actual.url === expected.url - && actual.repository === expected.repository - && actual.baseBranch === expected.baseBranch - && actual.headBranch === expected.headBranch - && actual.headCommitOid === expected.headCommitOid - && actual.draft === expected.draft; -} - -function pullRequestKey(repository: string, number: number): string { - return `${repository}#${number}`; -} - -function parseCreatedPullRequestNumber(output: string, repository: string): number | undefined { - const trimmed = output.endsWith("\r\n") - ? output.slice(0, -2) - : output.endsWith("\n") - ? output.slice(0, -1) - : output; - const prefix = `https://github.com/${repository}/pull/`; - if (!trimmed.startsWith(prefix) || trimmed.includes("\n") || trimmed.includes("\r")) { - return undefined; - } - const numberText = trimmed.slice(prefix.length); - if (!/^[1-9]\d*$/u.test(numberText)) return undefined; - const number = Number(numberText); - return validPullRequestNumber(number) ? number : undefined; -} - -function validCheckField(value: string): boolean { - return Buffer.byteLength(value, "utf8") <= MAX_CHECK_FIELD_BYTES - && !/[\u0000-\u001f\u007f-\u009f]/u.test(value); -} - -function parseRequiredChecks(output: string): RequiredCheck[] | undefined { - const parsed = parseJson(output); - if (!Array.isArray(parsed)) return undefined; - const checks: RequiredCheck[] = []; - for (const value of parsed) { - if (typeof value !== "object" || value === null || Array.isArray(value)) return undefined; - const record = value as Record; - if (Object.keys(record).some(key => !["bucket", "name", "state", "link"].includes(key)) - || typeof record.bucket !== "string" - || !["pass", "pending", "fail", "cancel", "skipping"].includes(record.bucket) - || typeof record.name !== "string" - || record.name.length === 0 - || !validCheckField(record.name) - || typeof record.state !== "string" - || record.state.length === 0 - || !validCheckField(record.state) - || !validCheckState(record.bucket, record.state) - || (record.link !== null && typeof record.link !== "string") - || (typeof record.link === "string" && !validCheckField(record.link))) return undefined; - checks.push({ - bucket: record.bucket as RequiredCheck["bucket"], - name: record.name, - state: record.state, - link: record.link as string | null, - }); - } - return checks; -} - -function validCheckState(bucket: string, state: string): boolean { - switch (bucket) { - case "pass": - return state === "SUCCESS"; - case "pending": - return ["EXPECTED", "IN_PROGRESS", "PENDING", "QUEUED", "REQUESTED", "WAITING"] - .includes(state); - case "fail": - return [ - "ACTION_REQUIRED", - "ERROR", - "FAILURE", - "STALE", - "STARTUP_FAILURE", - "TIMED_OUT", - ].includes(state); - case "cancel": - return state === "CANCELLED"; - case "skipping": - return ["NEUTRAL", "SKIPPED"].includes(state); - default: - return false; - } -} - -export class GitHubCliAdapter implements HostingAdapter { - private readonly runner: HostingCommandRunner; - private readonly platformServices: PlatformServices; - private readonly pullRequests = new Map(); - - constructor() { - this.platformServices = getPlatformServices(); - this.runner = createHostingCommandRunner(this.platformServices); - } - - private run( - executable: "gh" | "git", - args: string[], - cwd: string, - env: Record, - signal?: AbortSignal, - ): Promise { - if (signal?.aborted) fail("cancelled"); - return this.runner({ - executable, - args, - cwd, - env, - timeoutMs: COMMAND_TIMEOUT_MS, - maxOutputBytes: MAX_OUTPUT_BYTES, - }); - } - - async preflight(request: HostingPreflight): Promise { - if (!validCheckoutPath(request.checkoutPath) - || (request.expectedRepository !== undefined - && canonicalRepository(request.expectedRepository) === null)) { - fail("preflight-repository-identity-mismatch"); - } - if (request.signal?.aborted) fail("cancelled"); - - let version: HostingCommandResult; - try { - version = await this.run( - "gh", ["version"], request.checkoutPath, commandEnvironment(), request.signal, - ); - } catch (error) { - failCommand(error, "preflight-gh-unavailable"); - } - requireCleanExit(version, "preflight-gh-unavailable"); - const parsedVersion = parseVersion(version.stdout); - if (parsedVersion === null) fail("preflight-gh-version-invalid"); - if (!versionAtLeast(parsedVersion, MINIMUM_GH_VERSION)) { - fail("preflight-gh-version-unsupported"); - } - - let auth: HostingCommandResult; - try { - auth = await this.run( - "gh", - ["auth", "status", "--hostname", "github.com"], - request.checkoutPath, - commandEnvironment(), - request.signal, - ); - } catch (error) { - failCommand(error, "preflight-auth-failed"); - } - requireCleanExit(auth, "preflight-auth-failed"); - - let repositoryView: HostingCommandResult; - try { - repositoryView = await this.run( - "gh", - ["repo", "view", "--json", "nameWithOwner,url"], - request.checkoutPath, - commandEnvironment(), - request.signal, - ); - } catch (error) { - failCommand(error, "preflight-repository-query-failed"); - } - requireCleanExit(repositoryView, "preflight-repository-query-failed"); - - let parsed: unknown; - try { - parsed = JSON.parse(repositoryView.stdout); - } catch { - fail("preflight-repository-response-invalid"); - } - if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) { - fail("preflight-repository-response-invalid"); - } - const record = parsed as Record; - if (Object.keys(record).some(key => key !== "nameWithOwner" && key !== "url") - || typeof record.nameWithOwner !== "string" - || typeof record.url !== "string") { - fail("preflight-repository-response-invalid"); - } - const repository = canonicalRepository(record.nameWithOwner); - if (repository === null) fail("preflight-repository-response-invalid"); - const canonicalUrl = canonicalGithubUrl(record.url); - if (canonicalUrl === null) fail("preflight-repository-url-invalid"); - if (canonicalUrl.repository !== repository) fail("preflight-repository-identity-mismatch"); - if (request.expectedRepository !== undefined) { - const expected = canonicalRepository(request.expectedRepository); - if (expected === null || expected !== repository) { - fail("preflight-repository-identity-mismatch"); - } - } - return { - provider: "github", - repository, - canonicalHttpsUrl: canonicalUrl.url, - }; - } - - async pushBranch(request: PushRequest): Promise<{ remoteHead: string }> { - if (!validCheckoutPath(request.checkoutPath) - || !validTarget(request.target) - || !validBranch(request.branch) - || !OID.test(request.headCommitOid)) fail("push-request-invalid"); - if (request.signal?.aborted) fail("cancelled"); - - let quarantine: string | undefined; - try { - quarantine = await this.platformServices.createSecureTempDirectory(); - await chmod(quarantine, 0o700); - } catch { - if (quarantine !== undefined) { - try { - await rm(quarantine, { recursive: true }); - } catch { - throw new HostingAdapterError( - "push-quarantine-cleanup-failed", - "push-quarantine-create-failed", - ); - } - } - fail("push-quarantine-create-failed"); - } - const environment = isolatedGitEnvironment(quarantine); - const remoteEnvironment = isolatedGitEnvironment(quarantine, true); - const branchRef = `refs/heads/${request.branch}`; - const bundlePath = path.join(quarantine, "branch.bundle"); - let outcome: { remoteHead: string } | undefined; - let failure: HostingAdapterError | undefined; - - try { - let result = await this.run( - "git", - [ - "init", - "--bare", - "--quiet", - ...(request.headCommitOid.length === 64 ? ["--object-format=sha256"] : []), - ".", - ], - quarantine, - environment, - request.signal, - ); - requireCleanExit(result, "push-quarantine-init-failed"); - - result = await this.run( - "git", - ["bundle", "create", bundlePath, branchRef], - request.checkoutPath, - environment, - request.signal, - ); - requireCleanExit(result, "push-bundle-create-failed"); - - result = await this.run( - "git", - ["bundle", "unbundle", bundlePath], - quarantine, - environment, - request.signal, - ); - requireCleanExit(result, "push-bundle-import-failed"); - if (parseBundledHead(result.stdout, branchRef) !== request.headCommitOid) { - fail("push-imported-oid-mismatch"); - } - - result = await this.run( - "git", - ["rev-parse", "--verify", `${request.headCommitOid}^{commit}`], - quarantine, - environment, - request.signal, - ); - assertNotCancelled(result); - if (!cleanExit(result) || result.stdout.trim() !== request.headCommitOid) { - fail("push-imported-oid-mismatch"); - } - - result = await this.run( - "git", - ["update-ref", branchRef, request.headCommitOid, "0".repeat(request.headCommitOid.length)], - quarantine, - environment, - request.signal, - ); - requireCleanExit(result, "push-imported-oid-mismatch"); - - result = await this.run( - "git", - [...CREDENTIAL_HELPER_ARGS, "ls-remote", "--heads", request.target.canonicalHttpsUrl, branchRef], - quarantine, - remoteEnvironment, - request.signal, - ); - requireCleanExit(result, "push-remote-precheck-failed"); - const remoteHead = parseRemoteHead(result.stdout, branchRef); - if (remoteHead === undefined) fail("push-remote-response-invalid"); - if (remoteHead !== null && remoteHead !== request.headCommitOid) { - fail("push-remote-head-mismatch"); - } - if (remoteHead === request.headCommitOid) { - outcome = { remoteHead }; - } else { - result = await this.run( - "git", - [ - ...CREDENTIAL_HELPER_ARGS, - "push", - request.target.canonicalHttpsUrl, - `${branchRef}:${branchRef}`, - ], - quarantine, - remoteEnvironment, - request.signal, - ); - requireCleanExit(result, "push-command-failed"); - outcome = { remoteHead: request.headCommitOid }; - } - } catch (error) { - failure = error instanceof HostingAdapterError - ? error - : new HostingAdapterError("push-command-failed"); - } - - try { - await rm(quarantine, { recursive: true }); - } catch { - throw new HostingAdapterError("push-quarantine-cleanup-failed", failure?.classification); - } - if (failure !== undefined) throw failure; - return outcome!; - } - - async ensureDraftPullRequest( - request: DraftPullRequestRequest, - ): Promise { - if (!validCheckoutPath(request.checkoutPath) - || !validTarget(request.target) - || !validBranch(request.baseBranch) - || !validBranch(request.headBranch) - || !OID.test(request.headCommitOid) - || !validPullRequestText(request.title, request.body)) { - fail("draft-pull-request-request-invalid"); - } - if (request.signal?.aborted) fail("cancelled"); - - let listed: HostingCommandResult; - try { - listed = await this.run( - "gh", - [ - "pr", "list", - "--repo", request.target.repository, - "--base", request.baseBranch, - "--head", request.headBranch, - "--state", "open", - "--json", PR_JSON_FIELDS, - ], - request.checkoutPath, - commandEnvironment(), - request.signal, - ); - } catch (error) { - failCommand(error, "draft-pull-request-list-failed"); - } - assertNotCancelled(listed); - if (!cleanExit(listed) || !boundedOutput(listed)) { - fail("draft-pull-request-list-failed"); - } - const parsedList = parseJson(listed.stdout); - if (!Array.isArray(parsedList)) fail("draft-pull-request-response-invalid"); - const identities = parsedList.map(value => parsePullRequestIdentity(value, request.target)); - if (identities.some(identity => identity === undefined)) { - fail("draft-pull-request-identity-mismatch"); - } - if (identities.length > 1) fail("draft-pull-request-ambiguous"); - if (identities.length === 1) { - const identity = identities[0]!; - if (identity.baseBranch !== request.baseBranch - || identity.headBranch !== request.headBranch) { - fail("draft-pull-request-identity-mismatch"); - } - if (identity.headCommitOid !== request.headCommitOid) { - fail("draft-pull-request-head-mismatch"); - } - const key = pullRequestKey(identity.repository, identity.number); - this.pullRequests.set(key, identity); - return identity; - } - - let created: HostingCommandResult; - try { - created = await this.run( - "gh", - [ - "pr", "create", - "--repo", request.target.repository, - "--base", request.baseBranch, - "--head", request.headBranch, - "--draft", - "--title", request.title, - "--body", request.body, - ], - request.checkoutPath, - commandEnvironment(), - request.signal, - ); - } catch (error) { - failCommand(error, "draft-pull-request-create-failed"); - } - assertNotCancelled(created); - if (!cleanExit(created) || !boundedOutput(created)) { - fail("draft-pull-request-create-failed"); - } - const createdNumber = parseCreatedPullRequestNumber( - created.stdout, - request.target.repository, - ); - if (createdNumber === undefined) fail("draft-pull-request-response-invalid"); - - const identity = await this.viewPullRequest( - request.checkoutPath, - request.target, - createdNumber, - "draft-pull-request-create-failed", - "draft-pull-request-response-invalid", - request.signal, - ); - if (identity.baseBranch !== request.baseBranch - || identity.headBranch !== request.headBranch - || identity.headCommitOid !== request.headCommitOid - || !identity.draft) fail("draft-pull-request-identity-mismatch"); - const key = pullRequestKey(identity.repository, identity.number); - this.pullRequests.set(key, identity); - return identity; - } - - async requiredChecks(request: ChecksRequest): Promise { - if (!validCheckoutPath(request.checkoutPath) - || !validTarget(request.target) - || !validPullRequestNumber(request.pullRequestNumber) - || !OID.test(request.headCommitOid)) { - fail("required-checks-request-invalid"); - } - if (request.signal?.aborted) fail("cancelled"); - const key = pullRequestKey(request.target.repository, request.pullRequestNumber); - const expected = this.pullRequests.get(key); - if (expected === undefined) fail("required-checks-identity-not-established"); - - const before = await this.viewPullRequest( - request.checkoutPath, - request.target, - request.pullRequestNumber, - "required-checks-identity-query-failed", - "required-checks-identity-response-invalid", - request.signal, - ).catch(error => { - throw error; - }); - if (!samePullRequestIdentity(before, expected)) { - fail("required-checks-identity-mismatch"); - } - if (before.headCommitOid !== request.headCommitOid) { - fail("required-checks-head-mismatch"); - } - - let result: HostingCommandResult; - try { - result = await this.run( - "gh", - [ - "pr", "checks", String(request.pullRequestNumber), - "--repo", request.target.repository, - "--required", - "--json", CHECK_JSON_FIELDS, - ], - request.checkoutPath, - commandEnvironment(), - request.signal, - ); - } catch (error) { - failCommand(error, "required-checks-command-failed"); - } - if (!boundedOutput(result) || ![0, 1, 8].includes(result.exitCode ?? -1)) { - fail("required-checks-command-failed"); - } - - const after = await this.viewPullRequest( - request.checkoutPath, - request.target, - request.pullRequestNumber, - "required-checks-identity-query-failed", - "required-checks-identity-response-invalid", - request.signal, - ); - if (after.headCommitOid !== request.headCommitOid) { - fail("required-checks-head-mismatch"); - } - if (!samePullRequestIdentity(after, before)) { - fail("required-checks-identity-mismatch"); - } - - const checks = parseRequiredChecks(result.stdout); - if (checks === undefined) fail("required-checks-response-invalid"); - const aggregate = checks.length === 0 - ? "missing" - : checks.some(check => ["fail", "cancel", "skipping"].includes(check.bucket)) - ? "failed" - : checks.some(check => check.bucket === "pending") - ? "pending" - : "passed"; - const expectedExitCode = checks.length === 0 - ? 1 - : checks.some(check => check.bucket === "fail" || check.bucket === "cancel") - ? 1 - : checks.some(check => check.bucket === "pending") - ? 8 - : 0; - if (result.exitCode !== expectedExitCode) fail("required-checks-response-invalid"); - return { result: aggregate, headCommitOid: request.headCommitOid, checks }; - } - - async markReady(request: MarkReadyRequest): Promise { - if (!validCheckoutPath(request.checkoutPath) - || !validTarget(request.target) - || !validPullRequestNumber(request.pullRequestNumber) - || !OID.test(request.headCommitOid)) { - fail("mark-ready-request-invalid"); - } - if (request.signal?.aborted) fail("cancelled"); - const key = pullRequestKey(request.target.repository, request.pullRequestNumber); - const expected = this.pullRequests.get(key); - if (expected === undefined) fail("mark-ready-identity-not-established"); - const checks = await this.requiredChecks({ - checkoutPath: request.checkoutPath, - target: request.target, - pullRequestNumber: request.pullRequestNumber, - headCommitOid: request.headCommitOid, - ...(request.signal === undefined ? {} : { signal: request.signal }), - }); - if (checks.result !== "passed" - || checks.headCommitOid !== request.headCommitOid - || checks.checks.length === 0 - || checks.checks.some(check => check.bucket !== "pass")) { - fail("mark-ready-checks-not-passed"); - } - - let ready: HostingCommandResult; - try { - ready = await this.run( - "gh", - [ - "pr", "ready", String(request.pullRequestNumber), - "--repo", request.target.repository, - ], - request.checkoutPath, - commandEnvironment(), - request.signal, - ); - } catch (error) { - failCommand(error, "mark-ready-command-failed"); - } - if (!cleanExit(ready) || !boundedOutput(ready)) fail("mark-ready-command-failed"); - - const updated = await this.viewPullRequest( - request.checkoutPath, - request.target, - request.pullRequestNumber, - "mark-ready-identity-query-failed", - "mark-ready-identity-response-invalid", - request.signal, - ); - const readyExpected = { ...expected, draft: false }; - if (!samePullRequestIdentity(updated, readyExpected)) { - fail("mark-ready-identity-mismatch"); - } - this.pullRequests.delete(key); - return updated; - } - - private async viewPullRequest( - checkoutPath: string, - target: HostingTarget, - number: number, - queryFailure: HostingAdapterErrorClassification, - responseFailure: HostingAdapterErrorClassification, - signal?: AbortSignal, - ): Promise { - let viewed: HostingCommandResult; - try { - viewed = await this.run( - "gh", - [ - "pr", "view", String(number), - "--repo", target.repository, - "--json", PR_JSON_FIELDS, - ], - checkoutPath, - commandEnvironment(), - signal, - ); - } catch (error) { - failCommand(error, queryFailure); - } - assertNotCancelled(viewed); - if (!cleanExit(viewed) || !boundedOutput(viewed)) fail(queryFailure); - const identity = parsePullRequestIdentity(parseJson(viewed.stdout), target); - if (identity === undefined || identity.number !== number) fail(responseFailure); - return identity; - } -} - -export class InMemoryHostingAdapter implements HostingAdapter { - constructor(private readonly operations: InMemoryHostingOperations = {}) {} - - preflight(request: HostingPreflight): Promise { - return this.operations.preflight?.(request) - ?? Promise.reject(new HostingAdapterError("in-memory-preflight-not-configured")); - } - - pushBranch(request: PushRequest): Promise<{ remoteHead: string }> { - return this.operations.pushBranch?.(request) - ?? Promise.reject(new HostingAdapterError("in-memory-push-not-configured")); - } - - ensureDraftPullRequest(request: DraftPullRequestRequest): Promise { - return this.operations.ensureDraftPullRequest?.(request) - ?? Promise.reject(new HostingAdapterError("in-memory-draft-pull-request-not-configured")); - } - - async requiredChecks(request: ChecksRequest): Promise { - const operation = this.operations.requiredChecks; - if (operation === undefined) { - throw new HostingAdapterError("in-memory-required-checks-not-configured"); - } - const result = await operation(request); - if (result.headCommitOid !== request.headCommitOid) { - throw new HostingAdapterError("required-checks-head-mismatch"); - } - return result; - } - - markReady(request: MarkReadyRequest): Promise { - return this.operations.markReady?.(request) - ?? Promise.reject(new HostingAdapterError("in-memory-mark-ready-not-configured")); - } -} diff --git a/src/ship/hosting-adapter.ts b/src/ship/hosting-adapter.ts deleted file mode 100644 index a8d24c4..0000000 --- a/src/ship/hosting-adapter.ts +++ /dev/null @@ -1,79 +0,0 @@ -export interface HostingPreflight { - checkoutPath: string; - expectedRepository?: string; - signal?: AbortSignal; -} - -export interface HostingTarget { - provider: "github"; - repository: string; - canonicalHttpsUrl: string; -} - -export interface PushRequest { - checkoutPath: string; - target: HostingTarget; - branch: string; - headCommitOid: string; - signal?: AbortSignal; -} - -export interface DraftPullRequestRequest { - checkoutPath: string; - target: HostingTarget; - baseBranch: string; - headBranch: string; - headCommitOid: string; - title: string; - body: string; - signal?: AbortSignal; -} - -export interface PullRequestIdentity { - number: number; - url: string; - repository: string; - baseBranch: string; - headBranch: string; - headCommitOid: string; - draft: boolean; -} - -export interface ChecksRequest { - checkoutPath: string; - target: HostingTarget; - pullRequestNumber: number; - headCommitOid: string; - signal?: AbortSignal; -} - -export type RequiredCheckBucket = "pass" | "pending" | "fail" | "cancel" | "skipping"; - -export interface RequiredCheck { - bucket: RequiredCheckBucket; - name: string; - state: string; - link: string | null; -} - -export interface RequiredChecksResult { - result: "missing" | "pending" | "failed" | "passed"; - headCommitOid: string; - checks: RequiredCheck[]; -} - -export interface MarkReadyRequest { - checkoutPath: string; - target: HostingTarget; - pullRequestNumber: number; - headCommitOid: string; - signal?: AbortSignal; -} - -export interface HostingAdapter { - preflight(request: HostingPreflight): Promise; - pushBranch(request: PushRequest): Promise<{ remoteHead: string }>; - ensureDraftPullRequest(request: DraftPullRequestRequest): Promise; - requiredChecks(request: ChecksRequest): Promise; - markReady(request: MarkReadyRequest): Promise; -} diff --git a/src/util/errors.ts b/src/util/errors.ts index e51b113..6f542c3 100644 --- a/src/util/errors.ts +++ b/src/util/errors.ts @@ -1,14 +1,17 @@ export class RuntimeError extends Error { constructor(message: string, readonly detail?: Record) { super(message); this.name = "RuntimeError"; } } -export class SpecInvalidError extends RuntimeError { - constructor(readonly validationErrors: Array<{ path: string; message: string }>) { - super("delegation spec invalid"); this.name = "SpecInvalidError"; - } -} export class NestedDelegationError extends RuntimeError { // CLAUDE_ARCHITECT_DELEGATED already set constructor() { super("nested delegation denied"); this.name = "NestedDelegationError"; } } -export class SpawnFailureError extends RuntimeError { // child 'error' before start (ENOENT/EACCES) - constructor(readonly cause: unknown) { super("spawn failure"); this.name = "SpawnFailureError"; } + +/** The errno-style `code` a thrown value carries, if any. */ +export function errorCode(error: unknown): string | undefined { + return typeof error === "object" && error !== null && "code" in error + ? String((error as { code?: unknown }).code) + : undefined; +} + +export function isMissing(error: unknown): boolean { + return errorCode(error) === "ENOENT"; } diff --git a/src/verify/baseline-verifier.ts b/src/verify/baseline-verifier.ts index 38b8fc6..c3fa955 100644 --- a/src/verify/baseline-verifier.ts +++ b/src/verify/baseline-verifier.ts @@ -11,6 +11,7 @@ import { linkPrimaryDependencies, type DependencyLink } from "./dependency-link. import type { ArtifactStore } from "../runtime/artifact-store.js"; import { boundedRedactedDiagnostic } from "../runtime/redaction.js"; import { logger } from "../util/logger.js"; +import { isMissing } from "../util/errors.js"; export interface BaselineCommandResult { id: string; @@ -162,10 +163,7 @@ async function packageScriptInvokesVitest(cwd: string, scriptName: string): Prom // A parse error, a permission denial, or anything else is ambiguity, and // resolving it to `false` would let a command that collected zero tests // pass as a valid baseline proof. - if (typeof error === "object" && error !== null && "code" in error - && (error as NodeJS.ErrnoException).code === "ENOENT") { - return false; - } + if (isMissing(error)) return false; throw error; } } diff --git a/src/verify/dependency-link.ts b/src/verify/dependency-link.ts index 427bafb..fa10e93 100644 --- a/src/verify/dependency-link.ts +++ b/src/verify/dependency-link.ts @@ -1,5 +1,5 @@ import { execFile } from "node:child_process"; -import { access, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises"; +import { access, mkdir, mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import path from "node:path"; import { promisify } from "node:util"; @@ -25,6 +25,17 @@ export interface DependencyLinkDependencies { const LOCKFILES = ["package-lock.json", "bun.lockb", "pnpm-lock.yaml", "yarn.lock"] as const; const COPY_TIMEOUT_MS = 120_000; +const MAX_LOCKFILE_BYTES = 64 * 1024 * 1024; +// The system `cp` by absolute path: a PATH lookup would let the checkout's +// environment choose the program that copies the dependency tree. +const SYSTEM_CP = ["/bin/cp", "/usr/bin/cp"] as const; + +async function systemCp(): Promise { + for (const candidate of SYSTEM_CP) { + if (await exists(candidate)) return candidate; + } + throw new Error("system cp is unavailable"); +} type CowStrategy = "clonefile" | "reflink" | "unsupported"; @@ -68,7 +79,9 @@ export async function probeCowSupport( await mkdir(source); await writeFile(path.join(source, "sentinel"), "probe\n"); try { - await (dependencies.execFile ?? execFileAsync)("cp", clone.args, { timeout: COPY_TIMEOUT_MS }); + await (dependencies.execFile ?? execFileAsync)(await systemCp(), clone.args, { + timeout: COPY_TIMEOUT_MS, + }); return { cowSupported: true, strategy: clone.strategy }; } catch { return { cowSupported: false, strategy: clone.strategy }; @@ -98,6 +111,12 @@ export async function linkPrimaryDependencies( try { const comparisons = await Promise.all(LOCKFILES.map(async (lockfile, index) => { if (!primaryLockfiles[index]) return true; + const sizes = await Promise.all([ + stat(path.join(primaryRepo, lockfile)), + stat(path.join(worktreePath, lockfile)), + ]); + if (sizes.some(entry => entry.size > MAX_LOCKFILE_BYTES) + || sizes[0].size !== sizes[1].size) return false; const [primaryLock, worktreeLock] = await Promise.all([ readFile(path.join(primaryRepo, lockfile)), readFile(path.join(worktreePath, lockfile)), @@ -115,7 +134,9 @@ export async function linkPrimaryDependencies( if (clone === null) return "skipped-cow-unsupported"; try { - await (dependencies.execFile ?? execFileAsync)("cp", clone.args, { timeout: COPY_TIMEOUT_MS }); + await (dependencies.execFile ?? execFileAsync)(await systemCp(), clone.args, { + timeout: COPY_TIMEOUT_MS, + }); return "inherited"; } catch { await rm(targetModules, { recursive: true, force: true }); diff --git a/src/verify/project-verifier.ts b/src/verify/project-verifier.ts index 6c10620..b421e2f 100644 --- a/src/verify/project-verifier.ts +++ b/src/verify/project-verifier.ts @@ -1,6 +1,9 @@ -import { realpath } from "node:fs/promises"; +import { mkdtemp, realpath, rm } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { SANDBOX_BACKENDS } from "../platform/sandbox/backends.js"; +import { seatbeltArgv } from "../platform/sandbox/seatbelt.js"; +import { gitChecked as checkedGit } from "../git/checked-git.js"; import path from "node:path"; -import { git, type GitResult } from "../git/git-exec.js"; import { WorktreeManager } from "../runtime/worktree-manager.js"; import type { CheckoutLock, @@ -16,11 +19,9 @@ import type { CandidateArtifact, CommandOutcome } from "../protocol/attempt-resu import type { VerificationCommand } from "../protocol/delegation-spec.js"; import { registerSensitiveEnvironment, WIN32_ESSENTIAL_ENV } from "../runtime/environment-policy.js"; import { redact } from "../runtime/redaction.js"; -import { RuntimeError } from "../util/errors.js"; import { linkPrimaryDependencies, type DependencyLink } from "./dependency-link.js"; const MAX_COMMAND_OUTPUT_BYTES = 1_000_000; -const MAX_DIAGNOSTIC_LENGTH = 2_000; const POSIX_ESSENTIAL_ENV = [ "HOME", "PATH", @@ -47,9 +48,35 @@ export interface ProjectVerifyArgs { borrowedCheckoutLease?: CheckoutLock; } +/** + * Verification executes Producer-authored code (tests, package scripts), so it + * runs under the same OS confinement as the Producer wherever the runtime owns + * a backend. `null` means no backend exists here; the evidence then records + * `confinement: "none"` and the decision policy refuses autonomous acceptance. + */ +export interface VerificationConfinement { + backend: "macos-seatbelt"; + worktreePath: string; + scratchDir: string; +} + +export type VerificationConfinementBackend = VerificationConfinement["backend"] | "none"; + +export function verificationConfinementBackend( + os: PlatformServices["os"], + arch: string, +): VerificationConfinement["backend"] | null { + const platform = SANDBOX_BACKENDS.find(backend => backend.id === "macos-seatbelt") + ?.platforms.find(candidate => + candidate.os === os + && candidate.environmentType === "native" + && (candidate.arch === undefined || candidate.arch === arch)); + return platform === undefined || platform.state === "unsupported" ? null : "macos-seatbelt"; +} + export interface ProjectCommandEvidence { id: string; - confinement: "none"; + confinement: VerificationConfinementBackend; networkPolicy: "unenforced"; requestedNetwork: VerificationCommand["network"]; skipped: boolean; @@ -93,16 +120,7 @@ export interface ExecutedCommand { terminal: CommandTermination; } -function gitFailure(action: string, result: GitResult): RuntimeError { - const diagnostic = redact(result.stderr || result.stdout).trim().slice(0, MAX_DIAGNOSTIC_LENGTH); - return new RuntimeError(`${action} failed${diagnostic ? `: ${diagnostic}` : ""}`); -} -async function checkedGit(cwd: string, args: string[]): Promise { - const result = await git(cwd, args); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - return result.stdout; -} function defineEnvironmentValue(environment: Record, name: string, value: string): void { Object.defineProperty(environment, name, { @@ -207,6 +225,7 @@ export async function executeCommand(args: { now: () => number; abortSignal?: AbortSignal; logNamePrefix?: string; + confinement?: VerificationConfinement | null; }): Promise { const { command, index, cwd, ps, now } = args; const registration = registerSensitiveEnvironment(command.environment ?? {}); @@ -223,9 +242,27 @@ export async function executeCommand(args: { ...(path.isAbsolute(command.executable) ? { explicitPath: command.executable } : {}), searchPath: environment.PATH ?? environment.Path ?? "", }); + let spawned = { executable, args: command.args }; + if (args.confinement) { + defineEnvironmentValue(environment, "TMPDIR", args.confinement.scratchDir); + const confined = seatbeltArgv(args.confinement, [ + executable.command, + ...executable.prefixArgs, + ...command.args, + ]); + spawned = { + executable: { + kind: "native", + command: confined.command, + prefixArgs: [], + resolvedFrom: `seatbelt:${executable.resolvedFrom}`, + }, + args: confined.args, + }; + } exit = await supervise(ps, { - executable, - args: command.args, + executable: spawned.executable, + args: spawned.args, cwd, env: environment, timeoutMs: command.timeoutMs, @@ -270,7 +307,7 @@ export async function executeCommand(args: { }, evidence: { id: redact(command.id), - confinement: "none", + confinement: args.confinement?.backend ?? "none", networkPolicy: "unenforced", requestedNetwork: command.network, skipped: false, @@ -369,8 +406,16 @@ export async function projectVerify(args: ProjectVerifyArgs): Promise { - const result = await git(cwd, args); - if (result.exitCode !== 0) throw gitFailure(`git ${args[0] ?? "command"}`, result); - // Truncated output is a partial answer, and every caller here treats what it - // gets as the complete path set — a clipped `ls-tree` would silently hide a - // real case collision. Proof cannot rest on a truncated read. - if (result.truncated?.stdout === true || result.truncated?.stderr === true) { - throw gitFailure(`git ${args[0] ?? "command"}`, { ...result, stderr: "output truncated" }); - } - return result.stdout; -} diff --git a/src/verify/verification-inputs.ts b/src/verify/verification-inputs.ts new file mode 100644 index 0000000..da46623 --- /dev/null +++ b/src/verify/verification-inputs.ts @@ -0,0 +1,43 @@ +/** + * Paths whose content decides what project verification actually checks: + * tests, test and build configuration, and dependency manifests. A candidate + * that edits them can make its own verification pass, so verification alone + * no longer proves anything about it — independent review or a person must. + * + * Source under test is deliberately absent: proving that changed source + * passes unchanged tests is exactly what verification is for. + */ +const TEST_PATH_PATTERNS: readonly RegExp[] = [ + /(?:^|\/)(?:tests?|__tests__|spec|specs|testdata|fixtures)\//u, + /\.(?:test|spec)\.[^/]+$/u, + /(?:^|\/)(?:test_[^/]+|[^/]+_test)\.(?:py|go|rb|rs|exs?)$/u, + /(?:^|\/)[^/]+(?:Test|Tests|Spec)\.(?:java|kt|cs|swift|scala)$/u, + /(?:^|\/)conftest\.py$/u, +]; + +/** Whether a repository path is a test file or lives in a test tree. */ +export function isTestPath(candidate: string): boolean { + return TEST_PATH_PATTERNS.some(pattern => pattern.test(candidate)); +} + +const VERIFICATION_INPUT_PATTERNS: readonly RegExp[] = [ + ...TEST_PATH_PATTERNS, + // Test runner, compiler, and task configuration. + /(?:^|\/)(?:vitest|vite|jest|mocha|karma|playwright|cypress|ava|babel|webpack|rollup|esbuild)\.config\.[^/]+$/u, + /(?:^|\/)\.(?:mocharc|babelrc|nycrc|c8rc)(?:\.[^/]+)?$/u, + /(?:^|\/)tsconfig(?:\.[^/]+)?\.json$/u, + /(?:^|\/)(?:pytest|tox|setup)\.(?:ini|cfg)$/u, + /(?:^|\/)(?:Makefile|GNUmakefile|justfile|Taskfile\.ya?ml|Rakefile|build\.gradle(?:\.kts)?|pom\.xml)$/u, + // Dependency manifests and lockfiles. + /(?:^|\/)package\.json$/u, + /(?:^|\/)(?:package-lock\.json|npm-shrinkwrap\.json|yarn\.lock|pnpm-lock\.yaml|bun\.lockb?)$/u, + /(?:^|\/)(?:pyproject\.toml|requirements[^/]*\.txt|Pipfile(?:\.lock)?|poetry\.lock|uv\.lock)$/u, + /(?:^|\/)(?:Cargo\.(?:toml|lock)|go\.(?:mod|sum)|Gemfile(?:\.lock)?|mix\.(?:exs|lock))$/u, + // Attribute and ignore rules change which bytes Git and tools see. + /(?:^|\/)\.git(?:attributes|ignore|modules)$/u, +]; + +export function verificationInputPaths(changedPaths: readonly string[]): string[] { + return changedPaths.filter(changed => + VERIFICATION_INPUT_PATTERNS.some(pattern => pattern.test(changed))); +} diff --git a/tests/README.md b/tests/README.md index 52e4286..c3648b1 100644 --- a/tests/README.md +++ b/tests/README.md @@ -33,8 +33,8 @@ AGENTS.md's own carve-out, which never mocks the component whose security proper | tests/runtime/autopilot/autopilot-doctor.test.ts | src/mcp/doctor.ts | doctor | integration | no | | tests/runtime/autopilot/autopilot-e2e.test.ts | src/autopilot/autopilot-controller.ts, src/pipeline/pipeline-runtime.ts | AutopilotController, runPipeline | integration | no | | tests/runtime/autopilot/autopilot-mcp.test.ts | src/mcp/server.ts | createServer (via MCP Client/InMemoryTransport) | contract | no | -| tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns | adversarial | no | -| tests/runtime/autopilot/autopilot-recovery.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns | integration | no | +| tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts | src/runtime/recovery-autopilot.ts | recoverStaleRuns | adversarial | no | +| tests/runtime/autopilot/autopilot-recovery.test.ts | src/runtime/recovery-autopilot.ts | recoverStaleRuns | integration | no | | tests/runtime/autopilot/autopilot-windows.test.ts | src/autopilot/autopilot-controller.ts, src/pipeline/pipeline-runtime.ts | AutopilotController, runPipeline | integration | no | | tests/runtime/autopilot/branch-manager.test.ts | src/autopilot/branch-manager.ts | WorkflowBranchManager | integration | YES (minor) — `vi.spyOn(logger, "warn")` (L911) silences internal logger | | tests/runtime/autopilot/candidate-promoter.integration.test.ts | src/autopilot/candidate-promoter.ts | CandidatePromoter | integration | no | @@ -50,6 +50,7 @@ AGENTS.md's own carve-out, which never mocks the component whose security proper | tests/runtime/candidate-tree.test.ts | src/git/candidate-tree.ts | freezeCandidate | integration | YES — `vi.mock("../../src/git/git-exec.js", ...)` (L439) wraps `git()` to inject failures | | tests/runtime/capability-probe.test.ts | src/producers/capability-probe.ts | probeAll, CodexAdapter, ProducerRegistry | contract | no | | tests/runtime/changed-path-manifest.test.ts | src/git/changed-path-manifest.ts | computeChangedPathManifest, parseRawDiff, manifestHashOf | unit | no | +| tests/runtime/checked-git.test.ts | src/git/checked-git.ts | gitChecked, gitSucceeded, reviewDiffArgs | unit | no | | tests/runtime/claude-adapter.test.ts | src/producers/claude-adapter.ts | ClaudeAdapter, renderProducerPrompt | contract | no | | tests/runtime/codex-adapter.test.ts | src/producers/codex-adapter.ts | CodexAdapter, codexDescriptor, sandboxSupportWritableRoots | contract | no | | tests/runtime/consolidator.test.ts | src/pipeline/consolidator.ts | consolidate, detectNonConvergence | unit | no | @@ -81,12 +82,14 @@ AGENTS.md's own carve-out, which never mocks the component whose security proper | tests/runtime/mcp-input-schema.test.ts | src/mcp/server.ts | delegateInputSchema, delegatePipelineInputSchema | contract | no | | tests/runtime/mcp-output-schema.test.ts | src/mcp/server.ts, src/mcp/doctor.ts | delegatePipelineOutput, doctorOutput, doctor | contract | no | | tests/runtime/opencode-adapter.test.ts | src/producers/opencode-adapter.ts | OpenCodeAdapter | integration | no | +| tests/runtime/jev-screen.test.ts | src/mcp/jev-screen.ts | jevScreen | unit | no — the TypeSafe API is reached through an injected `fetch` | | tests/runtime/pi-adapter.test.ts | src/producers/pi-adapter.ts | PiAdapter | integration | no | | tests/runtime/pipeline-runtime.test.ts | src/pipeline/pipeline-runtime.ts | runPipeline, runIncrement, runReviews, verifyCandidate | integration | YES — extensive `vi.spyOn(AcceptanceVerifier.prototype, "verify")`, `ArtifactStore.prototype.*`, `WorktreeManager.prototype.create` (L792,927,933,1010,1180,1239,1378,1483,2076,3345,3424) replace internal src behavior | | tests/runtime/pipeline/advisor-stage.test.ts | src/pipeline/advisor-stage.ts | runAdvisorStage | integration | no | -| tests/runtime/pipeline/autopilot-eligibility.test.ts | src/autopilot/autopilot-eligibility.ts | evaluateAutopilotEligibility, eligibilityInputFromArtifacts | unit | no | +| tests/runtime/pipeline/autopilot-eligibility.test.ts | src/autopilot/autopilot-eligibility.ts | evaluateAutopilotEligibility | unit | no | | tests/runtime/pipeline/slice-runner.test.ts | src/pipeline/slice-runner.ts | SliceRunner, PipelineSlice, SliceAttempt | integration | no | | tests/runtime/pipeline/wayfinder.test.ts | src/pipeline/wayfinder.ts | routeSlice | unit | no | +| tests/runtime/platform-safety.test.ts | src/platform/platform-safety.ts | PlatformSafety.withCheckoutLease | unit | no | | tests/runtime/platform-path.test.ts | src/util/platform-path.ts | platformPathsEqual | unit | no | | tests/runtime/plugin-wiring.test.mjs | .mcp.json, runtime/bootstrap.mjs, runtime/server.mjs, agents/advisor.md | file/wiring assertions | contract | no | | tests/runtime/posix-platform-services.test.ts | src/platform/posix-platform-services.ts | PosixPlatformServices, CLEANUP_JOURNAL_LOCK_KEY | integration | no | @@ -120,8 +123,6 @@ AGENTS.md's own carve-out, which never mocks the component whose security proper | tests/runtime/schema-loader.test.ts | src/protocol/schema-loader.ts | loadSchemas, checkVersionCompat | contract | no | | tests/runtime/seatbelt.test.ts | src/platform/sandbox/seatbelt.ts | buildSeatbeltProfile, buildReadOnlySeatbeltPolicy, wrapInvocationWithSeatbelt | unit | no | | tests/runtime/serialize.test.ts | src/mcp/serialize.ts | withRepoLock | unit | no | -| tests/runtime/shipping/github-cli-adapter-red-paths.test.ts | src/ship/github-cli-adapter.ts | GitHubCliAdapter, HostingAdapterError, InMemoryHostingAdapter | adversarial | YES — mocks internal src/platform/select-platform.js (L53), src/platform/process-supervisor.js (L60), node:fs/promises (L71) to fake process execution | -| tests/runtime/shipping/github-cli-adapter.test.ts | src/ship/github-cli-adapter.ts | GitHubCliAdapter, HostingAdapterError, InMemoryHostingAdapter | contract | YES — same mocking pattern (L54, L61, L72) | | tests/runtime/skill-bootstrap.test.ts | src/producers/skill-bootstrap.ts | renderSkillBootstrap | unit | YES — `vi.doMock("node:fs")` (~L59) stubs `existsSync` to force a fail-closed branch | | tests/runtime/slice-composer.test.ts | src/pipeline/slice-composer.ts | composeSliceOntoHead, parseRawDiffEntries | integration | no | | tests/runtime/slice-scheduler.test.ts | src/pipeline/slice-scheduler.ts | planSliceWaves | unit | no | @@ -142,7 +143,7 @@ AGENTS.md's own carve-out, which never mocks the component whose security proper | tests/runtime/worktree-manager.test.ts | src/runtime/worktree-manager.ts | WorktreeManager, managedWorktreeDirectoryIdentity, removeManagedWorktreeDirectory | integration | no | | tests/runtime/worktree-registration.test.ts | src/git/worktree-registration.ts | findWorktreeRegistration | unit | no | | tests/runtime/worktree-removal-manifest.test.ts | src/runtime/worktree-removal-manifest.ts | persistWorktreeRemovalManifest, readPendingWorktreeRemovalManifests, replaceWorktreeRemovalManifest, assertNoPendingWorktreeRemovalForRepository | integration | no | -| tests/runtime/worktree-sweep.test.ts | src/runtime/recovery-manager.ts | recoverStaleRuns, WorktreeManager | integration | no | +| tests/runtime/worktree-sweep.test.ts | src/runtime/recovery-worktree-sweep.ts | recoverStaleRuns, WorktreeManager | integration | no | | tests/validate-release.test.sh | scripts/validate-release.sh | validate-release CLI contract | integration | no | ## Past the interface @@ -165,7 +166,6 @@ site below was read; each verdict names the reason. | `tests/runtime/pipeline-runtime.test.ts` (11 sites) | `AcceptanceVerifier.prototype.verify`, `ArtifactStore.prototype.*`, `WorktreeManager.prototype.create` spied; each calls through and either asserts the lease is held, counts calls, or fails once | keep: every spy runs the real method; the pipeline, store, verifier, and worktrees are real. Sites that never call through (`1180`, `1483`) reject a single durable write to prove the failure is reported, not swallowed | | `tests/runtime/run-status.test.ts:1661` | `writeRunStatus` rejected once; `logger.warn` observed | keep: proves status is advisory and never breaks control flow | | `tests/runtime/repo-preconditions.test.ts:982`, `tests/runtime/skill-bootstrap.test.ts:59` | `node:fs` failures forced | keep: fail-closed branches unreachable without an injected fault | -| `tests/runtime/shipping/github-cli-adapter*.test.ts` | `select-platform`, `process-supervisor`, `node:fs/promises` mocked to fake `gh` | keep: the adapter's designed seam; the real CLI is covered by the opt-in smoke path | | `branch-manager.test.ts:911`, `candidate-promoter.test.ts:447`, `lock-ownership.test.ts:690`, `recovery-manager.test.ts:897` | `logger.warn` / `console.error` spied | keep: log observation, no behaviour substituted | Nothing was moved or deleted: no test replaces the component whose property it diff --git a/tests/runtime/artifact-store-bytes.test.ts b/tests/runtime/artifact-store-bytes.test.ts index bca3e88..504c17a 100644 --- a/tests/runtime/artifact-store-bytes.test.ts +++ b/tests/runtime/artifact-store-bytes.test.ts @@ -20,7 +20,7 @@ const REPO_ROOT = "/repo"; const GOLDEN: Record = { "decision.json": "4cef15d87869d4ece959d5bad7ebd0c005ae089144c90c808b84c9729f1d26bb", "logs/producer.log": "e9024f1a07d29d52ad3aa5e1a18e94db1f3a9fd32b89e39d47c472cd99071e13", - "manifest.json": "9345893b4a64416898871a61fc65133a43371dcd50f51c472fe9f8060cec00bf", + "manifest.json": "d68bf2d317822ba625af666854f810fca06d1c66a1da3caf33d1f46287af7dab", "pipeline-active.json": "3c1c0c3ff953ec85e6b52da6a0dd124d41e29ba6f3394f545d2ef636dc20edce", "pipeline-gate-cleared.json": "a53c3367231380c176a4fc0e03f6f5056b1446452923dca40e1cb80e1a391c46", "pipeline/delegation-spec.json": "475e0a1730837fefbf663e3cec5923326087e80da856a60e4c21004c7e2351a3", diff --git a/tests/runtime/artifact-store.test.ts b/tests/runtime/artifact-store.test.ts index 80a127e..9ef90f9 100644 --- a/tests/runtime/artifact-store.test.ts +++ b/tests/runtime/artifact-store.test.ts @@ -33,7 +33,6 @@ import { } from "../../src/runtime/redaction.js"; import { scrubbedGitEnv } from "./helpers/git-fixture-env.js"; import { - eligibilityInputFromArtifacts, evaluateAutopilotEligibility, } from "../../src/autopilot/autopilot-eligibility.js"; import { @@ -256,12 +255,12 @@ describe("ArtifactStore", () => { await store.writeReviewSnapshot(snapshot); const pipelinePath = join(store.runDirectory, "pipeline", "pipeline-result.json"); const pipelineBefore = await readFile(pipelinePath, "utf8"); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: pipeline, reviewSnapshot: snapshot, advisor: advisorReport, evaluatedAt: "2026-07-20T12:00:00.000Z", - })); + }); const hashes = await store.writePostPipelineAutopilotArtifacts({ pipelineResult: pipeline, @@ -302,12 +301,12 @@ describe("ArtifactStore", () => { await store.writeReviewSnapshot(snapshot); const pipelinePath = join(store.runDirectory, "pipeline", "pipeline-result.json"); const pipelineBefore = await readFile(pipelinePath, "utf8"); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: pipeline, reviewSnapshot: snapshot, advisor: advisorReport, evaluatedAt: "2026-07-20T12:00:00.000Z", - })); + }); filesystemHooks.beforeLink = async (_source, destination) => { if (!destination.endsWith("post-pipeline-autopilot.json")) return; const error = new Error("injected atomic publication failure") as NodeJS.ErrnoException; @@ -348,12 +347,12 @@ describe("ArtifactStore", () => { const snapshot = reviewSnapshot(runId); await store.writePipelineArtifact("pipeline-result", pipeline); await store.writeReviewSnapshot(snapshot); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: pipeline, reviewSnapshot: snapshot, advisor: advisorReport, evaluatedAt: "2026-07-20T12:00:00.000Z", - })); + }); await expect(store.writePostPipelineAutopilotArtifacts({ pipelineResult: pipeline, @@ -536,12 +535,12 @@ describe("ArtifactStore", () => { expect(archivedBytes).not.toBeNull(); const archivedPipeline = JSON.parse(archivedBytes!); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: archivedPipeline, reviewSnapshot: reviewSnapshot(runId), advisor: advisorReport, evaluatedAt: "2026-07-20T12:00:00.000Z", - })); + }); expect(eligibility).toMatchObject({ eligible: false, reasons: expect.arrayContaining(["pipeline result is malformed"]), @@ -847,12 +846,12 @@ describe("ArtifactStore", () => { await store.writeResult(sampleResult(runId)); await store.writePipelineArtifact("pipeline-result", pipeline); await store.writeReviewSnapshot(snapshot); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: pipeline, reviewSnapshot: snapshot, advisor: advisorReport, evaluatedAt: "2026-07-14T12:00:00.000Z", - })); + }); const hashes = await store.writePostPipelineAutopilotArtifacts({ pipelineResult: pipeline, reviewSnapshot: snapshot, @@ -905,12 +904,12 @@ describe("ArtifactStore", () => { const candidate = pipeline.attempt.candidate!; await store.writePipelineArtifact("pipeline-result", pipeline); await store.writeReviewSnapshot(snapshot); - const eligibility = evaluateAutopilotEligibility(eligibilityInputFromArtifacts({ + const eligibility = evaluateAutopilotEligibility({ pipelineResult: pipeline, reviewSnapshot: snapshot, advisor: advisorReport, evaluatedAt: "2026-07-14T12:00:00.000Z", - })); + }); await store.writePostPipelineAutopilotArtifacts({ pipelineResult: pipeline, reviewSnapshot: snapshot, diff --git a/tests/runtime/autopilot/autopilot-adversarial.test.ts b/tests/runtime/autopilot/autopilot-adversarial.test.ts index bd5790a..4c47414 100644 --- a/tests/runtime/autopilot/autopilot-adversarial.test.ts +++ b/tests/runtime/autopilot/autopilot-adversarial.test.ts @@ -55,25 +55,12 @@ import { ProducerRegistry } from "../../../src/producers/producer-registry.js"; import { ArtifactStore } from "../../../src/runtime/artifact-store.js"; import type { AttemptRuntimeDependencies } from "../../../src/runtime/attempt-runtime.js"; import { createReviewSnapshot } from "../../../src/runtime/review-snapshot.js"; -import { - InMemoryHostingAdapter, - type InMemoryHostingOperations, -} from "../../../src/ship/github-cli-adapter.js"; -import type { - ChecksRequest, - DraftPullRequestRequest, - HostingTarget, - MarkReadyRequest, - PushRequest, -} from "../../../src/ship/hosting-adapter.js"; import { AcceptanceVerifier } from "../../../src/verify/acceptance-verifier.js"; import { structuralVerify } from "../../../src/verify/structural-verifier.js"; const editFixture = fileURLToPath(new URL("../fixtures/edit-file.mjs", import.meta.url)); const NOW = "2026-07-21T12:00:00.000Z"; const REMOTE_URL = "https://github.com/example/autopilot-adversarial.git"; -const REPOSITORY = "example/autopilot-adversarial"; -const OTHER_HEAD = "f".repeat(40); const temporaryPaths: string[] = []; const originalEnvironment = new Map(); let sandboxState: "certified" | "tested" | "unsupported" | undefined; @@ -264,7 +251,7 @@ function delegation(overrides: Partial = {}): DelegationSpec { function autopilotSpec(overrides: Partial = {}): AutopilotSpec { return { - specVersion: "1", + specVersion: "2", topic: "adversarial", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -282,33 +269,15 @@ function autopilotSpec(overrides: Partial = {}): AutopilotSpec { network: "denied", expectedExitCodes: [0], }], - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 600_000, - pullRequestTitle: "Adversarial workflow", - pullRequestBody: "Verified adversarial fixture.", - }, ...overrides, }; } -interface RecordedHostingCall { - operation: "preflight" | "push" | "draft-pr" | "checks" | "mark-ready"; - request: object; -} - interface HarnessOptions { mode?: ProducerMode; abortSignal?: AbortSignal; - checkHead?: string; - duplicatePullRequest?: boolean; - pushHead?: string; afterEligibility?: (runId: string, state: AutopilotWorkflowState) => Promise; afterPromotion?: () => void; - afterRequiredChecks?: () => void; - pendingRequiredChecks?: boolean; } async function createHarness(options: HarnessOptions = {}) { @@ -338,61 +307,9 @@ async function createHarness(options: HarnessOptions = {}) { remoteTransport: localRemoteTransport(fixture.bareRemote), }); const workflowStore = (id: string) => new WorkflowStore(id); - const hostingCalls: RecordedHostingCall[] = []; - let shippedHead = ""; - let shippedBranch = ""; - const target: HostingTarget = { - provider: "github", - repository: REPOSITORY, - canonicalHttpsUrl: REMOTE_URL, - }; - const hosting: InMemoryHostingOperations = { - preflight: async request => { - hostingCalls.push({ operation: "preflight", request }); - return target; - }, - pushBranch: async request => { - hostingCalls.push({ operation: "push", request }); - shippedHead = request.headCommitOid; - shippedBranch = request.branch; - return { remoteHead: options.pushHead ?? request.headCommitOid }; - }, - ensureDraftPullRequest: async request => { - hostingCalls.push({ operation: "draft-pr", request }); - return { - number: 17, - url: "https://github.com/example/autopilot-adversarial/pull/17", - repository: REPOSITORY, - baseBranch: request.baseBranch, - headBranch: options.duplicatePullRequest ? `${request.headBranch}-forged` : request.headBranch, - headCommitOid: request.headCommitOid, - draft: true, - }; - }, - requiredChecks: async request => { - hostingCalls.push({ operation: "checks", request }); - options.afterRequiredChecks?.(); - return { - result: options.pendingRequiredChecks ? "pending" : "passed", - headCommitOid: options.checkHead ?? request.headCommitOid, - checks: options.pendingRequiredChecks - ? [{ bucket: "pending", name: "test", state: "IN_PROGRESS", link: null }] - : [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }; - }, - markReady: async request => { - hostingCalls.push({ operation: "mark-ready", request }); - return { - number: 17, - url: "https://github.com/example/autopilot-adversarial/pull/17", - repository: REPOSITORY, - baseBranch: "main", - headBranch: shippedBranch, - headCommitOid: shippedHead, - draft: false, - }; - }, - }; + // The hand-off (cleanup that keeps the final-reviewed branch) is the one + // consequential mutation left after promotion; attacks must never reach it. + const handoffs: string[] = []; const dependencies: AutopilotControllerDependencies = { workflowId: () => workflowId, now: () => NOW, @@ -404,7 +321,15 @@ async function createHarness(options: HarnessOptions = {}) { const canonical = await platformServices.canonicalizePath(checkoutPath); return canonical.gitCommonDir ?? canonical.canonical; }, - branchManager, + branchManager: { + create: request => branchManager.create(request), + load: workflowId => branchManager.load(workflowId), + revalidate: (identity, expectedHead) => branchManager.revalidate(identity, expectedHead), + cleanup: async (identity, expectedHead, cleanupOptions) => { + if (cleanupOptions?.retainBranch === true) handoffs.push(expectedHead ?? identity.baseCommitOid); + return await branchManager.cleanup(identity, expectedHead, cleanupOptions); + }, + }, pipelineRunner: { run: (checkoutPath, spec) => runPipeline(checkoutPath, spec, pipelineDependencies), }, @@ -458,9 +383,6 @@ async function createHarness(options: HarnessOptions = {}) { roleRunner: approvingRoleRunner, now: () => NOW, }), - hostingAdapter: new InMemoryHostingAdapter(hosting), - requiredChecksPollIntervalMs: 100, - sleep: async () => {}, ...(options.abortSignal === undefined ? {} : { abortSignal: options.abortSignal }), }; return { @@ -469,7 +391,7 @@ async function createHarness(options: HarnessOptions = {}) { workflowId, store: new WorkflowStore(workflowId), producer, - hostingCalls, + handoffs, branchManager, }; } @@ -514,11 +436,6 @@ afterEach(async () => { rm(directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 }))); }); -function shippingMutations(calls: RecordedHostingCall[]): string[] { - return calls.map(call => call.operation).filter(operation => - operation === "push" || operation === "draft-pr" || operation === "mark-ready"); -} - async function candidateWorktreeFixture() { const root = temporaryPaths[0]!; const fixture = await createRepository(root); @@ -574,7 +491,7 @@ describe("autopilot adversarial trust boundaries", () => { it.each([ ["candidate/pipeline", "result.json"], ["advisor/eligibility", path.join("pipeline", "post-pipeline-autopilot.json")], - ])("detects %s persisted-byte tampering and fails before shipping", async (_label, relative) => { + ])("detects %s persisted-byte tampering and fails before hand-off", async (_label, relative) => { const harness = await createHarness({ afterEligibility: async runId => { const store = new ArtifactStore(runId); @@ -583,7 +500,7 @@ describe("autopilot adversarial trust boundaries", () => { }); await expect(harness.controller.start(harness.fixture.checkout, autopilotSpec())) .rejects.toBeDefined(); - expect(shippingMutations(harness.hostingCalls)).toEqual([]); + expect(harness.handoffs).toEqual([]); await expect(harness.store.read()).resolves.toMatchObject({ terminal: { classification: expect.stringMatching(/failed|human-decision-required/u) }, }); @@ -599,16 +516,6 @@ describe("autopilot adversarial trust boundaries", () => { await expect(harness.store.read()).rejects.toBeDefined(); }, 120_000); - it.each([ - ["stale checks", { checkHead: OTHER_HEAD }], - ["duplicate branch PR", { duplicatePullRequest: true }], - ])("rejects %s and never marks ready", async (_label, options) => { - const harness = await createHarness(options); - await expect(harness.controller.start(harness.fixture.checkout, autopilotSpec())) - .rejects.toBeDefined(); - expect(harness.hostingCalls.some(call => call.operation === "mark-ready")).toBe(false); - }, 120_000); - it.each([ ["traversal", "../escape"], ["absolute", path.resolve("escape")], @@ -657,7 +564,7 @@ describe("autopilot adversarial trust boundaries", () => { expect(result.failures).toContain(finding); }); - it("detects registration, ref, and rewritten-remote substitution", async () => { + it("detects registration and ref substitution", async () => { const harness = await createHarness(); const workflowId = `${harness.workflowId}-branch-substitution`; const branch = await harness.branchManager.create({ @@ -680,13 +587,6 @@ describe("autopilot adversarial trust boundaries", () => { await writeFile(ownershipPath, ownershipBytes); await runGit(branch.worktreePath, ["checkout", "--detach", "-q"]); await expect(harness.branchManager.revalidate(branch)).resolves.toMatchObject({ ok: false }); - await runGit(harness.fixture.checkout, [ - "config", "url.https://attacker.invalid/.insteadOf", "https://github.com/", - ]); - await expect(harness.branchManager.revalidate(branch)).resolves.toMatchObject({ - ok: false, - classification: "remote-identity-changed", - }); }); // Spec-level rejection only: no commit is created here, so this cannot speak @@ -724,7 +624,7 @@ describe("autopilot adversarial trust boundaries", () => { await expect(harness.branchManager.load(harness.workflowId)).resolves.toBeNull(); }, 120_000); - it("persists terminal cancellation and performs no later shipping mutation", async () => { + it("persists terminal cancellation and performs no later hand-off", async () => { const abort = new AbortController(); const harness = await createHarness({ mode: "cancel", abortSignal: abort.signal }); let producerStarted: (() => void) | undefined; @@ -743,13 +643,13 @@ describe("autopilot adversarial trust boundaries", () => { }); expect(durable.cleanup).toBeNull(); await expect(harness.branchManager.load(harness.workflowId)).resolves.not.toBeNull(); - expect(shippingMutations(harness.hostingCalls)).toEqual([]); + expect(harness.handoffs).toEqual([]); // Unlike the sibling cancellation tests, this one aborts while the Producer // is mid-flight, so it also pays for terminating a live process tree — // markedly slower on Windows, where 120s was not enough. }, 240_000); - it("halts durably when cancellation fires after promotion and before push", async () => { + it("halts durably when cancellation fires after promotion and before hand-off", async () => { const abort = new AbortController(); const harness = await createHarness({ abortSignal: abort.signal, @@ -762,33 +662,16 @@ describe("autopilot adversarial trust boundaries", () => { phase: "cancelled", terminal: { classification: "cancelled", reason: "cancelled" }, }); - expect(shippingMutations(harness.hostingCalls)).toEqual([]); - }, 120_000); - - it("halts during required-check polling before mark-ready", async () => { - const abort = new AbortController(); - const harness = await createHarness({ - abortSignal: abort.signal, - pendingRequiredChecks: true, - afterRequiredChecks: () => abort.abort(), - }); - - await expect(harness.controller.start(harness.fixture.checkout, autopilotSpec())) - .rejects.toMatchObject({ classification: "cancelled" }); - await expect(harness.store.read()).resolves.toMatchObject({ - phase: "cancelled", - terminal: { classification: "cancelled", reason: "cancelled" }, - }); - expect(harness.hostingCalls.filter(call => call.operation === "mark-ready")).toEqual([]); + expect(harness.handoffs).toEqual([]); }, 120_000); - it("bounds oversized producer output and fails closed before shipping", async () => { + it("bounds oversized producer output and fails closed before hand-off", async () => { const harness = await createHarness({ mode: "oversize" }); await expect(harness.controller.start(harness.fixture.checkout, autopilotSpec())) .rejects.toBeDefined(); const durable = await harness.store.read(); expect(["failed", "human-decision-required"]).toContain(durable.phase); - expect(shippingMutations(harness.hostingCalls)).toEqual([]); + expect(harness.handoffs).toEqual([]); }, 120_000); it("serializes duplicate workflow starts and rejects a live-owner resume", async () => { @@ -808,7 +691,7 @@ describe("autopilot adversarial trust boundaries", () => { abort.abort(); await expect(first).rejects.toMatchObject({ classification: "cancelled" }); await expect(second).resolves.toMatchObject({ phase: "cancelled" }); - expect(shippingMutations(harness.hostingCalls)).toEqual([]); + expect(harness.handoffs).toEqual([]); // Same reason as the terminal-cancellation test above: aborting while the // Producer is mid-flight pays for tearing down a live process tree, which // is far slower on Windows than the 120s this suite assumed. @@ -823,9 +706,7 @@ describe("autopilot adversarial trust boundaries", () => { expect(starts.filter(result => result.status === "fulfilled")).toHaveLength(1); expect(starts.filter(result => result.status === "rejected")).toHaveLength(1); - expect(harness.hostingCalls.filter(call => call.operation === "push")).toHaveLength(1); - expect(harness.hostingCalls.filter(call => call.operation === "draft-pr")).toHaveLength(1); - expect(harness.hostingCalls.filter(call => call.operation === "mark-ready")).toHaveLength(1); + expect(harness.handoffs).toHaveLength(1); }, 120_000); it("serializes checkout-lock contenders without interleaving branch creation", async () => { @@ -867,13 +748,6 @@ describe("autopilot adversarial trust boundaries", () => { await manager.cleanup(second); }); - it("detects a branch-head race before accepting push observation", async () => { - const harness = await createHarness({ pushHead: OTHER_HEAD }); - await expect(harness.controller.start(harness.fixture.checkout, autopilotSpec())) - .rejects.toMatchObject({ classification: "push-head-mismatch" }); - expect(harness.hostingCalls.some(call => call.operation === "draft-pr")).toBe(false); - }, 120_000); - it("rejects cross-repository workflow access", async () => { const harness = await createHarness(); await harness.controller.start(harness.fixture.checkout, autopilotSpec()); @@ -882,21 +756,17 @@ describe("autopilot adversarial trust boundaries", () => { .rejects.toMatchObject({ classification: "repository-identity-mismatch" }); }, 120_000); - it("exposes no force-push, no-verify, merge, close, delete, or arbitrary argv operation", async () => { + it("never publishes anything: the remote gains no ref from a complete workflow", async () => { const harness = await createHarness(); - await harness.controller.start(harness.fixture.checkout, autopilotSpec()); - const allowed = new Set(["preflight", "push", "draft-pr", "checks", "mark-ready"]); - expect(harness.hostingCalls.every(call => allowed.has(call.operation))).toBe(true); - const encoded = JSON.stringify(harness.hostingCalls).toLowerCase(); - for (const forbidden of ["force-push", "--force", "--no-verify", "merge", "close", "delete", "argv"]) { - expect(encoded).not.toContain(forbidden); - } - const requests: Array< - PushRequest | DraftPullRequestRequest | ChecksRequest | MarkReadyRequest - > = harness.hostingCalls - .filter(call => call.operation !== "preflight") - .map(call => call.request as PushRequest | DraftPullRequestRequest | ChecksRequest | MarkReadyRequest); - expect(requests.every(request => !("argv" in request))).toBe(true); + const remoteBefore = await runGit(harness.fixture.bareRemote, ["show-ref"]); + + const result = await harness.controller.start(harness.fixture.checkout, autopilotSpec()); + + expect(result.phase).toBe("ready-for-human-review"); + expect(harness.handoffs).toEqual([result.headCommitOid]); + expect(await runGit(harness.fixture.bareRemote, ["show-ref"])).toBe(remoteBefore); + expect(await runGit(harness.fixture.checkout, ["rev-parse", `refs/heads/${result.branch}`])) + .toBe(result.headCommitOid); }, 120_000); it("does not follow symlink-substituted workflow state", async () => { diff --git a/tests/runtime/autopilot/autopilot-controller.test.ts b/tests/runtime/autopilot/autopilot-controller.test.ts index 460ae47..7ab679b 100644 --- a/tests/runtime/autopilot/autopilot-controller.test.ts +++ b/tests/runtime/autopilot/autopilot-controller.test.ts @@ -13,8 +13,6 @@ import type { AutopilotWorkflowState } from "../../../src/autopilot/types.js"; import type { PipelineResult } from "../../../src/pipeline/pipeline-runtime.js"; import type { AutopilotSpec } from "../../../src/protocol/autopilot-spec.js"; import type { ReviewSnapshot } from "../../../src/runtime/review-snapshot.js"; -import type { HostingAdapter } from "../../../src/ship/hosting-adapter.js"; -import { GitHubCliAdapter } from "../../../src/ship/github-cli-adapter.js"; const REPOSITORY = "/repo"; const WORKFLOW_ID = "12345678-1234-4123-8123-123456789abc"; @@ -26,8 +24,6 @@ const SECOND_TREE = "5".repeat(40); const FIRST_MANIFEST = "a".repeat(64); const SECOND_MANIFEST = "b".repeat(64); const NOW = "2026-07-21T12:00:00.000Z"; -const DEADLINE = "2026-07-21T12:30:00.000Z"; -const PR_URL = "https://github.com/openai/claude-architect/pull/42"; function verification() { return [{ @@ -59,7 +55,7 @@ function delegation(objective: string) { function validSpec(): AutopilotSpec { return { - specVersion: "1", + specVersion: "2", topic: "delegation-autopilot", base: { remote: "origin", branch: "main" }, tasks: [ @@ -76,14 +72,6 @@ function validSpec(): AutopilotSpec { ], finalSuccessCriteria: ["The complete branch passes every release gate."], finalVerification: verification(), - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 1_800_000, - pullRequestTitle: "Add delegation autopilot", - pullRequestBody: "Implements the reviewed autonomous workflow.", - }, }; } @@ -170,21 +158,21 @@ function eligibilityFor( } function resumedState( - phase: "running-task" | "waiting-required-checks" | "ready-for-human-review", + phase: "running-task" | "cleaning-up" | "ready-for-human-review", ): AutopilotWorkflowState { - const shipping = phase === "waiting-required-checks" || phase === "ready-for-human-review"; + const reviewed = phase === "cleaning-up" || phase === "ready-for-human-review"; const terminal = phase === "ready-for-human-review"; return { - stateVersion: "1", + stateVersion: "2", workflowId: WORKFLOW_ID, repositoryIdentity: branch.repositoryIdentity, baseCommitOid: BASE, workflowRef: branch.branchRef, worktreePath: branch.worktreePath, autopilotSpecHash: canonicalArtifactHash(validSpec()), - revision: shipping ? 8 : 3, + revision: reviewed ? 8 : 3, phase, - currentTaskIndex: shipping ? 2 : 1, + currentTaskIndex: reviewed ? 2 : 1, tasks: [{ id: "contracts", runId: "run-contracts", @@ -194,30 +182,24 @@ function resumedState( status: "promoted", }, { id: "controller", - runId: shipping ? "run-controller" : null, - candidateManifestHash: shipping ? SECOND_MANIFEST : null, - eligibilityHash: shipping ? "7".repeat(64) : null, - promotionCommitOid: shipping ? SECOND_COMMIT : null, - status: shipping ? "promoted" : "running", + runId: reviewed ? "run-controller" : null, + candidateManifestHash: reviewed ? SECOND_MANIFEST : null, + eligibilityHash: reviewed ? "7".repeat(64) : null, + promotionCommitOid: reviewed ? SECOND_COMMIT : null, + status: reviewed ? "promoted" : "running", }], intentJournal: { ref: "journal.ndjson", entryCount: 2, lastEntryHash: "8".repeat(64), }, - finalGate: shipping ? { + finalGate: reviewed ? { reportRef: "final-branch-report.json", reportHash: "9".repeat(64), headCommitOid: SECOND_COMMIT, eligibilityHash: "9".repeat(64), } : null, - shipping: { - branch: branch.branch, - prNumber: shipping ? 42 : null, - prUrl: shipping ? PR_URL : null, - ciDeadlineAt: DEADLINE, - }, - ciObservations: [], + branch: branch.branch, cleanup: terminal ? { status: "succeeded", worktreeRemoved: true, @@ -383,7 +365,6 @@ class MemoryWorkflowStore implements WorkflowStorePort { } function harness(overrides: { - preflightError?: Error & { classification?: string }; branchError?: Error & { classification?: string }; branchIdentity?: WorkflowBranchIdentity; storeCreateError?: Error; @@ -405,35 +386,16 @@ function harness(overrides: { headCommitOid?: string; eligible?: boolean; reasons?: string[]; - status?: "ready-to-ship" | "human-decision-required"; + status?: "ready-for-human-review" | "human-decision-required"; }; - pushError?: Error & { classification?: string }; - pushHead?: string; - pullRequestError?: Error & { classification?: string }; - pullRequestHead?: string; - pullRequestDraft?: boolean; - checks?: Array<{ - result: "missing" | "pending" | "failed" | "passed"; - headCommitOid?: string; - checks: Array<{ - bucket: "pass" | "pending" | "fail" | "cancel" | "skipping"; - name: string; - state: string; - link: string | null; - }>; - }>; - checksError?: Error & { classification?: string }; - markReadyError?: Error & { classification?: string }; - readyHead?: string; - readyDraft?: boolean; cleanup?: { ok: true; worktreeRemoved: boolean; refsRemoved: boolean } | { ok: false; classification: "cleanup-failed" }; branchLoadMissing?: boolean; revalidation?: { ok: false; classification: "head-changed" }; now?: () => string; - sleepError?: Error & { classification?: string }; lockReleaseError?: Error; - hostingAdapter?: HostingAdapter; + decisionAuthority?: "autonomous" | "human"; + identityMissing?: boolean; } = {}) { const events: string[] = []; const operations: string[] = []; @@ -472,15 +434,6 @@ function harness(overrides: { if (overrides.lockReleaseError !== undefined) throw overrides.lockReleaseError; } }); - const preflight = vi.fn(async () => { - operations.push("side-effect:preflight"); - if (overrides.preflightError !== undefined) throw overrides.preflightError; - return { - provider: "github" as const, - repository: "openai/claude-architect", - canonicalHttpsUrl: "https://github.com/openai/claude-architect.git", - }; - }); const createBranch = vi.fn(async () => { operations.push("side-effect:create-branch"); if (overrides.branchError !== undefined) throw overrides.branchError; @@ -522,7 +475,7 @@ function harness(overrides: { operations.push("side-effect:final-review"); if (overrides.finalReviewError !== undefined) throw overrides.finalReviewError; return { - reportVersion: "1" as const, + reportVersion: "2" as const, workflowId: overrides.finalReport?.workflowId ?? WORKFLOW_ID, baseCommitOid: BASE, headCommitOid: overrides.finalReport?.headCommitOid ?? SECOND_COMMIT, @@ -533,65 +486,10 @@ function harness(overrides: { taskEvidenceHashes: ["a".repeat(64), "b".repeat(64)], eligible: overrides.finalReport?.eligible ?? true, reasons: overrides.finalReport?.reasons ?? [], - status: overrides.finalReport?.status ?? "ready-to-ship", + status: overrides.finalReport?.status ?? "ready-for-human-review", evaluatedAt: NOW, }; }); - const pushBranch = vi.fn(async () => { - operations.push("side-effect:push"); - if (overrides.pushError !== undefined) throw overrides.pushError; - return { remoteHead: overrides.pushHead ?? SECOND_COMMIT }; - }); - const ensureDraftPullRequest = vi.fn(async () => { - operations.push("side-effect:create-draft-pr"); - if (overrides.pullRequestError !== undefined) throw overrides.pullRequestError; - return { - number: 42, - url: PR_URL, - repository: "openai/claude-architect", - baseBranch: "main", - headBranch: branch.branch, - headCommitOid: overrides.pullRequestHead ?? SECOND_COMMIT, - draft: overrides.pullRequestDraft ?? true, - }; - }); - let checksIndex = 0; - const checkResults = overrides.checks ?? [{ - result: "pending" as const, - checks: [{ - bucket: "pending" as const, - name: "test", - state: "IN_PROGRESS", - link: null, - }], - }, { - result: "passed" as const, - checks: [{ - bucket: "pass" as const, - name: "test", - state: "SUCCESS", - link: "https://github.com/openai/claude-architect/actions/runs/1", - }], - }]; - const requiredChecks = vi.fn(async (request: { headCommitOid: string }) => { - operations.push("side-effect:required-checks"); - if (overrides.checksError !== undefined) throw overrides.checksError; - const result = checkResults[Math.min(checksIndex++, checkResults.length - 1)]!; - return { ...result, headCommitOid: result.headCommitOid ?? request.headCommitOid }; - }); - const markReady = vi.fn(async () => { - operations.push("side-effect:mark-ready"); - if (overrides.markReadyError !== undefined) throw overrides.markReadyError; - return { - number: 42, - url: PR_URL, - repository: "openai/claude-architect", - baseBranch: "main", - headBranch: branch.branch, - headCommitOid: overrides.readyHead ?? SECOND_COMMIT, - draft: overrides.readyDraft ?? false, - }; - }); const cleanup = vi.fn(async () => { operations.push("side-effect:cleanup"); return overrides.cleanup ?? { ok: true as const, worktreeRemoved: true, refsRemoved: true }; @@ -599,10 +497,6 @@ function harness(overrides: { const loadBranch = vi.fn(async () => overrides.branchLoadMissing ? null : branch); const revalidate = vi.fn(async () => overrides.revalidation ?? ({ ok: true as const })); const repositoryIdentity = vi.fn(async () => branch.repositoryIdentity); - const sleep = vi.fn(async (milliseconds: number) => { - operations.push(`side-effect:sleep:${milliseconds}`); - if (overrides.sleepError !== undefined) throw overrides.sleepError; - }); const dependencies = { workflowId, @@ -616,16 +510,9 @@ function harness(overrides: { eligibilityEvaluator: { evaluate }, promoter: { promote }, finalBranchReviewer: { review: finalReview }, - hostingAdapter: overrides.hostingAdapter ?? { - preflight, - pushBranch, - ensureDraftPullRequest, - requiredChecks, - markReady, - }, - requiredChecksPollIntervalMs: 1_000, - sleep, emit: (event: string) => { events.push(event); }, + decisionAuthority: () => overrides.decisionAuthority ?? "autonomous", + commitIdentityAvailable: async () => overrides.identityMissing !== true, } as unknown as AutopilotControllerDependencies; return { @@ -636,29 +523,23 @@ function harness(overrides: { spies: { workflowId, lock, - preflight, createBranch, runPipeline, createSnapshot, evaluate, promote, finalReview, - pushBranch, - ensureDraftPullRequest, - requiredChecks, - markReady, cleanup, loadBranch, revalidate, repositoryIdentity, - sleep, workflowStore: dependencies.workflowStore, }, }; } -describe("AutopilotController start-through-shipping", () => { - it("promotes every task, ships a draft, waits for required checks, and marks ready", async () => { +describe("AutopilotController start-through-hand-off", () => { + it("promotes every task, final-reviews the branch, and hands it off without publishing", async () => { const run = harness(); const result = await run.controller.start(REPOSITORY, validSpec()); @@ -668,18 +549,14 @@ describe("AutopilotController start-through-shipping", () => { phase: "ready-for-human-review", currentTaskIndex: 2, headCommitOid: SECOND_COMMIT, - pullRequest: { - number: 42, - draft: false, - headCommitOid: SECOND_COMMIT, - }, - shipping: { prNumber: 42, prUrl: PR_URL, ciDeadlineAt: DEADLINE }, + branch: branch.branch, finalGate: { headCommitOid: SECOND_COMMIT }, cleanup: { status: "succeeded", worktreeRemoved: true, lockReleased: true }, terminal: { classification: "ready-for-human-review" }, }); + expect(result).not.toHaveProperty("pullRequest"); + expect(result).not.toHaveProperty("shipping"); expect(result.tasks.map(task => task.status)).toEqual(["promoted", "promoted"]); - expect(result.pullRequest.headCommitOid).toBe(result.headCommitOid); expect(run.events).toEqual([ "preflight", "task:contracts", @@ -687,11 +564,6 @@ describe("AutopilotController start-through-shipping", () => { "task:controller", "promote:controller", "final-review", - "push", - "draft-pr", - "checks:pending", - "checks:pass", - "mark-ready", "cleanup", "ready", ]); @@ -702,13 +574,8 @@ describe("AutopilotController start-through-shipping", () => { expectedRevision: 5, checkoutPath: branch.worktreePath, })); - expect(run.spies.pushBranch).toHaveBeenCalledWith(expect.objectContaining({ - headCommitOid: SECOND_COMMIT, - })); - expect(run.spies.markReady).toHaveBeenCalledWith(expect.objectContaining({ - headCommitOid: SECOND_COMMIT, - })); - expect(run.spies.cleanup).toHaveBeenCalledWith(branch, SECOND_COMMIT); + // The reviewed branch is the hand-off, so cleanup must keep it. + expect(run.spies.cleanup).toHaveBeenCalledWith(branch, SECOND_COMMIT, { retainBranch: true }); expect(run.operations.indexOf("persist:running-task")) .toBeLessThan(run.operations.indexOf("side-effect:task:0")); @@ -719,13 +586,9 @@ describe("AutopilotController start-through-shipping", () => { expect(run.operations.indexOf("side-effect:promote:1")) .toBeLessThan(run.operations.indexOf("persist:final-review")); expect(run.operations.indexOf("side-effect:final-review")) - .toBeLessThan(run.operations.indexOf("side-effect:push")); - expect(run.operations.indexOf("side-effect:push")) - .toBeLessThan(run.operations.indexOf("side-effect:create-draft-pr")); - expect(run.operations.indexOf("side-effect:create-draft-pr")) - .toBeLessThan(run.operations.indexOf("side-effect:required-checks")); - expect(run.operations.indexOf("side-effect:required-checks")) - .toBeLessThan(run.operations.indexOf("side-effect:mark-ready")); + .toBeLessThan(run.operations.indexOf("persist:cleaning-up")); + expect(run.operations.indexOf("persist:cleaning-up")) + .toBeLessThan(run.operations.indexOf("side-effect:cleanup")); expect(run.operations.indexOf("side-effect:cleanup")) .toBeLessThan(run.operations.indexOf("lock:released")); expect(run.operations.indexOf("lock:released")) @@ -744,18 +607,47 @@ describe("AutopilotController start-through-shipping", () => { expect(run.operations).toEqual([]); }); - it("halts on shipping preflight failure before branch creation or a Producer", async () => { - const error = Object.assign(new Error("auth failed"), { - classification: "preflight-auth-failed", - }); - const run = harness({ preflightError: error }); + it("refuses to start under the human decision authority before any side effect", async () => { + const run = harness({ decisionAuthority: "human" }); await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "preflight-auth-failed", + classification: "decision-authority-human", }); + expect(run.operations).toEqual([]); expect(run.spies.createBranch).not.toHaveBeenCalled(); + }); + + it("refuses to start without a Git identity before any side effect", async () => { + const run = harness({ identityMissing: true }); + + await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ + classification: "git-identity-missing", + }); + expect(run.operations).toEqual([]); + }); + + it("refuses to resume an active workflow under the human decision authority", async () => { + const run = harness({ decisionAuthority: "human" }); + const state = resumedState("running-task"); + run.store.state = structuredClone(state); + + await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).rejects.toMatchObject({ + classification: "decision-authority-human", + }); + + expect(run.store.state).toEqual(state); + expect(run.operations).toEqual(["lock", "read:state", "lock:released"]); expect(run.spies.runPipeline).not.toHaveBeenCalled(); + }); + + it("finishes an already-promoted workflow under the human decision authority", async () => { + const run = harness({ decisionAuthority: "human" }); + run.store.state = resumedState("cleaning-up"); + + await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).resolves.toMatchObject({ + phase: "ready-for-human-review", + }); expect(run.spies.promote).not.toHaveBeenCalled(); }); @@ -771,7 +663,6 @@ describe("AutopilotController start-through-shipping", () => { expect(run.operations).toEqual([ "lock", - "side-effect:preflight", "side-effect:create-branch", "lock:released", ]); @@ -789,18 +680,6 @@ describe("AutopilotController start-through-shipping", () => { expect(run.spies.finalReview).not.toHaveBeenCalled(); }); - it("cleans an exact created branch on shipping repository mismatch", async () => { - const mismatched = { ...branch, ownerRepo: "elsewhere/repository" }; - const run = harness({ branchIdentity: mismatched }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "repository-identity-mismatch", - }); - - expect(run.spies.cleanup).toHaveBeenCalledWith(mismatched, BASE); - expect(run.spies.runPipeline).not.toHaveBeenCalled(); - }); - it("halts a failed pipeline without snapshotting or promoting", async () => { const run = harness({ firstPipeline: pipelineResult({ @@ -869,7 +748,6 @@ describe("AutopilotController start-through-shipping", () => { expect(run.spies.evaluate).not.toHaveBeenCalled(); expect(run.spies.promote).not.toHaveBeenCalled(); expect(run.spies.finalReview).not.toHaveBeenCalled(); - expect(run.spies.pushBranch).not.toHaveBeenCalled(); }); it.each([ @@ -902,10 +780,6 @@ describe("AutopilotController start-through-shipping", () => { "eligibility", "promotion", "final-review", - "push", - "create-draft-pr", - "required-checks", - "mark-ready", "cleanup", ] as const; const operationPrefix: Record<(typeof orderedCollaborators)[number], string> = { @@ -914,10 +788,6 @@ describe("AutopilotController start-through-shipping", () => { eligibility: "side-effect:eligibility", promotion: "side-effect:promote:", "final-review": "side-effect:final-review", - push: "side-effect:push", - "create-draft-pr": "side-effect:create-draft-pr", - "required-checks": "side-effect:required-checks", - "mark-ready": "side-effect:mark-ready", cleanup: "side-effect:cleanup", }; const redIndex = orderedCollaborators.indexOf(stage); @@ -961,7 +831,7 @@ describe("AutopilotController start-through-shipping", () => { expect(run.events).toEqual(["preflight", "task:contracts", "promote:contracts"]); }); - it("halts on a human-decision-required final report before push", async () => { + it("halts on a human-decision-required final report before cleanup", async () => { const run = harness({ finalReport: { eligible: false, @@ -978,231 +848,19 @@ describe("AutopilotController start-through-shipping", () => { phase: "human-decision-required", finalGate: { headCommitOid: SECOND_COMMIT }, }); - expect(run.spies.pushBranch).not.toHaveBeenCalled(); - expect(run.spies.ensureDraftPullRequest).not.toHaveBeenCalled(); - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); expect(run.spies.cleanup).not.toHaveBeenCalled(); }); - it("halts on a final report for a stale head before push", async () => { + it("halts on a final report for a stale head before cleanup", async () => { const run = harness({ finalReport: { headCommitOid: FIRST_COMMIT } }); await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ classification: "stale-final-review", }); - expect(run.spies.pushBranch).not.toHaveBeenCalled(); - expect(run.spies.ensureDraftPullRequest).not.toHaveBeenCalled(); - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts on push failure before creating a pull request", async () => { - const pushError = Object.assign(new Error("push failed"), { - classification: "push-command-failed", - }); - const run = harness({ pushError }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "push-command-failed", - }); - - expect(run.spies.ensureDraftPullRequest).not.toHaveBeenCalled(); - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts on pushed-head mismatch before creating a pull request", async () => { - const run = harness({ pushHead: FIRST_COMMIT }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "push-head-mismatch", - }); - - expect(run.spies.ensureDraftPullRequest).not.toHaveBeenCalled(); - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts on pull-request ambiguity before checking CI", async () => { - const pullRequestError = Object.assign(new Error("ambiguous"), { - classification: "draft-pull-request-ambiguous", - }); - const run = harness({ pullRequestError }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "draft-pull-request-ambiguous", - }); - - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts on draft pull-request identity mismatch before checking CI", async () => { - const run = harness({ pullRequestHead: FIRST_COMMIT }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "draft-pull-request-identity-mismatch", - }); - - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts when the required-check set is missing before mark-ready", async () => { - const run = harness({ checks: [{ result: "missing", checks: [] }] }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "required-checks-missing", - }); - - expect(run.store.state?.ciObservations).toEqual([expect.objectContaining({ - result: "missing", - checks: [], - })]); - expect(run.spies.markReady).not.toHaveBeenCalled(); expect(run.spies.cleanup).not.toHaveBeenCalled(); }); - it("halts pending checks at the original absolute deadline", async () => { - const times = [NOW, NOW, "2026-07-21T12:29:59.500Z", DEADLINE]; - const now = vi.fn(() => times.shift() ?? DEADLINE); - const run = harness({ - now, - checks: [{ - result: "pending", - checks: [{ bucket: "pending", name: "test", state: "IN_PROGRESS", link: null }], - }], - }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "required-checks-timeout", - }); - - expect(run.store.state?.shipping.ciDeadlineAt).toBe(DEADLINE); - expect(run.spies.requiredChecks).toHaveBeenCalledTimes(1); - expect(run.spies.sleep).toHaveBeenCalledWith(500); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts red required checks before mark-ready", async () => { - const run = harness({ - checks: [{ - result: "failed", - checks: [{ bucket: "fail", name: "test", state: "FAILURE", link: null }], - }], - }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "required-checks-red", - }); - - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts on a required-check query failure before mark-ready", async () => { - const error = Object.assign(new Error("checks unavailable"), { - classification: "required-checks-query-failed", - }); - const run = harness({ checksError: error }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "required-checks-query-failed", - }); - - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("halts on a bounded-wait failure before another check query", async () => { - const error = Object.assign(new Error("wait failed"), { - classification: "checks-wait-failed", - }); - const run = harness({ sleepError: error }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "checks-wait-failed", - }); - - expect(run.spies.requiredChecks).toHaveBeenCalledTimes(1); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("rejects an all-pass observation returned after the absolute deadline", async () => { - const times = [NOW, "2026-07-21T12:29:59.999Z", DEADLINE]; - const run = harness({ - now: vi.fn(() => times.shift() ?? DEADLINE), - checks: [{ - result: "passed", - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }], - }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "required-checks-timeout", - }); - - expect(run.spies.requiredChecks).toHaveBeenCalledTimes(1); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("never marks ready from passing checks bound to an earlier head", async () => { - const times = [NOW, "2026-07-21T12:29:59.999Z", DEADLINE]; - const run = harness({ - now: vi.fn(() => times.shift() ?? DEADLINE), - checks: [{ - result: "passed", - headCommitOid: FIRST_COMMIT, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }], - }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "required-checks-timeout", - }); - expect(run.store.state?.ciObservations).toEqual([ - expect.objectContaining({ result: "passed", headCommitOid: FIRST_COMMIT }), - ]); - expect(run.spies.markReady).not.toHaveBeenCalled(); - }); - - it("halts a mark-ready failure before cleanup", async () => { - const markReadyError = Object.assign(new Error("ready failed"), { - classification: "mark-ready-command-failed", - }); - const run = harness({ markReadyError }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "mark-ready-command-failed", - }); - - expect(run.spies.cleanup).not.toHaveBeenCalled(); - expect(run.events).not.toContain("cleanup"); - expect(run.events).not.toContain("ready"); - }); - - it("halts on ready pull-request identity mismatch before cleanup", async () => { - const run = harness({ readyDraft: true }); - - await expect(run.controller.start(REPOSITORY, validSpec())).rejects.toMatchObject({ - classification: "mark-ready-identity-mismatch", - }); - - expect(run.spies.cleanup).not.toHaveBeenCalled(); - expect(run.events).not.toContain("cleanup"); - expect(run.events).not.toContain("ready"); - }); - it("records cleanup failure and cannot produce the success terminal", async () => { const run = harness({ cleanup: { ok: false, classification: "cleanup-failed" } }); @@ -1259,18 +917,7 @@ describe("AutopilotController start-through-shipping", () => { it("returns redacted status using only read-only collaborators", async () => { const run = harness(); - run.store.state = resumedState("waiting-required-checks"); - run.store.state.ciObservations.push({ - observedAt: NOW, - result: "pending", - headCommitOid: SECOND_COMMIT, - checks: [{ - bucket: "pending", - name: "test", - state: "IN_PROGRESS", - link: "https://github.com/openai/claude-architect/actions/runs/secret", - }], - }); + run.store.state = resumedState("cleaning-up"); const result = await run.controller.status(REPOSITORY, WORKFLOW_ID); @@ -1278,14 +925,13 @@ describe("AutopilotController start-through-shipping", () => { workflowId: WORKFLOW_ID, repositoryIdentity: "[redacted]", worktreePath: "[redacted]", - shipping: { prUrl: "[redacted]" }, - ciObservations: [{ checks: [{ link: "[redacted]" }] }], + branch: branch.branch, }); expect(run.operations).toEqual(["read:state"]); expect(run.spies.lock).not.toHaveBeenCalled(); - expect(run.spies.preflight).not.toHaveBeenCalled(); expect(run.spies.revalidate).not.toHaveBeenCalled(); expect(run.spies.runPipeline).not.toHaveBeenCalled(); + expect(run.spies.cleanup).not.toHaveBeenCalled(); }); it("fails status identity validation without reading branch ownership or mutating", async () => { @@ -1321,7 +967,7 @@ describe("AutopilotController start-through-shipping", () => { expect(result).toMatchObject({ phase: "ready-for-human-review", currentTaskIndex: 2, - shipping: { ciDeadlineAt: DEADLINE }, + branch: branch.branch, }); expect(run.spies.runPipeline).toHaveBeenCalledTimes(1); expect(run.spies.promote).toHaveBeenCalledWith(expect.objectContaining({ @@ -1351,278 +997,12 @@ describe("AutopilotController start-through-shipping", () => { })); }); - it("resumes pending shipping checks only until the original deadline", async () => { - const times = ["2026-07-21T12:29:59.500Z", "2026-07-21T12:29:59.500Z", DEADLINE]; - const run = harness({ - now: vi.fn(() => times.shift() ?? DEADLINE), - checks: [{ - result: "pending", - checks: [{ bucket: "pending", name: "test", state: "IN_PROGRESS", link: null }], - }], - }); - run.store.state = resumedState("waiting-required-checks"); - - await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).rejects.toMatchObject({ - classification: "required-checks-timeout", - }); - - expect(run.store.state?.shipping.ciDeadlineAt).toBe(DEADLINE); - expect(run.spies.requiredChecks).toHaveBeenCalledTimes(1); - expect(run.spies.sleep).toHaveBeenCalledWith(500); - expect(run.spies.markReady).not.toHaveBeenCalled(); - }); - - it("re-establishes exact draft PR identity before resumed check polling", async () => { - const run = harness({ - checks: [{ - result: "passed", - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }], - }); - run.store.state = resumedState("waiting-required-checks"); - - await run.controller.resume(REPOSITORY, WORKFLOW_ID); - - expect(run.spies.ensureDraftPullRequest).toHaveBeenCalledTimes(1); - expect(run.operations.indexOf("side-effect:create-draft-pr")) - .toBeLessThan(run.operations.indexOf("side-effect:required-checks")); - }); - - it("rejects a resumed all-pass result returned at the original deadline", async () => { - const times = ["2026-07-21T12:29:59.999Z", DEADLINE]; - const run = harness({ - now: vi.fn(() => times.shift() ?? DEADLINE), - checks: [{ - result: "passed", - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }], - }); - run.store.state = resumedState("waiting-required-checks"); - - await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).rejects.toMatchObject({ - classification: "required-checks-timeout", - }); - - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("replays marking-ready without polling required checks again", async () => { - const run = harness(); - const state = resumedState("waiting-required-checks"); - state.phase = "marking-ready"; - state.ciObservations.push({ - observedAt: "2026-07-21T12:29:00.000Z", - result: "passed", - headCommitOid: SECOND_COMMIT, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }); - run.store.state = state; - - const result = await run.controller.resume(REPOSITORY, WORKFLOW_ID); - - expect(result).toMatchObject({ phase: "ready-for-human-review" }); - expect(run.spies.ensureDraftPullRequest).toHaveBeenCalledTimes(1); - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).toHaveBeenCalledTimes(1); - expect(run.spies.cleanup).toHaveBeenCalledTimes(1); - }); - - it("fails closed before replaying mark-ready without persisted all-pass proof", async () => { - const run = harness(); - const state = resumedState("waiting-required-checks"); - state.phase = "marking-ready"; - run.store.state = state; - - await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).rejects.toMatchObject({ - classification: "required-checks-proof-missing", - }); - - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).not.toHaveBeenCalled(); - }); - - it("fails closed before replaying mark-ready from stale-head all-pass proof", async () => { - const run = harness(); - const state = resumedState("waiting-required-checks"); - state.phase = "marking-ready"; - state.ciObservations.push({ - observedAt: "2026-07-21T12:29:00.000Z", - result: "passed", - headCommitOid: FIRST_COMMIT, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }); - run.store.state = state; - - await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).rejects.toMatchObject({ - classification: "required-checks-proof-missing", - }); - expect(run.spies.markReady).not.toHaveBeenCalled(); - }); - - it("observes an already-ready exact pull request after a mark-ready crash", async () => { - const run = harness({ pullRequestDraft: false }); - const state = resumedState("waiting-required-checks"); - state.phase = "marking-ready"; - state.ciObservations.push({ - observedAt: "2026-07-21T12:29:00.000Z", - result: "passed", - headCommitOid: SECOND_COMMIT, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }); - run.store.state = state; - - const result = await run.controller.resume(REPOSITORY, WORKFLOW_ID); - - expect(result).toMatchObject({ phase: "ready-for-human-review" }); - expect(run.spies.ensureDraftPullRequest).toHaveBeenCalledTimes(1); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).toHaveBeenCalledTimes(1); - }); - - it("uses persisted exact-head proof when waiting-checks reconciliation finds the PR ready", async () => { - const run = harness({ pullRequestDraft: false }); - const state = resumedState("waiting-required-checks"); - state.ciObservations.push({ - observedAt: "2026-07-21T12:29:00.000Z", - result: "passed", - headCommitOid: SECOND_COMMIT, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }); - run.store.state = state; - - await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).resolves.toMatchObject({ - phase: "ready-for-human-review", - }); - expect(run.spies.requiredChecks).not.toHaveBeenCalled(); - expect(run.spies.markReady).not.toHaveBeenCalled(); - expect(run.spies.cleanup).toHaveBeenCalledTimes(1); - }); - - it.each([ - ["after gh pr ready", false, 0], - ["before gh pr ready", true, 1], - ] as const)( - "recovers %s with a fresh real GitHub adapter", - async (_cutPoint, initialDraft, expectedReadyCalls) => { - const commands: Array<{ executable: "gh" | "git"; args: string[] }> = []; - let draft = true; - const createAdapter = () => { - const adapter = new GitHubCliAdapter(); - Object.defineProperty(adapter, "runner", { - value: async (request: { executable: "gh" | "git"; args: string[] }) => { - commands.push({ executable: request.executable, args: [...request.args] }); - const ok = (stdout = "") => ({ - exitCode: 0, - stdout, - stderr: "", - truncated: { stdout: false, stderr: false }, - }); - if (request.args[0] === "version") return ok("gh version 2.96.0\n"); - if (request.args[0] === "auth") return ok(); - if (request.args[0] === "repo") { - return ok(JSON.stringify({ - nameWithOwner: "openai/claude-architect", - url: "https://github.com/openai/claude-architect", - })); - } - if (request.args[0] === "pr" && request.args[1] === "list") { - return ok(JSON.stringify([{ - number: 42, - url: PR_URL, - baseRefName: "main", - headRefName: branch.branch, - headRefOid: SECOND_COMMIT, - headRepository: { nameWithOwner: "openai/claude-architect" }, - isDraft: draft, - }])); - } - if (request.args[0] === "pr" && request.args[1] === "view") { - return ok(JSON.stringify({ - number: 42, - url: PR_URL, - baseRefName: "main", - headRefName: branch.branch, - headRefOid: SECOND_COMMIT, - headRepository: { nameWithOwner: "openai/claude-architect" }, - isDraft: draft, - })); - } - if (request.args[0] === "pr" && request.args[1] === "checks") { - return ok(JSON.stringify([ - { bucket: "pass", name: "test", state: "SUCCESS", link: null }, - ])); - } - if (request.args[0] === "pr" && request.args[1] === "ready") { - draft = false; - return ok(); - } - throw new Error(`unexpected command: ${request.executable} ${request.args.join(" ")}`); - }, - }); - return adapter; - }; - if (!initialDraft) { - const preCrashAdapter = createAdapter(); - await preCrashAdapter.ensureDraftPullRequest({ - checkoutPath: branch.worktreePath, - target: { - provider: "github", - repository: "openai/claude-architect", - canonicalHttpsUrl: "https://github.com/openai/claude-architect.git", - }, - baseBranch: "main", - headBranch: branch.branch, - headCommitOid: SECOND_COMMIT, - title: "Ship reviewed workflow", - body: "Crash recovery fixture.", - }); - await preCrashAdapter.markReady({ - checkoutPath: branch.worktreePath, - target: { - provider: "github", - repository: "openai/claude-architect", - canonicalHttpsUrl: "https://github.com/openai/claude-architect.git", - }, - pullRequestNumber: 42, - headCommitOid: SECOND_COMMIT, - }); - } - const resumeCommandIndex = commands.length; - const run = harness({ hostingAdapter: createAdapter() }); - const state = resumedState("waiting-required-checks"); - state.phase = "marking-ready"; - state.ciObservations.push({ - observedAt: "2026-07-21T12:29:00.000Z", - result: "passed", - headCommitOid: SECOND_COMMIT, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }); - run.store.state = state; - - await expect(run.controller.resume(REPOSITORY, WORKFLOW_ID)).resolves.toMatchObject({ - phase: "ready-for-human-review", - }); - - expect(commands.slice(resumeCommandIndex) - .filter(command => command.args.slice(0, 2).join(" ") === "pr ready")) - .toHaveLength(expectedReadyCalls); - expect(commands.filter(command => command.args.slice(0, 2).join(" ") === "pr ready")) - .toHaveLength(1); - expect(commands.some(command => command.args.slice(0, 2).join(" ") === "pr create")) - .toBe(false); - expect(commands.some(command => command.executable === "git" && command.args.includes("push"))) - .toBe(false); - }, - ); - it("fails closed when incomplete cleanup cannot be reproven", async () => { const run = harness({ branchLoadMissing: true, cleanup: { ok: false, classification: "cleanup-failed" }, }); - const state = resumedState("waiting-required-checks"); - state.phase = "cleaning-up"; + const state = resumedState("cleaning-up"); run.store.state = state; run.store.seedCleanupIntent(SECOND_COMMIT); @@ -1631,13 +1011,12 @@ describe("AutopilotController start-through-shipping", () => { }); expect(run.spies.revalidate).not.toHaveBeenCalled(); - expect(run.spies.cleanup).toHaveBeenCalledWith(branch, SECOND_COMMIT); + expect(run.spies.cleanup).toHaveBeenCalledWith(branch, SECOND_COMMIT, { retainBranch: true }); }); it("reuses durable cleanup proof without repeating cleanup", async () => { const run = harness({ branchLoadMissing: true }); - const state = resumedState("waiting-required-checks"); - state.phase = "cleaning-up"; + const state = resumedState("cleaning-up"); run.store.state = state; run.store.seedCleanupIntent(SECOND_COMMIT, true); @@ -1657,7 +1036,6 @@ describe("AutopilotController start-through-shipping", () => { expect(result).toEqual(terminal); expect(run.operations).toEqual(["lock", "read:state", "lock:released"]); expect(run.spies.loadBranch).not.toHaveBeenCalled(); - expect(run.spies.preflight).not.toHaveBeenCalled(); expect(run.spies.runPipeline).not.toHaveBeenCalled(); expect(run.spies.cleanup).not.toHaveBeenCalled(); }); @@ -1675,7 +1053,6 @@ describe("AutopilotController start-through-shipping", () => { expect(run.store.state).toEqual(state); expect(run.operations).toEqual(["lock", "read:state", "lock:released"]); expect(run.spies.loadBranch).not.toHaveBeenCalled(); - expect(run.spies.preflight).not.toHaveBeenCalled(); expect(run.spies.runPipeline).not.toHaveBeenCalled(); }); }); @@ -1733,7 +1110,6 @@ describe("AutopilotController workflow leases", () => { "lock:released", ]); expect(run.spies.loadBranch).not.toHaveBeenCalled(); - expect(run.spies.preflight).not.toHaveBeenCalled(); expect(run.spies.runPipeline).not.toHaveBeenCalled(); }); diff --git a/tests/runtime/autopilot/autopilot-doctor.test.ts b/tests/runtime/autopilot/autopilot-doctor.test.ts index df5e465..54badf9 100644 --- a/tests/runtime/autopilot/autopilot-doctor.test.ts +++ b/tests/runtime/autopilot/autopilot-doctor.test.ts @@ -95,7 +95,7 @@ function autopilotSpec(): AutopilotSpec { expectedExitCodes: [0], }]; return { - specVersion: "1", + specVersion: "2", topic: "autopilot-doctor", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -117,20 +117,12 @@ function autopilotSpec(): AutopilotSpec { }], finalSuccessCriteria: ["Diagnostics remain read-only."], finalVerification: verification, - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 1_800_000, - pullRequestTitle: "Exercise autopilot doctor", - pullRequestBody: "Autopilot doctor fixture.", - }, }; } function initialState(branch: WorkflowBranchIdentity): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId: branch.workflowId, repositoryIdentity: branch.repositoryIdentity, baseCommitOid: branch.baseCommitOid, @@ -150,13 +142,7 @@ function initialState(branch: WorkflowBranchIdentity): AutopilotWorkflowState { }], intentJournal: { ref: "journal.ndjson", entryCount: 0, lastEntryHash: null }, finalGate: null, - shipping: { - branch: branch.branch, - prNumber: null, - prUrl: null, - ciDeadlineAt: "2026-07-21T18:30:00.000Z", - }, - ciObservations: [], + branch: branch.branch, cleanup: null, terminal: null, createdAt: "2026-07-21T18:00:00.000Z", @@ -288,26 +274,6 @@ async function runDoctor() { }); } -async function transitionTo( - store: WorkflowStore, - target: "pushing" | "creating-draft-pr" | "marking-ready", -): Promise { - const phases = [ - "running-task", - "promoting-task", - "final-review", - "pushing", - "creating-draft-pr", - "waiting-required-checks", - "marking-ready", - ] as const; - let state = await store.read(); - for (const phase of phases) { - state = await store.transition({ expectedRevision: state.revision, to: phase }); - if (phase === target) return; - } -} - async function snapshot(directory: string): Promise { const output: ByteSnapshot = []; async function visit(current: string, prefix: string): Promise { @@ -397,25 +363,6 @@ describe("autopilot doctor diagnostics", () => { expect((await runDoctor()).issues).toContain("autopilot-promotion-incomplete"); }); - it("reports autopilot-remote-recovery-required for interrupted pushing", async () => { - const fixture = await createFixture(); - await transitionTo(fixture.store, "pushing"); - await makeOwnersDead(fixture); - - expect((await runDoctor()).issues).toContain("autopilot-remote-recovery-required"); - }); - - it.each(["creating-draft-pr", "marking-ready"] as const)( - "reports autopilot-pr-recovery-required for interrupted %s", - async phase => { - const fixture = await createFixture(); - await transitionTo(fixture.store, phase); - await makeOwnersDead(fixture); - - expect((await runDoctor()).issues).toContain("autopilot-pr-recovery-required"); - }, - ); - it("reports bounded malformed state, journal, owner, and registration without disclosure", async () => { const stateFixture = await createFixture(); const journalFixture = await createFixture(); diff --git a/tests/runtime/autopilot/autopilot-e2e.test.ts b/tests/runtime/autopilot/autopilot-e2e.test.ts index 245daa9..e04369e 100644 --- a/tests/runtime/autopilot/autopilot-e2e.test.ts +++ b/tests/runtime/autopilot/autopilot-e2e.test.ts @@ -47,17 +47,12 @@ import { ProducerRegistry } from "../../../src/producers/producer-registry.js"; import { ArtifactStore } from "../../../src/runtime/artifact-store.js"; import type { AttemptRuntimeDependencies } from "../../../src/runtime/attempt-runtime.js"; import { createReviewSnapshot } from "../../../src/runtime/review-snapshot.js"; -import { - InMemoryHostingAdapter, - type InMemoryHostingOperations, -} from "../../../src/ship/github-cli-adapter.js"; import { AcceptanceVerifier } from "../../../src/verify/acceptance-verifier.js"; const editFixture = fileURLToPath(new URL("../fixtures/edit-file.mjs", import.meta.url)); const WORKFLOW_ID = "workflow-e2e-12345678"; const NOW = "2026-07-21T12:00:00.000Z"; const REMOTE_URL = "https://github.com/example/autopilot-fixture.git"; -const REPOSITORY = "example/autopilot-fixture"; const nodeExecutable: ResolvedExecutable = { kind: "native", command: process.execPath, @@ -266,7 +261,7 @@ function delegation(task: "one" | "two"): DelegationSpec { function autopilotSpec(): AutopilotSpec { return { - specVersion: "1", + specVersion: "2", topic: "e2e-green", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -291,14 +286,6 @@ function autopilotSpec(): AutopilotSpec { network: "denied", expectedExitCodes: [0], }], - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 600_000, - pullRequestTitle: "Autopilot E2E", - pullRequestBody: "Exercises the complete verified workflow.", - }, }; } @@ -344,7 +331,7 @@ afterEach(async () => { }); describe("AutopilotController end-to-end", () => { - it("promotes two exact commits, freezes cumulative evidence, ships, and cleans up", async () => { + it("promotes two exact commits, freezes cumulative evidence, and hands off the reviewed branch", async () => { const root = temporaryPaths[0]!; const stateRoot = process.env.CLAUDE_PLUGIN_DATA!; const fixture = await createRepository(root); @@ -371,54 +358,6 @@ describe("AutopilotController end-to-end", () => { remoteTransport: localRemoteTransport(fixture.bareRemote), }); const workflowStore = (workflowId: string) => new WorkflowStore(workflowId); - const shippingOrder: string[] = []; - let shippedHead = ""; - let shippedBranch = ""; - const hostingOperations: InMemoryHostingOperations = { - preflight: async () => ({ - provider: "github", - repository: REPOSITORY, - canonicalHttpsUrl: REMOTE_URL, - }), - pushBranch: async request => { - shippingOrder.push("push"); - shippedHead = request.headCommitOid; - shippedBranch = request.branch; - return { remoteHead: request.headCommitOid }; - }, - ensureDraftPullRequest: async request => { - shippingOrder.push("draft-pr"); - return { - number: 42, - url: "https://github.com/example/autopilot-fixture/pull/42", - repository: REPOSITORY, - baseBranch: request.baseBranch, - headBranch: request.headBranch, - headCommitOid: request.headCommitOid, - draft: true, - }; - }, - requiredChecks: async request => { - shippingOrder.push("checks"); - return { - result: "passed", - headCommitOid: request.headCommitOid, - checks: [{ bucket: "pass", name: "test", state: "SUCCESS", link: null }], - }; - }, - markReady: async () => { - shippingOrder.push("mark-ready"); - return { - number: 42, - url: "https://github.com/example/autopilot-fixture/pull/42", - repository: REPOSITORY, - baseBranch: "main", - headBranch: shippedBranch, - headCommitOid: shippedHead, - draft: false, - }; - }, - }; const controller = new AutopilotController({ workflowId: () => WORKFLOW_ID, now: () => NOW, @@ -476,9 +415,6 @@ describe("AutopilotController end-to-end", () => { roleRunner: approvingRoleRunner, now: () => NOW, }), - hostingAdapter: new InMemoryHostingAdapter(hostingOperations), - requiredChecksPollIntervalMs: 100, - sleep: async () => {}, }); const result = await controller.start(fixture.checkout, autopilotSpec()); @@ -488,16 +424,32 @@ describe("AutopilotController end-to-end", () => { expect(result.tasks.map(task => task.status)).toEqual(["promoted", "promoted"]); expect(producer.invocations.filter(name => name !== "probe")) .toEqual(["task-one", "task-two"]); - expect(shippingOrder).toEqual(["push", "draft-pr", "checks", "mark-ready"]); - expect(shippedHead).toBe(result.headCommitOid); + // The final-reviewed branch survives cleanup as the hand-off to the + // delivery gate; nothing was pushed. + expect(await runGit(fixture.checkout, ["rev-parse", `refs/heads/${result.branch}`])) + .toBe(result.headCommitOid); + expect((await git(fixture.bareRemote, ["show-ref", "--verify", "--quiet", `refs/heads/${result.branch}`])).exitCode) + .toBe(1); expect(await runGit(fixture.checkout, [ "log", "--reverse", "--format=%s", `${fixture.baseCommitOid}..${result.headCommitOid}`, ])).toBe("feat: promote task one\nfeat: promote task two"); + // Promotions are the user's commits, not the runtime's fixed identity. + expect(await runGit(fixture.checkout, [ + "log", "--format=%an <%ae>|%cn", `${fixture.baseCommitOid}..${result.headCommitOid}`, + ])).toBe([ + "Autopilot E2E |Autopilot E2E", + "Autopilot E2E |Autopilot E2E", + ].join("\n")); expect(await runGit(fixture.checkout, ["show", `${result.headCommitOid}:task-one.txt`])) .toBe("task-one promoted bytes"); expect(await runGit(fixture.checkout, ["show", `${result.headCommitOid}:task-two.txt`])) .toBe("task-two promoted bytes"); - expect(await workingTreeSnapshot(fixture.checkout)).toEqual(humanBefore); + // The only runtime residue in the checkout is the self-ignoring namespace + // marker; every worktree beneath it is gone. + const { [".worktrees/claude-architect/.gitignore"]: namespaceMarker, ...humanAfter } = + await workingTreeSnapshot(fixture.checkout); + expect(humanAfter).toEqual(humanBefore); + expect(Buffer.from(namespaceMarker ?? "", "base64").toString()).toBe("*\n"); expect(await runGit(fixture.checkout, ["status", "--porcelain=v1", "--untracked-files=all"])) .toBe(""); @@ -532,8 +484,8 @@ describe("AutopilotController end-to-end", () => { .split(/\r?\n/u).filter(line => line.startsWith("worktree ")) .map(line => path.resolve(line.slice("worktree ".length))); expect(registeredWorktrees).toEqual([fixture.checkout]); - const worktreesRoot = path.join(stateRoot, "worktrees"); - await expect(readdir(worktreesRoot)).resolves.toEqual([]); + await expect(readdir(path.join(fixture.checkout, ".worktrees", "claude-architect"))) + .resolves.toEqual([".gitignore"]); // Full-suite contention can push dual-commit promotion past 120s; scale gracefully. }, process.platform === "win32" ? 360_000 : 240_000); }); diff --git a/tests/runtime/autopilot/autopilot-mcp.test.ts b/tests/runtime/autopilot/autopilot-mcp.test.ts index 2ec758e..cc40284 100644 --- a/tests/runtime/autopilot/autopilot-mcp.test.ts +++ b/tests/runtime/autopilot/autopilot-mcp.test.ts @@ -31,7 +31,7 @@ function verification() { function validSpec(): AutopilotSpec { return { - specVersion: "1", + specVersion: "2", topic: "autopilot-mcp", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -53,20 +53,12 @@ function validSpec(): AutopilotSpec { }], finalSuccessCriteria: ["The MCP surface passes its protocol tests."], finalVerification: verification(), - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 1_800_000, - pullRequestTitle: "Expose autopilot MCP tools", - pullRequestBody: "Adds the reviewed workflow surface.", - }, }; } function workflowState(): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId: WORKFLOW_ID, repositoryIdentity: `${CHECKOUT}/.git`, baseCommitOid: OID, @@ -86,13 +78,7 @@ function workflowState(): AutopilotWorkflowState { }], intentJournal: { ref: "journal.ndjson", entryCount: 2, lastEntryHash: HASH }, finalGate: null, - shipping: { - branch: "feat/autopilot-mcp-workflow", - prNumber: null, - prUrl: null, - ciDeadlineAt: "2026-07-21T12:30:00.000Z", - }, - ciObservations: [], + branch: "feat/autopilot-mcp-workflow", cleanup: null, terminal: null, createdAt: NOW, @@ -104,12 +90,6 @@ function workflowState(): AutopilotWorkflowState { function redactedProjectionOf(state: AutopilotWorkflowState): AutopilotWorkflowState { state.repositoryIdentity = "[redacted]"; state.worktreePath = "[redacted]"; - if (state.shipping.prUrl !== null) state.shipping.prUrl = "[redacted]"; - for (const observation of state.ciObservations) { - for (const check of observation.checks) { - if (check.link !== null) check.link = "[redacted]"; - } - } return state; } @@ -252,18 +232,6 @@ describe("autopilot MCP surface", () => { // projection through to the client without widening it. it("passes the controller status projection through start and resume unchanged", async () => { const sensitive = workflowState(); - sensitive.shipping.prUrl = "https://github.com/example/repository/pull/42"; - sensitive.ciObservations.push({ - observedAt: NOW, - result: "passed", - headCommitOid: OID, - checks: [{ - bucket: "pass", - name: "build", - state: "SUCCESS", - link: "https://github.com/example/repository/actions/runs/99", - }], - }); const projected = redactedProjectionOf(sensitive); status.mockResolvedValueOnce(projected); status.mockResolvedValueOnce(projected); @@ -327,7 +295,7 @@ describe("autopilot MCP surface", () => { arguments: { checkoutPath: CHECKOUT, workflowId: WORKFLOW_ID, protocolVersion: "1.3.0" }, }); expect(toolErrorText(result)) - .toMatch(/protocol version mismatch.*received 1\.3\.0.*expected 2\.0\.0/isu); + .toMatch(/protocol version mismatch.*received 1\.3\.0.*expected 3\.0\.0/isu); expect(status).not.toHaveBeenCalled(); }); diff --git a/tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts b/tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts index e01c639..fe3016c 100644 --- a/tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts +++ b/tests/runtime/autopilot/autopilot-recovery-cutpoints.test.ts @@ -16,16 +16,15 @@ import { type RemoteTransport, type WorkflowBranchIdentity, } from "../../../src/autopilot/branch-manager.js"; +import { AutopilotController } from "../../../src/autopilot/autopilot-controller.js"; import { canonicalArtifactHash } from "../../../src/autopilot/autopilot-eligibility.js"; import type { AutopilotWorkflowState } from "../../../src/autopilot/types.js"; import { WorkflowStore } from "../../../src/autopilot/workflow-store.js"; import { git } from "../../../src/git/git-exec.js"; import { getPlatformServices } from "../../../src/platform/select-platform.js"; import type { AutopilotSpec } from "../../../src/protocol/autopilot-spec.js"; -import { - recoverStaleRuns, - type AutopilotRecoveryDisposition, -} from "../../../src/runtime/recovery-manager.js"; +import { recoverStaleRuns } from "../../../src/runtime/recovery-manager.js"; +import type { AutopilotRecoveryDisposition } from "../../../src/runtime/recovery-autopilot.js"; import { makeBootstrapOwnerDead, makeLeaseDead, @@ -93,7 +92,7 @@ function autopilotSpec(): AutopilotSpec { expectedExitCodes: [0], }]; return { - specVersion: "1", + specVersion: "2", topic: "recovery-cutpoint", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -115,20 +114,12 @@ function autopilotSpec(): AutopilotSpec { }], finalSuccessCriteria: ["The recovered workflow remains trustworthy."], finalVerification: verification, - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 1_800_000, - pullRequestTitle: "Exercise workflow recovery", - pullRequestBody: "Crash cut-point coverage.", - }, }; } function initialState(branch: WorkflowBranchIdentity): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId: branch.workflowId, repositoryIdentity: branch.repositoryIdentity, baseCommitOid: branch.baseCommitOid, @@ -148,13 +139,7 @@ function initialState(branch: WorkflowBranchIdentity): AutopilotWorkflowState { }], intentJournal: { ref: "journal.ndjson", entryCount: 0, lastEntryHash: null }, finalGate: null, - shipping: { - branch: branch.branch, - prNumber: null, - prUrl: null, - ciDeadlineAt: "2026-07-21T20:00:00.000Z", - }, - ciObservations: [], + branch: branch.branch, cleanup: null, terminal: null, createdAt: "2026-07-21T18:00:00.000Z", @@ -284,11 +269,11 @@ async function persistPromotion(fixture: Fixture): Promise { - let state = await persistPromotion(fixture); - state = await fixture.store.transition({ - expectedRevision: state.revision, - to: "pushing", +async function advanceToCleaningUp(fixture: Fixture): Promise { + const reviewed = await persistPromotion(fixture); + return await fixture.store.transition({ + expectedRevision: reviewed.revision, + to: "cleaning-up", update(draft) { draft.finalGate = { reportRef: "reports/final.json", @@ -298,53 +283,6 @@ async function advanceToWaitingChecks(fixture: Fixture): Promise { - const waiting = await advanceToWaitingChecks(fixture); - return await fixture.store.update({ - expectedRevision: waiting.revision, - update(draft) { - draft.ciObservations.push({ - observedAt: "2026-07-21T18:05:00.000Z", - result, - headCommitOid: expectedHead(draft), - checks: [{ - bucket: result === "passed" ? "pass" : "pending", - name: "build", - state: result === "passed" ? "SUCCESS" : "IN_PROGRESS", - link: null, - }], - }); - }, - }); -} - -async function advanceToCleaningUp(fixture: Fixture): Promise { - let state = await appendCiObservation(fixture, "passed"); - state = await fixture.store.transition({ - expectedRevision: state.revision, - to: "marking-ready", - }); - return await fixture.store.transition({ - expectedRevision: state.revision, - to: "cleaning-up", - }); } function expectedHead(state: AutopilotWorkflowState): string { @@ -367,10 +305,49 @@ async function beginCleanup(fixture: Fixture): Promise<{ } async function performCleanup(fixture: Fixture, headCommitOid: string): Promise { - await expect(fixture.branchManager.cleanup(fixture.branch, headCommitOid)) + await expect(fixture.branchManager.cleanup(fixture.branch, headCommitOid, { retainBranch: true })) .resolves.toEqual({ ok: true, worktreeRemoved: true, refsRemoved: true }); } +/** + * Finish an abandoned cleanup the way a user would: through the controller's + * resume, which owns the cleanup transition. Nothing task-related may run. + */ +async function resumeToTerminal(fixture: Fixture): Promise { + const unused = async (): Promise => { + throw new Error("a cleanup resume must not run task work"); + }; + const controller = new AutopilotController({ + workflowLock: { runExclusive: async (_workflowId, operation) => await operation() }, + workflowStore: () => fixture.store, + repositoryIdentity: async () => fixture.branch.repositoryIdentity, + branchManager: fixture.branchManager, + pipelineRunner: { run: unused }, + reviewSnapshotter: { create: unused }, + eligibilityEvaluator: { evaluate: unused }, + promoter: { promote: unused }, + finalBranchReviewer: { review: unused }, + decisionAuthority: () => "autonomous", + now: () => "2026-07-21T18:02:00.000Z", + }); + return await controller.resume(fixture.branch.checkoutPath, fixture.branch.workflowId); +} + +async function expectResumedCleanup(fixture: Fixture, headCommitOid: string): Promise { + await expectRecovery(fixture, "resume"); + await expect(resumeToTerminal(fixture)).resolves.toMatchObject({ + phase: "ready-for-human-review", + cleanup: { status: "succeeded", worktreeRemoved: true, lockReleased: true }, + }); + // The reviewed branch is the hand-off; the worktree and base ref are gone. + expect(await runGit(fixture.branch.checkoutPath, ["rev-parse", fixture.branch.branchRef])) + .toBe(headCommitOid); + expect((await git(fixture.branch.checkoutPath, [ + "show-ref", "--verify", "--quiet", fixture.branch.baseRef, + ])).exitCode).toBe(1); + expect((await recoverStaleRuns(recoveryDependencies())).workflows).toBeUndefined(); +} + async function snapshot(directory: string): Promise { const output: ByteSnapshot = []; async function visit(current: string, prefix: string): Promise { @@ -420,7 +397,7 @@ async function expectRecovery( const second = await recoverStaleRuns(recoveryDependencies()); - if (expected === null || expected === "dispose" || expected === "finalize") { + if (expected === null || expected === "dispose") { expect(second.workflows).toBeUndefined(); } else { expect(second.workflows).toEqual(first.workflows); @@ -536,37 +513,37 @@ describe("autopilot workflow recovery crash cut points", () => { await expectRecovery(fixture, "resume"); }); - it("7 resumes after a CI observation is durably appended", async () => { + it("7 resumes after promotion is persisted and before the final review", async () => { const fixture = await createFixture(); await initializeActiveWorkflow(fixture); - await appendCiObservation(fixture, "pending"); + await persistPromotion(fixture); await makeBootstrapOwnerDead(fixture); await makeLeaseDead(fixture.store); await expectRecovery(fixture, "resume"); }); - it("8 requires human decision after cleanup intent when the worktree remains", async () => { + it("8 resumes cleanup after its intent when the worktree remains", async () => { const fixture = await createFixture(); await initializeActiveWorkflow(fixture); - await beginCleanup(fixture); + const cleanup = await beginCleanup(fixture); await makeBootstrapOwnerDead(fixture); await makeLeaseDead(fixture.store); - await expectRecovery(fixture, "human-decision-required"); + await expectResumedCleanup(fixture, cleanup.headCommitOid); }); - it("9 finalizes after real cleanup removes ownership before intent completion", async () => { + it("9 resumes after real cleanup removes ownership before intent completion", async () => { const fixture = await createFixture(); await initializeActiveWorkflow(fixture); const cleanup = await beginCleanup(fixture); await performCleanup(fixture, cleanup.headCommitOid); await makeLeaseDead(fixture.store); - await expectRecovery(fixture, "finalize"); + await expectResumedCleanup(fixture, cleanup.headCommitOid); }); - it("10 finalizes after cleanup intent completion and before terminal persistence", async () => { + it("10 resumes after cleanup intent completion and before terminal persistence", async () => { const fixture = await createFixture(); await initializeActiveWorkflow(fixture); const cleanup = await beginCleanup(fixture); @@ -578,7 +555,7 @@ describe("autopilot workflow recovery crash cut points", () => { }); await makeLeaseDead(fixture.store); - await expectRecovery(fixture, "finalize"); + await expectResumedCleanup(fixture, cleanup.headCommitOid); }); it("11 skips a terminal workflow and does not resurrect or release its dead lease", async () => { diff --git a/tests/runtime/autopilot/autopilot-recovery.test.ts b/tests/runtime/autopilot/autopilot-recovery.test.ts index 7d99099..be2ee79 100644 --- a/tests/runtime/autopilot/autopilot-recovery.test.ts +++ b/tests/runtime/autopilot/autopilot-recovery.test.ts @@ -91,7 +91,7 @@ function localTransport(remote: string): RemoteTransport { function initialState(branch: WorkflowBranchIdentity): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId: branch.workflowId, repositoryIdentity: branch.repositoryIdentity, baseCommitOid: branch.baseCommitOid, @@ -111,13 +111,7 @@ function initialState(branch: WorkflowBranchIdentity): AutopilotWorkflowState { }], intentJournal: { ref: "journal.ndjson", entryCount: 0, lastEntryHash: null }, finalGate: null, - shipping: { - branch: branch.branch, - prNumber: null, - prUrl: null, - ciDeadlineAt: "2026-07-21T20:00:00.000Z", - }, - ciObservations: [], + branch: branch.branch, cleanup: null, terminal: null, createdAt: "2026-07-21T18:00:00.000Z", @@ -188,10 +182,6 @@ async function advanceToCleaningUp(store: WorkflowStore): Promise { }]); }); - it("finalizes observed cleanup and converges byte-idempotently", async () => { + it("hands an abandoned cleanup to the controller without acting on it", async () => { const fixture = await createFixture(); const cleaning = await advanceToCleaningUp(fixture.store); await fixture.store.beginIntent({ @@ -371,61 +361,49 @@ describe("autopilot startup recovery", () => { idempotencyKey: `cleanup:${fixture.branch.baseCommitOid}`, expectedIdentities: { headCommitOid: fixture.branch.baseCommitOid }, }); - await expect(fixture.branchManager.cleanup(fixture.branch, fixture.branch.baseCommitOid)) + await expect(fixture.branchManager.cleanup( + fixture.branch, + fixture.branch.baseCommitOid, + { retainBranch: true }, + )) .resolves.toEqual({ ok: true, worktreeRemoved: true, refsRemoved: true }); await makeLeaseDead(fixture.store); + const before = await snapshot(fixture.store.workflowDirectory); const first = await recoverStaleRuns(await recoveryDependencies()); - const afterFirst = await snapshot(fixture.store.workflowDirectory); - const state = await fixture.store.read(); - const journal = await fixture.store.readIntentJournal(); const second = await recoverStaleRuns(await recoveryDependencies()); + // Finishing cleanup is the controller's resume; recovery only classifies, + // so it writes nothing and answers the same way every time. expect(first.workflows).toEqual([{ workflowId: fixture.branch.workflowId, - disposition: "finalize", + disposition: "resume", }]); - expect(state).toMatchObject({ - phase: "ready-for-human-review", - cleanup: { status: "succeeded", worktreeRemoved: true, lockReleased: true }, - terminal: { classification: "ready-for-human-review", reason: null }, - }); - expect(journal.intents.find(intent => - intent.intent.operation === "cleanup-workflow-branch")?.completion?.completion) - .toEqual({ worktreeRemoved: true, refsRemoved: true }); - expect(second.workflows).toBeUndefined(); - expect(await snapshot(fixture.store.workflowDirectory)).toEqual(afterFirst); + expect(second.workflows).toEqual(first.workflows); + expect(await snapshot(fixture.store.workflowDirectory)).toEqual(before); + await expect(fixture.store.read()).resolves.toMatchObject({ phase: "cleaning-up" }); }); - it("does not finalize cleanup from a truncated worktree registration list", async () => { + it("refuses to hand off a cleanup whose recorded branch belongs to another workflow", async () => { const fixture = await createFixture(); - const cleaning = await advanceToCleaningUp(fixture.store); - await fixture.store.beginIntent({ - expectedRevision: cleaning.revision, - operation: "cleanup-workflow-branch", - idempotencyKey: `cleanup:${fixture.branch.baseCommitOid}`, - expectedIdentities: { headCommitOid: fixture.branch.baseCommitOid }, - }); - await expect(fixture.branchManager.cleanup(fixture.branch, fixture.branch.baseCommitOid)) - .resolves.toEqual({ ok: true, worktreeRemoved: true, refsRemoved: true }); + await advanceToCleaningUp(fixture.store); + await makeBootstrapOwnerDead(fixture); await makeLeaseDead(fixture.store); - const dependencies = await recoveryDependencies(); + const ownership = autopilotOwnershipPath(fixture.branch.workflowId, process.env.CLAUDE_PLUGIN_DATA!); + const record = JSON.parse(await readFile(ownership, "utf8")) as { + branch: string; + branchRef: string; + }; + record.branch = "feat/another-workflow"; + record.branchRef = "refs/heads/feat/another-workflow"; + await writeFile(ownership, `${JSON.stringify(record)}\n`); - const result = await recoverStaleRuns({ - ...dependencies, - git: async (cwd, args, options) => { - const observed = await dependencies.git(cwd, args, options); - return args[0] === "worktree" && args[1] === "list" - ? { ...observed, truncated: { stdout: true, stderr: false } } - : observed; - }, - }); + const result = await recoverStaleRuns(await recoveryDependencies()); expect(result.workflows).toEqual([{ workflowId: fixture.branch.workflowId, disposition: "human-decision-required", }]); - await expect(fixture.store.read()).resolves.toMatchObject({ phase: "cleaning-up" }); }); it("disposes a dead bootstrap orphan and converges byte-idempotently", async () => { @@ -480,27 +458,4 @@ describe("autopilot startup recovery", () => { disposition: "human-decision-required", }]); }); - - it("does not infer cleanup success from the cleaning-up phase", async () => { - const fixture = await createFixture(); - const cleaning = await advanceToCleaningUp(fixture.store); - await fixture.store.beginIntent({ - expectedRevision: cleaning.revision, - operation: "cleanup-workflow-branch", - idempotencyKey: `cleanup:${fixture.branch.baseCommitOid}`, - expectedIdentities: { headCommitOid: fixture.branch.baseCommitOid }, - }); - await makeBootstrapOwnerDead(fixture); - await makeLeaseDead(fixture.store); - const before = await snapshot(fixture.store.workflowDirectory); - - const result = await recoverStaleRuns(await recoveryDependencies()); - - expect(result.workflows).toEqual([{ - workflowId: fixture.branch.workflowId, - disposition: "human-decision-required", - }]); - await expect(lstat(fixture.branch.worktreePath)).resolves.toBeDefined(); - expect(await snapshot(fixture.store.workflowDirectory)).toEqual(before); - }); }); diff --git a/tests/runtime/autopilot/autopilot-windows.test.ts b/tests/runtime/autopilot/autopilot-windows.test.ts index 4147d06..45dcdf1 100644 --- a/tests/runtime/autopilot/autopilot-windows.test.ts +++ b/tests/runtime/autopilot/autopilot-windows.test.ts @@ -48,10 +48,6 @@ import { ProducerRegistry } from "../../../src/producers/producer-registry.js"; import { ArtifactStore } from "../../../src/runtime/artifact-store.js"; import type { AttemptRuntimeDependencies } from "../../../src/runtime/attempt-runtime.js"; import { createReviewSnapshot } from "../../../src/runtime/review-snapshot.js"; -import { - InMemoryHostingAdapter, - type InMemoryHostingOperations, -} from "../../../src/ship/github-cli-adapter.js"; import { AcceptanceVerifier } from "../../../src/verify/acceptance-verifier.js"; const editFixture = fileURLToPath(new URL("../fixtures/edit-file.mjs", import.meta.url)); @@ -59,7 +55,6 @@ const WORKFLOW_ID = "workflow-forced-red-12345678"; const RUN_ID = "autopilot-forced-red-task"; const NOW = "2026-07-21T13:00:00.000Z"; const REMOTE_URL = "https://github.com/example/autopilot-forced-red.git"; -const REPOSITORY = "example/autopilot-forced-red"; const FORCED_RED = { id: "forced-red", executable: "node", @@ -204,7 +199,7 @@ function unreachableRoleRunner(args: RoleRunArgs): Promise { function forcedRedSpec(): AutopilotSpec { return { - specVersion: "1", + specVersion: "2", topic: "forced-red", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -225,16 +220,8 @@ function forcedRedSpec(): AutopilotSpec { review: { reviewers: ["correctness", "systems"], maxRounds: 1 }, }, }], - finalSuccessCriteria: ["No authorization or shipping follows the red gate."], + finalSuccessCriteria: ["No authorization or promotion follows the red gate."], finalVerification: [structuredClone(FORCED_RED)], - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 600_000, - pullRequestTitle: "Forced red must not ship", - pullRequestBody: "This pull request must never be created.", - }, }; } @@ -280,7 +267,7 @@ afterEach(async () => { }); describe("AutopilotController platform-neutral forced-red gate", () => { - it("durably fails before eligibility, promotion, integration, or shipping", async () => { + it("durably fails before eligibility, promotion, or integration", async () => { const root = temporaryPaths[0]!; const fixture = await createRepository(root); const platformServices = getPlatformServices(); @@ -304,41 +291,6 @@ describe("AutopilotController platform-neutral forced-red gate", () => { remoteTransport: localRemoteTransport(fixture.bareRemote), }); const workflowStore = (workflowId: string) => new WorkflowStore(workflowId); - const hostingCalls: string[] = []; - const hostingOperations: InMemoryHostingOperations = { - preflight: async () => { - hostingCalls.push("preflight"); - return { - provider: "github", - repository: REPOSITORY, - canonicalHttpsUrl: REMOTE_URL, - }; - }, - pushBranch: async request => { - hostingCalls.push("push"); - return { remoteHead: request.headCommitOid }; - }, - ensureDraftPullRequest: async request => { - hostingCalls.push("draft-pr"); - return { - number: 7, - url: "https://github.com/example/autopilot-forced-red/pull/7", - repository: REPOSITORY, - baseBranch: request.baseBranch, - headBranch: request.headBranch, - headCommitOid: request.headCommitOid, - draft: true, - }; - }, - requiredChecks: async request => { - hostingCalls.push("checks"); - return { result: "passed", headCommitOid: request.headCommitOid, checks: [] }; - }, - markReady: async () => { - hostingCalls.push("mark-ready"); - throw new Error("mark-ready must remain unreachable"); - }, - }; const controllerDependencies: AutopilotControllerDependencies = { workflowId: () => WORKFLOW_ID, now: () => NOW, @@ -396,9 +348,6 @@ describe("AutopilotController platform-neutral forced-red gate", () => { roleRunner: unreachableRoleRunner, now: () => NOW, }), - hostingAdapter: new InMemoryHostingAdapter(hostingOperations), - requiredChecksPollIntervalMs: 100, - sleep: async () => {}, }; const controller = new AutopilotController(controllerDependencies); @@ -440,7 +389,6 @@ describe("AutopilotController platform-neutral forced-red gate", () => { .rejects.toMatchObject({ code: "ENOENT" }); expect(producer.invocations).toEqual([]); - expect(hostingCalls).toEqual(["preflight"]); expect(await readFile(path.join(fixture.checkout, "base.txt"))).toEqual(fixture.baseBytes); expect(await runGit(fixture.checkout, ["rev-parse", "HEAD"])).toBe(fixture.baseCommitOid); expect(await runGit(fixture.checkout, ["status", "--porcelain=v1", "--untracked-files=all"])) diff --git a/tests/runtime/autopilot/branch-manager.test.ts b/tests/runtime/autopilot/branch-manager.test.ts index af5c43f..e51e336 100644 --- a/tests/runtime/autopilot/branch-manager.test.ts +++ b/tests/runtime/autopilot/branch-manager.test.ts @@ -1,6 +1,7 @@ import { createHash } from "node:crypto"; import { chmod, + lstat, mkdir, mkdtemp, readFile, @@ -25,7 +26,7 @@ import { } from "../../../src/autopilot/branch-manager.js"; import { git, type GitResult } from "../../../src/git/git-exec.js"; import { getPlatformServices } from "../../../src/platform/select-platform.js"; -import { recoverPendingWorktreeRemovals } from "../../../src/runtime/recovery-manager.js"; +import { recoverPendingWorktreeRemovals } from "../../../src/runtime/recovery-worktree-removals.js"; import { RuntimeError } from "../../../src/util/errors.js"; import { logger } from "../../../src/util/logger.js"; @@ -292,6 +293,38 @@ describe("WorkflowBranchManager", () => { .resolves.toBeNull(); }); + it("hands off the final-reviewed branch: removes the worktree and base ref, keeps the branch", async () => { + const fixture = (await initFixture())!; + const created = await fixture.manager.create(fixture.request); + + await expect(fixture.manager.cleanup(created, created.baseCommitOid, { retainBranch: true })) + .resolves.toEqual({ ok: true, worktreeRemoved: true, refsRemoved: true }); + + await expect(stat(created.worktreePath)).rejects.toMatchObject({ code: "ENOENT" }); + expect(await runGit(fixture.repoRoot, ["rev-parse", "--verify", created.branchRef])) + .toBe(created.baseCommitOid); + expect((await git(fixture.repoRoot, ["show-ref", "--verify", "--quiet", created.baseRef])).exitCode) + .toBe(1); + // A crash after ownership removal but before the journal records it leaves + // exactly this state; resuming must complete, not fail forever. + await expect(fixture.manager.cleanup(created, created.baseCommitOid, { retainBranch: true })) + .resolves.toEqual({ ok: true, worktreeRemoved: true, refsRemoved: true }); + expect(await runGit(fixture.repoRoot, ["rev-parse", "--verify", created.branchRef])) + .toBe(created.baseCommitOid); + }); + + it("refuses to hand off a branch that moved away from the reviewed head", async () => { + const fixture = (await initFixture())!; + const created = await fixture.manager.create(fixture.request); + await writeFile(path.join(created.worktreePath, "late.txt"), "late\n"); + await runGit(created.worktreePath, ["add", "late.txt"]); + await runGit(created.worktreePath, ["-c", "user.name=t", "-c", "user.email=t@example.invalid", "commit", "-q", "-m", "late"]); + + await expect(fixture.manager.cleanup(created, created.baseCommitOid, { retainBranch: true })) + .resolves.toEqual({ ok: false, classification: "cleanup-failed" }); + await expect(stat(created.worktreePath)).resolves.toBeDefined(); + }); + it("derives a fresh branch and leaves the primary checkout untouched", async () => { const fixture = (await initFixture())!; const before = await snapshotCheckout(fixture.repoRoot); @@ -364,6 +397,25 @@ describe("WorkflowBranchManager", () => { }, ); + it("refuses cleanup from a truncated worktree registration list", async () => { + const fixture = (await initFixture())!; + const created = await fixture.manager.create(fixture.request); + const truncatingManager = new WorkflowBranchManager({ + remoteTransport: localTransport(fixture.bareRemote), + git: async (cwd, args, options) => { + const result = await git(cwd, args, options); + return args[0] === "worktree" && args[1] === "list" + ? { ...result, truncated: { stdout: true, stderr: false } } + : result; + }, + }); + + await expect(truncatingManager.cleanup(created, created.baseCommitOid, { retainBranch: true })) + .resolves.toEqual({ ok: false, classification: "cleanup-failed" }); + await expect(lstat(created.worktreePath)).resolves.toBeDefined(); + await fixture.manager.cleanup(created); + }); + it("preserves and supports a dirty primary checkout", async () => { const fixture = (await initFixture())!; await writeFile(path.join(fixture.repoRoot, "tracked.txt"), "human dirty bytes\n"); @@ -546,18 +598,22 @@ describe("WorkflowBranchManager", () => { await expect(fixture.manager.cleanup(created)).resolves.toMatchObject({ ok: true }); }); - it("detects a remote identity change without mutating either checkout", async () => { + it("revalidates offline: the remote is consulted only at create", async () => { const fixture = (await initFixture())!; const created = await fixture.manager.create(fixture.request); const primaryBefore = await snapshotCheckout(fixture.repoRoot); + await advanceRemote(fixture); await runGit(fixture.repoRoot, [ "config", "remote.origin.url", "https://github.com/example/different.git", ]); - - await expect(fixture.manager.revalidate(created)).resolves.toEqual({ - ok: false, - classification: "remote-identity-changed", + const offline = new WorkflowBranchManager({ + remoteTransport: { + fetch: () => { throw new Error("revalidation must not fetch"); }, + listHeads: () => { throw new Error("revalidation must not list remote heads"); }, + }, }); + + await expect(offline.revalidate(created)).resolves.toEqual({ ok: true }); expect(await snapshotCheckout(fixture.repoRoot)).toEqual(primaryBefore); }); @@ -597,9 +653,15 @@ describe("WorkflowBranchManager", () => { const fixture = (await initFixture())!; const managedId = `workflow-${createHash("sha256") .update(fixture.request.workflowId).digest("hex").slice(0, 32)}`; - const collision = path.join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", managedId); + const collision = path.join( + await realpath(fixture.repoRoot), + ".worktrees", + "claude-architect", + managedId, + ); const sentinel = path.join(collision, "sentinel.txt"); await mkdir(path.dirname(collision), { recursive: true, mode: 0o700 }); + await writeFile(path.join(path.dirname(collision), ".gitignore"), "*\n", { mode: 0o600 }); await runGit(fixture.repoRoot, ["worktree", "add", "--detach", collision, fixture.baseOid]); await writeFile(sentinel, "keep\n"); const before = await snapshotCheckout(fixture.repoRoot); @@ -728,7 +790,7 @@ describe("WorkflowBranchManager", () => { const fixture = (await initFixture({ prefix: "ca repo ünicode space " }))!; try { const created = await fixture.manager.create(fixture.request); - expect(created.worktreePath).toContain(statePrefix); + expect(created.worktreePath).toContain("ca repo ünicode space "); await expect(stat(created.worktreePath)).resolves.toBeDefined(); await expect(fixture.manager.revalidate(created)).resolves.toEqual({ ok: true }); await expect(fixture.manager.cleanup(created)).resolves.toEqual({ @@ -810,19 +872,11 @@ describe("WorkflowBranchManager", () => { ok: false, classification: "in-progress-operation", }); - - const fifthFixture = (await initFixture())!; - const baseDrift = await fifthFixture.manager.create(fifthFixture.request); - await advanceRemote(fifthFixture); - await expect(fifthFixture.manager.revalidate(baseDrift)).resolves.toEqual({ - ok: false, - classification: "remote-base-changed", - }); - // Builds five separate repository fixtures and revalidates each; the 30s + // Builds four separate repository fixtures and revalidates each; the 30s // default is not enough for that much real git on Windows. }, 120_000); - it("revalidates ownership and remote identity without discarding staged recovery bytes", async () => { + it("revalidates ownership without discarding staged recovery bytes", async () => { const fixture = (await initFixture())!; const created = await fixture.manager.create(fixture.request); await writeFile(path.join(created.worktreePath, "tracked.txt"), "staged candidate bytes\n"); @@ -835,12 +889,6 @@ describe("WorkflowBranchManager", () => { lock, )).resolves.toEqual({ ok: true }); - await advanceRemote(fixture); - await expect(fixture.manager.revalidateForStagedPromotionUnderLock( - created, - created.baseCommitOid, - lock, - )).resolves.toEqual({ ok: false, classification: "remote-base-changed" }); expect(await readFile(path.join(created.worktreePath, "tracked.txt"), "utf8")) .toBe("staged candidate bytes\n"); @@ -889,24 +937,14 @@ describe("WorkflowBranchManager", () => { await expect(stat(created.worktreePath)).rejects.toMatchObject({ code: "ENOENT" }); await expect(cleanupManager.cleanup(created)).resolves.toEqual({ ok: true, - worktreeRemoved: false, + worktreeRemoved: true, refsRemoved: true, }); }); - it("returns stable results when transport or lock release reports a failure", async () => { + it("returns stable results when lock release reports a failure", async () => { const fixture = (await initFixture())!; const created = await fixture.manager.create(fixture.request); - const rejectingTransport: RemoteTransport = { - fetch: () => Promise.reject(new Error("unexpected fetch")), - listHeads: () => Promise.reject(new Error("simulated transport rejection")), - }; - const rejectingManager = new WorkflowBranchManager({ remoteTransport: rejectingTransport }); - await expect(rejectingManager.revalidate(created)).resolves.toEqual({ - ok: false, - classification: "git-command-failed", - }); - const selected = getPlatformServices(); const warn = vi.spyOn(logger, "warn").mockImplementation(() => {}); const releaseFailingManager = new WorkflowBranchManager({ @@ -1000,8 +1038,8 @@ describe("WorkflowBranchManager", () => { }); await expect(manager.cleanup(created)).resolves.toEqual({ ok: true, - worktreeRemoved: false, - refsRemoved: false, + worktreeRemoved: true, + refsRemoved: true, }); }); @@ -1122,7 +1160,7 @@ describe("WorkflowBranchManager", () => { await expect(readdir(manifestRoot)).resolves.toEqual([]); await expect(fixture.manager.cleanup(created)).resolves.toEqual({ ok: true, - worktreeRemoved: false, + worktreeRemoved: true, refsRemoved: true, }); }); diff --git a/tests/runtime/autopilot/candidate-promoter.test.ts b/tests/runtime/autopilot/candidate-promoter.test.ts index 3dd3863..c56c890 100644 --- a/tests/runtime/autopilot/candidate-promoter.test.ts +++ b/tests/runtime/autopilot/candidate-promoter.test.ts @@ -15,6 +15,7 @@ import type { WorkflowStore } from "../../../src/autopilot/workflow-store.js"; import type { ArtifactStore } from "../../../src/runtime/artifact-store.js"; import type { PlatformServices } from "../../../src/platform/platform-services.js"; import type { GitResult } from "../../../src/git/git-exec.js"; +import { RuntimeError } from "../../../src/util/errors.js"; import { logger } from "../../../src/util/logger.js"; const baseOid = "a".repeat(40); @@ -55,7 +56,11 @@ function fixture(options: { workflowDrift?: boolean; repositoryIdentityDrift?: boolean; missingBranchIdentity?: boolean; + checkoutLocked?: boolean; mergeCommitParents?: boolean; + identityMissing?: boolean; + stageConflicts?: boolean; + decisionAuthority?: "autonomous" | "human"; } = {}) { const events: string[] = []; const artifact = { @@ -219,7 +224,11 @@ function fixture(options: { if (args[0] === "log") return ok(`${message}\n`); if (args[0] === "write-tree") return ok(`${indexTree}\n`); if (args[0] === "symbolic-ref") return ok(`${workflowRef}\n`); - if (args[0] === "var") return ok("runtime 0 +0000\n"); + if (args[0] === "var") { + return options.identityMissing + ? { exitCode: 128, stdout: "", stderr: "fatal: unable to auto-detect email address" } + : ok("Jo Doe 1780000000 +0200\n"); + } if (args[0] === "commit-tree") { if (crashAfterCommitTree) { crashAfterCommitTree = false; @@ -268,7 +277,9 @@ function fixture(options: { }; let lockReleaseFails = options.lockReleaseFailsOnce ?? false; const platformServices = { - acquireCheckoutLock: vi.fn().mockResolvedValue({ + acquireCheckoutLock: options.checkoutLocked + ? vi.fn().mockRejectedValue(new RuntimeError("checkout is locked: /repo", { key: "checkout", classification: "lock-contended" })) + : vi.fn().mockResolvedValue({ key: "checkout", repositoryIdentity: options.repositoryIdentityDrift ? "/other/.git" : "/repo/.git", release: vi.fn(async () => { @@ -286,6 +297,9 @@ function fixture(options: { crashAfterStage = false; throw new Error("crashed after staging candidate bytes"); } + if (options.stageConflicts) { + return { integration: "conflicted" as const, detail: "candidate tree conflicted" }; + } return { integration: "applied" as const, detail: "candidate tree applied", }; @@ -298,6 +312,7 @@ function fixture(options: { platformServices: platformServices as unknown as PlatformServices, stageCandidate, now: () => "2026-07-20T12:01:00.000Z", + decisionAuthority: () => options.decisionAuthority ?? "autonomous", }); const request: PromotionRequest = { workflowId, runId, workflowCheckoutPath: checkout, expectedHead: baseOid, @@ -357,6 +372,65 @@ describe("CandidatePromoter", () => { args[0] === "update-ref" && args.includes("-d"))).toHaveLength(0); }); + it("commits the promotion under the user's identity, never the runtime's", async () => { + const f = fixture(); + + await expect(f.promoter.promote(f.request)).resolves.toEqual({ + status: "committed", commitOid, + }); + + const identityReads = f.runGit.mock.calls.filter(([, args]) => args[0] === "var"); + expect(identityReads.map(([, args, options]) => [args, options])).toEqual([ + [["var", "GIT_AUTHOR_IDENT"], { userIdentity: true }], + [["var", "GIT_COMMITTER_IDENT"], { userIdentity: true }], + ]); + const commitTree = f.runGit.mock.calls.find(([, args]) => args[0] === "commit-tree"); + expect(commitTree?.[2]).toEqual({ + env: { + GIT_AUTHOR_NAME: "Jo Doe", + GIT_AUTHOR_EMAIL: "jo@example.invalid", + GIT_AUTHOR_DATE: "1780000000 +0200", + GIT_COMMITTER_NAME: "Jo Doe", + GIT_COMMITTER_EMAIL: "jo@example.invalid", + GIT_COMMITTER_DATE: "1780000000 +0200", + }, + }); + }); + + it("records no acceptance under the human decision authority", async () => { + const f = fixture({ decisionAuthority: "human" }); + + await expect(f.promoter.promote(f.request)).resolves.toEqual({ + status: "rejected", classification: "human-decision-required", + }); + expect(f.stageCandidate).not.toHaveBeenCalled(); + expect(f.artifactStore.writeAutopilotDecision).not.toHaveBeenCalled(); + expect(f.runGit).not.toHaveBeenCalled(); + }); + + it("records the acceptance only after the exact bytes are staged", async () => { + const conflicted = fixture({ stageConflicts: true }); + await expect(conflicted.promoter.promote(conflicted.request)).resolves.toEqual({ + status: "rejected", classification: "human-decision-required", + }); + expect(conflicted.stageCandidate).toHaveBeenCalledOnce(); + expect(conflicted.artifactStore.writeAutopilotDecision).not.toHaveBeenCalled(); + + const applied = fixture(); + await applied.promoter.promote(applied.request); + expect(applied.stageCandidate.mock.invocationCallOrder[0]!) + .toBeLessThan(applied.artifactStore.writeAutopilotDecision.mock.invocationCallOrder[0]!); + }); + + it("refuses to promote without a configured Git identity", async () => { + const f = fixture({ identityMissing: true }); + + await expect(f.promoter.promote(f.request)).resolves.toEqual({ + status: "rejected", classification: "git-identity-missing", + }); + expect(f.runGit.mock.calls.filter(([, args]) => args[0] === "commit-tree")).toHaveLength(0); + }); + it("recovers an intent whose durable append crashed before promotion began", async () => { const f = fixture({ beginCrashOnce: true }); @@ -533,6 +607,16 @@ describe("CandidatePromoter", () => { expect(f.artifactStore.writeAutopilotDecision).not.toHaveBeenCalled(); }); + it("reports checkout contention as busy, not as a branch identity change", async () => { + const f = fixture({ checkoutLocked: true }); + + await expect(f.promoter.promote(f.request)).resolves.toEqual({ + status: "rejected", classification: "checkout-busy", + }); + expect(f.stageCandidate).not.toHaveBeenCalled(); + expect(f.artifactStore.writeAutopilotDecision).not.toHaveBeenCalled(); + }); + it("revalidates workflow authorization under its writer lease", async () => { const f = fixture({ workflowDrift: true }); diff --git a/tests/runtime/autopilot/final-branch-reviewer.test.ts b/tests/runtime/autopilot/final-branch-reviewer.test.ts index fc14c50..d654e29 100644 --- a/tests/runtime/autopilot/final-branch-reviewer.test.ts +++ b/tests/runtime/autopilot/final-branch-reviewer.test.ts @@ -5,7 +5,7 @@ import { tmpdir } from "node:os"; import path from "node:path"; import { Ajv2020 } from "ajv/dist/2020.js"; import { afterEach, describe, expect, it, vi } from "vitest"; -import finalBranchReportSchema from "../../../runtime/schemas/final-branch-report.v1.json" with { type: "json" }; +import finalBranchReportSchema from "../../../runtime/schemas/final-branch-report.v2.json" with { type: "json" }; import { branchArtifactHashOf, FINAL_ADVISOR_REF, @@ -97,7 +97,7 @@ function initialState(args: { }): AutopilotWorkflowState { const taskIds = args.taskIds ?? ["task-1"]; return { - stateVersion: "1", + stateVersion: "2", workflowId: args.workflowId, repositoryIdentity: path.join(args.repo, ".git"), baseCommitOid: args.baseOid, @@ -121,13 +121,7 @@ function initialState(args: { lastEntryHash: null, }, finalGate: null, - shipping: { - branch: "main", - prNumber: null, - prUrl: null, - ciDeadlineAt: "2026-07-20T22:00:00.000Z", - }, - ciObservations: [], + branch: "main", cleanup: null, terminal: null, createdAt: "2026-07-20T20:00:00.000Z", @@ -384,7 +378,7 @@ function inMemoryEvidenceStore( function finalSpec(): AutopilotSpec { return { - specVersion: "1", + specVersion: "2", topic: "final-branch-fixture", base: { remote: "origin", branch: "main" }, tasks: [{ @@ -414,14 +408,6 @@ function finalSpec(): AutopilotSpec { network: "denied", expectedExitCodes: [0], }], - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 600_000, - pullRequestTitle: "Final branch fixture", - pullRequestBody: "Fixture body", - }, }; } @@ -538,9 +524,9 @@ async function freezeForFinalReview(f: Fixture, reviewer: FinalBranchReviewer) { }); } -describe("FinalBranchReport v1", () => { +describe("FinalBranchReport v2", () => { const valid = { - reportVersion: "1", + reportVersion: "2", workflowId: "workflow-1", baseCommitOid: "1".repeat(40), headCommitOid: "2".repeat(40), @@ -551,7 +537,7 @@ describe("FinalBranchReport v1", () => { taskEvidenceHashes: ["8".repeat(64)], eligible: true, reasons: [], - status: "ready-to-ship", + status: "ready-for-human-review", evaluatedAt: "2026-07-20T20:00:00.000Z", } satisfies FinalBranchReport; @@ -1126,6 +1112,7 @@ describe("FinalBranchReviewer cumulative artifact", () => { archivedRefs.set(f.evidence.runId, [ ...archivedRefs.get(f.evidence.runId)!, repairRef, + "logs/implementer.log", ].sort()); const evidence = new Map(); const reviewer = new FinalBranchReviewer({ @@ -1137,6 +1124,8 @@ describe("FinalBranchReviewer cumulative artifact", () => { const artifact = await freezeForFinalReview(f, reviewer); expect(artifact.taskEvidence[0]!.evidenceRefs).toContain(repairRef); + // Producer transcripts never reach the final reviewers. + expect(artifact.taskEvidence[0]!.evidenceRefs).not.toContain("logs/implementer.log"); expect(artifact.taskEvidence[0]!.evidence.find(item => item.reference === repairRef)) .toMatchObject({ content: evidenceBytes(f.evidence.runId, repairRef) }); @@ -1331,15 +1320,18 @@ describe("FinalBranchReviewer strict final gate", () => { f.evidence.flatMap(evidence => expectedEvidenceRefs(evidence.evidenceRefs)), ); - const testEvidence = JSON.parse(pkg.testEvidence) as Record; - expect(testEvidence).toEqual(pkg.advisorEvidence); - expect(testEvidence).toMatchObject({ + // Each piece of evidence appears once: reviewers get the final + // verification beside the diff; the advisor gets the frozen artifact, + // whose task evidence is already inside it. + expect(JSON.parse(pkg.testEvidence)).toMatchObject(passingVerification()); + expect(Object.keys(pkg.advisorEvidence ?? {}).sort()) + .toEqual(["artifact", "autopilotSpec", "verification"]); + expect(pkg.advisorEvidence).toMatchObject({ autopilotSpec: f.spec, artifact: { patch: expectedDiff.stdout, taskEvidence: artifact.taskEvidence, }, - taskEvidence: artifact.taskEvidence, verification: passingVerification(), }); }); @@ -1360,7 +1352,7 @@ describe("FinalBranchReviewer strict final gate", () => { checkoutPath: f.repo, }); - expect(report).toMatchObject({ eligible: true, status: "ready-to-ship", reasons: [] }); + expect(report).toMatchObject({ eligible: true, status: "ready-for-human-review", reasons: [] }); expect(new Set(packages).size).toBe(1); const evidence = await Promise.all([ FINAL_VERIFICATION_REF, @@ -1413,7 +1405,7 @@ describe("FinalBranchReviewer strict final gate", () => { checkoutPath: f.repo, }); - expect(report).toMatchObject({ eligible: true, status: "ready-to-ship" }); + expect(report).toMatchObject({ eligible: true, status: "ready-for-human-review" }); expect(worktrees.size).toBe(4); }); @@ -1765,6 +1757,42 @@ describe("FinalBranchReviewer strict final gate", () => { } }); + it("resumes a review that crashed before its report without colliding on its own evidence", async () => { + const f = await fixture(); + const reviewer = finalReviewerFor(f); + const artifact = await freezeForFinalReview(f, reviewer); + // The crashed attempt published evidence but never its report. + await writeFile( + path.join(f.store.workflowDirectory, FINAL_VERIFICATION_REF), + "{\"stale\": true}\n", + ); + const request = { artifact, autopilotSpec: finalSpec(), checkoutPath: f.repo }; + + const report = await reviewer.runFinalReview(request); + // A second resume after publication returns the published report as is. + await expect(reviewer.runFinalReview(request)).resolves.toEqual(report); + }); + + it("refuses to resume from a report of an earlier report version", async () => { + const f = await fixture(); + const reviewer = finalReviewerFor(f); + const artifact = await freezeForFinalReview(f, reviewer); + const request = { artifact, autopilotSpec: finalSpec(), checkoutPath: f.repo }; + const report = await reviewer.runFinalReview(request); + const reportPath = path.join(f.store.workflowDirectory, FINAL_BRANCH_REPORT_REF); + await rm(reportPath); + await writeFile(reportPath, `${JSON.stringify({ + ...report, + reportVersion: "1", + status: "ready-to-ship", + })}\n`); + + await expect(reviewer.runFinalReview(request)).rejects.toMatchObject({ + classification: "artifact-persistence-failed", + message: expect.stringContaining("version is unsupported"), + }); + }); + it("rejects an atomic final-report publication collision", async () => { const f = await fixture(); const reviewer = finalReviewerFor(f); diff --git a/tests/runtime/autopilot/workflow-state-schema.test.ts b/tests/runtime/autopilot/workflow-state-schema.test.ts index 10f2bad..39e3b24 100644 --- a/tests/runtime/autopilot/workflow-state-schema.test.ts +++ b/tests/runtime/autopilot/workflow-state-schema.test.ts @@ -18,7 +18,7 @@ const task = { function validWorkflowState(): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId: "workflow-state-contract", repositoryIdentity: "/canonical/repository/.git", baseCommitOid: "1".repeat(40), @@ -40,23 +40,7 @@ function validWorkflowState(): AutopilotWorkflowState { headCommitOid: "4".repeat(40), eligibilityHash: "8".repeat(64), }, - shipping: { - branch: "feat/autopilot-state-contract", - prNumber: 42, - prUrl: "https://github.com/example/repository/pull/42", - ciDeadlineAt: "2026-07-20T18:30:00.000Z", - }, - ciObservations: [{ - observedAt: "2026-07-20T18:00:00.000Z", - result: "passed", - headCommitOid: "4".repeat(40), - checks: [{ - bucket: "pass", - name: "test", - state: "SUCCESS", - link: "https://github.com/example/repository/actions/runs/1", - }], - }], + branch: "feat/autopilot-state-contract", cleanup: { status: "succeeded", worktreeRemoved: true, @@ -88,9 +72,7 @@ describe("Autopilot Workflow State v1", () => { ["task", (state: any) => { state.tasks[0].unknown = true; }], ["intent journal", (state: any) => { state.intentJournal.unknown = true; }], ["final gate", (state: any) => { state.finalGate.unknown = true; }], - ["shipping", (state: any) => { state.shipping.unknown = true; }], - ["CI observation", (state: any) => { state.ciObservations[0].unknown = true; }], - ["CI check", (state: any) => { state.ciObservations[0].checks[0].unknown = true; }], + ["retired v1 shipping", (state: any) => { state.shipping = { prNumber: 42 }; }], ["cleanup", (state: any) => { state.cleanup.unknown = true; }], ["terminal", (state: any) => { state.terminal.unknown = true; }], ] as const)("rejects an unknown %s key", (_name, mutate) => { @@ -129,33 +111,25 @@ describe("Autopilot Workflow State v1", () => { } }); - it("uses the exact 13-value phase type", () => { + it("uses the exact 9-value phase type", () => { const phases: AutopilotPhase[] = [ "preflighting", "running-task", "promoting-task", "final-review", - "pushing", - "creating-draft-pr", - "waiting-required-checks", - "marking-ready", "cleaning-up", "ready-for-human-review", "human-decision-required", "failed", "cancelled", ]; - // `AutopilotPhase[]` accepts any subset, so a 14th phase would leave this + // `AutopilotPhase[]` accepts any subset, so a 10th phase would leave this // green. Pin the list to the union itself via an exhaustive mapping. const everyPhase: Record = { "preflighting": true, "running-task": true, "promoting-task": true, "final-review": true, - "pushing": true, - "creating-draft-pr": true, - "waiting-required-checks": true, - "marking-ready": true, "cleaning-up": true, "ready-for-human-review": true, "human-decision-required": true, @@ -163,7 +137,7 @@ describe("Autopilot Workflow State v1", () => { "cancelled": true, }; expect([...phases].sort()).toEqual(Object.keys(everyPhase).sort()); - expect(phases).toHaveLength(13); + expect(phases).toHaveLength(9); for (const phase of phases) { expect(validate({ ...validWorkflowState(), phase }), phase).toBe(true); } diff --git a/tests/runtime/autopilot/workflow-store.test.ts b/tests/runtime/autopilot/workflow-store.test.ts index 9408cb1..d708d02 100644 --- a/tests/runtime/autopilot/workflow-store.test.ts +++ b/tests/runtime/autopilot/workflow-store.test.ts @@ -30,10 +30,6 @@ const PRIMARY_PATH: AutopilotPhase[] = [ "running-task", "promoting-task", "final-review", - "pushing", - "creating-draft-pr", - "waiting-required-checks", - "marking-ready", "cleaning-up", ]; @@ -50,7 +46,7 @@ async function temporaryDirectory(): Promise { function initialState(workflowId: string): AutopilotWorkflowState { return { - stateVersion: "1", + stateVersion: "2", workflowId, repositoryIdentity: "/canonical/repository/.git", baseCommitOid: "1".repeat(40), @@ -74,13 +70,7 @@ function initialState(workflowId: string): AutopilotWorkflowState { lastEntryHash: null, }, finalGate: null, - shipping: { - branch: `autopilot/${workflowId}`, - prNumber: null, - prUrl: null, - ciDeadlineAt: "2026-07-20T20:00:00.000Z", - }, - ciObservations: [], + branch: `autopilot/${workflowId}`, cleanup: null, terminal: null, createdAt: "2026-07-20T18:00:00.000Z", @@ -239,7 +229,7 @@ describe("WorkflowStore", () => { it("rejects an illegal edge without changing persisted state", async () => { const store = await createStore("illegal-edge"); - await expect(store.transition({ expectedRevision: 0, to: "marking-ready" })) + await expect(store.transition({ expectedRevision: 0, to: "cleaning-up" })) .rejects.toMatchObject({ detail: { toolError: "invalid-workflow-transition" } }); expect(await store.read()).toMatchObject({ revision: 0, phase: "preflighting" }); }); @@ -255,21 +245,7 @@ describe("WorkflowStore", () => { "failed", "cancelled", ], - "final-review": ["pushing", "human-decision-required", "failed", "cancelled"], - pushing: ["creating-draft-pr", "human-decision-required", "failed", "cancelled"], - "creating-draft-pr": [ - "waiting-required-checks", - "human-decision-required", - "failed", - "cancelled", - ], - "waiting-required-checks": [ - "marking-ready", - "human-decision-required", - "failed", - "cancelled", - ], - "marking-ready": ["cleaning-up", "human-decision-required", "failed", "cancelled"], + "final-review": ["cleaning-up", "human-decision-required", "failed", "cancelled"], "cleaning-up": ["ready-for-human-review", "human-decision-required", "failed", "cancelled"], "ready-for-human-review": [], "human-decision-required": [], @@ -343,9 +319,9 @@ describe("WorkflowStore", () => { .toEqual([]); }, 10_000); - it("requires marking-ready then cleaning-up and successful cleanup before success", async () => { + it("requires final review then cleaning-up and successful cleanup before success", async () => { const store = await createStore("successful-ending"); - let state = await advanceTo(store, "marking-ready"); + let state = await advanceTo(store, "final-review"); await expect(store.transition({ expectedRevision: state.revision, @@ -379,14 +355,14 @@ describe("WorkflowStore", () => { .rejects.toMatchObject({ detail: { toolError: "invalid-workflow-transition" } }); }); - it("increments revisions while preserving immutable identity and the absolute CI deadline", async () => { + it("increments revisions while preserving immutable identity and the hand-off branch", async () => { const store = await createStore("immutable-fields"); const state = await store.transition({ expectedRevision: 0, to: "running-task", update: draft => { draft.repositoryIdentity = "/substituted"; - draft.shipping.ciDeadlineAt = "2099-01-01T00:00:00.000Z"; + draft.branch = "substituted/branch"; draft.tasks[0]!.status = "running"; }, }); @@ -395,42 +371,34 @@ describe("WorkflowStore", () => { revision: 1, phase: "running-task", repositoryIdentity: "/canonical/repository/.git", - shipping: { ciDeadlineAt: "2026-07-20T20:00:00.000Z" }, + branch: initialState("immutable-fields").branch, tasks: [{ status: "running" }], }); }); - it("records pending CI observations with a CAS update that preserves the phase", async () => { - const store = await createStore("pending-ci-update"); - const waiting = await advanceTo(store, "waiting-required-checks"); + it("records a CAS update that preserves the phase", async () => { + const store = await createStore("cas-update"); + const running = await advanceTo(store, "running-task"); const updated = await store.update({ - expectedRevision: waiting.revision, - patch: { - ciObservations: [...waiting.ciObservations, { - observedAt: "2026-07-20T18:01:00.000Z", - result: "pending", - headCommitOid: "2".repeat(40), - checks: [{ - bucket: "pending", - name: "test", - state: "IN_PROGRESS", - link: null, - }], - }], - }, + expectedRevision: running.revision, + patch: { currentTaskIndex: 0 }, }); - expect(updated).toMatchObject({ - revision: waiting.revision + 1, - phase: "waiting-required-checks", - ciObservations: [{ result: "pending" }], - }); + expect(updated).toMatchObject({ revision: running.revision + 1, phase: "running-task" }); await expect(store.update({ - expectedRevision: waiting.revision, - patch: { ciObservations: [] }, + expectedRevision: running.revision, + patch: { currentTaskIndex: 0 }, })).rejects.toMatchObject({ detail: { toolError: "workflow-revision-conflict" } }); }); + it("names a workflow persisted by the shipping (v1) runtime instead of calling it malformed", async () => { + const store = await createStore("retired-v1-state"); + const persisted = JSON.parse(await readFile(store.statePath, "utf8")); + await writeFile(store.statePath, JSON.stringify({ ...persisted, stateVersion: "1" }), "utf8"); + await expect(store.read()) + .rejects.toMatchObject({ detail: { toolError: "workflow-state-version-unsupported" } }); + }); + it("rejects malformed, oversize, and symlink-substituted persisted state", async () => { const malformed = await createStore("malformed-state"); await writeFile(malformed.statePath, "{not-json", "utf8"); diff --git a/tests/runtime/bootstrap.smoke.test.ts b/tests/runtime/bootstrap.smoke.test.ts index 9203dbd..881a084 100644 --- a/tests/runtime/bootstrap.smoke.test.ts +++ b/tests/runtime/bootstrap.smoke.test.ts @@ -161,6 +161,28 @@ describe("runtime bootstrap", () => { expect(result.stderr).toContain("fake server ready"); }); + it.skipIf(process.platform === "win32")("never re-execs a node from a relative PATH entry", async () => { + const root = await mkdtemp(path.join(tmpdir(), "ca-bootstrap-relative-")); + temporaryPaths.push(root); + const serverPath = await fakeServer(root); + const preludePath = await nodeVersionPrelude(root, "20.19.0"); + await mkdir(path.join(root, "bin")); + await symlink(process.execPath, path.join(root, "bin", "node")); + + const result = spawnSync( + process.execPath, + ["--import", preludePath, bootstrapPath], + { + cwd: root, + encoding: "utf8", + env: { ...process.env, PATH: "bin", CLAUDE_ARCHITECT_SERVER_PATH: serverPath }, + }, + ); + + expect(result.status).not.toBe(0); + expect(result.stderr).not.toContain("fake server ready"); + }); + it("uses the shipped parser to accept the Node.js 22 boundary", async () => { const root = await mkdtemp(path.join(tmpdir(), "ca-bootstrap-boundary-")); temporaryPaths.push(root); diff --git a/tests/runtime/candidate-tree.test.ts b/tests/runtime/candidate-tree.test.ts index 7bcb419..98a1aa5 100644 --- a/tests/runtime/candidate-tree.test.ts +++ b/tests/runtime/candidate-tree.test.ts @@ -17,14 +17,16 @@ vi.mock("../../src/git/git-exec.js", async importOriginal => { return { ...actual, git: async (...args: Parameters) => { - if (args[1][0] === gitHooks.failCommand) { + // The subcommand, past leading options such as --attr-source. + const command = args[1].find(arg => !arg.startsWith("-")); + if (command === gitHooks.failCommand) { return { stdout: "", stderr: `forced ${gitHooks.failCommand} failure`, exitCode: 1 }; } const result = await actual.git(...args); - if (args[1][0] === gitHooks.truncateCommand) { + if (command === gitHooks.truncateCommand) { return { ...result, truncated: { stdout: true, stderr: false } }; } - if (args[1][0] === "read-tree" && gitHooks.afterReadTree !== undefined) { + if (command === "read-tree" && gitHooks.afterReadTree !== undefined) { const hook = gitHooks.afterReadTree; gitHooks.afterReadTree = undefined; await hook(); diff --git a/tests/runtime/checked-git.test.ts b/tests/runtime/checked-git.test.ts new file mode 100644 index 0000000..4d46ca7 --- /dev/null +++ b/tests/runtime/checked-git.test.ts @@ -0,0 +1,73 @@ +import { mkdtemp, rm, writeFile } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import path from "node:path"; +import { afterEach, describe, expect, it } from "vitest"; +import { candidateReviewPatch } from "../../src/git/candidate-tree.js"; +import { gitChecked, reviewDiff } from "../../src/git/checked-git.js"; +import { git } from "../../src/git/git-exec.js"; + +const temporaryPaths: string[] = []; + +afterEach(async () => { + await Promise.all(temporaryPaths.splice(0).map(candidate => + rm(candidate, { recursive: true, force: true }))); +}); + +async function commitAll(repo: string, message: string): Promise { + await gitChecked(repo, ["add", "-A"]); + await gitChecked(repo, [ + "-c", "user.name=Review Diff Test", + "-c", "user.email=review-diff@example.invalid", + "commit", "-q", "-m", message, + ]); + return (await gitChecked(repo, ["rev-parse", "HEAD"])).trim(); +} + +async function hiddenCandidate(): Promise<{ repo: string; base: string; head: string }> { + const repo = await mkdtemp(path.join(tmpdir(), "ca-review-diff-")); + temporaryPaths.push(repo); + await gitChecked(repo, ["init", "-q"]); + await writeFile(path.join(repo, "payload.ts"), "export const safe = true;\n"); + await writeFile(path.join(repo, "image.png"), Buffer.from([0x89, 0x50, 0x00, 0x01])); + const base = await commitAll(repo, "base"); + // A Producer marks its own source as binary so a plain diff hides it. + await writeFile(path.join(repo, ".gitattributes"), "payload.ts -diff\n"); + await writeFile(path.join(repo, "payload.ts"), "export const safe = true;\nexfiltrate();\n"); + await writeFile(path.join(repo, "image.png"), Buffer.from([0x89, 0x50, 0x00, 0x02])); + const head = await commitAll(repo, "candidate"); + return { repo, base, head }; +} + +describe("review diffs", () => { + it("shows source a Producer marked -diff while real binaries stay binary", async () => { + const { repo, base, head } = await hiddenCandidate(); + + const plain = await gitChecked(repo, ["diff", `${base}..${head}`]); + const reviewed = await reviewDiff(repo, base, head); + + expect(plain).not.toContain("exfiltrate()"); + expect(reviewed).toContain("+exfiltrate();"); + expect(reviewed).toContain("Binary files a/image.png and b/image.png differ"); + }); + + it("renders the same content in the archived human review patch", async () => { + const { repo, base, head } = await hiddenCandidate(); + + const patch = await candidateReviewPatch(repo, base, head); + + expect(patch).toContain("+exfiltrate();"); + expect(patch).toContain("[[BINARY_PATCH_PAYLOAD_OMITTED]]"); + }); +}); + +describe("gitChecked", () => { + it("treats truncated output as a failure, never as a partial answer", async () => { + const { repo, base, head } = await hiddenCandidate(); + + const bounded = await git(repo, ["diff", `${base}..${head}`], { maxOutputBytes: 16 }); + expect(bounded.exitCode).toBe(0); + expect(bounded.truncated?.stdout).toBe(true); + await expect(gitChecked(repo, ["diff", `${base}..${head}`], { maxOutputBytes: 16 })) + .rejects.toThrow("git diff output exceeded the runtime bound"); + }); +}); diff --git a/tests/runtime/decision-authority.test.ts b/tests/runtime/decision-authority.test.ts index e556960..4cc5471 100644 --- a/tests/runtime/decision-authority.test.ts +++ b/tests/runtime/decision-authority.test.ts @@ -6,7 +6,6 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, it } from "vitest"; import { - autonomousEligibility, DECISION_AUTHORITY_ENV, decisionAuthority, } from "../../src/mcp/decision-authority.js"; @@ -17,6 +16,7 @@ import type { AttemptResult, CandidateArtifact } from "../../src/protocol/attemp import { ArtifactStore } from "../../src/runtime/artifact-store.js"; import type { CandidateDecisionV2 } from "../../src/protocol/candidate-decision.js"; import type { RunManifest } from "../../src/runtime/run-manifest.js"; +import { manifestHashOf } from "../../src/git/changed-path-manifest.js"; import type { ReviewSnapshot } from "../../src/runtime/review-snapshot.js"; describe("decisionAuthority", () => { @@ -42,49 +42,6 @@ describe("decisionAuthority", () => { }); }); -describe("autonomousEligibility", () => { - const gateCleared = { warnings: [], verifiedClean: true, unreadable: false }; - - it("accepts only an evidence-bound, gate-cleared, unwarned, readable candidate", () => { - expect(autonomousEligibility("autonomous", gateCleared)) - .toEqual({ eligible: true, reasons: [] }); - }); - - it("refuses when the authority is human", () => { - expect(autonomousEligibility("human", gateCleared).eligible).toBe(false); - }); - - it("refuses an unreadable archive rather than falling through to a prompt", () => { - // Under autonomous policy a client may not advertise elicitation at all, so - // downgrading here would dead-end the run with no path forward. - const verdict = autonomousEligibility( - "autonomous", - { warnings: ["unreadable"], verifiedClean: false, unreadable: true }, - ); - expect(verdict.eligible).toBe(false); - expect(verdict.reasons).toEqual(["the candidate archive could not be read"]); - }); - - it("refuses a run that is not an independently verified candidate", () => { - // The decisive case: zero warnings but unverified (e.g. a failed or - // still-open run). Keying autonomy off warnings alone, instead of the - // archived status, would auto-accept whatever such a run produced. - const verdict = autonomousEligibility( - "autonomous", - { warnings: [], verifiedClean: false, unreadable: false }, - ); - expect(verdict.eligible).toBe(false); - expect(verdict.reasons).toEqual(["the candidate is not an independently verified result"]); - }); - - it("refuses a verified candidate carrying advisory warnings", () => { - expect(autonomousEligibility( - "autonomous", - { warnings: ["the pipeline gate did NOT clear this candidate"], verifiedClean: true, unreadable: false }, - ).eligible).toBe(false); - }); -}); - describe("policy-autonomous decisions survive the archive", () => { // Isolated state root: this used to write into the real plugin data directory // under a fixed run id, so the archive it created survived the run and made @@ -158,6 +115,10 @@ const candidate: CandidateArtifact = { changedPaths: [], }; +let confinedVerification: unknown[] = [ + { id: "unit", confinement: "macos-seatbelt", networkPolicy: "unenforced", skipped: false }, +]; + const verifiedResult = { runId: "decide-authority", status: "verified-candidate", @@ -208,6 +169,7 @@ async function advisoryFor(result: AttemptResult) { repoRoot: "/canonical/repo", baseCommitOid: candidate.baseCommitOid, candidateManifestHash: candidate.manifestHash, + effectivePolicy: { verificationPolicy: confinedVerification }, } as unknown as RunManifest), }) as never, }); @@ -246,6 +208,7 @@ async function decideVia( repoRoot: "/canonical/repo", baseCommitOid: candidate.baseCommitOid, candidateManifestHash: candidate.manifestHash, + effectivePolicy: { verificationPolicy: confinedVerification }, } as unknown as RunManifest), writeCandidateDecisionRecord: async (record: CandidateDecisionV2) => { recorded = record; @@ -302,13 +265,72 @@ describe("decideCandidate honors the configured authority", () => { const advisory = await advisoryFor(plainDelegateResult); expect(advisory).toEqual({ warnings: [], verifiedClean: true, unreadable: false }); - expect(autonomousEligibility("autonomous", advisory).eligible).toBe(true); const { decision, output } = await decideVia("autonomous", plainDelegateResult); expect(decision, JSON.stringify(output)).not.toBeNull(); expect(decision?.authority).toBe("policy-autonomous"); }); + it("requires a person when verification ran without OS confinement", async () => { + // Unconfined verification ran Producer code with the user's authority and + // could have rewritten the archive itself, so it cannot ground autonomy. + const plainDelegateResult = { + ...verifiedResult, + evidence: { plainDelegate: true }, + } as AttemptResult; + const previous = confinedVerification; + confinedVerification = [{ id: "unit", confinement: "none", skipped: false }]; + try { + expect(await advisoryFor(plainDelegateResult)).toEqual({ + warnings: ["project verification ran without OS confinement on this platform"], + verifiedClean: false, + unreadable: false, + }); + const { decision } = await decideVia("autonomous", plainDelegateResult); + expect(decision).toBeNull(); + } finally { + confinedVerification = previous; + } + }); + + it("requires a person when a plain delegate rewrote its own verification inputs", async () => { + const changedPaths = [{ + path: "tests/unit.test.ts", + changeType: "modified", + mode: "100644", + contentHash: "a".repeat(40), + }]; + const touched = { + ...verifiedResult, + candidate: { + ...candidate, + changedPaths, + manifestHash: manifestHashOf(changedPaths as never), + }, + evidence: { plainDelegate: true }, + } as AttemptResult; + + const advisory = await readDecisionAdvisory("decide-authority", { + ps: fakePlatform(), + storeFactory: () => ({ + readResult: async () => touched, + readManifest: async () => ({ + runId: "decide-authority", + repoRoot: "/canonical/repo", + baseCommitOid: candidate.baseCommitOid, + candidateManifestHash: touched.candidate!.manifestHash, + effectivePolicy: { verificationPolicy: confinedVerification }, + } as unknown as RunManifest), + }) as never, + }); + + expect(advisory).toEqual({ + warnings: ["the candidate changes verification inputs: tests/unit.test.ts"], + verifiedClean: false, + unreadable: false, + }); + }); + it("fails closed on an archive with neither provenance marker nor gate evidence", async () => { // An archive carrying no `plainDelegate` marker and no pipeline evidence // proves nothing about how it was produced. Autonomy must key on positive @@ -320,7 +342,6 @@ describe("decideCandidate honors the configured authority", () => { verifiedClean: false, unreadable: false, }); - expect(autonomousEligibility("autonomous", advisory).eligible).toBe(false); }); it("does not double-report a missing clearance record when the gate refused", async () => { @@ -332,9 +353,7 @@ describe("decideCandidate honors the configured authority", () => { }); expect(advisory).toEqual({ - warnings: [ - "the pipeline gate did NOT clear this candidate: unresolved blocker F-001: blocked", - ], + warnings: ["unresolved blocker F-001: blocked"], verifiedClean: false, unreadable: false, }); @@ -371,7 +390,6 @@ describe("decideCandidate honors the configured authority", () => { verifiedClean: false, unreadable: false, }); - expect(autonomousEligibility("autonomous", advisory).eligible).toBe(false); }, ); diff --git a/tests/runtime/dependency-link.test.ts b/tests/runtime/dependency-link.test.ts index 5cbb601..14b0005 100644 --- a/tests/runtime/dependency-link.test.ts +++ b/tests/runtime/dependency-link.test.ts @@ -45,7 +45,7 @@ describe("probeCowSupport", () => { await expect(probeCowSupport({ platform: "linux", execFile: async (file, args) => { - expect(file).toBe("cp"); + expect(["/bin/cp", "/usr/bin/cp"]).toContain(file); expect(args.slice(0, 2)).toEqual(["-a", "--reflink=always"]); probeRoot = path.dirname(args.at(-1)!); throw new Error("forced cp failure"); diff --git a/tests/runtime/doctor.test.ts b/tests/runtime/doctor.test.ts index 45f3fc8..16b2d12 100644 --- a/tests/runtime/doctor.test.ts +++ b/tests/runtime/doctor.test.ts @@ -224,6 +224,25 @@ describe("doctor", () => { expect(JSON.stringify(result)).not.toContain("sk-doctorsecret"); }); + it.each([ + ["2.39.5", true], + ["2.40.0", false], + ["2.49.0.windows.1", false], + ["3.0.0", false], + ])("flags git %s as too old: %s", async (version, tooOld) => { + const result = await doctor({ + ps: platform("darwin"), + env: { CLAUDE_PLUGIN_DATA: "/plugin-data" }, + nodeVersion: "22.17.0", + arch: "arm64", + environmentType: "native", + git: async () => ({ stdout: `git version ${version}\n`, stderr: "", exitCode: 0 }), + probeAll: async () => [], + }); + expect(result.git.version).toBe(version); + expect(result.issues.includes("git-too-old")).toBe(tooOld); + }); + it("reports unsupported for a sandbox backend without a matching host row", async () => { const result = await doctor({ ps: platform("win32"), diff --git a/tests/runtime/durable-write.test.ts b/tests/runtime/durable-write.test.ts index 27e875e..72e5d6f 100644 --- a/tests/runtime/durable-write.test.ts +++ b/tests/runtime/durable-write.test.ts @@ -1,4 +1,4 @@ -import { mkdtemp, readFile, readdir, rm } from "node:fs/promises"; +import { mkdtemp, readFile, readdir, rm, symlink, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import path from "node:path"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; @@ -41,6 +41,23 @@ describe("PlatformSafety durable-write", () => { } }); + it.skipIf(process.platform === "win32")( + "refuses a symlink planted where an immutable record belongs", + async () => { + const outside = path.join(testDir, "outside.json"); + await writeFile(outside, '{"data":1}'); + await symlink(outside, path.join(testDir, "artifact.json")); + const session = await openDurableDirectorySession(testDir); + try { + // Identical bytes behind the link must not count as the record. + await expect(writeAtomic(session, "artifact.json", '{"data":1}', "immutable")) + .rejects.toThrow("archive entry is not a plain file"); + } finally { + await session.close(); + } + }, + ); + it("writes atomically in replace mode", async () => { const session = await openDurableDirectorySession(testDir); try { diff --git a/tests/runtime/e2e-pipeline.test.ts b/tests/runtime/e2e-pipeline.test.ts index 0816b24..e0bd32f 100644 --- a/tests/runtime/e2e-pipeline.test.ts +++ b/tests/runtime/e2e-pipeline.test.ts @@ -17,7 +17,6 @@ import { readDecisionAdvisory, type ToolDependencies, } from "../../src/mcp/tools.js"; -import { autonomousEligibility } from "../../src/mcp/decision-authority.js"; import { runPipeline } from "../../src/pipeline/pipeline-runtime.js"; import type { ReviewReport } from "../../src/pipeline/report-types.js"; import type { ResolvedExecutable } from "../../src/platform/platform-services.js"; @@ -225,7 +224,11 @@ const passingVerifier: AcceptanceVerifierLike = { return { ok: true, failures: [], - evidence: { acceptance: "passed" }, + // Real-shaped policy: the declared command ran under OS confinement. + evidence: { + acceptance: "passed", + verificationPolicy: [{ id: "unit", confinement: "macos-seatbelt", skipped: false }], + }, commandOutcomes: [], }; }, @@ -349,6 +352,11 @@ afterEach(async () => { rm(entry, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 }))); }); +// Every writer and review round gets a fresh worktree, so one pipeline drives +// several real create/remove cycles; on a loaded full-suite host those exceed +// the default per-test budget. +const PIPELINE_TIMEOUT_MS = 90_000; + describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () => { it("full lifecycle: a gate-cleared pipeline remains autonomously eligible", async () => { const repo = await initRepo(); @@ -385,8 +393,6 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = verifiedClean: true, unreadable: false, }); - expect(autonomousEligibility("autonomous", advisory)) - .toEqual({ eligible: true, reasons: [] }); const candidateHash = result.result.attempt.candidate?.manifestHash; expect(candidateHash).toBeDefined(); @@ -419,7 +425,7 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = lifecycleDeps, )).resolves.toMatchObject({ integration: "applied" }); await expect(readFile(path.join(repo, "a.txt"), "utf8")).resolves.toBe("fixed\n"); - }); + }, PIPELINE_TIMEOUT_MS); it("pipeline with an unfixable blocker ends at human-decision-required", async () => { const repo = await initRepo(); @@ -439,7 +445,7 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = if (!result.ok) throw new Error("pipeline delegation unexpectedly failed"); expect(result.result.rounds).toHaveLength(2); expect(adapter.calls).toEqual({ implement: 2, correctness: 2, systems: 2, fixer: 2 }); - }); + }, PIPELINE_TIMEOUT_MS); it("carries a refusing gate into the archived attempt the accept path reads", async () => { const repo = await initRepo(); @@ -459,18 +465,13 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = reasons: expect.arrayContaining([expect.any(String)]), }); - // And it has to reach the text the human reads before spending a decision. + // It has to reach the text the human reads before spending a decision, and + // block autonomous acceptance: the advisory is the autonomous verdict. await expect(readDecisionAdvisory(runId, deps)).resolves.toMatchObject({ - warnings: [expect.stringContaining("the pipeline gate did NOT clear this candidate")], + warnings: archived?.evidence.pipelineGateRefused?.reasons, + verifiedClean: false, }); - - // A refused gate must also block autonomous acceptance, or the default - // authority would spend a decision on the candidate the gate rejected. - expect(autonomousEligibility( - "autonomous", - await readDecisionAdvisory(runId, deps), - ).eligible).toBe(false); - }); + }, PIPELINE_TIMEOUT_MS); it("warns rather than reporting a clean candidate when the archive cannot be read", async () => { const advisory = await readDecisionAdvisory("e2e-pipeline-no-such-run", {}); @@ -479,7 +480,5 @@ describe.runIf(process.platform === "darwin")("end-to-end review pipeline", () = unreadable: true, verifiedClean: false, }); - // An unknown candidate must never be autonomously accepted. - expect(autonomousEligibility("autonomous", advisory).eligible).toBe(false); - }); + }, PIPELINE_TIMEOUT_MS); }); diff --git a/tests/runtime/environment-policy.test.ts b/tests/runtime/environment-policy.test.ts index dcf01c6..8a2ad3f 100644 --- a/tests/runtime/environment-policy.test.ts +++ b/tests/runtime/environment-policy.test.ts @@ -28,6 +28,28 @@ afterEach(() => { }); describe("buildEnvironment", () => { + it("redacts every value handed to the Producer, whatever its name", () => { + const result = buildEnvironment({ + os: "darwin", + adapterAllowlist: [], + specAdditions: { VENDOR_WEBHOOK: "hooks-x9Y8z7W6v5", CACHE_DIR: "/abs/cache/path" }, + }); + try { + expect(redact("posting to hooks-x9Y8z7W6v5")).not.toContain("hooks-x9Y8z7W6v5"); + expect(redact("cache at /abs/cache/path")).toContain("/abs/cache/path"); + } finally { + result.secretRegistration.dispose(); + } + }); + + it("refuses a spec that overrides a confinement input", () => { + expect(() => buildEnvironment({ + os: "darwin", + adapterAllowlist: [], + specAdditions: { PATH: "/attacker/bin" }, + })).toThrow('delegation environment may not override "PATH"'); + }); + it("constructs a layered allowlisted environment with names-only provenance", () => { const result = buildEnvironment({ os: "darwin", diff --git a/tests/runtime/gates.test.ts b/tests/runtime/gates.test.ts index ad070f4..476fc97 100644 --- a/tests/runtime/gates.test.ts +++ b/tests/runtime/gates.test.ts @@ -108,7 +108,6 @@ describe("evaluateGates", () => { ["invalid artifact", base({ artifactsValid: false }), false], ["baseline drift", base({ baselineDrift: false, ...{ baselineDrift: true } }), false], ["round cap exceeded", base({ roundsUsed: 3 }), true], - ["minor without disposition", base({ findings: [finding("F-001", "minor")] }), false], ])("%s → not decision-ready (human=%s)", (_name, input, expectHuman) => { const out = evaluateGates(input); expect(out.decisionReady).toBe(false); @@ -116,9 +115,9 @@ describe("evaluateGates", () => { expect(out.requiresHumanDecision).toBe(expectHuman); }); - it("nits never block, even undispositioned", () => { - const out = evaluateGates(base({ findings: [finding("F-001", "nit")] })); - expect(out.decisionReady).toBe(true); + it.each(["nit", "minor"] as const)("%s findings never block, even undispositioned", severity => { + const out = evaluateGates(base({ findings: [finding("F-001", severity)] })); + expect(out).toEqual({ decisionReady: true, requiresHumanDecision: false, reasons: [] }); }); it("fixed blocker with commit + passing verification is decision-ready", () => { diff --git a/tests/runtime/git-exec.test.ts b/tests/runtime/git-exec.test.ts index b92ddc6..c346945 100644 --- a/tests/runtime/git-exec.test.ts +++ b/tests/runtime/git-exec.test.ts @@ -3,7 +3,7 @@ import { chmod, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises import { tmpdir } from "node:os"; import path from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; -import { git, type GitResult } from "../../src/git/git-exec.js"; +import { git, userCommitEnvironment, type GitResult } from "../../src/git/git-exec.js"; import { getPlatformServices } from "../../src/platform/select-platform.js"; const temporaryPaths: string[] = []; @@ -175,3 +175,162 @@ describe("git execution hardening", () => { expect(result.truncated?.stdout).toBe(true); }); }); + +describe("diff driver suppression", () => { + it("never runs a configured textconv or external diff bound by in-tree attributes", async () => { + const { repo } = await makeRepo(); + const marker = path.join(repo, "..", `driver-ran-${path.basename(repo)}`); + temporaryPaths.push(marker); + const script = `require('fs').writeFileSync(${JSON.stringify(marker)},'')`; + await rawGit(repo, ["config", "diff.x.textconv", `"${process.execPath}" -e "${script.replaceAll("\"", "\\\"")}"`]); + await rawGit(repo, ["config", "diff.x.command", `"${process.execPath}" -e "${script.replaceAll("\"", "\\\"")}"`]); + await writeFile(path.join(repo, ".gitattributes"), "* diff=x\n"); + await writeFile(path.join(repo, "tracked.txt"), "changed\n"); + + for (const args of [ + ["diff"], + ["-c", "core.quotepath=false", "diff", "HEAD"], + ["log", "-p", "-1"], + ["show", "HEAD"], + ]) { + const result = await git(repo, args); + expect(result.exitCode, `${args.join(" ")}: ${result.stderr}`).toBe(0); + } + await expect(readFile(marker)).rejects.toMatchObject({ code: "ENOENT" }); + }); +}); + + +describe("index listing bound", () => { + it("lists an index larger than the default output bound in full", async () => { + const repo = await mkdtemp(path.join(tmpdir(), "ca-git-ls-files-")); + try { + expect((await git(repo, ["init", "-q"])).exitCode).toBe(0); + await writeFile(path.join(repo, "blob"), "x"); + const blob = (await git(repo, ["hash-object", "-w", "blob"])).stdout.trim(); + // Index-only entries with long names: ~9 MB of listing, no files on disk. + const directory = "d".repeat(200); + const total = 11_000; + for (let start = 0; start < total; start += 500) { + const args = ["update-index", "--add"]; + for (let index = start; index < start + 500; index += 1) { + args.push("--cacheinfo", `100644,${blob},${directory}/${directory}/${directory}/${directory}/f${index}`); + } + expect((await git(repo, args)).exitCode).toBe(0); + } + + const listed = await git(repo, ["ls-files", "-v", "-z"]); + + expect(listed.truncated?.stdout).toBe(false); + expect(listed.stdout.length).toBeGreaterThan(8_000_000); + expect(listed.stdout.split("\0").filter(Boolean)).toHaveLength(total); + } finally { + await rm(repo, { recursive: true, force: true }); + } + }, 60_000); +}); + +describe("commit identity", () => { + it("reads the user's global identity only for promotion commits", async () => { + const { root, repo } = await makeRepo(); + const home = path.join(root, "home"); + await mkdir(home); + await writeFile( + path.join(home, ".gitconfig"), + "[user]\n\tname = Global Person\n\temail = global@example.invalid\n", + ); + const saved = Object.fromEntries( + ["HOME", "XDG_CONFIG_HOME", "GIT_CONFIG_GLOBAL", "GIT_CONFIG_SYSTEM", "GIT_CONFIG_NOSYSTEM"] + .map(key => [key, process.env[key]]), + ); + for (const key of Object.keys(saved)) delete process.env[key]; + process.env.HOME = home; + try { + const environment = await userCommitEnvironment(repo); + expect(environment).toMatchObject({ + GIT_AUTHOR_NAME: "Global Person", + GIT_AUTHOR_EMAIL: "global@example.invalid", + GIT_COMMITTER_NAME: "Global Person", + GIT_COMMITTER_EMAIL: "global@example.invalid", + }); + expect(environment?.GIT_AUTHOR_DATE).toMatch(/^\d+ [+-]\d{4}$/); + expect(Number(environment!.GIT_AUTHOR_DATE!.split(" ")[0])) + .toBeGreaterThan(Date.parse("2020-01-01") / 1000); + + const tree = (await expectGit(repo, ["rev-parse", "HEAD^{tree}"])).stdout.trim(); + const promoted = (await git(repo, ["commit-tree", tree, "-m", "promoted"], { + env: environment!, + })).stdout.trim(); + expect((await expectGit(repo, ["log", "-1", "--format=%an <%ae>|%cn", promoted])).stdout) + .toBe("Global Person |Global Person\n"); + + // Every other Git call still sees neither global config nor the user. + const internal = (await expectGit(repo, ["commit-tree", tree, "-m", "internal"])).stdout.trim(); + expect((await expectGit(repo, ["log", "-1", "--format=%an|%ad", "--date=unix", internal])).stdout) + .toBe("claude-architect|946684800\n"); + expect((await git(repo, ["config", "user.name"])).exitCode).toBe(1); + } finally { + for (const [key, value] of Object.entries(saved)) { + if (value === undefined) delete process.env[key]; + else process.env[key] = value; + } + } + }); + + it("honors the caller's GIT_CONFIG_GLOBAL when reading the user identity", async () => { + const { root, repo } = await makeRepo(); + const config = path.join(root, "chosen.gitconfig"); + await writeFile(config, "[user]\n\tname = Chosen Config\n\temail = chosen@example.invalid\n"); + const original = process.env.GIT_CONFIG_GLOBAL; + process.env.GIT_CONFIG_GLOBAL = config; + try { + expect(await userCommitEnvironment(repo)).toMatchObject({ + GIT_AUTHOR_NAME: "Chosen Config", + GIT_COMMITTER_EMAIL: "chosen@example.invalid", + }); + } finally { + if (original === undefined) delete process.env.GIT_CONFIG_GLOBAL; + else process.env.GIT_CONFIG_GLOBAL = original; + } + }); + + it("refuses the user-identity mode for anything but git var of an identity", async () => { + const { repo } = await makeRepo(); + for (const args of [["config", "user.name"], ["var", "GIT_EDITOR"], ["var"]]) { + const result = await git(repo, args, { userIdentity: true }); + expect(result.exitCode, args.join(" ")).toBe(2); + expect(result.stderr).toContain("userIdentity"); + } + }); + + it("refuses a machine-guessed identity when none is configured", async () => { + const { root, repo } = await makeRepo(); + const home = path.join(root, "empty-home"); + await mkdir(home); + const empty = path.join(root, "empty.gitconfig"); + await writeFile(empty, ""); + const saved = Object.fromEntries( + ["HOME", "XDG_CONFIG_HOME", "GIT_CONFIG_GLOBAL", "GIT_CONFIG_SYSTEM", "GIT_CONFIG_NOSYSTEM"] + .map(key => [key, process.env[key]]), + ); + for (const key of Object.keys(saved)) delete process.env[key]; + process.env.HOME = home; + process.env.GIT_CONFIG_GLOBAL = empty; + process.env.GIT_CONFIG_NOSYSTEM = "1"; + try { + expect(await userCommitEnvironment(repo)).toBeNull(); + } finally { + for (const [key, value] of Object.entries(saved)) { + if (value === undefined) delete process.env[key]; + else process.env[key] = value; + } + } + }); + + it("reports a missing identity instead of inventing one", async () => { + const result = await userCommitEnvironment("/unused", async () => ({ + stdout: "", stderr: "fatal: unable to auto-detect email address", exitCode: 128, + })); + expect(result).toBeNull(); + }); +}); diff --git a/tests/runtime/handshake.smoke.test.ts b/tests/runtime/handshake.smoke.test.ts index 91bbf56..d51235e 100644 --- a/tests/runtime/handshake.smoke.test.ts +++ b/tests/runtime/handshake.smoke.test.ts @@ -287,7 +287,7 @@ describe("MCP server handshake", () => { name: "delegate", arguments: { checkoutPath: "/unused-invalid-spec", - protocolVersion: "1.3.0", + protocolVersion: "2.0.0", spec: { specVersion: "1" }, }, }); @@ -330,8 +330,8 @@ describe("MCP server handshake", () => { issues: expect.any(Array), }); expect(mismatchDiagnostic).toContain("protocol version mismatch"); - expect(mismatchDiagnostic).toContain("received 1.3.0"); - expect(mismatchDiagnostic).toContain("expected 2.0.0"); + expect(mismatchDiagnostic).toContain("received 2.0.0"); + expect(mismatchDiagnostic).toContain("expected 3.0.0"); expect(stdout.trim().split(/\r?\n/).every(line => { try { JSON.parse(line); diff --git a/tests/runtime/jev-screen.test.ts b/tests/runtime/jev-screen.test.ts new file mode 100644 index 0000000..096827e --- /dev/null +++ b/tests/runtime/jev-screen.test.ts @@ -0,0 +1,65 @@ +import { describe, expect, it } from "vitest"; +import { jevScreen } from "../../src/mcp/jev-screen.js"; +import type { CandidateArtifact } from "../../src/protocol/attempt-result.js"; + +const candidate = { + patch: "diff --git a/a.ts b/a.ts\n+const token = \"ghp_abcdefghijklmnopqrstuvwxyz0123456789\";\n", + changedPaths: [{ path: "a.ts", changeType: "modified", mode: "100644", contentHash: null }], +} as unknown as CandidateArtifact; + +const enabled = { CLAUDE_ARCHITECT_JEV: "on", TYPESAFE_API_KEY: "test-key" }; + +function answering(nouls: Record, status = 200): { + fetch: typeof globalThis.fetch; + requests: { url: string; init: RequestInit }[]; +} { + const requests: { url: string; init: RequestInit }[] = []; + const fetch = (async (url: string, init: RequestInit) => { + requests.push({ url, init }); + const answers = Object.fromEntries(Object.entries(nouls).map(([id, noul]) => [id, { type: "noul", noul }])); + return new Response(JSON.stringify({ model: "jev-test", answers }), { status }); + }) as unknown as typeof globalThis.fetch; + return { fetch, requests }; +} + +describe("jevScreen", () => { + it("does nothing, and sends nothing, unless explicitly enabled", async () => { + const { fetch, requests } = answering({}); + await expect(jevScreen(candidate, { env: { TYPESAFE_API_KEY: "k" }, fetch })) + .resolves.toEqual({ status: "disabled" }); + expect(requests).toHaveLength(0); + }); + + it("is unavailable, not a concern, without a key", async () => { + await expect(jevScreen(candidate, { env: { CLAUDE_ARCHITECT_JEV: "on" } })) + .resolves.toEqual({ status: "unavailable", reason: "TYPESAFE_API_KEY is not set" }); + }); + + it("sends only the redacted patch and changed paths", async () => { + const { fetch, requests } = answering({ weakens_verification: 0.1, security_sensitive: 0.1 }); + await expect(jevScreen(candidate, { env: enabled, fetch })).resolves.toEqual({ status: "clear" }); + const body = JSON.parse(String(requests[0]!.init.body)); + expect(requests[0]!.url).toBe("https://api.typesafe.ai/v1/systemone"); + expect(body.state.changedPaths).toEqual(["a.ts"]); + expect(body.state.patch).not.toContain("ghp_abcdefghijklmnopqrstuvwxyz0123456789"); + expect(Object.keys(body.questions)).toEqual(["weakens_verification", "security_sensitive"]); + }); + + it("reports each flagged risk as a concern", async () => { + const { fetch } = answering({ weakens_verification: 0.8, security_sensitive: 0.05 }); + await expect(jevScreen(candidate, { env: enabled, fetch })).resolves.toEqual({ + status: "concern", + reasons: ["an independent screen (Jev) flagged the candidate as weakening verification (p=0.80)"], + }); + }); + + it.each([ + ["an HTTP error", answering({}, 529).fetch, "HTTP 529"], + ["a malformed answer", answering({ weakens_verification: "yes", security_sensitive: 0.1 }).fetch, "malformed answer"], + ["a missing answer", answering({ weakens_verification: 0.1 }).fetch, "malformed answer"], + ["a network failure", (async () => { throw new TypeError("fetch failed"); }) as unknown as typeof globalThis.fetch, "TypeError"], + ])("treats %s as unavailable", async (_name, fetch, reason) => { + await expect(jevScreen(candidate, { env: enabled, fetch })) + .resolves.toEqual({ status: "unavailable", reason }); + }); +}); diff --git a/tests/runtime/lock-contention.test.ts b/tests/runtime/lock-contention.test.ts index e646e5a..acd34c0 100644 --- a/tests/runtime/lock-contention.test.ts +++ b/tests/runtime/lock-contention.test.ts @@ -6,6 +6,7 @@ import path from "node:path"; import nodeProcess from "node:process"; import { promisify } from "node:util"; import { afterEach, beforeEach, describe, expect, it } from "vitest"; +import { isLockContention } from "../../src/platform/lock-ownership.js"; import { getPlatformServices } from "../../src/platform/select-platform.js"; const execFileAsync = promisify(execFile); @@ -104,6 +105,14 @@ describe("repository lock contention diagnostics", () => { ); }); + it("classifies a timed-out acquisition as contention for callers to branch on", async () => { + const ps = getPlatformServices(); + const token = await ps.getProcessStartToken(nodeProcess.pid); + await writeLockRecord({ pid: nodeProcess.pid, processToken: token }); + const error = await ps.acquireCheckoutLock(checkout).then(() => null, (caught: unknown) => caught); + expect(isLockContention(error)).toBe(true); + }); + it("never discloses the owner's process token", async () => { const ps = getPlatformServices(); const held = await ps.acquireCheckoutLock(checkout, { runId: "run-secret" }); diff --git a/tests/runtime/mcp-decision-gate.test.ts b/tests/runtime/mcp-decision-gate.test.ts index 9b53180..7da4b9f 100644 --- a/tests/runtime/mcp-decision-gate.test.ts +++ b/tests/runtime/mcp-decision-gate.test.ts @@ -12,6 +12,7 @@ import type { AttemptResult, CandidateArtifact } from "../../src/protocol/attemp import { ArtifactStore } from "../../src/runtime/artifact-store.js"; import type { CandidateDecisionV2 } from "../../src/protocol/candidate-decision.js"; import type { RunManifest } from "../../src/runtime/run-manifest.js"; +import type { JevScreen } from "../../src/mcp/jev-screen.js"; import type { ReviewSnapshot } from "../../src/runtime/review-snapshot.js"; function minimalResult(runId: string): AttemptResult { @@ -140,6 +141,7 @@ async function decideVia( options: { onAcquireLock?: () => void; currentResult?: () => AttemptResult; + jevScreen?: JevScreen; } = {}, ): Promise<{ output: unknown; decision: CandidateDecisionV2 | null }> { let recorded: CandidateDecisionV2 | null = null; @@ -151,6 +153,8 @@ async function decideVia( pruneRuns: async () => {}, ps: fakePlatform(options.onAcquireLock), decisionAuthority: () => authority, + // Hermetic by default: the real screen is opt-in and networked. + jevScreen: options.jevScreen ?? (async () => ({ status: "disabled" })), storeFactory: () => ({ readResult: async () => options.currentResult?.() ?? result, readManifest: async () => ({ @@ -158,6 +162,7 @@ async function decideVia( repoRoot: "/canonical/repo", baseCommitOid: candidate.baseCommitOid, candidateManifestHash: candidate.manifestHash, + effectivePolicy: { verificationPolicy: [{ id: "unit", confinement: "macos-seatbelt", skipped: false }] }, } as unknown as RunManifest), writeCandidateDecisionRecord: async (record: CandidateDecisionV2) => { recorded = record; @@ -226,6 +231,27 @@ describe("decideCandidate authority", () => { expect(decision?.authority).toBe("policy-autonomous"); }); + it("lets a Jev concern withdraw autonomy but never grant it", async () => { + const concern: JevScreen = async () => ({ + status: "concern", + reasons: ["an independent screen (Jev) flagged security-sensitive changes in the candidate (p=0.91)"], + }); + const flagged = await decideVia(verifiedResult, "autonomous", { jevScreen: concern }); + expect(flagged.decision).toBeNull(); + expect(JSON.stringify(flagged.output)).toContain("elicitation"); + + for (const status of ["clear", "disabled"] as const) { + const { decision } = await decideVia(verifiedResult, "autonomous", { + jevScreen: async () => ({ status }), + }); + expect(decision?.authority).toBe("policy-autonomous"); + } + const outage = await decideVia(verifiedResult, "autonomous", { + jevScreen: async () => ({ status: "unavailable", reason: "HTTP 529" }), + }); + expect(outage.decision?.authority).toBe("policy-autonomous"); + }); + it("never records a clean candidate without elicitation under human authority", async () => { // Same candidate, same client, only the authority differs — the mutation // that proves the branch above is why no prompt happened. @@ -292,6 +318,7 @@ describe("decideCandidate authority", () => { repoRoot: "/canonical/repo", baseCommitOid: candidate.baseCommitOid, candidateManifestHash: candidate.manifestHash, + effectivePolicy: { verificationPolicy: [{ id: "unit", confinement: "macos-seatbelt", skipped: false }] }, } as unknown as RunManifest), writeCandidateDecisionRecord: async (record: CandidateDecisionV2) => { await persistentStore.writeCandidateDecisionRecord(record); diff --git a/tests/runtime/mcp-input-schema.test.ts b/tests/runtime/mcp-input-schema.test.ts index 48b21ca..b6665d4 100644 --- a/tests/runtime/mcp-input-schema.test.ts +++ b/tests/runtime/mcp-input-schema.test.ts @@ -74,15 +74,15 @@ describe.each([ expectedSpecSha256: 42, }).success).toBe(false); }); - it("diagnoses the previous 1.3.0 protocol and names expected 2.0.0", () => { - const result = schema.safeParse({ ...validInput, protocolVersion: "1.3.0" }); + it("diagnoses the previous 2.0.0 protocol and names expected 3.0.0", () => { + const result = schema.safeParse({ ...validInput, protocolVersion: "2.0.0" }); expect(result.success).toBe(false); if (result.success) return; const diagnostic = result.error.issues.map(issue => issue.message).join("\n"); expect(diagnostic).toContain("protocol version mismatch"); - expect(diagnostic).toContain("received 1.3.0"); - expect(diagnostic).toContain("expected 2.0.0"); + expect(diagnostic).toContain("received 2.0.0"); + expect(diagnostic).toContain("expected 3.0.0"); }, 5_000); }); diff --git a/tests/runtime/pipeline-runtime.test.ts b/tests/runtime/pipeline-runtime.test.ts index 650c93b..10d38a0 100644 --- a/tests/runtime/pipeline-runtime.test.ts +++ b/tests/runtime/pipeline-runtime.test.ts @@ -1261,7 +1261,7 @@ describe("runPipeline", () => { expect(reviewArgs[0]?.pkg.candidateDiff).toContain("slice two candidate"); expect(reviewArgs[0]?.pkg.testEvidence).toContain('"sliceIndex":1'); expect(reviewArgs[0]?.pkg.testEvidence).toContain('"sliceIndex":2'); - expect(path.basename(reviewArgs[0]?.worktreePath ?? "")).toBe(`${runId}-composed-review`); + expect(path.basename(reviewArgs[0]?.worktreePath ?? "")).toBe(`${runId}-round-1-review`); expect(result).toMatchObject({ status: "decision-ready", @@ -1672,7 +1672,7 @@ describe("runPipeline", () => { expect(reviewerArgs.map(args => path.basename(args.worktreePath))).toEqual([ `${runId}-slice-1-attempt-0-review`, `${runId}-slice-2-attempt-0-review`, - `${runId}-composed-review`, + `${runId}-round-1-review`, ]); expect(reviewerArgs[0]?.baseSpec.objective).toBe("Implement slice one only."); expect(reviewerArgs[0]?.pkg.candidateDiff).toContain("slice one candidate"); @@ -2843,6 +2843,50 @@ describe("runPipeline", () => { }); }, 120_000); + it("gives every fixer a fresh worktree that no earlier role could leave residue in", async () => { + const repo = await initRepo(); + const worktrees: Array<{ role: string; path: string; residue: boolean }> = []; + const base = roundReviews([ + { correctness: blocker, systems: approve }, + { correctness: blocker, systems: approve }, + { correctness: approve, systems: approve }, + ], async (args, round) => { + const commit = await commitFix(args, `fixed ${round}\n`); + // Ignored residue (a build cache, say) passes provenance, and a shared + // worktree would carry it into the next fixer. + const commonDir = await runGit(args.worktreePath, ["rev-parse", "--git-common-dir"]); + await mkdir(path.resolve(args.worktreePath, commonDir, "info"), { recursive: true }); + await writeFile(path.resolve(args.worktreePath, commonDir, "info", "exclude"), "residue.txt\n"); + await writeFile(path.join(args.worktreePath, "residue.txt"), "left behind\n"); + return success(fenced({ + reportVersion: "1", + candidateCommit: commit, + dispositions: [{ findingId: "F-001", disposition: "fixed", evidence: "Fixed.", commit }], + })); + }); + const roleRunner = async (args: RoleRunArgs): Promise => { + const residue = await readFile(path.join(args.worktreePath, "residue.txt")).then(() => true, () => false); + worktrees.push({ role: args.role, path: args.worktreePath, residue }); + return await base(args); + }; + + const result = await runPipeline( + repo, + validSpec({ reviewers: ["correctness", "systems"], maxRounds: 3 }), + dependencies({ runId: "pipeline-fresh-fixers", roleRunner }), + ); + + // Two blockers at one location end at the non-convergence gate; what + // matters here is where each role ran. + expect(result.rounds).toHaveLength(3); + const fixers = worktrees.filter(entry => entry.role === "fixer"); + expect(fixers.map(entry => path.basename(entry.path))).toEqual([ + "pipeline-fresh-fixers-round-1-fix", + "pipeline-fresh-fixers-round-2-fix", + ]); + expect(worktrees.every(entry => !entry.residue)).toBe(true); + }); + it("fixes a blocker and returns decision-ready after a clean re-review", async () => { const repo = await initRepo(); let privateObjectsDir = ""; @@ -3690,6 +3734,29 @@ describe("detectWeakenedTests", () => { expect(detectWeakenedTests(diff)).toEqual({ testsDeleted: 1, testsSkipped: 1 }); }); + it.each([ + ["tests/test_api.py", "@pytest.mark.skip(reason=\"flaky\")"], + ["tests/test_api.py", " self.skipTest(\"later\")"], + ["pkg/api_test.go", "\tt.Skip(\"later\")"], + ["tests/api.rs", "#[ignore]"], + ["src/test/java/ApiTest.java", " @Disabled"], + ["Tests/ApiTests.cs", " [Ignore(\"later\")]"], + ["spec/api_spec.rb", " skip \"later\""], + ["tests/api.test.ts", "xdescribe(\"api\", () => {"], + ])("counts a skip added to %s", (file, added) => { + const diff = [`diff --git a/${file} b/${file}`, `+${added}`].join("\n"); + expect(detectWeakenedTests(diff)).toEqual({ testsDeleted: 0, testsSkipped: 1 }); + }); + + it("does not count ordinary identifiers that resemble skip markers", () => { + const diff = [ + "diff --git a/pkg/api_test.go b/pkg/api_test.go", + "+\tskip := len(cases) == 0", + "+\tpending := 3", + ].join("\n"); + expect(detectWeakenedTests(diff)).toEqual({ testsDeleted: 0, testsSkipped: 0 }); + }); + it("ignores skips in non-test files", () => { const diff = ["diff --git a/src/foo.ts b/src/foo.ts", "+it.skip(", ""].join("\n"); expect(detectWeakenedTests(diff)).toEqual({ testsDeleted: 0, testsSkipped: 0 }); diff --git a/tests/runtime/pipeline/autopilot-eligibility.test.ts b/tests/runtime/pipeline/autopilot-eligibility.test.ts index 895b6f1..6126544 100644 --- a/tests/runtime/pipeline/autopilot-eligibility.test.ts +++ b/tests/runtime/pipeline/autopilot-eligibility.test.ts @@ -1,92 +1,92 @@ import { describe, expect, it } from "vitest"; import { advisorReportHash, - eligibilityInputFromArtifacts, evaluateAutopilotEligibility, pipelineResultHash, + type AutopilotEligibilityEvidence, } from "../../../src/autopilot/autopilot-eligibility.js"; +import { reviewSnapshotHash } from "../../../src/runtime/review-snapshot.js"; import { advisorReport, pipelineResult, reviewSnapshot } from "./autopilot-fixtures.js"; import { loadSchemas } from "../../../src/protocol/schema-loader.js"; -function greenInput() { - return eligibilityInputFromArtifacts({ +function greenEvidence(): AutopilotEligibilityEvidence { + return { pipelineResult: pipelineResult(), reviewSnapshot: reviewSnapshot(), - advisor: advisorReport, + advisor: structuredClone(advisorReport), evaluatedAt: "2026-07-20T12:00:00.000Z", - }); + }; } describe("evaluateAutopilotEligibility", () => { - it("derives eligibility only from a completely green bound record", () => { - expect(evaluateAutopilotEligibility(greenInput())).toMatchObject({ + it("derives eligibility only from completely green evidence", () => { + const evidence = greenEvidence(); + expect(evaluateAutopilotEligibility(evidence)).toEqual({ + recordVersion: "1", + policyVersion: "1", + runId: evidence.pipelineResult.runId, eligible: true, reasons: [], + baseCommitOid: evidence.reviewSnapshot.baseCommitOid, + candidateCommitOid: evidence.reviewSnapshot.candidateCommitOid, + candidateTreeOid: evidence.reviewSnapshot.candidateTreeOid, + candidateManifestHash: evidence.reviewSnapshot.manifestHash, + reviewSnapshotHash: reviewSnapshotHash(evidence.reviewSnapshot), + pipelineResultHash: pipelineResultHash(evidence.pipelineResult), + advisorReportHash: advisorReportHash(evidence.advisor), + evaluatedAt: evidence.evaluatedAt, }); }); - // Several rows are red for more than the reason they name -- the status and - // gate overrides also trip the projection-mismatch check, because the - // hash-bound pipelineResult still reports decision-ready. Asserting only - // `eligible: false` would keep these green even if the named check were - // removed, so each row now pins the reason it claims to exercise. + // Each row pins the reason it claims to exercise, so removing that one + // check cannot leave the row green on some other red reason. it.each([ - ["human status", () => ({ status: "human-decision-required" as const }), - /status is not decision-ready/iu], - ["gate reason", () => ({ - gate: { decisionReady: false, requiresHumanDecision: false, reasons: ["baseline drift"] }, - }), /baseline drift|gate/iu], - ["advisor risk", () => { - const advisor = { - ...advisorReport, - risks: [{ severity: "major" as const, claim: "race", evidence: "repro" }], - }; - return { advisor, advisorReportHash: advisorReportHash(advisor) }; - }, /risk/iu], - ["coverage gap", () => { - const advisor = { ...advisorReport, coverageGaps: ["Windows not reviewed"] }; - return { advisor, advisorReportHash: advisorReportHash(advisor) }; - }, /coverage/iu], - ["hash mismatch", () => ({ reviewManifestHash: "0".repeat(64) }), /hash|manifest/iu], - ["missing source artifacts", () => ({ - pipelineResult: undefined, reviewSnapshot: undefined, - }), /missing|artifact/iu], - ])("rejects %s", (_name, override, expectedReason) => { - const record = evaluateAutopilotEligibility({ ...greenInput(), ...override() }); - expect(record).toMatchObject({ eligible: false }); - expect(record.reasons.some(reason => expectedReason.test(reason)), record.reasons.join(" | ")) - .toBe(true); + ["human status", (e: AutopilotEligibilityEvidence) => { + e.pipelineResult.status = "human-decision-required"; + }, "pipeline status is not decision-ready"], + ["gate reason", (e: AutopilotEligibilityEvidence) => { + e.pipelineResult.gate = { decisionReady: false, requiresHumanDecision: false, reasons: ["baseline drift"] }; + }, "pipeline gate: baseline drift"], + ["advisor risk", (e: AutopilotEligibilityEvidence) => { + e.advisor.risks = [{ severity: "major", claim: "race", evidence: "repro" }]; + }, "advisor reported blocker or major risk"], + ["advisor coverage gap", (e: AutopilotEligibilityEvidence) => { + e.advisor.coverageGaps = ["Windows not reviewed"]; + }, "advisor reported coverage gaps"], + ["snapshot of other bytes", (e: AutopilotEligibilityEvidence) => { + e.reviewSnapshot.manifestHash = "0".repeat(64); + }, "review snapshot candidate manifest mismatch"], + ["snapshot of another run", (e: AutopilotEligibilityEvidence) => { + e.reviewSnapshot.runId = "run-other"; + }, "review snapshot run id mismatch"], + ["candidate manifest not matching its paths", (e: AutopilotEligibilityEvidence) => { + e.pipelineResult.attempt.candidate!.changedPaths = [ + { path: "unreviewed.txt", changeType: "added", mode: "100644", contentHash: "d".repeat(40) }, + ]; + }, "pipeline result candidate binding mismatch"], + ["missing candidate", (e: AutopilotEligibilityEvidence) => { + e.pipelineResult.attempt.candidate = null; + }, "pipeline result has no candidate"], + ] as const)("rejects %s", (_name, mutate, expectedReason) => { + const evidence = greenEvidence(); + mutate(evidence); + const record = evaluateAutopilotEligibility(evidence); + expect(record.eligible).toBe(false); + expect(record.reasons).toContain(expectedReason); }); - it("ignores a forged caller eligibility and recomputes reasons", () => { - const red = { - ...greenInput(), - status: "human-decision-required" as const, - eligible: true, - reasons: [], - }; - expect(evaluateAutopilotEligibility(red)).toMatchObject({ - eligible: false, - reasons: expect.arrayContaining(["pipeline status is not decision-ready"]), - }); - }); - - it("rejects caller projections that disagree with the hash-bound PipelineResult", () => { - const green = greenInput(); - const source = { ...green.pipelineResult, status: "human-decision-required" as const }; - expect(evaluateAutopilotEligibility({ - ...green, - pipelineResult: source, - pipelineResultHash: pipelineResultHash(source), - })).toMatchObject({ - eligible: false, - reasons: expect.arrayContaining(["pipeline result eligibility projection mismatch"]), - }); + it("reports malformed evidence instead of throwing", () => { + const evidence = greenEvidence(); + // A BigInt has no JSON form, so the advisor report cannot be hashed. + (evidence.advisor as { rationale: unknown }).rationale = 1n; + const record = evaluateAutopilotEligibility(evidence); + expect(record.eligible).toBe(false); + expect(record.reasons).toContain("advisor report is malformed"); }); it("registers strict advisor and eligibility schemas", () => { const schemas = loadSchemas(); - const eligibility = evaluateAutopilotEligibility(greenInput()); + const eligibility = evaluateAutopilotEligibility(greenEvidence()); expect(schemas.advisorReport(advisorReport)).toBe(true); expect(schemas.autopilotEligibility(eligibility)).toBe(true); expect(schemas.advisorReport({ diff --git a/tests/runtime/platform-safety.test.ts b/tests/runtime/platform-safety.test.ts new file mode 100644 index 0000000..d50ca70 --- /dev/null +++ b/tests/runtime/platform-safety.test.ts @@ -0,0 +1,55 @@ +import { mkdtemp, rm } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import path from "node:path"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { PlatformSafety } from "../../src/platform/platform-safety.js"; + +let stateRoot: string; +let previousPluginData: string | undefined; + +beforeEach(async () => { + stateRoot = await mkdtemp(path.join(tmpdir(), "ca-platform-safety-")); + previousPluginData = process.env.CLAUDE_PLUGIN_DATA; + process.env.CLAUDE_PLUGIN_DATA = stateRoot; +}); + +afterEach(async () => { + if (previousPluginData === undefined) delete process.env.CLAUDE_PLUGIN_DATA; + else process.env.CLAUDE_PLUGIN_DATA = previousPluginData; + await rm(stateRoot, { recursive: true, force: true }); +}); + +function safetyWithRelease(release: () => Promise): PlatformSafety { + return new PlatformSafety({ + acquireCheckoutLock: vi.fn(async () => ({ + key: "test-lock", + repositoryIdentity: path.join(stateRoot, "repository.git"), + release, + })), + }); +} + +describe("withCheckoutLease", () => { + it("returns the result that onReleaseError substitutes after a failed release", async () => { + const safety = safetyWithRelease(async () => { throw new Error("release refused"); }); + + await expect(safety.withCheckoutLease(stateRoot, async () => ({ detail: "applied" }), { + onReleaseError: (_error, result) => ({ detail: `${result.detail}; release failed` }), + })).resolves.toEqual({ detail: "applied; release failed" }); + }); + + it("throws the release error when no handler owns it", async () => { + const safety = safetyWithRelease(async () => { throw new Error("release refused"); }); + + await expect(safety.withCheckoutLease(stateRoot, async () => "done")) + .rejects.toThrow("release refused"); + }); + + it("keeps the primary failure visible when release also fails", async () => { + const safety = safetyWithRelease(async () => { throw new Error("release refused"); }); + + await expect(safety.withCheckoutLease(stateRoot, async () => { throw new Error("work failed"); }, { + onReleaseError: () => { throw new Error("handler must not run for a failed operation"); }, + })).rejects.toThrow("work failed; checkout lock release failed"); + }); +}); diff --git a/tests/runtime/plugin-wiring.test.mjs b/tests/runtime/plugin-wiring.test.mjs index d700e26..c703e9a 100644 --- a/tests/runtime/plugin-wiring.test.mjs +++ b/tests/runtime/plugin-wiring.test.mjs @@ -80,7 +80,7 @@ describe("P0-A plugin wiring", () => { const runtimeVersion = /RUNTIME_VERSION\s*=\s*"([^"]+)"/u.exec(versions)?.[1]; const skill = read("skills/delegate/SKILL.md"); const skillProtocol = /^PROTOCOL_VERSION:\s*([^\s]+)$/mu.exec(skill)?.[1]; - assert.equal(runtimeProtocol, "2.0.0", "runtime must expose the current wire protocol"); + assert.equal(runtimeProtocol, "3.0.0", "runtime must expose the current wire protocol"); assert.equal( runtimeVersion, JSON.parse(read(".claude-plugin/plugin.json")).version, @@ -366,9 +366,11 @@ test("project policy composes Superpowers SDD with exclusive delivery controller const guide = read("AGENTS.md"); assert.match(guide, /manual SDD[^.]*bare `\/no-mistakes` validate-only mode/u, "manual SDD must hand a final committed branch to No Mistakes validate-only mode"); - assert.match(guide, /Autopilot is a separate trusted delivery controller/u, - "Autopilot must remain distinct from the No Mistakes delivery path"); - assert.match(guide, /Never start or stack No Mistakes while Autopilot is active/u, + assert.match(guide, /Autopilot ends at a final-reviewed local branch; it never pushes, opens a PR, or polls checks/u, + "Autopilot must stop before delivery"); + assert.match(guide, /handed to No Mistakes like any other feature branch/u, + "the reviewed Autopilot branch must be delivered through No Mistakes"); + assert.match(guide, /Never start No Mistakes while Autopilot is active on the branch/u, "project policy must prohibit No Mistakes inside Autopilot custody"); assert.match(guide, /Never start Autopilot while No Mistakes is active/u, "project policy must prohibit Autopilot inside No Mistakes custody"); @@ -463,6 +465,18 @@ test("codex skill ships the direct CLI lane without obscuring its trust boundary "README must not describe a worktree as production"); }); +test("CI pins every action to a commit and every installed tool to a version", () => { + for (const file of [".github/workflows/ci.yml", ".github/workflows/codeql.yml"]) { + const workflow = read(file); + for (const [, reference] of workflow.matchAll(/uses:\s*(\S+)/gu)) { + assert.match(reference, /@[0-9a-f]{40}$/u, `${file}: ${reference} must be pinned to a commit`); + } + for (const [line] of workflow.matchAll(/npm install -g \S+/gu)) { + assert.match(line, /@\d+\.\d+\.\d+$/u, `${file}: ${line} must pin a version`); + } + } +}); + test("CI exercises the supported macOS 15, Ubuntu, and Windows runners", () => { const workflow = read(".github/workflows/ci.yml"); assert.match( @@ -471,12 +485,12 @@ test("CI exercises the supported macOS 15, Ubuntu, and Windows runners", () => { "CI must test the approved three-platform runner matrix", ); assert.doesNotMatch(workflow, /macos-14/u); - assert.match(workflow, /actions\/checkout@v7/u); - assert.match(workflow, /actions\/setup-node@v7/u); + assert.match(workflow, /actions\/checkout@[0-9a-f]{40} # v7\./u); + assert.match(workflow, /actions\/setup-node@[0-9a-f]{40} # v7\./u); assert.match(workflow, /node-version:\s*22/u); - assert.match(workflow, /actions\/upload-artifact@v7/u); + assert.match(workflow, /actions\/upload-artifact@[0-9a-f]{40} # v7\./u); assert.match(workflow, /win32-job-kill-x64\.exe/u); - assert.match(workflow, /setup-zig@v2[^]*version: 0\.15\.2/u, + assert.match(workflow, /setup-zig@[0-9a-f]{40} # v2\.[^]*version: 0\.15\.2/u, "Windows CI must use the pinned compiler that produced the shipped helper"); assert.match(workflow, /win32-filesystem-x64-reviewed\.exe[^]*fc \/b/u, "Windows x64 CI must byte-compare rebuilt and reviewed helper binaries"); diff --git a/tests/runtime/project-verifier.test.ts b/tests/runtime/project-verifier.test.ts index b95876c..b61af82 100644 --- a/tests/runtime/project-verifier.test.ts +++ b/tests/runtime/project-verifier.test.ts @@ -12,7 +12,7 @@ import { getPlatformServices } from "../../src/platform/select-platform.js"; import type { CandidateArtifact } from "../../src/protocol/attempt-result.js"; import type { VerificationCommand } from "../../src/protocol/delegation-spec.js"; import { clearRegisteredSecrets, redact } from "../../src/runtime/redaction.js"; -import { projectVerify } from "../../src/verify/project-verifier.js"; +import { projectVerify, verificationConfinementBackend } from "../../src/verify/project-verifier.js"; interface Fixture { repoRoot: string; @@ -102,36 +102,24 @@ afterEach(async () => { describe("projectVerify", () => { it("derives its managed worktree name from the artifact run id", async () => { const fixture = await frozenFixture(); - const marker = join(await temporaryDirectory("ca-project-verifier-marker-"), "cwd.txt"); - await projectVerify({ + const result = await projectVerify({ repoRoot: fixture.repoRoot, artifact: fixture.artifact, - commands: [command({ - args: [ - "-e", - `require('node:fs').writeFileSync(${JSON.stringify(marker)}, process.cwd())`, - ], - })], + commands: [command({ args: ["-e", "process.stdout.write(process.cwd())"] })], }); - expect(await readFile(marker, "utf8")).toMatch(/verify-project-verifier$/); + expect(result.outputLogs[0]?.text).toMatch(/verify-project-verifier$/); }); it("evaluates verificationId once to select its managed worktree name", async () => { const fixture = await frozenFixture(); - const marker = join(await temporaryDirectory("ca-project-verifier-marker-"), "cwd.txt"); let calls = 0; - await projectVerify({ + const result = await projectVerify({ repoRoot: fixture.repoRoot, artifact: fixture.artifact, - commands: [command({ - args: [ - "-e", - `require('node:fs').writeFileSync(${JSON.stringify(marker)}, process.cwd())`, - ], - })], + commands: [command({ args: ["-e", "process.stdout.write(process.cwd())"] })], verificationId: () => { calls += 1; return "slice-2-attempt-0"; @@ -139,7 +127,7 @@ describe("projectVerify", () => { }); expect(calls).toBe(1); - expect(await readFile(marker, "utf8")).toMatch(/verify-slice-2-attempt-0$/); + expect(result.outputLogs[0]?.text).toMatch(/verify-slice-2-attempt-0$/); }); it("records a passing Host-authorized command without mutation", async () => { @@ -164,7 +152,8 @@ describe("projectVerify", () => { expect(result.evidence.commands).toEqual([ expect.objectContaining({ id: "pass", - confinement: "none", + confinement: verificationConfinementBackend(process.platform as never, process.arch) + ?? "none", networkPolicy: "unenforced", requestedNetwork: "denied", skipped: false, @@ -234,9 +223,12 @@ describe("projectVerify", () => { it("detects a tracked mutation hidden by the skip-worktree index bit", async () => { const fixture = await frozenFixture(); + // Confinement blocks these writes outright; exercise detection where no + // confinement backend exists. const result = await projectVerify({ repoRoot: fixture.repoRoot, artifact: fixture.artifact, + arch: "unconfined-test-arch", commands: [command({ id: "hidden-mutation", args: [ @@ -359,9 +351,12 @@ describe("projectVerify", () => { it("detects a clean status after the verification command changes HEAD", async () => { const fixture = await frozenFixture(); + // Confinement blocks these writes outright; exercise detection where no + // confinement backend exists. const result = await projectVerify({ repoRoot: fixture.repoRoot, artifact: fixture.artifact, + arch: "unconfined-test-arch", commands: [command({ id: "move-head", executable: "git", @@ -537,3 +532,56 @@ describe("projectVerify", () => { expect(redact(secret)).toBe(secret); }); }); + +describe.runIf(verificationConfinementBackend(process.platform as never, process.arch) !== null)( + "confined verification", + () => { + it("cannot write outside its worktree or read credential stores", async () => { + const fixture = await frozenFixture(); + const outside = join(await temporaryDirectory("ca-verify-outside-"), "escaped.txt"); + const home = await temporaryDirectory("ca-verify-home-"); + await mkdir(join(home, ".ssh")); + await writeFile(join(home, ".ssh", "id_ed25519"), "PRIVATE KEY\n"); + const previousHome = process.env.HOME; + process.env.HOME = home; + try { + const result = await projectVerify({ + repoRoot: fixture.repoRoot, + artifact: fixture.artifact, + commands: [ + command({ + id: "escape", + args: ["-e", `require('node:fs').writeFileSync(${JSON.stringify(outside)}, 'x')`], + }), + command({ + id: "steal", + args: [ + "-e", + `process.stdout.write(require('node:fs').readFileSync(${ + JSON.stringify(join(home, ".ssh", "id_ed25519"))}, 'utf8'))`, + ], + }), + command({ + id: "local-write", + args: ["-e", "require('node:fs').writeFileSync(require('node:os').tmpdir() + '/ok', 'x')"], + }), + ], + }); + + expect(result.failures).toEqual(expect.arrayContaining([ + "command-failed:escape", + "command-failed:steal", + ])); + expect(result.failures).not.toContain("command-failed:local-write"); + expect(result.outputLogs.map(log => log.text).join("")).not.toContain("PRIVATE KEY"); + await expect(access(outside)).rejects.toMatchObject({ code: "ENOENT" }); + expect(result.evidence.commands.every(entry => entry.confinement === "macos-seatbelt")) + .toBe(true); + } finally { + if (previousHome === undefined) delete process.env.HOME; + else process.env.HOME = previousHome; + } + }); + }, +); + diff --git a/tests/runtime/protocol/autopilot-schema.test.ts b/tests/runtime/protocol/autopilot-schema.test.ts index 8fe7959..7844d12 100644 --- a/tests/runtime/protocol/autopilot-schema.test.ts +++ b/tests/runtime/protocol/autopilot-schema.test.ts @@ -39,7 +39,7 @@ function delegation(objective: string) { // would re-run this suite's describe blocks in the importing suite. function validAutopilotSpec() { return { - specVersion: "1", + specVersion: "2", topic: "delegation-autopilot", base: { remote: "origin", branch: "main" }, tasks: [ @@ -56,32 +56,34 @@ function validAutopilotSpec() { ], finalSuccessCriteria: ["The complete branch passes every release gate."], finalVerification: verificationCommands(), - shipping: { - provider: "github", - draft: true, - markReadyWhenRequiredChecksPass: true, - requiredChecksTimeoutMs: 1_800_000, - pullRequestTitle: "Add delegation autopilot", - pullRequestBody: "Implements the reviewed autonomous workflow.", - }, }; } -describe("Autopilot Spec v1", () => { +describe("Autopilot Spec v2", () => { it("accepts the canonical fixture", () => { expect(validateAutopilotSpec(validAutopilotSpec())).toMatchObject({ ok: true }); }, 5_000); - it("accepts inclusive task, topic, commit-byte, and CI-timeout boundaries", () => { + it("names the retired v1 contract instead of reporting a generic schema error", () => { + const spec: any = validAutopilotSpec(); + spec.specVersion = "1"; + expect(validateAutopilotSpec(spec)).toEqual({ + ok: false, + errors: [expect.objectContaining({ + path: "#/specVersion", + message: expect.stringContaining("final-reviewed local branch"), + })], + }); + }); + + it("accepts inclusive task, topic, and commit-byte boundaries", () => { const spec = validAutopilotSpec(); spec.topic = "abc"; spec.tasks = [spec.tasks[0]!]; spec.tasks[0]!.commitMessage = "a".repeat(200); - spec.shipping.requiredChecksTimeoutMs = 600_000; expect(validateAutopilotSpec(spec)).toMatchObject({ ok: true }); spec.topic = `a${"b".repeat(46)}z`; - spec.shipping.requiredChecksTimeoutMs = 3_600_000; expect(validateAutopilotSpec(spec)).toMatchObject({ ok: true }); }, 5_000); @@ -95,7 +97,9 @@ describe("Autopilot Spec v1", () => { ["unknown final verification key", (s: any) => { s.finalVerification[0].extra = true; }], - ["unknown shipping key", (s: any) => { s.shipping.extra = true; }], + ["a shipping section (v1 contract)", (s: any) => { + s.shipping = { provider: "github", draft: true }; + }], ["no tasks", (s: any) => { s.tasks = []; }], ["more than 32 tasks", (s: any) => { s.tasks = Array.from({ length: 33 }, (_, index) => ({ @@ -112,17 +116,7 @@ describe("Autopilot Spec v1", () => { ["empty final verification", (s: any) => { s.finalVerification = []; }], ["non-origin remote", (s: any) => { s.base.remote = "upstream"; }], ["non-main target", (s: any) => { s.base.branch = "develop"; }], - ["non-GitHub provider", (s: any) => { s.shipping.provider = "gitlab"; }], - ["non-draft shipping", (s: any) => { s.shipping.draft = false; }], - ["disabled required-check readiness", (s: any) => { - s.shipping.markReadyWhenRequiredChecksPass = false; - }], - ["CI timeout below the floor", (s: any) => { - s.shipping.requiredChecksTimeoutMs = 599_999; - }], - ["CI timeout above the ceiling", (s: any) => { - s.shipping.requiredChecksTimeoutMs = 3_600_001; - }], + ["the retired v1 version", (s: any) => { s.specVersion = "1"; }], ["multiline commit message", (s: any) => { s.tasks[0].commitMessage = "feat: x\nbody"; }], diff --git a/tests/runtime/recovery-manager.test.ts b/tests/runtime/recovery-manager.test.ts index 55acc14..55f6b0b 100644 --- a/tests/runtime/recovery-manager.test.ts +++ b/tests/runtime/recovery-manager.test.ts @@ -2142,7 +2142,7 @@ describe("recoverStaleRuns", () => { // A previous process crashed while holding the cleanup-journal mutex, leaving its // lock file behind with a now-dead owner. Recovery must reclaim it before replay: // otherwise replayInterruptedPrunes spins to its acquire deadline, throws, and aborts - // recovery before reclaimLocks runs — permanently blocking every future pass. Without + // recovery before reclaimDeadCheckoutLocks runs — permanently blocking every future pass. Without // the up-front reclaim this test throws "cleanup journal is locked" after ~2.5s. const journalLockPath = path.join( process.env.CLAUDE_PLUGIN_DATA!, "locks", `${CLEANUP_JOURNAL_LOCK_KEY}.lock`, diff --git a/tests/runtime/review-manifest-echo.test.ts b/tests/runtime/review-manifest-echo.test.ts index 886c0f9..1ae4418 100644 --- a/tests/runtime/review-manifest-echo.test.ts +++ b/tests/runtime/review-manifest-echo.test.ts @@ -108,7 +108,7 @@ function dependencies(storedManifest: RunManifest): ToolDependencies { ps, storeFactory: () => store, git: async (_cwd, args) => { - if (args[0] === "diff") return gitResult("exact patch\n"); + if (args[1] === "diff") return gitResult("exact patch\n"); if (args.includes(`${candidate.anchorRef}^{commit}`)) { return gitResult(`${candidate.candidateCommitOid}\n`); } diff --git a/tests/runtime/review-snapshot.test.ts b/tests/runtime/review-snapshot.test.ts index 281a03f..600e18b 100644 --- a/tests/runtime/review-snapshot.test.ts +++ b/tests/runtime/review-snapshot.test.ts @@ -104,7 +104,7 @@ function reviewRun(overrides: { }), }, git: async (_cwd, args) => { - if (args[0] === "diff") return overrides.patch ?? gitResult("exact patch\n"); + if (args[1] === "diff") return overrides.patch ?? gitResult("exact patch\n"); if (args.includes(`${candidate.anchorRef}^{commit}`)) { return overrides.anchor ?? gitResult(`${candidate.candidateCommitOid}\n`); } diff --git a/tests/runtime/run-decision.test.ts b/tests/runtime/run-decision.test.ts index 7ef957d..cdce0ac 100644 --- a/tests/runtime/run-decision.test.ts +++ b/tests/runtime/run-decision.test.ts @@ -42,6 +42,7 @@ function makeManifest(runId: string): RunManifest { model: "test-model", }, effectiveConfig: {}, + effectivePolicy: { verificationPolicy: [{ id: "unit", confinement: "macos-seatbelt", skipped: false }] }, policy: { confinement: "none", writeScope: ["."], @@ -201,6 +202,34 @@ describe("RunDecision", () => { }); }); + it("1a. requires a person when the manifest has no verification record, or an unknown confinement", async () => { + const runId = "accepted-run"; + const variants: Record[] = [ + {}, + { verificationPolicy: [{ id: "unit", confinement: "[REDACTED]", skipped: false }] }, + { verificationPolicy: [{ id: "unit", confinement: "none", skipped: false }] }, + ]; + for (const effectivePolicy of variants) { + const store = createMockStore(runId, { + readManifest: async () => ({ ...makeManifest(runId), effectivePolicy }), + }); + await expect(runDecision.evaluate(runId, { store, authority: "autonomous" })).resolves.toEqual({ + state: "human-required", + candidateCommit: CANDIDATE_COMMIT, + reasons: ["project verification ran without OS confinement on this platform"], + }); + } + }); + + it("1c. accepts when the spec declared no verification command", async () => { + const runId = "accepted-run"; + const store = createMockStore(runId, { + readManifest: async () => ({ ...makeManifest(runId), effectivePolicy: { verificationPolicy: [] } }), + }); + await expect(runDecision.evaluate(runId, { store, authority: "autonomous" })) + .resolves.toMatchObject({ state: "accepted" }); + }); + it("1b. state: accepted on clean verified plain-delegate run without gate record", async () => { const runId = "plain-delegate-run"; const result = makeResult(runId, { diff --git a/tests/runtime/run-manifest.test.ts b/tests/runtime/run-manifest.test.ts index cd40b5b..30edc69 100644 --- a/tests/runtime/run-manifest.test.ts +++ b/tests/runtime/run-manifest.test.ts @@ -46,18 +46,18 @@ function withProtocolVersion(protocolVersion: string): RunManifest { describe("run manifest protocol provenance", () => { it("accepts an archived protocol version with the current major", () => { - const manifest = withProtocolVersion("2.0.0"); + const manifest = withProtocolVersion("3.0.0"); expect(verifyRunManifest(manifest)).toEqual(manifest); }); it("accepts a same-major archive from a different minor", () => { - const manifest = withProtocolVersion("2.7.0"); + const manifest = withProtocolVersion("3.7.0"); expect(verifyRunManifest(manifest)).toEqual(manifest); }); - it.each(["1.0.0", "1.3.0", "3.0.0", "not-a-version"])( + it.each(["1.0.0", "2.0.0", "4.0.0", "not-a-version"])( "rejects incompatible archived protocol %s with both versions in the diagnostic", archivedVersion => { expect(() => verifyRunManifest(withProtocolVersion(archivedVersion))).toThrow( diff --git a/tests/runtime/schema-loader.test.ts b/tests/runtime/schema-loader.test.ts index dd571fc..abb0332 100644 --- a/tests/runtime/schema-loader.test.ts +++ b/tests/runtime/schema-loader.test.ts @@ -58,13 +58,13 @@ describe("schema loader", () => { expect(v.delegationSpec({ specVersion: "1" })).toBe(false); // missing required fields }); - // Both paths this used to walk resolved to runtime/schemas/autopilot-spec.v1.json, + // Both paths this used to walk resolved to one runtime/schemas/autopilot-spec file, // so the "source versus packaged" comparison read one file twice and could not // have caught a divergence. There is only one schema file; assert that the // packaged runtime resolves it and that the loader agrees. - it("loads Autopilot Spec v1 from the packaged runtime schema path", () => { + it("loads the Autopilot Spec from the packaged runtime schema path", () => { const packagedRuntimeUrl = new URL("../../runtime/server.mjs", import.meta.url); - const schemaUrl = new URL("./schemas/autopilot-spec.v1.json", packagedRuntimeUrl); + const schemaUrl = new URL(`./schemas/autopilot-spec.v${AUTOPILOT_SPEC_VERSION}.json`, packagedRuntimeUrl); const schema = JSON.parse(fs.readFileSync(fileURLToPath(schemaUrl), "utf8")); expect(schema.$id).toBe(`autopilot-spec.v${AUTOPILOT_SPEC_VERSION}.json`); @@ -230,7 +230,7 @@ describe("checkVersionCompat", () => { }); it("rejects every non-matching protocol version", () => { - for (const version of ["1.0.0", "1.3.0", "1.99.0", "3.0.0", "not-semver"]) { + for (const version of ["1.0.0", "2.0.0", "2.99.0", "4.0.0", "not-semver"]) { const result = checkVersionCompat(version); expect(result.ok).toBe(false); expect(result.diagnostic).toContain(`skill declares ${version}`); diff --git a/tests/runtime/shipping/github-cli-adapter-red-paths.test.ts b/tests/runtime/shipping/github-cli-adapter-red-paths.test.ts deleted file mode 100644 index 7e5bc35..0000000 --- a/tests/runtime/shipping/github-cli-adapter-red-paths.test.ts +++ /dev/null @@ -1,848 +0,0 @@ -import { describe, expect, it, vi } from "vitest"; -import type { - ChecksRequest, - DraftPullRequestRequest, - HostingTarget, - MarkReadyRequest, - PushRequest, -} from "../../../src/ship/hosting-adapter.js"; -import { - GitHubCliAdapter, - HostingAdapterError, - InMemoryHostingAdapter, - type HostingAdapterErrorClassification, -} from "../../../src/ship/github-cli-adapter.js"; - -interface HostingCommandRequest { - executable: "gh" | "git"; - args: string[]; - cwd: string; - env: Record; - timeoutMs: number; - maxOutputBytes: number; -} - -interface HostingCommandResult { - exitCode: number | null; - stdout: string; - stderr: string; - timedOut?: boolean; - cancelled?: boolean; - truncated?: { stdout: boolean; stderr: boolean }; - spawnError?: unknown; -} - -interface TestAdapterDependencies { - createTemporaryDirectory?: () => Promise; - chmod?: (directory: string, mode: number) => Promise; - removeTemporaryDirectory?: (directory: string) => Promise; -} - -type CommandHandler = ( - request: HostingCommandRequest, -) => HostingCommandResult | Promise; - -const commandHarness = vi.hoisted(() => ({ - calls: [] as HostingCommandRequest[], - handler: undefined as CommandHandler | undefined, - createTemporaryDirectory: async () => "/runtime-owned/quarantine", - chmod: async (_directory: string, _mode: number) => {}, - removeTemporaryDirectory: async (_directory: string) => {}, -})); - -vi.mock("../../../src/platform/select-platform.js", () => ({ - getPlatformServices: () => ({ - resolveExecutable: async ({ name }: { name: string }) => name, - createSecureTempDirectory: () => commandHarness.createTemporaryDirectory(), - }), -})); - -vi.mock("../../../src/platform/process-supervisor.js", () => ({ - supervise: async ( - _platformServices: unknown, - request: HostingCommandRequest, - ) => { - const captured = { ...request, args: [...request.args], env: { ...request.env } }; - commandHarness.calls.push(captured); - return commandHarness.handler?.(captured); - }, -})); - -vi.mock("node:fs/promises", async importOriginal => ({ - ...(await importOriginal()), - chmod: (directory: string, mode: number) => commandHarness.chmod(directory, mode), - rm: (directory: string) => commandHarness.removeTemporaryDirectory(directory), -})); - -const HEAD = "1".repeat(40); -const OTHER_HEAD = "2".repeat(40); -const SECRET = "github_pat_red_path_secret"; -const LEAK_PATH = "/private/red-path-leak"; -const TARGET: HostingTarget = { - provider: "github", - repository: "example/project", - canonicalHttpsUrl: "https://github.com/example/project.git", -}; - -function result( - stdout = "", - overrides: Partial = {}, -): HostingCommandResult { - return { - exitCode: 0, - stdout, - stderr: `credential ${SECRET} at ${LEAK_PATH}`, - truncated: { stdout: false, stderr: false }, - ...overrides, - }; -} - -function stage(request: HostingCommandRequest): string { - if (request.executable === "gh") { - if (request.args[0] === "version") return "version"; - if (request.args[0] === "auth") return "auth"; - if (request.args[0] === "repo") return "repo"; - return `pr-${request.args[1]}`; - } - if (request.args[0] === "init") return "init"; - if (request.args[0] === "bundle") return `bundle-${request.args[1]}`; - if (request.args[0] === "rev-parse") return "rev-parse"; - if (request.args[0] === "update-ref") return "update-ref"; - if (request.args.includes("ls-remote")) return "ls-remote"; - if (request.args.includes("push")) return "push"; - return "unexpected"; -} - -function preflightSuccess(request: HostingCommandRequest): HostingCommandResult { - switch (stage(request)) { - case "version": return result("gh version 2.96.0\n"); - case "auth": return result(); - case "repo": return result(JSON.stringify({ - nameWithOwner: "example/project", - url: "https://github.com/example/project", - })); - default: throw new Error(`unexpected ${stage(request)} ${SECRET} ${LEAK_PATH}`); - } -} - -function pullRequestJson(overrides: Record = {}): Record { - return { - number: 17, - url: "https://github.com/example/project/pull/17", - baseRefName: "main", - headRefName: "feat/autopilot-01234567", - headRefOid: HEAD, - headRepository: { nameWithOwner: "example/project" }, - isDraft: true, - ...overrides, - }; -} - -function pushSuccess(request: HostingCommandRequest): HostingCommandResult { - switch (stage(request)) { - case "bundle-unbundle": - return result(`${HEAD} refs/heads/feat/autopilot-01234567\n`); - case "rev-parse": return result(`${HEAD}\n`); - default: return result(); - } -} - -function pushRequest(overrides: Partial = {}): PushRequest { - return { - checkoutPath: "/source/checkout", - target: TARGET, - branch: "feat/autopilot-01234567", - headCommitOid: HEAD, - ...overrides, - }; -} - -function draftRequest( - overrides: Partial = {}, -): DraftPullRequestRequest { - return { - checkoutPath: "/source/checkout", - target: TARGET, - baseBranch: "main", - headBranch: "feat/autopilot-01234567", - headCommitOid: HEAD, - title: "Ship the candidate", - body: "Ready for review.", - ...overrides, - }; -} - -function checksRequest(overrides: Partial = {}): ChecksRequest { - return { - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - ...overrides, - }; -} - -function markReadyRequest(overrides: Partial = {}): MarkReadyRequest { - return { - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - ...overrides, - }; -} - -interface Scenario { - operation: Promise; - calls: HostingCommandRequest[]; - expectedStages: string[]; - dispose?: () => Promise; -} - -interface RedCase { - classification: HostingAdapterErrorClassification; - create: () => Promise | Scenario; -} - -function fakeAdapter( - handler: (request: HostingCommandRequest) => HostingCommandResult | Promise, - calls: HostingCommandRequest[], - dependencies: TestAdapterDependencies = {}, -): GitHubCliAdapter { - commandHarness.calls = calls; - commandHarness.handler = handler; - commandHarness.createTemporaryDirectory = dependencies.createTemporaryDirectory - ?? (async () => "/runtime-owned/quarantine"); - commandHarness.chmod = dependencies.chmod ?? (async () => {}); - commandHarness.removeTemporaryDirectory = dependencies.removeTemporaryDirectory - ?? (async () => {}); - return new GitHubCliAdapter(); -} - -function preflightCase( - classification: HostingAdapterErrorClassification, - failedStage: string, - failure: HostingCommandResult | Error, -): RedCase { - return { - classification, - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (stage(request) === failedStage) { - if (failure instanceof Error) throw failure; - return failure; - } - return preflightSuccess(request); - }, calls); - const sequence = ["version", "auth", "repo"]; - return { - operation: adapter.preflight({ checkoutPath: LEAK_PATH }), - calls, - expectedStages: sequence.slice(0, sequence.indexOf(failedStage) + 1), - }; - }, - }; -} - -function pushCase( - classification: HostingAdapterErrorClassification, - failedStage: string, - failure: HostingCommandResult | Error, -): RedCase { - return { - classification, - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (stage(request) === failedStage) { - if (failure instanceof Error) throw failure; - return failure; - } - return pushSuccess(request); - }, calls); - const sequence = [ - "init", "bundle-create", "bundle-unbundle", "rev-parse", "update-ref", "ls-remote", "push", - ]; - return { - operation: adapter.pushBranch(pushRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: sequence.slice(0, sequence.indexOf(failedStage) + 1), - }; - }, - }; -} - -function draftCase( - classification: HostingAdapterErrorClassification, - failedStage: "pr-list" | "pr-create" | "pr-view", - failure: HostingCommandResult | Error, -): RedCase { - return { - classification, - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - const current = stage(request); - if (current === failedStage) { - if (failure instanceof Error) throw failure; - return failure; - } - if (current === "pr-list") return result("[]"); - if (current === "pr-create") { - return result("https://github.com/example/project/pull/17\n"); - } - if (current === "pr-view") return result(JSON.stringify(pullRequestJson())); - throw new Error(`unexpected ${current} ${SECRET} ${LEAK_PATH}`); - }, calls); - const sequence = ["pr-list", "pr-create", "pr-view"]; - return { - operation: adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: sequence.slice(0, sequence.indexOf(failedStage) + 1), - }; - }, - }; -} - -async function checksCase( - classification: HostingAdapterErrorClassification, - failedStage: "pr-checks" | "pr-view", - failure: HostingCommandResult | Error, -): Promise { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - const current = stage(request); - if (current === failedStage) { - if (failure instanceof Error) throw failure; - return failure; - } - if (current === "pr-list") return result(JSON.stringify([pullRequestJson()])); - if (current === "pr-checks") return result("[]", { exitCode: 1 }); - if (current === "pr-view") return result(JSON.stringify(pullRequestJson())); - throw new Error(`unexpected ${current} ${SECRET} ${LEAK_PATH}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })); - const sequence = ["pr-list", "pr-view", "pr-checks", "pr-view"]; - return { - operation: adapter.requiredChecks(checksRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: classification === "required-checks-response-invalid" - ? sequence - : failedStage === "pr-view" - ? sequence.slice(0, 2) - : sequence.slice(0, 3), - }; -} - -async function markReadyCase( - classification: HostingAdapterErrorClassification, - failedView: 3 | undefined, - failure: HostingCommandResult | Error, -): Promise { - const calls: HostingCommandRequest[] = []; - let views = 0; - const adapter = fakeAdapter(request => { - const current = stage(request); - if (current === "pr-list") return result(JSON.stringify([pullRequestJson()])); - if (current === "pr-checks") { - return result(JSON.stringify([ - { bucket: "pass", name: "unit", state: "SUCCESS", link: null }, - ])); - } - if (current === "pr-view") { - views += 1; - if (views === failedView) { - if (failure instanceof Error) throw failure; - return failure; - } - return result(JSON.stringify(pullRequestJson({ isDraft: views < 3 }))); - } - if (current === "pr-ready") { - if (failedView === undefined) { - if (failure instanceof Error) throw failure; - return failure; - } - return result(); - } - throw new Error(`unexpected ${current} ${SECRET} ${LEAK_PATH}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })); - const expectedStages = failedView === 3 - ? ["pr-list", "pr-view", "pr-checks", "pr-view", "pr-ready", "pr-view"] - : ["pr-list", "pr-view", "pr-checks", "pr-view", "pr-ready"]; - return { - operation: adapter.markReady(markReadyRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages, - }; -} - -const redCases: RedCase[] = [ - { - classification: "cancelled", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(), calls); - const abort = new AbortController(); - abort.abort(); - return { - operation: adapter.preflight({ checkoutPath: LEAK_PATH, signal: abort.signal }), - calls, - expectedStages: [], - }; - }, - }, - preflightCase("preflight-gh-unavailable", "version", new Error(`${SECRET} ${LEAK_PATH}`)), - preflightCase("preflight-gh-version-invalid", "version", result("not a version")), - preflightCase("preflight-gh-version-unsupported", "version", result("gh version 2.95.9\n")), - preflightCase("preflight-auth-failed", "auth", result("", { exitCode: 4 })), - preflightCase("preflight-repository-query-failed", "repo", result("", { timedOut: true })), - preflightCase("preflight-repository-response-invalid", "repo", result(`{"leak":"${SECRET}"}`)), - preflightCase("preflight-repository-url-invalid", "repo", result(JSON.stringify({ - nameWithOwner: "example/project", url: `https://github.com/example/project?token=${SECRET}`, - }))), - preflightCase("preflight-repository-identity-mismatch", "repo", result(JSON.stringify({ - nameWithOwner: "example/project", url: "https://github.com/example/other", - }))), - { - classification: "push-request-invalid", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(pushSuccess, calls); - return { operation: adapter.pushBranch(pushRequest({ branch: "--force" })), calls, expectedStages: [] }; - }, - }, - { - classification: "push-quarantine-create-failed", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(pushSuccess, calls, { - createTemporaryDirectory: async () => { throw new Error(`${SECRET} ${LEAK_PATH}`); }, - }); - return { operation: adapter.pushBranch(pushRequest()), calls, expectedStages: [] }; - }, - }, - { - classification: "push-quarantine-cleanup-failed", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(pushSuccess, calls, { - createTemporaryDirectory: async () => "/runtime-owned/quarantine", - removeTemporaryDirectory: async () => { throw new Error(`${SECRET} ${LEAK_PATH}`); }, - }); - return { - operation: adapter.pushBranch(pushRequest()), - calls, - expectedStages: [ - "init", "bundle-create", "bundle-unbundle", "rev-parse", "update-ref", "ls-remote", "push", - ], - }; - }, - }, - pushCase("push-quarantine-init-failed", "init", result("", { exitCode: 1 })), - pushCase("push-bundle-create-failed", "bundle-create", result("", { exitCode: 1 })), - pushCase("push-bundle-import-failed", "bundle-unbundle", result("", { exitCode: 1 })), - pushCase("push-imported-oid-mismatch", "bundle-unbundle", - result(`${OTHER_HEAD} refs/heads/feat/autopilot-01234567\n`)), - pushCase("push-remote-precheck-failed", "ls-remote", result("", { exitCode: 1 })), - pushCase("push-remote-response-invalid", "ls-remote", result(`invalid ${SECRET}\n`)), - pushCase("push-remote-head-mismatch", "ls-remote", - result(`${OTHER_HEAD}\trefs/heads/feat/autopilot-01234567\n`)), - pushCase("push-command-failed", "push", new Error(`${SECRET} ${LEAK_PATH}`)), - { - classification: "draft-pull-request-request-invalid", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(), calls); - return { - operation: adapter.ensureDraftPullRequest(draftRequest({ title: "bad\ntitle" })), - calls, - expectedStages: [], - }; - }, - }, - // A non-zero exit is the substantive failure. This case used to inject - // `cancelled: true`, which asserted the very conflation being fixed: an abort - // landing after spawn must classify as `cancelled`, not as a remote failure. - draftCase("draft-pull-request-list-failed", "pr-list", result("", { exitCode: 1 })), - { - classification: "draft-pull-request-response-invalid", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(`{"leak":"${SECRET}"}`), calls); - return { - operation: adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: ["pr-list"], - }; - }, - }, - { - classification: "draft-pull-request-identity-mismatch", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(JSON.stringify([ - pullRequestJson({ headRepository: { nameWithOwner: "attacker/project" } }), - ])), calls); - return { - operation: adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: ["pr-list"], - }; - }, - }, - { - classification: "draft-pull-request-head-mismatch", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(JSON.stringify([ - pullRequestJson({ headRefOid: OTHER_HEAD }), - ])), calls); - return { - operation: adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: ["pr-list"], - }; - }, - }, - { - classification: "draft-pull-request-ambiguous", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(JSON.stringify([ - pullRequestJson(), - pullRequestJson({ number: 18, url: "https://github.com/example/project/pull/18" }), - ])), calls); - return { - operation: adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: ["pr-list"], - }; - }, - }, - draftCase("draft-pull-request-create-failed", "pr-create", new Error(`${SECRET} ${LEAK_PATH}`)), - { - classification: "required-checks-request-invalid", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(), calls); - return { - operation: adapter.requiredChecks(checksRequest({ pullRequestNumber: 0 })), - calls, - expectedStages: [], - }; - }, - }, - { - classification: "required-checks-identity-not-established", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(), calls); - return { operation: adapter.requiredChecks(checksRequest()), calls, expectedStages: [] }; - }, - }, - { classification: "required-checks-command-failed", create: () => checksCase( - "required-checks-command-failed", "pr-checks", new Error(`${SECRET} ${LEAK_PATH}`), - ) }, - { classification: "required-checks-identity-query-failed", create: () => checksCase( - "required-checks-identity-query-failed", "pr-view", result("", { exitCode: 1 }), - ) }, - { classification: "required-checks-identity-response-invalid", create: () => checksCase( - "required-checks-identity-response-invalid", "pr-view", result(`{"leak":"${SECRET}"}`), - ) }, - { classification: "required-checks-identity-mismatch", create: () => checksCase( - "required-checks-identity-mismatch", "pr-view", - result(JSON.stringify(pullRequestJson({ headRefOid: OTHER_HEAD }))), - ) }, - { - classification: "required-checks-head-mismatch", - create: async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (stage(request) === "pr-list") return result(JSON.stringify([pullRequestJson()])); - if (stage(request) === "pr-view") return result(JSON.stringify(pullRequestJson())); - throw new Error(`unexpected ${stage(request)} ${SECRET} ${LEAK_PATH}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })); - return { - operation: adapter.requiredChecks(checksRequest({ - checkoutPath: LEAK_PATH, - headCommitOid: OTHER_HEAD, - })), - calls, - expectedStages: ["pr-list", "pr-view"], - }; - }, - }, - { classification: "required-checks-response-invalid", create: () => checksCase( - "required-checks-response-invalid", "pr-checks", result(`[{"bucket":"${SECRET}"}]`, { exitCode: 1 }), - ) }, - { - classification: "mark-ready-request-invalid", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(), calls); - return { - operation: adapter.markReady(markReadyRequest({ pullRequestNumber: 0 })), - calls, - expectedStages: [], - }; - }, - }, - { - classification: "mark-ready-identity-not-established", - create: () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result(), calls); - return { operation: adapter.markReady(markReadyRequest()), calls, expectedStages: [] }; - }, - }, - { - classification: "mark-ready-checks-not-passed", - create: async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - const current = stage(request); - if (current === "pr-list") return result(JSON.stringify([pullRequestJson()])); - if (current === "pr-view") return result(JSON.stringify(pullRequestJson())); - if (current === "pr-checks") return result("[]", { exitCode: 1 }); - throw new Error(`unexpected ${current} ${SECRET} ${LEAK_PATH}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH })); - return { - operation: adapter.markReady(markReadyRequest({ checkoutPath: LEAK_PATH })), - calls, - expectedStages: ["pr-list", "pr-view", "pr-checks", "pr-view"], - }; - }, - }, - { classification: "mark-ready-identity-query-failed", create: () => markReadyCase( - "mark-ready-identity-query-failed", 3, new Error(`${SECRET} ${LEAK_PATH}`), - ) }, - { classification: "mark-ready-identity-response-invalid", create: () => markReadyCase( - "mark-ready-identity-response-invalid", 3, result(`{"leak":"${SECRET}"}`), - ) }, - { classification: "mark-ready-identity-mismatch", create: () => markReadyCase( - "mark-ready-identity-mismatch", 3, - result(JSON.stringify(pullRequestJson({ headRefOid: OTHER_HEAD }))), - ) }, - { classification: "mark-ready-command-failed", create: () => markReadyCase( - "mark-ready-command-failed", undefined, new Error(`${SECRET} ${LEAK_PATH}`), - ) }, - ...([ - ["in-memory-preflight-not-configured", (adapter: InMemoryHostingAdapter) => - adapter.preflight({ checkoutPath: LEAK_PATH })], - ["in-memory-push-not-configured", (adapter: InMemoryHostingAdapter) => - adapter.pushBranch(pushRequest({ checkoutPath: LEAK_PATH }))], - ["in-memory-draft-pull-request-not-configured", (adapter: InMemoryHostingAdapter) => - adapter.ensureDraftPullRequest(draftRequest({ checkoutPath: LEAK_PATH }))], - ["in-memory-required-checks-not-configured", (adapter: InMemoryHostingAdapter) => - adapter.requiredChecks(checksRequest({ checkoutPath: LEAK_PATH }))], - ["in-memory-mark-ready-not-configured", (adapter: InMemoryHostingAdapter) => - adapter.markReady(markReadyRequest({ checkoutPath: LEAK_PATH }))], - ] as const).map(([classification, operation]): RedCase => ({ - classification, - create: () => ({ - operation: operation(new InMemoryHostingAdapter()), - calls: [], - expectedStages: [], - }), - })), -]; - -const allRedClassifications = [ - "cancelled", - "preflight-gh-unavailable", - "preflight-gh-version-invalid", - "preflight-gh-version-unsupported", - "preflight-auth-failed", - "preflight-repository-query-failed", - "preflight-repository-response-invalid", - "preflight-repository-url-invalid", - "preflight-repository-identity-mismatch", - "push-request-invalid", - "push-quarantine-create-failed", - "push-quarantine-init-failed", - "push-bundle-create-failed", - "push-bundle-import-failed", - "push-imported-oid-mismatch", - "push-remote-precheck-failed", - "push-remote-response-invalid", - "push-remote-head-mismatch", - "push-command-failed", - "push-quarantine-cleanup-failed", - "draft-pull-request-request-invalid", - "draft-pull-request-list-failed", - "draft-pull-request-response-invalid", - "draft-pull-request-identity-mismatch", - "draft-pull-request-head-mismatch", - "draft-pull-request-ambiguous", - "draft-pull-request-create-failed", - "required-checks-request-invalid", - "required-checks-identity-not-established", - "required-checks-identity-query-failed", - "required-checks-identity-response-invalid", - "required-checks-identity-mismatch", - "required-checks-head-mismatch", - "required-checks-command-failed", - "required-checks-response-invalid", - "mark-ready-request-invalid", - "mark-ready-identity-not-established", - "mark-ready-identity-query-failed", - "mark-ready-identity-response-invalid", - "mark-ready-identity-mismatch", - "mark-ready-checks-not-passed", - "mark-ready-command-failed", - "in-memory-preflight-not-configured", - "in-memory-push-not-configured", - "in-memory-draft-pull-request-not-configured", - "in-memory-required-checks-not-configured", - "in-memory-mark-ready-not-configured", -] as const satisfies readonly HostingAdapterErrorClassification[]; - -type MissingRedClassification = Exclude< - HostingAdapterErrorClassification, - (typeof allRedClassifications)[number] ->; -const allRedClassificationsAreRepresented: MissingRedClassification extends never ? true : false = true; -void allRedClassificationsAreRepresented; - -describe("GitHubCliAdapter complete red-path matrix", () => { - it("contains exactly one case for every reachable classification", () => { - expect(redCases.map(redCase => redCase.classification).sort()).toEqual( - [...allRedClassifications].sort(), - ); - }); - - it.each(redCases)("classifies $classification, stops, and redacts", async redCase => { - const scenario = await redCase.create(); - try { - const error = await scenario.operation.catch(cause => cause); - expect(error).toBeInstanceOf(HostingAdapterError); - expect(error).toMatchObject({ - classification: redCase.classification, - message: redCase.classification, - }); - // `String(error)` is only "name: message". A secret carried in `stack`, - // `cause`, or any enumerable property would pass that untouched. - const exposed = [ - String(error), - (error as Error).stack ?? "", - JSON.stringify(error, Object.getOwnPropertyNames(error as object)), - ].join("\n"); - expect(exposed).not.toContain(SECRET); - expect(exposed).not.toContain(LEAK_PATH); - expect(scenario.calls.map(stage)).toEqual(scenario.expectedStages); - } finally { - await scenario.dispose?.(); - } - }); -}); - -describe("GitHubCliAdapter request injection matrix", () => { - const injectedTarget = (field: keyof HostingTarget): HostingTarget => ({ - ...TARGET, - [field]: field === "provider" - ? "github\n--hostname=attacker.invalid" - : `${TARGET[field]}\n--config=credential.helper=attacker`, - } as HostingTarget); - - const cases: Array<{ - field: string; - classification: HostingAdapterErrorClassification; - run: (adapter: GitHubCliAdapter) => Promise; - }> = [ - { - field: "preflight.checkoutPath", - classification: "preflight-repository-identity-mismatch", - run: adapter => adapter.preflight({ checkoutPath: `/source\0${SECRET}` }), - }, - { - field: "preflight.expectedRepository", - classification: "preflight-repository-identity-mismatch", - run: adapter => adapter.preflight({ - checkoutPath: "/source", expectedRepository: `example/project\n${SECRET}`, - }), - }, - ...(["checkoutPath", "target.provider", "target.repository", "target.canonicalHttpsUrl", "branch", "headCommitOid"] as const) - .map(field => ({ - field: `push.${field}`, - classification: "push-request-invalid" as const, - run: (adapter: GitHubCliAdapter) => adapter.pushBranch(pushRequest( - field === "checkoutPath" ? { checkoutPath: `/source\0${SECRET}` } - : field === "branch" ? { branch: `--upload-pack=${SECRET}` } - : field === "headCommitOid" ? { headCommitOid: `${HEAD}\n${SECRET}` } - : { target: injectedTarget(field.slice("target.".length) as keyof HostingTarget) }, - )), - })), - ...(["checkoutPath", "target.provider", "target.repository", "target.canonicalHttpsUrl", "baseBranch", "headBranch", "headCommitOid", "title", "body"] as const) - .map(field => ({ - field: `draft.${field}`, - classification: "draft-pull-request-request-invalid" as const, - run: (adapter: GitHubCliAdapter) => adapter.ensureDraftPullRequest(draftRequest( - field === "checkoutPath" ? { checkoutPath: `/source\0${SECRET}` } - : field === "baseBranch" ? { baseBranch: `--upload-pack=${SECRET}` } - : field === "headBranch" ? { headBranch: `--upload-pack=${SECRET}` } - : field === "headCommitOid" ? { headCommitOid: `${HEAD}\n${SECRET}` } - : field === "title" ? { title: `title\n${SECRET}` } - : field === "body" ? { body: `body\0${SECRET}` } - : { target: injectedTarget(field.slice("target.".length) as keyof HostingTarget) }, - )), - })), - ...(["requiredChecks", "markReady"] as const).flatMap(operation => - (["checkoutPath", "target.provider", "target.repository", "target.canonicalHttpsUrl", "pullRequestNumber"] as const) - .map(field => ({ - field: `${operation}.${field}`, - classification: operation === "requiredChecks" - ? "required-checks-request-invalid" as const - : "mark-ready-request-invalid" as const, - run: (adapter: GitHubCliAdapter) => { - const overrides = field === "checkoutPath" ? { checkoutPath: `/source\0${SECRET}` } - : field === "pullRequestNumber" ? { pullRequestNumber: Number.NaN } - : { target: injectedTarget(field.slice("target.".length) as keyof HostingTarget) }; - return operation === "requiredChecks" - ? adapter.requiredChecks(checksRequest(overrides)) - : adapter.markReady(markReadyRequest(overrides)); - }, - }))), - ]; - - it.each(cases)("rejects $field before spawn", async injection => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => { - throw new Error(`spawned ${SECRET} ${LEAK_PATH}`); - }, calls); - const error = await injection.run(adapter).catch(cause => cause); - expect(error).toMatchObject({ classification: injection.classification }); - expect(String(error)).not.toContain(SECRET); - expect(String(error)).not.toContain(LEAK_PATH); - expect(calls).toEqual([]); - }); -}); - -it("pushes without setting an upstream", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(pushSuccess, calls); - await expect(adapter.pushBranch(pushRequest())).resolves.toEqual({ remoteHead: HEAD }); - const argumentsUsed = calls.flatMap(call => call.args); - expect(argumentsUsed).not.toContain("upstream"); - expect(argumentsUsed).not.toContain("--set-upstream"); - expect(argumentsUsed).not.toContain("-u"); - expect(calls.some(call => call.args.includes("remote"))).toBe(false); -}); - -// `cleanExit` folded `cancelled` in with a non-zero exit, so an abort that -// landed AFTER spawn was reported as a substantive remote failure. The -// `cancelled` classification was only ever produced by the pre-spawn signal -// check, and autopilot's resume and terminal-state logic depends on telling -// those apart. -it("classifies a post-spawn cancellation as cancelled, not a remote failure", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => result("", { cancelled: true }), calls); - - const error = await adapter.ensureDraftPullRequest(draftRequest()).catch(cause => cause); - - expect(error).toBeInstanceOf(HostingAdapterError); - expect(error).toMatchObject({ classification: "cancelled" }); -}); diff --git a/tests/runtime/shipping/github-cli-adapter.test.ts b/tests/runtime/shipping/github-cli-adapter.test.ts deleted file mode 100644 index 37e142c..0000000 --- a/tests/runtime/shipping/github-cli-adapter.test.ts +++ /dev/null @@ -1,1047 +0,0 @@ -import path from "node:path"; -import { describe, expect, it, vi } from "vitest"; -import type { - DraftPullRequestRequest, - HostingTarget, - PullRequestIdentity, - PushRequest, - RequiredCheck, -} from "../../../src/ship/hosting-adapter.js"; -import { - GitHubCliAdapter, - HostingAdapterError, - InMemoryHostingAdapter, -} from "../../../src/ship/github-cli-adapter.js"; -import * as githubAdapterModule from "../../../src/ship/github-cli-adapter.js"; - -interface HostingCommandRequest { - executable: "gh" | "git"; - args: string[]; - cwd: string; - env: Record; - timeoutMs: number; - maxOutputBytes: number; -} - -interface HostingCommandResult { - exitCode: number | null; - stdout: string; - stderr: string; - timedOut?: boolean; - cancelled?: boolean; - truncated?: { stdout: boolean; stderr: boolean }; - spawnError?: unknown; -} - -interface TestAdapterDependencies { - createTemporaryDirectory?: () => Promise; - chmod?: (directory: string, mode: number) => Promise; - removeTemporaryDirectory?: (directory: string) => Promise; -} - -type CommandHandler = ( - request: HostingCommandRequest, -) => HostingCommandResult | Promise; - -const commandHarness = vi.hoisted(() => ({ - calls: [] as HostingCommandRequest[], - handler: undefined as CommandHandler | undefined, - createTemporaryDirectory: async () => "/runtime-owned/quarantine", - chmod: async (_directory: string, _mode: number) => {}, - removeTemporaryDirectory: async (_directory: string) => {}, -})); - -vi.mock("../../../src/platform/select-platform.js", () => ({ - getPlatformServices: () => ({ - resolveExecutable: async ({ name }: { name: string }) => name, - createSecureTempDirectory: () => commandHarness.createTemporaryDirectory(), - }), -})); - -vi.mock("../../../src/platform/process-supervisor.js", () => ({ - supervise: async ( - _platformServices: unknown, - request: HostingCommandRequest, - ) => { - const captured = { ...request, args: [...request.args], env: { ...request.env } }; - commandHarness.calls.push(captured); - return commandHarness.handler?.(captured); - }, -})); - -vi.mock("node:fs/promises", async importOriginal => ({ - ...(await importOriginal()), - chmod: (directory: string, mode: number) => commandHarness.chmod(directory, mode), - rm: (directory: string) => commandHarness.removeTemporaryDirectory(directory), -})); - -const HEAD = "1".repeat(40); -const OTHER_HEAD = "2".repeat(40); -const TARGET: HostingTarget = { - provider: "github", - repository: "example/project", - canonicalHttpsUrl: "https://github.com/example/project.git", -}; - -function ok(stdout = ""): HostingCommandResult { - return { - exitCode: 0, - stdout, - stderr: "", - truncated: { stdout: false, stderr: false }, - }; -} - -function commandKey(request: HostingCommandRequest): string { - return `${request.executable} ${JSON.stringify(request.args)}`; -} - -function fakeAdapter( - handler: (request: HostingCommandRequest) => HostingCommandResult | Promise, - calls: HostingCommandRequest[] = [], - dependencies: TestAdapterDependencies = {}, -): GitHubCliAdapter { - commandHarness.calls = calls; - commandHarness.handler = handler; - commandHarness.createTemporaryDirectory = dependencies.createTemporaryDirectory - ?? (async () => "/runtime-owned/quarantine"); - commandHarness.chmod = dependencies.chmod ?? (async () => {}); - commandHarness.removeTemporaryDirectory = dependencies.removeTemporaryDirectory - ?? (async () => {}); - return new GitHubCliAdapter(); -} - -function successfulPreflight(request: HostingCommandRequest): HostingCommandResult { - if (request.args[0] === "version") return ok("gh version 2.96.0 (2026-07-16)\n"); - if (request.args[0] === "auth") return ok(); - if (request.args[0] === "repo") { - return ok(JSON.stringify({ - nameWithOwner: "Example/Project", - url: "https://github.com/Example/Project", - })); - } - throw new Error(`unexpected command: ${commandKey(request)}`); -} - -function pushRequest(overrides: Partial = {}): PushRequest { - return { - checkoutPath: "/source/checkout", - target: TARGET, - branch: "feat/autopilot-01234567", - headCommitOid: HEAD, - ...overrides, - }; -} - -function draftRequest( - overrides: Partial = {}, -): DraftPullRequestRequest { - return { - checkoutPath: "/source/checkout", - target: TARGET, - baseBranch: "main", - headBranch: "feat/autopilot-01234567", - headCommitOid: HEAD, - title: "Ship the candidate", - body: "## Summary\n\nReady for review.", - ...overrides, - }; -} - -function pullRequestJson(overrides: Record = {}): Record { - return { - number: 17, - url: "https://github.com/example/project/pull/17", - baseRefName: "main", - headRefName: "feat/autopilot-01234567", - headRefOid: HEAD, - headRepository: { nameWithOwner: "example/project" }, - isDraft: true, - ...overrides, - }; -} - -function pullRequestIdentity(overrides: Partial = {}): PullRequestIdentity { - return { - number: 17, - url: "https://github.com/example/project/pull/17", - repository: "example/project", - baseBranch: "main", - headBranch: "feat/autopilot-01234567", - headCommitOid: HEAD, - draft: true, - ...overrides, - }; -} - -function checksJson(checks: RequiredCheck[]): string { - return JSON.stringify(checks); -} - -function successfulPush( - request: HostingCommandRequest, - remoteHead: string | null = null, -): HostingCommandResult { - if (request.args[0] === "bundle" && request.args[1] === "unbundle") { - return ok(`${HEAD} refs/heads/feat/autopilot-01234567\n`); - } - if (request.args[0] === "rev-parse") return ok(`${HEAD}\n`); - if (request.args.includes("ls-remote")) { - return ok(remoteHead === null - ? "" - : `${remoteHead}\trefs/heads/feat/autopilot-01234567\n`); - } - return ok(); -} - -async function expectClassification( - operation: Promise, - classification: string, -): Promise { - const error = await operation.catch(cause => cause); - expect(error).toBeInstanceOf(HostingAdapterError); - expect(error).toMatchObject({ classification, message: classification }); -} - -it("exports only structured adapter operations and sanitized errors", () => { - expect(Object.keys(githubAdapterModule).sort()).toEqual([ - "GitHubCliAdapter", - "HostingAdapterError", - "InMemoryHostingAdapter", - ]); - expect(GitHubCliAdapter.length).toBe(0); -}); - -it("does not spawn commands for pre-aborted adapter requests", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => ok(), calls); - const abort = new AbortController(); - abort.abort(); - - const operations = [ - () => adapter.preflight({ checkoutPath: "/source/checkout", signal: abort.signal }), - () => adapter.pushBranch({ ...pushRequest(), signal: abort.signal }), - () => adapter.ensureDraftPullRequest({ ...draftRequest(), signal: abort.signal }), - () => adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - signal: abort.signal, - }), - () => adapter.markReady({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - signal: abort.signal, - }), - ]; - - for (const operation of operations) { - await expectClassification(operation(), "cancelled"); - } - expect(calls).toEqual([]); -}); - -describe("GitHubCliAdapter preflight", () => { - it("uses fixed gh argv and returns a canonical credential-free target", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(successfulPreflight, calls); - - await expect(adapter.preflight({ - checkoutPath: "/repository", - expectedRepository: "example/project", - })).resolves.toEqual(TARGET); - - expect(calls.map(call => call.args)).toEqual([ - ["version"], - ["auth", "status", "--hostname", "github.com"], - ["repo", "view", "--json", "nameWithOwner,url"], - ]); - expect(calls.every(call => call.executable === "gh" && call.cwd === "/repository")).toBe(true); - expect(calls.every(call => call.env.GH_PROMPT_DISABLED === "1")).toBe(true); - }); - - it.each([ - ["2.95.9", "preflight-gh-version-unsupported"], - ["not-a-version", "preflight-gh-version-invalid"], - ])("rejects gh %s with %s", async (version, classification) => { - const adapter = fakeAdapter(request => request.args[0] === "version" - ? ok(version === "not-a-version" ? version : `gh version ${version}\n`) - : successfulPreflight(request)); - await expectClassification( - adapter.preflight({ checkoutPath: "/repository" }), - classification, - ); - }); - - it("accepts versions above the floor", async () => { - const adapter = fakeAdapter(request => request.args[0] === "version" - ? ok("gh version 3.0.0\n") - : successfulPreflight(request)); - await expect(adapter.preflight({ checkoutPath: "/repository" })).resolves.toEqual(TARGET); - }); - - it("classifies authentication loss without exposing gh output", async () => { - const secret = "ghp_do-not-leak"; - const adapter = fakeAdapter(request => request.args[0] === "auth" - ? { ...ok(), exitCode: 4, stderr: `token ${secret} at /private/auth.yml` } - : successfulPreflight(request)); - const error = await adapter.preflight({ checkoutPath: "/private/repository" }).catch(cause => cause); - expect(error).toMatchObject({ classification: "preflight-auth-failed" }); - expect(String(error)).not.toContain(secret); - expect(String(error)).not.toContain("/private"); - }); - - it.each([ - "http://github.com/example/project", - "https://gitlab.com/example/project", - "https://user:token@github.com/example/project", - "https://github.com/example/project?token=secret", - "https://github.com/example/project#secret", - "https://github.com/example/%70roject", - ])("rejects non-canonical repository URL %s", async url => { - const adapter = fakeAdapter(request => request.args[0] === "repo" - ? ok(JSON.stringify({ nameWithOwner: "example/project", url })) - : successfulPreflight(request)); - const error = await adapter.preflight({ checkoutPath: "/repository" }).catch(cause => cause); - expect(error).toMatchObject({ classification: "preflight-repository-url-invalid" }); - expect(String(error)).not.toContain(url); - }); - - it("rejects disagreement between repo identity and URL", async () => { - const adapter = fakeAdapter(request => request.args[0] === "repo" - ? ok(JSON.stringify({ - nameWithOwner: "example/project", - url: "https://github.com/example/other", - })) - : successfulPreflight(request)); - await expectClassification( - adapter.preflight({ checkoutPath: "/repository" }), - "preflight-repository-identity-mismatch", - ); - }); -}); - -describe("GitHubCliAdapter quarantined push", () => { - it("imports the bundle, isolates config, and pushes one exact full refspec", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => successfulPush(request), calls); - - await expect(adapter.pushBranch(pushRequest())).resolves.toEqual({ remoteHead: HEAD }); - - const quarantine = calls[0]!.cwd; - const bundlePath = path.join(quarantine, "branch.bundle"); - expect(calls.map(call => call.args)).toEqual([ - ["init", "--bare", "--quiet", "."], - ["bundle", "create", bundlePath, "refs/heads/feat/autopilot-01234567"], - ["bundle", "unbundle", bundlePath], - ["rev-parse", "--verify", `${HEAD}^{commit}`], - ["update-ref", "refs/heads/feat/autopilot-01234567", HEAD, "0".repeat(40)], - [ - "-c", "credential.helper=", - "-c", "credential.helper=!gh auth git-credential", - "ls-remote", "--heads", TARGET.canonicalHttpsUrl, - "refs/heads/feat/autopilot-01234567", - ], - [ - "-c", "credential.helper=", - "-c", "credential.helper=!gh auth git-credential", - "push", TARGET.canonicalHttpsUrl, - "refs/heads/feat/autopilot-01234567:refs/heads/feat/autopilot-01234567", - ], - ]); - expect(calls[1]!.cwd).toBe("/source/checkout"); - for (const [index, call] of calls.entries()) { - if (index !== 1) expect(call.cwd).toBe(quarantine); - expect(call.env).toMatchObject({ - GIT_CONFIG_GLOBAL: process.platform === "win32" ? "NUL" : "/dev/null", - GIT_CONFIG_SYSTEM: process.platform === "win32" ? "NUL" : "/dev/null", - GIT_CONFIG_NOSYSTEM: "1", - GIT_CONFIG_COUNT: "0", - GIT_CONFIG_PARAMETERS: "", - HOME: quarantine, - XDG_CONFIG_HOME: quarantine, - }); - const isolatedKeys = [ - "GIT_CONFIG_COUNT", - "GIT_CONFIG_GLOBAL", - "GIT_CONFIG_NOSYSTEM", - "GIT_CONFIG_PARAMETERS", - "GIT_CONFIG_SYSTEM", - "GIT_TERMINAL_PROMPT", - "HOME", - "PATH", - "XDG_CONFIG_HOME", - ]; - if (!call.args.includes("ls-remote") && !call.args.includes("push")) { - expect(Object.keys(call.env).sort()).toEqual(isolatedKeys); - } else { - expect(Object.keys(call.env).every(key => isolatedKeys.includes(key) - || ["GH_CONFIG_DIR", "GH_TOKEN", "GITHUB_TOKEN"].includes(key))).toBe(true); - } - } - }); - - it("initializes a SHA-256 quarantine for a 64-character object ID", async () => { - const sha256Head = "a".repeat(64); - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (request.args[0] === "bundle" && request.args[1] === "unbundle") { - return ok(`${sha256Head} refs/heads/feat/autopilot-01234567\n`); - } - if (request.args[0] === "rev-parse") return ok(`${sha256Head}\n`); - return ok(); - }, calls); - - await expect(adapter.pushBranch(pushRequest({ headCommitOid: sha256Head }))).resolves - .toEqual({ remoteHead: sha256Head }); - expect(calls[0]!.args).toEqual([ - "init", "--bare", "--quiet", "--object-format=sha256", ".", - ]); - expect(calls.find(call => call.args[0] === "update-ref")!.args.at(-1)).toBe("0".repeat(64)); - }); - - it("preserves quarantine creation as primary when creation cleanup also fails", async () => { - const adapter = fakeAdapter(request => successfulPush(request), [], { - createTemporaryDirectory: async () => "/runtime-owned/partial-quarantine", - chmod: async () => { throw new Error("chmod failed with github_pat_secret"); }, - removeTemporaryDirectory: async () => { throw new Error("cleanup failed /private/path"); }, - }); - - const error = await adapter.pushBranch(pushRequest()).catch(cause => cause); - expect(error).toMatchObject({ - classification: "push-quarantine-cleanup-failed", - primaryClassification: "push-quarantine-create-failed", - }); - expect(String(error)).not.toContain("github_pat_secret"); - expect(String(error)).not.toContain("/private/path"); - }); - - it("is idempotent when the exact remote head already exists", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => successfulPush(request, HEAD), calls); - await expect(adapter.pushBranch(pushRequest())).resolves.toEqual({ remoteHead: HEAD }); - expect(calls.some(call => call.args.includes("push"))).toBe(false); - }); - - it("halts before push when the remote head differs", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => successfulPush(request, OTHER_HEAD), calls); - await expectClassification( - adapter.pushBranch(pushRequest()), - "push-remote-head-mismatch", - ); - expect(calls.some(call => call.args.includes("push"))).toBe(false); - }); - - it("halts before any remote operation when the imported object differs", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => request.args[0] === "rev-parse" - ? ok(`${OTHER_HEAD}\n`) - : successfulPush(request), calls); - await expectClassification( - adapter.pushBranch(pushRequest()), - "push-imported-oid-mismatch", - ); - expect(calls.some(call => call.args.includes("ls-remote"))).toBe(false); - expect(calls.some(call => call.args.includes("push"))).toBe(false); - }); - - it("rejects a bundle that advertises a different branch OID", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => request.args[0] === "bundle" - && request.args[1] === "unbundle" - ? ok(`${OTHER_HEAD} refs/heads/feat/autopilot-01234567\n`) - : successfulPush(request), calls); - await expectClassification( - adapter.pushBranch(pushRequest()), - "push-imported-oid-mismatch", - ); - expect(calls.some(call => call.args.includes("rev-parse"))).toBe(false); - expect(calls.some(call => call.args.includes("ls-remote"))).toBe(false); - }); - - it("redacts command failures and local paths", async () => { - const secret = "github_pat_do-not-leak"; - const adapter = fakeAdapter(request => request.args.includes("push") - ? { - ...ok(), - exitCode: 128, - stderr: `credential ${secret} rejected for /source/checkout`, - } - : successfulPush(request)); - const error = await adapter.pushBranch(pushRequest()).catch(cause => cause); - expect(error).toMatchObject({ classification: "push-command-failed" }); - expect(String(error)).not.toContain(secret); - expect(String(error)).not.toContain("/source/checkout"); - }); -}); - -describe("GitHubCliAdapter pull request lifecycle", () => { - it("reuses the one exact draft pull request and verifies its head repository", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => request.args[1] === "list" - ? ok(JSON.stringify([pullRequestJson()])) - : (() => { throw new Error(`unexpected command: ${commandKey(request)}`); })(), calls); - - await expect(adapter.ensureDraftPullRequest(draftRequest())).resolves.toEqual( - pullRequestIdentity(), - ); - expect(calls.map(call => call.args)).toEqual([[ - "pr", "list", - "--repo", "example/project", - "--base", "main", - "--head", "feat/autopilot-01234567", - "--state", "open", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ]]); - }); - - it("reconciles the one exact already-ready pull request without creating a duplicate", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => request.args[1] === "list" - ? ok(JSON.stringify([pullRequestJson({ isDraft: false })])) - : (() => { throw new Error(`unexpected command: ${commandKey(request)}`); })(), calls); - - await expect(adapter.ensureDraftPullRequest(draftRequest())).resolves.toEqual( - pullRequestIdentity({ draft: false }), - ); - expect(calls.map(call => call.args[1])).toEqual(["list"]); - }); - - it.each([ - ["a fork", pullRequestJson({ headRepository: { nameWithOwner: "attacker/project" } }), - "draft-pull-request-identity-mismatch"], - ["a stale head", pullRequestJson({ headRefOid: OTHER_HEAD }), - "draft-pull-request-head-mismatch"], - ["a wrong base", pullRequestJson({ baseRefName: "release" }), - "draft-pull-request-identity-mismatch"], - ["a wrong head", pullRequestJson({ headRefName: "feat/other" }), - "draft-pull-request-identity-mismatch"], - ["a wrong repository URL", pullRequestJson({ - url: "https://github.com/example/other/pull/17", - }), "draft-pull-request-identity-mismatch"], - ])("rejects %s returned by the exact list", async (_label, listed, classification) => { - const adapter = fakeAdapter(request => request.args[1] === "list" - ? ok(JSON.stringify([listed])) - : ok()); - await expectClassification(adapter.ensureDraftPullRequest(draftRequest()), classification); - }); - - it("halts on duplicate matching pull requests", async () => { - const adapter = fakeAdapter(request => request.args[1] === "list" - ? ok(JSON.stringify([ - pullRequestJson(), - pullRequestJson({ number: 18, url: "https://github.com/example/project/pull/18" }), - ])) - : ok()); - await expectClassification( - adapter.ensureDraftPullRequest(draftRequest()), - "draft-pull-request-ambiguous", - ); - }); - - it("creates from an empty list with Markdown and shell-looking content kept in one argv", async () => { - const calls: HostingCommandRequest[] = []; - const body = "## Details\n\nRun `merge --admin` only as quoted documentation."; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok("[]"); - if (request.args[1] === "create") { - return ok("https://github.com/example/project/pull/17\n"); - } - if (request.args[1] === "view") return ok(JSON.stringify(pullRequestJson())); - throw new Error(`unexpected command: ${commandKey(request)}`); - }, calls); - - await expect(adapter.ensureDraftPullRequest(draftRequest({ body }))).resolves.toEqual( - pullRequestIdentity(), - ); - const create = calls.find(call => call.args[1] === "create")!; - expect(create.args).toEqual([ - "pr", "create", - "--repo", "example/project", - "--base", "main", - "--head", "feat/autopilot-01234567", - "--draft", - "--title", "Ship the candidate", - "--body", body, - ]); - expect(create.args.filter(argument => argument.includes("merge --admin"))).toEqual([body]); - }); - - it.each([ - ["malformed", "{"], - ["truncated", "[{\"number\":17"], - ["oversize", `"${"x".repeat(1_000_001)}"`], - ])("fails closed on %s list JSON", async (_label, stdout) => { - const adapter = fakeAdapter(() => ok(stdout)); - await expectClassification( - adapter.ensureDraftPullRequest(draftRequest()), - _label === "oversize" - ? "draft-pull-request-list-failed" - : "draft-pull-request-response-invalid", - ); - }); - - it.each([ - ["title control characters", { title: "bad\ntitle" }], - ["body control characters", { body: "bad\u0000body" }], - ["oversize title", { title: "x".repeat(257) }], - ["oversize body", { body: "x".repeat(65_537) }], - ])("rejects %s without running gh", async (_label, overrides) => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => ok(), calls); - await expectClassification( - adapter.ensureDraftPullRequest(draftRequest(overrides)), - "draft-pull-request-request-invalid", - ); - expect(calls).toEqual([]); - }); - - it("rejects a non-string title without running gh", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => ok(), calls); - const request = draftRequest() as unknown as Record; - request.title = Buffer.from("not a string"); - - await expectClassification( - adapter.ensureDraftPullRequest(request as unknown as DraftPullRequestRequest), - "draft-pull-request-request-invalid", - ); - expect(calls).toEqual([]); - }); - - it("rejects a non-string body without running gh", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(() => ok(), calls); - const request = draftRequest() as unknown as Record; - request.body = null; - - await expectClassification( - adapter.ensureDraftPullRequest(request as unknown as DraftPullRequestRequest), - "draft-pull-request-request-invalid", - ); - expect(calls).toEqual([]); - }); -}); - -describe("GitHubCliAdapter required checks", () => { - async function runChecks( - checkResult: HostingCommandResult, - view: Record | Record[] = pullRequestJson(), - calls: HostingCommandRequest[] = [], - ): ReturnType { - let viewIndex = 0; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "checks") return checkResult; - if (request.args[1] === "view") { - const current = Array.isArray(view) - ? view[Math.min(viewIndex++, view.length - 1)]! - : view; - return ok(JSON.stringify(current)); - } - throw new Error(`unexpected command: ${commandKey(request)}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - return adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - }); - } - - it.each([ - ["missing", 1, [], "missing"], - ["red failure", 1, [{ bucket: "fail", name: "unit", state: "FAILURE", link: null }], - "failed"], - ["red cancellation", 1, - [{ bucket: "cancel", name: "unit", state: "CANCELLED", link: null }], "failed"], - ["pending", 8, [{ bucket: "pending", name: "unit", state: "QUEUED", link: null }], - "pending"], - ["pass", 0, [{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }], - "passed"], - ["skipping", 0, - [{ bucket: "skipping", name: "optional", state: "SKIPPED", link: null }], "failed"], - ])("maps the %s bucket path deterministically", async (_label, exitCode, checks, result) => { - await expect(runChecks({ ...ok(checksJson(checks as RequiredCheck[])), exitCode })).resolves - .toMatchObject({ result, checks }); - }); - - it("uses exact fixed argv for checks and live identity revalidation", async () => { - const calls: HostingCommandRequest[] = []; - await runChecks({ - ...ok(checksJson([{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }])), - exitCode: 0, - }, pullRequestJson(), calls); - - expect(calls.slice(1).map(call => call.args)).toEqual([ - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - [ - "pr", "checks", "17", - "--repo", "example/project", - "--required", - "--json", "bucket,name,state,link", - ], - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - ]); - }); - - it("rejects stale passing checks when the expected head differs before observation", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "view") return ok(JSON.stringify(pullRequestJson())); - if (request.args[1] === "checks") { - return ok(checksJson([{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }])); - } - throw new Error(`unexpected command: ${commandKey(request)}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - - await expectClassification(adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: OTHER_HEAD, - }), "required-checks-head-mismatch"); - expect(calls.map(call => call.args[1])).toEqual(["list", "view"]); - }); - - it("revalidates the live head after fetching checks and before parsing evidence", async () => { - const calls: HostingCommandRequest[] = []; - await expectClassification( - runChecks({ ...ok("not-json"), exitCode: 0 }, [ - pullRequestJson(), - pullRequestJson({ headRefOid: OTHER_HEAD }), - ], calls), - "required-checks-head-mismatch", - ); - expect(calls.map(call => call.args[1])).toEqual(["list", "view", "checks", "view"]); - }); - - it.each([ - ["unknown bucket", 1, JSON.stringify([ - { bucket: "neutral", name: "unit", state: "NEUTRAL", link: null }, - ])], - ["unknown pass state", 0, JSON.stringify([ - { bucket: "pass", name: "unit", state: "NOT_A_GITHUB_STATE", link: null }, - ])], - ["malformed JSON", 1, "["], - ["truncated output", 1, JSON.stringify([])], - ["oversize output", 1, `"${"x".repeat(1_000_001)}"`], - ["inconsistent exit", 0, JSON.stringify([ - { bucket: "fail", name: "unit", state: "FAILURE", link: null }, - ])], - ])("fails closed for %s", async (label, exitCode, stdout) => { - const result = { - ...ok(stdout), - exitCode, - ...(label === "truncated output" - ? { truncated: { stdout: true, stderr: false } } - : {}), - }; - await expectClassification( - runChecks(result), - label === "truncated output" ? "required-checks-command-failed" : - label === "oversize output" ? "required-checks-command-failed" : - "required-checks-response-invalid", - ); - }); - - it.each([2, 4, null])("rejects gh checks exit code %s", async exitCode => { - await expectClassification( - runChecks({ ...ok("[]"), exitCode }), - "required-checks-command-failed", - ); - }); -}); - -describe("GitHubCliAdapter mark ready", () => { - it("refuses mutation when the fresh required-check proof is not passing", async () => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list" || request.args[1] === "view") { - return ok(JSON.stringify(request.args[1] === "list" - ? [pullRequestJson()] - : pullRequestJson())); - } - if (request.args[1] === "checks") { - return { - ...ok(checksJson([{ - bucket: "pending", name: "unit", state: "IN_PROGRESS", link: null, - }])), - exitCode: 8, - }; - } - throw new Error(`unexpected command: ${commandKey(request)}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - await expectClassification(adapter.markReady({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - }), "mark-ready-checks-not-passed"); - expect(calls.some(call => call.args[1] === "ready")).toBe(false); - }); - - it("halts when the PR head changes inside the required-checks bracket", async () => { - const calls: HostingCommandRequest[] = []; - let views = 0; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "checks") { - return ok(checksJson([{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }])); - } - if (request.args[1] === "view") { - views += 1; - return ok(JSON.stringify(views === 1 - ? pullRequestJson() - : pullRequestJson({ headRefOid: OTHER_HEAD }))); - } - return ok(); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - await expectClassification(adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - }), "required-checks-head-mismatch"); - expect(calls.some(call => call.args[1] === "ready")).toBe(false); - }); - - it.each([ - ["skipped", { bucket: "skipping", name: "required", state: "SKIPPED", link: null }], - ["malformed pass", { - bucket: "pass", name: "required", state: "NOT_A_GITHUB_STATE", link: null, - }], - ])("never marks ready from %s evidence", async (_label, check) => { - const calls: HostingCommandRequest[] = []; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "checks") { - return { ...ok(JSON.stringify([check])), exitCode: 0 }; - } - if (request.args[1] === "view") return ok(JSON.stringify(pullRequestJson())); - return ok(); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - const checksError = await adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - }).catch(cause => cause); - if (check.bucket === "pass") { - expect(checksError).toMatchObject({ classification: "required-checks-response-invalid" }); - } else { - expect(checksError).toMatchObject({ result: "failed" }); - } - await expectClassification(adapter.markReady({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - }), check.bucket === "pass" - ? "required-checks-response-invalid" - : "mark-ready-checks-not-passed"); - expect(calls.some(call => call.args[1] === "ready")).toBe(false); - }); - - it("marks ready only after passing checks and confirms the resulting identity", async () => { - const calls: HostingCommandRequest[] = []; - let ready = false; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "checks") { - return ok(checksJson([{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }])); - } - if (request.args[1] === "ready") { - ready = true; - return ok(); - } - if (request.args[1] === "view") { - return ok(JSON.stringify(pullRequestJson({ isDraft: !ready }))); - } - throw new Error(`unexpected command: ${commandKey(request)}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - await adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - }); - await expect(adapter.markReady({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - })).resolves.toEqual(pullRequestIdentity({ draft: false })); - expect(calls.slice(1).map(call => call.args)).toEqual([ - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - [ - "pr", "checks", "17", - "--repo", "example/project", - "--required", - "--json", "bucket,name,state,link", - ], - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - [ - "pr", "checks", "17", - "--repo", "example/project", - "--required", - "--json", "bucket,name,state,link", - ], - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - ["pr", "ready", "17", "--repo", "example/project"], - [ - "pr", "view", "17", - "--repo", "example/project", - "--json", "number,url,baseRefName,headRefName,headRefOid,headRepository,isDraft", - ], - ]); - }); - - it("re-proves exact-head checks with a fresh adapter before marking ready", async () => { - const calls: HostingCommandRequest[] = []; - let ready = false; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "checks") { - return ok(checksJson([{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }])); - } - if (request.args[1] === "ready") { - ready = true; - return ok(); - } - if (request.args[1] === "view") { - return ok(JSON.stringify(pullRequestJson({ isDraft: !ready }))); - } - throw new Error(`unexpected command: ${commandKey(request)}`); - }, calls); - await adapter.ensureDraftPullRequest(draftRequest()); - - await expect(adapter.markReady({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - })).resolves.toEqual(pullRequestIdentity({ draft: false })); - expect(calls.map(call => call.args[1])).toEqual([ - "list", "view", "checks", "view", "ready", "view", - ]); - }); - - it("releases completed pull request lifecycle state", async () => { - let ready = false; - const adapter = fakeAdapter(request => { - if (request.args[1] === "list") return ok(JSON.stringify([pullRequestJson()])); - if (request.args[1] === "checks") { - return ok(checksJson([{ bucket: "pass", name: "unit", state: "SUCCESS", link: null }])); - } - if (request.args[1] === "ready") { - ready = true; - return ok(); - } - if (request.args[1] === "view") { - return ok(JSON.stringify(pullRequestJson({ isDraft: !ready }))); - } - throw new Error(`unexpected command: ${commandKey(request)}`); - }); - await adapter.ensureDraftPullRequest(draftRequest()); - await adapter.requiredChecks({ - checkoutPath: "/source/checkout", target: TARGET, pullRequestNumber: 17, - headCommitOid: HEAD, - }); - await adapter.markReady({ - checkoutPath: "/source/checkout", target: TARGET, pullRequestNumber: 17, - headCommitOid: HEAD, - }); - - await expectClassification(adapter.requiredChecks({ - checkoutPath: "/source/checkout", target: TARGET, pullRequestNumber: 17, - headCommitOid: HEAD, - }), "required-checks-identity-not-established"); - }); -}); - -describe("InMemoryHostingAdapter", () => { - it("provides an injectable skeleton and fails closed for absent operations", async () => { - const adapter = new InMemoryHostingAdapter({ - preflight: async () => TARGET, - pushBranch: async request => ({ remoteHead: request.headCommitOid }), - }); - await expect(adapter.preflight({ checkoutPath: "/repository" })).resolves.toEqual(TARGET); - await expect(adapter.pushBranch(pushRequest())).resolves.toEqual({ remoteHead: HEAD }); - await expectClassification( - adapter.requiredChecks({ - checkoutPath: "/repository", - target: TARGET, - pullRequestNumber: 1, - headCommitOid: HEAD, - }), - "in-memory-required-checks-not-configured", - ); - }); - - it("forwards all pull request lifecycle operations to injected implementations", async () => { - const identity = pullRequestIdentity(); - const checks = { - result: "passed" as const, - headCommitOid: HEAD, - checks: [{ bucket: "pass" as const, name: "unit", state: "SUCCESS", link: null }], - }; - const adapter = new InMemoryHostingAdapter({ - ensureDraftPullRequest: async request => ({ - ...identity, - headCommitOid: request.headCommitOid, - }), - requiredChecks: async () => checks, - markReady: async () => ({ ...identity, draft: false }), - }); - await expect(adapter.ensureDraftPullRequest(draftRequest())).resolves.toEqual(identity); - await expect(adapter.requiredChecks({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - })).resolves.toEqual(checks); - await expect(adapter.markReady({ - checkoutPath: "/source/checkout", - target: TARGET, - pullRequestNumber: 17, - headCommitOid: HEAD, - })).resolves.toEqual({ ...identity, draft: false }); - }); -}); diff --git a/tests/runtime/spec-validator.test.ts b/tests/runtime/spec-validator.test.ts index b4a5e09..45c0600 100644 --- a/tests/runtime/spec-validator.test.ts +++ b/tests/runtime/spec-validator.test.ts @@ -20,6 +20,17 @@ const base = { }; describe("validateSpec", () => { it("accepts a valid spec", () => expect(validateSpec(base).ok).toBe(true)); + it("bounds every list a spec can carry", () => { + const commands = Array.from({ length: 33 }, (_, index) => ({ + ...base.verification[0], + id: `check-${index}`, + })); + expect(validateSpec({ ...base, verification: commands }).ok).toBe(false); + expect(validateSpec({ + ...base, + writeAllowlist: Array.from({ length: 513 }, (_, index) => `src/${index}.ts`), + }).ok).toBe(false); + }); it("validates verification command cwd within the checkout", () => { expect(validateSpec({ ...base, diff --git a/tests/runtime/tools.test.ts b/tests/runtime/tools.test.ts index 02f2279..bd27255 100644 --- a/tests/runtime/tools.test.ts +++ b/tests/runtime/tools.test.ts @@ -264,6 +264,7 @@ function legacyAcceptedDecision(recordedAt: string): RunDecision { decision: "accepted", authority: "human", recordedAt, + candidateManifestHash: candidate.manifestHash, }; } @@ -295,7 +296,7 @@ function dependencies( ps, storeFactory: () => store, git: async (_cwd, args) => { - if (args[0] === "diff") return gitResult("exact unredacted patch\n"); + if (args[1] === "diff") return gitResult("exact unredacted patch\n"); if (args.includes(`${candidate.anchorRef}^{commit}`)) { return gitResult(`${candidate.candidateCommitOid}\n`); } @@ -1030,6 +1031,21 @@ describe("MCP tool handlers", () => { .toMatchObject({ authority: "human" }); }); + it("refuses to spend a legacy acceptance that names no artifact", async () => { + const repoRoot = await createRepository(); + const store = new FakeStore(result, manifestFor(repoRoot)); + store.decision = { + decisionVersion: "1", + decision: "accepted", + authority: "human", + recordedAt: "2026-07-20T09:00:00.000Z", + }; + + await expect(handleIntegrateCandidate( + repoRoot, "run-tools", candidate.manifestHash, dependencies(store, getPlatformServices()), + )).resolves.toEqual({ integration: "aborted", detail: "decision-artifact-mismatch" }); + }); + it("refuses to spend an acceptance on a different artifact", async () => { const repoRoot = await createRepository(); const store = new FakeStore(result, manifestFor(repoRoot)); @@ -1543,7 +1559,9 @@ describe("MCP tool handlers", () => { expect(store.reviewSnapshot).toEqual(expectedReviewSnapshot); expect(JSON.stringify(output)).toBe(JSON.stringify(store.reviewSnapshot)); expect(gitCalls.at(-1)).toEqual([ + `--attr-source=${candidate.baseCommitOid}`, "diff", + "--no-color", "--no-ext-diff", "--no-textconv", "--binary", @@ -1585,7 +1603,7 @@ describe("MCP tool handlers", () => { const originalGit = deps.git!; deps.git = async (cwd, args, indexFile) => { const output = await originalGit(cwd, args, indexFile); - return args[0] === "diff" + return args[1] === "diff" ? { ...output, truncated: { stdout: true, stderr: false } } : output; }; @@ -1886,7 +1904,9 @@ describe("MCP tool handlers", () => { ["rev-parse", "--verify", "--quiet", `${candidate.anchorRef}^{commit}`], ["rev-parse", "--verify", `${candidate.candidateCommitOid}^{tree}`], [ + `--attr-source=${candidate.baseCommitOid}`, "diff", + "--no-color", "--no-ext-diff", "--no-textconv", "--binary", @@ -1910,7 +1930,9 @@ describe("MCP tool handlers", () => { ], ["rev-parse", "--verify", `${candidate.candidateCommitOid}^{tree}`], [ + `--attr-source=${candidate.baseCommitOid}`, "diff", + "--no-color", "--no-ext-diff", "--no-textconv", "--binary", diff --git a/tests/runtime/watchdog.test.ts b/tests/runtime/watchdog.test.ts index 141a761..9d89d2e 100644 --- a/tests/runtime/watchdog.test.ts +++ b/tests/runtime/watchdog.test.ts @@ -15,13 +15,35 @@ describe("producer watchdog", () => { it("kills the child when the supervisor dies", async () => { const supervisor = spawn(process.execPath, ["-e", "setTimeout(() => {}, 1_000)"]); await new Promise(resolve => supervisor.once("spawn", resolve)); + // The runtime always starts the watchdog as a process-group leader. const child = spawn(process.execPath, [ WATCHDOG, String(supervisor.pid), "--", process.execPath, "-e", "setInterval(() => {}, 1000)", - ]); + ], { detached: process.platform !== "win32" }); const exit = await new Promise(resolve => { const timer = setTimeout(() => resolve(null), 30_000); child.once("exit", code => { clearTimeout(timer); resolve(code ?? 0); }); }); expect(exit).not.toBeNull(); }, 40_000); + + it.runIf(process.platform !== "win32")( + "a group SIGKILL reaches a producer that ignores SIGTERM", + async () => { + const producer = "process.on('SIGTERM', () => {}); process.stdout.write(String(process.pid)); setInterval(() => {}, 1000)"; + const watchdog = spawn(process.execPath, [ + WATCHDOG, String(process.pid), "--", process.execPath, "-e", producer, + ], { detached: true, stdio: ["ignore", "pipe", "ignore"] }); + const producerPid = await new Promise(resolve => + watchdog.stdout!.once("data", chunk => resolve(Number(String(chunk))))); + + // What supervise's escalation and startup recovery both do. + process.kill(-watchdog.pid!, "SIGTERM"); + await new Promise(resolve => setTimeout(resolve, 300)); + process.kill(-watchdog.pid!, "SIGKILL"); + await new Promise(resolve => setTimeout(resolve, 300)); + + expect(() => process.kill(producerPid, 0)).toThrow(); + }, + 20_000, + ); }); diff --git a/tests/runtime/worktree-manager.test.ts b/tests/runtime/worktree-manager.test.ts index ccc015a..0aad238 100644 --- a/tests/runtime/worktree-manager.test.ts +++ b/tests/runtime/worktree-manager.test.ts @@ -1,3 +1,4 @@ +import { realpathSync } from "node:fs"; import { execFile } from "node:child_process"; import { createHash } from "node:crypto"; import { @@ -28,10 +29,8 @@ import { syncDirectoryMetadata } from "../../src/platform/durable-directory.js"; import { getPlatformServices } from "../../src/platform/select-platform.js"; import { windowsEssentialEnvironment } from "../../src/platform/windows-env.js"; import { platformPathsEqual } from "../../src/util/platform-path.js"; -import { - recoverPendingWorktreeRemovals, - recoverStaleRuns, -} from "../../src/runtime/recovery-manager.js"; +import { recoverStaleRuns } from "../../src/runtime/recovery-manager.js"; +import { recoverPendingWorktreeRemovals } from "../../src/runtime/recovery-worktree-removals.js"; import { ArtifactStore } from "../../src/runtime/artifact-store.js"; import { managedWorktreeDirectoryIdentity, @@ -102,6 +101,10 @@ async function canonicalPathsEqual(left: string, right: string): Promise { const result = await git(cwd, args); expect(result.exitCode, result.stderr).toBe(0); @@ -168,7 +171,7 @@ describe("WorktreeManager", () => { const attempt = await manager.create(base); expect(attempt.path).toBe(await realpath( - join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", "run-123"), + join(managedRootOf(directory), "run-123"), )); await expect(stat(attempt.path)).resolves.toBeDefined(); expect(await runGit(attempt.path, ["rev-parse", "HEAD"])).toBe(base); @@ -191,11 +194,42 @@ describe("WorktreeManager", () => { expect(await registeredWorktrees(directory)).not.toContain(resolve(attempt.path)); }); + it("pins Git to the managed registration so a rewritten .git pointer cannot run commands", async () => { + const { directory, base } = await initRepo(); + const manager = new WorktreeManager(directory, "run-pinned"); + const attempt = await manager.create(base); + const hostile = await temporaryDirectory("ca-hostile-gitdir-"); + const marker = join(hostile, "textconv-ran"); + await runGit(hostile, ["init", "-q"]); + await writeFile( + join(hostile, ".git", "config"), + `[diff "x"]\n\ttextconv = "${process.execPath}" -e "require('fs').writeFileSync('${marker.replaceAll("\\", "/")}','')"\n`, + { flag: "a" }, + ); + await writeFile(join(attempt.path, ".git"), `gitdir: ${join(hostile, ".git")}\n`); + await writeFile(join(attempt.path, ".gitattributes"), "a.txt diff=x\n"); + await writeFile(join(attempt.path, "a.txt"), "changed\n"); + + const diff = await git(attempt.path, ["diff", "--stat"]); + const head = await git(attempt.path, ["rev-parse", "HEAD"]); + + expect(diff.exitCode, diff.stderr).toBe(0); + expect(diff.stdout).toContain("a.txt"); + expect(head.stdout.trim()).toBe(base); + await expect(stat(marker)).rejects.toMatchObject({ code: "ENOENT" }); + + await attempt.cleanup(); + + await expect(stat(attempt.path)).rejects.toMatchObject({ code: "ENOENT" }); + await expect(stat(marker)).rejects.toMatchObject({ code: "ENOENT" }); + expect(await registeredWorktrees(directory)).not.toContain(resolve(attempt.path)); + }); + it("retries a locked Windows quarantine rename until it succeeds", async () => { const { directory, base } = await initRepo(); const delays: number[] = []; let physicalMoves = 0; - const physicalPath = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", "run-retry"); + const physicalPath = join(managedRootOf(directory), "run-retry"); const manager = new WorktreeManager(directory, "run-retry", { os: "win32" }, { async rename(source, destination) { if (await canonicalPathsEqual(source, physicalPath)) { @@ -222,7 +256,7 @@ describe("WorktreeManager", () => { const { directory, base } = await initRepo(); const delays: number[] = []; let moves = 0; - const physicalPath = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", "run-exhausted"); + const physicalPath = join(managedRootOf(directory), "run-exhausted"); const manager = new WorktreeManager(directory, "run-exhausted", { os: "win32" }, { async rename(source, destination) { if (!await canonicalPathsEqual(source, physicalPath)) { @@ -491,9 +525,7 @@ describe("WorktreeManager", () => { quarantineRoot, `.remove-registration-${basename(registrationPath)}-${transactionId}`, ); - const physicalQuarantinePath = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const physicalQuarantinePath = join(managedRootOf(directory), `.remove-run-precommit-recovery-${transactionId}`, ); const physicalIdentity = await managedWorktreeDirectoryIdentity(attempt.path); @@ -511,7 +543,7 @@ describe("WorktreeManager", () => { commonDir, ...await removalRootIdentities( commonDir, - join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"), + managedRootOf(directory), registrationRoot, quarantineRoot, ), @@ -618,7 +650,9 @@ describe("WorktreeManager", () => { } finally { await rm(manifestPath, { force: true }); await rename(quarantinePath, registrationPath); - await Promise.all([attemptA.cleanup(), attemptB.cleanup()]); + // Both cleanups take the same checkout lease; run them in turn. + await attemptA.cleanup(); + await attemptB.cleanup(); } }); @@ -640,7 +674,7 @@ describe("WorktreeManager", () => { quarantineRoot, `.remove-registration-${basename(registrationPath)}-${transactionId}`, ); - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); const physicalIdentity = await managedWorktreeDirectoryIdentity(attempt.path); const registrationIdentity = await managedWorktreeDirectoryIdentity(registrationPath); const manifestRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktree-removals"); @@ -712,7 +746,7 @@ describe("WorktreeManager", () => { stderr: Readable.from([]), }; }; - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); const manager = new WorktreeManager(directory, "run-emptying-failure", undefined, { processSupervisor, }); @@ -836,7 +870,7 @@ describe("WorktreeManager", () => { it("persists the physical-removal commit marker before quarantine sync", async () => { const { directory, base } = await initRepo(); - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); let failPhysicalSync = false; const manager = new WorktreeManager(directory, "run-intent-sync-failure", undefined, { syncDirectory: async directoryPath => { @@ -956,7 +990,7 @@ describe("WorktreeManager", () => { "retains staged registration when final physical rmdir fails", async () => { const { directory, base } = await initRepo(); - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); const manager = new WorktreeManager(directory, "run-rmdir-failure", undefined, { async rmdir(directoryPath) { if (await canonicalPathsEqual(dirname(directoryPath), physicalRoot)) { @@ -996,7 +1030,7 @@ describe("WorktreeManager", () => { "preserves a removal whose quarantined inode moved to an unrecorded sibling", async () => { const { directory, base } = await initRepo(); - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); const manager = new WorktreeManager(directory, "run-moved-quarantine", undefined, { async rmdir(directoryPath) { if (await canonicalPathsEqual(dirname(directoryPath), physicalRoot)) { @@ -1036,7 +1070,7 @@ describe("WorktreeManager", () => { "preserves a pending removal when its registration root changed before startup", async () => { const { directory, base } = await initRepo(); - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); const manager = new WorktreeManager(directory, "run-root-substitution", undefined, { async rmdir(directoryPath) { if (await canonicalPathsEqual(dirname(directoryPath), physicalRoot)) { @@ -1082,7 +1116,7 @@ describe("WorktreeManager", () => { "preserves worktrees when a durable removal manifest is malformed", async () => { const { directory, base } = await initRepo(); - const physicalRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const physicalRoot = managedRootOf(directory); const manager = new WorktreeManager(directory, "run-malformed-manifest", undefined, { async rmdir(directoryPath) { if (await canonicalPathsEqual(dirname(directoryPath), physicalRoot)) { @@ -1119,7 +1153,7 @@ describe("WorktreeManager", () => { it("rejects a managed root substituted during removal-storage preflight", async () => { const { directory, base } = await initRepo(); - const worktreesRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const worktreesRoot = managedRootOf(directory); const displacedRoot = `${worktreesRoot}-preflight-displaced`; let gitCalls = 0; const manager = new WorktreeManager(directory, "run-preflight-root-race", undefined, { @@ -1187,7 +1221,7 @@ describe("WorktreeManager", () => { it("durably records a worktree root substituted before git chooses its destination", async () => { const { directory, base } = await initRepo(); - const worktreesRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const worktreesRoot = managedRootOf(directory); const displacedRoot = `${worktreesRoot}-pre-add-displaced`; const worktreePath = join(worktreesRoot, "run-create-pre-add-race"); let substituted = false; @@ -1226,7 +1260,7 @@ describe("WorktreeManager", () => { it("recovers a placeholder created before its identity publication completes", async () => { const { directory, base } = await initRepo(); - const worktreesRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const worktreesRoot = managedRootOf(directory); const manifestRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktree-removals"); let interrupted = false; const manager = new WorktreeManager(directory, "run-create-unbound-staging", undefined, { @@ -1255,7 +1289,7 @@ describe("WorktreeManager", () => { it("recovers a creation interrupted after intent publication but before placeholder promotion", async () => { const { directory, base } = await initRepo(); - const worktreesRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const worktreesRoot = managedRootOf(directory); const worktreePath = join(worktreesRoot, "run-create-intent-crash"); let interrupted = false; const manager = new WorktreeManager(directory, "run-create-intent-crash", undefined, { @@ -1285,9 +1319,7 @@ describe("WorktreeManager", () => { it("cleans its durable placeholder after an ordinary git worktree rejection", async () => { const { directory, base } = await initRepo(); - const worktreePath = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const worktreePath = join(managedRootOf(directory), "run-create-git-rejection", ); const manager = new WorktreeManager(directory, "run-create-git-rejection", undefined, { @@ -1304,9 +1336,7 @@ describe("WorktreeManager", () => { it("publishes before Git and cleans an in-process post-add interruption", async () => { const { directory, base } = await initRepo(); - const worktreePath = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const worktreePath = join(managedRootOf(directory), "run-create-post-add-crash", ); const manifestRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktree-removals"); @@ -1335,7 +1365,7 @@ describe("WorktreeManager", () => { it("durably records a worktree root substitution after git add", async () => { const { directory, base } = await initRepo(); - const worktreesRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const worktreesRoot = managedRootOf(directory); const displacedRoot = `${worktreesRoot}-displaced`; const worktreePath = join(worktreesRoot, "run-create-root-race"); let substituted = false; @@ -1416,25 +1446,57 @@ describe("WorktreeManager", () => { }, ); - it("canonicalizes a runtime state root reached through a symlinked ancestor", async () => { + it("canonicalizes a checkout reached through a symlinked ancestor", async () => { const { directory, base } = await initRepo(); - const realParent = await temporaryDirectory("ca-real-state-parent-"); - const realState = join(realParent, "state"); - await mkdir(realState, { mode: 0o700 }); - const aliasParent = `${realParent}-alias`; - await symlink(realParent, aliasParent, process.platform === "win32" ? "junction" : "dir"); - process.env.CLAUDE_PLUGIN_DATA = join(aliasParent, "state"); - const manager = new WorktreeManager(directory, "run-state-ancestor-alias"); + const aliasParent = `${directory}-alias`; + await symlink(directory, aliasParent, process.platform === "win32" ? "junction" : "dir"); + const manager = new WorktreeManager(aliasParent, "run-checkout-alias"); try { const attempt = await manager.create(base); - expect(dirname(attempt.path)).toBe(await realpath(join(realState, "worktrees"))); + expect(dirname(attempt.path)).toBe(managedRootOf(directory)); await attempt.cleanup(); } finally { await rm(aliasParent, { force: true }); } }); + it("places worktrees made from a linked checkout in the main checkout namespace", async () => { + const { directory, base } = await initRepo(); + const linked = join(directory, ".worktrees", "user-linked"); + await runGit(directory, ["worktree", "add", "-q", "--detach", linked, base]); + const manager = new WorktreeManager(linked, "run-from-linked"); + + const attempt = await manager.create(base); + + expect(dirname(attempt.path)).toBe(managedRootOf(directory)); + expect(await runGit(linked, ["status", "--porcelain", "--untracked-files=all"])).toBe(""); + await attempt.cleanup(); + await expect(stat(attempt.path)).rejects.toMatchObject({ code: "ENOENT" }); + }); + + it("keeps the checkout clean and never touches user worktrees beside the namespace", async () => { + const { directory, base } = await initRepo(); + const userWorktree = join(directory, ".worktrees", "user-feature"); + await runGit(directory, ["worktree", "add", "-q", "--detach", userWorktree, base]); + await writeFile(join(userWorktree, "user-work.txt"), "keep\n"); + const manager = new WorktreeManager(directory, "run-namespaced"); + + const attempt = await manager.create(base); + await writeFile(join(attempt.path, "producer.txt"), "candidate\n"); + + expect(dirname(attempt.path)).toBe(managedRootOf(directory)); + expect(await readFile(join(managedRootOf(directory), ".gitignore"), "utf8")).toBe("*\n"); + expect(await runGit(directory, ["status", "--porcelain", "--untracked-files=all"])) + .toBe("?? .worktrees/user-feature/"); + await attempt.cleanup(); + await expect(recoverStaleRuns({ isProcessAlive: () => false })).resolves.toMatchObject({ + recovered: [], + }); + await expect(readFile(join(userWorktree, "user-work.txt"), "utf8")).resolves.toBe("keep\n"); + expect(await registeredWorktrees(directory)).toContain(await realpath(userWorktree)); + }); + it.runIf(process.platform !== "win32")( "rejects a group-writable runtime state root before invoking git", async () => { @@ -1479,7 +1541,8 @@ describe("WorktreeManager", () => { const outside = await temporaryDirectory("ca-symlinked-worktree-root-"); const sentinel = join(outside, "sentinel.txt"); await writeFile(sentinel, "preserve outside root\n"); - const worktreesRoot = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees"); + const worktreesRoot = managedRootOf(directory); + await mkdir(dirname(worktreesRoot)); await symlink(outside, worktreesRoot, process.platform === "win32" ? "junction" : "dir"); let gitCalls = 0; const manager = new WorktreeManager(directory, "run-symlinked-root", undefined, { @@ -1509,9 +1572,7 @@ describe("WorktreeManager", () => { it("removes the exact registration when a new worktree vanishes before identity capture", async () => { const { directory, base } = await initRepo(); - const worktreePath = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const worktreePath = join(managedRootOf(directory), "run-vanished-after-add", ); const manager = new WorktreeManager(directory, "run-vanished-after-add", undefined, { @@ -1533,7 +1594,7 @@ describe("WorktreeManager", () => { it("preserves a colliding managed directory when worktree creation fails", async () => { const { directory, base } = await initRepo(); - const collidingPath = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", "run-collision"); + const collidingPath = join(managedRootOf(directory), "run-collision"); const sentinel = join(collidingPath, "sentinel.txt"); await mkdir(collidingPath, { recursive: true }); await writeFile(sentinel, "keep\n"); @@ -1563,9 +1624,7 @@ describe("WorktreeManager", () => { }); it("rejects a quarantine token that could escape the managed root", async () => { - const managedDirectory = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const managedDirectory = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", "run-quarantine-token", ); await mkdir(managedDirectory, { recursive: true }); @@ -1623,7 +1682,7 @@ describe("WorktreeManager", () => { const commonDir = await realpath(await runGit(directory, [ "rev-parse", "--path-format=absolute", "--git-common-dir", ])); - const physicalRoot = await realpath(join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees")); + const physicalRoot = await realpath(managedRootOf(directory)); const registrationRoot = await realpath(join(commonDir, "worktrees")); const registrationQuarantineRoot = join(commonDir, "claude-architect-quarantine"); @@ -1638,9 +1697,7 @@ describe("WorktreeManager", () => { it("passes no ambient secrets to the native Windows cleanup helpers", async () => { const previousSecret = process.env.UNRELATED_SECRET; process.env.UNRELATED_SECRET = "do-not-pass"; - const managedDirectory = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const managedDirectory = join(process.env.CLAUDE_PLUGIN_DATA!, "worktrees", "run-windows-environment", ); await mkdir(managedDirectory, { recursive: true }); @@ -1949,9 +2006,7 @@ describe("WorktreeManager", () => { const expectedIdentity = await managedWorktreeDirectoryIdentity(attempt.path); expect(expectedIdentity).not.toBeNull(); const displaced = `${attempt.path}-displaced`; - const quarantine = join( - process.env.CLAUDE_PLUGIN_DATA!, - "worktrees", + const quarantine = join(managedRootOf(directory), ".remove-run-substitution-fixed", ); const sentinel = join(quarantine, "sentinel.txt"); diff --git a/tests/runtime/worktree-removal-manifest.test.ts b/tests/runtime/worktree-removal-manifest.test.ts index d7d6aac..6469851 100644 --- a/tests/runtime/worktree-removal-manifest.test.ts +++ b/tests/runtime/worktree-removal-manifest.test.ts @@ -2,10 +2,8 @@ import { access, link, lstat, mkdir, mkdtemp, readFile, realpath, rm, writeFile import { tmpdir } from "node:os"; import path from "node:path"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { - recoverPendingWorktreeRemovals, - recoverStaleRuns, -} from "../../src/runtime/recovery-manager.js"; +import { recoverStaleRuns } from "../../src/runtime/recovery-manager.js"; +import { recoverPendingWorktreeRemovals } from "../../src/runtime/recovery-worktree-removals.js"; import { PlatformSafety } from "../../src/platform/platform-safety.js"; import { assertNoPendingWorktreeRemovalForRepository, diff --git a/tests/runtime/worktree-sweep.test.ts b/tests/runtime/worktree-sweep.test.ts index f42141d..fb24508 100644 --- a/tests/runtime/worktree-sweep.test.ts +++ b/tests/runtime/worktree-sweep.test.ts @@ -146,7 +146,7 @@ async function createNonterminalWorkflowState( now: () => timestamp, }); await store.create({ - stateVersion: "1", + stateVersion: "2", workflowId, repositoryIdentity: repo.commonDir, baseCommitOid: repo.head, @@ -166,13 +166,7 @@ async function createNonterminalWorkflowState( }], intentJournal: { ref: "journal.ndjson", entryCount: 0, lastEntryHash: null }, finalGate: null, - shipping: { - branch: `feat/${workflowId}`, - prNumber: null, - prUrl: null, - ciDeadlineAt: timestamp, - }, - ciObservations: [], + branch: `feat/${workflowId}`, cleanup: null, terminal: null, createdAt: timestamp, @@ -195,7 +189,7 @@ async function createTerminalWorkflowWithUnverifiableOwner( }; const store = new WorkflowStore(workflowId, options); await store.create({ - stateVersion: "1", + stateVersion: "2", workflowId, repositoryIdentity: repo.commonDir, baseCommitOid: repo.head, @@ -215,13 +209,7 @@ async function createTerminalWorkflowWithUnverifiableOwner( }], intentJournal: { ref: "journal.ndjson", entryCount: 0, lastEntryHash: null }, finalGate: null, - shipping: { - branch: `feat/${workflowId}`, - prNumber: null, - prUrl: null, - ciDeadlineAt: timestamp, - }, - ciObservations: [], + branch: `feat/${workflowId}`, cleanup: null, terminal: null, createdAt: timestamp, @@ -612,7 +600,9 @@ describe("startup worktree sweep", () => { await expect(access(valid.path)).resolves.toBeUndefined(); await expect(access(invalid.path)).resolves.toBeUndefined(); await expect(access(missing.path)).resolves.toBeUndefined(); - await Promise.all([valid.cleanup(), invalid.cleanup(), missing.cleanup()]); + // One checkout lease serializes these; concurrent cleanups can exceed its + // acquisition timeout on a loaded host. + for (const worktree of [valid, invalid, missing]) await worktree.cleanup(); }); it("sweeps stale modern and legacy final-review materializations", async () => { @@ -654,7 +644,7 @@ describe("startup worktree sweep", () => { now: () => timestamp, }); await store.create({ - stateVersion: "1", + stateVersion: "2", workflowId, repositoryIdentity: repo.commonDir, baseCommitOid: repo.head, @@ -678,13 +668,7 @@ describe("startup worktree sweep", () => { lastEntryHash: null, }, finalGate: null, - shipping: { - branch: `feat/${workflowId}`, - prNumber: null, - prUrl: null, - ciDeadlineAt: timestamp, - }, - ciObservations: [], + branch: `feat/${workflowId}`, cleanup: null, terminal: null, createdAt: timestamp, @@ -906,6 +890,27 @@ describe("startup worktree sweep", () => { expect(listed.stdout).not.toContain(worktree.path); }); + it("sweeps an orphan in a checkout namespace and leaves user worktrees beside it", async () => { + const repo = await initRepo(); + const userWorktree = path.join(repo.directory, ".worktrees", "user-feature"); + await runGit(repo.directory, ["worktree", "add", "-q", "--detach", userWorktree, repo.head]); + const orphan = await new WorktreeManager(repo.directory, "namespace-orphan").create(repo.head); + + await expect(recoverStaleRuns({ isProcessAlive: () => false })).resolves.toEqual({ + recovered: [], + quarantined: [], + }); + + await expectMissing(orphan.path); + const listed = await git(repo.directory, ["worktree", "list", "--porcelain", "-z"]); + expect(listed.stdout).not.toContain(orphan.path); + expect(listed.stdout).toContain(await realpath(userWorktree)); + await expect(readFile( + path.join(repo.directory, ".worktrees", "claude-architect", ".gitignore"), + "utf8", + )).resolves.toBe("*\n"); + }); + it("removes stale registrations when the entire managed worktree root vanished", async () => { const repo = await initRepo(); const runId = "sweep-missing-worktree-root"; @@ -1228,7 +1233,7 @@ describe("worktree lease coverage", () => { "src/autopilot/branch-manager.ts#createAttached", "src/autopilot/final-branch-reviewer.ts#create", "src/pipeline/candidate-verifier.ts#withManagedWorktree", - "src/pipeline/pipeline-runtime.ts#create", + "src/pipeline/pipeline-runtime.ts#withManagedWorktree", "src/pipeline/slice-runner.ts#withManagedWorktree", "src/pipeline/slice-runner.ts#withManagedWorktree", "src/runtime/attempt-runtime.ts#create", diff --git a/tests/support/isolated-state-dir.ts b/tests/support/isolated-state-dir.ts new file mode 100644 index 0000000..557d338 --- /dev/null +++ b/tests/support/isolated-state-dir.ts @@ -0,0 +1,17 @@ +import { mkdtempSync, rmSync } from "node:fs"; +import { tmpdir } from "node:os"; +import path from "node:path"; +import { afterAll } from "vitest"; + +// Test files that name no state directory fall back to `os.tmpdir()`, which +// every parallel test file shares. Removal manifests there are repository-wide +// guards, so one file's pending manifest could block another's worktree +// mutations. Each file gets its own root unless it chooses one itself. +if (process.env.CLAUDE_PLUGIN_DATA === undefined + && process.env.CLAUDE_ARCHITECT_STATE_DIR === undefined) { + const stateDirectory = mkdtempSync(path.join(tmpdir(), "ca-test-state-")); + process.env.CLAUDE_ARCHITECT_STATE_DIR = stateDirectory; + afterAll(() => { + rmSync(stateDirectory, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 }); + }); +} diff --git a/tsconfig.json b/tsconfig.json index 135a74b..2a591d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "target": "ES2023", "module": "NodeNext", "moduleResolution": "NodeNext", "strict": true, "noUncheckedIndexedAccess": true, "exactOptionalPropertyTypes": true, + "noUnusedLocals": true, "resolveJsonModule": true, "skipLibCheck": true, "declaration": false, "types": ["node"], "outDir": "dist", "rootDir": "src" }, diff --git a/vitest.config.ts b/vitest.config.ts index 34e5d20..bd05b34 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -9,6 +9,7 @@ export default defineConfig({ test: { include: ["tests/runtime/**/*.test.{ts,mjs}"], environment: "node", + setupFiles: ["tests/support/isolated-state-dir.ts"], testTimeout: 30_000, hookTimeout: 60_000, },