@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-cleanup.js
CHANGED
|
@@ -12,22 +12,62 @@ import { getCleanupInstallConfig, CLEANUP_INSTALL_TIMEOUT_MS } from './cleanup-i
|
|
|
12
12
|
import { createValidationError } from './wu-done-errors.js';
|
|
13
13
|
import { defaultWorktreeFrom, defaultBranchFrom, branchExists } from './wu-done-paths.js';
|
|
14
14
|
import { isBranchAlreadyMerged } from './wu-done-branch-utils.js';
|
|
15
|
-
import {
|
|
15
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
16
|
+
import { CLAIMED_MODES, EMOJI, LOG_PREFIX } from './wu-constants.js';
|
|
16
17
|
import { exec as execCallback } from 'node:child_process';
|
|
17
18
|
import { promisify } from 'node:util';
|
|
18
19
|
const execAsync = promisify(execCallback);
|
|
20
|
+
function isNonTestTypeScriptPath(filePath) {
|
|
21
|
+
return (filePath.endsWith('.ts') &&
|
|
22
|
+
!filePath.includes('/__tests__/') &&
|
|
23
|
+
!filePath.endsWith('.test.ts') &&
|
|
24
|
+
!filePath.endsWith('.spec.ts'));
|
|
25
|
+
}
|
|
26
|
+
function isCliOrCoreSourcePath(filePath) {
|
|
27
|
+
return ((filePath.startsWith('packages/@lumenflow/cli/src/') ||
|
|
28
|
+
filePath.startsWith('packages/@lumenflow/core/src/')) &&
|
|
29
|
+
isNonTestTypeScriptPath(filePath));
|
|
30
|
+
}
|
|
31
|
+
function isPackSourcePath(filePath) {
|
|
32
|
+
const segments = filePath.split('/');
|
|
33
|
+
return (segments[0] === 'packages' &&
|
|
34
|
+
segments[1] === '@lumenflow' &&
|
|
35
|
+
segments[2] === 'packs' &&
|
|
36
|
+
typeof segments[3] === 'string' &&
|
|
37
|
+
segments[3].length > 0 &&
|
|
38
|
+
segments[4] === 'src' &&
|
|
39
|
+
isNonTestTypeScriptPath(filePath));
|
|
40
|
+
}
|
|
41
|
+
function isExportSensitivePackageJsonPath(filePath) {
|
|
42
|
+
if (filePath === 'packages/@lumenflow/cli/package.json' ||
|
|
43
|
+
filePath === 'packages/@lumenflow/core/package.json') {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
const segments = filePath.split('/');
|
|
47
|
+
return (segments[0] === 'packages' &&
|
|
48
|
+
segments[1] === '@lumenflow' &&
|
|
49
|
+
segments[2] === 'packs' &&
|
|
50
|
+
typeof segments[3] === 'string' &&
|
|
51
|
+
segments[3].length > 0 &&
|
|
52
|
+
segments[4] === 'package.json' &&
|
|
53
|
+
segments.length === 5);
|
|
54
|
+
}
|
|
19
55
|
/**
|
|
20
|
-
* WU-2572
|
|
21
|
-
*
|
|
22
|
-
*
|
|
56
|
+
* WU-2572 + WU-2723: Detect export-sensitive sources whose compiled output is
|
|
57
|
+
* required by the `pnpm release`/`pnpm lumenflow:*` commands invoked against
|
|
58
|
+
* the main checkout after `wu:done`.
|
|
23
59
|
*
|
|
24
|
-
*
|
|
25
|
-
* `packages/@lumenflow/
|
|
26
|
-
*
|
|
27
|
-
*
|
|
60
|
+
* This includes:
|
|
61
|
+
* - non-test .ts files under `packages/@lumenflow/cli/src`
|
|
62
|
+
* - non-test .ts files under `packages/@lumenflow/core/src`
|
|
63
|
+
* - non-test .ts files under `packages/@lumenflow/packs/<pack>/src`
|
|
64
|
+
* - `package.json` export surfaces for cli/core and pack packages
|
|
28
65
|
*/
|
|
29
|
-
|
|
30
|
-
|
|
66
|
+
function isExportSensitivePath(filePath) {
|
|
67
|
+
return (isCliOrCoreSourcePath(filePath) ||
|
|
68
|
+
isPackSourcePath(filePath) ||
|
|
69
|
+
isExportSensitivePackageJsonPath(filePath));
|
|
70
|
+
}
|
|
31
71
|
export async function cliSourceChangedSinceBaseline(docMain) {
|
|
32
72
|
const git = getGitForCwd();
|
|
33
73
|
const baseline = typeof docMain?.baseline_main_sha === 'string' && docMain.baseline_main_sha.length > 0
|
|
@@ -36,7 +76,11 @@ export async function cliSourceChangedSinceBaseline(docMain) {
|
|
|
36
76
|
const range = baseline ? `${baseline}..HEAD` : 'HEAD~1..HEAD';
|
|
37
77
|
try {
|
|
38
78
|
const output = await git.raw(['diff', range, '--name-only']);
|
|
39
|
-
return
|
|
79
|
+
return output
|
|
80
|
+
.split('\n')
|
|
81
|
+
.map((line) => line.trim())
|
|
82
|
+
.filter((line) => line.length > 0)
|
|
83
|
+
.some(isExportSensitivePath);
|
|
40
84
|
}
|
|
41
85
|
catch {
|
|
42
86
|
// Fail-safe: on git error, skip the rebuild hint. wu:done proceeds
|
|
@@ -151,14 +195,13 @@ async function runCleanupInternal(docMain, args, worktreePath) {
|
|
|
151
195
|
: `pnpm install failed: ${installErr.message}`;
|
|
152
196
|
console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} ${errorMsg}`);
|
|
153
197
|
}
|
|
154
|
-
// WU-2572: Rebuild
|
|
155
|
-
//
|
|
156
|
-
// so without this step a follow-on
|
|
157
|
-
// dist-backed CLI command)
|
|
158
|
-
//
|
|
159
|
-
// merged but dist/release.js on main was still the pre-fix bytes.
|
|
198
|
+
// WU-2572 + WU-2723: Rebuild @lumenflow packages when the merged
|
|
199
|
+
// commits touched export-sensitive CLI/core/pack surfaces.
|
|
200
|
+
// Reinstalling does not rebuild, so without this step a follow-on
|
|
201
|
+
// `pnpm release` (or any other dist-backed CLI command) can run with
|
|
202
|
+
// stale compiled output or stale package export surfaces.
|
|
160
203
|
if (await cliSourceChangedSinceBaseline(docMain)) {
|
|
161
|
-
console.log(`${LOG_PREFIX.DONE}
|
|
204
|
+
console.log(`${LOG_PREFIX.DONE} Export-sensitive package changes detected, rebuilding @lumenflow packages...`);
|
|
162
205
|
try {
|
|
163
206
|
const installConfig = getCleanupInstallConfig();
|
|
164
207
|
await execAsync('pnpm build', {
|
|
@@ -197,17 +240,18 @@ async function runCleanupInternal(docMain, args, worktreePath) {
|
|
|
197
240
|
*/
|
|
198
241
|
async function deleteBranchWithCleanup(laneBranch) {
|
|
199
242
|
const gitAdapter = getGitForCwd();
|
|
243
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
200
244
|
// WU-1440: Check if branch is merged before deletion
|
|
201
245
|
// Use -D (force) when confirmed merged to handle rebased branches
|
|
202
246
|
const isMerged = await isBranchAlreadyMerged(laneBranch);
|
|
203
247
|
const isMergedIntoRemoteMain = async () => {
|
|
204
248
|
try {
|
|
205
|
-
await gitAdapter.fetch(
|
|
249
|
+
await gitAdapter.fetch(integrationTarget.remote, integrationTarget.mainBranch);
|
|
206
250
|
await gitAdapter.raw([
|
|
207
251
|
'merge-base',
|
|
208
252
|
'--is-ancestor',
|
|
209
253
|
laneBranch,
|
|
210
|
-
|
|
254
|
+
integrationTarget.trackingRef,
|
|
211
255
|
]);
|
|
212
256
|
return true;
|
|
213
257
|
}
|
|
@@ -221,7 +265,7 @@ async function deleteBranchWithCleanup(laneBranch) {
|
|
|
221
265
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Deleted local branch ${laneBranch}${modeIndicator}`);
|
|
222
266
|
// Also delete remote if it exists
|
|
223
267
|
try {
|
|
224
|
-
await gitAdapter.raw(['push',
|
|
268
|
+
await gitAdapter.raw(['push', integrationTarget.remote, '--delete', laneBranch]);
|
|
225
269
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Deleted remote branch ${laneBranch}`);
|
|
226
270
|
}
|
|
227
271
|
catch (e) {
|
|
@@ -238,7 +282,7 @@ async function deleteBranchWithCleanup(laneBranch) {
|
|
|
238
282
|
if (mergedOnRemoteMain) {
|
|
239
283
|
try {
|
|
240
284
|
await gitAdapter.deleteBranch(laneBranch, { force: true });
|
|
241
|
-
console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Deleted local branch ${laneBranch} (force: merged on
|
|
285
|
+
console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Deleted local branch ${laneBranch} (force: merged on ${integrationTarget.trackingRef})`);
|
|
242
286
|
return;
|
|
243
287
|
}
|
|
244
288
|
catch (forceErr) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-cleanup.js","sourceRoot":"","sources":["../src/wu-done-cleanup.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wu-done-cleanup.js","sourceRoot":"","sources":["../src/wu-done-cleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-concurrent-merge.d.ts","sourceRoot":"","sources":["../src/wu-done-concurrent-merge.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,YAAY,EAAuB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"wu-done-concurrent-merge.d.ts","sourceRoot":"","sources":["../src/wu-done-concurrent-merge.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,YAAY,EAAuB,MAAM,qBAAqB,CAAC;AAiBxE;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsBrE;AA8FD;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,CAAC,CAgBvB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CA0BxF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,kCAAkC,CACtD,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,CA+BjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iCAAiC,CACrD,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAsCjB;AAED;;;;;;;;;GASG;AACH,wBAAsB,mCAAmC,CACvD,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA6CzD"}
|
|
@@ -20,9 +20,9 @@ import { validateWUEvent } from './wu-state-schema.js';
|
|
|
20
20
|
import { generateBacklog, generateStatus } from './backlog-generator.js';
|
|
21
21
|
import { getStateStoreDirFromBacklog } from './wu-paths.js';
|
|
22
22
|
import { getGitForCwd } from './git-adapter.js';
|
|
23
|
-
import {
|
|
23
|
+
import { LUMENFLOW_PATHS, WU_STATUS } from './wu-constants.js';
|
|
24
24
|
import { createError, ErrorCodes } from './error-handler.js';
|
|
25
|
-
|
|
25
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
26
26
|
/**
|
|
27
27
|
* Creates a unique key for an event to detect duplicates.
|
|
28
28
|
* Events are considered identical if they have the same type, wuId, and timestamp.
|
|
@@ -41,9 +41,10 @@ function getEventKey(event) {
|
|
|
41
41
|
export async function fetchMainEventsContent() {
|
|
42
42
|
try {
|
|
43
43
|
const git = getGitForCwd();
|
|
44
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
44
45
|
// First, fetch to ensure we have the latest main
|
|
45
46
|
try {
|
|
46
|
-
await git.fetch(
|
|
47
|
+
await git.fetch(integrationTarget.remote, integrationTarget.mainBranch);
|
|
47
48
|
}
|
|
48
49
|
catch {
|
|
49
50
|
// If fetch fails (e.g., offline), continue with cached version
|
|
@@ -51,7 +52,7 @@ export async function fetchMainEventsContent() {
|
|
|
51
52
|
}
|
|
52
53
|
// Try to read wu-events.jsonl from origin/main
|
|
53
54
|
const eventsPath = `${LUMENFLOW_PATHS.STATE_DIR}/${WU_EVENTS_FILE_NAME}`;
|
|
54
|
-
const content = await git.raw(['show', `${
|
|
55
|
+
const content = await git.raw(['show', `${integrationTarget.trackingRef}:${eventsPath}`]);
|
|
55
56
|
return content;
|
|
56
57
|
}
|
|
57
58
|
catch (error) {
|
|
@@ -243,9 +244,10 @@ export async function getMergedEventsContent(worktreeStateDir, mainStateDir, wuI
|
|
|
243
244
|
export async function mergeWithMainState(worktreeStateDir) {
|
|
244
245
|
// Load worktree events
|
|
245
246
|
const worktreeEvents = loadEventsFromDir(worktreeStateDir, 'worktree');
|
|
247
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
246
248
|
// Try to fetch main events via git show
|
|
247
249
|
const mainContent = await fetchMainEventsContent();
|
|
248
|
-
const mainEvents = mainContent ? parseEventsFile(mainContent,
|
|
250
|
+
const mainEvents = mainContent ? parseEventsFile(mainContent, integrationTarget.trackingRef) : [];
|
|
249
251
|
if (mainEvents.length > 0) {
|
|
250
252
|
console.log(`[wu-done] Merging state: ${worktreeEvents.length} worktree events + ${mainEvents.length} main events`);
|
|
251
253
|
}
|
|
@@ -344,11 +346,12 @@ export async function computeStatusContentWithMainMerge(backlogPath, wuId, mainS
|
|
|
344
346
|
*/
|
|
345
347
|
export async function computeWUEventsContentWithMainMerge(backlogPath, wuId) {
|
|
346
348
|
const worktreeStateDir = getStateStoreDirFromBacklog(backlogPath);
|
|
349
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
347
350
|
// Load worktree events
|
|
348
351
|
const worktreeEvents = loadEventsFromDir(worktreeStateDir, 'worktree');
|
|
349
352
|
// Try to fetch main events via git show
|
|
350
353
|
const mainContent = await fetchMainEventsContent();
|
|
351
|
-
const mainEvents = mainContent ? parseEventsFile(mainContent,
|
|
354
|
+
const mainEvents = mainContent ? parseEventsFile(mainContent, integrationTarget.trackingRef) : [];
|
|
352
355
|
// Merge events
|
|
353
356
|
const mergedEvents = mergeEvents(mainEvents, worktreeEvents);
|
|
354
357
|
// Check if WU is already done
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-concurrent-merge.js","sourceRoot":"","sources":["../src/wu-done-concurrent-merge.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAgB,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wu-done-concurrent-merge.js","sourceRoot":"","sources":["../src/wu-done-concurrent-merge.ts"],"names":[],"mappings":"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"}
|
package/dist/wu-done-errors.d.ts
CHANGED
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Create a validation error for wu:done validators.
|
|
4
4
|
*/
|
|
5
|
-
export declare function createValidationError(message: string, details?: {}): import("
|
|
5
|
+
export declare function createValidationError(message: string, details?: {}): import("@lumenflow/kernel/primitives/error-handler").WUError;
|
|
6
6
|
/**
|
|
7
7
|
* Create a file-not-found error for wu:done validators.
|
|
8
8
|
*/
|
|
9
|
-
export declare function createFileNotFoundError(message: string, details?: {}): import("
|
|
9
|
+
export declare function createFileNotFoundError(message: string, details?: {}): import("@lumenflow/kernel/primitives/error-handler").WUError;
|
|
10
10
|
/**
|
|
11
11
|
* Create a recovery error for wu:done recovery flows.
|
|
12
12
|
*/
|
|
13
|
-
export declare function createRecoveryError(message: string, details?: {}): import("
|
|
13
|
+
export declare function createRecoveryError(message: string, details?: {}): import("@lumenflow/kernel/primitives/error-handler").WUError;
|
|
14
14
|
//# sourceMappingURL=wu-done-errors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-errors.d.ts","sourceRoot":"","sources":["../src/wu-done-errors.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"wu-done-errors.d.ts","sourceRoot":"","sources":["../src/wu-done-errors.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,gEAElE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,gEAEpE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,gEAEhE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-inputs.d.ts","sourceRoot":"","sources":["../src/wu-done-inputs.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE;;;
|
|
1
|
+
{"version":3,"file":"wu-done-inputs.d.ts","sourceRoot":"","sources":["../src/wu-done-inputs.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE;;;EAkD5C"}
|
package/dist/wu-done-inputs.js
CHANGED
|
@@ -15,6 +15,9 @@ export function validateInputs(argv) {
|
|
|
15
15
|
const args = parseWUArgs(argv);
|
|
16
16
|
if (args.help || !args.id) {
|
|
17
17
|
console.log('Usage: pnpm wu:done --id WU-334 [OPTIONS]\n\n' +
|
|
18
|
+
'Gate scope: when tests.unit is declared, wu:done reuses the same scoped unit-test surface\n' +
|
|
19
|
+
'that wu:prep validated. Use --skip-gates only for genuine pre-existing main regressions that\n' +
|
|
20
|
+
'already have a fix WU.\n\n' +
|
|
18
21
|
'Options:\n' +
|
|
19
22
|
' --worktree <path> Override worktree path (default: worktrees/<lane>-<wu-id>)\n' +
|
|
20
23
|
' --no-auto Skip auto-updating YAML/backlog/status (you staged manually)\n' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-inputs.js","sourceRoot":"","sources":["../src/wu-done-inputs.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAc;IAC3C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CACT,+CAA+C;YAC7C,YAAY;YACZ,oFAAoF;YACpF,sFAAsF;YACtF,+CAA+C;YAC/C,+DAA+D;YAC/D,gFAAgF;YAChF,2EAA2E;YAC3E,mEAAmE;YACnE,qEAAqE;YACrE,gFAAgF;YAChF,wEAAwE;YACxE,sFAAsF;YACtF,0FAA0F;YAC1F,+EAA+E;YAC/E,8EAA8E;YAC9E,4EAA4E;YAC5E,qGAAqG;YACrG,oFAAoF;YACpF,0CAA0C;YAC1C,2BAA2B;YAC3B,iCAAiC;YACjC,8EAA8E;YAC9E,4EAA4E;YAC5E,8CAA8C;YAC9C,gEAAgE;YAChE,2EAA2E;YAC3E,oBAAoB;YACpB,yCAAyC;YACzC,6EAA6E;YAC7E,kEAAkE;YAClE,gFAAgF,CACnF,CAAC;QACF,MAAM,IAAI,gBAAgB,CACxB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,4BAA4B,EAC3D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAClD,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;IACjC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAAE,GAAG,CAAC,kBAAkB,IAAI,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAExF,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC"}
|
|
1
|
+
{"version":3,"file":"wu-done-inputs.js","sourceRoot":"","sources":["../src/wu-done-inputs.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAc;IAC3C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CACT,+CAA+C;YAC7C,6FAA6F;YAC7F,gGAAgG;YAChG,4BAA4B;YAC5B,YAAY;YACZ,oFAAoF;YACpF,sFAAsF;YACtF,+CAA+C;YAC/C,+DAA+D;YAC/D,gFAAgF;YAChF,2EAA2E;YAC3E,mEAAmE;YACnE,qEAAqE;YACrE,gFAAgF;YAChF,wEAAwE;YACxE,sFAAsF;YACtF,0FAA0F;YAC1F,+EAA+E;YAC/E,8EAA8E;YAC9E,4EAA4E;YAC5E,qGAAqG;YACrG,oFAAoF;YACpF,0CAA0C;YAC1C,2BAA2B;YAC3B,iCAAiC;YACjC,8EAA8E;YAC9E,4EAA4E;YAC5E,8CAA8C;YAC9C,gEAAgE;YAChE,2EAA2E;YAC3E,oBAAoB;YACpB,yCAAyC;YACzC,6EAA6E;YAC7E,kEAAkE;YAClE,gFAAgF,CACnF,CAAC;QACF,MAAM,IAAI,gBAAgB,CACxB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,4BAA4B,EAC3D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAClD,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;IACjC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAAE,GAAG,CAAC,kBAAkB,IAAI,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAExF,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-merge-phase.d.ts","sourceRoot":"","sources":["../src/wu-done-merge-phase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wu-done-merge-phase.d.ts","sourceRoot":"","sources":["../src/wu-done-merge-phase.ts"],"names":[],"mappings":"AAkCA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,YAAY;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,eAAe;IACf,KAAK,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,kDAAkD;IAClD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,wBAAwB;IACxB,IAAI,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oCAAoC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,+BAA+B;IAC/B,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6FzF"}
|
|
@@ -12,11 +12,12 @@
|
|
|
12
12
|
* Functions:
|
|
13
13
|
* executeMergePhase - Run the merge/PR decision logic after worktree commit
|
|
14
14
|
*/
|
|
15
|
-
import {
|
|
15
|
+
import { THRESHOLDS, LOG_PREFIX, BOX } from './wu-constants.js';
|
|
16
16
|
import { PREFLIGHT, MERGE } from './wu-done-messages.js';
|
|
17
17
|
import { getDriftLevel, DRIFT_LEVELS } from './branch-drift.js';
|
|
18
18
|
import { createError, ErrorCodes } from './error-handler.js';
|
|
19
19
|
import { isPRModeEnabled, createPR, ensurePRCreated, printPRCreatedMessage } from './wu-done-pr.js';
|
|
20
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
20
21
|
import { isBranchAlreadyMerged } from './wu-done-branch-utils.js';
|
|
21
22
|
import { branchExists } from './wu-done-validators.js';
|
|
22
23
|
import { withMergeLock } from './merge-lock.js';
|
|
@@ -115,7 +116,8 @@ export async function executeMergePhase(ctx) {
|
|
|
115
116
|
});
|
|
116
117
|
console.log(MERGE.ATOMIC_SUCCESS);
|
|
117
118
|
merged = true;
|
|
118
|
-
|
|
119
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
120
|
+
console.log(MERGE.PUSHED(integrationTarget.remote, integrationTarget.mainBranch));
|
|
119
121
|
}
|
|
120
122
|
}
|
|
121
123
|
return { merged, prUrl, prModeEnabled };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-merge-phase.js","sourceRoot":"","sources":["../src/wu-done-merge-phase.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wu-done-merge-phase.js","sourceRoot":"","sources":["../src/wu-done-merge-phase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-merge.d.ts","sourceRoot":"","sources":["../src/wu-done-merge.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AAEH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"wu-done-merge.d.ts","sourceRoot":"","sources":["../src/wu-done-merge.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AAEH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQjE;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CAalB;AAED;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,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;IACrB,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,IAAI,CAAC,CA8Ff"}
|
package/dist/wu-done-merge.js
CHANGED
|
@@ -11,11 +11,12 @@
|
|
|
11
11
|
* mergeLaneBranch - Merge lane branch to main with retry
|
|
12
12
|
*/
|
|
13
13
|
import { getGitForCwd } from './git-adapter.js';
|
|
14
|
-
import {
|
|
14
|
+
import { LOG_PREFIX, EMOJI, GIT_COMMANDS, GIT_FLAGS } from './wu-constants.js';
|
|
15
15
|
import { MERGE } from './wu-done-messages.js';
|
|
16
16
|
import { createError, ErrorCodes, getErrorMessage } from './error-handler.js';
|
|
17
17
|
import { withRetry, createRetryConfig } from './retry-strategy.js';
|
|
18
18
|
import { autoRebaseBranch } from './wu-done-rebase.js';
|
|
19
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
19
20
|
/**
|
|
20
21
|
* Check if main is an ancestor of the given branch.
|
|
21
22
|
*
|
|
@@ -24,8 +25,14 @@ import { autoRebaseBranch } from './wu-done-rebase.js';
|
|
|
24
25
|
* @returns True if main is an ancestor of branch
|
|
25
26
|
*/
|
|
26
27
|
export async function isMainAncestorOfBranch(gitAdapter, branch) {
|
|
28
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
27
29
|
try {
|
|
28
|
-
await gitAdapter.raw([
|
|
30
|
+
await gitAdapter.raw([
|
|
31
|
+
GIT_COMMANDS.MERGE_BASE,
|
|
32
|
+
GIT_FLAGS.IS_ANCESTOR,
|
|
33
|
+
integrationTarget.mainBranch,
|
|
34
|
+
branch,
|
|
35
|
+
]);
|
|
29
36
|
return true;
|
|
30
37
|
}
|
|
31
38
|
catch {
|
|
@@ -44,6 +51,7 @@ export async function isMainAncestorOfBranch(gitAdapter, branch) {
|
|
|
44
51
|
*/
|
|
45
52
|
export async function mergeLaneBranch(branch, options = {}) {
|
|
46
53
|
const gitAdapter = getGitForCwd();
|
|
54
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
47
55
|
console.log(MERGE.BRANCH_MERGE(branch));
|
|
48
56
|
// WU-1747: Use exponential backoff retry for merge operations
|
|
49
57
|
// WU-1749 Bug 2: Now rebases lane branch on retry instead of just pulling main
|
|
@@ -71,10 +79,10 @@ export async function mergeLaneBranch(branch, options = {}) {
|
|
|
71
79
|
GIT_COMMANDS.PULL,
|
|
72
80
|
GIT_FLAGS.REBASE,
|
|
73
81
|
'--autostash',
|
|
74
|
-
|
|
75
|
-
|
|
82
|
+
integrationTarget.remote,
|
|
83
|
+
integrationTarget.mainBranch,
|
|
76
84
|
]);
|
|
77
|
-
console.log(MERGE.UPDATED_MAIN(
|
|
85
|
+
console.log(MERGE.UPDATED_MAIN(integrationTarget.remote));
|
|
78
86
|
}
|
|
79
87
|
catch (pullErr) {
|
|
80
88
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Pull also failed: ${getErrorMessage(pullErr)}`);
|
|
@@ -89,10 +97,10 @@ export async function mergeLaneBranch(branch, options = {}) {
|
|
|
89
97
|
GIT_COMMANDS.PULL,
|
|
90
98
|
GIT_FLAGS.REBASE,
|
|
91
99
|
'--autostash',
|
|
92
|
-
|
|
93
|
-
|
|
100
|
+
integrationTarget.remote,
|
|
101
|
+
integrationTarget.mainBranch,
|
|
94
102
|
]);
|
|
95
|
-
console.log(MERGE.UPDATED_MAIN(
|
|
103
|
+
console.log(MERGE.UPDATED_MAIN(integrationTarget.remote));
|
|
96
104
|
}
|
|
97
105
|
catch (pullErr) {
|
|
98
106
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Pull failed: ${getErrorMessage(pullErr)} - will retry anyway`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-merge.js","sourceRoot":"","sources":["../src/wu-done-merge.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;GASG;AAEH,OAAO,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wu-done-merge.js","sourceRoot":"","sources":["../src/wu-done-merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-merged-worktree.d.ts","sourceRoot":"","sources":["../src/wu-done-merged-worktree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wu-done-merged-worktree.d.ts","sourceRoot":"","sources":["../src/wu-done-merged-worktree.ts"],"names":[],"mappings":"AA4CA,MAAM,WAAW,4BAA4B;IAC3C,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,4BAA4B;IAC3C,iEAAiE;IACjE,MAAM,EAAE,OAAO,CAAC;IAChB,2CAA2C;IAC3C,YAAY,EAAE,OAAO,CAAC;IACtB,oDAAoD;IACpD,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,oBAAoB;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,mCAAmC;IACnC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,6BAA6B;IAC5C,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,cAAc,EAAE,OAAO,CAAC;IACxB,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAMD;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAoEvC;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,6BAA6B,CAAC,CAoFxC"}
|
|
@@ -29,10 +29,12 @@ import { getGitForCwd } from './git-adapter.js';
|
|
|
29
29
|
import { createStamp } from './stamp-utils.js';
|
|
30
30
|
import { readWU, writeWU } from './wu-yaml.js';
|
|
31
31
|
import { WU_PATHS } from './wu-paths.js';
|
|
32
|
+
import { applyDoneStateToWUDoc } from './wu-transaction-collectors.js';
|
|
32
33
|
import { moveWUToDoneBacklog } from './wu-backlog-updater.js';
|
|
33
34
|
import { updateStatusRemoveInProgress, addToStatusCompleted } from './wu-status-updater.js';
|
|
34
|
-
import {
|
|
35
|
+
import { LOG_PREFIX, EMOJI } from './wu-constants.js';
|
|
35
36
|
import { getErrorMessage } from './error-handler.js';
|
|
37
|
+
import { resolveIntegrationTarget } from './integration-target.js';
|
|
36
38
|
// ──────────────────────────────────────────────
|
|
37
39
|
// Detection
|
|
38
40
|
// ──────────────────────────────────────────────
|
|
@@ -56,10 +58,11 @@ export async function detectAlreadyMergedNoWorktree(params) {
|
|
|
56
58
|
try {
|
|
57
59
|
// Check if branch still exists
|
|
58
60
|
const branchStillExists = await gitAdapter.branchExists(laneBranch);
|
|
61
|
+
const integrationTarget = resolveIntegrationTarget();
|
|
59
62
|
if (branchStillExists) {
|
|
60
63
|
// Branch exists: check if tip === merge-base (fully merged)
|
|
61
64
|
const branchTip = (await gitAdapter.getCommitHash(laneBranch)).trim();
|
|
62
|
-
const mergeBase = (await gitAdapter.mergeBase(
|
|
65
|
+
const mergeBase = (await gitAdapter.mergeBase(integrationTarget.mainBranch, laneBranch)).trim();
|
|
63
66
|
const isMerged = branchTip === mergeBase;
|
|
64
67
|
return {
|
|
65
68
|
merged: isMerged,
|
|
@@ -78,7 +81,7 @@ export async function detectAlreadyMergedNoWorktree(params) {
|
|
|
78
81
|
'--grep',
|
|
79
82
|
params.wuId,
|
|
80
83
|
'-1',
|
|
81
|
-
|
|
84
|
+
integrationTarget.mainBranch,
|
|
82
85
|
]);
|
|
83
86
|
const commitFound = logOutput.trim().length > 0;
|
|
84
87
|
return {
|
|
@@ -151,11 +154,7 @@ export async function executeAlreadyMergedCompletion(params) {
|
|
|
151
154
|
const wuPath = WU_PATHS.WU(id);
|
|
152
155
|
const doc = readWU(wuPath, id);
|
|
153
156
|
if (doc && typeof doc === 'object') {
|
|
154
|
-
const updatedDoc = {
|
|
155
|
-
...doc,
|
|
156
|
-
status: WU_STATUS.DONE,
|
|
157
|
-
completed_at: new Date().toISOString().split('T')[0],
|
|
158
|
-
};
|
|
157
|
+
const updatedDoc = applyDoneStateToWUDoc({ ...doc });
|
|
159
158
|
writeWU(wuPath, updatedDoc);
|
|
160
159
|
yamlUpdated = true;
|
|
161
160
|
console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Updated WU YAML status to done`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-merged-worktree.js","sourceRoot":"","sources":["../src/wu-done-merged-worktree.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wu-done-merged-worktree.js","sourceRoot":"","sources":["../src/wu-done-merged-worktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wu-done-messages.d.ts","sourceRoot":"","sources":["../src/wu-done-messages.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"wu-done-messages.d.ts","sourceRoot":"","sources":["../src/wu-done-messages.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAS,MAAM,mBAAmB,CAAC;AAItD,OAAO,EAAE,UAAU,EAAE,CAAC;AActB;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;2BAYI,OAAO,KAAG,MAAM;;;;CAKxC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ;oBACH,MAAM,KAAG,MAAM;;0BAET,MAAM,SAAS,OAAO,KAAG,MAAM;;CAGtD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM;4BACO,MAAM,KAAG,MAAM;6BAEd,MAAM,KAAG,MAAM;4BAEhB,MAAM,SAAS,OAAO,KAAG,MAAM;kCAEzB,OAAO,KAAG,MAAM;;CAG/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU;yBACA,MAAM,SAAS,MAAM,KAAG,MAAM;;CAGpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;+BACA,OAAO,KAAG,MAAM;CAE5C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM;uBACE,MAAM,cAAc,MAAM,KAAG,MAAM;;oBAGtC,OAAO,KAAG,MAAM;;+BAGL,MAAM,UAAU,MAAM,cAAc,MAAM,UAAU,MAAM,KAAG,MAAM;CAS/F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;mCAEW,MAAM,aAAa,MAAM,KAAG,MAAM;uCAG9B,MAAM,KAAG,MAAM;0CAEZ,MAAM,KAAG,MAAM;uCAElB,MAAM,KAAG,MAAM;;;;;0BAM5B,MAAM,aAAa,MAAM,aAAa,MAAM,YAAY,MAAM,KAAG,MAAM;oCAMhF,MAAM,aACN,MAAM,UACT,MAAM,cACF,MAAM,KACjB,MAAM;oCAUM,MAAM,UACX,MAAM,cACF,MAAM,UACV,MAAM,KACb,MAAM;8BAWC,MAAM,eACF,MAAM,KACjB,MAAM;oCAUuB,MAAM,KAAG,MAAM;;;uCAKZ,MAAM,KAAG,MAAM;;4CAOV,MAAM,EAAE,KAAG,MAAM;;CAY1D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK;wBACI,MAAM,KAAG,MAAM;2BAEZ,MAAM,KAAG,MAAM;sBAEpB,MAAM,KAAG,MAAM;;;2BAIV,MAAM,KAAG,MAAM;qBAErB,MAAM,cAAc,MAAM,KAAG,MAAM;6BAG1C,MAAM,cACF,OAAO,aACR,OAAO,WACV,MAAM,eACF,MAAM,KACjB,MAAM;gCAUC,MAAM,iBACC,OAAO,eACV,MAAM,KACjB,MAAM;2CAQC,MAAM,iBACC,OAAO,eACV,MAAM,KACjB,MAAM;CAOV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
|