zelari-code 2.46.2 → 2.49.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/README.md +3 -3
- package/dist/cli/automations/browser/cookieDisk.js +56 -0
- package/dist/cli/automations/browser/cookieDisk.js.map +1 -0
- package/dist/cli/automations/browser/pageAdapter.js +130 -0
- package/dist/cli/automations/browser/pageAdapter.js.map +1 -0
- package/dist/cli/automations/browser/selectors.js +178 -0
- package/dist/cli/automations/browser/selectors.js.map +1 -0
- package/dist/cli/automations/browser/session.js +243 -0
- package/dist/cli/automations/browser/session.js.map +1 -0
- package/dist/cli/budget/budgetRuntime.js +9 -13
- package/dist/cli/budget/budgetRuntime.js.map +1 -1
- package/dist/cli/budget/essentialBashConfig.js +118 -0
- package/dist/cli/budget/essentialBashConfig.js.map +1 -0
- package/dist/cli/components/ChatStream.js +7 -2
- package/dist/cli/components/ChatStream.js.map +1 -1
- package/dist/cli/components/InputBar.js +8 -2
- package/dist/cli/components/InputBar.js.map +1 -1
- package/dist/cli/components/SelectList.js +5 -4
- package/dist/cli/components/SelectList.js.map +1 -1
- package/dist/cli/components/Sidebar.js +8 -7
- package/dist/cli/components/Sidebar.js.map +1 -1
- package/dist/cli/components/SplashScreen.js +3 -2
- package/dist/cli/components/SplashScreen.js.map +1 -1
- package/dist/cli/components/StartupBanner.js +6 -3
- package/dist/cli/components/StartupBanner.js.map +1 -1
- package/dist/cli/components/StatusBar.js +17 -14
- package/dist/cli/components/StatusBar.js.map +1 -1
- package/dist/cli/components/ToolOutput.js +6 -5
- package/dist/cli/components/ToolOutput.js.map +1 -1
- package/dist/cli/components/tuiPalette.js +56 -0
- package/dist/cli/components/tuiPalette.js.map +1 -0
- package/dist/cli/headless/runOneTurn.js +36 -6
- package/dist/cli/headless/runOneTurn.js.map +1 -1
- package/dist/cli/hooks/useChatTurn.js +30 -7
- package/dist/cli/hooks/useChatTurn.js.map +1 -1
- package/dist/cli/keyStore.js +2 -0
- package/dist/cli/keyStore.js.map +1 -1
- package/dist/cli/kraken/candidateRegistry.js +13 -0
- package/dist/cli/kraken/candidateRegistry.js.map +1 -1
- package/dist/cli/kraken/executor.js +200 -22
- package/dist/cli/kraken/executor.js.map +1 -1
- package/dist/cli/kraken/narrativeFloor.js +23 -0
- package/dist/cli/kraken/narrativeFloor.js.map +1 -0
- package/dist/cli/kraken/planner.js +27 -0
- package/dist/cli/kraken/planner.js.map +1 -1
- package/dist/cli/kraken/strictWaiver.js +22 -0
- package/dist/cli/kraken/strictWaiver.js.map +1 -0
- package/dist/cli/kraken/unresolvedGate.js +32 -0
- package/dist/cli/kraken/unresolvedGate.js.map +1 -0
- package/dist/cli/kraken/verificationBridge.js +67 -8
- package/dist/cli/kraken/verificationBridge.js.map +1 -1
- package/dist/cli/kraken/verifyHonestVerdict.js +30 -0
- package/dist/cli/kraken/verifyHonestVerdict.js.map +1 -0
- package/dist/cli/kraken/worktreeMergeRollback.js +277 -0
- package/dist/cli/kraken/worktreeMergeRollback.js.map +1 -0
- package/dist/cli/kraken/worktreeScheduling.js +11 -0
- package/dist/cli/kraken/worktreeScheduling.js.map +1 -1
- package/dist/cli/main.bundled.js +3375 -1511
- package/dist/cli/main.bundled.js.map +4 -4
- package/dist/cli/main.js +1 -1
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/modelDiscovery.js +5 -1
- package/dist/cli/modelDiscovery.js.map +1 -1
- package/dist/cli/museOAuth.js +384 -0
- package/dist/cli/museOAuth.js.map +1 -0
- package/dist/cli/oauthDesktop.js +18 -1
- package/dist/cli/oauthDesktop.js.map +1 -1
- package/dist/cli/provider/openai-compatible.js +1 -0
- package/dist/cli/provider/openai-compatible.js.map +1 -1
- package/dist/cli/provider/resolveStream.js +2 -0
- package/dist/cli/provider/resolveStream.js.map +1 -1
- package/dist/cli/providerConfig.js +2 -0
- package/dist/cli/providerConfig.js.map +1 -1
- package/dist/cli/refreshRegistry.js +6 -0
- package/dist/cli/refreshRegistry.js.map +1 -1
- package/dist/cli/runHeadless.js +184 -100
- package/dist/cli/runHeadless.js.map +1 -1
- package/dist/cli/slashCommands.js +6 -6
- package/dist/cli/slashCommands.js.map +1 -1
- package/dist/cli/slashHandlers/krakenGraph.js +25 -7
- package/dist/cli/slashHandlers/krakenGraph.js.map +1 -1
- package/dist/cli/slashHandlers/provider.js +14 -4
- package/dist/cli/slashHandlers/provider.js.map +1 -1
- package/dist/cli/thinking.js +1 -0
- package/dist/cli/thinking.js.map +1 -1
- package/dist/cli/thinkingCapability.js +2 -0
- package/dist/cli/thinkingCapability.js.map +1 -1
- package/dist/cli/toolRegistry.js +22 -3
- package/dist/cli/toolRegistry.js.map +1 -1
- package/dist/cli/tools/bashWriteWatch.js +195 -0
- package/dist/cli/tools/bashWriteWatch.js.map +1 -0
- package/dist/cli/tools/krakenModel.js +50 -0
- package/dist/cli/tools/krakenModel.js.map +1 -1
- package/dist/cli/tools/krakenRadio.js +50 -5
- package/dist/cli/tools/krakenRadio.js.map +1 -1
- package/dist/cli/tools/krakenWorktree.js +35 -6
- package/dist/cli/tools/krakenWorktree.js.map +1 -1
- package/dist/cli/tools/taskTool.js +328 -34
- package/dist/cli/tools/taskTool.js.map +1 -1
- package/dist/cli/tools/verifyDebtSpine.js +117 -0
- package/dist/cli/tools/verifyDebtSpine.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* K2.3 / F11 — roll the parent tree back when a Kraken worktree squash-merge
|
|
3
|
+
* fails after staging (commit denied, conflict, or any post-staging step).
|
|
4
|
+
*
|
|
5
|
+
* Radio names ride in `description` (same pattern as K2.1 bash-write):
|
|
6
|
+
* `worktree.merge_aborted` / `worktree.merge_abort_failed`. Kind stays `error`
|
|
7
|
+
* so we do not have to widen KrakenRadioKind.
|
|
8
|
+
*/
|
|
9
|
+
import { execFile } from 'node:child_process';
|
|
10
|
+
import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
11
|
+
import path from 'node:path';
|
|
12
|
+
import { promisify } from 'node:util';
|
|
13
|
+
import { appendKrakenRadio } from '../tools/krakenRadio.js';
|
|
14
|
+
const execFileAsync = promisify(execFile);
|
|
15
|
+
export const WORKTREE_MERGE_ABORTED = 'worktree.merge_aborted';
|
|
16
|
+
export const WORKTREE_MERGE_ABORT_FAILED = 'worktree.merge_abort_failed';
|
|
17
|
+
/**
|
|
18
|
+
* K2.3 req.4 — signal an abort that happened BEFORE the first parent mutation:
|
|
19
|
+
* there is nothing to roll back, but the audit trail stays uniform (every
|
|
20
|
+
* aborted merge emits `worktree.merge_aborted`).
|
|
21
|
+
*/
|
|
22
|
+
export function emitWorktreeMergeAborted(opts) {
|
|
23
|
+
emitRadio(opts.repoRoot, opts.sessionId ?? '', WORKTREE_MERGE_ABORTED, {
|
|
24
|
+
branch: opts.branch,
|
|
25
|
+
reason: opts.reason,
|
|
26
|
+
phase: opts.phase,
|
|
27
|
+
...(opts.nodeId !== undefined ? { nodeId: opts.nodeId } : {}),
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
export async function defaultGitRun(cwd, args) {
|
|
31
|
+
try {
|
|
32
|
+
const { stdout, stderr } = await execFileAsync('git', ['-C', cwd, ...args], {
|
|
33
|
+
maxBuffer: 16 * 1024 * 1024,
|
|
34
|
+
windowsHide: true,
|
|
35
|
+
});
|
|
36
|
+
return { ok: true, stdout: stdout ?? '', stderr: stderr ?? '', code: 0 };
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
const e = err;
|
|
40
|
+
return {
|
|
41
|
+
ok: false,
|
|
42
|
+
stdout: e.stdout ?? '',
|
|
43
|
+
stderr: e.stderr ?? e.message ?? String(err),
|
|
44
|
+
code: typeof e.code === 'number' ? e.code : 1,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
const MAX_SNAPSHOT_BYTES = 2 * 1024 * 1024;
|
|
49
|
+
export function parsePorcelainZ(raw) {
|
|
50
|
+
const paths = [];
|
|
51
|
+
const chunks = raw.split('\0');
|
|
52
|
+
let i = 0;
|
|
53
|
+
while (i < chunks.length) {
|
|
54
|
+
const entry = chunks[i];
|
|
55
|
+
i += 1;
|
|
56
|
+
if (!entry)
|
|
57
|
+
continue;
|
|
58
|
+
const code = entry.slice(0, 2);
|
|
59
|
+
const p = entry.length >= 3 && entry[2] === ' ' ? entry.slice(3) : entry.slice(2).trim();
|
|
60
|
+
if (p)
|
|
61
|
+
paths.push(p.replace(/\\/g, '/'));
|
|
62
|
+
const isRename = code.includes('R') || code.includes('C');
|
|
63
|
+
if (isRename && i < chunks.length) {
|
|
64
|
+
const orig = chunks[i];
|
|
65
|
+
i += 1;
|
|
66
|
+
if (orig)
|
|
67
|
+
paths.push(orig.replace(/\\/g, '/'));
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return [...new Set(paths)];
|
|
71
|
+
}
|
|
72
|
+
function safeJoin(root, rel) {
|
|
73
|
+
const resolvedRoot = path.resolve(root);
|
|
74
|
+
const abs = path.resolve(root, rel);
|
|
75
|
+
const prefix = resolvedRoot.endsWith(path.sep) ? resolvedRoot : resolvedRoot + path.sep;
|
|
76
|
+
if (abs !== resolvedRoot && !abs.startsWith(prefix))
|
|
77
|
+
return null;
|
|
78
|
+
return abs;
|
|
79
|
+
}
|
|
80
|
+
function snapshotPath(repoRoot, rel) {
|
|
81
|
+
const abs = safeJoin(repoRoot, rel);
|
|
82
|
+
if (!abs || !existsSync(abs))
|
|
83
|
+
return { kind: 'missing' };
|
|
84
|
+
try {
|
|
85
|
+
const content = readFileSync(abs);
|
|
86
|
+
if (content.length > MAX_SNAPSHOT_BYTES)
|
|
87
|
+
return { kind: 'missing' };
|
|
88
|
+
return { kind: 'file', content };
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
return { kind: 'missing' };
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
export async function captureParentPreMergeState(repoRoot, git = defaultGitRun) {
|
|
95
|
+
const headRun = await git(repoRoot, ['rev-parse', 'HEAD']);
|
|
96
|
+
const head = headRun.ok ? headRun.stdout.trim() : null;
|
|
97
|
+
const st = await git(repoRoot, ['status', '--porcelain', '-z']);
|
|
98
|
+
if (!st.ok) {
|
|
99
|
+
return {
|
|
100
|
+
head: head && head.length > 0 ? head : null,
|
|
101
|
+
dirtyPaths: [],
|
|
102
|
+
snapshots: new Map(),
|
|
103
|
+
porcelain: st.stderr,
|
|
104
|
+
ambiguous: true,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
const dirtyPaths = parsePorcelainZ(st.stdout);
|
|
108
|
+
const snapshots = new Map();
|
|
109
|
+
let ambiguous = false;
|
|
110
|
+
for (const rel of dirtyPaths) {
|
|
111
|
+
const snap = snapshotPath(repoRoot, rel);
|
|
112
|
+
snapshots.set(rel, snap);
|
|
113
|
+
const abs = safeJoin(repoRoot, rel);
|
|
114
|
+
if (abs && existsSync(abs) && snap.kind === 'missing')
|
|
115
|
+
ambiguous = true;
|
|
116
|
+
}
|
|
117
|
+
return {
|
|
118
|
+
head: head && head.length > 0 ? head : null,
|
|
119
|
+
dirtyPaths,
|
|
120
|
+
snapshots,
|
|
121
|
+
porcelain: st.stdout,
|
|
122
|
+
ambiguous,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
function restoreSnapshots(repoRoot, snapshots) {
|
|
126
|
+
const failed = [];
|
|
127
|
+
for (const [rel, snap] of snapshots) {
|
|
128
|
+
const abs = safeJoin(repoRoot, rel);
|
|
129
|
+
if (!abs) {
|
|
130
|
+
failed.push(rel);
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
try {
|
|
134
|
+
if (snap.kind === 'missing') {
|
|
135
|
+
if (existsSync(abs))
|
|
136
|
+
rmSync(abs, { recursive: true, force: true });
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
mkdirSync(path.dirname(abs), { recursive: true });
|
|
140
|
+
writeFileSync(abs, snap.content ?? Buffer.alloc(0));
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
failed.push(rel);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
return failed;
|
|
147
|
+
}
|
|
148
|
+
async function leftoverUntracked(repoRoot, keep, git) {
|
|
149
|
+
const st = await git(repoRoot, ['status', '--porcelain', '-z']);
|
|
150
|
+
if (!st.ok)
|
|
151
|
+
return [];
|
|
152
|
+
const now = parsePorcelainZ(st.stdout);
|
|
153
|
+
const removed = [];
|
|
154
|
+
for (const rel of now) {
|
|
155
|
+
if (keep.has(rel))
|
|
156
|
+
continue;
|
|
157
|
+
const abs = safeJoin(repoRoot, rel);
|
|
158
|
+
if (!abs || !existsSync(abs))
|
|
159
|
+
continue;
|
|
160
|
+
try {
|
|
161
|
+
rmSync(abs, { recursive: true, force: true });
|
|
162
|
+
removed.push(rel);
|
|
163
|
+
}
|
|
164
|
+
catch {
|
|
165
|
+
// leave it; caller will report leftover porcelain
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return removed;
|
|
169
|
+
}
|
|
170
|
+
function emitRadio(repoRoot, sessionId, description, payload) {
|
|
171
|
+
appendKrakenRadio(repoRoot, sessionId, {
|
|
172
|
+
kind: 'error',
|
|
173
|
+
agent: 'kraken-worktree',
|
|
174
|
+
description,
|
|
175
|
+
detail: JSON.stringify(payload),
|
|
176
|
+
worktree: typeof payload.branch === 'string' ? payload.branch : null,
|
|
177
|
+
ok: false,
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
export function formatRollbackMessage(reason, rb, branch) {
|
|
181
|
+
const kept = `worktree branch ${branch} kept`;
|
|
182
|
+
if (!rb.ok) {
|
|
183
|
+
return `${reason}; rollback FAILED (${(rb.stderr ?? '').trim().slice(0, 200)}). parent may be dirty. ${kept}`;
|
|
184
|
+
}
|
|
185
|
+
if (rb.action === 'none-no-parent-commit') {
|
|
186
|
+
return `${reason}; parent has no commit — skipped reset (would be blind). ${kept}`;
|
|
187
|
+
}
|
|
188
|
+
const dirty = rb.dirtyPathsLeft.length > 0
|
|
189
|
+
? `; preserved/left dirty: ${rb.dirtyPathsLeft.slice(0, 20).join(', ')}`
|
|
190
|
+
: '';
|
|
191
|
+
return `${reason}; rolled back via ${rb.action}${dirty}. ${kept}`;
|
|
192
|
+
}
|
|
193
|
+
export async function rollbackParentAfterFailedMerge(opts) {
|
|
194
|
+
const git = opts.git ?? defaultGitRun;
|
|
195
|
+
const sessionId = opts.sessionId ?? '';
|
|
196
|
+
const basePayload = {
|
|
197
|
+
branch: opts.branch,
|
|
198
|
+
reason: opts.reason,
|
|
199
|
+
phase: opts.phase,
|
|
200
|
+
...(opts.nodeId !== undefined ? { nodeId: opts.nodeId } : {}),
|
|
201
|
+
};
|
|
202
|
+
if (!opts.pre.head) {
|
|
203
|
+
const result = {
|
|
204
|
+
ok: true,
|
|
205
|
+
action: 'none-no-parent-commit',
|
|
206
|
+
dirtyPathsLeft: opts.pre.dirtyPaths,
|
|
207
|
+
};
|
|
208
|
+
emitRadio(opts.repoRoot, sessionId, WORKTREE_MERGE_ABORTED, {
|
|
209
|
+
...basePayload,
|
|
210
|
+
action: result.action,
|
|
211
|
+
dirtyPathsLeft: result.dirtyPathsLeft,
|
|
212
|
+
});
|
|
213
|
+
return result;
|
|
214
|
+
}
|
|
215
|
+
if (opts.pre.ambiguous) {
|
|
216
|
+
const mixed = await git(opts.repoRoot, ['reset']);
|
|
217
|
+
if (!mixed.ok) {
|
|
218
|
+
const stderr = (mixed.stderr || mixed.stdout).trim();
|
|
219
|
+
emitRadio(opts.repoRoot, sessionId, WORKTREE_MERGE_ABORT_FAILED, {
|
|
220
|
+
...basePayload,
|
|
221
|
+
action: 'reset-mixed',
|
|
222
|
+
stderr,
|
|
223
|
+
});
|
|
224
|
+
return { ok: false, action: 'reset-mixed', dirtyPathsLeft: opts.pre.dirtyPaths, stderr };
|
|
225
|
+
}
|
|
226
|
+
const st = await git(opts.repoRoot, ['status', '--porcelain', '-z']);
|
|
227
|
+
const left = st.ok ? parsePorcelainZ(st.stdout) : opts.pre.dirtyPaths;
|
|
228
|
+
const result = { ok: true, action: 'reset-mixed', dirtyPathsLeft: left };
|
|
229
|
+
emitRadio(opts.repoRoot, sessionId, WORKTREE_MERGE_ABORTED, {
|
|
230
|
+
...basePayload,
|
|
231
|
+
action: result.action,
|
|
232
|
+
dirtyPathsLeft: left,
|
|
233
|
+
});
|
|
234
|
+
return result;
|
|
235
|
+
}
|
|
236
|
+
const wasDirty = opts.pre.dirtyPaths.length > 0;
|
|
237
|
+
const hard = await git(opts.repoRoot, ['reset', '--hard', opts.pre.head]);
|
|
238
|
+
if (!hard.ok) {
|
|
239
|
+
const stderr = (hard.stderr || hard.stdout).trim();
|
|
240
|
+
emitRadio(opts.repoRoot, sessionId, WORKTREE_MERGE_ABORT_FAILED, {
|
|
241
|
+
...basePayload,
|
|
242
|
+
action: wasDirty ? 'reset-hard-restore-dirty' : 'reset-hard',
|
|
243
|
+
stderr,
|
|
244
|
+
});
|
|
245
|
+
return {
|
|
246
|
+
ok: false,
|
|
247
|
+
action: wasDirty ? 'reset-hard-restore-dirty' : 'reset-hard',
|
|
248
|
+
dirtyPathsLeft: opts.pre.dirtyPaths,
|
|
249
|
+
stderr,
|
|
250
|
+
};
|
|
251
|
+
}
|
|
252
|
+
await leftoverUntracked(opts.repoRoot, new Set(opts.pre.dirtyPaths), git);
|
|
253
|
+
if (wasDirty) {
|
|
254
|
+
const failed = restoreSnapshots(opts.repoRoot, opts.pre.snapshots);
|
|
255
|
+
const result = {
|
|
256
|
+
ok: failed.length === 0,
|
|
257
|
+
action: 'reset-hard-restore-dirty',
|
|
258
|
+
dirtyPathsLeft: opts.pre.dirtyPaths,
|
|
259
|
+
...(failed.length > 0 ? { stderr: `restore failed: ${failed.join(', ')}` } : {}),
|
|
260
|
+
};
|
|
261
|
+
emitRadio(opts.repoRoot, sessionId, result.ok ? WORKTREE_MERGE_ABORTED : WORKTREE_MERGE_ABORT_FAILED, {
|
|
262
|
+
...basePayload,
|
|
263
|
+
action: result.action,
|
|
264
|
+
dirtyPathsLeft: result.dirtyPathsLeft,
|
|
265
|
+
...(result.stderr ? { stderr: result.stderr } : {}),
|
|
266
|
+
});
|
|
267
|
+
return result;
|
|
268
|
+
}
|
|
269
|
+
const result = { ok: true, action: 'reset-hard', dirtyPathsLeft: [] };
|
|
270
|
+
emitRadio(opts.repoRoot, sessionId, WORKTREE_MERGE_ABORTED, {
|
|
271
|
+
...basePayload,
|
|
272
|
+
action: result.action,
|
|
273
|
+
dirtyPathsLeft: [],
|
|
274
|
+
});
|
|
275
|
+
return result;
|
|
276
|
+
}
|
|
277
|
+
//# sourceMappingURL=worktreeMergeRollback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktreeMergeRollback.js","sourceRoot":"","sources":["../../../src/cli/kraken/worktreeMergeRollback.ts"],"names":[],"mappings":"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"}
|
|
@@ -153,11 +153,22 @@ export function resolveWorktreeMode(envValue) {
|
|
|
153
153
|
* Worktree capability is checked per kind here; the caller still owns the
|
|
154
154
|
* per-node state this module cannot see (rework lineage, a caller-level
|
|
155
155
|
* `allowWorktree: false`).
|
|
156
|
+
*
|
|
157
|
+
* `opts.sharedTreeDegraded` (F12/K2.4) is the run-level escape hatch: after a
|
|
158
|
+
* worktree creation failure the caller sets it so the policy degrades to the
|
|
159
|
+
* same defensive `defer` a non-auto mode yields — parallel admission assumed
|
|
160
|
+
* isolation, and without it overlapping writers must serialize again.
|
|
156
161
|
*/
|
|
157
162
|
export function worktreeSchedulingDecision(node, racingNodes, env, opts = {}) {
|
|
158
163
|
if (resolveWorktreeMode(env.ZELARI_KRAKEN_WORKTREE) !== 'auto') {
|
|
159
164
|
return { mode: 'defer', overlapScore: 0, rationaleCode: 'worktree-mode-not-auto' };
|
|
160
165
|
}
|
|
166
|
+
if (opts.sharedTreeDegraded) {
|
|
167
|
+
// The run already fell back to the shared tree: isolation — the sole
|
|
168
|
+
// licence for parallel worktree admission — is gone, so defer exactly as
|
|
169
|
+
// a non-auto mode would.
|
|
170
|
+
return { mode: 'defer', overlapScore: 0, rationaleCode: 'shared-tree-degraded' };
|
|
171
|
+
}
|
|
161
172
|
const nodeScopes = writeScopeOf(node);
|
|
162
173
|
if (!nodeScopes) {
|
|
163
174
|
// Read-only node: arbitration never defers these anyway; say so honestly.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktreeScheduling.js","sourceRoot":"","sources":["../../../src/cli/kraken/worktreeScheduling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAIzC;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,IAAI,KAAK,IAAI,sBAAsB;QAAE,OAAO,MAAM,CAAC;IACnD,IAAI,KAAK,GAAG,qBAAqB;QAAE,OAAO,UAAU,CAAC;IACrD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAA0B,EAC1B,OAA0B,EAC1B,OAA2B,EAAE;IAE7B,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC;IAC1C,0EAA0E;IAC1E,wDAAwD;IACxD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,KAAa,CAAC;YAClB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxB,KAAK,GAAG,CAAC,CAAC,CAAC,uDAAuD;YACpE,CAAC;iBAAM,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;gBACpC,KAAK,GAAG,qBAAqB,CAAC,CAAC,8BAA8B;YAC/D,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,CAAC,CAAC;YACZ,CAAC;YACD,IAAI,KAAK,GAAG,IAAI;gBAAE,IAAI,GAAG,KAAK,CAAC;YAC/B,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAsB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAE5E,oEAAoE;AACpE,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,OAAO,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC/C,CAAC;
|
|
1
|
+
{"version":3,"file":"worktreeScheduling.js","sourceRoot":"","sources":["../../../src/cli/kraken/worktreeScheduling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAIzC;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,IAAI,KAAK,IAAI,sBAAsB;QAAE,OAAO,MAAM,CAAC;IACnD,IAAI,KAAK,GAAG,qBAAqB;QAAE,OAAO,UAAU,CAAC;IACrD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAA0B,EAC1B,OAA0B,EAC1B,OAA2B,EAAE;IAE7B,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC;IAC1C,0EAA0E;IAC1E,wDAAwD;IACxD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,KAAa,CAAC;YAClB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxB,KAAK,GAAG,CAAC,CAAC,CAAC,uDAAuD;YACpE,CAAC;iBAAM,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;gBACpC,KAAK,GAAG,qBAAqB,CAAC,CAAC,8BAA8B;YAC/D,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,CAAC,CAAC;YACZ,CAAC;YACD,IAAI,KAAK,GAAG,IAAI;gBAAE,IAAI,GAAG,KAAK,CAAC;YAC/B,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAsB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAE5E,oEAAoE;AACpE,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,OAAO,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC/C,CAAC;AAoBD;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAA4B;IAC9D,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAChD,IAAI,CAAC,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAC3C,OAAO,KAAK,CAAC;AACf,CAAC;AA0BD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,0BAA0B,CACxC,IAAmB,EACnB,WAAqC,EACrC,GAAsB,EACtB,OAAkC,EAAE;IAEpC,IAAI,mBAAmB,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,wBAAwB,EAAE,CAAC;IACrF,CAAC;IACD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,qEAAqE;QACrE,yEAAyE;QACzE,yBAAyB;QACzB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACnF,CAAC;IACD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,0EAA0E;QAC1E,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;IAC7E,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,2BAA2B,EAAE,CAAC;IACxF,CAAC;IACD,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,WAA+B,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,WAAW;YAAE,SAAS,CAAC,0CAA0C;QACtE,MAAM,KAAK,GAAG,oBAAoB,CAAC,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,KAAK,GAAG,IAAI,EAAE,CAAC;YACjB,IAAI,GAAG,KAAK,CAAC;YACb,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,IAAI,KAAK,CAAC;YAAE,MAAM;IACxB,CAAC;IACD,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QACf,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;IACzF,CAAC;IACD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;QACpC,OAAO;YACL,IAAI,EAAE,mBAAmB;YACzB,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,sBAAsB;YACrC,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtD,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,cAAc;QAC7B,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC;AACJ,CAAC"}
|