teamshare-bridge 0.25.15 → 0.26.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/bridge/auto-upgrade.js +9 -2
- package/dist/bridge/auto-upgrade.js.map +1 -1
- package/dist/bridge/autostart-launcher.js +8 -3
- package/dist/bridge/autostart-launcher.js.map +1 -1
- package/dist/bridge/cdp-handler.js +8 -9
- package/dist/bridge/cdp-handler.js.map +1 -1
- package/dist/bridge/daemon-inbox.js +57 -22
- package/dist/bridge/daemon-inbox.js.map +1 -1
- package/dist/bridge/daemon-instance.js +40 -10
- package/dist/bridge/daemon-instance.js.map +1 -1
- package/dist/bridge/daemon-support.js +3 -1
- package/dist/bridge/daemon-support.js.map +1 -1
- package/dist/bridge/daemon.d.ts +1 -1
- package/dist/bridge/daemon.js +75 -31
- package/dist/bridge/daemon.js.map +1 -1
- package/dist/bridge/doctor.js +61 -18
- package/dist/bridge/doctor.js.map +1 -1
- package/dist/bridge/hidden-launch.js.map +1 -1
- package/dist/bridge/index.js +26 -8
- package/dist/bridge/index.js.map +1 -1
- package/dist/bridge/install-verify.js +2 -1
- package/dist/bridge/install-verify.js.map +1 -1
- package/dist/bridge/local-server.d.ts +3 -1
- package/dist/bridge/local-server.js +53 -15
- package/dist/bridge/local-server.js.map +1 -1
- package/dist/bridge/protocol.js +82 -20
- package/dist/bridge/protocol.js.map +1 -1
- package/dist/bridge/service.d.ts +1 -1
- package/dist/bridge/service.js +77 -21
- package/dist/bridge/service.js.map +1 -1
- package/dist/bridge/session-relay.d.ts +2 -1
- package/dist/bridge/session-relay.js +17 -1
- package/dist/bridge/session-relay.js.map +1 -1
- package/dist/bridge/singleton-policy.js +42 -7
- package/dist/bridge/singleton-policy.js.map +1 -1
- package/dist/bridge/spawn.d.ts +7 -1
- package/dist/bridge/spawn.js +132 -18
- package/dist/bridge/spawn.js.map +1 -1
- package/dist/bridge/stopped-marker.js.map +1 -1
- package/dist/bridge/supervisor-restart.js.map +1 -1
- package/dist/bridge/upgrade-marker.js.map +1 -1
- package/dist/bridge/upgrade-preflight.js.map +1 -1
- package/dist/bridge/wake-handler.js +56 -19
- package/dist/bridge/wake-handler.js.map +1 -1
- package/dist/bridge/wake-lanes.d.ts +5 -0
- package/dist/bridge/wake-lanes.js +23 -3
- package/dist/bridge/wake-lanes.js.map +1 -1
- package/dist/bridge/wake-outbox.js +3 -2
- package/dist/bridge/wake-outbox.js.map +1 -1
- package/dist/bridge/wake-queue-store.js.map +1 -1
- package/dist/bridge/wake-routing.d.ts +4 -2
- package/dist/bridge/wake-routing.js +92 -16
- package/dist/bridge/wake-routing.js.map +1 -1
- package/dist/cli/commands/audit.js +6 -5
- package/dist/cli/commands/audit.js.map +1 -1
- package/dist/cli/commands/blog.js +11 -1
- package/dist/cli/commands/blog.js.map +1 -1
- package/dist/cli/commands/board.js +5 -1
- package/dist/cli/commands/board.js.map +1 -1
- package/dist/cli/commands/browse.js +167 -61
- package/dist/cli/commands/browse.js.map +1 -1
- package/dist/cli/commands/browser.js +14 -5
- package/dist/cli/commands/browser.js.map +1 -1
- package/dist/cli/commands/build.js +183 -51
- package/dist/cli/commands/build.js.map +1 -1
- package/dist/cli/commands/chat.js +31 -9
- package/dist/cli/commands/chat.js.map +1 -1
- package/dist/cli/commands/cleanup.js +6 -2
- package/dist/cli/commands/cleanup.js.map +1 -1
- package/dist/cli/commands/connect.js.map +1 -1
- package/dist/cli/commands/context.js +8 -1
- package/dist/cli/commands/context.js.map +1 -1
- package/dist/cli/commands/disconnect.js.map +1 -1
- package/dist/cli/commands/doc.js +20 -6
- package/dist/cli/commands/doc.js.map +1 -1
- package/dist/cli/commands/insight.js +57 -54
- package/dist/cli/commands/insight.js.map +1 -1
- package/dist/cli/commands/key.js +10 -4
- package/dist/cli/commands/key.js.map +1 -1
- package/dist/cli/commands/link.js +11 -3
- package/dist/cli/commands/link.js.map +1 -1
- package/dist/cli/commands/plan.js +15 -5
- package/dist/cli/commands/plan.js.map +1 -1
- package/dist/cli/commands/planner.d.ts +3 -3
- package/dist/cli/commands/planner.js +76 -76
- package/dist/cli/commands/planner.js.map +1 -1
- package/dist/cli/commands/research.d.ts +1 -1
- package/dist/cli/commands/research.js +274 -247
- package/dist/cli/commands/research.js.map +1 -1
- package/dist/cli/commands/run.js +67 -23
- package/dist/cli/commands/run.js.map +1 -1
- package/dist/cli/commands/scaffold.js +4 -1
- package/dist/cli/commands/scaffold.js.map +1 -1
- package/dist/cli/commands/set-folder.js +6 -2
- package/dist/cli/commands/set-folder.js.map +1 -1
- package/dist/cli/commands/shared.js +12 -2
- package/dist/cli/commands/shared.js.map +1 -1
- package/dist/cli/commands/skills.js.map +1 -1
- package/dist/cli/commands/usage.js +8 -2
- package/dist/cli/commands/usage.js.map +1 -1
- package/dist/cli/commands/worker.js +82 -28
- package/dist/cli/commands/worker.js.map +1 -1
- package/dist/cli/commands/workflow-author.d.ts +1 -0
- package/dist/cli/commands/workflow-author.js +170 -0
- package/dist/cli/commands/workflow-author.js.map +1 -0
- package/dist/cli/commands/workflow.js +120 -110
- package/dist/cli/commands/workflow.js.map +1 -1
- package/dist/cli/index.js +6 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/utils.js +9 -5
- package/dist/cli/utils.js.map +1 -1
- package/dist/lib/api-agents.d.ts +11 -9
- package/dist/lib/api-agents.js +11 -11
- package/dist/lib/api-agents.js.map +1 -1
- package/dist/lib/api-content.d.ts +12 -12
- package/dist/lib/api-content.js +46 -46
- package/dist/lib/api-content.js.map +1 -1
- package/dist/lib/api-core.js +13 -12
- package/dist/lib/api-core.js.map +1 -1
- package/dist/lib/api-tasks.d.ts +28 -2
- package/dist/lib/api-tasks.js +29 -21
- package/dist/lib/api-tasks.js.map +1 -1
- package/dist/lib/api-types.d.ts +36 -28
- package/dist/lib/api.d.ts +14 -14
- package/dist/lib/api.js +26 -26
- package/dist/lib/api.js.map +1 -1
- package/dist/lib/audit/docs.js.map +1 -1
- package/dist/lib/audit/errors.js.map +1 -1
- package/dist/lib/audit/gates.js +9 -2
- package/dist/lib/audit/gates.js.map +1 -1
- package/dist/lib/audit/modularity.js +4 -1
- package/dist/lib/audit/modularity.js.map +1 -1
- package/dist/lib/audit/quality.js +1 -1
- package/dist/lib/audit/quality.js.map +1 -1
- package/dist/lib/audit/rbac.js.map +1 -1
- package/dist/lib/audit/reporter.js.map +1 -1
- package/dist/lib/audit/runner.js +29 -8
- package/dist/lib/audit/runner.js.map +1 -1
- package/dist/lib/audit/security.js +35 -7
- package/dist/lib/audit/security.js.map +1 -1
- package/dist/lib/audit/ux.js +1 -4
- package/dist/lib/audit/ux.js.map +1 -1
- package/dist/lib/auto-run-state.js +5 -1
- package/dist/lib/auto-run-state.js.map +1 -1
- package/dist/lib/blog/charts.js.map +1 -1
- package/dist/lib/bridge-notice.js +2 -2
- package/dist/lib/bridge-notice.js.map +1 -1
- package/dist/lib/brief.d.ts +2 -2
- package/dist/lib/brief.js +158 -153
- package/dist/lib/brief.js.map +1 -1
- package/dist/lib/browser/batch.d.ts +18 -0
- package/dist/lib/browser/batch.js +42 -4
- package/dist/lib/browser/batch.js.map +1 -1
- package/dist/lib/browser/browse-actions.js +326 -293
- package/dist/lib/browser/browse-actions.js.map +1 -1
- package/dist/lib/browser/browse-cdp.js +51 -28
- package/dist/lib/browser/browse-cdp.js.map +1 -1
- package/dist/lib/browser/browse-editor.d.ts +1 -1
- package/dist/lib/browser/browse-editor.js +335 -236
- package/dist/lib/browser/browse-editor.js.map +1 -1
- package/dist/lib/browser/browse-harness.js +27 -8
- package/dist/lib/browser/browse-harness.js.map +1 -1
- package/dist/lib/browser/browse-llm.d.ts +10 -0
- package/dist/lib/browser/browse-llm.js +182 -39
- package/dist/lib/browser/browse-llm.js.map +1 -1
- package/dist/lib/browser/browse-safety.d.ts +12 -0
- package/dist/lib/browser/browse-safety.js +29 -17
- package/dist/lib/browser/browse-safety.js.map +1 -1
- package/dist/lib/browser/browse-stealth.d.ts +9 -0
- package/dist/lib/browser/browse-stealth.js +118 -66
- package/dist/lib/browser/browse-stealth.js.map +1 -1
- package/dist/lib/browser/browse-types.js +143 -143
- package/dist/lib/browser/browse-types.js.map +1 -1
- package/dist/lib/browser/cdp.d.ts +32 -0
- package/dist/lib/browser/cdp.js +139 -9
- package/dist/lib/browser/cdp.js.map +1 -1
- package/dist/lib/browser/human-input-guard.js +14 -4
- package/dist/lib/browser/human-input-guard.js.map +1 -1
- package/dist/lib/browser/launch.js +3 -1
- package/dist/lib/browser/launch.js.map +1 -1
- package/dist/lib/browser/login.js +97 -19
- package/dist/lib/browser/login.js.map +1 -1
- package/dist/lib/browser/option-state.js +8 -2
- package/dist/lib/browser/option-state.js.map +1 -1
- package/dist/lib/browser/owned-registry.js.map +1 -1
- package/dist/lib/browser/personal-fields.js +54 -9
- package/dist/lib/browser/personal-fields.js.map +1 -1
- package/dist/lib/browser/process.js +10 -2
- package/dist/lib/browser/process.js.map +1 -1
- package/dist/lib/browser/profile-guard.js +5 -0
- package/dist/lib/browser/profile-guard.js.map +1 -1
- package/dist/lib/browser/screen-change.js.map +1 -1
- package/dist/lib/browser/session.d.ts +19 -0
- package/dist/lib/browser/session.js +34 -3
- package/dist/lib/browser/session.js.map +1 -1
- package/dist/lib/browser/stage-file.d.ts +31 -0
- package/dist/lib/browser/stage-file.js +123 -0
- package/dist/lib/browser/stage-file.js.map +1 -0
- package/dist/lib/cache-cleaner.js +54 -15
- package/dist/lib/cache-cleaner.js.map +1 -1
- package/dist/lib/chat/board-reply.js +16 -4
- package/dist/lib/chat/board-reply.js.map +1 -1
- package/dist/lib/chat/chat-lock.js.map +1 -1
- package/dist/lib/chat/chat-reply.js +21 -13
- package/dist/lib/chat/chat-reply.js.map +1 -1
- package/dist/lib/chat/daemon-reporter.js +1 -0
- package/dist/lib/chat/daemon-reporter.js.map +1 -1
- package/dist/lib/chat/doc-reply.js +32 -7
- package/dist/lib/chat/doc-reply.js.map +1 -1
- package/dist/lib/chat/index.d.ts +1 -1
- package/dist/lib/chat/index.js.map +1 -1
- package/dist/lib/chat/session-stream.d.ts +7 -1
- package/dist/lib/chat/session-stream.js +2 -1
- package/dist/lib/chat/session-stream.js.map +1 -1
- package/dist/lib/chat/workflow-author-reply.d.ts +41 -0
- package/dist/lib/chat/workflow-author-reply.js +158 -0
- package/dist/lib/chat/workflow-author-reply.js.map +1 -0
- package/dist/lib/config.js +30 -23
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/context/scan.js +12 -4
- package/dist/lib/context/scan.js.map +1 -1
- package/dist/lib/context/sync.js +6 -1
- package/dist/lib/context/sync.js.map +1 -1
- package/dist/lib/diagnostics.js +24 -7
- package/dist/lib/diagnostics.js.map +1 -1
- package/dist/lib/documents/convert.js +0 -2
- package/dist/lib/documents/convert.js.map +1 -1
- package/dist/lib/documents/docx-inspect.js +6 -2
- package/dist/lib/documents/docx-inspect.js.map +1 -1
- package/dist/lib/documents/docx-template.js +11 -20
- package/dist/lib/documents/docx-template.js.map +1 -1
- package/dist/lib/documents/job-runner.js.map +1 -1
- package/dist/lib/documents/source.js.map +1 -1
- package/dist/lib/git/git-auto.js +43 -10
- package/dist/lib/git/git-auto.js.map +1 -1
- package/dist/lib/git/git-branch.js +15 -15
- package/dist/lib/git/git-core.d.ts +2 -2
- package/dist/lib/git/git-core.js +7 -7
- package/dist/lib/git/git-core.js.map +1 -1
- package/dist/lib/git/git-discovery.js +49 -42
- package/dist/lib/git/git-discovery.js.map +1 -1
- package/dist/lib/git/git-finalize.d.ts +2 -2
- package/dist/lib/git/git-finalize.js +99 -96
- package/dist/lib/git/git-finalize.js.map +1 -1
- package/dist/lib/git/git-pipeline.d.ts +9 -9
- package/dist/lib/git/git-pipeline.js.map +1 -1
- package/dist/lib/git/git-prepare.d.ts +2 -2
- package/dist/lib/git/git-prepare.js +45 -42
- package/dist/lib/git/git-prepare.js.map +1 -1
- package/dist/lib/git/git-presence.js +16 -6
- package/dist/lib/git/git-presence.js.map +1 -1
- package/dist/lib/git/git-runner.js +82 -22
- package/dist/lib/git/git-runner.js.map +1 -1
- package/dist/lib/git/index-recovery.js +18 -4
- package/dist/lib/git/index-recovery.js.map +1 -1
- package/dist/lib/git/index.d.ts +4 -4
- package/dist/lib/git/index.js.map +1 -1
- package/dist/lib/git/pr-create.js +4 -1
- package/dist/lib/git/pr-create.js.map +1 -1
- package/dist/lib/git/question-pause.d.ts +1 -1
- package/dist/lib/git/question-pause.js +1 -1
- package/dist/lib/git/question-pause.js.map +1 -1
- package/dist/lib/git/slug.js.map +1 -1
- package/dist/lib/git/stash-context.js +3 -1
- package/dist/lib/git/stash-context.js.map +1 -1
- package/dist/lib/harness/agy-pty.js +9 -4
- package/dist/lib/harness/agy-pty.js.map +1 -1
- package/dist/lib/harness/harness-adapter.d.ts +1 -3
- package/dist/lib/harness/harness-adapter.js +61 -20
- package/dist/lib/harness/harness-adapter.js.map +1 -1
- package/dist/lib/harness/harness-models.js +10 -3
- package/dist/lib/harness/harness-models.js.map +1 -1
- package/dist/lib/harness/harness-output.js +14 -6
- package/dist/lib/harness/harness-output.js.map +1 -1
- package/dist/lib/harness/harness.js +32 -14
- package/dist/lib/harness/harness.js.map +1 -1
- package/dist/lib/harness/index.d.ts +3 -3
- package/dist/lib/harness/index.js.map +1 -1
- package/dist/lib/harness/plan-gate.js.map +1 -1
- package/dist/lib/harness/resume.js +3 -1
- package/dist/lib/harness/resume.js.map +1 -1
- package/dist/lib/harness/run-scope.js.map +1 -1
- package/dist/lib/harness/session-store.js.map +1 -1
- package/dist/lib/harness/spawn.js +41 -14
- package/dist/lib/harness/spawn.js.map +1 -1
- package/dist/lib/human-style.d.ts +29 -0
- package/dist/lib/human-style.js +114 -0
- package/dist/lib/human-style.js.map +1 -0
- package/dist/lib/llm/index.d.ts +3 -3
- package/dist/lib/llm/index.js.map +1 -1
- package/dist/lib/llm/llm-chat.js.map +1 -1
- package/dist/lib/llm/llm-tools.js +229 -63
- package/dist/lib/llm/llm-tools.js.map +1 -1
- package/dist/lib/llm/llm.d.ts +1 -1
- package/dist/lib/llm/llm.js +28 -6
- package/dist/lib/llm/llm.js.map +1 -1
- package/dist/lib/llm/models.js +27 -5
- package/dist/lib/llm/models.js.map +1 -1
- package/dist/lib/llm/retry.js.map +1 -1
- package/dist/lib/llm/usage-reader.js +30 -10
- package/dist/lib/llm/usage-reader.js.map +1 -1
- package/dist/lib/llm/usage.js.map +1 -1
- package/dist/lib/lock.d.ts +5 -1
- package/dist/lib/lock.js +13 -4
- package/dist/lib/lock.js.map +1 -1
- package/dist/lib/mcp-identity.js +4 -1
- package/dist/lib/mcp-identity.js.map +1 -1
- package/dist/lib/media-gen/generate.d.ts +1 -1
- package/dist/lib/media-gen/generate.js +83 -68
- package/dist/lib/media-gen/generate.js.map +1 -1
- package/dist/lib/orchestrator/client.js +66 -15
- package/dist/lib/orchestrator/client.js.map +1 -1
- package/dist/lib/orchestrator/handlers/browser.js +198 -35
- package/dist/lib/orchestrator/handlers/browser.js.map +1 -1
- package/dist/lib/orchestrator/handlers/cv-parse.js +0 -1
- package/dist/lib/orchestrator/handlers/cv-parse.js.map +1 -1
- package/dist/lib/orchestrator/handlers/git.js +91 -70
- package/dist/lib/orchestrator/handlers/git.js.map +1 -1
- package/dist/lib/orchestrator/handlers/index.d.ts +2 -2
- package/dist/lib/orchestrator/handlers/index.js.map +1 -1
- package/dist/lib/orchestrator/handlers/misc.js +48 -15
- package/dist/lib/orchestrator/handlers/misc.js.map +1 -1
- package/dist/lib/orchestrator/handlers/planner.js +61 -61
- package/dist/lib/orchestrator/handlers/planner.js.map +1 -1
- package/dist/lib/orchestrator/runner.js +6 -3
- package/dist/lib/orchestrator/runner.js.map +1 -1
- package/dist/lib/orchestrator/worktree.js +133 -40
- package/dist/lib/orchestrator/worktree.js.map +1 -1
- package/dist/lib/package-manager.js +28 -4
- package/dist/lib/package-manager.js.map +1 -1
- package/dist/lib/process-tree.js +16 -3
- package/dist/lib/process-tree.js.map +1 -1
- package/dist/lib/rate-gate.js +3 -2
- package/dist/lib/rate-gate.js.map +1 -1
- package/dist/lib/run-report.js.map +1 -1
- package/dist/lib/scaffold/renderer.js.map +1 -1
- package/dist/lib/scaffold/structure.js.map +1 -1
- package/dist/lib/scaffold/verify.js.map +1 -1
- package/dist/lib/secret-store.js +28 -9
- package/dist/lib/secret-store.js.map +1 -1
- package/dist/lib/skills.js +1 -1
- package/dist/lib/skills.js.map +1 -1
- package/dist/lib/tail-file.js.map +1 -1
- package/dist/lib/tools/browser-tool.js +153 -55
- package/dist/lib/tools/browser-tool.js.map +1 -1
- package/dist/lib/tools/chart-builder.js +29 -7
- package/dist/lib/tools/chart-builder.js.map +1 -1
- package/dist/lib/tools/csv-cruncher.js +22 -6
- package/dist/lib/tools/csv-cruncher.js.map +1 -1
- package/dist/lib/tools/docx-report.js +419 -54
- package/dist/lib/tools/docx-report.js.map +1 -1
- package/dist/lib/tools/docx-source.js +3 -1
- package/dist/lib/tools/docx-source.js.map +1 -1
- package/dist/lib/tools/pdf-exporter.js +151 -37
- package/dist/lib/tools/pdf-exporter.js.map +1 -1
- package/dist/lib/tools/pptx-deck.js +34 -6
- package/dist/lib/tools/pptx-deck.js.map +1 -1
- package/dist/lib/tools/process-image.js +16 -4
- package/dist/lib/tools/process-image.js.map +1 -1
- package/dist/lib/tools/qr-generator.js +4 -1
- package/dist/lib/tools/qr-generator.js.map +1 -1
- package/dist/lib/tools/runner.js +4 -2
- package/dist/lib/tools/runner.js.map +1 -1
- package/dist/lib/tools/xlsx-workbook.js +4 -1
- package/dist/lib/tools/xlsx-workbook.js.map +1 -1
- package/dist/lib/version-check.js +11 -5
- package/dist/lib/version-check.js.map +1 -1
- package/dist/lib/wake-claim.js +2 -1
- package/dist/lib/wake-claim.js.map +1 -1
- package/dist/lib/wake-state.js +12 -6
- package/dist/lib/wake-state.js.map +1 -1
- package/dist/lib/workflow/node-executor.js +144 -18
- package/dist/lib/workflow/node-executor.js.map +1 -1
- package/dist/lib/workspace/bus.js +3 -1
- package/dist/lib/workspace/bus.js.map +1 -1
- package/dist/lib/workspace/classify.js +77 -18
- package/dist/lib/workspace/classify.js.map +1 -1
- package/dist/lib/workspace/mirror-lease.js +6 -2
- package/dist/lib/workspace/mirror-lease.js.map +1 -1
- package/dist/lib/workspace/mirror.js +34 -10
- package/dist/lib/workspace/mirror.js.map +1 -1
- package/dist/lib/workspace/opencode-projects.js +9 -4
- package/dist/lib/workspace/opencode-projects.js.map +1 -1
- package/dist/lib/workspace/presence.js +6 -2
- package/dist/lib/workspace/presence.js.map +1 -1
- package/dist/lib/workspace/repo-lock.js +16 -4
- package/dist/lib/workspace/repo-lock.js.map +1 -1
- package/dist/lib/workspace/session-mention.js.map +1 -1
- package/dist/lib/workspace/shim-runner.js +22 -5
- package/dist/lib/workspace/shim-runner.js.map +1 -1
- package/dist/lib/workspace/shims.js +8 -2
- package/dist/lib/workspace/shims.js.map +1 -1
- package/dist/lib/workspace/stop-notice.js +5 -2
- package/dist/lib/workspace/stop-notice.js.map +1 -1
- package/dist/lib/workspace/stop-save.js +9 -4
- package/dist/lib/workspace/stop-save.js.map +1 -1
- package/package.json +10 -2
|
@@ -39,15 +39,15 @@ function checkoutWithRecovery(gitRoot, cwd, args, timeoutMs, opts, label) {
|
|
|
39
39
|
const blocker = (0, index_recovery_1.detectIndexBlocker)(gitRoot);
|
|
40
40
|
if (!blocker.blocked)
|
|
41
41
|
return { co, skip: false };
|
|
42
|
-
opts.log(`[git] ${label}checkout failed on a blocked index (${blocker.kind}) - attempting recovery`,
|
|
42
|
+
opts.log(`[git] ${label}checkout failed on a blocked index (${blocker.kind}) - attempting recovery`, 'stderr');
|
|
43
43
|
const rec = (0, index_recovery_1.recoverBlockedIndex)(gitRoot, { cwd, log: opts.log, blocker });
|
|
44
44
|
if (!rec)
|
|
45
45
|
return { co, skip: false };
|
|
46
|
-
if (rec.status ===
|
|
46
|
+
if (rec.status === 'blocked')
|
|
47
47
|
return { co, record: rec, skip: true };
|
|
48
48
|
co = (0, git_core_1.git)(gitRoot, args, timeoutMs);
|
|
49
49
|
if (co.ok) {
|
|
50
|
-
opts.log(`[git] ${label}checkout succeeded after blocked-index recovery`,
|
|
50
|
+
opts.log(`[git] ${label}checkout succeeded after blocked-index recovery`, 'stdout');
|
|
51
51
|
return { co, record: rec, skip: false };
|
|
52
52
|
}
|
|
53
53
|
return {
|
|
@@ -66,12 +66,15 @@ function checkoutWithRecovery(gitRoot, cwd, args, timeoutMs, opts, label) {
|
|
|
66
66
|
function prepareRunGitUnlocked(cwd, opts) {
|
|
67
67
|
const recoveries = [];
|
|
68
68
|
const attach = (prepared) => recoveries.length > 0
|
|
69
|
-
? {
|
|
69
|
+
? {
|
|
70
|
+
...prepared,
|
|
71
|
+
indexRecoveries: [...(prepared.indexRecoveries ?? []), ...recoveries],
|
|
72
|
+
}
|
|
70
73
|
: prepared;
|
|
71
74
|
try {
|
|
72
|
-
if (opts.policy ===
|
|
73
|
-
opts.log(
|
|
74
|
-
return attach({ active: false, skipReason:
|
|
75
|
+
if (opts.policy === 'none') {
|
|
76
|
+
opts.log('[git] skipped: agent git policy is off for this project');
|
|
77
|
+
return attach({ active: false, skipReason: 'policy-none' });
|
|
75
78
|
}
|
|
76
79
|
// NO GIT BINARY (2026-09): every step below is a git call. On a machine
|
|
77
80
|
// without Git they all fail fast with ENOENT, so nothing would throw - but
|
|
@@ -80,9 +83,9 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
80
83
|
// so the closing comment can say exactly what is wrong.
|
|
81
84
|
if (!(0, git_presence_1.isGitAvailable)()) {
|
|
82
85
|
const detail = (0, git_presence_1.probeGit)().detail;
|
|
83
|
-
opts.log(`[git] skipped: git is not available on this machine${detail ? ` (${detail})` :
|
|
86
|
+
opts.log(`[git] skipped: git is not available on this machine${detail ? ` (${detail})` : ''} - ` +
|
|
84
87
|
`the run works in the linked folder with no branch, commit or PR`);
|
|
85
|
-
return attach({ active: false, skipReason:
|
|
88
|
+
return attach({ active: false, skipReason: 'git-unavailable' });
|
|
86
89
|
}
|
|
87
90
|
// Isolation mirror: worktrees are DETACHED and the run branch is created
|
|
88
91
|
// LAZILY by finalize only for repos that actually changed — so a repo with
|
|
@@ -90,11 +93,11 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
90
93
|
if ((0, mirror_1.isMirrorDir)(cwd)) {
|
|
91
94
|
const mirrorRoots = (0, mirror_1.resolveRunRepos)(cwd);
|
|
92
95
|
if (mirrorRoots.length === 0) {
|
|
93
|
-
return attach({ active: false, skipReason:
|
|
96
|
+
return attach({ active: false, skipReason: 'mirror-destroyed' });
|
|
94
97
|
}
|
|
95
98
|
for (const gitRoot of mirrorRoots)
|
|
96
99
|
(0, git_auto_1.ensureRepo)(gitRoot);
|
|
97
|
-
opts.log(
|
|
100
|
+
opts.log('[git] isolation mirror: branch creation deferred to finalize (only repos with changes)');
|
|
98
101
|
return attach({
|
|
99
102
|
active: true,
|
|
100
103
|
repos: mirrorRoots.map((gitRoot) => ({ gitRoot, active: true })),
|
|
@@ -116,10 +119,10 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
116
119
|
if ((0, mirror_1.looksLikeMirrorPath)(cwd)) {
|
|
117
120
|
opts.log(`[git] this run was dispatched into ${cwd}, which has a mirror's name but no marker and no git repo: ` +
|
|
118
121
|
`the isolation mirror was torn down before the session started. Uncommitted work in it is NOT recoverable.`);
|
|
119
|
-
return attach({ active: false, skipReason:
|
|
122
|
+
return attach({ active: false, skipReason: 'mirror-destroyed' });
|
|
120
123
|
}
|
|
121
|
-
opts.log(
|
|
122
|
-
return attach({ active: false, skipReason:
|
|
124
|
+
opts.log('[git] skipped: no git repository found (searched up to 5 parent directories) - run `teamshare-agent link --project <id> --path <folder>` (link can init one)');
|
|
125
|
+
return attach({ active: false, skipReason: 'not-a-git-repo' });
|
|
123
126
|
}
|
|
124
127
|
// Single-repo fast path: preserve exact existing behavior.
|
|
125
128
|
if (gitRoots.length === 1) {
|
|
@@ -132,12 +135,12 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
132
135
|
const repoResults = [];
|
|
133
136
|
let anyOnDefault = false;
|
|
134
137
|
for (const gitRoot of gitRoots) {
|
|
135
|
-
const repoName = (0, node_path_1.relative)(cwd, gitRoot).replace(/\\/g,
|
|
138
|
+
const repoName = (0, node_path_1.relative)(cwd, gitRoot).replace(/\\/g, '/');
|
|
136
139
|
(0, git_auto_1.ensureRepo)(gitRoot);
|
|
137
140
|
// A repo the pre-flight (or an earlier checkout here) could not recover
|
|
138
141
|
// is skipped entirely: no warm checkout, no branch, no finalize commit.
|
|
139
142
|
if ((0, index_recovery_1.isBlockedIndexRepo)(gitRoot)) {
|
|
140
|
-
opts.log(`[git] [${repoName}] git index is blocked (see [git-index-blocked]) - skipping git prep for this repo`,
|
|
143
|
+
opts.log(`[git] [${repoName}] git index is blocked (see [git-index-blocked]) - skipping git prep for this repo`, 'stderr');
|
|
141
144
|
repoResults.push({ gitRoot, active: false });
|
|
142
145
|
continue;
|
|
143
146
|
}
|
|
@@ -155,7 +158,7 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
155
158
|
continue;
|
|
156
159
|
}
|
|
157
160
|
// Detect status for reporting; finalize will create branches lazily.
|
|
158
|
-
const head = (0, git_core_1.git)(gitRoot, [
|
|
161
|
+
const head = (0, git_core_1.git)(gitRoot, ['rev-parse', '--verify', 'HEAD']);
|
|
159
162
|
if (!head.ok) {
|
|
160
163
|
opts.log(`[git] [${repoName}] fresh repository (no commits yet)`);
|
|
161
164
|
repoResults.push({ gitRoot, active: true });
|
|
@@ -172,23 +175,23 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
172
175
|
// branch at HEAD when a stray session commit exists, so nothing is lost.
|
|
173
176
|
const warmBase = (0, git_branch_1.startPointFor)(gitRoot, opts, true);
|
|
174
177
|
if (warmBase) {
|
|
175
|
-
const warm = checkoutWithRecovery(gitRoot, cwd, [
|
|
178
|
+
const warm = checkoutWithRecovery(gitRoot, cwd, ['checkout', warmBase], git_core_1.GIT_SLOW_TIMEOUT_MS, opts, `[${repoName}] `);
|
|
176
179
|
if (warm.record)
|
|
177
180
|
recoveries.push(warm.record);
|
|
178
181
|
if (warm.co.ok) {
|
|
179
182
|
opts.log(`[git] [${repoName}] warmed on ${warmBase}`);
|
|
180
183
|
}
|
|
181
184
|
else if (warm.skip) {
|
|
182
|
-
opts.log(`[git] [${repoName}] git prep skipped - index still unusable (${warm.co.out.slice(0, 120)})`,
|
|
185
|
+
opts.log(`[git] [${repoName}] git prep skipped - index still unusable (${warm.co.out.slice(0, 120)})`, 'stderr');
|
|
183
186
|
repoResults.push({ gitRoot, active: false });
|
|
184
187
|
continue;
|
|
185
188
|
}
|
|
186
189
|
else {
|
|
187
|
-
opts.log(`[git] [${repoName}] could not switch to base ${warmBase} (${warm.co.out.slice(0, 120)}) - working on current branch`,
|
|
190
|
+
opts.log(`[git] [${repoName}] could not switch to base ${warmBase} (${warm.co.out.slice(0, 120)}) - working on current branch`, 'stderr');
|
|
188
191
|
}
|
|
189
192
|
}
|
|
190
193
|
else if (opts.independentBase) {
|
|
191
|
-
opts.log(`[git] [${repoName}] no default/base branch found to branch from - staying on current HEAD`,
|
|
194
|
+
opts.log(`[git] [${repoName}] no default/base branch found to branch from - staying on current HEAD`, 'stderr');
|
|
192
195
|
}
|
|
193
196
|
const branchInfo = (0, git_discovery_1.isOnDefaultBranch)(gitRoot);
|
|
194
197
|
if (branchInfo.onDefault) {
|
|
@@ -208,7 +211,7 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
208
211
|
}
|
|
209
212
|
catch (err) {
|
|
210
213
|
const reason = err instanceof Error ? err.message.slice(0, 120) : String(err);
|
|
211
|
-
opts.log(`[git] prepare failed: ${reason}`,
|
|
214
|
+
opts.log(`[git] prepare failed: ${reason}`, 'stderr');
|
|
212
215
|
return attach({ active: false, skipReason: `prepare-failed: ${reason}` });
|
|
213
216
|
}
|
|
214
217
|
}
|
|
@@ -216,10 +219,10 @@ function prepareRunGitUnlocked(cwd, opts) {
|
|
|
216
219
|
function prepareSingleRepo(gitRoot, opts, recoveries, cwd) {
|
|
217
220
|
(0, git_auto_1.ensureRepo)(gitRoot);
|
|
218
221
|
if ((0, index_recovery_1.isBlockedIndexRepo)(gitRoot)) {
|
|
219
|
-
opts.log(
|
|
222
|
+
opts.log('[git] git index is blocked (see [git-index-blocked]) - skipping git prep for this repo', 'stderr');
|
|
220
223
|
return {
|
|
221
224
|
active: false,
|
|
222
|
-
skipReason:
|
|
225
|
+
skipReason: 'index-blocked',
|
|
223
226
|
repos: [{ gitRoot, active: false }],
|
|
224
227
|
};
|
|
225
228
|
}
|
|
@@ -236,43 +239,43 @@ function prepareSingleRepo(gitRoot, opts, recoveries, cwd) {
|
|
|
236
239
|
}
|
|
237
240
|
const options = (0, config_1.projectGitOptions)(opts.projectId);
|
|
238
241
|
if (options.autoBranch === false) {
|
|
239
|
-
opts.log(
|
|
242
|
+
opts.log('[git] autoBranch disabled in config - working on the current branch');
|
|
240
243
|
return { active: true, repos: [{ gitRoot, active: true }] };
|
|
241
244
|
}
|
|
242
|
-
const head = (0, git_core_1.git)(gitRoot, [
|
|
245
|
+
const head = (0, git_core_1.git)(gitRoot, ['rev-parse', '--verify', 'HEAD']);
|
|
243
246
|
if (!head.ok) {
|
|
244
|
-
opts.log(
|
|
247
|
+
opts.log('[git] fresh repository (no commits yet) - committing on the current branch');
|
|
245
248
|
return { active: true, repos: [{ gitRoot, active: true }] };
|
|
246
249
|
}
|
|
247
250
|
const branch = (0, git_branch_1.desiredBranch)(opts);
|
|
248
|
-
const existing = (0, git_core_1.git)(gitRoot, [
|
|
251
|
+
const existing = (0, git_core_1.git)(gitRoot, ['rev-parse', '--verify', '--quiet', branch]);
|
|
249
252
|
const baseSha = head.out.slice(0, 7);
|
|
250
253
|
// chain base wins; independent tasks start from the (fetched) repo default.
|
|
251
|
-
const startPoint = existing.ok ?
|
|
254
|
+
const startPoint = existing.ok ? '' : (0, git_branch_1.startPointFor)(gitRoot, opts, true);
|
|
252
255
|
if (!existing.ok && !startPoint && opts.independentBase) {
|
|
253
|
-
opts.log(
|
|
256
|
+
opts.log('[git] no default/base branch found to branch from - staying on current HEAD', 'stderr');
|
|
254
257
|
}
|
|
255
258
|
const checkoutArgs = existing.ok
|
|
256
|
-
? [
|
|
259
|
+
? ['checkout', branch]
|
|
257
260
|
: startPoint
|
|
258
|
-
? [
|
|
259
|
-
: [
|
|
260
|
-
const checkout = checkoutWithRecovery(gitRoot, cwd, checkoutArgs, existing.ok ? git_core_1.GIT_TIMEOUT_MS : git_core_1.GIT_SLOW_TIMEOUT_MS, opts,
|
|
261
|
+
? ['checkout', '-B', branch, startPoint]
|
|
262
|
+
: ['checkout', '-B', branch];
|
|
263
|
+
const checkout = checkoutWithRecovery(gitRoot, cwd, checkoutArgs, existing.ok ? git_core_1.GIT_TIMEOUT_MS : git_core_1.GIT_SLOW_TIMEOUT_MS, opts, '');
|
|
261
264
|
if (checkout.record)
|
|
262
265
|
recoveries.push(checkout.record);
|
|
263
266
|
if (checkout.skip) {
|
|
264
267
|
// Never continue silently on the wrong branch with an unusable index:
|
|
265
268
|
// skip git prep for this repo so finalize does not commit it.
|
|
266
|
-
opts.log(`[git] git prep skipped - index unusable after recovery (${checkout.co.out.slice(0, 120)})`,
|
|
269
|
+
opts.log(`[git] git prep skipped - index unusable after recovery (${checkout.co.out.slice(0, 120)})`, 'stderr');
|
|
267
270
|
return {
|
|
268
271
|
active: false,
|
|
269
|
-
skipReason:
|
|
272
|
+
skipReason: 'index-blocked',
|
|
270
273
|
indexRecoveries: [...recoveries],
|
|
271
274
|
repos: [{ gitRoot, active: false }],
|
|
272
275
|
};
|
|
273
276
|
}
|
|
274
277
|
if (!checkout.co.ok) {
|
|
275
|
-
opts.log(`[git] could not switch to ${branch} (${checkout.co.out.slice(0, 120)}) - working on the current branch`,
|
|
278
|
+
opts.log(`[git] could not switch to ${branch} (${checkout.co.out.slice(0, 120)}) - working on the current branch`, 'stderr');
|
|
276
279
|
const branchInfo = (0, git_discovery_1.isOnDefaultBranch)(gitRoot);
|
|
277
280
|
return {
|
|
278
281
|
active: true,
|
|
@@ -308,18 +311,18 @@ exports.GIT_LOCK_WAIT_MS = 5 * 60_000;
|
|
|
308
311
|
* report note), never throws.
|
|
309
312
|
*/
|
|
310
313
|
async function prepareRunGitAsync(cwd, opts) {
|
|
311
|
-
const handle = await (0, repo_lock_1.acquireWsLock)({ kind:
|
|
314
|
+
const handle = await (0, repo_lock_1.acquireWsLock)({ kind: 'dir', path: cwd }, 'exclusive', {
|
|
312
315
|
agentId: opts.agentName,
|
|
313
316
|
taskId: opts.taskId,
|
|
314
317
|
projectId: opts.projectId ?? undefined,
|
|
315
|
-
label:
|
|
318
|
+
label: 'git prepare',
|
|
316
319
|
}, {
|
|
317
320
|
waitMs: opts.lockWaitMs ?? exports.GIT_LOCK_WAIT_MS,
|
|
318
321
|
pollMs: 1000,
|
|
319
|
-
onWaiting: () => opts.log(
|
|
322
|
+
onWaiting: () => opts.log('[git] workspace busy - waiting for branch setup...'),
|
|
320
323
|
});
|
|
321
324
|
if (!handle) {
|
|
322
|
-
opts.log(
|
|
325
|
+
opts.log('[git] workspace stayed busy - proceeding WITHOUT branch isolation', 'stderr');
|
|
323
326
|
return { active: true };
|
|
324
327
|
}
|
|
325
328
|
try {
|
|
@@ -332,7 +335,7 @@ async function prepareRunGitAsync(cwd, opts) {
|
|
|
332
335
|
}
|
|
333
336
|
if (prepared.branch) {
|
|
334
337
|
(0, bus_1.publishEvent)({
|
|
335
|
-
type:
|
|
338
|
+
type: 'lock.granted',
|
|
336
339
|
dir: cwd,
|
|
337
340
|
agentId: opts.agentName,
|
|
338
341
|
taskId: opts.taskId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-prepare.js","sourceRoot":"","sources":["../../../src/lib/git/git-prepare.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"git-prepare.js","sourceRoot":"","sources":["../../../src/lib/git/git-prepare.ts"],"names":[],"mappings":";;;AAqfA,gDAkDC;AAMD,sCAKC;AAljBD;;;;;;;;;GASG;AACH,yCAAqC;AACrC,yCAAwC;AACxC,sCAA8C;AAC9C,sDAAsE;AACtE,0CAAgD;AAChD,yCAAsE;AAEtE,iDAA0D;AAC1D,mDAAoD;AACpD,gDAI6B;AAC7B,6CAA4D;AAC5D,qDAM0B;AAuF1B;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAC3B,OAAe,EACf,GAAW,EACX,IAAc,EACd,SAAiB,EACjB,IAA0B,EAC1B,KAAa;IAMb,IAAI,EAAE,GAAG,IAAA,cAAG,EAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACvC,IAAI,EAAE,CAAC,EAAE;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,OAAO,CAAC,OAAO;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAEjD,IAAI,CAAC,GAAG,CACN,SAAS,KAAK,uCAAuC,OAAO,CAAC,IAAI,yBAAyB,EAC1F,QAAQ,CACT,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,oCAAmB,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1E,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACrC,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAErE,EAAE,GAAG,IAAA,cAAG,EAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACnC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;QACV,IAAI,CAAC,GAAG,CACN,SAAS,KAAK,iDAAiD,EAC/D,QAAQ,CACT,CAAC;QACF,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC1C,CAAC;IACD,OAAO;QACL,EAAE;QACF,MAAM,EAAE,IAAA,iCAAgB,EACtB,OAAO,EACP,GAAG,EACH,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,aAAa,EACjB,0CAA0C,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CACjE;QACD,IAAI,EAAE,IAAI;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAC5B,GAAW,EACX,IAA0B;IAE1B,MAAM,UAAU,GAA0B,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,CAAC,QAAqB,EAAe,EAAE,CACpD,UAAU,CAAC,MAAM,GAAG,CAAC;QACnB,CAAC,CAAC;YACE,GAAG,QAAQ;YACX,eAAe,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC;SACtE;QACH,CAAC,CAAC,QAAQ,CAAC;IACf,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACpE,OAAO,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,wEAAwE;QACxE,2EAA2E;QAC3E,wEAAwE;QACxE,yEAAyE;QACzE,wDAAwD;QACxD,IAAI,CAAC,IAAA,6BAAc,GAAE,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,IAAA,uBAAQ,GAAE,CAAC,MAAM,CAAC;YACjC,IAAI,CAAC,GAAG,CACN,sDAAsD,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK;gBACrF,iEAAiE,CACpE,CAAC;YACF,OAAO,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,yEAAyE;QACzE,2EAA2E;QAC3E,0EAA0E;QAC1E,IAAI,IAAA,oBAAW,EAAC,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,WAAW,GAAG,IAAA,wBAAe,EAAC,GAAG,CAAC,CAAC;YACzC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,WAAW;gBAAE,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;YACvD,IAAI,CAAC,GAAG,CACN,wFAAwF,CACzF,CAAC;YACF,OAAO,MAAM,CAAC;gBACZ,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;aACjE,CAAC,CAAC;QACL,CAAC;QAED,sBAAsB;QACtB,sEAAsE;QACtE,wCAAwC;QACxC,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,GAAG,CAAC,CAAC;QACtC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,2EAA2E;YAC3E,sEAAsE;YACtE,2EAA2E;YAC3E,0EAA0E;YAC1E,0EAA0E;YAC1E,4EAA4E;YAC5E,0EAA0E;YAC1E,kCAAkC;YAClC,IAAI,IAAA,4BAAmB,EAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,GAAG,CACN,sCAAsC,GAAG,6DAA6D;oBACpG,2GAA2G,CAC9G,CAAC;gBACF,OAAO,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,IAAI,CAAC,GAAG,CACN,8JAA8J,CAC/J,CAAC;YACF,OAAO,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,2DAA2D;QAC3D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,kEAAkE;QAClE,qEAAqE;QACrE,qCAAqC;QACrC,IAAI,CAAC,GAAG,CAAC,8BAA8B,QAAQ,CAAC,MAAM,eAAe,CAAC,CAAC;QACvE,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,IAAA,oBAAQ,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC5D,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;YAEpB,wEAAwE;YACxE,wEAAwE;YACxE,IAAI,IAAA,mCAAkB,EAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CACN,UAAU,QAAQ,oFAAoF,EACtG,QAAQ,CACT,CAAC;gBACF,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC7C,SAAS;YACX,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,UAAU,GAAG,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;gBAC9C,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;oBACzB,IAAI,CAAC,GAAG,CACN,UAAU,QAAQ,wBAAwB,UAAU,CAAC,aAAa,wDAAwD,CAC3H,CAAC;oBACF,YAAY,GAAG,IAAI,CAAC;gBACtB,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC;oBACf,OAAO;oBACP,MAAM,EAAE,IAAI;oBACZ,eAAe,EAAE,UAAU,CAAC,SAAS;iBACtC,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,qEAAqE;YACrE,MAAM,IAAI,GAAG,IAAA,cAAG,EAAC,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,UAAU,QAAQ,qCAAqC,CAAC,CAAC;gBAClE,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5C,SAAS;YACX,CAAC;YACD,sEAAsE;YACtE,gEAAgE;YAChE,mEAAmE;YACnE,uEAAuE;YACvE,EAAE;YACF,oEAAoE;YACpE,wEAAwE;YACxE,uEAAuE;YACvE,yEAAyE;YACzE,MAAM,QAAQ,GAAG,IAAA,0BAAa,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,GAAG,oBAAoB,CAC/B,OAAO,EACP,GAAG,EACH,CAAC,UAAU,EAAE,QAAQ,CAAC,EACtB,8BAAmB,EACnB,IAAI,EACJ,IAAI,QAAQ,IAAI,CACjB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM;oBAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC9C,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,UAAU,QAAQ,eAAe,QAAQ,EAAE,CAAC,CAAC;gBACxD,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACrB,IAAI,CAAC,GAAG,CACN,UAAU,QAAQ,8CAA8C,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,EAC5F,QAAQ,CACT,CAAC;oBACF,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC7C,SAAS;gBACX,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CACN,UAAU,QAAQ,8BAA8B,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,+BAA+B,EACrH,QAAQ,CACT,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CACN,UAAU,QAAQ,yEAAyE,EAC3F,QAAQ,CACT,CAAC;YACJ,CAAC;YACD,MAAM,UAAU,GAAG,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBACzB,YAAY,GAAG,IAAI,CAAC;YACtB,CAAC;YACD,WAAW,CAAC,IAAI,CAAC;gBACf,OAAO;gBACP,MAAM,EAAE,IAAI;gBACZ,eAAe,EAAE,UAAU,CAAC,SAAS;aACtC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;YACZ,MAAM,EAAE,IAAI;YACZ,eAAe,EAAE,YAAY;YAC7B,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,GACV,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,GAAG,CAAC,yBAAyB,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAC;QACtD,OAAO,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,mBAAmB,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,2DAA2D;AAC3D,SAAS,iBAAiB,CACxB,OAAe,EACf,IAA0B,EAC1B,UAAiC,EACjC,GAAW;IAEX,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;IAEpB,IAAI,IAAA,mCAAkB,EAAC,OAAO,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC,GAAG,CACN,wFAAwF,EACxF,QAAQ,CACT,CAAC;QACF,OAAO;YACL,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,eAAe;YAC3B,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SACpC,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,UAAU,GAAG,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CACN,4BAA4B,UAAU,CAAC,aAAa,wDAAwD,CAC7G,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,eAAe,EAAE,UAAU,CAAC,SAAS;YACrC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC;SAC1E,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClD,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QACjC,IAAI,CAAC,GAAG,CACN,qEAAqE,CACtE,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,cAAG,EAAC,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CACN,4EAA4E,CAC7E,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,0BAAa,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,cAAG,EAAC,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACrC,4EAA4E;IAC5E,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,0BAAa,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACzE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACxD,IAAI,CAAC,GAAG,CACN,6EAA6E,EAC7E,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,MAAM,YAAY,GAAa,QAAQ,CAAC,EAAE;QACxC,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC;QACtB,CAAC,CAAC,UAAU;YACV,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC;YACxC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,oBAAoB,CACnC,OAAO,EACP,GAAG,EACH,YAAY,EACZ,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAc,CAAC,CAAC,CAAC,8BAAmB,EAClD,IAAI,EACJ,EAAE,CACH,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM;QAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACtD,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,sEAAsE;QACtE,8DAA8D;QAC9D,IAAI,CAAC,GAAG,CACN,2DAA2D,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,EAC3F,QAAQ,CACT,CAAC;QACF,OAAO;YACL,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,eAAe;YAC3B,eAAe,EAAE,CAAC,GAAG,UAAU,CAAC;YAChC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SACpC,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACpB,IAAI,CAAC,GAAG,CACN,6BAA6B,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,mCAAmC,EACxG,QAAQ,CACT,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;QAC9C,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,eAAe,EAAE,UAAU,CAAC,SAAS;YACrC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC;SAC1E,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QAChB,IAAI,CAAC,GAAG,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;QACvD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC9E,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,GAAG,CAAC,gBAAgB,MAAM,iBAAiB,UAAU,EAAE,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,gBAAgB,MAAM,iBAAiB,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,MAAM;QACN,WAAW,EAAE,UAAU,IAAI,OAAO;QAClC,KAAK,EAAE;YACL,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,IAAI,OAAO,EAAE;SACtE;KACF,CAAC;AACJ,CAAC;AAED,yEAAyE;AAC5D,QAAA,gBAAgB,GAAG,CAAC,GAAG,MAAM,CAAC;AAE3C;;;;;GAKG;AACI,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,IAAoD;IAEpD,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAa,EAChC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAC1B,WAAW,EACX;QACE,OAAO,EAAE,IAAI,CAAC,SAAS;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;QACtC,KAAK,EAAE,aAAa;KACrB,EACD;QACE,MAAM,EAAE,IAAI,CAAC,UAAU,IAAI,wBAAgB;QAC3C,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,GAAG,EAAE,CACd,IAAI,CAAC,GAAG,CAAC,oDAAoD,CAAC;KACjE,CACF,CAAC;IACF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC,GAAG,CACN,mEAAmE,EACnE,QAAQ,CACT,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAClD,sEAAsE;QACtE,uEAAuE;QACvE,iDAAiD;QACjD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;YACjD,MAAM,IAAA,yCAAwB,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAC9D,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,IAAA,kBAAY,EAAC;gBACX,IAAI,EAAE,cAAc;gBACpB,GAAG,EAAE,GAAG;gBACR,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,UAAU,QAAQ,CAAC,MAAM,EAAE;aAClC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;YAAS,CAAC;QACT,IAAA,yBAAa,EAAC,MAAM,CAAC,CAAC;IACxB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,aAAa,CAC3B,GAAW,EACX,IAA0B;IAE1B,OAAO,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -117,7 +117,12 @@ function resolveGitBinary() {
|
|
|
117
117
|
const code = found.error.code ?? found.error.message;
|
|
118
118
|
// `where` itself missing is not evidence about git.
|
|
119
119
|
if (code !== 'ENOENT') {
|
|
120
|
-
return {
|
|
120
|
+
return {
|
|
121
|
+
found: false,
|
|
122
|
+
ok: false,
|
|
123
|
+
state: 'blocked',
|
|
124
|
+
detail: `where.exe git failed: ${code}`,
|
|
125
|
+
};
|
|
121
126
|
}
|
|
122
127
|
// where.exe is gone - fall through to the PATH probe below.
|
|
123
128
|
}
|
|
@@ -140,7 +145,7 @@ function resolveGitBinary() {
|
|
|
140
145
|
state: 'blocked',
|
|
141
146
|
detail: 'the only `git` on PATH is the TeamShare arbitration shim ' +
|
|
142
147
|
`(${candidates[0]}) - the probe cannot use it without deadlocking on ` +
|
|
143
|
-
|
|
148
|
+
"the daemon's own workspace lock",
|
|
144
149
|
};
|
|
145
150
|
}
|
|
146
151
|
}
|
|
@@ -175,7 +180,12 @@ function probeBinary(path) {
|
|
|
175
180
|
// ONLY ENOENT is proof of absence. Everything else - including the
|
|
176
181
|
// ETIMEDOUT that started all this - is an inconclusive probe.
|
|
177
182
|
if (code === 'ENOENT') {
|
|
178
|
-
return {
|
|
183
|
+
return {
|
|
184
|
+
state: 'absent',
|
|
185
|
+
ok: false,
|
|
186
|
+
resolvedPath: path,
|
|
187
|
+
detail: 'ENOENT',
|
|
188
|
+
};
|
|
179
189
|
}
|
|
180
190
|
return { state: 'blocked', ok: false, resolvedPath: path, detail: code };
|
|
181
191
|
}
|
|
@@ -210,7 +220,6 @@ function probeBinary(path) {
|
|
|
210
220
|
function shimFreeEnv() {
|
|
211
221
|
let shimsDir = '';
|
|
212
222
|
try {
|
|
213
|
-
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
214
223
|
const mod = require('../workspace/shims');
|
|
215
224
|
shimsDir = mod.SHIMS_DIR ?? '';
|
|
216
225
|
if (typeof mod.envWithoutShims === 'function') {
|
|
@@ -265,7 +274,6 @@ function normalizePathEntry(entry) {
|
|
|
265
274
|
}
|
|
266
275
|
function shimDirNormalized() {
|
|
267
276
|
try {
|
|
268
|
-
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
269
277
|
const mod = require('../workspace/shims');
|
|
270
278
|
return mod.SHIMS_DIR ? normalizePathEntry(mod.SHIMS_DIR) : '';
|
|
271
279
|
}
|
|
@@ -277,7 +285,9 @@ function isInsideShimDir(candidate, shimDir) {
|
|
|
277
285
|
if (!shimDir)
|
|
278
286
|
return false;
|
|
279
287
|
const norm = normalizePathEntry(candidate);
|
|
280
|
-
return norm === shimDir ||
|
|
288
|
+
return (norm === shimDir ||
|
|
289
|
+
norm.startsWith(`${shimDir}/`) ||
|
|
290
|
+
norm.startsWith(`${shimDir}\\`));
|
|
281
291
|
}
|
|
282
292
|
// ── user-facing text ────────────────────────────────────────────────────────
|
|
283
293
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-presence.js","sourceRoot":"","sources":["../../../src/lib/git/git-presence.ts"],"names":[],"mappings":";;AA8EA,8DAGC;AAGD,4BAYC;AAGD,wCAEC;AASD,0DAEC;
|
|
1
|
+
{"version":3,"file":"git-presence.js","sourceRoot":"","sources":["../../../src/lib/git/git-presence.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,8 +93,15 @@ function git(cwd, args, timeoutMs = GIT_TIMEOUT_MS) {
|
|
|
93
93
|
// mirror failures as `(Command failed: git worktree add "…" --detach <branch>\n)`
|
|
94
94
|
// with a blank reason: git's `fatal: …` was on stderr and never printed.
|
|
95
95
|
// Empty-string checks, not nullish checks.
|
|
96
|
-
const out = (stdout.trim() ||
|
|
97
|
-
|
|
96
|
+
const out = (stdout.trim() ||
|
|
97
|
+
stderr.trim() ||
|
|
98
|
+
describeDeath(res, cwd, args)).trim();
|
|
99
|
+
return {
|
|
100
|
+
ok: exitCode === 0,
|
|
101
|
+
out,
|
|
102
|
+
exitCode,
|
|
103
|
+
shimLockTimeout: exitCode === exports.GIT_SHIM_LOCK_TIMEOUT_EXIT,
|
|
104
|
+
};
|
|
98
105
|
}
|
|
99
106
|
catch (err) {
|
|
100
107
|
return {
|
|
@@ -134,7 +141,10 @@ function getConflictedFiles(gitRoot) {
|
|
|
134
141
|
const r = git(gitRoot, ['diff', '--name-only', '--diff-filter=U']);
|
|
135
142
|
if (!r.ok || !r.out)
|
|
136
143
|
return [];
|
|
137
|
-
return r.out
|
|
144
|
+
return r.out
|
|
145
|
+
.split('\n')
|
|
146
|
+
.map((l) => l.trim())
|
|
147
|
+
.filter(Boolean);
|
|
138
148
|
}
|
|
139
149
|
/**
|
|
140
150
|
* Paths captured by a stash. Tracked paths come from `stash show`; untracked
|
|
@@ -143,7 +153,13 @@ function getConflictedFiles(gitRoot) {
|
|
|
143
153
|
*/
|
|
144
154
|
function stashFiles(gitRoot, ref) {
|
|
145
155
|
const files = new Set();
|
|
146
|
-
let r = git(gitRoot, [
|
|
156
|
+
let r = git(gitRoot, [
|
|
157
|
+
'stash',
|
|
158
|
+
'show',
|
|
159
|
+
'--name-only',
|
|
160
|
+
'--include-untracked',
|
|
161
|
+
ref,
|
|
162
|
+
]);
|
|
147
163
|
if (!r.ok)
|
|
148
164
|
r = git(gitRoot, ['stash', 'show', '--name-only', ref]);
|
|
149
165
|
if (r.ok && r.out) {
|
|
@@ -184,7 +200,9 @@ function listStashes(gitRoot, cwd, currentTaskId) {
|
|
|
184
200
|
taskId: m[1],
|
|
185
201
|
isSelf: m[1] === currentTaskId,
|
|
186
202
|
leftover: Boolean(m[2]),
|
|
187
|
-
date: dateRes.ok && dateRes.out
|
|
203
|
+
date: dateRes.ok && dateRes.out
|
|
204
|
+
? dateRes.out.split('\n')[0].trim()
|
|
205
|
+
: 'unknown',
|
|
188
206
|
files: stashFiles(gitRoot, ref),
|
|
189
207
|
});
|
|
190
208
|
}
|
|
@@ -198,7 +216,12 @@ function listStashes(gitRoot, cwd, currentTaskId) {
|
|
|
198
216
|
function popStashByRef(gitRoot, ref, log) {
|
|
199
217
|
// Capture the entry (tag + commit) before popping so a CONFLICTED pop can
|
|
200
218
|
// be handed to the next run with its backup still on the stash list.
|
|
201
|
-
const sha = git(gitRoot, [
|
|
219
|
+
const sha = git(gitRoot, [
|
|
220
|
+
'rev-parse',
|
|
221
|
+
'--verify',
|
|
222
|
+
'--quiet',
|
|
223
|
+
ref,
|
|
224
|
+
]).out.trim();
|
|
202
225
|
if (!sha) {
|
|
203
226
|
log(`[git-stash] daemon pop skipped - ${ref} does not exist in ${gitRoot} (never created, or already popped/dropped)`, 'stderr');
|
|
204
227
|
return false;
|
|
@@ -304,7 +327,15 @@ function retainStashAfterConflictedPop(gitRoot, tag, before, name, log) {
|
|
|
304
327
|
async function stashRepo(gitRoot, taskId, cwd, api, log, opts = {}) {
|
|
305
328
|
const name = repoName(cwd, gitRoot);
|
|
306
329
|
const leftover = opts.leftover === true;
|
|
307
|
-
const base = {
|
|
330
|
+
const base = {
|
|
331
|
+
gitRoot,
|
|
332
|
+
repoName: name,
|
|
333
|
+
wasDirty: false,
|
|
334
|
+
stashed: false,
|
|
335
|
+
leftover,
|
|
336
|
+
popped: true,
|
|
337
|
+
popConflicts: false,
|
|
338
|
+
};
|
|
308
339
|
// Keep the local scratch folder (research/tool outputs) out of git so it
|
|
309
340
|
// never shows as dirty and is never swept into a stash or commit. Not
|
|
310
341
|
// gated on isolation: this is a dirt-hygiene concern, not a stash concern.
|
|
@@ -334,7 +365,13 @@ async function stashRepo(gitRoot, taskId, cwd, api, log, opts = {}) {
|
|
|
334
365
|
if (rec) {
|
|
335
366
|
await (0, index_recovery_1.postIndexRecoveryComment)(api, taskId, rec).catch(() => undefined);
|
|
336
367
|
if (rec.status === 'recovered') {
|
|
337
|
-
push = git(gitRoot, [
|
|
368
|
+
push = git(gitRoot, [
|
|
369
|
+
'stash',
|
|
370
|
+
'push',
|
|
371
|
+
'-m',
|
|
372
|
+
tag,
|
|
373
|
+
'--include-untracked',
|
|
374
|
+
]);
|
|
338
375
|
}
|
|
339
376
|
}
|
|
340
377
|
}
|
|
@@ -344,7 +381,8 @@ async function stashRepo(gitRoot, taskId, cwd, api, log, opts = {}) {
|
|
|
344
381
|
log(`[git-stash] ${name}stash failed: ${errMsg}`, 'stderr');
|
|
345
382
|
// Post failure comment — user needs to know their changes are exposed
|
|
346
383
|
if (api) {
|
|
347
|
-
await api
|
|
384
|
+
await api
|
|
385
|
+
.addComment({
|
|
348
386
|
taskId,
|
|
349
387
|
body: [
|
|
350
388
|
`[git-stash-failed] Could not stash uncommitted changes before the run.`,
|
|
@@ -354,7 +392,8 @@ async function stashRepo(gitRoot, taskId, cwd, api, log, opts = {}) {
|
|
|
354
392
|
'',
|
|
355
393
|
`Your uncommitted changes remain in the working tree and may be affected by branch operations.`,
|
|
356
394
|
].join('\n'),
|
|
357
|
-
})
|
|
395
|
+
})
|
|
396
|
+
.catch(() => undefined);
|
|
358
397
|
}
|
|
359
398
|
return { ...base, error: errMsg };
|
|
360
399
|
}
|
|
@@ -388,10 +427,14 @@ async function stashRepo(gitRoot, taskId, cwd, api, log, opts = {}) {
|
|
|
388
427
|
if (api) {
|
|
389
428
|
const files = stashFiles(gitRoot, stashIndex);
|
|
390
429
|
const fileLines = files.length
|
|
391
|
-
? files
|
|
430
|
+
? files
|
|
431
|
+
.slice(0, 20)
|
|
432
|
+
.map((f) => ` - \`${f}\``)
|
|
433
|
+
.join('\n') +
|
|
392
434
|
(files.length > 20 ? `\n - *(+${files.length - 20} more)*` : '')
|
|
393
435
|
: ' - (file list unavailable)';
|
|
394
|
-
await api
|
|
436
|
+
await api
|
|
437
|
+
.addComment({
|
|
395
438
|
taskId,
|
|
396
439
|
body: [
|
|
397
440
|
leftover
|
|
@@ -408,7 +451,8 @@ async function stashRepo(gitRoot, taskId, cwd, api, log, opts = {}) {
|
|
|
408
451
|
`they are NOT lost — the next run reports this stash (report-only). To restore now:`,
|
|
409
452
|
`\`cd ${name} && git stash apply ${stashIndex}\` (non-destructive).`,
|
|
410
453
|
].join('\n'),
|
|
411
|
-
})
|
|
454
|
+
})
|
|
455
|
+
.catch(() => undefined);
|
|
412
456
|
}
|
|
413
457
|
return { ...base, wasDirty: true, stashed: true, stashRef: tag, stashIndex };
|
|
414
458
|
}
|
|
@@ -439,7 +483,8 @@ async function popRepo(gitRoot, result, cwd, taskId, api, log) {
|
|
|
439
483
|
if (pop.ok) {
|
|
440
484
|
log(`[git-stash] ${name}pop restored cleanly`);
|
|
441
485
|
if (api) {
|
|
442
|
-
await api
|
|
486
|
+
await api
|
|
487
|
+
.addComment({
|
|
443
488
|
taskId,
|
|
444
489
|
body: [
|
|
445
490
|
`[git-pop-restored] Stashed changes restored successfully.`,
|
|
@@ -448,7 +493,8 @@ async function popRepo(gitRoot, result, cwd, taskId, api, log) {
|
|
|
448
493
|
`- **Repo:** \`${name}\``,
|
|
449
494
|
`- **Status:** Clean pop — all changes restored.`,
|
|
450
495
|
].join('\n'),
|
|
451
|
-
})
|
|
496
|
+
})
|
|
497
|
+
.catch(() => undefined);
|
|
452
498
|
}
|
|
453
499
|
return { ...result, popped: true, popConflicts: false };
|
|
454
500
|
}
|
|
@@ -464,7 +510,8 @@ async function popRepo(gitRoot, result, cwd, taskId, api, log) {
|
|
|
464
510
|
const fileList = conflictedFiles.length > 0
|
|
465
511
|
? conflictedFiles.map((f) => ` - \`${f}\``).join('\n')
|
|
466
512
|
: ' - (unable to determine conflicted files)';
|
|
467
|
-
await api
|
|
513
|
+
await api
|
|
514
|
+
.addComment({
|
|
468
515
|
taskId,
|
|
469
516
|
body: [
|
|
470
517
|
`[git-pop-conflicts] Stash pop completed with merge conflicts.`,
|
|
@@ -484,9 +531,15 @@ async function popRepo(gitRoot, result, cwd, taskId, api, log) {
|
|
|
484
531
|
`(or \`git merge --abort\` / \`git reset --hard HEAD\`, which discards the unmerged`,
|
|
485
532
|
`tree but keeps the stash entry).`,
|
|
486
533
|
].join('\n'),
|
|
487
|
-
})
|
|
534
|
+
})
|
|
535
|
+
.catch(() => undefined);
|
|
488
536
|
}
|
|
489
|
-
return {
|
|
537
|
+
return {
|
|
538
|
+
...result,
|
|
539
|
+
popped: true,
|
|
540
|
+
popConflicts: true,
|
|
541
|
+
popConflictedFiles: conflictedFiles,
|
|
542
|
+
};
|
|
490
543
|
}
|
|
491
544
|
// ---------------------------------------------------------------------------
|
|
492
545
|
// Orphaned stash detection
|
|
@@ -520,10 +573,16 @@ async function checkOrphanedStashes(cwd, currentTaskId, api, log) {
|
|
|
520
573
|
if (!api)
|
|
521
574
|
continue;
|
|
522
575
|
const fileLines = orphan.files.length
|
|
523
|
-
? orphan.files
|
|
524
|
-
|
|
576
|
+
? orphan.files
|
|
577
|
+
.slice(0, 20)
|
|
578
|
+
.map((f) => ` - \`${f}\``)
|
|
579
|
+
.join('\n') +
|
|
580
|
+
(orphan.files.length > 20
|
|
581
|
+
? `\n - *(+${orphan.files.length - 20} more)*`
|
|
582
|
+
: '')
|
|
525
583
|
: ' - (file list unavailable)';
|
|
526
|
-
await api
|
|
584
|
+
await api
|
|
585
|
+
.addComment({
|
|
527
586
|
taskId: currentTaskId,
|
|
528
587
|
body: [
|
|
529
588
|
orphan.isSelf
|
|
@@ -541,7 +600,8 @@ async function checkOrphanedStashes(cwd, currentTaskId, api, log) {
|
|
|
541
600
|
`To restore: \`cd ${orphan.repoName} && git stash apply ${orphan.stashIndex}\` (non-destructive)`,
|
|
542
601
|
`To discard: \`cd ${orphan.repoName} && git stash drop ${orphan.stashIndex}\``,
|
|
543
602
|
].join('\n'),
|
|
544
|
-
})
|
|
603
|
+
})
|
|
604
|
+
.catch(() => undefined);
|
|
545
605
|
}
|
|
546
606
|
}
|
|
547
607
|
return found;
|