@lumenflow/core 4.24.0 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/arg-parser.d.ts.map +1 -1
- package/dist/arg-parser.js +16 -0
- package/dist/arg-parser.js.map +1 -1
- package/dist/atomic-merge.d.ts.map +1 -1
- package/dist/atomic-merge.js +25 -18
- package/dist/atomic-merge.js.map +1 -1
- package/dist/client-ids.d.ts +1 -15
- package/dist/client-ids.d.ts.map +1 -1
- package/dist/client-ids.js +4 -13
- package/dist/client-ids.js.map +1 -1
- package/dist/code-path-validator.d.ts.map +1 -1
- package/dist/code-path-validator.js +6 -3
- package/dist/code-path-validator.js.map +1 -1
- package/dist/config-contract.d.ts +1 -30
- package/dist/config-contract.d.ts.map +1 -1
- package/dist/config-contract.js +4 -60
- package/dist/config-contract.js.map +1 -1
- package/dist/constants/backlog-patterns.d.ts +1 -20
- package/dist/constants/backlog-patterns.d.ts.map +1 -1
- package/dist/constants/backlog-patterns.js +2 -23
- package/dist/constants/backlog-patterns.js.map +1 -1
- package/dist/constants/duration-constants.d.ts +1 -28
- package/dist/constants/duration-constants.d.ts.map +1 -1
- package/dist/constants/duration-constants.js +4 -28
- package/dist/constants/duration-constants.js.map +1 -1
- package/dist/constants/gate-constants.d.ts +1 -23
- package/dist/constants/gate-constants.d.ts.map +1 -1
- package/dist/constants/gate-constants.js +4 -23
- package/dist/constants/gate-constants.js.map +1 -1
- package/dist/constants/lock-constants.d.ts +1 -28
- package/dist/constants/lock-constants.d.ts.map +1 -1
- package/dist/constants/lock-constants.js +2 -28
- package/dist/constants/lock-constants.js.map +1 -1
- package/dist/core/tool.schemas.d.ts +11 -11
- package/dist/core/worktree-guard.js +2 -2
- package/dist/core/worktree-guard.js.map +1 -1
- package/dist/cycle-detector.d.ts +4 -48
- package/dist/cycle-detector.d.ts.map +1 -1
- package/dist/cycle-detector.js +4 -78
- package/dist/cycle-detector.js.map +1 -1
- package/dist/date-utils.d.ts +1 -65
- package/dist/date-utils.d.ts.map +1 -1
- package/dist/date-utils.js +4 -140
- package/dist/date-utils.js.map +1 -1
- package/dist/delegation-monitor.d.ts +2 -0
- package/dist/delegation-monitor.d.ts.map +1 -1
- package/dist/delegation-monitor.js +29 -2
- package/dist/delegation-monitor.js.map +1 -1
- package/dist/delegation-recovery.d.ts +36 -17
- package/dist/delegation-recovery.d.ts.map +1 -1
- package/dist/delegation-recovery.js +285 -82
- package/dist/delegation-recovery.js.map +1 -1
- package/dist/delegation-registry-schema.d.ts +257 -31
- package/dist/delegation-registry-schema.d.ts.map +1 -1
- package/dist/delegation-registry-schema.js +43 -34
- package/dist/delegation-registry-schema.js.map +1 -1
- package/dist/delegation-registry-store.d.ts +4 -128
- package/dist/delegation-registry-store.d.ts.map +1 -1
- package/dist/delegation-registry-store.js +39 -178
- package/dist/delegation-registry-store.js.map +1 -1
- package/dist/delegation-tree.d.ts +12 -20
- package/dist/delegation-tree.d.ts.map +1 -1
- package/dist/delegation-tree.js +40 -29
- package/dist/delegation-tree.js.map +1 -1
- package/dist/delivery-review-contract.d.ts +1 -1
- package/dist/delivery-review-contract.d.ts.map +1 -1
- package/dist/docs-layout-presets.d.ts +1 -30
- package/dist/docs-layout-presets.d.ts.map +1 -1
- package/dist/docs-layout-presets.js +4 -38
- package/dist/docs-layout-presets.js.map +1 -1
- package/dist/domain/context.schemas.d.ts +3 -3
- package/dist/domain/orchestration.constants.d.ts +1 -110
- package/dist/domain/orchestration.constants.d.ts.map +1 -1
- package/dist/domain/orchestration.constants.js +2 -127
- package/dist/domain/orchestration.constants.js.map +1 -1
- package/dist/domain/orchestration.schemas.d.ts +1 -306
- package/dist/domain/orchestration.schemas.d.ts.map +1 -1
- package/dist/domain/orchestration.schemas.js +2 -211
- package/dist/domain/orchestration.schemas.js.map +1 -1
- package/dist/domain/orchestration.types.d.ts +1 -133
- package/dist/domain/orchestration.types.d.ts.map +1 -1
- package/dist/domain/orchestration.types.js +2 -2
- package/dist/domain/orchestration.types.js.map +1 -1
- package/dist/domain/recovery.schemas.d.ts +3 -3
- package/dist/domain/validation.schemas.d.ts +4 -4
- package/dist/error-handler.d.ts +4 -173
- package/dist/error-handler.d.ts.map +1 -1
- package/dist/error-handler.js +4 -244
- package/dist/error-handler.js.map +1 -1
- package/dist/file-classifiers.d.ts.map +1 -1
- package/dist/file-classifiers.js +26 -0
- package/dist/file-classifiers.js.map +1 -1
- package/dist/git-adapter.d.ts +4 -448
- package/dist/git-adapter.d.ts.map +1 -1
- package/dist/git-adapter.js +4 -772
- package/dist/git-adapter.js.map +1 -1
- package/dist/git-context-extractor.d.ts +4 -98
- package/dist/git-context-extractor.d.ts.map +1 -1
- package/dist/git-context-extractor.js +4 -563
- package/dist/git-context-extractor.js.map +1 -1
- package/dist/git-staged-validator.d.ts +4 -29
- package/dist/git-staged-validator.d.ts.map +1 -1
- package/dist/git-staged-validator.js +4 -46
- package/dist/git-staged-validator.js.map +1 -1
- package/dist/incremental-lint.d.ts.map +1 -1
- package/dist/incremental-lint.js +3 -2
- package/dist/incremental-lint.js.map +1 -1
- package/dist/incremental-test.d.ts +1 -32
- package/dist/incremental-test.d.ts.map +1 -1
- package/dist/incremental-test.js +4 -61
- package/dist/incremental-test.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -2
- package/dist/index.js.map +1 -1
- package/dist/integration-target.d.ts +30 -0
- package/dist/integration-target.d.ts.map +1 -0
- package/dist/integration-target.js +51 -0
- package/dist/integration-target.js.map +1 -0
- package/dist/lane-checker.d.ts.map +1 -1
- package/dist/lane-checker.js +8 -0
- package/dist/lane-checker.js.map +1 -1
- package/dist/lumenflow-config-schema.d.ts +73 -29
- package/dist/lumenflow-config-schema.d.ts.map +1 -1
- package/dist/lumenflow-config-schema.js +1 -1
- package/dist/lumenflow-config-schema.js.map +1 -1
- package/dist/lumenflow-config.d.ts +10 -34
- package/dist/lumenflow-config.d.ts.map +1 -1
- package/dist/lumenflow-config.js +32 -142
- package/dist/lumenflow-config.js.map +1 -1
- package/dist/manual-test-validator.d.ts +1 -96
- package/dist/manual-test-validator.d.ts.map +1 -1
- package/dist/manual-test-validator.js +4 -245
- package/dist/manual-test-validator.js.map +1 -1
- package/dist/micro-worktree-shared.d.ts.map +1 -1
- package/dist/micro-worktree-shared.js +10 -9
- package/dist/micro-worktree-shared.js.map +1 -1
- package/dist/micro-worktree.d.ts.map +1 -1
- package/dist/micro-worktree.js +26 -23
- package/dist/micro-worktree.js.map +1 -1
- package/dist/normalize-config-keys.d.ts +1 -10
- package/dist/normalize-config-keys.d.ts.map +1 -1
- package/dist/normalize-config-keys.js +7 -73
- package/dist/normalize-config-keys.js.map +1 -1
- package/dist/object-guards.d.ts +1 -10
- package/dist/object-guards.d.ts.map +1 -1
- package/dist/object-guards.js +7 -20
- package/dist/object-guards.js.map +1 -1
- package/dist/ports/config.ports.d.ts +1 -82
- package/dist/ports/config.ports.d.ts.map +1 -1
- package/dist/ports/config.ports.js +2 -1
- package/dist/ports/config.ports.js.map +1 -1
- package/dist/ports/dashboard-renderer.port.d.ts +1 -112
- package/dist/ports/dashboard-renderer.port.d.ts.map +1 -1
- package/dist/ports/dashboard-renderer.port.js +2 -1
- package/dist/ports/dashboard-renderer.port.js.map +1 -1
- package/dist/ports/git-validator.ports.d.ts +5 -110
- package/dist/ports/git-validator.ports.d.ts.map +1 -1
- package/dist/ports/git-validator.ports.js +8 -1
- package/dist/ports/git-validator.ports.js.map +1 -1
- package/dist/ports/sync-validator.ports.d.ts +1 -51
- package/dist/ports/sync-validator.ports.d.ts.map +1 -1
- package/dist/ports/sync-validator.ports.js +2 -1
- package/dist/ports/sync-validator.ports.js.map +1 -1
- package/dist/ports/wu-helpers.ports.d.ts +1 -156
- package/dist/ports/wu-helpers.ports.d.ts.map +1 -1
- package/dist/ports/wu-helpers.ports.js +2 -1
- package/dist/ports/wu-helpers.ports.js.map +1 -1
- package/dist/ports/wu-state.ports.d.ts +1 -208
- package/dist/ports/wu-state.ports.d.ts.map +1 -1
- package/dist/ports/wu-state.ports.js +2 -1
- package/dist/ports/wu-state.ports.js.map +1 -1
- package/dist/rebase-artifact-cleanup.d.ts.map +1 -1
- package/dist/rebase-artifact-cleanup.js +6 -3
- package/dist/rebase-artifact-cleanup.js.map +1 -1
- package/dist/sandbox-allowlist.d.ts +1 -15
- package/dist/sandbox-allowlist.d.ts.map +1 -1
- package/dist/sandbox-allowlist.js +4 -74
- package/dist/sandbox-allowlist.js.map +1 -1
- package/dist/sandbox-backend-linux.d.ts +1 -5
- package/dist/sandbox-backend-linux.d.ts.map +1 -1
- package/dist/sandbox-backend-linux.js +4 -64
- package/dist/sandbox-backend-linux.js.map +1 -1
- package/dist/sandbox-backend-macos.d.ts +1 -5
- package/dist/sandbox-backend-macos.d.ts.map +1 -1
- package/dist/sandbox-backend-macos.js +4 -109
- package/dist/sandbox-backend-macos.js.map +1 -1
- package/dist/sandbox-backend-windows.d.ts +1 -5
- package/dist/sandbox-backend-windows.d.ts.map +1 -1
- package/dist/sandbox-backend-windows.js +4 -27
- package/dist/sandbox-backend-windows.js.map +1 -1
- package/dist/sandbox-profile.d.ts +1 -57
- package/dist/sandbox-profile.d.ts.map +1 -1
- package/dist/sandbox-profile.js +4 -65
- package/dist/sandbox-profile.js.map +1 -1
- package/dist/schemas/agents-config.d.ts +47 -0
- package/dist/schemas/agents-config.d.ts.map +1 -1
- package/dist/schemas/agents-config.js +59 -0
- package/dist/schemas/agents-config.js.map +1 -1
- package/dist/schemas/command-schemas.d.ts +4 -4
- package/dist/schemas/flow-arg-validators.d.ts +2 -2
- package/dist/schemas/flow-schemas.d.ts +4 -4
- package/dist/schemas/gates-section-config.d.ts +32 -13
- package/dist/schemas/gates-section-config.d.ts.map +1 -1
- package/dist/schemas/gates-section-config.js +16 -1
- package/dist/schemas/gates-section-config.js.map +1 -1
- package/dist/schemas/initiative-arg-validators.d.ts +2 -2
- package/dist/schemas/initiative-schemas.d.ts +12 -12
- package/dist/schemas/lanes-config.d.ts +5 -5
- package/dist/schemas/memory-arg-validators.d.ts +6 -0
- package/dist/schemas/memory-arg-validators.d.ts.map +1 -1
- package/dist/schemas/memory-config.d.ts +4 -4
- package/dist/schemas/memory-schemas.d.ts +12 -0
- package/dist/schemas/memory-schemas.d.ts.map +1 -1
- package/dist/schemas/memory-schemas.js +12 -0
- package/dist/schemas/memory-schemas.js.map +1 -1
- package/dist/schemas/operational-config.d.ts +4 -4
- package/dist/schemas/setup-arg-validators.d.ts +3 -3
- package/dist/schemas/setup-schemas.d.ts +8 -8
- package/dist/schemas/wu-config.d.ts +3 -3
- package/dist/schemas/wu-lifecycle-arg-validators.d.ts +2 -2
- package/dist/schemas/wu-lifecycle-schemas.d.ts +4 -4
- package/dist/section-headings.d.ts +1 -34
- package/dist/section-headings.d.ts.map +1 -1
- package/dist/section-headings.js +2 -51
- package/dist/section-headings.js.map +1 -1
- package/dist/spawn-constraints-generator.js +3 -3
- package/dist/spawn-constraints-generator.js.map +1 -1
- package/dist/spawn-guidance-generators.d.ts +1 -1
- package/dist/spawn-guidance-generators.d.ts.map +1 -1
- package/dist/spawn-policy-resolver.d.ts +1 -1
- package/dist/spawn-policy-resolver.d.ts.map +1 -1
- package/dist/spawn-task-builder.d.ts +17 -1
- package/dist/spawn-task-builder.d.ts.map +1 -1
- package/dist/spawn-task-builder.js +63 -1
- package/dist/spawn-task-builder.js.map +1 -1
- package/dist/spawn-template-assembler.d.ts +1 -1
- package/dist/spawn-template-assembler.d.ts.map +1 -1
- package/dist/state-machine.d.ts +1 -9
- package/dist/state-machine.d.ts.map +1 -1
- package/dist/state-machine.js +2 -86
- package/dist/state-machine.js.map +1 -1
- package/dist/sync-validator.d.ts.map +1 -1
- package/dist/sync-validator.js +15 -12
- package/dist/sync-validator.js.map +1 -1
- package/dist/telemetry.d.ts.map +1 -1
- package/dist/telemetry.js +3 -2
- package/dist/telemetry.js.map +1 -1
- package/dist/work-classifier.d.ts +1 -102
- package/dist/work-classifier.d.ts.map +1 -1
- package/dist/work-classifier.js +2 -424
- package/dist/work-classifier.js.map +1 -1
- package/dist/worktree-symlink.d.ts +2 -2
- package/dist/worktree-symlink.d.ts.map +1 -1
- package/dist/worktree-symlink.js +37 -12
- package/dist/worktree-symlink.js.map +1 -1
- package/dist/wu-cli-constants.d.ts +1 -433
- package/dist/wu-cli-constants.d.ts.map +1 -1
- package/dist/wu-cli-constants.js +4 -436
- package/dist/wu-cli-constants.js.map +1 -1
- package/dist/wu-consistency-file-repairs.d.ts.map +1 -1
- package/dist/wu-consistency-file-repairs.js +5 -3
- package/dist/wu-consistency-file-repairs.js.map +1 -1
- package/dist/wu-context-constants.d.ts +22 -0
- package/dist/wu-context-constants.d.ts.map +1 -1
- package/dist/wu-context-constants.js +22 -0
- package/dist/wu-context-constants.js.map +1 -1
- package/dist/wu-doc-types.d.ts +1 -47
- package/dist/wu-doc-types.d.ts.map +1 -1
- package/dist/wu-domain-constants.d.ts +1 -295
- package/dist/wu-domain-constants.d.ts.map +1 -1
- package/dist/wu-domain-constants.js +4 -397
- package/dist/wu-domain-constants.js.map +1 -1
- package/dist/wu-done-branch-only.d.ts +1 -1
- package/dist/wu-done-branch-only.d.ts.map +1 -1
- package/dist/wu-done-branch-only.js +22 -13
- package/dist/wu-done-branch-only.js.map +1 -1
- package/dist/wu-done-branch-utils.d.ts.map +1 -1
- package/dist/wu-done-branch-utils.js +5 -3
- package/dist/wu-done-branch-utils.js.map +1 -1
- package/dist/wu-done-cleanup.d.ts.map +1 -1
- package/dist/wu-done-cleanup.js +66 -22
- package/dist/wu-done-cleanup.js.map +1 -1
- package/dist/wu-done-concurrent-merge.d.ts.map +1 -1
- package/dist/wu-done-concurrent-merge.js +9 -6
- package/dist/wu-done-concurrent-merge.js.map +1 -1
- package/dist/wu-done-errors.d.ts +3 -3
- package/dist/wu-done-errors.d.ts.map +1 -1
- package/dist/wu-done-inputs.d.ts.map +1 -1
- package/dist/wu-done-inputs.js +3 -0
- package/dist/wu-done-inputs.js.map +1 -1
- package/dist/wu-done-merge-phase.d.ts.map +1 -1
- package/dist/wu-done-merge-phase.js +4 -2
- package/dist/wu-done-merge-phase.js.map +1 -1
- package/dist/wu-done-merge.d.ts.map +1 -1
- package/dist/wu-done-merge.js +16 -8
- package/dist/wu-done-merge.js.map +1 -1
- package/dist/wu-done-merged-worktree.d.ts.map +1 -1
- package/dist/wu-done-merged-worktree.js +7 -8
- package/dist/wu-done-merged-worktree.js.map +1 -1
- package/dist/wu-done-messages.d.ts.map +1 -1
- package/dist/wu-done-messages.js +12 -5
- package/dist/wu-done-messages.js.map +1 -1
- package/dist/wu-done-metadata.d.ts.map +1 -1
- package/dist/wu-done-metadata.js +3 -8
- package/dist/wu-done-metadata.js.map +1 -1
- package/dist/wu-done-preflight-checks.d.ts.map +1 -1
- package/dist/wu-done-preflight-checks.js +21 -15
- package/dist/wu-done-preflight-checks.js.map +1 -1
- package/dist/wu-done-rebase.d.ts.map +1 -1
- package/dist/wu-done-rebase.js +10 -8
- package/dist/wu-done-rebase.js.map +1 -1
- package/dist/wu-done-retry-helpers.d.ts.map +1 -1
- package/dist/wu-done-retry-helpers.js +13 -11
- package/dist/wu-done-retry-helpers.js.map +1 -1
- package/dist/wu-done-validation.d.ts.map +1 -1
- package/dist/wu-done-validation.js +4 -2
- package/dist/wu-done-validation.js.map +1 -1
- package/dist/wu-done-worktree-services.d.ts.map +1 -1
- package/dist/wu-done-worktree-services.js +4 -2
- package/dist/wu-done-worktree-services.js.map +1 -1
- package/dist/wu-done-worktree.d.ts.map +1 -1
- package/dist/wu-done-worktree.js +4 -2
- package/dist/wu-done-worktree.js.map +1 -1
- package/dist/wu-git-constants.d.ts +1 -175
- package/dist/wu-git-constants.d.ts.map +1 -1
- package/dist/wu-git-constants.js +4 -175
- package/dist/wu-git-constants.js.map +1 -1
- package/dist/wu-helpers.d.ts +24 -0
- package/dist/wu-helpers.d.ts.map +1 -1
- package/dist/wu-helpers.js +37 -4
- package/dist/wu-helpers.js.map +1 -1
- package/dist/wu-id-format.d.ts +1 -137
- package/dist/wu-id-format.d.ts.map +1 -1
- package/dist/wu-id-format.js +2 -249
- package/dist/wu-id-format.js.map +1 -1
- package/dist/wu-id-generator.d.ts.map +1 -1
- package/dist/wu-id-generator.js +8 -5
- package/dist/wu-id-generator.js.map +1 -1
- package/dist/wu-paths-constants.d.ts +1 -253
- package/dist/wu-paths-constants.d.ts.map +1 -1
- package/dist/wu-paths-constants.js +4 -273
- package/dist/wu-paths-constants.js.map +1 -1
- package/dist/wu-paths.d.ts +1 -274
- package/dist/wu-paths.d.ts.map +1 -1
- package/dist/wu-paths.js +4 -236
- package/dist/wu-paths.js.map +1 -1
- package/dist/wu-rules-resolvers.d.ts.map +1 -1
- package/dist/wu-rules-resolvers.js +11 -6
- package/dist/wu-rules-resolvers.js.map +1 -1
- package/dist/wu-schema.d.ts +1 -830
- package/dist/wu-schema.d.ts.map +1 -1
- package/dist/wu-schema.js +4 -929
- package/dist/wu-schema.js.map +1 -1
- package/dist/wu-spawn-helpers.d.ts.map +1 -1
- package/dist/wu-spawn-helpers.js +5 -2
- package/dist/wu-spawn-helpers.js.map +1 -1
- package/dist/wu-spawn.d.ts +2 -2
- package/dist/wu-spawn.d.ts.map +1 -1
- package/dist/wu-spawn.js +2 -2
- package/dist/wu-spawn.js.map +1 -1
- package/dist/wu-state-schema.d.ts +1 -291
- package/dist/wu-state-schema.d.ts.map +1 -1
- package/dist/wu-state-schema.js +4 -212
- package/dist/wu-state-schema.js.map +1 -1
- package/dist/wu-status-transition.d.ts +3 -1
- package/dist/wu-status-transition.d.ts.map +1 -1
- package/dist/wu-status-transition.js +9 -24
- package/dist/wu-status-transition.js.map +1 -1
- package/dist/wu-statuses.d.ts +1 -208
- package/dist/wu-statuses.d.ts.map +1 -1
- package/dist/wu-statuses.js +4 -242
- package/dist/wu-statuses.js.map +1 -1
- package/dist/wu-transaction-collectors.d.ts +1 -0
- package/dist/wu-transaction-collectors.d.ts.map +1 -1
- package/dist/wu-transaction-collectors.js +13 -8
- package/dist/wu-transaction-collectors.js.map +1 -1
- package/dist/wu-type-helpers.d.ts +1 -27
- package/dist/wu-type-helpers.d.ts.map +1 -1
- package/dist/wu-type-helpers.js +4 -46
- package/dist/wu-type-helpers.js.map +1 -1
- package/dist/wu-ui-constants.d.ts +1 -235
- package/dist/wu-ui-constants.d.ts.map +1 -1
- package/dist/wu-ui-constants.js +5 -235
- package/dist/wu-ui-constants.js.map +1 -1
- package/dist/wu-validation-constants.d.ts +1 -60
- package/dist/wu-validation-constants.d.ts.map +1 -1
- package/dist/wu-validation-constants.js +4 -66
- package/dist/wu-validation-constants.js.map +1 -1
- package/dist/wu-yaml.d.ts +1 -112
- package/dist/wu-yaml.d.ts.map +1 -1
- package/dist/wu-yaml.js +4 -304
- package/dist/wu-yaml.js.map +1 -1
- package/package.json +12 -9
- package/dist/coverage-gate.d.ts +0 -128
- package/dist/coverage-gate.d.ts.map +0 -1
- package/dist/coverage-gate.js +0 -211
- package/dist/coverage-gate.js.map +0 -1
- package/dist/gates-agent-mode.d.ts +0 -108
- package/dist/gates-agent-mode.d.ts.map +0 -1
- package/dist/gates-agent-mode.js +0 -138
- package/dist/gates-agent-mode.js.map +0 -1
- package/dist/gates-config-internal.d.ts +0 -54
- package/dist/gates-config-internal.d.ts.map +0 -1
- package/dist/gates-config-internal.js +0 -107
- package/dist/gates-config-internal.js.map +0 -1
- package/dist/gates-config.d.ts +0 -68
- package/dist/gates-config.d.ts.map +0 -1
- package/dist/gates-config.js +0 -193
- package/dist/gates-config.js.map +0 -1
- package/dist/gates-coverage.d.ts +0 -42
- package/dist/gates-coverage.d.ts.map +0 -1
- package/dist/gates-coverage.js +0 -162
- package/dist/gates-coverage.js.map +0 -1
- package/dist/gates-presets.d.ts +0 -52
- package/dist/gates-presets.d.ts.map +0 -1
- package/dist/gates-presets.js +0 -117
- package/dist/gates-presets.js.map +0 -1
- package/dist/gates-schemas.d.ts +0 -143
- package/dist/gates-schemas.d.ts.map +0 -1
- package/dist/gates-schemas.js +0 -67
- package/dist/gates-schemas.js.map +0 -1
- package/dist/package-manager-resolver.d.ts +0 -80
- package/dist/package-manager-resolver.d.ts.map +0 -1
- package/dist/package-manager-resolver.js +0 -245
- package/dist/package-manager-resolver.js.map +0 -1
- package/dist/resolve-policy.d.ts +0 -293
- package/dist/resolve-policy.d.ts.map +0 -1
- package/dist/resolve-policy.js +0 -303
- package/dist/resolve-policy.js.map +0 -1
package/dist/wu-done-messages.js
CHANGED
|
@@ -9,9 +9,16 @@
|
|
|
9
9
|
* All log messages, error messages, and text templates extracted to constants.
|
|
10
10
|
* Prevents duplication and makes text maintainable.
|
|
11
11
|
*/
|
|
12
|
-
import { LOG_PREFIX, EMOJI
|
|
12
|
+
import { LOG_PREFIX, EMOJI } from './wu-constants.js';
|
|
13
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
13
14
|
// Re-export LOG_PREFIX for backwards compatibility
|
|
14
15
|
export { LOG_PREFIX };
|
|
16
|
+
function defaultRemote() {
|
|
17
|
+
return resolveIntegrationTarget().remote;
|
|
18
|
+
}
|
|
19
|
+
function defaultMainBranch() {
|
|
20
|
+
return resolveIntegrationTarget().mainBranch;
|
|
21
|
+
}
|
|
15
22
|
function formatUnknownError(error) {
|
|
16
23
|
return error instanceof Error ? error.message : String(error);
|
|
17
24
|
}
|
|
@@ -119,7 +126,7 @@ export const PREFLIGHT = {
|
|
|
119
126
|
` 3. Rebase onto main: git rebase ${remote}/${mainBranch}\n` +
|
|
120
127
|
` 4. Force-push lane branch: git push --force-with-lease ${remote} ${branch}\n` +
|
|
121
128
|
` 5. Return to main checkout and retry`,
|
|
122
|
-
CONFLICT_ERROR: (remote =
|
|
129
|
+
CONFLICT_ERROR: (remote = defaultRemote(), mainBranch = defaultMainBranch()) => `⚠️ MERGE CONFLICTS DETECTED (WU-755 pre-flight check)\n\n` +
|
|
123
130
|
`Cannot complete WU - merge conflicts found between main and your branch.\n\n` +
|
|
124
131
|
`REQUIRED: Resolve conflicts before completing:\n` +
|
|
125
132
|
` 1. cd into your worktree\n` +
|
|
@@ -161,7 +168,7 @@ export const MERGE = {
|
|
|
161
168
|
FF_FAILED_RETRY: `${LOG_PREFIX.DONE} ${EMOJI.WARNING} Fast-forward failed, updating main and retrying...`,
|
|
162
169
|
UPDATED_MAIN: (remote) => `${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Updated main from ${remote}, retrying merge...`,
|
|
163
170
|
PUSHED: (remote, mainBranch) => `${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Pushed to ${remote}/${mainBranch}`,
|
|
164
|
-
FF_MERGE_ERROR: (branch, mergeError, pullError, remote =
|
|
171
|
+
FF_MERGE_ERROR: (branch, mergeError, pullError, remote = defaultRemote(), mainBranch = defaultMainBranch()) => `Fast-forward merge failed and retry with git pull also failed.\n\n` +
|
|
165
172
|
`Original merge error: ${formatUnknownError(mergeError)}\n` +
|
|
166
173
|
`Pull error: ${formatUnknownError(pullError)}\n\n` +
|
|
167
174
|
`Manual fix required:\n` +
|
|
@@ -169,13 +176,13 @@ export const MERGE = {
|
|
|
169
176
|
` 2. Resolve conflicts\n` +
|
|
170
177
|
` 3. Switch to your worktree and rebase onto ${mainBranch}\n` +
|
|
171
178
|
` 4. Return to main checkout and retry`,
|
|
172
|
-
FF_DIVERGED_ERROR: (branch, originalError, mainBranch =
|
|
179
|
+
FF_DIVERGED_ERROR: (branch, originalError, mainBranch = defaultMainBranch()) => `Fast-forward merge failed for ${branch}.\n\n` +
|
|
173
180
|
`This means your branch has diverged from ${mainBranch}.\n` +
|
|
174
181
|
`To fix:\n` +
|
|
175
182
|
` 1. Switch to your worktree: cd <worktree-path>\n` +
|
|
176
183
|
` 2. Rebase onto ${mainBranch}: git rebase ${mainBranch}\n` +
|
|
177
184
|
` 3. Return to main checkout and retry`,
|
|
178
|
-
FF_FAILED_NON_DIVERGED_ERROR: (branch, originalError, mainBranch =
|
|
185
|
+
FF_FAILED_NON_DIVERGED_ERROR: (branch, originalError, mainBranch = defaultMainBranch()) => `Fast-forward merge failed for ${branch}, but ${mainBranch} is an ancestor.\n\n` +
|
|
179
186
|
`This indicates the merge did not fail due to divergence.\n` +
|
|
180
187
|
`Underlying git error: ${formatUnknownError(originalError)}\n\n` +
|
|
181
188
|
`Next steps:\n` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-messages.js","sourceRoot":"","sources":["../src/wu-done-messages.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wu-done-messages.js","sourceRoot":"","sources":["../src/wu-done-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-metadata.d.ts","sourceRoot":"","sources":["../src/wu-done-metadata.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"wu-done-metadata.d.ts","sourceRoot":"","sources":["../src/wu-done-metadata.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAiCzD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,eAAgB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,2BAA2B;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,yBAA0B,SAAQ,2BAA2B;IACrE,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,kCAAmC,SAAQ,2BAA2B;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,aAAa,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,aAAa;IACrB,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3C;AAED,UAAU,4BAA4B;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAgCD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,SAAS,SAA8B,EACvC,UAAU,GAAE,gBAAqB,GAChC,MAAM,CAsCR;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,EACzC,UAAU,EACV,WAAW,GACZ,EAAE,2BAA2B,GAAG,IAAI,CAiBpC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,EAAE,EACF,KAAK,EACL,GAAG,EACH,MAAM,EACN,UAAU,EACV,WAAW,GACZ,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB3C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,wBAAsB,4BAA4B,CAAC,EACjD,EAAE,EACF,KAAK,EACL,GAAG,EACH,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,WAAW,EACX,WAAW,GACZ,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgDpD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,sBAAsB,CAAC,EAC3C,EAAE,EACF,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,cAAqB,EACrB,UAAiB,EACjB,QAAe,GAChB,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C9C"}
|
package/dist/wu-done-metadata.js
CHANGED
|
@@ -12,13 +12,12 @@ import { updateStatusRemoveInProgress, addToStatusCompleted } from './wu-status-
|
|
|
12
12
|
import { moveWUToDoneBacklog } from './wu-backlog-updater.js';
|
|
13
13
|
import { createStamp } from './stamp-utils.js';
|
|
14
14
|
import { WU_EVENTS_FILE_NAME } from './wu-state-store.js';
|
|
15
|
-
import { computeWUYAMLContent, computeStatusContentFromMergedState, computeBacklogContent, computeWUEventsContentAfterComplete, computeStampContent, } from './wu-transaction-collectors.js';
|
|
15
|
+
import { applyDoneStateToWUDoc, computeWUYAMLContent, computeStatusContentFromMergedState, computeBacklogContent, computeWUEventsContentAfterComplete, computeStampContent, } from './wu-transaction-collectors.js';
|
|
16
16
|
import { computeInitiativeSyncWriteOnWUComplete } from './wu-done-initiative-sync.js';
|
|
17
|
-
import { DEFAULTS, LOG_PREFIX, EMOJI, PKG_MANAGER, SCRIPTS, PRETTIER_FLAGS, PRETTIER_ARGS, LUMENFLOW_PATHS,
|
|
17
|
+
import { DEFAULTS, LOG_PREFIX, EMOJI, PKG_MANAGER, SCRIPTS, PRETTIER_FLAGS, PRETTIER_ARGS, LUMENFLOW_PATHS, } from './wu-constants.js';
|
|
18
18
|
import { applyExposureDefaults } from './wu-done-validation.js';
|
|
19
19
|
import { createFileNotFoundError, createValidationError } from './wu-done-errors.js';
|
|
20
20
|
import { writeWU } from './wu-yaml.js';
|
|
21
|
-
import { normalizeToDateString } from './date-utils.js';
|
|
22
21
|
import { getErrorMessage } from './error-handler.js';
|
|
23
22
|
const execFileAsync = promisify(execFileCallback);
|
|
24
23
|
const PNPM_EXEC_SUBCOMMAND = 'exec';
|
|
@@ -121,11 +120,7 @@ export async function updateMetadataFiles({ id, title, doc, wuPath, statusPath,
|
|
|
121
120
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Auto-set exposure to ${exposureUpdate.exposure} for ${id}`);
|
|
122
121
|
}
|
|
123
122
|
// Update WU YAML (mark as done, lock, set completion timestamp)
|
|
124
|
-
|
|
125
|
-
doc.status = WU_STATUS.DONE;
|
|
126
|
-
doc.locked = true;
|
|
127
|
-
doc.completed_at = completedAt;
|
|
128
|
-
doc.completed = normalizeToDateString(doc.completed ?? completedAt) ?? completedAt.slice(0, 10);
|
|
123
|
+
applyDoneStateToWUDoc(doc);
|
|
129
124
|
writeWU(wuPath, doc);
|
|
130
125
|
// Update status.md (remove from In Progress, add to Completed)
|
|
131
126
|
updateStatusRemoveInProgress(statusPath, id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-metadata.js","sourceRoot":"","sources":["../src/wu-done-metadata.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;GAEG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,mCAAmC,EACnC,qBAAqB,EACrB,mCAAmC,EACnC,mBAAmB,GACpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,sCAAsC,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EACL,QAAQ,EACR,UAAU,EACV,KAAK,EACL,WAAW,EACX,OAAO,EACP,cAAc,EACd,aAAa,EACb,eAAe,
|
|
1
|
+
{"version":3,"file":"wu-done-metadata.js","sourceRoot":"","sources":["../src/wu-done-metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-preflight-checks.d.ts","sourceRoot":"","sources":["../src/wu-done-preflight-checks.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"wu-done-preflight-checks.d.ts","sourceRoot":"","sources":["../src/wu-done-preflight-checks.ts"],"names":[],"mappings":";AAwCA;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,uCAAuC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgCtE;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAwDf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CA4Df;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,GAAG,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,IAAW,GAC3C,OAAO,CAAC,IAAI,CAAC,CA6Df"}
|
|
@@ -16,11 +16,12 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import { spawnSync } from 'node:child_process';
|
|
18
18
|
import { getGitForCwd } from './git-adapter.js';
|
|
19
|
-
import {
|
|
19
|
+
import { THRESHOLDS, LOG_PREFIX, STRING_LITERALS, GIT_COMMANDS, GIT_FLAGS, } from './wu-constants.js';
|
|
20
20
|
import { PREFLIGHT } from './wu-done-messages.js';
|
|
21
21
|
import { createError, ErrorCodes, getErrorMessage } from './error-handler.js';
|
|
22
22
|
import { createValidationError } from './wu-done-errors.js';
|
|
23
23
|
import { autoRebaseBranch } from './wu-done-rebase.js';
|
|
24
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
24
25
|
function isErrorWithCode(error, code) {
|
|
25
26
|
if (typeof error !== 'object' || error === null || !('code' in error)) {
|
|
26
27
|
return false;
|
|
@@ -36,16 +37,17 @@ function isErrorWithCode(error, code) {
|
|
|
36
37
|
*/
|
|
37
38
|
export async function checkBranchDrift(branch) {
|
|
38
39
|
const gitAdapter = getGitForCwd();
|
|
40
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
39
41
|
try {
|
|
40
42
|
const counts = await gitAdapter.revList([
|
|
41
43
|
'--left-right',
|
|
42
44
|
'--count',
|
|
43
|
-
`${
|
|
45
|
+
`${integrationTarget.mainBranch}...${branch}`,
|
|
44
46
|
]);
|
|
45
47
|
const [mainAheadRaw] = counts.split(/\s+/).map(Number);
|
|
46
48
|
const mainAhead = typeof mainAheadRaw === 'number' && Number.isFinite(mainAheadRaw) ? mainAheadRaw : 0;
|
|
47
49
|
if (mainAhead > THRESHOLDS.BRANCH_DRIFT_MAX) {
|
|
48
|
-
throw createError(ErrorCodes.GIT_ERROR, PREFLIGHT.BRANCH_DRIFT_ERROR(mainAhead, THRESHOLDS.BRANCH_DRIFT_MAX,
|
|
50
|
+
throw createError(ErrorCodes.GIT_ERROR, PREFLIGHT.BRANCH_DRIFT_ERROR(mainAhead, THRESHOLDS.BRANCH_DRIFT_MAX, integrationTarget.remote, integrationTarget.mainBranch), { branch, commitsBehind: mainAhead, threshold: THRESHOLDS.BRANCH_DRIFT_MAX });
|
|
49
51
|
}
|
|
50
52
|
return mainAhead;
|
|
51
53
|
}
|
|
@@ -68,13 +70,14 @@ export async function checkBranchDrift(branch) {
|
|
|
68
70
|
export async function checkBranchDivergence(branch, options = {}) {
|
|
69
71
|
const { autoRebase = true, worktreePath = null, wuId = null } = options;
|
|
70
72
|
const gitAdapter = getGitForCwd();
|
|
73
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
71
74
|
try {
|
|
72
|
-
const mergeBase = await gitAdapter.mergeBase(
|
|
73
|
-
const mainHead = await gitAdapter.getCommitHash(
|
|
75
|
+
const mergeBase = await gitAdapter.mergeBase(integrationTarget.mainBranch, branch);
|
|
76
|
+
const mainHead = await gitAdapter.getCommitHash(integrationTarget.mainBranch);
|
|
74
77
|
if (mergeBase !== mainHead) {
|
|
75
78
|
const mainCommitsAhead = await gitAdapter.revList([
|
|
76
79
|
'--count',
|
|
77
|
-
`${mergeBase}..${
|
|
80
|
+
`${mergeBase}..${integrationTarget.mainBranch}`,
|
|
78
81
|
]);
|
|
79
82
|
const commitCount = Number(mainCommitsAhead);
|
|
80
83
|
console.log(PREFLIGHT.DIVERGENCE_DETECTED(commitCount));
|
|
@@ -95,7 +98,7 @@ export async function checkBranchDivergence(branch, options = {}) {
|
|
|
95
98
|
});
|
|
96
99
|
}
|
|
97
100
|
// Auto-rebase disabled or no worktree path - throw with manual instructions
|
|
98
|
-
throw createError(ErrorCodes.GIT_ERROR, PREFLIGHT.DIVERGENCE_ERROR(commitCount,
|
|
101
|
+
throw createError(ErrorCodes.GIT_ERROR, PREFLIGHT.DIVERGENCE_ERROR(commitCount, integrationTarget.remote, integrationTarget.mainBranch, branch), { branch, mergeBase, mainHead, mainCommitsAhead: commitCount });
|
|
99
102
|
}
|
|
100
103
|
console.log(PREFLIGHT.NO_DIVERGENCE);
|
|
101
104
|
}
|
|
@@ -119,6 +122,7 @@ export async function checkBranchDivergence(branch, options = {}) {
|
|
|
119
122
|
export async function checkMergeCommits(branch, options = {}) {
|
|
120
123
|
const { autoRebase = true, worktreePath = null, wuId = null } = options;
|
|
121
124
|
const gitAdapter = getGitForCwd();
|
|
125
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
122
126
|
try {
|
|
123
127
|
// Find merge commits in lane branch that are not in main
|
|
124
128
|
// --merges: only merge commits
|
|
@@ -126,7 +130,7 @@ export async function checkMergeCommits(branch, options = {}) {
|
|
|
126
130
|
const mergeCommitsRaw = await gitAdapter.raw([
|
|
127
131
|
'rev-list',
|
|
128
132
|
'--merges',
|
|
129
|
-
`${
|
|
133
|
+
`${integrationTarget.mainBranch}..${branch}`,
|
|
130
134
|
]);
|
|
131
135
|
const mergeCommits = mergeCommitsRaw.trim().split(STRING_LITERALS.NEWLINE).filter(Boolean);
|
|
132
136
|
const mergeCount = mergeCommits.length;
|
|
@@ -152,9 +156,9 @@ export async function checkMergeCommits(branch, options = {}) {
|
|
|
152
156
|
`GitHub requires linear history. Merge commits must be eliminated.\n\n` +
|
|
153
157
|
`REQUIRED: Rebase your branch to linearize history:\n` +
|
|
154
158
|
` 1. cd into your worktree\n` +
|
|
155
|
-
` 2. git fetch ${
|
|
156
|
-
` 3. git rebase ${
|
|
157
|
-
` 4. git push --force-with-lease ${
|
|
159
|
+
` 2. git fetch ${integrationTarget.remote} ${integrationTarget.mainBranch}\n` +
|
|
160
|
+
` 3. git rebase ${integrationTarget.trackingRef}\n` +
|
|
161
|
+
` 4. git push --force-with-lease ${integrationTarget.remote} ${branch}\n` +
|
|
158
162
|
` 5. Return to main checkout and retry`, { branch, mergeCommitCount: mergeCount });
|
|
159
163
|
}
|
|
160
164
|
console.log(PREFLIGHT.NO_MERGE_COMMITS);
|
|
@@ -173,10 +177,11 @@ export async function checkMergeCommits(branch, options = {}) {
|
|
|
173
177
|
*/
|
|
174
178
|
export async function checkMergeConflicts(branch) {
|
|
175
179
|
const MERGE_TREE_CONFLICT_EXIT_CODE = 1;
|
|
180
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
176
181
|
try {
|
|
177
182
|
// Use git exit status for conflict detection (status=1 indicates conflicts).
|
|
178
183
|
// This avoids brittle parsing of merge-tree output text.
|
|
179
|
-
const result = spawnSync(GIT_COMMANDS.GIT, [GIT_COMMANDS.MERGE_TREE, GIT_FLAGS.WRITE_TREE,
|
|
184
|
+
const result = spawnSync(GIT_COMMANDS.GIT, [GIT_COMMANDS.MERGE_TREE, GIT_FLAGS.WRITE_TREE, integrationTarget.mainBranch, branch], {
|
|
180
185
|
cwd: process.cwd(),
|
|
181
186
|
encoding: 'utf-8',
|
|
182
187
|
});
|
|
@@ -189,7 +194,7 @@ export async function checkMergeConflicts(branch) {
|
|
|
189
194
|
return;
|
|
190
195
|
}
|
|
191
196
|
if (result.status === MERGE_TREE_CONFLICT_EXIT_CODE) {
|
|
192
|
-
throw createError(ErrorCodes.GIT_ERROR, PREFLIGHT.CONFLICT_ERROR(
|
|
197
|
+
throw createError(ErrorCodes.GIT_ERROR, PREFLIGHT.CONFLICT_ERROR(integrationTarget.remote, integrationTarget.mainBranch), {
|
|
193
198
|
branch,
|
|
194
199
|
operation: 'merge-tree --write-tree',
|
|
195
200
|
});
|
|
@@ -221,12 +226,13 @@ export async function checkMergeConflicts(branch) {
|
|
|
221
226
|
*/
|
|
222
227
|
export async function checkEmptyMerge(branch, doc = null) {
|
|
223
228
|
const gitAdapter = getGitForCwd();
|
|
229
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
224
230
|
try {
|
|
225
231
|
// Count commits on lane branch that are not in main
|
|
226
232
|
const commitCountRaw = await gitAdapter.raw([
|
|
227
233
|
'rev-list',
|
|
228
234
|
'--count',
|
|
229
|
-
`${
|
|
235
|
+
`${integrationTarget.mainBranch}..${branch}`,
|
|
230
236
|
]);
|
|
231
237
|
const commitCount = Number(commitCountRaw.trim());
|
|
232
238
|
// WU-1460: If code_paths defined, verify those files were modified
|
|
@@ -239,7 +245,7 @@ export async function checkEmptyMerge(branch, doc = null) {
|
|
|
239
245
|
const modifiedFilesRaw = await gitAdapter.raw([
|
|
240
246
|
'diff',
|
|
241
247
|
'--name-only',
|
|
242
|
-
`${
|
|
248
|
+
`${integrationTarget.mainBranch}...${branch}`,
|
|
243
249
|
]);
|
|
244
250
|
const modifiedFiles = modifiedFilesRaw.trim().split('\n').filter(Boolean);
|
|
245
251
|
// Check if code_paths files are in the modified list
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-preflight-checks.js","sourceRoot":"","sources":["../src/wu-done-preflight-checks.ts"],"names":[],"mappings":";AACA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"wu-done-preflight-checks.js","sourceRoot":"","sources":["../src/wu-done-preflight-checks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-rebase.d.ts","sourceRoot":"","sources":["../src/wu-done-rebase.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"wu-done-rebase.d.ts","sourceRoot":"","sources":["../src/wu-done-rebase.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAwRrE;;;;;;;;;;GAUG;AACH,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,UAAU,EAClB,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED;;;;;;;GAOG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAwCjD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA8J/C"}
|
package/dist/wu-done-rebase.js
CHANGED
|
@@ -16,8 +16,9 @@
|
|
|
16
16
|
import path from 'node:path';
|
|
17
17
|
import { appendFile, readFile, writeFile } from 'node:fs/promises';
|
|
18
18
|
import { createGitForPath } from './git-adapter.js';
|
|
19
|
-
import {
|
|
19
|
+
import { LOG_PREFIX, EMOJI, COMMIT_FORMATS, GIT_COMMANDS, LUMENFLOW_PATHS, ENV_VARS, } from './wu-constants.js';
|
|
20
20
|
import { REBASE } from './wu-done-messages.js';
|
|
21
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
21
22
|
import { WU_EVENTS_FILE_NAME } from './wu-state-store.js';
|
|
22
23
|
import { validateWUEvent } from './wu-state-schema.js';
|
|
23
24
|
import { WU_BRIEF_EVIDENCE_NOTE_PREFIX } from './wu-event-sourcer.js';
|
|
@@ -314,7 +315,8 @@ export async function autoResolveAppendOnlyConflicts(gitCwd, worktreePath) {
|
|
|
314
315
|
* @returns {Promise<{success: boolean, error?: string}>} Rebase result
|
|
315
316
|
*/
|
|
316
317
|
export async function autoRebaseBranch(branch, worktreePath, wuId) {
|
|
317
|
-
|
|
318
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
319
|
+
console.log(REBASE.STARTING(branch, integrationTarget.mainBranch));
|
|
318
320
|
// WU-1541: Use explicit baseDir instead of process.chdir for git operations
|
|
319
321
|
const gitWorktree = createGitForPath(worktreePath);
|
|
320
322
|
const previousEditor = process.env[ENV_VARS.GIT_EDITOR];
|
|
@@ -322,11 +324,11 @@ export async function autoRebaseBranch(branch, worktreePath, wuId) {
|
|
|
322
324
|
let preservedWuBriefEvidence = null;
|
|
323
325
|
try {
|
|
324
326
|
// Fetch latest main (using worktree git context)
|
|
325
|
-
await gitWorktree.fetch(
|
|
327
|
+
await gitWorktree.fetch(integrationTarget.remote, integrationTarget.mainBranch);
|
|
326
328
|
preservedWuBriefEvidence = await preserveWuBriefEvidenceBeforeRebase(gitWorktree, worktreePath);
|
|
327
329
|
// Attempt rebase
|
|
328
330
|
try {
|
|
329
|
-
await gitWorktree.rebase(
|
|
331
|
+
await gitWorktree.rebase(integrationTarget.trackingRef);
|
|
330
332
|
}
|
|
331
333
|
catch (rebaseError) {
|
|
332
334
|
// WU-1749 Bug 3: Check if conflicts are in append-only files that can be auto-resolved
|
|
@@ -383,14 +385,14 @@ export async function autoRebaseBranch(branch, worktreePath, wuId) {
|
|
|
383
385
|
// A rebase can pull generated docs changes from main that need regeneration and/or formatting.
|
|
384
386
|
if (wuId) {
|
|
385
387
|
const docsResult = await maybeRegenerateAndStageDocs({
|
|
386
|
-
baseBranch:
|
|
388
|
+
baseBranch: integrationTarget.trackingRef,
|
|
387
389
|
repoRoot: worktreePath,
|
|
388
390
|
});
|
|
389
391
|
if (!docsResult.regenerated) {
|
|
390
392
|
const changedDocOutputs = await gitWorktree.raw([
|
|
391
393
|
'diff',
|
|
392
394
|
'--name-only',
|
|
393
|
-
`${
|
|
395
|
+
`${integrationTarget.trackingRef}...HEAD`,
|
|
394
396
|
'--',
|
|
395
397
|
...DOC_OUTPUT_FILES,
|
|
396
398
|
]);
|
|
@@ -413,7 +415,7 @@ export async function autoRebaseBranch(branch, worktreePath, wuId) {
|
|
|
413
415
|
}
|
|
414
416
|
}
|
|
415
417
|
// Force-push lane branch with lease (safe force push)
|
|
416
|
-
await gitWorktree.raw(['push', '--force-with-lease',
|
|
418
|
+
await gitWorktree.raw(['push', '--force-with-lease', integrationTarget.remote, branch]);
|
|
417
419
|
console.log(REBASE.SUCCESS);
|
|
418
420
|
return { success: true };
|
|
419
421
|
}
|
|
@@ -431,7 +433,7 @@ export async function autoRebaseBranch(branch, worktreePath, wuId) {
|
|
|
431
433
|
await restoreWuBriefEvidenceAfterRebase(preservedWuBriefEvidence);
|
|
432
434
|
return {
|
|
433
435
|
success: false,
|
|
434
|
-
error: REBASE.MANUAL_FIX(worktreePath,
|
|
436
|
+
error: REBASE.MANUAL_FIX(worktreePath, integrationTarget.remote, integrationTarget.mainBranch, branch),
|
|
435
437
|
};
|
|
436
438
|
}
|
|
437
439
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-rebase.js","sourceRoot":"","sources":["../src/wu-done-rebase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wu-done-rebase.js","sourceRoot":"","sources":["../src/wu-done-rebase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-retry-helpers.d.ts","sourceRoot":"","sources":["../src/wu-done-retry-helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wu-done-retry-helpers.d.ts","sourceRoot":"","sources":["../src/wu-done-retry-helpers.ts"],"names":[],"mappings":"AA2BA;;;uDAGuD;AACvD,UAAU,qBAAqB;IAC7B,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QAAE,GAAG,CAAC,EAAE,aAAa,CAAC;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACjE,SAAS,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,aAAa,CAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,oEAAoE;AACpE,UAAU,gBAAgB;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAaD;;;;;;;;;;;GAWG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,qBAAqB,mBAkClC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,+BAA+B;IAC9C,yDAAyD;IACzD,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,qBAAqB,EACjC,OAAO,GAAE,+BAAoC;;;GAoD9C;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,qBAAqB;;GAqB9F;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,gCAAgC;IAC/C,uBAAuB;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,qBAAqB,EACjC,OAAO,GAAE,gCAAqC;;;GA+E/C"}
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
*/
|
|
14
14
|
import { LOG_PREFIX, EMOJI, GIT, GIT_COMMANDS, GIT_FLAGS, GIT_REFS, STRING_LITERALS, } from './wu-constants.js';
|
|
15
15
|
import { createError, ErrorCodes } from './error-handler.js';
|
|
16
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
16
17
|
/**
|
|
17
18
|
* Regex to match wu:done completion commit messages
|
|
18
19
|
* Format: wu(<id>): done - <title>
|
|
@@ -126,21 +127,22 @@ export async function prepareRecoveryWithSquash(wuId, gitAdapter) {
|
|
|
126
127
|
}
|
|
127
128
|
export async function handleParallelCompletions(wuId, doc, gitAdapter, options = {}) {
|
|
128
129
|
const { worktreePath, autoRebase = true } = options;
|
|
129
|
-
|
|
130
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
131
|
+
// Fetch latest from the configured remote
|
|
130
132
|
await gitAdapter.fetch?.();
|
|
131
|
-
// Get current
|
|
132
|
-
const currentMainSha = await gitAdapter.getCommitHash?.(
|
|
133
|
+
// Get current integration-branch SHA
|
|
134
|
+
const currentMainSha = await gitAdapter.getCommitHash?.(integrationTarget.trackingRef);
|
|
133
135
|
// Get baseline SHA from when WU was claimed
|
|
134
136
|
const baselineSha = doc.baseline_main_sha;
|
|
135
137
|
if (!baselineSha || currentMainSha === baselineSha) {
|
|
136
|
-
// No parallel completions -
|
|
138
|
+
// No parallel completions - integration branch hasn't changed since claim
|
|
137
139
|
return { parallelDetected: false, rebaseTriggered: false };
|
|
138
140
|
}
|
|
139
141
|
// Check if changes since baseline include other WU completions
|
|
140
142
|
const newCommits = await gitAdapter.raw?.([
|
|
141
143
|
'log',
|
|
142
144
|
'--oneline',
|
|
143
|
-
`${baselineSha}..${
|
|
145
|
+
`${baselineSha}..${integrationTarget.trackingRef}`,
|
|
144
146
|
'--',
|
|
145
147
|
]);
|
|
146
148
|
const hasParallelCompletions = newCommits && newCommits.trim() && COMPLETION_COMMIT_PATTERN.test(newCommits);
|
|
@@ -149,19 +151,19 @@ export async function handleParallelCompletions(wuId, doc, gitAdapter, options =
|
|
|
149
151
|
return { parallelDetected: false, rebaseTriggered: false };
|
|
150
152
|
}
|
|
151
153
|
// Parallel completions detected
|
|
152
|
-
console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Parallel completion(s) detected on
|
|
154
|
+
console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Parallel completion(s) detected on ${integrationTarget.mainBranch} since WU claim`);
|
|
153
155
|
if (!autoRebase) {
|
|
154
|
-
throw createError(ErrorCodes.VALIDATION_ERROR, `Parallel completions detected on
|
|
156
|
+
throw createError(ErrorCodes.VALIDATION_ERROR, `Parallel completions detected on ${integrationTarget.mainBranch} since ${wuId} was claimed.\n` +
|
|
155
157
|
`This would cause merge conflicts during wu:done.\n\n` +
|
|
156
|
-
`Fix: Run 'git fetch
|
|
158
|
+
`Fix: Run 'git fetch ${integrationTarget.remote} && git rebase ${integrationTarget.trackingRef}' in your worktree,\n` +
|
|
157
159
|
`then retry wu:done.\n\n` +
|
|
158
160
|
`Or use --no-auto-rebase to disable this check (not recommended).`, { wuId, baselineSha, currentMainSha });
|
|
159
161
|
}
|
|
160
162
|
// Trigger auto-rebase
|
|
161
163
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Triggering auto-rebase to incorporate parallel completions...`);
|
|
162
164
|
try {
|
|
163
|
-
// Rebase the current branch onto
|
|
164
|
-
await gitAdapter.rebase?.(
|
|
165
|
+
// Rebase the current branch onto the integration tracking ref
|
|
166
|
+
await gitAdapter.rebase?.(integrationTarget.trackingRef);
|
|
165
167
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Auto-rebase complete - parallel completions incorporated`);
|
|
166
168
|
return { parallelDetected: true, rebaseTriggered: true };
|
|
167
169
|
}
|
|
@@ -170,7 +172,7 @@ export async function handleParallelCompletions(wuId, doc, gitAdapter, options =
|
|
|
170
172
|
throw createError(ErrorCodes.GIT_ERROR, `Auto-rebase failed: ${errorMessage}\n\n` +
|
|
171
173
|
`Manual resolution required:\n` +
|
|
172
174
|
`1. cd ${worktreePath || 'your-worktree'}\n` +
|
|
173
|
-
`2. git fetch
|
|
175
|
+
`2. git fetch ${integrationTarget.remote} && git rebase ${integrationTarget.trackingRef}\n` +
|
|
174
176
|
`3. Resolve conflicts if any\n` +
|
|
175
177
|
`4. Retry wu:done`, { wuId, originalError: errorMessage });
|
|
176
178
|
}
|