@pugi/cli 0.1.0-beta.5 → 0.1.0-beta.50
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/THIRD_PARTY_NOTICES.md +40 -0
- package/assets/pugi-mascot.ansi +15 -25
- package/assets/pugi-prozr2-mascot.ansi +9 -0
- package/bin/run.js +33 -1
- package/dist/commands/jobs-watch.js +201 -0
- package/dist/commands/jobs.js +15 -0
- package/dist/commands/smoke.js +133 -0
- package/dist/core/agent-progress/cleanup.js +134 -0
- package/dist/core/agent-progress/schema.js +144 -0
- package/dist/core/agent-progress/writer.js +101 -0
- package/dist/core/artifact-chain/dispatcher.js +148 -0
- package/dist/core/artifact-chain/exporter.js +164 -0
- package/dist/core/artifact-chain/state.js +243 -0
- package/dist/core/artifact-chain/steps.js +169 -0
- package/dist/core/auth/ensure-authenticated.js +129 -0
- package/dist/core/auth/env-provider.js +238 -0
- package/dist/core/auto-update/channels.js +122 -0
- package/dist/core/auto-update/checker.js +241 -0
- package/dist/core/auto-update/state.js +235 -0
- package/dist/core/bare-mode/index.js +107 -0
- package/dist/core/bash-classifier.js +400 -4
- package/dist/core/checkpoint/resumer.js +149 -0
- package/dist/core/checkpoint/rewinder.js +291 -0
- package/dist/core/codegraph/decision-store.js +248 -0
- package/dist/core/codegraph/detect-repo.js +459 -0
- package/dist/core/codegraph/install.js +134 -0
- package/dist/core/codegraph/offer-hook.js +220 -0
- package/dist/core/compact/auto-trigger.js +96 -0
- package/dist/core/compact/buffer-rewriter.js +115 -0
- package/dist/core/compact/summarizer.js +208 -0
- package/dist/core/compact/token-counter.js +108 -0
- package/dist/core/consensus/diff-capture.js +112 -3
- package/dist/core/context/index.js +7 -0
- package/dist/core/context/markdown-traverse.js +255 -0
- package/dist/core/cost/rate-card.js +129 -0
- package/dist/core/cost/tracker.js +221 -0
- package/dist/core/denial-tracking/index.js +8 -0
- package/dist/core/denial-tracking/state.js +264 -0
- package/dist/core/diagnostics/probe-runner.js +93 -0
- package/dist/core/diagnostics/probes/api.js +46 -0
- package/dist/core/diagnostics/probes/auth.js +86 -0
- package/dist/core/diagnostics/probes/bare-mode.js +42 -0
- package/dist/core/diagnostics/probes/cli-version.js +127 -0
- package/dist/core/diagnostics/probes/config.js +72 -0
- package/dist/core/diagnostics/probes/denial-tracking.js +57 -0
- package/dist/core/diagnostics/probes/disk.js +81 -0
- package/dist/core/diagnostics/probes/git.js +65 -0
- package/dist/core/diagnostics/probes/hooks.js +118 -0
- package/dist/core/diagnostics/probes/mcp.js +75 -0
- package/dist/core/diagnostics/probes/node.js +59 -0
- package/dist/core/diagnostics/probes/pnpm.js +36 -0
- package/dist/core/diagnostics/probes/pugi-md.js +89 -0
- package/dist/core/diagnostics/probes/sandbox.js +40 -0
- package/dist/core/diagnostics/probes/session.js +74 -0
- package/dist/core/diagnostics/probes/status-snapshot.js +488 -0
- package/dist/core/diagnostics/probes/workspace.js +63 -0
- package/dist/core/diagnostics/types.js +70 -0
- package/dist/core/dispatch/cache-cleanup.js +197 -0
- package/dist/core/dispatch/cache-handoff.js +295 -0
- package/dist/core/edits/dispatch.js +218 -2
- package/dist/core/edits/journal.js +199 -0
- package/dist/core/edits/layer-d-ast.js +557 -14
- package/dist/core/edits/verify-hook.js +273 -0
- package/dist/core/edits/worktree.js +322 -0
- package/dist/core/engine/anvil-client.js +115 -5
- package/dist/core/engine/budgets.js +98 -0
- package/dist/core/engine/context-prefix.js +155 -0
- package/dist/core/engine/intent.js +260 -0
- package/dist/core/engine/native-pugi.js +860 -211
- package/dist/core/engine/prompts.js +88 -2
- package/dist/core/engine/strip-internal-fields.js +124 -0
- package/dist/core/engine/tool-bridge.js +1045 -36
- package/dist/core/feedback/queue.js +177 -0
- package/dist/core/feedback/submitter.js +145 -0
- package/dist/core/file-cache.js +113 -1
- package/dist/core/hooks/events.js +44 -0
- package/dist/core/hooks/index.js +15 -0
- package/dist/core/hooks/registry.js +213 -0
- package/dist/core/hooks/runner.js +236 -0
- package/dist/core/hooks/v2/event-emitter.js +115 -0
- package/dist/core/hooks/v2/executor.js +282 -0
- package/dist/core/hooks/v2/index.js +25 -0
- package/dist/core/hooks/v2/lifecycle.js +104 -0
- package/dist/core/hooks/v2/loader.js +216 -0
- package/dist/core/hooks/v2/matcher.js +125 -0
- package/dist/core/hooks/v2/trust.js +143 -0
- package/dist/core/hooks/v2/types.js +86 -0
- package/dist/core/lsp/cache.js +105 -0
- package/dist/core/lsp/client.js +776 -0
- package/dist/core/lsp/language-detect.js +66 -0
- package/dist/core/lsp/post-edit-diagnostics.js +171 -0
- package/dist/core/mcp/client.js +75 -6
- package/dist/core/mcp/http-server.js +553 -0
- package/dist/core/mcp/orchestrator-tools.js +662 -0
- package/dist/core/mcp/permission.js +190 -0
- package/dist/core/mcp/registry.js +24 -2
- package/dist/core/mcp/server-tools.js +219 -0
- package/dist/core/mcp/server.js +397 -0
- package/dist/core/memory/dual-write.js +416 -0
- package/dist/core/memory/phase1-kinds.js +20 -0
- package/dist/core/memory-sync/queue.js +158 -0
- package/dist/core/onboarding/ensure-initialized.js +133 -0
- package/dist/core/onboarding/marker.js +111 -0
- package/dist/core/onboarding/telemetry-state.js +108 -0
- package/dist/core/output-style/presets.js +176 -0
- package/dist/core/output-style/state.js +185 -0
- package/dist/core/path-security.js +284 -2
- package/dist/core/permissions/auto-classifier.js +124 -0
- package/dist/core/permissions/circuit-breaker.js +83 -0
- package/dist/core/permissions/gate.js +278 -0
- package/dist/core/permissions/index.js +20 -0
- package/dist/core/permissions/mode.js +174 -0
- package/dist/core/permissions/state.js +241 -0
- package/dist/core/permissions/tool-class.js +93 -0
- package/dist/core/prd-check/parser.js +215 -0
- package/dist/core/prd-check/reporter.js +127 -0
- package/dist/core/prd-check/session-review.js +557 -0
- package/dist/core/prd-check/verifiers.js +223 -0
- package/dist/core/pugi-md/context-injector.js +76 -0
- package/dist/core/pugi-md/walk-up.js +207 -0
- package/dist/core/release-notes/parser.js +241 -0
- package/dist/core/release-notes/state.js +116 -0
- package/dist/core/repl/history.js +11 -1
- package/dist/core/repl/model-pricing.js +135 -0
- package/dist/core/repl/session.js +1897 -37
- package/dist/core/repl/slash-commands.js +430 -15
- package/dist/core/repl/store/session-store.js +31 -2
- package/dist/core/repl/workspace-context.js +22 -0
- package/dist/core/repo-map/build.js +125 -0
- package/dist/core/repo-map/cache.js +185 -0
- package/dist/core/repo-map/extractor.js +254 -0
- package/dist/core/repo-map/formatter.js +145 -0
- package/dist/core/repo-map/scanner.js +211 -0
- package/dist/core/retry-budget/budget.js +284 -0
- package/dist/core/retry-budget/index.js +5 -0
- package/dist/core/session.js +92 -0
- package/dist/core/settings.js +80 -0
- package/dist/core/share/formatter.js +271 -0
- package/dist/core/share/redactor.js +221 -0
- package/dist/core/share/uploader.js +267 -0
- package/dist/core/skills/defaults.js +457 -0
- package/dist/core/smoke/headless-driver.js +174 -0
- package/dist/core/smoke/orchestrator.js +194 -0
- package/dist/core/smoke/runner.js +238 -0
- package/dist/core/smoke/scenario-parser.js +316 -0
- package/dist/core/subagents/dispatcher-real.js +600 -0
- package/dist/core/subagents/dispatcher.js +113 -24
- package/dist/core/subagents/index.js +18 -5
- package/dist/core/subagents/isolation-matrix.js +213 -0
- package/dist/core/subagents/spawn.js +19 -4
- package/dist/core/telemetry/emitter.js +229 -0
- package/dist/core/telemetry/queue.js +251 -0
- package/dist/core/theme/context.js +91 -0
- package/dist/core/theme/presets.js +228 -0
- package/dist/core/theme/state.js +181 -0
- package/dist/core/todos/invariant.js +10 -0
- package/dist/core/todos/state.js +177 -0
- package/dist/core/transport/version-interceptor.js +166 -0
- package/dist/core/vim/keymap.js +288 -0
- package/dist/core/vim/state.js +92 -0
- package/dist/core/worktree-manager/cleanup.js +123 -0
- package/dist/core/worktree-manager/manager.js +303 -0
- package/dist/index.js +28 -0
- package/dist/runtime/bootstrap.js +190 -0
- package/dist/runtime/cli.js +3241 -343
- package/dist/runtime/commands/cancel.js +231 -0
- package/dist/runtime/commands/chain.js +489 -0
- package/dist/runtime/commands/codegraph-status.js +227 -0
- package/dist/runtime/commands/compact.js +297 -0
- package/dist/runtime/commands/cost.js +199 -0
- package/dist/runtime/commands/delegate.js +242 -11
- package/dist/runtime/commands/dispatch.js +126 -0
- package/dist/runtime/commands/doctor.js +412 -0
- package/dist/runtime/commands/feedback.js +184 -0
- package/dist/runtime/commands/hooks.js +184 -0
- package/dist/runtime/commands/lsp.js +368 -0
- package/dist/runtime/commands/mcp.js +879 -0
- package/dist/runtime/commands/memory.js +508 -0
- package/dist/runtime/commands/model.js +237 -0
- package/dist/runtime/commands/onboarding.js +275 -0
- package/dist/runtime/commands/patch.js +128 -0
- package/dist/runtime/commands/permissions.js +112 -0
- package/dist/runtime/commands/plan.js +143 -0
- package/dist/runtime/commands/prd-check.js +285 -0
- package/dist/runtime/commands/redo-blob-store.js +92 -0
- package/dist/runtime/commands/redo.js +361 -0
- package/dist/runtime/commands/release-notes.js +229 -0
- package/dist/runtime/commands/repo-map.js +95 -0
- package/dist/runtime/commands/report.js +299 -0
- package/dist/runtime/commands/resume.js +118 -0
- package/dist/runtime/commands/review-consensus.js +17 -2
- package/dist/runtime/commands/rewind.js +333 -0
- package/dist/runtime/commands/sessions.js +163 -0
- package/dist/runtime/commands/share.js +316 -0
- package/dist/runtime/commands/status.js +186 -0
- package/dist/runtime/commands/stickers.js +82 -0
- package/dist/runtime/commands/style.js +194 -0
- package/dist/runtime/commands/theme.js +196 -0
- package/dist/runtime/commands/undo.js +32 -0
- package/dist/runtime/commands/update.js +289 -0
- package/dist/runtime/commands/vim.js +140 -0
- package/dist/runtime/commands/worktree.js +177 -0
- package/dist/runtime/commands/worktrees.js +155 -0
- package/dist/runtime/headless-repl.js +195 -0
- package/dist/runtime/headless.js +543 -0
- package/dist/runtime/load-hooks-or-exit.js +71 -0
- package/dist/runtime/plan-decompose.js +531 -0
- package/dist/runtime/version.js +65 -0
- package/dist/tools/agent-tool.js +229 -0
- package/dist/tools/apply-patch.js +556 -0
- package/dist/tools/ask-user-question.js +213 -0
- package/dist/tools/ask-user.js +115 -0
- package/dist/tools/bash.js +203 -4
- package/dist/tools/file-tools.js +85 -14
- package/dist/tools/lsp-tools.js +189 -0
- package/dist/tools/mcp-tool.js +260 -0
- package/dist/tools/multi-edit.js +361 -0
- package/dist/tools/powershell.js +268 -0
- package/dist/tools/registry.js +51 -0
- package/dist/tools/skill-tool.js +96 -0
- package/dist/tools/tasks.js +208 -0
- package/dist/tools/todo-write.js +184 -0
- package/dist/tools/web-fetch.js +147 -2
- package/dist/tools/web-search.js +458 -0
- package/dist/tui/agent-progress-card.js +111 -0
- package/dist/tui/agent-tree.js +10 -0
- package/dist/tui/ask-modal.js +2 -2
- package/dist/tui/ask-user-question-prompt.js +192 -0
- package/dist/tui/compact-banner.js +81 -0
- package/dist/tui/conversation-pane.js +82 -8
- package/dist/tui/cost-table.js +111 -0
- package/dist/tui/doctor-table.js +46 -0
- package/dist/tui/feedback-prompt.js +156 -0
- package/dist/tui/input-box.js +218 -3
- package/dist/tui/markdown-render.js +4 -4
- package/dist/tui/onboarding-wizard.js +240 -0
- package/dist/tui/permissions-picker.js +86 -0
- package/dist/tui/render.js +35 -0
- package/dist/tui/repl-render.js +313 -35
- package/dist/tui/repl-splash-art.js +1 -1
- package/dist/tui/repl-splash-mascot.js +32 -8
- package/dist/tui/repl-splash.js +2 -2
- package/dist/tui/repl.js +85 -5
- package/dist/tui/splash.js +1 -1
- package/dist/tui/status-bar.js +94 -16
- package/dist/tui/status-table.js +7 -0
- package/dist/tui/stickers-art.js +136 -0
- package/dist/tui/style-table.js +28 -0
- package/dist/tui/theme-table.js +29 -0
- package/dist/tui/thinking-spinner.js +123 -0
- package/dist/tui/tool-stream-pane.js +52 -3
- package/dist/tui/update-banner.js +27 -2
- package/dist/tui/vim-input.js +267 -0
- package/dist/tui/welcome-banner.js +107 -0
- package/dist/tui/welcome-data.js +293 -0
- package/docs/examples/codegraph.mcp.json +10 -0
- package/package.json +12 -6
- package/test/scenarios/codegen-create-file.scenario.txt +13 -0
- package/test/scenarios/compact-force.scenario.txt +11 -0
- package/test/scenarios/identity.scenario.txt +11 -0
- package/test/scenarios/persona-handoff.scenario.txt +11 -0
- package/test/scenarios/walkback.scenario.txt +12 -0
- package/dist/core/engine/compaction-hook.js +0 -154
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verify hook — β1b Pl10 (2026-05-26).
|
|
3
|
+
*
|
|
4
|
+
* After the edit-dispatcher writes a multi-file change to the
|
|
5
|
+
* workspace, this hook fires three lightweight checks against the
|
|
6
|
+
* post-state and reports each result back to the engine loop as a
|
|
7
|
+
* status event:
|
|
8
|
+
*
|
|
9
|
+
* 1. tsc — if `tsconfig.json` is present in the workspace root, run
|
|
10
|
+
* `tsc --noEmit` to catch compile-time breakage. Pass/fail tracked
|
|
11
|
+
* per file is overkill at this stage; we surface the exit code +
|
|
12
|
+
* first ~40 lines of stderr.
|
|
13
|
+
* 2. tests — if package.json has a `test` script AND a test runner
|
|
14
|
+
* is available (jest / vitest / node --test), run `pnpm test
|
|
15
|
+
* --bail` (or `npm test --bail`). Same exit-code + tail of output
|
|
16
|
+
* contract.
|
|
17
|
+
* 3. URL probes — extract every `https?://...` literal from the diff
|
|
18
|
+
* (README + code) and HEAD-probe each. A response < 400 counts as
|
|
19
|
+
* live; >=400 surfaces as a warning. Capped at 8 unique URLs per
|
|
20
|
+
* hook to avoid spending the budget on doc rot.
|
|
21
|
+
*
|
|
22
|
+
* Retry contract (β1b r1 rescope): the hook itself is stateless and
|
|
23
|
+
* runs ONCE per invocation, returning a structured report. The
|
|
24
|
+
* "feedback → model → re-edit" retry orchestrator does NOT exist yet
|
|
25
|
+
* in the engine loop — it was promised as part of β1b Pl10 but never
|
|
26
|
+
* shipped because the engine refactor that hosts it is bigger than
|
|
27
|
+
* the verify-hook itself can absorb. Retry orchestration is deferred
|
|
28
|
+
* to β6 plan-mode integration where the loop already needs a
|
|
29
|
+
* model→hook feedback channel for plan replay. Today the operator
|
|
30
|
+
* re-runs `pugi code` to re-drive verification after a fail. The
|
|
31
|
+
* stateless hook ships unchanged so the β6 driver can wrap it.
|
|
32
|
+
*
|
|
33
|
+
* Why HEAD and not GET for URL probes:
|
|
34
|
+
* - HEAD avoids the body fetch; cheaper + faster.
|
|
35
|
+
* - SSRF guard from `web-fetch.ts::validateHostnameForFetch` runs
|
|
36
|
+
* before every probe so private IPs / localhost cannot ride.
|
|
37
|
+
* - Some servers reject HEAD (rare but real); on 4xx-from-HEAD we
|
|
38
|
+
* do NOT escalate to GET — that would burn the budget. We surface
|
|
39
|
+
* a `head_rejected` warning so the operator decides.
|
|
40
|
+
*
|
|
41
|
+
* Skip cases (return early with `skipped: true` on the relevant
|
|
42
|
+
* check):
|
|
43
|
+
* - tsc: no `tsconfig.json` at workspace root.
|
|
44
|
+
* - tests: no `package.json` OR no `test` script.
|
|
45
|
+
* - urls: no `https?://...` literals in the diff.
|
|
46
|
+
*
|
|
47
|
+
* Best-effort: every failure mode degrades to a structured report; the
|
|
48
|
+
* hook itself NEVER throws. The engine loop decides whether to
|
|
49
|
+
* surface as a hard fail vs a model-correctable warning.
|
|
50
|
+
*
|
|
51
|
+
* Brand voice: ASCII only, no banned words.
|
|
52
|
+
*/
|
|
53
|
+
import { spawnSync } from 'node:child_process';
|
|
54
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
55
|
+
import { resolve } from 'node:path';
|
|
56
|
+
import { validateHostnameForFetch } from '../../tools/web-fetch.js';
|
|
57
|
+
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
58
|
+
const DEFAULT_MAX_URL_PROBES = 8;
|
|
59
|
+
const URL_LITERAL_RE = /(https?:\/\/[^\s"'<>()`\\\]]+)/g;
|
|
60
|
+
/**
|
|
61
|
+
* Drive one verify pass. Synchronous tsc + test child processes,
|
|
62
|
+
* concurrent URL probes (up to `maxUrlProbes`). Returns once every
|
|
63
|
+
* check has completed (no streaming events — the caller wraps the
|
|
64
|
+
* report into its own status event format).
|
|
65
|
+
*/
|
|
66
|
+
export async function runVerifyHook(input) {
|
|
67
|
+
const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
68
|
+
const runProc = input.runProc ?? defaultRunProc;
|
|
69
|
+
return {
|
|
70
|
+
tsc: runTscCheck(input.workspaceRoot, runProc, timeoutMs),
|
|
71
|
+
tests: runTestsCheck(input.workspaceRoot, runProc, timeoutMs),
|
|
72
|
+
urls: await runUrlChecks(input),
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
/* ----------------------- tsc check ---------------------- */
|
|
76
|
+
function runTscCheck(workspaceRoot, runProc, timeoutMs) {
|
|
77
|
+
const tsconfig = resolve(workspaceRoot, 'tsconfig.json');
|
|
78
|
+
if (!existsSync(tsconfig)) {
|
|
79
|
+
return { ok: true, skipped: true, reason: 'no_tsconfig' };
|
|
80
|
+
}
|
|
81
|
+
// Prefer `pnpm exec tsc` because pnpm-aware monorepos hoist tsc into
|
|
82
|
+
// `node_modules/.bin`; fallback to bare `tsc` for global installs.
|
|
83
|
+
// We try `pnpm exec tsc` first only if a `pnpm-lock.yaml` is at the
|
|
84
|
+
// workspace root; otherwise we go straight to `tsc`.
|
|
85
|
+
const pnpmLock = existsSync(resolve(workspaceRoot, 'pnpm-lock.yaml'));
|
|
86
|
+
const cmd = pnpmLock ? 'pnpm' : 'tsc';
|
|
87
|
+
const args = pnpmLock ? ['exec', 'tsc', '--noEmit'] : ['--noEmit'];
|
|
88
|
+
const result = runProc(cmd, args, workspaceRoot, timeoutMs);
|
|
89
|
+
if (result.exitCode === 0)
|
|
90
|
+
return { ok: true };
|
|
91
|
+
return {
|
|
92
|
+
ok: false,
|
|
93
|
+
reason: `tsc_exit_${result.exitCode}`,
|
|
94
|
+
detail: tailOutput(result.stdout, result.stderr, 40),
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
/* ----------------------- tests check ---------------------- */
|
|
98
|
+
function runTestsCheck(workspaceRoot, runProc, timeoutMs) {
|
|
99
|
+
const pkgPath = resolve(workspaceRoot, 'package.json');
|
|
100
|
+
if (!existsSync(pkgPath)) {
|
|
101
|
+
return { ok: true, skipped: true, reason: 'no_package_json' };
|
|
102
|
+
}
|
|
103
|
+
let pkg;
|
|
104
|
+
try {
|
|
105
|
+
pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
return { ok: true, skipped: true, reason: 'malformed_package_json' };
|
|
109
|
+
}
|
|
110
|
+
if (!pkg.scripts || typeof pkg.scripts.test !== 'string') {
|
|
111
|
+
return { ok: true, skipped: true, reason: 'no_test_script' };
|
|
112
|
+
}
|
|
113
|
+
const pnpmLock = existsSync(resolve(workspaceRoot, 'pnpm-lock.yaml'));
|
|
114
|
+
// Prefer pnpm test --bail; some test runners reject the flag (node
|
|
115
|
+
// --test ignores it), so we surface non-zero exits clearly but do
|
|
116
|
+
// not retry without --bail.
|
|
117
|
+
// Both pnpm + npm accept `<cmd> test -- --bail`; the runner-side
|
|
118
|
+
// flag-forwarding contract is identical, so the ternary collapses to
|
|
119
|
+
// a single args literal.
|
|
120
|
+
const cmd = pnpmLock ? 'pnpm' : 'npm';
|
|
121
|
+
const args = ['test', '--', '--bail'];
|
|
122
|
+
const result = runProc(cmd, args, workspaceRoot, timeoutMs);
|
|
123
|
+
if (result.exitCode === 0)
|
|
124
|
+
return { ok: true };
|
|
125
|
+
return {
|
|
126
|
+
ok: false,
|
|
127
|
+
reason: `tests_exit_${result.exitCode}`,
|
|
128
|
+
detail: tailOutput(result.stdout, result.stderr, 60),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
/* ----------------------- url probes ---------------------- */
|
|
132
|
+
async function runUrlChecks(input) {
|
|
133
|
+
const diffText = input.diffText ?? '';
|
|
134
|
+
if (diffText.length === 0) {
|
|
135
|
+
return { ok: true, skipped: true, reason: 'no_diff_text' };
|
|
136
|
+
}
|
|
137
|
+
const urls = extractUrls(diffText);
|
|
138
|
+
if (urls.length === 0) {
|
|
139
|
+
return { ok: true, skipped: true, reason: 'no_urls' };
|
|
140
|
+
}
|
|
141
|
+
const cap = input.maxUrlProbes ?? DEFAULT_MAX_URL_PROBES;
|
|
142
|
+
const probed = urls.slice(0, cap);
|
|
143
|
+
const probeFn = input.probeFn ?? defaultProbeFn;
|
|
144
|
+
const failures = [];
|
|
145
|
+
for (const url of probed) {
|
|
146
|
+
// Hostname SSRF guard — never probe a localhost / private IP even
|
|
147
|
+
// when a literal in the diff points there.
|
|
148
|
+
let parsed;
|
|
149
|
+
try {
|
|
150
|
+
parsed = new URL(url);
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
failures.push({ url, error: 'invalid_url' });
|
|
154
|
+
continue;
|
|
155
|
+
}
|
|
156
|
+
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
|
|
157
|
+
failures.push({ url, error: `unsupported_scheme_${parsed.protocol}` });
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
const hostname = parsed.hostname.replace(/^\[|\]$/g, '');
|
|
161
|
+
const guard = await validateHostnameForFetch(hostname);
|
|
162
|
+
if (guard) {
|
|
163
|
+
failures.push({ url, error: `ssrf_refused: ${guard}` });
|
|
164
|
+
continue;
|
|
165
|
+
}
|
|
166
|
+
try {
|
|
167
|
+
const r = await probeFn(url);
|
|
168
|
+
if ('error' in r) {
|
|
169
|
+
failures.push({ url, error: r.error });
|
|
170
|
+
continue;
|
|
171
|
+
}
|
|
172
|
+
if (r.status >= 400) {
|
|
173
|
+
failures.push({ url, error: `http_${r.status}` });
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
failures.push({
|
|
178
|
+
url,
|
|
179
|
+
error: error instanceof Error ? error.message : String(error),
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
if (failures.length === 0) {
|
|
184
|
+
return { ok: true, probedCount: probed.length };
|
|
185
|
+
}
|
|
186
|
+
return {
|
|
187
|
+
ok: false,
|
|
188
|
+
reason: `url_probe_failed`,
|
|
189
|
+
probedCount: probed.length,
|
|
190
|
+
failures,
|
|
191
|
+
detail: failures.map((f) => `${f.url} → ${f.error}`).join('; '),
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* Extract unique http(s) URLs from a diff/text blob. Order preserved
|
|
196
|
+
* (first-seen) so the cap picks the earliest-mentioned ones, which
|
|
197
|
+
* intuitively matches the operator's expectation.
|
|
198
|
+
*/
|
|
199
|
+
export function extractUrls(text) {
|
|
200
|
+
const seen = new Set();
|
|
201
|
+
const out = [];
|
|
202
|
+
let match;
|
|
203
|
+
// Reset the regex's lastIndex; URL_LITERAL_RE is module-scoped and
|
|
204
|
+
// /g means stateful exec calls.
|
|
205
|
+
URL_LITERAL_RE.lastIndex = 0;
|
|
206
|
+
while ((match = URL_LITERAL_RE.exec(text)) !== null) {
|
|
207
|
+
const raw = match[1];
|
|
208
|
+
if (!raw)
|
|
209
|
+
continue;
|
|
210
|
+
// Strip a trailing punctuation that the regex tolerates inside
|
|
211
|
+
// the match (sentences in Markdown often end `... https://x).`).
|
|
212
|
+
// We also strip `!` and `?` so prose like "see https://x!" lands
|
|
213
|
+
// as `https://x`.
|
|
214
|
+
const cleaned = raw.replace(/[.,;:!?)\]>]+$/, '');
|
|
215
|
+
if (cleaned.length === 0)
|
|
216
|
+
continue;
|
|
217
|
+
if (seen.has(cleaned))
|
|
218
|
+
continue;
|
|
219
|
+
seen.add(cleaned);
|
|
220
|
+
out.push(cleaned);
|
|
221
|
+
}
|
|
222
|
+
return out;
|
|
223
|
+
}
|
|
224
|
+
/* ----------------------- defaults ---------------------- */
|
|
225
|
+
function defaultRunProc(cmd, args, cwd, timeoutMs) {
|
|
226
|
+
const result = spawnSync(cmd, [...args], {
|
|
227
|
+
cwd,
|
|
228
|
+
encoding: 'utf8',
|
|
229
|
+
timeout: timeoutMs,
|
|
230
|
+
// Inherit a minimal env — every check is read-only against the
|
|
231
|
+
// workspace and we do not want to leak PUGI_API_KEY into a
|
|
232
|
+
// sub-process accidentally.
|
|
233
|
+
env: { ...process.env, PUGI_API_KEY: undefined, PUGI_LOGIN_TOKEN: undefined },
|
|
234
|
+
});
|
|
235
|
+
return {
|
|
236
|
+
exitCode: typeof result.status === 'number' ? result.status : -1,
|
|
237
|
+
stdout: result.stdout ?? '',
|
|
238
|
+
stderr: result.stderr ?? '',
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
async function defaultProbeFn(url) {
|
|
242
|
+
// Lazy-import undici so the verify-hook module stays cheap when
|
|
243
|
+
// url probes are skipped.
|
|
244
|
+
const { request } = await import('undici');
|
|
245
|
+
try {
|
|
246
|
+
const response = await request(url, {
|
|
247
|
+
method: 'HEAD',
|
|
248
|
+
bodyTimeout: 5_000,
|
|
249
|
+
headersTimeout: 5_000,
|
|
250
|
+
});
|
|
251
|
+
// Drain so the connection releases promptly.
|
|
252
|
+
try {
|
|
253
|
+
await response.body.dump();
|
|
254
|
+
}
|
|
255
|
+
catch {
|
|
256
|
+
/* swallow */
|
|
257
|
+
}
|
|
258
|
+
return { status: response.statusCode };
|
|
259
|
+
}
|
|
260
|
+
catch (error) {
|
|
261
|
+
return { error: error instanceof Error ? error.message : String(error) };
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
function tailOutput(stdout, stderr, maxLines) {
|
|
265
|
+
const merged = `${stdout}\n${stderr}`.trim();
|
|
266
|
+
if (merged.length === 0)
|
|
267
|
+
return '';
|
|
268
|
+
const lines = merged.split('\n');
|
|
269
|
+
if (lines.length <= maxLines)
|
|
270
|
+
return merged;
|
|
271
|
+
return `... (${lines.length - maxLines} earlier lines elided)\n${lines.slice(-maxLines).join('\n')}`;
|
|
272
|
+
}
|
|
273
|
+
//# sourceMappingURL=verify-hook.js.map
|
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worktree isolation — α7.7 Phase 1.
|
|
3
|
+
*
|
|
4
|
+
* Wraps `git worktree add` so a long agent loop (build / consensus
|
|
5
|
+
* review / multi-file refactor) can land its edits into a scratch
|
|
6
|
+
* workspace, run the validators against THAT path, and only then promote
|
|
7
|
+
* the resulting diff back to the operator's main working tree. The
|
|
8
|
+
* primary win is safety: a half-applied refactor never corrupts the
|
|
9
|
+
* operator's branch.
|
|
10
|
+
*
|
|
11
|
+
* Three operations:
|
|
12
|
+
*
|
|
13
|
+
* - `createWorktree(branch)` — spawns `git worktree add --detach`
|
|
14
|
+
* under `.pugi/worktrees/<uuid>` based on the supplied branch (or
|
|
15
|
+
* HEAD when omitted). Returns the absolute path + a `cleanup()`
|
|
16
|
+
* callback. The dir lives under `.pugi/` so the existing `.gitignore`
|
|
17
|
+
* for that subtree applies (no accidental commits of the scratch
|
|
18
|
+
* state to the main repo).
|
|
19
|
+
*
|
|
20
|
+
* - `promoteWorktree(worktreePath, cwd)` — diffs the worktree against
|
|
21
|
+
* its base commit and applies the diff to the main `cwd` via
|
|
22
|
+
* `git apply`. Refuses if the main cwd has staged changes that
|
|
23
|
+
* would conflict; the operator must commit or stash first.
|
|
24
|
+
*
|
|
25
|
+
* - `dropWorktree(worktreePath)` — removes the worktree both from
|
|
26
|
+
* git's bookkeeping (`git worktree remove --force`) and from disk.
|
|
27
|
+
* Idempotent; a partially-removed worktree (`git` already cleaned
|
|
28
|
+
* up but dir survived) is handled.
|
|
29
|
+
*
|
|
30
|
+
* Brand voice: ASCII only, no emoji, no banned words.
|
|
31
|
+
*/
|
|
32
|
+
import { spawnSync } from 'node:child_process';
|
|
33
|
+
import { existsSync, mkdirSync, realpathSync, rmSync } from 'node:fs';
|
|
34
|
+
import { randomUUID } from 'node:crypto';
|
|
35
|
+
import { resolve, sep } from 'node:path';
|
|
36
|
+
import { OperatorAbortedError } from '../../tools/file-tools.js';
|
|
37
|
+
import { applySecurityGate } from './security-gate.js';
|
|
38
|
+
import { extractPatchPaths } from '../../tools/apply-patch.js';
|
|
39
|
+
/**
|
|
40
|
+
* Create a scratch worktree under `.pugi/worktrees/<uuid>`. The path is
|
|
41
|
+
* guaranteed unique (uuid) so multiple agent loops can run in parallel
|
|
42
|
+
* without collision.
|
|
43
|
+
*/
|
|
44
|
+
export function createWorktree(opts) {
|
|
45
|
+
if (opts.cancellation && opts.cancellation.isAborted) {
|
|
46
|
+
return { ok: false, reason: 'operator_aborted', detail: 'createWorktree aborted' };
|
|
47
|
+
}
|
|
48
|
+
// Confirm we're inside a git repo. `git rev-parse --git-dir` is the
|
|
49
|
+
// canonical check and avoids a misleading error message later when
|
|
50
|
+
// `git worktree add` runs in a non-repo.
|
|
51
|
+
const gitDir = runGit(['rev-parse', '--git-dir'], opts.cwd);
|
|
52
|
+
if (gitDir.status !== 0) {
|
|
53
|
+
return {
|
|
54
|
+
ok: false,
|
|
55
|
+
reason: 'not_a_git_repo',
|
|
56
|
+
detail: `not a git repo: ${opts.cwd}`,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
// Resolve base SHA. When the operator named a branch we honor it; the
|
|
60
|
+
// default is HEAD. We capture the SHA up-front so `promoteWorktree`
|
|
61
|
+
// can `git diff <baseSha>..HEAD` deterministically even if the main
|
|
62
|
+
// working tree has moved forward since.
|
|
63
|
+
const baseRef = opts.branch ?? 'HEAD';
|
|
64
|
+
const baseShaResult = runGit(['rev-parse', baseRef], opts.cwd);
|
|
65
|
+
if (baseShaResult.status !== 0) {
|
|
66
|
+
return {
|
|
67
|
+
ok: false,
|
|
68
|
+
reason: 'git_command_failed',
|
|
69
|
+
detail: `cannot resolve base ref ${baseRef}: ${baseShaResult.stderr}`,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
const baseSha = baseShaResult.stdout.trim();
|
|
73
|
+
const worktreeRoot = resolve(opts.cwd, '.pugi', 'worktrees');
|
|
74
|
+
mkdirSync(worktreeRoot, { recursive: true });
|
|
75
|
+
const worktreePath = resolve(worktreeRoot, randomUUID());
|
|
76
|
+
// `--detach` keeps the worktree on a detached HEAD so we don't
|
|
77
|
+
// collide with branch checkouts on the main tree. The worktree is
|
|
78
|
+
// throwaway — there is no branch name to track.
|
|
79
|
+
const create = runGit(['worktree', 'add', '--detach', worktreePath, baseSha], opts.cwd);
|
|
80
|
+
if (create.status !== 0) {
|
|
81
|
+
return {
|
|
82
|
+
ok: false,
|
|
83
|
+
reason: 'git_command_failed',
|
|
84
|
+
detail: `git worktree add failed: ${create.stderr}`,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
const handle = {
|
|
88
|
+
path: worktreePath,
|
|
89
|
+
baseSha,
|
|
90
|
+
cleanup: () => {
|
|
91
|
+
const r = dropWorktree(worktreePath, opts.cwd);
|
|
92
|
+
if (!r.ok && r.reason !== 'worktree_missing') {
|
|
93
|
+
// Swallow non-fatal cleanup failures so the agent loop doesn't
|
|
94
|
+
// hard-crash on the happy path. The diagnostic still surfaces
|
|
95
|
+
// via the JSON output on the `pugi worktree drop` command.
|
|
96
|
+
}
|
|
97
|
+
},
|
|
98
|
+
};
|
|
99
|
+
return { ok: true, value: handle };
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Diff the worktree against its base and apply the diff to the main cwd.
|
|
103
|
+
*
|
|
104
|
+
* Implementation notes:
|
|
105
|
+
*
|
|
106
|
+
* - We run `git diff --binary <baseSha>` inside the worktree (NOT
|
|
107
|
+
* `git diff <worktree>..HEAD` from the main tree — the worktree's
|
|
108
|
+
* HEAD is detached at `baseSha`, so the meaningful diff is the
|
|
109
|
+
* UNCOMMITTED changes the agent wrote into it).
|
|
110
|
+
* - `--binary` ensures non-text files (assets, images) survive the
|
|
111
|
+
* round-trip; without it `git apply` fails on any binary delta.
|
|
112
|
+
* - We always run `git apply --check` first so a refusal does not
|
|
113
|
+
* leave the main tree half-modified.
|
|
114
|
+
*/
|
|
115
|
+
export function promoteWorktree(opts) {
|
|
116
|
+
if (opts.cancellation && opts.cancellation.isAborted) {
|
|
117
|
+
return { ok: false, reason: 'operator_aborted', detail: 'promoteWorktree aborted' };
|
|
118
|
+
}
|
|
119
|
+
if (!existsSync(opts.worktreePath)) {
|
|
120
|
+
return {
|
|
121
|
+
ok: false,
|
|
122
|
+
reason: 'worktree_missing',
|
|
123
|
+
detail: `worktree path does not exist: ${opts.worktreePath}`,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
// Capture the diff against the base SHA. `git diff <baseSha>`
|
|
127
|
+
// (no `--cached`) compares the WORKING TREE against the base, which
|
|
128
|
+
// covers both unstaged AND staged changes in a single invocation —
|
|
129
|
+
// anything the working tree shows is included. `--binary` ensures
|
|
130
|
+
// non-text files survive the round-trip.
|
|
131
|
+
//
|
|
132
|
+
// Note: untracked files that were NEVER staged stay invisible — git
|
|
133
|
+
// diff has no native flag to include them. The agent loop must
|
|
134
|
+
// `git add` any new file it wants promoted; the CLI surface
|
|
135
|
+
// documents this explicitly so the contract is not surprising.
|
|
136
|
+
// (Staging is enough to expose the file; the file does not need to
|
|
137
|
+
// be committed.)
|
|
138
|
+
const diffResult = runGit(['diff', '--binary', opts.baseSha], opts.worktreePath);
|
|
139
|
+
if (diffResult.status !== 0) {
|
|
140
|
+
return {
|
|
141
|
+
ok: false,
|
|
142
|
+
reason: 'git_command_failed',
|
|
143
|
+
detail: `git diff failed: ${diffResult.stderr}`,
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
const diffText = diffResult.stdout;
|
|
147
|
+
if (diffText.trim().length === 0) {
|
|
148
|
+
return { ok: true, value: { filesChanged: 0 } };
|
|
149
|
+
}
|
|
150
|
+
// SECURITY GATE (R1 fix 2026-05-26, PR #413 r1) — every path mentioned
|
|
151
|
+
// in the worktree's diff goes through the same `applySecurityGate`
|
|
152
|
+
// chokepoint as the apply_patch + Layer A/B/C applicators. A staged
|
|
153
|
+
// `.env` (or `../../etc/passwd`, or a symlink into a protected target)
|
|
154
|
+
// inside the worktree must NOT slip into the operator's main tree just
|
|
155
|
+
// because the worktree itself was a sandboxed scratch dir. Without
|
|
156
|
+
// this gate, `promoteWorktree` was a clean bypass of every other edit
|
|
157
|
+
// primitive's safety net.
|
|
158
|
+
const diffPaths = extractPatchPaths(diffText);
|
|
159
|
+
const failedPaths = [];
|
|
160
|
+
for (const file of diffPaths) {
|
|
161
|
+
const gate = applySecurityGate(file, { cwd: opts.cwd, toolName: 'layer-c' });
|
|
162
|
+
if (!gate.ok) {
|
|
163
|
+
failedPaths.push(`${file}: ${gate.reason}`);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
if (failedPaths.length > 0) {
|
|
167
|
+
return {
|
|
168
|
+
ok: false,
|
|
169
|
+
reason: 'protected_file_in_worktree',
|
|
170
|
+
detail: `worktree diff touches protected/escaping paths: ${failedPaths.join('; ')}`,
|
|
171
|
+
files: failedPaths,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
// `git apply --check` validates the diff against the main tree first.
|
|
175
|
+
// Refuse early on conflict so the operator can resolve before we
|
|
176
|
+
// touch any file.
|
|
177
|
+
const check = runGit(['apply', '--check', '-'], opts.cwd, diffText);
|
|
178
|
+
if (check.status !== 0) {
|
|
179
|
+
return {
|
|
180
|
+
ok: false,
|
|
181
|
+
reason: 'apply_conflict',
|
|
182
|
+
detail: `git apply --check rejected: ${check.stderr}`,
|
|
183
|
+
};
|
|
184
|
+
}
|
|
185
|
+
if (opts.dryRun) {
|
|
186
|
+
return { ok: true, value: { filesChanged: countDiffFiles(diffText) } };
|
|
187
|
+
}
|
|
188
|
+
const apply = runGit(['apply', '-'], opts.cwd, diffText);
|
|
189
|
+
if (apply.status !== 0) {
|
|
190
|
+
return {
|
|
191
|
+
ok: false,
|
|
192
|
+
reason: 'apply_failed',
|
|
193
|
+
detail: `git apply failed: ${apply.stderr}`,
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
return { ok: true, value: { filesChanged: countDiffFiles(diffText) } };
|
|
197
|
+
}
|
|
198
|
+
/**
|
|
199
|
+
* Drop a worktree both from git's bookkeeping and from disk. Idempotent —
|
|
200
|
+
* a missing path returns `worktree_missing` which the caller can ignore
|
|
201
|
+
* on the cleanup-after-error path.
|
|
202
|
+
*
|
|
203
|
+
* Security (R1 fix 2026-05-26, PR #413 r1): we MUST validate the path is
|
|
204
|
+
* a real subdirectory of `<cwd>/.pugi/worktrees/` BEFORE running either
|
|
205
|
+
* `git worktree remove --force` or `rmSync`. Without this gate, a
|
|
206
|
+
* typo like `pugi worktree drop ../some-dir` recursively deleted an
|
|
207
|
+
* arbitrary directory: `git worktree remove` correctly failed (path not
|
|
208
|
+
* registered), but the `rmSync(worktreePath, recursive: true)` below
|
|
209
|
+
* still fired regardless.
|
|
210
|
+
*
|
|
211
|
+
* We resolve both `cwd` and `worktreePath` through `realpathSync` so a
|
|
212
|
+
* caller passing a symlink that points outside `.pugi/worktrees/` is
|
|
213
|
+
* still rejected. When the worktree path does not exist on disk at all
|
|
214
|
+
* (idempotent re-drop of an already-removed worktree), we fall back to
|
|
215
|
+
* the lexical containment check — the rejection only matters when there
|
|
216
|
+
* is a real directory to delete.
|
|
217
|
+
*/
|
|
218
|
+
export function dropWorktree(worktreePath, cwd) {
|
|
219
|
+
// SECURITY GATE — validate containment under `<cwd>/.pugi/worktrees/`
|
|
220
|
+
// BEFORE any destructive call. Two-tier check:
|
|
221
|
+
// 1. lexical containment using resolved (but not realpath'd) paths,
|
|
222
|
+
// catches the operator-typo + missing-worktree cases.
|
|
223
|
+
// 2. realpath containment when the path exists, catches symlink
|
|
224
|
+
// shenanigans.
|
|
225
|
+
const scratchRootLexical = resolve(cwd, '.pugi', 'worktrees');
|
|
226
|
+
const worktreeLexical = resolve(cwd, worktreePath);
|
|
227
|
+
const insideLexical = worktreeLexical.startsWith(scratchRootLexical + sep) &&
|
|
228
|
+
worktreeLexical !== scratchRootLexical;
|
|
229
|
+
if (!insideLexical) {
|
|
230
|
+
return {
|
|
231
|
+
ok: false,
|
|
232
|
+
reason: 'invalid_worktree_path',
|
|
233
|
+
detail: `worktree path ${worktreePath} is not under ${scratchRootLexical}`,
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
if (existsSync(worktreeLexical)) {
|
|
237
|
+
try {
|
|
238
|
+
const realScratchRoot = realpathSync(scratchRootLexical);
|
|
239
|
+
const realWorktree = realpathSync(worktreeLexical);
|
|
240
|
+
const insideReal = realWorktree.startsWith(realScratchRoot + sep) &&
|
|
241
|
+
realWorktree !== realScratchRoot;
|
|
242
|
+
if (!insideReal) {
|
|
243
|
+
return {
|
|
244
|
+
ok: false,
|
|
245
|
+
reason: 'invalid_worktree_path',
|
|
246
|
+
detail: `worktree realpath ${realWorktree} escapes ${realScratchRoot}`,
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
catch (error) {
|
|
251
|
+
// realpath failed for a path that exists — surface as
|
|
252
|
+
// invalid_worktree_path so we never recurse into rmSync on an
|
|
253
|
+
// unreadable path.
|
|
254
|
+
return {
|
|
255
|
+
ok: false,
|
|
256
|
+
reason: 'invalid_worktree_path',
|
|
257
|
+
detail: `cannot realpath worktree path: ${error instanceof Error ? error.message : String(error)}`,
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
// `git worktree remove --force` cleans the metadata in `.git/worktrees`.
|
|
262
|
+
// If the worktree was created by another process and already pruned,
|
|
263
|
+
// git returns non-zero — we still try to `rmSync` the dir to leave the
|
|
264
|
+
// filesystem consistent. Path containment has already been validated
|
|
265
|
+
// above so the rmSync below is bounded to `.pugi/worktrees/`.
|
|
266
|
+
const remove = runGit(['worktree', 'remove', '--force', worktreeLexical], cwd);
|
|
267
|
+
const gitCleanFailed = remove.status !== 0;
|
|
268
|
+
if (existsSync(worktreeLexical)) {
|
|
269
|
+
try {
|
|
270
|
+
rmSync(worktreeLexical, { recursive: true, force: true });
|
|
271
|
+
}
|
|
272
|
+
catch (error) {
|
|
273
|
+
if (gitCleanFailed) {
|
|
274
|
+
return {
|
|
275
|
+
ok: false,
|
|
276
|
+
reason: 'git_command_failed',
|
|
277
|
+
detail: `git worktree remove failed AND rmSync failed: ${error instanceof Error ? error.message : String(error)}`,
|
|
278
|
+
};
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
if (gitCleanFailed && !worktreeLexical.includes(`${sep}.pugi${sep}worktrees${sep}`)) {
|
|
283
|
+
// A worktree that wasn't created by us (path is outside our naming
|
|
284
|
+
// convention) is suspicious — surface the failure so the operator
|
|
285
|
+
// can diagnose.
|
|
286
|
+
return {
|
|
287
|
+
ok: false,
|
|
288
|
+
reason: 'git_command_failed',
|
|
289
|
+
detail: `git worktree remove failed: ${remove.stderr}`,
|
|
290
|
+
};
|
|
291
|
+
}
|
|
292
|
+
return { ok: true, value: undefined };
|
|
293
|
+
}
|
|
294
|
+
function countDiffFiles(diff) {
|
|
295
|
+
// Count `diff --git a/... b/...` headers. Cheap and unambiguous.
|
|
296
|
+
let count = 0;
|
|
297
|
+
for (const line of diff.split('\n')) {
|
|
298
|
+
if (line.startsWith('diff --git '))
|
|
299
|
+
count += 1;
|
|
300
|
+
}
|
|
301
|
+
return count;
|
|
302
|
+
}
|
|
303
|
+
function runGit(args, cwd, stdin) {
|
|
304
|
+
return spawnSync('git', args, {
|
|
305
|
+
cwd,
|
|
306
|
+
input: stdin,
|
|
307
|
+
encoding: 'utf8',
|
|
308
|
+
maxBuffer: 64 * 1024 * 1024,
|
|
309
|
+
});
|
|
310
|
+
}
|
|
311
|
+
/**
|
|
312
|
+
* Test-only helper exporting the internal git runner so specs can stub
|
|
313
|
+
* the spawn surface when running on a CI host without a global git.
|
|
314
|
+
*/
|
|
315
|
+
export const __test__ = { runGit, countDiffFiles };
|
|
316
|
+
/**
|
|
317
|
+
* Re-export the abort marker so the worktree CLI surface can fold the
|
|
318
|
+
* exception into a clean exit code without needing to import from the
|
|
319
|
+
* tools layer.
|
|
320
|
+
*/
|
|
321
|
+
export { OperatorAbortedError };
|
|
322
|
+
//# sourceMappingURL=worktree.js.map
|