@rpamis/comet 0.4.3 → 0.4.5
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/README.md +372 -332
- package/assets/manifest.json +1 -1
- package/assets/skills/comet/scripts/comet-archive.mjs +113 -97
- package/assets/skills/comet/scripts/comet-check.mjs +117 -104
- package/assets/skills/comet/scripts/comet-entry-runtime.mjs +59 -59
- package/assets/skills/comet/scripts/comet-guard.mjs +170 -157
- package/assets/skills/comet/scripts/comet-handoff.mjs +110 -97
- package/assets/skills/comet/scripts/comet-hook-guard.mjs +110 -97
- package/assets/skills/comet/scripts/comet-hook-router.mjs +272 -153
- package/assets/skills/comet/scripts/comet-intent.mjs +31 -31
- package/assets/skills/comet/scripts/comet-resume-probe.mjs +104 -91
- package/assets/skills/comet/scripts/comet-runtime.mjs +311 -296
- package/assets/skills/comet/scripts/comet-state.mjs +221 -207
- package/assets/skills/comet/scripts/comet-yaml-validate.mjs +25 -25
- package/assets/skills/comet-archive/SKILL.md +13 -9
- package/assets/skills/comet-build/SKILL.md +4 -6
- package/assets/skills/comet-classic/SKILL.md +1 -1
- package/assets/skills/comet-classic/reference/scripts.md +9 -1
- package/assets/skills/comet-design/SKILL.md +0 -2
- package/assets/skills/comet-hotfix/SKILL.md +1 -3
- package/assets/skills/comet-native/SKILL.md +8 -7
- package/assets/skills/comet-native/reference/artifacts.md +51 -7
- package/assets/skills/comet-native/reference/clarification.md +5 -5
- package/assets/skills/comet-native/reference/commands.md +15 -13
- package/assets/skills/comet-native/reference/recovery.md +3 -3
- package/assets/skills/comet-native/reference/workspace.md +10 -4
- package/assets/skills/comet-native/scripts/comet-native-archive.mjs +257 -169
- package/assets/skills/comet-native/scripts/comet-native-doctor.mjs +238 -153
- package/assets/skills/comet-native/scripts/comet-native-hook-guard.mjs +241 -124
- package/assets/skills/comet-native/scripts/comet-native-init.mjs +189 -108
- package/assets/skills/comet-native/scripts/comet-native-new.mjs +220 -139
- package/assets/skills/comet-native/scripts/comet-native-next.mjs +245 -160
- package/assets/skills/comet-native/scripts/comet-native-root.mjs +210 -129
- package/assets/skills/comet-native/scripts/comet-native-runtime.mjs +284 -196
- package/assets/skills/comet-native/scripts/comet-native-select.mjs +212 -128
- package/assets/skills/comet-native/scripts/comet-native-show.mjs +207 -126
- package/assets/skills/comet-native/scripts/comet-native-spec.mjs +203 -118
- package/assets/skills/comet-native/scripts/comet-native-status.mjs +208 -124
- package/assets/skills/comet-open/SKILL.md +0 -2
- package/assets/skills/comet-tweak/SKILL.md +1 -1
- package/assets/skills/comet-verify/SKILL.md +0 -2
- package/assets/skills-zh/comet-archive/SKILL.md +13 -9
- package/assets/skills-zh/comet-build/SKILL.md +4 -6
- package/assets/skills-zh/comet-classic/SKILL.md +1 -1
- package/assets/skills-zh/comet-classic/reference/scripts.md +9 -1
- package/assets/skills-zh/comet-design/SKILL.md +0 -2
- package/assets/skills-zh/comet-hotfix/SKILL.md +1 -3
- package/assets/skills-zh/comet-native/SKILL.md +8 -7
- package/assets/skills-zh/comet-native/reference/artifacts.md +51 -7
- package/assets/skills-zh/comet-native/reference/clarification.md +5 -5
- package/assets/skills-zh/comet-native/reference/commands.md +16 -10
- package/assets/skills-zh/comet-native/reference/recovery.md +3 -3
- package/assets/skills-zh/comet-native/reference/workspace.md +10 -4
- package/assets/skills-zh/comet-open/SKILL.md +0 -2
- package/assets/skills-zh/comet-tweak/SKILL.md +1 -1
- package/assets/skills-zh/comet-verify/SKILL.md +0 -2
- package/bin/comet-daemon-router.js +23 -7
- package/bin/fast-runtime-router.js +1 -1
- package/dist/app/cli/index.js +1 -0
- package/dist/app/cli/index.js.map +1 -1
- package/dist/app/commands/daemon-server.d.ts.map +1 -1
- package/dist/app/commands/daemon-server.js +13 -2
- package/dist/app/commands/daemon-server.js.map +1 -1
- package/dist/app/commands/doctor.d.ts.map +1 -1
- package/dist/app/commands/doctor.js +17 -10
- package/dist/app/commands/doctor.js.map +1 -1
- package/dist/app/commands/i18n.d.ts +1 -1
- package/dist/app/commands/i18n.d.ts.map +1 -1
- package/dist/app/commands/i18n.js +4 -0
- package/dist/app/commands/i18n.js.map +1 -1
- package/dist/app/commands/project-knowledge.d.ts +2 -0
- package/dist/app/commands/project-knowledge.d.ts.map +1 -1
- package/dist/app/commands/project-knowledge.js +64 -7
- package/dist/app/commands/project-knowledge.js.map +1 -1
- package/dist/app/commands/uninstall.d.ts +1 -0
- package/dist/app/commands/uninstall.d.ts.map +1 -1
- package/dist/app/commands/uninstall.js +65 -10
- package/dist/app/commands/uninstall.js.map +1 -1
- package/dist/domains/agent-learning/coordinator.d.ts +8 -1
- package/dist/domains/agent-learning/coordinator.d.ts.map +1 -1
- package/dist/domains/agent-learning/coordinator.js +58 -0
- package/dist/domains/agent-learning/coordinator.js.map +1 -1
- package/dist/domains/agent-learning/experience-journal.d.ts +21 -1
- package/dist/domains/agent-learning/experience-journal.d.ts.map +1 -1
- package/dist/domains/agent-learning/experience-journal.js +190 -11
- package/dist/domains/agent-learning/experience-journal.js.map +1 -1
- package/dist/domains/bundle/bundle-platform.d.ts.map +1 -1
- package/dist/domains/bundle/bundle-platform.js +6 -1
- package/dist/domains/bundle/bundle-platform.js.map +1 -1
- package/dist/domains/comet-classic/classic-archive-entry.d.ts +1 -1
- package/dist/domains/comet-classic/classic-archive-entry.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-archive-entry.js +5 -2
- package/dist/domains/comet-classic/classic-archive-entry.js.map +1 -1
- package/dist/domains/comet-classic/classic-archive.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-archive.js +5 -1
- package/dist/domains/comet-classic/classic-archive.js.map +1 -1
- package/dist/domains/comet-classic/classic-branch-binding.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-branch-binding.js +5 -4
- package/dist/domains/comet-classic/classic-branch-binding.js.map +1 -1
- package/dist/domains/comet-classic/classic-check-entry.d.ts +1 -1
- package/dist/domains/comet-classic/classic-check-entry.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-check-entry.js +5 -2
- package/dist/domains/comet-classic/classic-check-entry.js.map +1 -1
- package/dist/domains/comet-classic/classic-check-snapshot.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-check-snapshot.js +68 -26
- package/dist/domains/comet-classic/classic-check-snapshot.js.map +1 -1
- package/dist/domains/comet-classic/classic-design-readiness.d.ts +1 -1
- package/dist/domains/comet-classic/classic-guard-entry.d.ts +1 -1
- package/dist/domains/comet-classic/classic-guard-entry.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-guard-entry.js +5 -2
- package/dist/domains/comet-classic/classic-guard-entry.js.map +1 -1
- package/dist/domains/comet-classic/classic-handoff-entry.d.ts +1 -1
- package/dist/domains/comet-classic/classic-handoff-entry.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-handoff-entry.js +5 -2
- package/dist/domains/comet-classic/classic-handoff-entry.js.map +1 -1
- package/dist/domains/comet-classic/classic-progress.d.ts +60 -2
- package/dist/domains/comet-classic/classic-progress.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-progress.js +199 -22
- package/dist/domains/comet-classic/classic-progress.js.map +1 -1
- package/dist/domains/comet-classic/classic-recovery.d.ts +20 -1
- package/dist/domains/comet-classic/classic-recovery.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-resume-probe.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-resume-probe.js +3 -2
- package/dist/domains/comet-classic/classic-resume-probe.js.map +1 -1
- package/dist/domains/comet-classic/classic-script-entry.d.ts +3 -1
- package/dist/domains/comet-classic/classic-script-entry.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-script-entry.js +34 -3
- package/dist/domains/comet-classic/classic-script-entry.js.map +1 -1
- package/dist/domains/comet-classic/classic-state-command.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-state-command.js +3 -2
- package/dist/domains/comet-classic/classic-state-command.js.map +1 -1
- package/dist/domains/comet-classic/classic-state-entry.d.ts +1 -1
- package/dist/domains/comet-classic/classic-state-entry.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-state-entry.js +5 -2
- package/dist/domains/comet-classic/classic-state-entry.js.map +1 -1
- package/dist/domains/comet-classic/classic-store.d.ts.map +1 -1
- package/dist/domains/comet-classic/classic-store.js +67 -1
- package/dist/domains/comet-classic/classic-store.js.map +1 -1
- package/dist/domains/comet-entry/resume-probe.d.ts.map +1 -1
- package/dist/domains/comet-entry/resume-probe.js +3 -2
- package/dist/domains/comet-entry/resume-probe.js.map +1 -1
- package/dist/domains/comet-native/native-acceptance.d.ts +5 -1
- package/dist/domains/comet-native/native-acceptance.d.ts.map +1 -1
- package/dist/domains/comet-native/native-acceptance.js +13 -2
- package/dist/domains/comet-native/native-acceptance.js.map +1 -1
- package/dist/domains/comet-native/native-archive-command.d.ts.map +1 -1
- package/dist/domains/comet-native/native-archive-command.js +167 -37
- package/dist/domains/comet-native/native-archive-command.js.map +1 -1
- package/dist/domains/comet-native/native-artifact-language.d.ts +10 -1
- package/dist/domains/comet-native/native-artifact-language.d.ts.map +1 -1
- package/dist/domains/comet-native/native-artifact-language.js +65 -12
- package/dist/domains/comet-native/native-artifact-language.js.map +1 -1
- package/dist/domains/comet-native/native-artifacts.d.ts +10 -1
- package/dist/domains/comet-native/native-artifacts.d.ts.map +1 -1
- package/dist/domains/comet-native/native-artifacts.js +130 -21
- package/dist/domains/comet-native/native-artifacts.js.map +1 -1
- package/dist/domains/comet-native/native-builder-acceptance-review.d.ts +16 -0
- package/dist/domains/comet-native/native-builder-acceptance-review.d.ts.map +1 -0
- package/dist/domains/comet-native/native-builder-acceptance-review.js +65 -0
- package/dist/domains/comet-native/native-builder-acceptance-review.js.map +1 -0
- package/dist/domains/comet-native/native-cli-help.d.ts.map +1 -1
- package/dist/domains/comet-native/native-cli-help.js +8 -4
- package/dist/domains/comet-native/native-cli-help.js.map +1 -1
- package/dist/domains/comet-native/native-cli-shared.d.ts +4 -2
- package/dist/domains/comet-native/native-cli-shared.d.ts.map +1 -1
- package/dist/domains/comet-native/native-cli-shared.js +37 -9
- package/dist/domains/comet-native/native-cli-shared.js.map +1 -1
- package/dist/domains/comet-native/native-cli.d.ts +4 -1
- package/dist/domains/comet-native/native-cli.d.ts.map +1 -1
- package/dist/domains/comet-native/native-cli.js +9 -5
- package/dist/domains/comet-native/native-cli.js.map +1 -1
- package/dist/domains/comet-native/native-doctor-command.d.ts.map +1 -1
- package/dist/domains/comet-native/native-doctor-command.js +144 -3
- package/dist/domains/comet-native/native-doctor-command.js.map +1 -1
- package/dist/domains/comet-native/native-git-provenance.d.ts.map +1 -1
- package/dist/domains/comet-native/native-git-provenance.js +3 -2
- package/dist/domains/comet-native/native-git-provenance.js.map +1 -1
- package/dist/domains/comet-native/native-hook-guard.d.ts.map +1 -1
- package/dist/domains/comet-native/native-hook-guard.js +57 -26
- package/dist/domains/comet-native/native-hook-guard.js.map +1 -1
- package/dist/domains/comet-native/native-local-execution.d.ts +1 -0
- package/dist/domains/comet-native/native-local-execution.d.ts.map +1 -1
- package/dist/domains/comet-native/native-local-execution.js +7 -0
- package/dist/domains/comet-native/native-local-execution.js.map +1 -1
- package/dist/domains/comet-native/native-lock.d.ts.map +1 -1
- package/dist/domains/comet-native/native-lock.js +12 -0
- package/dist/domains/comet-native/native-lock.js.map +1 -1
- package/dist/domains/comet-native/native-loop-runtime.d.ts +2 -0
- package/dist/domains/comet-native/native-loop-runtime.d.ts.map +1 -1
- package/dist/domains/comet-native/native-loop-runtime.js +6 -0
- package/dist/domains/comet-native/native-loop-runtime.js.map +1 -1
- package/dist/domains/comet-native/native-next-command.d.ts.map +1 -1
- package/dist/domains/comet-native/native-next-command.js +57 -28
- package/dist/domains/comet-native/native-next-command.js.map +1 -1
- package/dist/domains/comet-native/native-output-language.d.ts.map +1 -1
- package/dist/domains/comet-native/native-output-language.js +7 -0
- package/dist/domains/comet-native/native-output-language.js.map +1 -1
- package/dist/domains/comet-native/native-portable-acceptance.d.ts +2 -0
- package/dist/domains/comet-native/native-portable-acceptance.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-acceptance.js +11 -1
- package/dist/domains/comet-native/native-portable-acceptance.js.map +1 -1
- package/dist/domains/comet-native/native-portable-archive.d.ts +1 -0
- package/dist/domains/comet-native/native-portable-archive.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-archive.js +3 -0
- package/dist/domains/comet-native/native-portable-archive.js.map +1 -1
- package/dist/domains/comet-native/native-portable-checks.d.ts +14 -4
- package/dist/domains/comet-native/native-portable-checks.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-checks.js +159 -60
- package/dist/domains/comet-native/native-portable-checks.js.map +1 -1
- package/dist/domains/comet-native/native-portable-continuation.d.ts +2 -1
- package/dist/domains/comet-native/native-portable-continuation.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-continuation.js +121 -39
- package/dist/domains/comet-native/native-portable-continuation.js.map +1 -1
- package/dist/domains/comet-native/native-portable-requirements.d.ts +1 -0
- package/dist/domains/comet-native/native-portable-requirements.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-requirements.js +68 -18
- package/dist/domains/comet-native/native-portable-requirements.js.map +1 -1
- package/dist/domains/comet-native/native-portable-shape-coordination.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-shape-coordination.js +18 -5
- package/dist/domains/comet-native/native-portable-shape-coordination.js.map +1 -1
- package/dist/domains/comet-native/native-portable-state.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-state.js +12 -3
- package/dist/domains/comet-native/native-portable-state.js.map +1 -1
- package/dist/domains/comet-native/native-portable-status.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-status.js +10 -4
- package/dist/domains/comet-native/native-portable-status.js.map +1 -1
- package/dist/domains/comet-native/native-portable-types.d.ts +2 -1
- package/dist/domains/comet-native/native-portable-types.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-types.js.map +1 -1
- package/dist/domains/comet-native/native-portable-verification.d.ts +3 -0
- package/dist/domains/comet-native/native-portable-verification.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-verification.js +28 -35
- package/dist/domains/comet-native/native-portable-verification.js.map +1 -1
- package/dist/domains/comet-native/native-portable-verifier-coordination.d.ts +2 -0
- package/dist/domains/comet-native/native-portable-verifier-coordination.d.ts.map +1 -1
- package/dist/domains/comet-native/native-portable-verifier-coordination.js +9 -0
- package/dist/domains/comet-native/native-portable-verifier-coordination.js.map +1 -1
- package/dist/domains/comet-native/native-runner-input-artifacts.d.ts +9 -0
- package/dist/domains/comet-native/native-runner-input-artifacts.d.ts.map +1 -0
- package/dist/domains/comet-native/native-runner-input-artifacts.js +102 -0
- package/dist/domains/comet-native/native-runner-input-artifacts.js.map +1 -0
- package/dist/domains/comet-native/native-runner-input.d.ts +90 -64
- package/dist/domains/comet-native/native-runner-input.d.ts.map +1 -1
- package/dist/domains/comet-native/native-runner-input.js +107 -22
- package/dist/domains/comet-native/native-runner-input.js.map +1 -1
- package/dist/domains/comet-native/native-script-entry.d.ts.map +1 -1
- package/dist/domains/comet-native/native-script-entry.js +9 -3
- package/dist/domains/comet-native/native-script-entry.js.map +1 -1
- package/dist/domains/comet-native/native-snapshot.d.ts.map +1 -1
- package/dist/domains/comet-native/native-snapshot.js +7 -2
- package/dist/domains/comet-native/native-snapshot.js.map +1 -1
- package/dist/domains/comet-native/native-verification-receipt-runtime.d.ts.map +1 -1
- package/dist/domains/comet-native/native-verification-receipt-runtime.js +5 -4
- package/dist/domains/comet-native/native-verification-receipt-runtime.js.map +1 -1
- package/dist/domains/comet-native/native-workspace-finish.d.ts +26 -0
- package/dist/domains/comet-native/native-workspace-finish.d.ts.map +1 -1
- package/dist/domains/comet-native/native-workspace-finish.js +520 -15
- package/dist/domains/comet-native/native-workspace-finish.js.map +1 -1
- package/dist/domains/comet-plugin/integration.d.ts +1 -0
- package/dist/domains/comet-plugin/integration.d.ts.map +1 -1
- package/dist/domains/comet-plugin/integration.js +20 -10
- package/dist/domains/comet-plugin/integration.js.map +1 -1
- package/dist/domains/comet-plugin/plugin-runtime.d.ts +8 -2
- package/dist/domains/comet-plugin/plugin-runtime.d.ts.map +1 -1
- package/dist/domains/comet-plugin/plugin-runtime.js +18 -4
- package/dist/domains/comet-plugin/plugin-runtime.js.map +1 -1
- package/dist/domains/dashboard/project-directory.d.ts +4 -0
- package/dist/domains/dashboard/project-directory.d.ts.map +1 -1
- package/dist/domains/dashboard/project-directory.js +30 -2
- package/dist/domains/dashboard/project-directory.js.map +1 -1
- package/dist/domains/dashboard/server.d.ts.map +1 -1
- package/dist/domains/dashboard/server.js +28 -3
- package/dist/domains/dashboard/server.js.map +1 -1
- package/dist/domains/dashboard/web/assets/{abnfDiagram-VCTEODGH-qlcciI25.js → abnfDiagram-VCTEODGH-m9_t3fwH.js} +1 -1
- package/dist/domains/dashboard/web/assets/{arc-KVm4k9kp.js → arc-CDiwRrMg.js} +1 -1
- package/dist/domains/dashboard/web/assets/architecture-7GRP2DOG-ypJOsR2Y.js +1 -0
- package/dist/domains/dashboard/web/assets/{architectureDiagram-5GKGNRK7-C366RdBK.js → architectureDiagram-5GKGNRK7-Xwj-hlQB.js} +1 -1
- package/dist/domains/dashboard/web/assets/{blockDiagram-I7D4REHJ-DAuTc2OO.js → blockDiagram-I7D4REHJ-Cme6qNK_.js} +1 -1
- package/dist/domains/dashboard/web/assets/{c4Diagram-7LVT6UL2-CFB0RZmL.js → c4Diagram-7LVT6UL2-Cxs1dU7y.js} +1 -1
- package/dist/domains/dashboard/web/assets/channel-BFTjR7Ng.js +1 -0
- package/dist/domains/dashboard/web/assets/{chunk-4HAMMTFA-DTV6lyGQ.js → chunk-4HAMMTFA-DBQykIWE.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-75Z2AOVW-DgJm4cEX.js → chunk-75Z2AOVW-Dh-E6TAx.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-DU6HZSFF-NAtcgGZr.js → chunk-DU6HZSFF-W3lPaoVP.js} +2 -2
- package/dist/domains/dashboard/web/assets/{chunk-F27PBJKO-BcFXHZMJ.js → chunk-F27PBJKO-dzf1fpYi.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-GMAD6QVW-wNemar9b.js → chunk-GMAD6QVW-CeuSGVHV.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-GVQU2GXP-BiVCDO9d.js → chunk-GVQU2GXP-BrGrIBgk.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-IMKFNOWR-D9GDj4b6.js → chunk-IMKFNOWR-DXiTC1Xo.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-L3NEJ4N5-DkPl5vac.js → chunk-L3NEJ4N5-DnyD3Ocj.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-OSK3NFVY-RbbxGqtJ.js → chunk-OSK3NFVY-6vxhPm51.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-P2QGCYS3-B9_X57eT.js → chunk-P2QGCYS3-DChNsVqO.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-POPQ4Y6H-DE4bOH0D.js → chunk-POPQ4Y6H-RBgha6dE.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-PWAF6VOD-Bo-W1iA1.js → chunk-PWAF6VOD-CayoKmnh.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-SHT3W25Y-BhLxs4rZ.js → chunk-SHT3W25Y-sOkLJZoB.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-SVP7TREG-BCXfn8uF.js → chunk-SVP7TREG-j0QRwmsq.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-TICWLB2K-DqSBgE5L.js → chunk-TICWLB2K-D7Re_d_T.js} +1 -1
- package/dist/domains/dashboard/web/assets/{chunk-XXDRQBXY-Dbkt1xEZ.js → chunk-XXDRQBXY-BFV70fKF.js} +1 -1
- package/dist/domains/dashboard/web/assets/classDiagram-ZZMXUADV-gDSLbV2K.js +1 -0
- package/dist/domains/dashboard/web/assets/classDiagram-v2-VYDZK3BY-gDSLbV2K.js +1 -0
- package/dist/domains/dashboard/web/assets/{cose-bilkent-JH36ORCC-DrwNpMyX.js → cose-bilkent-JH36ORCC-k7gqx2Br.js} +1 -1
- package/dist/domains/dashboard/web/assets/{cynefin-OW5HDTMX-BbDlivxs.js → cynefin-OW5HDTMX-CWI6FZT8.js} +1 -1
- package/dist/domains/dashboard/web/assets/{cynefinDiagram-5FMLGOSQ-DmLmRN42.js → cynefinDiagram-5FMLGOSQ-D-O3RrOu.js} +1 -1
- package/dist/domains/dashboard/web/assets/{dagre-GXQ25YYZ-Cgm5DNgI.js → dagre-GXQ25YYZ-BR1jxWfn.js} +1 -1
- package/dist/domains/dashboard/web/assets/{diagram-S7CK7UJ4-Bnht1X2m.js → diagram-S7CK7UJ4-B6gXFYBj.js} +1 -1
- package/dist/domains/dashboard/web/assets/{diagram-UQ7AKVKN-LELTI4PR.js → diagram-UQ7AKVKN-BBW6aRk8.js} +1 -1
- package/dist/domains/dashboard/web/assets/{diagram-VSXAHHWV-Do0fZuNG.js → diagram-VSXAHHWV-BC0CZeyH.js} +1 -1
- package/dist/domains/dashboard/web/assets/{diagram-VX7I27RA-B0rZTUwt.js → diagram-VX7I27RA-BmwBIkwS.js} +1 -1
- package/dist/domains/dashboard/web/assets/{diagram-Z3DM3KII-wn8xCc_j.js → diagram-Z3DM3KII-DTZgX9SF.js} +1 -1
- package/dist/domains/dashboard/web/assets/{dist-CYwDKy2m.js → dist-brXLwleg.js} +1 -1
- package/dist/domains/dashboard/web/assets/{ebnfDiagram-PWID7BFC-CMDOpP2T.js → ebnfDiagram-PWID7BFC-CsMXo0C6.js} +1 -1
- package/dist/domains/dashboard/web/assets/{erDiagram-RLTQ6QDP-C2d43bdq.js → erDiagram-RLTQ6QDP-DQ9ewX94.js} +1 -1
- package/dist/domains/dashboard/web/assets/{es-BzaOcXwu.js → es-CgcAhzLf.js} +1 -1
- package/dist/domains/dashboard/web/assets/eventmodeling-NTZA5JFV-Ll12Q19y.js +1 -0
- package/dist/domains/dashboard/web/assets/flowDiagram-HODETNUW-Bf2-9XUn.js +1 -0
- package/dist/domains/dashboard/web/assets/{ganttDiagram-EL5Y4UJY-hTH7TzhY.js → ganttDiagram-EL5Y4UJY-DIFkXe6G.js} +1 -1
- package/dist/domains/dashboard/web/assets/{gitGraph-4MIJSDKK-C3CCywb-.js → gitGraph-4MIJSDKK-BHY8ZnpE.js} +1 -1
- package/dist/domains/dashboard/web/assets/{gitGraphDiagram-WWUBYQGX-DW6jDckj.js → gitGraphDiagram-WWUBYQGX-cBn9dMzs.js} +1 -1
- package/dist/domains/dashboard/web/assets/{index-CTZPz_mx.js → index-C_6nf1Fw.js} +3 -3
- package/dist/domains/dashboard/web/assets/{index-CWNqBYyI.css → index-Gaxnq6Jd.css} +1 -1
- package/dist/domains/dashboard/web/assets/{info-A6RAGUB7-Bg3eKis8.js → info-A6RAGUB7-DtUaS9jN.js} +1 -1
- package/dist/domains/dashboard/web/assets/{infoDiagram-27XIBGKW-7zk6ytVJ.js → infoDiagram-27XIBGKW-CIl0e_EN.js} +1 -1
- package/dist/domains/dashboard/web/assets/{ishikawaDiagram-5VMMS53U-CGDCTmCQ.js → ishikawaDiagram-5VMMS53U-DAdtPZ_c.js} +1 -1
- package/dist/domains/dashboard/web/assets/{journeyDiagram-3NMN7TZE-C8_L_e8a.js → journeyDiagram-3NMN7TZE-CBokRgde.js} +1 -1
- package/dist/domains/dashboard/web/assets/{kanban-definition-UXKFOSKX-D5x6qTgM.js → kanban-definition-UXKFOSKX-DrqCYJ-7.js} +1 -1
- package/dist/domains/dashboard/web/assets/katex-D29apahB.js +257 -0
- package/dist/domains/dashboard/web/assets/{line-DC93oja4.js → line-BDlVqlh4.js} +1 -1
- package/dist/domains/dashboard/web/assets/{linear-81TNubkB.js → linear-DTAzui9x.js} +1 -1
- package/dist/domains/dashboard/web/assets/{mermaid-parser.core-D60d8uy9.js → mermaid-parser.core-CFw-xbYY.js} +3 -3
- package/dist/domains/dashboard/web/assets/{mermaid.core-l4Wgjz2Q.js → mermaid.core-Ck7fB8UD.js} +4 -4
- package/dist/domains/dashboard/web/assets/{mindmap-definition-YA3MSWOX-Dfqu1201.js → mindmap-definition-YA3MSWOX-C7kb9KL9.js} +1 -1
- package/dist/domains/dashboard/web/assets/{packet-AYTQ26CC-CsFZBhTs.js → packet-AYTQ26CC-P8Mtt0tp.js} +1 -1
- package/dist/domains/dashboard/web/assets/{pegDiagram-XKGWAZYB-myFMaA7n.js → pegDiagram-XKGWAZYB-DUDD9qv5.js} +1 -1
- package/dist/domains/dashboard/web/assets/{pie-WAS4IAKB-FMuCTNSk.js → pie-WAS4IAKB-dEmLxiDR.js} +1 -1
- package/dist/domains/dashboard/web/assets/{pieDiagram-E7YTZNPT-CSR4B4Z1.js → pieDiagram-E7YTZNPT-BUssAcqk.js} +1 -1
- package/dist/domains/dashboard/web/assets/purify.es-Bvo9QlJ8.js +3 -0
- package/dist/domains/dashboard/web/assets/{quadrantDiagram-AXDQQJYC-BiE4kEeP.js → quadrantDiagram-AXDQQJYC-BzaAWdQL.js} +1 -1
- package/dist/domains/dashboard/web/assets/{radar-RG4KPBEZ-BZ-n7JtG.js → radar-RG4KPBEZ-mqtvaz9w.js} +1 -1
- package/dist/domains/dashboard/web/assets/{railroad-74A4TZTK-CWVtRfHu.js → railroad-74A4TZTK-7tTnGpoz.js} +1 -1
- package/dist/domains/dashboard/web/assets/railroad-abnf-HS5TGJTU-CpJvyBJM.js +1 -0
- package/dist/domains/dashboard/web/assets/railroad-ebnf-LZEXJU2U-BJ5g77l6.js +1 -0
- package/dist/domains/dashboard/web/assets/railroad-peg-WCYAUIDC-BslCK-Gr.js +1 -0
- package/dist/domains/dashboard/web/assets/{railroadDiagram-O6MQD6OU-CBj7v1de.js → railroadDiagram-O6MQD6OU-DM1AKXm0.js} +1 -1
- package/dist/domains/dashboard/web/assets/{requirementDiagram-BXWQKSXE-DSDgb54n.js → requirementDiagram-BXWQKSXE--H5KiPSc.js} +1 -1
- package/dist/domains/dashboard/web/assets/{sankeyDiagram-P5KCCOFB-1-oXLUAP.js → sankeyDiagram-P5KCCOFB-JweUq_u2.js} +1 -1
- package/dist/domains/dashboard/web/assets/{sequenceDiagram-WJ2MYXX4-DAF4nGs_.js → sequenceDiagram-WJ2MYXX4-pxb1iTGb.js} +1 -1
- package/dist/domains/dashboard/web/assets/{src-CTWLVUqE.js → src-joFOxopw.js} +1 -1
- package/dist/domains/dashboard/web/assets/{stateDiagram-D77RDMKH-DzENBaJT.js → stateDiagram-D77RDMKH-CDu5crd8.js} +1 -1
- package/dist/domains/dashboard/web/assets/stateDiagram-v2-MP3YSRHH-wV5AqWaM.js +1 -0
- package/dist/domains/dashboard/web/assets/{swimlanes-42K2YHIH-CnxFUZJc.js → swimlanes-42K2YHIH-ioSqowJ4.js} +1 -1
- package/dist/domains/dashboard/web/assets/swimlanesDiagram-VR7AAH4N-DOPLn-V5.js +8 -0
- package/dist/domains/dashboard/web/assets/{timeline-definition-24CTP7MA-KtvPzpZM.js → timeline-definition-24CTP7MA-2YXSYkS3.js} +1 -1
- package/dist/domains/dashboard/web/assets/{treeView-Q6P3EWNA-Bdu3P9iY.js → treeView-Q6P3EWNA-DEGims38.js} +1 -1
- package/dist/domains/dashboard/web/assets/{treemap-WGGIJYW6-DFnn23JR.js → treemap-WGGIJYW6-CJvBhTlR.js} +1 -1
- package/dist/domains/dashboard/web/assets/{vennDiagram-4TSXK5OY-BjpviP26.js → vennDiagram-4TSXK5OY-CHdNWhBK.js} +1 -1
- package/dist/domains/dashboard/web/assets/{wardley-WFR3VGLG-CEo4a-j4.js → wardley-WFR3VGLG-CVO9PCjo.js} +1 -1
- package/dist/domains/dashboard/web/assets/{wardleyDiagram-VM6X3IG4-Bf54n6im.js → wardleyDiagram-VM6X3IG4-RToPmij6.js} +1 -1
- package/dist/domains/dashboard/web/assets/{xychartDiagram-S5SC5T6Z-CU-hI0Cm.js → xychartDiagram-S5SC5T6Z-DaWHnpHE.js} +1 -1
- package/dist/domains/dashboard/web/index.html +2 -2
- package/dist/domains/project-knowledge/host-review.d.ts +15 -2
- package/dist/domains/project-knowledge/host-review.d.ts.map +1 -1
- package/dist/domains/project-knowledge/host-review.js +65 -25
- package/dist/domains/project-knowledge/host-review.js.map +1 -1
- package/dist/domains/project-knowledge/index.d.ts +1 -0
- package/dist/domains/project-knowledge/index.d.ts.map +1 -1
- package/dist/domains/project-knowledge/index.js +1 -0
- package/dist/domains/project-knowledge/index.js.map +1 -1
- package/dist/domains/project-knowledge/learning.d.ts +2 -1
- package/dist/domains/project-knowledge/learning.d.ts.map +1 -1
- package/dist/domains/project-knowledge/learning.js +6 -0
- package/dist/domains/project-knowledge/learning.js.map +1 -1
- package/dist/domains/project-knowledge/plugin.d.ts.map +1 -1
- package/dist/domains/project-knowledge/plugin.js +3 -1
- package/dist/domains/project-knowledge/plugin.js.map +1 -1
- package/dist/domains/skill/dsh-adapter.d.ts +5 -1
- package/dist/domains/skill/dsh-adapter.d.ts.map +1 -1
- package/dist/domains/skill/dsh-adapter.js +222 -87
- package/dist/domains/skill/dsh-adapter.js.map +1 -1
- package/dist/domains/skill/platform-inspect.d.ts +1 -0
- package/dist/domains/skill/platform-inspect.d.ts.map +1 -1
- package/dist/domains/skill/platform-inspect.js +8 -4
- package/dist/domains/skill/platform-inspect.js.map +1 -1
- package/dist/domains/skill/platform-install.d.ts.map +1 -1
- package/dist/domains/skill/platform-install.js +7 -7
- package/dist/domains/skill/platform-install.js.map +1 -1
- package/dist/domains/workflow-contract/hook-target-scope.d.ts.map +1 -1
- package/dist/domains/workflow-contract/hook-target-scope.js +2 -1
- package/dist/domains/workflow-contract/hook-target-scope.js.map +1 -1
- package/dist/platform/fs/file-system.d.ts +2 -0
- package/dist/platform/fs/file-system.d.ts.map +1 -1
- package/dist/platform/fs/file-system.js +11 -0
- package/dist/platform/fs/file-system.js.map +1 -1
- package/dist/platform/install/dsh-profiles.d.ts +3 -0
- package/dist/platform/install/dsh-profiles.d.ts.map +1 -0
- package/dist/platform/install/dsh-profiles.js +40 -0
- package/dist/platform/install/dsh-profiles.js.map +1 -0
- package/dist/platform/install/platforms.d.ts.map +1 -1
- package/dist/platform/install/platforms.js +1 -0
- package/dist/platform/install/platforms.js.map +1 -1
- package/dist/platform/install/project-registry.d.ts +7 -1
- package/dist/platform/install/project-registry.d.ts.map +1 -1
- package/dist/platform/install/project-registry.js +49 -5
- package/dist/platform/install/project-registry.js.map +1 -1
- package/dist/platform/paths/git-worktree-cache.d.ts +3 -0
- package/dist/platform/paths/git-worktree-cache.d.ts.map +1 -0
- package/dist/platform/paths/git-worktree-cache.js +109 -0
- package/dist/platform/paths/git-worktree-cache.js.map +1 -0
- package/dist/platform/paths/git-worktree.d.ts +6 -0
- package/dist/platform/paths/git-worktree.d.ts.map +1 -1
- package/dist/platform/paths/git-worktree.js +191 -30
- package/dist/platform/paths/git-worktree.js.map +1 -1
- package/dist/platform/paths/project-worktree-root.d.ts +3 -0
- package/dist/platform/paths/project-worktree-root.d.ts.map +1 -0
- package/dist/platform/paths/project-worktree-root.js +14 -0
- package/dist/platform/paths/project-worktree-root.js.map +1 -0
- package/dist/platform/process/comet-daemon.d.ts +3 -0
- package/dist/platform/process/comet-daemon.d.ts.map +1 -1
- package/dist/platform/process/comet-daemon.js +8 -6
- package/dist/platform/process/comet-daemon.js.map +1 -1
- package/dist/platform/process/external-command.d.ts +3 -0
- package/dist/platform/process/external-command.d.ts.map +1 -1
- package/dist/platform/process/external-command.js +69 -2
- package/dist/platform/process/external-command.js.map +1 -1
- package/dist/platform/process/git.d.ts.map +1 -1
- package/dist/platform/process/git.js +3 -4
- package/dist/platform/process/git.js.map +1 -1
- package/dist/platform/process/hook-adapter.d.ts +2 -0
- package/dist/platform/process/hook-adapter.d.ts.map +1 -1
- package/dist/platform/process/hook-adapter.js +45 -3
- package/dist/platform/process/hook-adapter.js.map +1 -1
- package/dist/platform/process/hook-read-cache.d.ts +2 -0
- package/dist/platform/process/hook-read-cache.d.ts.map +1 -1
- package/dist/platform/process/hook-read-cache.js +25 -13
- package/dist/platform/process/hook-read-cache.js.map +1 -1
- package/dist/platform/process/process-identity.d.ts.map +1 -1
- package/dist/platform/process/process-identity.js +18 -51
- package/dist/platform/process/process-identity.js.map +1 -1
- package/dist/platform/process/runtime-metrics.d.ts +10 -1
- package/dist/platform/process/runtime-metrics.d.ts.map +1 -1
- package/dist/platform/process/runtime-metrics.js +37 -2
- package/dist/platform/process/runtime-metrics.js.map +1 -1
- package/dist/platform/process/windows-process-broker.d.ts +1 -0
- package/dist/platform/process/windows-process-broker.d.ts.map +1 -1
- package/dist/platform/process/windows-process-broker.js +70 -11
- package/dist/platform/process/windows-process-broker.js.map +1 -1
- package/dist/platform/process/windows-process-identity.d.ts +6 -0
- package/dist/platform/process/windows-process-identity.d.ts.map +1 -0
- package/dist/platform/process/windows-process-identity.js +190 -0
- package/dist/platform/process/windows-process-identity.js.map +1 -0
- package/eval/local/tasks/comet-classic-layout-lifecycle/environment/current-comet-package.json +11 -3
- package/eval/local/tasks/comet-native-wave-f-dashboard-readonly/environment/current-comet-package.json +11 -3
- package/eval/local/tests/scaffold/test_task_resolution.py +6 -2
- package/package.json +14 -8
- package/dist/domains/dashboard/web/assets/architecture-7GRP2DOG-QeljAKq2.js +0 -1
- package/dist/domains/dashboard/web/assets/channel-_AqwP0KA.js +0 -1
- package/dist/domains/dashboard/web/assets/classDiagram-ZZMXUADV-CRo4aB_7.js +0 -1
- package/dist/domains/dashboard/web/assets/classDiagram-v2-VYDZK3BY-CRo4aB_7.js +0 -1
- package/dist/domains/dashboard/web/assets/eventmodeling-NTZA5JFV-KYANo3DQ.js +0 -1
- package/dist/domains/dashboard/web/assets/flowDiagram-HODETNUW-CSROlLuj.js +0 -1
- package/dist/domains/dashboard/web/assets/katex-CXMH3UgJ.js +0 -257
- package/dist/domains/dashboard/web/assets/purify.es-ChwZkWde.js +0 -3
- package/dist/domains/dashboard/web/assets/railroad-abnf-HS5TGJTU-CkHwwI2i.js +0 -1
- package/dist/domains/dashboard/web/assets/railroad-ebnf-LZEXJU2U-8xzEHL6v.js +0 -1
- package/dist/domains/dashboard/web/assets/railroad-peg-WCYAUIDC-nSHBw0tH.js +0 -1
- package/dist/domains/dashboard/web/assets/stateDiagram-v2-MP3YSRHH-CNw52Fkn.js +0 -1
- package/dist/domains/dashboard/web/assets/swimlanesDiagram-VR7AAH4N-6TRvbqqI.js +0 -8
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { accessSync, constants as fsConstants, promises as fs } from 'node:fs';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import os from 'node:os';
|
|
4
5
|
import { atomicWriteJson } from './native-atomic-file.js';
|
|
6
|
+
import { readNativeStatusRecord } from './native-archived-status.js';
|
|
5
7
|
import { runExternalCommand } from '../../platform/process/external-command.js';
|
|
6
8
|
import { gitBranchRemote, gitStatusPaths, runGitCommand } from '../../platform/process/git.js';
|
|
7
9
|
import { inspectGitWorktree, listGitWorktreeRoots } from '../../platform/paths/git-worktree.js';
|
|
@@ -15,6 +17,12 @@ export const NATIVE_WORKSPACE_FINISH_JOURNAL_SCHEMA = 'comet.native.workspace-fi
|
|
|
15
17
|
const NATIVE_FINISH_NAME_SOURCE = '[a-z][a-z0-9]*(?:-[a-z0-9]+)*';
|
|
16
18
|
const NATIVE_FINISH_NAME_PATTERN = new RegExp(`^${NATIVE_FINISH_NAME_SOURCE}$`, 'u');
|
|
17
19
|
const NATIVE_FINISH_TRANSACTION_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/u;
|
|
20
|
+
const GIT_OBJECT_PATTERN = /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/u;
|
|
21
|
+
export function validateNativeWorkspaceFinishMessage(message, flag) {
|
|
22
|
+
if (!message.trim() || message.includes('\0')) {
|
|
23
|
+
throw new Error(`${flag} must contain non-whitespace text and no NUL character`);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
18
26
|
function parseNativeWorkspaceFinishJournal(value) {
|
|
19
27
|
if (!value || typeof value !== 'object' || Array.isArray(value)) {
|
|
20
28
|
throw new Error('Native workspace finish journal is invalid');
|
|
@@ -47,6 +55,53 @@ function parseNativeWorkspaceFinishJournal(value) {
|
|
|
47
55
|
throw new Error('Native workspace finish journal result is invalid');
|
|
48
56
|
}
|
|
49
57
|
}
|
|
58
|
+
if (record.plan !== undefined) {
|
|
59
|
+
const plan = record.plan;
|
|
60
|
+
if (!plan ||
|
|
61
|
+
typeof plan !== 'object' ||
|
|
62
|
+
!['keep', 'merge', 'push', 'pull-request'].includes(plan.finish) ||
|
|
63
|
+
!['current', 'branch', 'worktree'].includes(plan.isolation) ||
|
|
64
|
+
![plan.changeRoot, plan.primaryRoot].every((root) => typeof root === 'string' && path.isAbsolute(root)) ||
|
|
65
|
+
![plan.changeBranch, plan.targetBranch].every((branch) => typeof branch === 'string' && branch.length > 0) ||
|
|
66
|
+
(plan.targetRoot !== null &&
|
|
67
|
+
(typeof plan.targetRoot !== 'string' || !path.isAbsolute(plan.targetRoot))) ||
|
|
68
|
+
(plan.remote !== null && typeof plan.remote !== 'string') ||
|
|
69
|
+
typeof plan.commitMessage !== 'string' ||
|
|
70
|
+
(plan.mergeMessage !== null && typeof plan.mergeMessage !== 'string')) {
|
|
71
|
+
throw new Error('Native workspace finish journal plan is invalid');
|
|
72
|
+
}
|
|
73
|
+
validateNativeWorkspaceFinishMessage(plan.commitMessage, 'commit-message');
|
|
74
|
+
if (plan.mergeMessage !== null)
|
|
75
|
+
validateNativeWorkspaceFinishMessage(plan.mergeMessage, 'merge-message');
|
|
76
|
+
}
|
|
77
|
+
if (record.createdAt !== undefined &&
|
|
78
|
+
(typeof record.createdAt !== 'string' || !Number.isFinite(Date.parse(record.createdAt))))
|
|
79
|
+
throw new Error('Native workspace finish journal creation identity is invalid');
|
|
80
|
+
if (record.commit !== undefined) {
|
|
81
|
+
const commit = record.commit;
|
|
82
|
+
if (!commit ||
|
|
83
|
+
!GIT_OBJECT_PATTERN.test(commit.parent) ||
|
|
84
|
+
!Array.isArray(commit.paths) ||
|
|
85
|
+
!commit.paths.every((ref) => typeof ref === 'string' &&
|
|
86
|
+
ref.length > 0 &&
|
|
87
|
+
!path.posix.isAbsolute(ref) &&
|
|
88
|
+
!path.win32.isAbsolute(ref) &&
|
|
89
|
+
!ref.split('/').includes('..')) ||
|
|
90
|
+
!Array.isArray(commit.entries) ||
|
|
91
|
+
!commit.entries.every((entry) => typeof entry === 'string') ||
|
|
92
|
+
(commit.sha !== null && !GIT_OBJECT_PATTERN.test(commit.sha))) {
|
|
93
|
+
throw new Error('Native workspace finish journal commit is invalid');
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (record.merge !== undefined) {
|
|
97
|
+
const merge = record.merge;
|
|
98
|
+
if (!merge ||
|
|
99
|
+
!GIT_OBJECT_PATTERN.test(merge.target) ||
|
|
100
|
+
!GIT_OBJECT_PATTERN.test(merge.source) ||
|
|
101
|
+
(merge.sha !== null && !GIT_OBJECT_PATTERN.test(merge.sha))) {
|
|
102
|
+
throw new Error('Native workspace finish journal merge is invalid');
|
|
103
|
+
}
|
|
104
|
+
}
|
|
50
105
|
return {
|
|
51
106
|
schema: NATIVE_WORKSPACE_FINISH_JOURNAL_SCHEMA,
|
|
52
107
|
name: record.name,
|
|
@@ -55,6 +110,14 @@ function parseNativeWorkspaceFinishJournal(value) {
|
|
|
55
110
|
status: record.status,
|
|
56
111
|
result: record.result,
|
|
57
112
|
updatedAt: record.updatedAt,
|
|
113
|
+
...(record.createdAt === undefined ? {} : { createdAt: record.createdAt }),
|
|
114
|
+
...(record.plan === undefined ? {} : { plan: record.plan }),
|
|
115
|
+
...(record.commit === undefined
|
|
116
|
+
? {}
|
|
117
|
+
: { commit: record.commit }),
|
|
118
|
+
...(record.merge === undefined
|
|
119
|
+
? {}
|
|
120
|
+
: { merge: record.merge }),
|
|
58
121
|
};
|
|
59
122
|
}
|
|
60
123
|
function workspaceFinishJournalFile(paths, name) {
|
|
@@ -146,6 +209,321 @@ export async function clearNativeWorkspaceFinishJournal(paths, name) {
|
|
|
146
209
|
throw error;
|
|
147
210
|
}
|
|
148
211
|
}
|
|
212
|
+
export async function prepareNativeWorkspaceFinishMessages(options) {
|
|
213
|
+
const { plan, journal } = options;
|
|
214
|
+
const recorded = journal?.plan;
|
|
215
|
+
if (recorded) {
|
|
216
|
+
for (const key of ['finish', 'isolation', 'changeBranch', 'targetBranch', 'remote']) {
|
|
217
|
+
if (plan[key] !== recorded[key])
|
|
218
|
+
throw new Error(`Recorded Native workspace finish ${key} changed`);
|
|
219
|
+
}
|
|
220
|
+
for (const key of ['changeRoot', 'primaryRoot', 'targetRoot']) {
|
|
221
|
+
if (plan[key] !== recorded[key])
|
|
222
|
+
throw new Error(`Recorded Native workspace finish ${key} changed`);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
const commitMessage = options.commitMessage ?? recorded?.commitMessage ?? `chore(native): archive ${options.name}`;
|
|
226
|
+
const mergeMessage = options.mergeMessage ??
|
|
227
|
+
recorded?.mergeMessage ??
|
|
228
|
+
(plan.finish === 'merge'
|
|
229
|
+
? await previewDefaultMergeMessage(plan, commitMessage, journal)
|
|
230
|
+
: null);
|
|
231
|
+
if (options.mergeMessage !== undefined && plan.finish !== 'merge') {
|
|
232
|
+
throw new Error('--merge-message requires a merge workspace finish');
|
|
233
|
+
}
|
|
234
|
+
if (recorded?.commitMessage !== undefined &&
|
|
235
|
+
commitMessage !== recorded.commitMessage &&
|
|
236
|
+
journal?.commit) {
|
|
237
|
+
const head = runGitCommand(plan.changeRoot, ['rev-parse', 'HEAD']);
|
|
238
|
+
if (journal.commit.sha ||
|
|
239
|
+
(head !== journal.commit.parent && matchesFinishCommit(plan.changeRoot, journal.commit, head))) {
|
|
240
|
+
throw new Error('The archive commit already exists; --commit-message cannot rewrite it');
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
if (recorded && mergeMessage !== recorded.mergeMessage && journal?.merge?.sha) {
|
|
244
|
+
throw new Error('The merge commit already exists; --merge-message cannot rewrite it');
|
|
245
|
+
}
|
|
246
|
+
return { ...plan, commitMessage, mergeMessage };
|
|
247
|
+
}
|
|
248
|
+
async function previewDefaultMergeMessage(plan, commitMessage, journal) {
|
|
249
|
+
// Git's shortlog includes the pending archive commit. Build that history in
|
|
250
|
+
// temporary metadata so preview never writes the project's index, refs or objects.
|
|
251
|
+
const tempRoot = path.resolve(os.tmpdir());
|
|
252
|
+
const dir = await fs.mkdtemp(path.join(tempRoot, 'comet-native-merge-preview-'));
|
|
253
|
+
if (!pathContains(tempRoot, dir) || path.resolve(dir) === tempRoot)
|
|
254
|
+
throw new Error('Native merge preview temporary directory is outside its root');
|
|
255
|
+
try {
|
|
256
|
+
const objectFormat = runGitCommand(plan.changeRoot, ['rev-parse', '--show-object-format']);
|
|
257
|
+
const hooks = path.join(dir, 'hooks');
|
|
258
|
+
await fs.mkdir(hooks, { recursive: true });
|
|
259
|
+
runGitCommand(dir, [
|
|
260
|
+
'-c',
|
|
261
|
+
`core.hooksPath=${hooks}`,
|
|
262
|
+
'init',
|
|
263
|
+
'--bare',
|
|
264
|
+
'--template=',
|
|
265
|
+
`--object-format=${objectFormat}`,
|
|
266
|
+
]);
|
|
267
|
+
runGitCommand(dir, ['config', 'core.hooksPath', hooks]);
|
|
268
|
+
const commonDir = runGitCommand(plan.changeRoot, [
|
|
269
|
+
'rev-parse',
|
|
270
|
+
'--path-format=absolute',
|
|
271
|
+
'--git-common-dir',
|
|
272
|
+
]);
|
|
273
|
+
await fs.writeFile(path.join(dir, 'objects/info/alternates'), `${path.join(commonDir, 'objects').replaceAll('\\', '/')}\n`);
|
|
274
|
+
const configArgs = ['-c', 'commit.gpgsign=false'];
|
|
275
|
+
for (const key of [
|
|
276
|
+
'user.name',
|
|
277
|
+
'user.email',
|
|
278
|
+
'author.name',
|
|
279
|
+
'author.email',
|
|
280
|
+
'committer.name',
|
|
281
|
+
'committer.email',
|
|
282
|
+
'i18n.commitEncoding',
|
|
283
|
+
'merge.log',
|
|
284
|
+
'merge.branchdesc',
|
|
285
|
+
'merge.suppressDest',
|
|
286
|
+
`branch.${plan.changeBranch}.description`,
|
|
287
|
+
]) {
|
|
288
|
+
let values;
|
|
289
|
+
try {
|
|
290
|
+
values = runGitCommand(plan.targetRoot ?? plan.changeRoot, [
|
|
291
|
+
'config',
|
|
292
|
+
'--null',
|
|
293
|
+
'--get-all',
|
|
294
|
+
key,
|
|
295
|
+
])
|
|
296
|
+
.split('\0')
|
|
297
|
+
.filter(Boolean);
|
|
298
|
+
}
|
|
299
|
+
catch {
|
|
300
|
+
continue;
|
|
301
|
+
}
|
|
302
|
+
if (key === 'merge.suppressDest')
|
|
303
|
+
configArgs.push('-c', `${key}=`);
|
|
304
|
+
for (const value of values)
|
|
305
|
+
configArgs.push('-c', `${key}=${value}`);
|
|
306
|
+
}
|
|
307
|
+
const source = runGitCommand(plan.changeRoot, ['rev-parse', `refs/heads/${plan.changeBranch}`]);
|
|
308
|
+
const checkpoint = journal?.commit;
|
|
309
|
+
const committed = checkpoint &&
|
|
310
|
+
source !== checkpoint.parent &&
|
|
311
|
+
matchesFinishCommit(plan.changeRoot, checkpoint, source);
|
|
312
|
+
let mergeSource = source;
|
|
313
|
+
if (!committed) {
|
|
314
|
+
const file = path.join(dir, 'archive-message');
|
|
315
|
+
await fs.writeFile(file, commitMessage);
|
|
316
|
+
const tree = runGitCommand(plan.changeRoot, ['rev-parse', `${source}^{tree}`]);
|
|
317
|
+
mergeSource = runGitCommand(dir, [
|
|
318
|
+
...configArgs,
|
|
319
|
+
'commit-tree',
|
|
320
|
+
tree,
|
|
321
|
+
'-p',
|
|
322
|
+
source,
|
|
323
|
+
'-F',
|
|
324
|
+
file,
|
|
325
|
+
]);
|
|
326
|
+
}
|
|
327
|
+
const target = runGitCommand(plan.changeRoot, ['rev-parse', `refs/heads/${plan.targetBranch}`]);
|
|
328
|
+
runGitCommand(dir, ['update-ref', '--no-deref', 'HEAD', target]);
|
|
329
|
+
runGitCommand(dir, ['update-ref', `refs/heads/${plan.changeBranch}`, mergeSource]);
|
|
330
|
+
const file = path.join(dir, 'merge-head');
|
|
331
|
+
await fs.writeFile(file, `${mergeSource}\t\tbranch '${plan.changeBranch}' of .\n`);
|
|
332
|
+
return runGitCommand(dir, [
|
|
333
|
+
...configArgs,
|
|
334
|
+
'fmt-merge-msg',
|
|
335
|
+
...mergeMessageLogOptions(plan, plan.targetRoot ?? plan.changeRoot),
|
|
336
|
+
'--into-name',
|
|
337
|
+
plan.targetBranch,
|
|
338
|
+
'-F',
|
|
339
|
+
file,
|
|
340
|
+
]);
|
|
341
|
+
}
|
|
342
|
+
finally {
|
|
343
|
+
if (pathContains(tempRoot, dir) && path.resolve(dir) !== tempRoot)
|
|
344
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
function mergeMessageLogOptions(plan, root) {
|
|
348
|
+
let options;
|
|
349
|
+
try {
|
|
350
|
+
options = runGitCommand(root, ['config', '--get', `branch.${plan.targetBranch}.mergeOptions`]);
|
|
351
|
+
}
|
|
352
|
+
catch {
|
|
353
|
+
return [];
|
|
354
|
+
}
|
|
355
|
+
// Git's branch mergeOptions contract excludes option values containing whitespace.
|
|
356
|
+
return options
|
|
357
|
+
.split(/\s+/u)
|
|
358
|
+
.map((option) => option.replace(/^(['"])(.*)\1$/u, '$2'))
|
|
359
|
+
.filter((option) => /^--(?:no-log|log(?:=\d+)?)$/u.test(option));
|
|
360
|
+
}
|
|
361
|
+
export async function readNativeWorkspaceFinishArchive(paths, journal) {
|
|
362
|
+
if (!journal.archiveDir ||
|
|
363
|
+
!pathContains(paths.archiveDir, journal.archiveDir) ||
|
|
364
|
+
path.resolve(paths.archiveDir) === path.resolve(journal.archiveDir)) {
|
|
365
|
+
throw new Error('Native workspace finish journal has no safe archived change directory');
|
|
366
|
+
}
|
|
367
|
+
const record = await readNativeStatusRecord(paths, path.join(journal.archiveDir, 'comet-state.yaml'));
|
|
368
|
+
if (record.state.name !== journal.name ||
|
|
369
|
+
!record.state.archived ||
|
|
370
|
+
record.state.status !== 'done' ||
|
|
371
|
+
(journal.createdAt !== undefined && record.state.created_at !== journal.createdAt)) {
|
|
372
|
+
throw new Error('Native workspace finish journal does not match a completed Archive record');
|
|
373
|
+
}
|
|
374
|
+
return record;
|
|
375
|
+
}
|
|
376
|
+
function finishTreeEntries(root, refs, commit) {
|
|
377
|
+
const raw = runGitCommand(root, commit
|
|
378
|
+
? ['ls-tree', '-r', '-z', commit, '--', ...refs]
|
|
379
|
+
: ['ls-files', '--stage', '-z', '--', ...refs]);
|
|
380
|
+
return raw
|
|
381
|
+
.split('\0')
|
|
382
|
+
.filter(Boolean)
|
|
383
|
+
.map((entry) => {
|
|
384
|
+
const match = commit
|
|
385
|
+
? /^(\d+) (?:blob|commit) ([a-f0-9]+)\t([\s\S]+)$/u.exec(entry)
|
|
386
|
+
: /^(\d+) ([a-f0-9]+) 0\t([\s\S]+)$/u.exec(entry);
|
|
387
|
+
if (!match)
|
|
388
|
+
throw new Error('Native workspace finish encountered an unresolved index entry');
|
|
389
|
+
return `${match[1]} ${match[2]}\t${match[3]}`;
|
|
390
|
+
})
|
|
391
|
+
.sort();
|
|
392
|
+
}
|
|
393
|
+
function matchesFinishCommit(root, checkpoint, sha) {
|
|
394
|
+
try {
|
|
395
|
+
runGitCommand(root, ['merge-base', '--is-ancestor', checkpoint.parent, sha]);
|
|
396
|
+
if (checkpoint.sha)
|
|
397
|
+
runGitCommand(root, ['merge-base', '--is-ancestor', checkpoint.sha, sha]);
|
|
398
|
+
return (JSON.stringify(finishTreeEntries(root, checkpoint.paths, sha)) ===
|
|
399
|
+
JSON.stringify(checkpoint.entries));
|
|
400
|
+
}
|
|
401
|
+
catch {
|
|
402
|
+
return false;
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
async function archivedFilesCommitted(paths, state, archiveDir, root, sha) {
|
|
406
|
+
const files = [];
|
|
407
|
+
async function visit(dir) {
|
|
408
|
+
for (const entry of await fs.readdir(dir, { withFileTypes: true })) {
|
|
409
|
+
if (entry.isSymbolicLink())
|
|
410
|
+
throw new Error('Native archived record contains a symbolic link');
|
|
411
|
+
const file = path.join(dir, entry.name);
|
|
412
|
+
if (entry.isDirectory())
|
|
413
|
+
await visit(file);
|
|
414
|
+
else if (entry.isFile())
|
|
415
|
+
files.push(file);
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
await visit(archiveDir);
|
|
419
|
+
for (const change of state.spec_changes) {
|
|
420
|
+
const file = canonicalSpecPath(paths, change.capability);
|
|
421
|
+
if (await pathExists(file))
|
|
422
|
+
files.push(file);
|
|
423
|
+
}
|
|
424
|
+
try {
|
|
425
|
+
if (runGitCommand(root, [
|
|
426
|
+
'ls-tree',
|
|
427
|
+
'-r',
|
|
428
|
+
'--name-only',
|
|
429
|
+
sha,
|
|
430
|
+
'--',
|
|
431
|
+
portableRelative(paths.projectRoot, nativeChangeDir(paths, state.name)),
|
|
432
|
+
]))
|
|
433
|
+
return false;
|
|
434
|
+
return files.every((file) => {
|
|
435
|
+
const ref = portableRelative(paths.projectRoot, file);
|
|
436
|
+
return (runGitCommand(root, ['rev-parse', `${sha}:${ref}`]) ===
|
|
437
|
+
runGitCommand(root, ['hash-object', '--path', ref, '--', file]));
|
|
438
|
+
});
|
|
439
|
+
}
|
|
440
|
+
catch {
|
|
441
|
+
return false;
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
/** Read-only reconciliation: Doctor never creates a commit, push, or merge. */
|
|
445
|
+
export async function inspectNativeWorkspaceFinishCompletion(paths, journal) {
|
|
446
|
+
const archived = await readNativeWorkspaceFinishArchive(paths, journal);
|
|
447
|
+
const plan = journal.plan ??
|
|
448
|
+
(await prepareNativePortableWorkspaceFinish({
|
|
449
|
+
paths,
|
|
450
|
+
state: archived.state,
|
|
451
|
+
archiveDir: journal.archiveDir,
|
|
452
|
+
}));
|
|
453
|
+
if (!plan)
|
|
454
|
+
return true;
|
|
455
|
+
if (path.resolve(plan.changeRoot) !== path.resolve(paths.projectRoot) ||
|
|
456
|
+
plan.isolation !== archived.state.workspace.isolation)
|
|
457
|
+
return false;
|
|
458
|
+
if (plan.isolation !== 'current' &&
|
|
459
|
+
(plan.changeBranch !== archived.state.workspace.change_branch ||
|
|
460
|
+
plan.targetBranch !== archived.state.workspace.target_branch ||
|
|
461
|
+
plan.finish !== archived.state.workspace.finish))
|
|
462
|
+
return false;
|
|
463
|
+
if (inspectGitWorktree(plan.changeRoot).currentBranch !== plan.changeBranch) {
|
|
464
|
+
// A branch merge may already have switched this checkout to the target.
|
|
465
|
+
if (plan.isolation !== 'branch' ||
|
|
466
|
+
plan.finish !== 'merge' ||
|
|
467
|
+
inspectGitWorktree(plan.changeRoot).currentBranch !== plan.targetBranch)
|
|
468
|
+
return false;
|
|
469
|
+
}
|
|
470
|
+
const sha = runGitCommand(plan.changeRoot, ['rev-parse', `refs/heads/${plan.changeBranch}`]);
|
|
471
|
+
const owned = portableArchiveOwnedPaths(paths, archived.state, journal.archiveDir);
|
|
472
|
+
if (gitStatusPaths(plan.changeRoot).some((ref) => pathCovered(ref, owned)))
|
|
473
|
+
return false;
|
|
474
|
+
if (journal.commit) {
|
|
475
|
+
const expectedPaths = [
|
|
476
|
+
portableRelative(paths.projectRoot, nativeChangeDir(paths, journal.name)),
|
|
477
|
+
portableRelative(paths.projectRoot, journal.archiveDir),
|
|
478
|
+
...archived.state.spec_changes.map((change) => portableRelative(paths.projectRoot, canonicalSpecPath(paths, change.capability))),
|
|
479
|
+
portableRelative(paths.projectRoot, nativeSelectionFile(paths)),
|
|
480
|
+
];
|
|
481
|
+
if (JSON.stringify(journal.commit.paths) !== JSON.stringify(expectedPaths))
|
|
482
|
+
return false;
|
|
483
|
+
if (!matchesFinishCommit(plan.changeRoot, journal.commit, sha))
|
|
484
|
+
return false;
|
|
485
|
+
}
|
|
486
|
+
if (!(await archivedFilesCommitted(paths, archived.state, journal.archiveDir, plan.changeRoot, sha)))
|
|
487
|
+
return false;
|
|
488
|
+
if (plan.finish === 'keep')
|
|
489
|
+
return true;
|
|
490
|
+
if (plan.finish === 'merge') {
|
|
491
|
+
try {
|
|
492
|
+
runGitCommand(plan.changeRoot, [
|
|
493
|
+
'merge-base',
|
|
494
|
+
'--is-ancestor',
|
|
495
|
+
sha,
|
|
496
|
+
`refs/heads/${plan.targetBranch}`,
|
|
497
|
+
]);
|
|
498
|
+
return true;
|
|
499
|
+
}
|
|
500
|
+
catch {
|
|
501
|
+
return false;
|
|
502
|
+
}
|
|
503
|
+
}
|
|
504
|
+
// Push and PR completion still use the existing provider-aware Archive path.
|
|
505
|
+
return false;
|
|
506
|
+
}
|
|
507
|
+
async function defaultMergeMessage(plan, root) {
|
|
508
|
+
const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'comet-native-merge-message-'));
|
|
509
|
+
const file = path.join(dir, 'merge-head');
|
|
510
|
+
try {
|
|
511
|
+
const sha = runGitCommand(plan.changeRoot, ['rev-parse', `refs/heads/${plan.changeBranch}`]);
|
|
512
|
+
await fs.writeFile(file, `${sha}\t\tbranch '${plan.changeBranch}' of .\n`);
|
|
513
|
+
return runGitCommand(root, [
|
|
514
|
+
'fmt-merge-msg',
|
|
515
|
+
...mergeMessageLogOptions(plan, root),
|
|
516
|
+
'--into-name',
|
|
517
|
+
plan.targetBranch,
|
|
518
|
+
'-F',
|
|
519
|
+
file,
|
|
520
|
+
]);
|
|
521
|
+
}
|
|
522
|
+
finally {
|
|
523
|
+
await fs.unlink(file).catch(() => { });
|
|
524
|
+
await fs.rmdir(dir);
|
|
525
|
+
}
|
|
526
|
+
}
|
|
149
527
|
export class NativeWorkspaceFinishError extends Error {
|
|
150
528
|
result;
|
|
151
529
|
constructor(result) {
|
|
@@ -468,6 +846,15 @@ async function cleanupMergedWorktree(plan) {
|
|
|
468
846
|
export async function finishArchivedNativeWorkspace(options) {
|
|
469
847
|
const result = baseResult(options.plan);
|
|
470
848
|
let switchedMergeRoot = null;
|
|
849
|
+
let mergeRoot = null;
|
|
850
|
+
let mergeAttempted = false;
|
|
851
|
+
let journal = await readNativeWorkspaceFinishJournal(options.paths, options.name);
|
|
852
|
+
const save = async () => {
|
|
853
|
+
if (!journal)
|
|
854
|
+
return;
|
|
855
|
+
journal = { ...journal, result: { ...result }, updatedAt: new Date().toISOString() };
|
|
856
|
+
await writeNativeWorkspaceFinishJournal(options.paths, journal);
|
|
857
|
+
};
|
|
471
858
|
try {
|
|
472
859
|
const allowedPaths = [
|
|
473
860
|
portableRelative(options.paths.projectRoot, nativeChangeDir(options.paths, options.name)),
|
|
@@ -475,7 +862,22 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
475
862
|
...options.state.spec_changes.map((change) => portableRelative(options.paths.projectRoot, canonicalSpecPath(options.paths, change.capability))),
|
|
476
863
|
portableRelative(options.paths.projectRoot, nativeSelectionFile(options.paths)),
|
|
477
864
|
];
|
|
865
|
+
if (journal?.commit && JSON.stringify(journal.commit.paths) !== JSON.stringify(allowedPaths)) {
|
|
866
|
+
throw new Error('Recorded Native archive commit scope does not match this change');
|
|
867
|
+
}
|
|
478
868
|
const preservesUnrelatedChanges = options.plan.isolation === 'current' || options.plan.finish === 'keep';
|
|
869
|
+
const head = runGitCommand(options.plan.changeRoot, ['rev-parse', 'HEAD']);
|
|
870
|
+
if (journal?.commit) {
|
|
871
|
+
if (journal.commit.sha || head !== journal.commit.parent) {
|
|
872
|
+
if (!matchesFinishCommit(options.plan.changeRoot, journal.commit, head)) {
|
|
873
|
+
throw new Error('Recorded Native archive commit does not match the current branch or archived contents');
|
|
874
|
+
}
|
|
875
|
+
if (gitStatusPaths(options.plan.changeRoot).some((ref) => pathCovered(ref, allowedPaths))) {
|
|
876
|
+
throw new Error('Native archived contents changed after the archive commit');
|
|
877
|
+
}
|
|
878
|
+
result.commit = head;
|
|
879
|
+
}
|
|
880
|
+
}
|
|
479
881
|
const unexpected = gitStatusPaths(options.plan.changeRoot).filter((candidate) => !pathCovered(candidate, allowedPaths) &&
|
|
480
882
|
!(candidate === '.comet/config.yaml' && managedConfigMatches(options.plan.changeRoot)));
|
|
481
883
|
if (unexpected.length > 0 && !preservesUnrelatedChanges) {
|
|
@@ -495,10 +897,10 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
495
897
|
}
|
|
496
898
|
}
|
|
497
899
|
}
|
|
498
|
-
if (trackedCandidates.length > 0) {
|
|
900
|
+
if (!result.commit && trackedCandidates.length > 0) {
|
|
499
901
|
runGitCommand(options.plan.changeRoot, ['add', '-u', '--', ...trackedCandidates]);
|
|
500
902
|
}
|
|
501
|
-
if (untrackedPaths.size > 0) {
|
|
903
|
+
if (!result.commit && untrackedPaths.size > 0) {
|
|
502
904
|
runGitCommand(options.plan.changeRoot, ['add', '--', ...untrackedPaths]);
|
|
503
905
|
}
|
|
504
906
|
const staged = runGitCommand(options.plan.changeRoot, [
|
|
@@ -509,20 +911,57 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
509
911
|
'--',
|
|
510
912
|
...allowedPaths,
|
|
511
913
|
]);
|
|
512
|
-
if (staged) {
|
|
914
|
+
if (staged && !result.commit) {
|
|
513
915
|
const commitPaths = [...new Set([...trackedCandidates, ...untrackedPaths])];
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
'
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
916
|
+
if (journal) {
|
|
917
|
+
const entries = finishTreeEntries(options.plan.changeRoot, allowedPaths);
|
|
918
|
+
if (journal.commit && JSON.stringify(entries) !== JSON.stringify(journal.commit.entries)) {
|
|
919
|
+
throw new Error('Native archived contents changed since the rejected commit; restore the recorded contents before retrying');
|
|
920
|
+
}
|
|
921
|
+
journal = {
|
|
922
|
+
...journal,
|
|
923
|
+
commit: journal.commit ?? { parent: head, paths: allowedPaths, entries, sha: null },
|
|
924
|
+
};
|
|
925
|
+
await save();
|
|
926
|
+
}
|
|
927
|
+
try {
|
|
928
|
+
runGitCommand(options.plan.changeRoot, preservesUnrelatedChanges
|
|
929
|
+
? [
|
|
930
|
+
'commit',
|
|
931
|
+
'--only',
|
|
932
|
+
'-m',
|
|
933
|
+
options.plan.commitMessage ?? `chore(native): archive ${options.name}`,
|
|
934
|
+
'--',
|
|
935
|
+
...commitPaths,
|
|
936
|
+
]
|
|
937
|
+
: [
|
|
938
|
+
'commit',
|
|
939
|
+
'-m',
|
|
940
|
+
options.plan.commitMessage ?? `chore(native): archive ${options.name}`,
|
|
941
|
+
]);
|
|
942
|
+
}
|
|
943
|
+
catch (error) {
|
|
944
|
+
const actual = runGitCommand(options.plan.changeRoot, ['rev-parse', 'HEAD']);
|
|
945
|
+
if (!journal?.commit ||
|
|
946
|
+
actual === journal.commit.parent ||
|
|
947
|
+
!matchesFinishCommit(options.plan.changeRoot, journal.commit, actual))
|
|
948
|
+
throw error;
|
|
949
|
+
}
|
|
524
950
|
}
|
|
525
951
|
result.commit = runGitCommand(options.plan.changeRoot, ['rev-parse', 'HEAD']);
|
|
952
|
+
if (journal) {
|
|
953
|
+
if (journal.commit &&
|
|
954
|
+
!matchesFinishCommit(options.plan.changeRoot, journal.commit, result.commit)) {
|
|
955
|
+
throw new Error('Native archive commit does not contain the recorded archived contents');
|
|
956
|
+
}
|
|
957
|
+
const archived = await readNativeWorkspaceFinishArchive(options.paths, journal);
|
|
958
|
+
if (!(await archivedFilesCommitted(options.paths, archived.state, options.archiveDir, options.plan.changeRoot, result.commit))) {
|
|
959
|
+
throw new Error('Native archive files are not committed with their expected contents');
|
|
960
|
+
}
|
|
961
|
+
if (journal.commit)
|
|
962
|
+
journal = { ...journal, commit: { ...journal.commit, sha: result.commit } };
|
|
963
|
+
await save();
|
|
964
|
+
}
|
|
526
965
|
const remainingOwned = gitStatusPaths(options.plan.changeRoot).filter((candidate) => pathCovered(candidate, allowedPaths));
|
|
527
966
|
if (remainingOwned.length > 0) {
|
|
528
967
|
throw new Error(`Native archive commit left change-owned working-tree changes: ${remainingOwned.join(', ')}`);
|
|
@@ -540,6 +979,7 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
540
979
|
options.plan.changeBranch,
|
|
541
980
|
]);
|
|
542
981
|
result.pushed = true;
|
|
982
|
+
await save();
|
|
543
983
|
if (options.plan.finish === 'pull-request') {
|
|
544
984
|
result.pullRequest = finishNativePullRequest({
|
|
545
985
|
projectRoot: options.plan.changeRoot,
|
|
@@ -552,6 +992,7 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
552
992
|
config: options.plan.pullRequestFinish,
|
|
553
993
|
});
|
|
554
994
|
result.pullRequestUrl = result.pullRequest.pullRequest.url;
|
|
995
|
+
await save();
|
|
555
996
|
}
|
|
556
997
|
const cwdInsideChangeRoot = pathContains(options.plan.changeRoot, process.cwd());
|
|
557
998
|
if (options.plan.isolation === 'worktree' && !cwdInsideChangeRoot) {
|
|
@@ -567,14 +1008,67 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
567
1008
|
}
|
|
568
1009
|
return result;
|
|
569
1010
|
}
|
|
570
|
-
|
|
1011
|
+
mergeRoot = options.plan.targetRoot ?? options.plan.changeRoot;
|
|
571
1012
|
if (options.plan.isolation === 'branch') {
|
|
572
1013
|
runGitCommand(mergeRoot, ['switch', options.plan.targetBranch]);
|
|
573
1014
|
switchedMergeRoot = mergeRoot;
|
|
574
1015
|
}
|
|
575
|
-
|
|
1016
|
+
let alreadyMerged = false;
|
|
1017
|
+
try {
|
|
1018
|
+
runGitCommand(mergeRoot, [
|
|
1019
|
+
'merge-base',
|
|
1020
|
+
'--is-ancestor',
|
|
1021
|
+
result.commit,
|
|
1022
|
+
`refs/heads/${options.plan.targetBranch}`,
|
|
1023
|
+
]);
|
|
1024
|
+
alreadyMerged = true;
|
|
1025
|
+
}
|
|
1026
|
+
catch {
|
|
1027
|
+
/* The recorded change still needs its authorized merge. */
|
|
1028
|
+
}
|
|
1029
|
+
if (!alreadyMerged) {
|
|
1030
|
+
const message = options.plan.mergeMessage ?? (await defaultMergeMessage(options.plan, mergeRoot));
|
|
1031
|
+
if (journal) {
|
|
1032
|
+
journal = {
|
|
1033
|
+
...journal,
|
|
1034
|
+
plan: { ...options.plan, mergeMessage: message },
|
|
1035
|
+
merge: {
|
|
1036
|
+
target: runGitCommand(mergeRoot, ['rev-parse', 'HEAD']),
|
|
1037
|
+
source: result.commit,
|
|
1038
|
+
sha: null,
|
|
1039
|
+
},
|
|
1040
|
+
};
|
|
1041
|
+
await save();
|
|
1042
|
+
}
|
|
1043
|
+
mergeAttempted = true;
|
|
1044
|
+
try {
|
|
1045
|
+
runGitCommand(mergeRoot, [
|
|
1046
|
+
'merge',
|
|
1047
|
+
'--no-ff',
|
|
1048
|
+
'--no-edit',
|
|
1049
|
+
'--no-log',
|
|
1050
|
+
'-m',
|
|
1051
|
+
message,
|
|
1052
|
+
options.plan.changeBranch,
|
|
1053
|
+
]);
|
|
1054
|
+
}
|
|
1055
|
+
catch (error) {
|
|
1056
|
+
try {
|
|
1057
|
+
runGitCommand(mergeRoot, ['merge-base', '--is-ancestor', result.commit, 'HEAD']);
|
|
1058
|
+
}
|
|
1059
|
+
catch {
|
|
1060
|
+
throw error;
|
|
1061
|
+
}
|
|
1062
|
+
}
|
|
1063
|
+
}
|
|
576
1064
|
result.merged = true;
|
|
577
1065
|
result.targetRoot = mergeRoot;
|
|
1066
|
+
if (journal?.merge)
|
|
1067
|
+
journal = {
|
|
1068
|
+
...journal,
|
|
1069
|
+
merge: { ...journal.merge, sha: runGitCommand(mergeRoot, ['rev-parse', 'HEAD']) },
|
|
1070
|
+
};
|
|
1071
|
+
await save();
|
|
578
1072
|
result.cleanup = await cleanupMergedWorktree(options.plan);
|
|
579
1073
|
return result;
|
|
580
1074
|
}
|
|
@@ -582,6 +1076,16 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
582
1076
|
if (error instanceof NativePullRequestFinishError && error.pullRequest) {
|
|
583
1077
|
result.pullRequestUrl = error.pullRequest.url;
|
|
584
1078
|
}
|
|
1079
|
+
if (mergeAttempted && mergeRoot && !result.merged) {
|
|
1080
|
+
try {
|
|
1081
|
+
if (runGitCommand(mergeRoot, ['rev-parse', '--verify', 'MERGE_HEAD']) === result.commit) {
|
|
1082
|
+
runGitCommand(mergeRoot, ['merge', '--abort']);
|
|
1083
|
+
}
|
|
1084
|
+
}
|
|
1085
|
+
catch {
|
|
1086
|
+
/* Preserve the original Git failure when there is no owned merge to abort. */
|
|
1087
|
+
}
|
|
1088
|
+
}
|
|
585
1089
|
if (switchedMergeRoot !== null) {
|
|
586
1090
|
let restored;
|
|
587
1091
|
try {
|
|
@@ -615,6 +1119,7 @@ export async function finishArchivedNativeWorkspace(options) {
|
|
|
615
1119
|
'--short',
|
|
616
1120
|
];
|
|
617
1121
|
result.recoveryArgs = ['comet', 'native', 'archive', options.name, '--confirmed'];
|
|
1122
|
+
await save();
|
|
618
1123
|
throw new NativeWorkspaceFinishError(result);
|
|
619
1124
|
}
|
|
620
1125
|
}
|