@deftai/directive-runtime 0.129.5 → 0.129.6
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/Taskfile.yml +235 -0
- package/UPGRADING.md +1 -0
- package/contracts/design-critique.md +1 -1
- package/contracts/path-write-fence.md +6 -0
- package/dist/applying-host-release.d.ts +16 -0
- package/dist/applying-host-release.js +98 -0
- package/dist/authz.d.ts +1 -1
- package/dist/authz.js +1 -1
- package/dist/check.d.ts +1 -0
- package/dist/check.js +27 -4
- package/dist/design-critique-ensure-arc-dest.d.ts +16 -0
- package/dist/design-critique-ensure-arc-dest.js +168 -0
- package/dist/dispatch.d.ts +1 -1
- package/dist/dispatch.js +8 -0
- package/dist/hook-dispatch.js +3 -2
- package/dist/human-presence-mint.d.ts +6 -1
- package/dist/human-presence-mint.js +20 -6
- package/dist/session-start.js +40 -6
- package/dist/setup-wiring.d.ts +36 -0
- package/dist/setup-wiring.js +169 -14
- package/dist/verify-source-cli/verify-deposit-closure.js +5 -5
- package/dist/windows-bin-ps1.d.ts +2 -2
- package/dist/windows-bin-ps1.js +5 -11
- package/docs/deft-directive-disable.md +3 -3
- package/package.json +2 -3
- package/packs/lessons/lessons-pack-0.1.json +15 -0
- package/packs/skills/skills-pack-0.1.json +2 -2
- package/skills/deft-directive-design-critique/SKILL.md +1 -1
- package/skills/deft-directive-release/SKILL.md +31 -1
- package/vendor/directive-content/Taskfile.yml +235 -0
- package/vendor/directive-content/UPGRADING.md +1 -0
- package/vendor/directive-content/contracts/design-critique.md +1 -1
- package/vendor/directive-content/contracts/path-write-fence.md +6 -0
- package/vendor/directive-content/docs/deft-directive-disable.md +3 -3
- package/vendor/directive-content/packs/lessons/lessons-pack-0.1.json +15 -0
- package/vendor/directive-content/packs/skills/skills-pack-0.1.json +2 -2
- package/vendor/directive-content/skills/deft-directive-design-critique/SKILL.md +1 -1
- package/vendor/directive-content/skills/deft-directive-release/SKILL.md +31 -1
- package/vendor/directive-core/dist/.tsbuildinfo +1 -1
- package/vendor/directive-core/dist/authz/classify.d.ts +12 -0
- package/vendor/directive-core/dist/authz/classify.d.ts.map +1 -1
- package/vendor/directive-core/dist/authz/classify.js +40 -12
- package/vendor/directive-core/dist/authz/classify.js.map +1 -1
- package/vendor/directive-core/dist/authz/templates.d.ts +2 -2
- package/vendor/directive-core/dist/authz/templates.d.ts.map +1 -1
- package/vendor/directive-core/dist/authz/templates.js +1 -0
- package/vendor/directive-core/dist/authz/templates.js.map +1 -1
- package/vendor/directive-core/dist/authz/types.d.ts +1 -1
- package/vendor/directive-core/dist/authz/types.d.ts.map +1 -1
- package/vendor/directive-core/dist/authz/types.js +2 -0
- package/vendor/directive-core/dist/authz/types.js.map +1 -1
- package/vendor/directive-core/dist/authz/verb-classification.d.ts.map +1 -1
- package/vendor/directive-core/dist/authz/verb-classification.js +30 -3
- package/vendor/directive-core/dist/authz/verb-classification.js.map +1 -1
- package/vendor/directive-core/dist/cache/fetch.d.ts.map +1 -1
- package/vendor/directive-core/dist/cache/fetch.js +50 -4
- package/vendor/directive-core/dist/cache/fetch.js.map +1 -1
- package/vendor/directive-core/dist/design-critique/arc-dest.d.ts +22 -5
- package/vendor/directive-core/dist/design-critique/arc-dest.d.ts.map +1 -1
- package/vendor/directive-core/dist/design-critique/arc-dest.js +61 -0
- package/vendor/directive-core/dist/design-critique/arc-dest.js.map +1 -1
- package/vendor/directive-core/dist/design-critique/run-posture.d.ts +7 -2
- package/vendor/directive-core/dist/design-critique/run-posture.d.ts.map +1 -1
- package/vendor/directive-core/dist/design-critique/run-posture.js +6 -1
- package/vendor/directive-core/dist/design-critique/run-posture.js.map +1 -1
- package/vendor/directive-core/dist/hooks/dispatcher.d.ts.map +1 -1
- package/vendor/directive-core/dist/hooks/dispatcher.js +174 -12
- package/vendor/directive-core/dist/hooks/dispatcher.js.map +1 -1
- package/vendor/directive-core/dist/hooks/shell-write-targets.d.ts +5 -0
- package/vendor/directive-core/dist/hooks/shell-write-targets.d.ts.map +1 -1
- package/vendor/directive-core/dist/hooks/shell-write-targets.js +18 -1
- package/vendor/directive-core/dist/hooks/shell-write-targets.js.map +1 -1
- package/vendor/directive-core/dist/init-deposit/host-hook-outer.d.ts +5 -0
- package/vendor/directive-core/dist/init-deposit/host-hook-outer.d.ts.map +1 -1
- package/vendor/directive-core/dist/init-deposit/host-hook-outer.js +22 -9
- package/vendor/directive-core/dist/init-deposit/host-hook-outer.js.map +1 -1
- package/vendor/directive-core/dist/init-deposit/scaffold.d.ts +8 -1
- package/vendor/directive-core/dist/init-deposit/scaffold.d.ts.map +1 -1
- package/vendor/directive-core/dist/init-deposit/scaffold.js +38 -4
- package/vendor/directive-core/dist/init-deposit/scaffold.js.map +1 -1
- package/vendor/directive-core/dist/install-health/cheap.d.ts +2 -1
- package/vendor/directive-core/dist/install-health/cheap.d.ts.map +1 -1
- package/vendor/directive-core/dist/install-health/cheap.js +4 -3
- package/vendor/directive-core/dist/install-health/cheap.js.map +1 -1
- package/vendor/directive-core/dist/install-health/constants.d.ts +18 -2
- package/vendor/directive-core/dist/install-health/constants.d.ts.map +1 -1
- package/vendor/directive-core/dist/install-health/constants.js +18 -2
- package/vendor/directive-core/dist/install-health/constants.js.map +1 -1
- package/vendor/directive-core/dist/policy/deft-directive-disable.d.ts +42 -5
- package/vendor/directive-core/dist/policy/deft-directive-disable.d.ts.map +1 -1
- package/vendor/directive-core/dist/policy/deft-directive-disable.js +71 -41
- package/vendor/directive-core/dist/policy/deft-directive-disable.js.map +1 -1
- package/vendor/directive-core/dist/pr-closeout-attestable/evaluate.d.ts +6 -1
- package/vendor/directive-core/dist/pr-closeout-attestable/evaluate.d.ts.map +1 -1
- package/vendor/directive-core/dist/pr-closeout-attestable/evaluate.js +24 -12
- package/vendor/directive-core/dist/pr-closeout-attestable/evaluate.js.map +1 -1
- package/vendor/directive-core/dist/pr-closeout-attestable/pr-head-assert.d.ts +68 -14
- package/vendor/directive-core/dist/pr-closeout-attestable/pr-head-assert.d.ts.map +1 -1
- package/vendor/directive-core/dist/pr-closeout-attestable/pr-head-assert.js +278 -47
- package/vendor/directive-core/dist/pr-closeout-attestable/pr-head-assert.js.map +1 -1
- package/vendor/directive-core/dist/release/gh.d.ts.map +1 -1
- package/vendor/directive-core/dist/release/gh.js +2 -1
- package/vendor/directive-core/dist/release/gh.js.map +1 -1
- package/vendor/directive-core/dist/release/version.d.ts +4 -2
- package/vendor/directive-core/dist/release/version.d.ts.map +1 -1
- package/vendor/directive-core/dist/release/version.js +4 -2
- package/vendor/directive-core/dist/release/version.js.map +1 -1
- package/vendor/directive-core/dist/release-publish/gh-api.d.ts.map +1 -1
- package/vendor/directive-core/dist/release-publish/gh-api.js +4 -2
- package/vendor/directive-core/dist/release-publish/gh-api.js.map +1 -1
- package/vendor/directive-core/dist/release-publish/main.d.ts.map +1 -1
- package/vendor/directive-core/dist/release-publish/main.js +15 -4
- package/vendor/directive-core/dist/release-publish/main.js.map +1 -1
- package/vendor/directive-core/dist/release-publish/pipeline.d.ts +11 -0
- package/vendor/directive-core/dist/release-publish/pipeline.d.ts.map +1 -1
- package/vendor/directive-core/dist/release-publish/pipeline.js +143 -2
- package/vendor/directive-core/dist/release-publish/pipeline.js.map +1 -1
- package/vendor/directive-core/dist/release-rollback/gh.d.ts.map +1 -1
- package/vendor/directive-core/dist/release-rollback/gh.js +2 -1
- package/vendor/directive-core/dist/release-rollback/gh.js.map +1 -1
- package/vendor/directive-core/dist/session/git.d.ts +21 -2
- package/vendor/directive-core/dist/session/git.d.ts.map +1 -1
- package/vendor/directive-core/dist/session/git.js +21 -4
- package/vendor/directive-core/dist/session/git.js.map +1 -1
- package/vendor/directive-core/dist/session/occupancy.d.ts +93 -6
- package/vendor/directive-core/dist/session/occupancy.d.ts.map +1 -1
- package/vendor/directive-core/dist/session/occupancy.js +215 -52
- package/vendor/directive-core/dist/session/occupancy.js.map +1 -1
- package/vendor/directive-core/dist/session/session-start.d.ts.map +1 -1
- package/vendor/directive-core/dist/session/session-start.js +5 -2
- package/vendor/directive-core/dist/session/session-start.js.map +1 -1
- package/vendor/directive-core/dist/swarm/dest-place.d.ts +1 -1
- package/vendor/directive-core/dist/swarm/dest-place.d.ts.map +1 -1
- package/vendor/directive-core/dist/swarm/dest-place.js +36 -41
- package/vendor/directive-core/dist/swarm/dest-place.js.map +1 -1
- package/vendor/directive-core/dist/swarm/finalize-owed.d.ts +14 -0
- package/vendor/directive-core/dist/swarm/finalize-owed.d.ts.map +1 -1
- package/vendor/directive-core/dist/swarm/finalize-owed.js +214 -48
- package/vendor/directive-core/dist/swarm/finalize-owed.js.map +1 -1
- package/vendor/directive-core/dist/swarm/launch.d.ts.map +1 -1
- package/vendor/directive-core/dist/swarm/launch.js +15 -4
- package/vendor/directive-core/dist/swarm/launch.js.map +1 -1
- package/vendor/directive-core/dist/swarm/worktree-pm-install.d.ts +49 -2
- package/vendor/directive-core/dist/swarm/worktree-pm-install.d.ts.map +1 -1
- package/vendor/directive-core/dist/swarm/worktree-pm-install.js +207 -12
- package/vendor/directive-core/dist/swarm/worktree-pm-install.js.map +1 -1
- package/vendor/directive-core/dist/swarm/worktrees-cli.d.ts +6 -0
- package/vendor/directive-core/dist/swarm/worktrees-cli.d.ts.map +1 -1
- package/vendor/directive-core/dist/swarm/worktrees-cli.js +79 -2
- package/vendor/directive-core/dist/swarm/worktrees-cli.js.map +1 -1
- package/vendor/directive-core/dist/swarm/worktrees.d.ts +12 -1
- package/vendor/directive-core/dist/swarm/worktrees.d.ts.map +1 -1
- package/vendor/directive-core/dist/swarm/worktrees.js +34 -26
- package/vendor/directive-core/dist/swarm/worktrees.js.map +1 -1
|
@@ -1,11 +1,29 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Swarm worktree package install (AC14.25).
|
|
2
|
+
* Swarm worktree package install (AC14.25) + guarded linked-worktree prep (#6100).
|
|
3
3
|
* After `git worktree add`, materialize node_modules via the project PM.
|
|
4
4
|
* Failure must prevent claiming readiness.
|
|
5
5
|
*/
|
|
6
6
|
import { spawnSync } from "node:child_process";
|
|
7
7
|
import { existsSync, readFileSync } from "node:fs";
|
|
8
|
-
import { join } from "node:path";
|
|
8
|
+
import { join, resolve } from "node:path";
|
|
9
|
+
import { reconstituteLinkedWorktreeDeposit } from "../init-deposit/gitignore.js";
|
|
10
|
+
import { HOST_HOOK_OUTER_PIN_HOOK_BIN_REL } from "../init-deposit/host-hook-outer.js";
|
|
11
|
+
import { isLinkedWorktreePath, mainWorktreeRoot } from "../session/main-worktree.js";
|
|
12
|
+
import { liveOccupancyOnTree, occupancyAdmission, readOccupancy, } from "../session/occupancy.js";
|
|
13
|
+
/** Outer-visible runtime pin the deposited host wrapper tests (#6100). */
|
|
14
|
+
/** Presenter for live-lease admission — match claim path (DEFT then GROK) (#6100). */
|
|
15
|
+
export function resolvePresenterSessionId(explicit, env = process.env) {
|
|
16
|
+
const fromExplicit = explicit?.trim() ?? "";
|
|
17
|
+
if (fromExplicit.length > 0)
|
|
18
|
+
return fromExplicit;
|
|
19
|
+
for (const key of ["DEFT_SESSION_ID", "GROK_SESSION_ID"]) {
|
|
20
|
+
const value = typeof env[key] === "string" ? env[key].trim() : "";
|
|
21
|
+
if (value.length > 0)
|
|
22
|
+
return value;
|
|
23
|
+
}
|
|
24
|
+
return "";
|
|
25
|
+
}
|
|
26
|
+
export const OUTER_VISIBLE_RUNTIME_PIN_REL = HOST_HOOK_OUTER_PIN_HOOK_BIN_REL;
|
|
9
27
|
function defaultRunner(command, args, cwd) {
|
|
10
28
|
// Windows exposes npm/pnpm as .cmd shims; spawnSync needs shell to launch them.
|
|
11
29
|
// Force a non-production NODE_ENV so a runtime pin in devDependencies is installed.
|
|
@@ -47,6 +65,60 @@ function hasRuntimePin(pkg) {
|
|
|
47
65
|
}
|
|
48
66
|
return false;
|
|
49
67
|
}
|
|
68
|
+
function sameTree(left, right) {
|
|
69
|
+
const a = resolve(left);
|
|
70
|
+
const b = resolve(right);
|
|
71
|
+
if (process.platform === "win32")
|
|
72
|
+
return a.toLowerCase() === b.toLowerCase();
|
|
73
|
+
return a === b;
|
|
74
|
+
}
|
|
75
|
+
/** True when the deposited-outer-visible hook-bin exists under the worktree. */
|
|
76
|
+
export function outerVisibleRuntimePinExists(worktreePath) {
|
|
77
|
+
return existsSync(join(resolve(worktreePath), OUTER_VISIBLE_RUNTIME_PIN_REL));
|
|
78
|
+
}
|
|
79
|
+
/** Read requested @deftai/directive-runtime range from package.json. */
|
|
80
|
+
function readRequestedRuntimePin(pkg) {
|
|
81
|
+
for (const key of ["dependencies", "devDependencies", "optionalDependencies"]) {
|
|
82
|
+
const block = pkg[key];
|
|
83
|
+
if (block !== null && typeof block === "object" && !Array.isArray(block)) {
|
|
84
|
+
const v = block["@deftai/directive-runtime"];
|
|
85
|
+
if (typeof v === "string" && v.trim().length > 0)
|
|
86
|
+
return v.trim();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
/** Installed runtime package version under the worktree, or null. */
|
|
92
|
+
function readInstalledRuntimeVersion(worktreePath) {
|
|
93
|
+
try {
|
|
94
|
+
const raw = readFileSync(join(resolve(worktreePath), "node_modules", "@deftai", "directive-runtime", "package.json"), "utf8");
|
|
95
|
+
const parsed = JSON.parse(raw);
|
|
96
|
+
if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed))
|
|
97
|
+
return null;
|
|
98
|
+
const version = parsed.version;
|
|
99
|
+
return typeof version === "string" && version.trim().length > 0 ? version.trim() : null;
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* Outer pin may skip install only when the installed runtime matches the
|
|
107
|
+
* package.json requested pin (stale node_modules after checkout must refresh).
|
|
108
|
+
*/
|
|
109
|
+
export function runtimePinMatchesRequest(worktreePath) {
|
|
110
|
+
if (!outerVisibleRuntimePinExists(worktreePath))
|
|
111
|
+
return false;
|
|
112
|
+
const pkg = readPackageJson(worktreePath);
|
|
113
|
+
if (pkg === null || !hasRuntimePin(pkg))
|
|
114
|
+
return true;
|
|
115
|
+
const requested = readRequestedRuntimePin(pkg);
|
|
116
|
+
const installed = readInstalledRuntimeVersion(worktreePath);
|
|
117
|
+
if (requested === null || installed === null)
|
|
118
|
+
return false;
|
|
119
|
+
const reqNorm = requested.replace(/^[\^~>=<\s]+/, "");
|
|
120
|
+
return installed === reqNorm || installed === requested;
|
|
121
|
+
}
|
|
50
122
|
/** Detect npm vs pnpm from lockfile / packageManager field (AC5.6 subset). */
|
|
51
123
|
export function detectWorktreePm(worktreePath) {
|
|
52
124
|
if (existsSync(join(worktreePath, "yarn.lock")) || existsSync(join(worktreePath, "bun.lockb"))) {
|
|
@@ -70,10 +142,22 @@ export function detectWorktreePm(worktreePath) {
|
|
|
70
142
|
return "npm";
|
|
71
143
|
return null;
|
|
72
144
|
}
|
|
145
|
+
function assertOuterVisiblePin(worktreePath, pm) {
|
|
146
|
+
if (outerVisibleRuntimePinExists(worktreePath)) {
|
|
147
|
+
return { ok: true, pm: pm ?? "npm", skipped: false };
|
|
148
|
+
}
|
|
149
|
+
return {
|
|
150
|
+
ok: false,
|
|
151
|
+
pm,
|
|
152
|
+
message: `worktree PM install finished but outer-visible pin missing at ` +
|
|
153
|
+
`${OUTER_VISIBLE_RUNTIME_PIN_REL}; not claiming readiness`,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
73
156
|
/**
|
|
74
157
|
* Run project PM install in a newly created worktree (AC14.25).
|
|
75
158
|
* Skips when there is no package.json. Fails closed on PM error when a
|
|
76
|
-
* runtime pin is present (configured project).
|
|
159
|
+
* runtime pin is present (configured project). Success requires the
|
|
160
|
+
* outer-visible hook-bin for configured (pinned) projects (#6100).
|
|
77
161
|
*/
|
|
78
162
|
export function installWorktreePackages(worktreePath, seams = {}) {
|
|
79
163
|
const pkg = readPackageJson(worktreePath);
|
|
@@ -104,6 +188,9 @@ export function installWorktreePackages(worktreePath, seams = {}) {
|
|
|
104
188
|
if (pm === "npm" && useArgs[0] === "ci") {
|
|
105
189
|
const retry = runner(pm, ["install", "--include=dev"], worktreePath);
|
|
106
190
|
if (retry.status === 0) {
|
|
191
|
+
if (hasRuntimePin(pkg)) {
|
|
192
|
+
return assertOuterVisiblePin(worktreePath, pm);
|
|
193
|
+
}
|
|
107
194
|
return { ok: true, pm, skipped: false };
|
|
108
195
|
}
|
|
109
196
|
const detail = (retry.stderr || retry.stdout || proc.stderr || "").trim();
|
|
@@ -120,16 +207,9 @@ export function installWorktreePackages(worktreePath, seams = {}) {
|
|
|
120
207
|
message: `worktree PM install failed (${pm} ${useArgs.join(" ")}): ${detail || `exit ${proc.status}`}`,
|
|
121
208
|
};
|
|
122
209
|
}
|
|
123
|
-
// Configured projects must end with
|
|
210
|
+
// Configured projects must end with the outer-visible pin after install (#6100).
|
|
124
211
|
if (hasRuntimePin(pkg)) {
|
|
125
|
-
|
|
126
|
-
if (!existsSync(runtimeDir)) {
|
|
127
|
-
return {
|
|
128
|
-
ok: false,
|
|
129
|
-
pm,
|
|
130
|
-
message: "worktree PM install finished but @deftai/directive-runtime is missing under node_modules; not claiming readiness",
|
|
131
|
-
};
|
|
132
|
-
}
|
|
212
|
+
return assertOuterVisiblePin(worktreePath, pm);
|
|
133
213
|
}
|
|
134
214
|
return { ok: true, pm, skipped: false };
|
|
135
215
|
}
|
|
@@ -138,4 +218,119 @@ export function worktreeHasRuntimePin(worktreePath) {
|
|
|
138
218
|
const pkg = readPackageJson(worktreePath);
|
|
139
219
|
return pkg !== null && hasRuntimePin(pkg);
|
|
140
220
|
}
|
|
221
|
+
/**
|
|
222
|
+
* Shared guarded prep for an existing linked worktree (#6100 Prefer-A Recut-3).
|
|
223
|
+
*
|
|
224
|
+
* Order: foreign-worktree refuse → live stranger-lease refuse → deposit/PM →
|
|
225
|
+
* success only when the outer-visible PIN_REL exists. Lease/foreign refuse runs
|
|
226
|
+
* before any deposit write or PM invocation.
|
|
227
|
+
*/
|
|
228
|
+
export function prepareLinkedWorktree(worktreePathRaw, seams = {}) {
|
|
229
|
+
const worktreePath = resolve(worktreePathRaw);
|
|
230
|
+
if (!isLinkedWorktreePath(worktreePath)) {
|
|
231
|
+
return {
|
|
232
|
+
ok: false,
|
|
233
|
+
code: "not-linked",
|
|
234
|
+
message: `linked-worktree prep refused: ${worktreePath} is not a linked worktree`,
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
const mainOf = seams.mainWorktreeRoot ?? mainWorktreeRoot;
|
|
238
|
+
const destMain = mainOf(worktreePath);
|
|
239
|
+
const repoRootRaw = seams.repoRoot?.trim() ?? "";
|
|
240
|
+
const ownershipRoot = repoRootRaw.length > 0 ? resolve(repoRootRaw) : worktreePath;
|
|
241
|
+
const repoMain = mainOf(ownershipRoot);
|
|
242
|
+
if (repoMain === null || destMain === null || !sameTree(repoMain, destMain)) {
|
|
243
|
+
return {
|
|
244
|
+
ok: false,
|
|
245
|
+
code: "foreign-worktree",
|
|
246
|
+
message: `linked-worktree prep refused: ${worktreePath} is not a linked worktree of ` +
|
|
247
|
+
`${ownershipRoot} (mainWorktreeRoot mismatch before deposit/PM)`,
|
|
248
|
+
};
|
|
249
|
+
}
|
|
250
|
+
const now = seams.now ?? new Date();
|
|
251
|
+
const readOcc = seams.readOccupancy ?? readOccupancy;
|
|
252
|
+
const liveOnTree = seams.liveOccupancyOnTree ?? liveOccupancyOnTree;
|
|
253
|
+
const admit = seams.occupancyAdmission ?? occupancyAdmission;
|
|
254
|
+
const live = liveOnTree(worktreePath, readOcc(worktreePath), now);
|
|
255
|
+
if (live !== null) {
|
|
256
|
+
const presenter = resolvePresenterSessionId(seams.presenterSessionId, process.env);
|
|
257
|
+
if (admit(live, presenter, now) === "stranger") {
|
|
258
|
+
return {
|
|
259
|
+
ok: false,
|
|
260
|
+
code: "live-stranger-lease",
|
|
261
|
+
message: `linked-worktree prep refused: ${worktreePath} has a live occupancy lease ` +
|
|
262
|
+
`and presenter admission is stranger (zero deposit/PM mutation)`,
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
// Skip install only when outer pin exists AND installed runtime matches request (#6100).
|
|
267
|
+
if (outerVisibleRuntimePinExists(worktreePath) && runtimePinMatchesRequest(worktreePath)) {
|
|
268
|
+
return {
|
|
269
|
+
ok: true,
|
|
270
|
+
worktreePath,
|
|
271
|
+
pm: detectWorktreePm(worktreePath),
|
|
272
|
+
skippedInstall: true,
|
|
273
|
+
pinRel: OUTER_VISIBLE_RUNTIME_PIN_REL,
|
|
274
|
+
};
|
|
275
|
+
}
|
|
276
|
+
if (seams.requirePinOnly) {
|
|
277
|
+
return {
|
|
278
|
+
ok: false,
|
|
279
|
+
code: "pin-missing",
|
|
280
|
+
message: `linked-worktree prep refused: outer-visible pin missing at ` +
|
|
281
|
+
`${OUTER_VISIBLE_RUNTIME_PIN_REL} (requirePinOnly)`,
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
const reconstitute = seams.reconstitute ?? reconstituteLinkedWorktreeDeposit;
|
|
285
|
+
const pinned = worktreeHasRuntimePin(worktreePath);
|
|
286
|
+
const pkg = readPackageJson(worktreePath);
|
|
287
|
+
if (pinned) {
|
|
288
|
+
const pm = installWorktreePackages(worktreePath, { runner: seams.runner });
|
|
289
|
+
if (!pm.ok) {
|
|
290
|
+
return { ok: false, code: "pm-failed", message: pm.message };
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
else {
|
|
294
|
+
const deposit = reconstitute(worktreePath, { preferPrimaryCore: true });
|
|
295
|
+
if (deposit.status === "refused") {
|
|
296
|
+
return {
|
|
297
|
+
ok: false,
|
|
298
|
+
code: "deposit-refused",
|
|
299
|
+
message: `linked-worktree prep deposit refused: ${deposit.message}`,
|
|
300
|
+
};
|
|
301
|
+
}
|
|
302
|
+
if (pkg !== null) {
|
|
303
|
+
// Unpinned consumer with package.json: install and require outer-visible pin.
|
|
304
|
+
const pm = installWorktreePackages(worktreePath, { runner: seams.runner });
|
|
305
|
+
if (!pm.ok) {
|
|
306
|
+
return { ok: false, code: "pm-failed", message: pm.message };
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
else {
|
|
310
|
+
// No package.json: deposit-only / fixture path — not Codex pin handoff.
|
|
311
|
+
return {
|
|
312
|
+
ok: true,
|
|
313
|
+
worktreePath,
|
|
314
|
+
pm: null,
|
|
315
|
+
skippedInstall: true,
|
|
316
|
+
pinRel: OUTER_VISIBLE_RUNTIME_PIN_REL,
|
|
317
|
+
};
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
if (!outerVisibleRuntimePinExists(worktreePath)) {
|
|
321
|
+
return {
|
|
322
|
+
ok: false,
|
|
323
|
+
code: "pin-missing",
|
|
324
|
+
message: `linked-worktree prep finished but outer-visible pin missing at ` +
|
|
325
|
+
`${OUTER_VISIBLE_RUNTIME_PIN_REL}; not claiming readiness`,
|
|
326
|
+
};
|
|
327
|
+
}
|
|
328
|
+
return {
|
|
329
|
+
ok: true,
|
|
330
|
+
worktreePath,
|
|
331
|
+
pm: detectWorktreePm(worktreePath),
|
|
332
|
+
skippedInstall: false,
|
|
333
|
+
pinRel: OUTER_VISIBLE_RUNTIME_PIN_REL,
|
|
334
|
+
};
|
|
335
|
+
}
|
|
141
336
|
//# sourceMappingURL=worktree-pm-install.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-pm-install.js","sourceRoot":"","sources":["../../src/swarm/worktree-pm-install.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worktree-pm-install.js","sourceRoot":"","sources":["../../src/swarm/worktree-pm-install.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,11 @@ export declare function parseWorktreesArgv(argv: readonly string[]): {
|
|
|
5
5
|
repoRoot: string;
|
|
6
6
|
createMissing: boolean;
|
|
7
7
|
};
|
|
8
|
+
export declare function parsePrepArgv(argv: readonly string[]): {
|
|
9
|
+
path: string;
|
|
10
|
+
repoRoot: string;
|
|
11
|
+
sessionId: string;
|
|
12
|
+
help: boolean;
|
|
13
|
+
};
|
|
8
14
|
export declare function worktreesMain(argv?: string[]): number;
|
|
9
15
|
//# sourceMappingURL=worktrees-cli.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees-cli.d.ts","sourceRoot":"","sources":["../../src/swarm/worktrees-cli.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"worktrees-cli.d.ts","sourceRoot":"","sources":["../../src/swarm/worktrees-cli.ts"],"names":[],"mappings":";AAcA,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG;IAC3D,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;CACxB,CAqBA;AAYD,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf,CAuBA;AAoCD,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG,MAAM,CAoC5E"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { resolve } from "node:path";
|
|
3
|
+
/**
|
|
4
|
+
* Swarm worktrees CLI — map resolve + one-path linked-worktree prep (#6100).
|
|
5
|
+
*/
|
|
2
6
|
import { fileURLToPath } from "node:url";
|
|
7
|
+
import { prepareLinkedWorktree } from "./worktree-pm-install.js";
|
|
3
8
|
import { loadWorktreeMapFile, resolveWorktreeMap, WorktreeMapConfigError, WorktreeMapError, } from "./worktrees.js";
|
|
4
9
|
export function parseWorktreesArgv(argv) {
|
|
5
10
|
let mapPath = "";
|
|
@@ -26,16 +31,88 @@ export function parseWorktreesArgv(argv) {
|
|
|
26
31
|
}
|
|
27
32
|
return { mapPath, baseBranch, repoRoot, createMissing };
|
|
28
33
|
}
|
|
34
|
+
const PREP_USAGE = "usage: deft swarm-worktrees prep --path <linked-worktree> [--repo-root <path>] [--session-id <id>]\n" +
|
|
35
|
+
" Prepare one linked worktree (ownership + live-lease gates, then deposit/PM as needed).\n" +
|
|
36
|
+
" --help, -h Show this help without mutating the worktree.\n";
|
|
37
|
+
const MAP_USAGE = "usage: deft swarm-worktrees --map <file> --base-branch <branch> [--repo-root <path>] [--no-create-missing]\n" +
|
|
38
|
+
" Or: deft swarm-worktrees prep --path <linked-worktree> [...]\n" +
|
|
39
|
+
" --help, -h Show this help.\n";
|
|
40
|
+
export function parsePrepArgv(argv) {
|
|
41
|
+
let path = "";
|
|
42
|
+
let repoRoot = ".";
|
|
43
|
+
let sessionId = "";
|
|
44
|
+
let help = false;
|
|
45
|
+
for (let i = 0; i < argv.length; i += 1) {
|
|
46
|
+
const arg = argv[i] ?? "";
|
|
47
|
+
if (arg === "--help" || arg === "-h") {
|
|
48
|
+
help = true;
|
|
49
|
+
}
|
|
50
|
+
else if ((arg === "--path" || arg === "--worktree") && argv[i + 1] !== undefined) {
|
|
51
|
+
path = argv[i + 1] ?? "";
|
|
52
|
+
i += 1;
|
|
53
|
+
}
|
|
54
|
+
else if (arg === "--repo-root" && argv[i + 1] !== undefined) {
|
|
55
|
+
repoRoot = argv[i + 1] ?? ".";
|
|
56
|
+
i += 1;
|
|
57
|
+
}
|
|
58
|
+
else if ((arg === "--session-id" || arg === "--presenter") && argv[i + 1] !== undefined) {
|
|
59
|
+
sessionId = argv[i + 1] ?? "";
|
|
60
|
+
i += 1;
|
|
61
|
+
}
|
|
62
|
+
else if (!arg.startsWith("-") && path.length === 0) {
|
|
63
|
+
path = arg;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return { path, repoRoot, sessionId, help };
|
|
67
|
+
}
|
|
68
|
+
function prepMain(argv) {
|
|
69
|
+
const { path, repoRoot, sessionId, help } = parsePrepArgv(argv);
|
|
70
|
+
if (help) {
|
|
71
|
+
process.stdout.write(PREP_USAGE);
|
|
72
|
+
return 0;
|
|
73
|
+
}
|
|
74
|
+
if (path.trim().length === 0) {
|
|
75
|
+
process.stderr.write("config error: swarm-worktrees prep requires --path <linked-worktree>\n");
|
|
76
|
+
return 2;
|
|
77
|
+
}
|
|
78
|
+
const result = prepareLinkedWorktree(resolve(path), {
|
|
79
|
+
repoRoot: resolve(repoRoot),
|
|
80
|
+
...(sessionId.trim().length > 0 ? { presenterSessionId: sessionId.trim() } : {}),
|
|
81
|
+
});
|
|
82
|
+
if (!result.ok) {
|
|
83
|
+
process.stderr.write(`error: ${result.message}\n`);
|
|
84
|
+
return 1;
|
|
85
|
+
}
|
|
86
|
+
process.stdout.write(`${JSON.stringify({
|
|
87
|
+
ok: true,
|
|
88
|
+
worktreePath: result.worktreePath,
|
|
89
|
+
pinRel: result.pinRel,
|
|
90
|
+
skippedInstall: result.skippedInstall,
|
|
91
|
+
pm: result.pm,
|
|
92
|
+
}, null, 2)}\n`);
|
|
93
|
+
return 0;
|
|
94
|
+
}
|
|
29
95
|
export function worktreesMain(argv = process.argv.slice(2)) {
|
|
96
|
+
if (argv.some((a) => a === "--help" || a === "-h") && (argv[0] ?? "").trim() !== "prep") {
|
|
97
|
+
process.stdout.write(MAP_USAGE);
|
|
98
|
+
return 0;
|
|
99
|
+
}
|
|
100
|
+
if ((argv[0] ?? "").trim() === "prep") {
|
|
101
|
+
return prepMain(argv.slice(1));
|
|
102
|
+
}
|
|
30
103
|
const { mapPath, baseBranch, repoRoot, createMissing } = parseWorktreesArgv(argv);
|
|
31
104
|
if (mapPath.length === 0 || baseBranch.length === 0) {
|
|
32
|
-
process.stderr.write("config error: --map and --base-branch are required\n");
|
|
105
|
+
process.stderr.write("config error: --map and --base-branch are required (or use: prep --path <worktree>)\n");
|
|
33
106
|
return 2;
|
|
34
107
|
}
|
|
35
108
|
try {
|
|
36
109
|
const mapping = loadWorktreeMapFile(mapPath);
|
|
37
110
|
const resolved = resolveWorktreeMap(mapping, baseBranch, createMissing, { repoRoot });
|
|
38
|
-
|
|
111
|
+
if (!resolved.ok) {
|
|
112
|
+
process.stderr.write(`config error: ${resolved.message}\n`);
|
|
113
|
+
return 2;
|
|
114
|
+
}
|
|
115
|
+
process.stdout.write(`${JSON.stringify(resolved.records, null, 2)}\n`);
|
|
39
116
|
return 0;
|
|
40
117
|
}
|
|
41
118
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees-cli.js","sourceRoot":"","sources":["../../src/swarm/worktrees-cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,MAAM,UAAU,kBAAkB,CAAC,IAAuB;IAMxD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,QAAQ,GAAG,GAAG,CAAC;IACnB,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,KAAK,OAAO,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACjD,OAAO,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5B,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;aAAM,IAAI,GAAG,KAAK,eAAe,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YAChE,UAAU,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/B,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;aAAM,IAAI,GAAG,KAAK,aAAa,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YAC9D,QAAQ,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC;YAC9B,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;aAAM,IAAI,GAAG,KAAK,qBAAqB,EAAE,CAAC;YACzC,aAAa,GAAG,KAAK,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAiB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpD,OAAO,CAAC,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"worktrees-cli.js","sourceRoot":"","sources":["../../src/swarm/worktrees-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,18 +41,29 @@ export interface WorktreePorcelainEntry {
|
|
|
41
41
|
}
|
|
42
42
|
/** Parse `git worktree list --porcelain` into `{compareKey: {branch, head}}`. */
|
|
43
43
|
export declare function parseWorktreePorcelain(text: string): Map<string, WorktreePorcelainEntry>;
|
|
44
|
+
/** Prep/create operational outcome for resolveWorktreeMap (#6100 returned-failure). */
|
|
45
|
+
export type ResolveWorktreeMapResult = {
|
|
46
|
+
readonly ok: true;
|
|
47
|
+
readonly records: WorktreeRecord[];
|
|
48
|
+
} | {
|
|
49
|
+
readonly ok: false;
|
|
50
|
+
readonly message: string;
|
|
51
|
+
};
|
|
44
52
|
/**
|
|
45
53
|
* Resolve a story-to-worktree mapping into normalized C3 records (frozen contract).
|
|
46
54
|
*
|
|
47
55
|
* Registered paths are reused only when their porcelain HEAD OID matches the
|
|
48
56
|
* requested base OID. That comparison is a snapshot at resolution time — not a
|
|
49
57
|
* pin on the worker's start revision (`swarm:launch` emits a manifest and stops).
|
|
58
|
+
*
|
|
59
|
+
* Map/config/git-list invariant failures still throw. Linked-worktree prep
|
|
60
|
+
* denials return `{ ok: false, message }` (same shape as dest-place).
|
|
50
61
|
*/
|
|
51
62
|
export declare function resolveWorktreeMap(mapping: readonly Record<string, unknown>[], baseBranch: string, createMissing?: boolean, options?: {
|
|
52
63
|
repoRoot?: string;
|
|
53
64
|
git?: GitRunner;
|
|
54
65
|
pmRunner?: WorktreePmRunner;
|
|
55
|
-
}):
|
|
66
|
+
}): ResolveWorktreeMapResult;
|
|
56
67
|
export declare function loadWorktreeMapFile(mapPath: string): Record<string, unknown>[];
|
|
57
68
|
export { C3_FIELDS };
|
|
58
69
|
//# sourceMappingURL=worktrees.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/swarm/worktrees.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/swarm/worktrees.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAW,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAExF,qBAAa,gBAAiB,SAAQ,KAAK;IAChC,IAAI,SAAsB;CACpC;AAED,qBAAa,sBAAuB,SAAQ,gBAAgB;IACjD,IAAI,SAA4B;CAC1C;AAED,qBAAa,uBAAwB,SAAQ,gBAAgB;IAClD,IAAI,SAA6B;CAC3C;AAED,qBAAa,oBAAqB,SAAQ,gBAAgB;IAC/C,IAAI,SAA0B;CACxC;AAED,qBAAa,mBAAoB,SAAQ,gBAAgB;IAC9C,IAAI,SAAyB;CACvC;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IACtC,IAAI,SAA4B;CAC1C;AAED,qBAAa,uBAAwB,SAAQ,gBAAgB;IAClD,IAAI,SAA6B;CAC3C;AAED,qBAAa,6BAA8B,SAAQ,gBAAgB;IACxD,IAAI,SAAmC;CACjD;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK,iBAAiB,CAAC;AAEpF,eAAO,MAAM,gBAAgB,EAAE,SAA6D,CAAC;AAoB7F,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,oFAAoF;AACpF,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,iFAAiF;AACjF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CA4BxF;AAsFD,uFAAuF;AACvF,MAAM,MAAM,wBAAwB,GAChC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,CAAA;CAAE,GACzD;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC3C,UAAU,EAAE,MAAM,EAClB,aAAa,UAAO,EACpB,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAA;CAAO,GAChF,wBAAwB,CA2H1B;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAoB9E;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { mkdirSync, readFileSync } from "node:fs";
|
|
2
2
|
import { isAbsolute, resolve as pathResolve } from "node:path";
|
|
3
3
|
import { assertProjectionContained, ProjectionContainmentError, } from "../fs/projection-containment.js";
|
|
4
|
-
import { reconstituteLinkedWorktreeDeposit } from "../init-deposit/gitignore.js";
|
|
5
4
|
import { C3_FIELDS } from "./constants.js";
|
|
6
5
|
import { ensureSubagentStatusDir } from "./subagent-status-dir.js";
|
|
7
6
|
import { runText } from "./subprocess.js";
|
|
8
|
-
import {
|
|
7
|
+
import { prepareLinkedWorktree } from "./worktree-pm-install.js";
|
|
9
8
|
export class WorktreeMapError extends Error {
|
|
10
9
|
name = "WorktreeMapError";
|
|
11
10
|
}
|
|
@@ -125,26 +124,16 @@ function createWorktree(repoRoot, worktreePath, baseBranch, git, seams = {}) {
|
|
|
125
124
|
throw new WorktreeMapConfigError(`\`git worktree add --detach ${worktreePath} ${baseBranch}\` failed ` +
|
|
126
125
|
`(rc=${proc.returncode}): ${proc.stderr.trim() || "<no stderr>"}`);
|
|
127
126
|
}
|
|
128
|
-
//
|
|
129
|
-
//
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
throw new WorktreeMapConfigError(pm.message);
|
|
134
|
-
}
|
|
135
|
-
return;
|
|
136
|
-
}
|
|
137
|
-
const deposit = reconstituteLinkedWorktreeDeposit(worktreePath, {
|
|
138
|
-
preferPrimaryCore: true,
|
|
127
|
+
// #6100: shared guarded prep (foreign/lease refuse before deposit/PM; pin-present success).
|
|
128
|
+
// Operational prep denials return ok:false (dest-place pattern); no new throw sites.
|
|
129
|
+
const prep = prepareLinkedWorktree(worktreePath, {
|
|
130
|
+
repoRoot,
|
|
131
|
+
runner: seams.pmRunner,
|
|
139
132
|
});
|
|
140
|
-
if (
|
|
141
|
-
|
|
142
|
-
}
|
|
143
|
-
// Best-effort PM install for package.json without a runtime pin (legacy / unconfigured).
|
|
144
|
-
const pm = installWorktreePackages(worktreePath, { runner: seams.pmRunner });
|
|
145
|
-
if (!pm.ok && pm.message.includes("Yarn/Bun")) {
|
|
146
|
-
throw new WorktreeMapConfigError(pm.message);
|
|
133
|
+
if (!prep.ok) {
|
|
134
|
+
return { ok: false, message: prep.message };
|
|
147
135
|
}
|
|
136
|
+
return { ok: true };
|
|
148
137
|
}
|
|
149
138
|
/**
|
|
150
139
|
* Resolve a story-to-worktree mapping into normalized C3 records (frozen contract).
|
|
@@ -152,6 +141,9 @@ function createWorktree(repoRoot, worktreePath, baseBranch, git, seams = {}) {
|
|
|
152
141
|
* Registered paths are reused only when their porcelain HEAD OID matches the
|
|
153
142
|
* requested base OID. That comparison is a snapshot at resolution time — not a
|
|
154
143
|
* pin on the worker's start revision (`swarm:launch` emits a manifest and stops).
|
|
144
|
+
*
|
|
145
|
+
* Map/config/git-list invariant failures still throw. Linked-worktree prep
|
|
146
|
+
* denials return `{ ok: false, message }` (same shape as dest-place).
|
|
155
147
|
*/
|
|
156
148
|
export function resolveWorktreeMap(mapping, baseBranch, createMissing = true, options = {}) {
|
|
157
149
|
if (!Array.isArray(mapping)) {
|
|
@@ -220,6 +212,14 @@ export function resolveWorktreeMap(mapping, baseBranch, createMissing = true, op
|
|
|
220
212
|
`but requested base '${trimmedBase}' resolves to ${requestedOid}; ` +
|
|
221
213
|
`this is a snapshot check at resolution time, not a pin on the worker's start revision`);
|
|
222
214
|
}
|
|
215
|
+
// #6100: reuse must run guarded prep when outer-visible pin is missing.
|
|
216
|
+
const reusePrep = prepareLinkedWorktree(entry._abs, {
|
|
217
|
+
repoRoot: root,
|
|
218
|
+
runner: options.pmRunner,
|
|
219
|
+
});
|
|
220
|
+
if (!reusePrep.ok) {
|
|
221
|
+
return { ok: false, message: reusePrep.message };
|
|
222
|
+
}
|
|
223
223
|
// Heartbeat dir only. Child occupancy owner is recorded at claim (#3999).
|
|
224
224
|
ensureSubagentStatusDir(entry._abs);
|
|
225
225
|
continue;
|
|
@@ -227,15 +227,23 @@ export function resolveWorktreeMap(mapping, baseBranch, createMissing = true, op
|
|
|
227
227
|
if (!createMissing) {
|
|
228
228
|
throw new MissingWorktreeError(`story '${entry.story_id}' maps to '${entry.worktree_path}' which is not a registered git worktree and create_missing is disabled`);
|
|
229
229
|
}
|
|
230
|
-
createWorktree(root, entry._abs, trimmedBase, git, {
|
|
230
|
+
const created = createWorktree(root, entry._abs, trimmedBase, git, {
|
|
231
|
+
pmRunner: options.pmRunner,
|
|
232
|
+
});
|
|
233
|
+
if (!created.ok) {
|
|
234
|
+
return { ok: false, message: created.message };
|
|
235
|
+
}
|
|
231
236
|
// Heartbeat dir only. Child occupancy owner is recorded at claim (#3999).
|
|
232
237
|
ensureSubagentStatusDir(entry._abs);
|
|
233
238
|
}
|
|
234
|
-
return
|
|
235
|
-
|
|
236
|
-
worktree_path,
|
|
237
|
-
|
|
238
|
-
|
|
239
|
+
return {
|
|
240
|
+
ok: true,
|
|
241
|
+
records: resolved.map(({ story_id, worktree_path, base_branch }) => ({
|
|
242
|
+
story_id,
|
|
243
|
+
worktree_path,
|
|
244
|
+
base_branch,
|
|
245
|
+
})),
|
|
246
|
+
};
|
|
239
247
|
}
|
|
240
248
|
export function loadWorktreeMapFile(mapPath) {
|
|
241
249
|
let raw;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/swarm/worktrees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EACL,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,OAAO,EAA0B,MAAM,iBAAiB,CAAC;AAClE,OAAO,EACL,uBAAuB,EAEvB,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAElC,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAChC,IAAI,GAAG,kBAAkB,CAAC;CACpC;AAED,MAAM,OAAO,sBAAuB,SAAQ,gBAAgB;IACjD,IAAI,GAAG,wBAAwB,CAAC;CAC1C;AAED,MAAM,OAAO,uBAAwB,SAAQ,gBAAgB;IAClD,IAAI,GAAG,yBAAyB,CAAC;CAC3C;AAED,MAAM,OAAO,oBAAqB,SAAQ,gBAAgB;IAC/C,IAAI,GAAG,sBAAsB,CAAC;CACxC;AAED,MAAM,OAAO,mBAAoB,SAAQ,gBAAgB;IAC9C,IAAI,GAAG,qBAAqB,CAAC;CACvC;AAED,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IACtC,IAAI,GAAG,wBAAwB,CAAC;CAC1C;AAED,MAAM,OAAO,uBAAwB,SAAQ,gBAAgB;IAClD,IAAI,GAAG,yBAAyB,CAAC;CAC3C;AAED,MAAM,OAAO,6BAA8B,SAAQ,gBAAgB;IACxD,IAAI,GAAG,+BAA+B,CAAC;CACjD;AAID,MAAM,CAAC,MAAM,gBAAgB,GAAc,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AAE7F,SAAS,WAAW,CAAC,GAAW,EAAE,QAAgB;IAChD,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACrE,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,2BAA2B,CAAC,QAAgB,EAAE,YAAoB;IACzE,IAAI,CAAC;QACH,yBAAyB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,0BAA0B,EAAE,CAAC;YAC9C,MAAM,IAAI,uBAAuB,CAC/B,sDAAsD,GAAG,CAAC,OAAO,EAAE,CACpE,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;AACnD,CAAC;AAcD,iFAAiF;AACjF,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkC,CAAC;IAC7D,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,WAAW,GAAkB,IAAI,CAAC;IAEtC,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACzB,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,KAAK,EAAE,CAAC;YACR,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACjE,aAAa,GAAG,IAAI,CAAC;YACrB,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC5D,WAAW,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5C,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAChD,aAAa,GAAG,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACxF,CAAC;IACH,CAAC;IACD,KAAK,EAAE,CAAC;IACR,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,GAAc;IACvD,IAAI,IAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,IAAI,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,IAAI,sBAAsB,CAC9B,0CAA0C,QAAQ,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,sBAAsB,CAC9B,mCAAmC,QAAQ,QAAQ,IAAI,CAAC,UAAU,KAAK;YACrE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,aAAa,8BAA8B,CACvE,CAAC;IACJ,CAAC;IACD,OAAO,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB,EAAE,QAAgB,EAAE,GAAc;IAC1E,IAAI,IAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,IAAI,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,QAAQ,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC9F,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,IAAI,sBAAsB,CAC9B,2BAA2B,QAAQ,wBAAwB,QAAQ,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CACtF,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,sBAAsB,CAC9B,2BAA2B,QAAQ,wBAAwB,QAAQ,GAAG;YACpE,OAAO,IAAI,CAAC,UAAU,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,aAAa,EAAE,CACpE,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,sBAAsB,CAC9B,2BAA2B,QAAQ,kCAAkC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC3F,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,cAAc,CACrB,QAAgB,EAChB,YAAoB,EACpB,UAAkB,EAClB,GAAc,EACd,QAAkD,EAAE;IAEpD,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,IAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,IAAI,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,IAAI,sBAAsB,CAC9B,0CAA0C,YAAY,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CACzE,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,sBAAsB,CAC9B,+BAA+B,YAAY,IAAI,UAAU,YAAY;YACnE,OAAO,IAAI,CAAC,UAAU,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,aAAa,EAAE,CACpE,CAAC;IACJ,CAAC;IACD,mFAAmF;IACnF,gDAAgD;IAChD,IAAI,qBAAqB,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,uBAAuB,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACX,MAAM,IAAI,sBAAsB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,iCAAiC,CAAC,YAAY,EAAE;QAC9D,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,sBAAsB,CAC9B,sCAAsC,YAAY,KAAK,OAAO,CAAC,OAAO,EAAE,CACzE,CAAC;IACJ,CAAC;IACD,yFAAyF;IACzF,MAAM,EAAE,GAAG,uBAAuB,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7E,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,sBAAsB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAMD;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAA2C,EAC3C,UAAkB,EAClB,aAAa,GAAG,IAAI,EACpB,UAA+E,EAAE;IAEjF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,sBAAsB,CAC9B,+CAA+C,OAAO,OAAO,EAAE,CAChE,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,sBAAsB,CAAC,wCAAwC,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,gBAAgB,CAAC;IAE5C,MAAM,QAAQ,GAAqB,EAAE,CAAC;IACtC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE/C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACvD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,2BAA2B,OAAO,MAAM,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC;QACnC,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,oCAAoC,CAAC,CAAC;QACzF,CAAC;QACD,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC;QACrC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,sBAAsB,CAC9B,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,yCAAyC,CAC1E,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACpD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrE,MAAM,IAAI,sBAAsB,CAC9B,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,yCAAyC,CAC1E,CAAC;YACJ,CAAC;YACD,IAAI,UAAU,CAAC,IAAI,EAAE,KAAK,WAAW,EAAE,CAAC;gBACtC,MAAM,IAAI,uBAAuB,CAC/B,UAAU,OAAO,2BAA2B,UAAU,CAAC,IAAI,EAAE,oCAAoC,WAAW,GAAG,CAChH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QACvD,2BAA2B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEnD,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,sBAAsB,CAC9B,qCAAqC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,OAAO,kBAAkB,SAAS,GAAG,CACvG,CAAC;QACJ,CAAC;QACD,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,mBAAmB,CAC3B,uBAAuB,OAAO,sBAAsB,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,SAAS,GAAG,CACpG,CAAC;QACJ,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC5B,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,OAAO;YACjB,aAAa,EAAE,SAAS;YACxB,WAAW,EAAE,WAAW;YACxB,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;YACtC,IAAI,SAAS,KAAK,YAAY,EAAE,CAAC;gBAC/B,MAAM,IAAI,6BAA6B,CACrC,wBAAwB,KAAK,CAAC,aAAa,iBAAiB,SAAS,IAAI,WAAW,GAAG;oBACrF,uBAAuB,WAAW,iBAAiB,YAAY,IAAI;oBACnE,uFAAuF,CAC1F,CAAC;YACJ,CAAC;YACD,0EAA0E;YAC1E,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,SAAS;QACX,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,oBAAoB,CAC5B,UAAU,KAAK,CAAC,QAAQ,cAAc,KAAK,CAAC,aAAa,yEAAyE,CACnI,CAAC;QACJ,CAAC;QACD,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnF,0EAA0E;QAC1E,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QACjE,QAAQ;QACR,aAAa;QACb,WAAW;KACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,IAAI,sBAAsB,CAAC,+BAA+B,OAAO,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;IACD,IAAI,IAAa,CAAC;IAClB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;IACpC,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,IAAI,sBAAsB,CAAC,gBAAgB,OAAO,uBAAuB,OAAO,EAAE,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,sBAAsB,CAC9B,gBAAgB,OAAO,uCAAuC,CAC/D,CAAC;IACJ,CAAC;IACD,OAAO,IAAiC,CAAC;AAC3C,CAAC;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/swarm/worktrees.ts"],"names":[],"mappings":"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"}
|