@telora/daemon 0.22.0 → 0.22.13
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/build-info.json +5 -3
- package/dist/backends/index.d.ts.map +1 -1
- package/dist/backends/index.js +1 -0
- package/dist/backends/index.js.map +1 -1
- package/dist/ci/ci-sensor-loop.d.ts +36 -2
- package/dist/ci/ci-sensor-loop.d.ts.map +1 -1
- package/dist/ci/ci-sensor-loop.js +48 -9
- package/dist/ci/ci-sensor-loop.js.map +1 -1
- package/dist/completion/event-phases.d.ts +7 -8
- package/dist/completion/event-phases.d.ts.map +1 -1
- package/dist/completion/event-phases.js +57 -42
- package/dist/completion/event-phases.js.map +1 -1
- package/dist/completion/event.d.ts +9 -0
- package/dist/completion/event.d.ts.map +1 -1
- package/dist/completion/event.js +3 -0
- package/dist/completion/event.js.map +1 -1
- package/dist/completion/exit-classification.d.ts +2 -2
- package/dist/completion/exit-classification.d.ts.map +1 -1
- package/dist/completion/exit-classification.js +2 -0
- package/dist/completion/exit-classification.js.map +1 -1
- package/dist/completion/index.js +1 -1
- package/dist/completion/merge-phase.d.ts.map +1 -1
- package/dist/completion/merge-phase.js +2 -1
- package/dist/completion/merge-phase.js.map +1 -1
- package/dist/completion/team-lifecycle.d.ts.map +1 -1
- package/dist/completion/team-lifecycle.js +48 -28
- package/dist/completion/team-lifecycle.js.map +1 -1
- package/dist/completion/team-phase.d.ts.map +1 -1
- package/dist/completion/team-phase.js +2 -1
- package/dist/completion/team-phase.js.map +1 -1
- package/dist/directive/directive-executor.d.ts.map +1 -1
- package/dist/directive/directive-executor.js +6 -5
- package/dist/directive/directive-executor.js.map +1 -1
- package/dist/focus/focus-executor.d.ts.map +1 -1
- package/dist/focus/focus-executor.js +12 -6
- package/dist/focus/focus-executor.js.map +1 -1
- package/dist/focus/focus-lifecycle.js +1 -1
- package/dist/focus/focus-lifecycle.js.map +1 -1
- package/dist/focus/listener-spawn.d.ts +22 -6
- package/dist/focus/listener-spawn.d.ts.map +1 -1
- package/dist/focus/listener-spawn.js +44 -16
- package/dist/focus/listener-spawn.js.map +1 -1
- package/dist/focus/team-actionable-work.d.ts +68 -0
- package/dist/focus/team-actionable-work.d.ts.map +1 -0
- package/dist/focus/team-actionable-work.js +75 -0
- package/dist/focus/team-actionable-work.js.map +1 -0
- package/dist/merge/focus-merge.d.ts +55 -62
- package/dist/merge/focus-merge.d.ts.map +1 -1
- package/dist/merge/focus-merge.js +182 -242
- package/dist/merge/focus-merge.js.map +1 -1
- package/dist/merge/merge-conflict-escalation.d.ts +60 -0
- package/dist/merge/merge-conflict-escalation.d.ts.map +1 -0
- package/dist/merge/merge-conflict-escalation.js +131 -0
- package/dist/merge/merge-conflict-escalation.js.map +1 -0
- package/dist/queries/schemas.d.ts +61 -0
- package/dist/queries/schemas.d.ts.map +1 -1
- package/dist/queries/schemas.js +13 -2
- package/dist/queries/schemas.js.map +1 -1
- package/dist/shell/model-resolution.d.ts +54 -0
- package/dist/shell/model-resolution.d.ts.map +1 -1
- package/dist/shell/model-resolution.js +50 -0
- package/dist/shell/model-resolution.js.map +1 -1
- package/dist/spawn/model-routing.d.ts +14 -19
- package/dist/spawn/model-routing.d.ts.map +1 -1
- package/dist/spawn/model-routing.js +57 -39
- package/dist/spawn/model-routing.js.map +1 -1
- package/dist/spawn/spawn-cooldown.d.ts.map +1 -1
- package/dist/spawn/spawn-cooldown.js +2 -1
- package/dist/spawn/spawn-cooldown.js.map +1 -1
- package/dist/spawn/worktree-session.d.ts +53 -5
- package/dist/spawn/worktree-session.d.ts.map +1 -1
- package/dist/spawn/worktree-session.js +61 -29
- package/dist/spawn/worktree-session.js.map +1 -1
- package/dist/testing/fixtures/index.js +1 -1
- package/dist/types/focus.d.ts +12 -2
- package/dist/types/focus.d.ts.map +1 -1
- package/dist/types/index.js +1 -1
- package/dist/types/session.d.ts +1 -1
- package/dist/types/session.d.ts.map +1 -1
- package/dist/worktree/verify-interlock.d.ts +34 -0
- package/dist/worktree/verify-interlock.d.ts.map +1 -1
- package/dist/worktree/verify-interlock.js +25 -0
- package/dist/worktree/verify-interlock.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-routing.d.ts","sourceRoot":"","sources":["../../src/spawn/model-routing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model-routing.d.ts","sourceRoot":"","sources":["../../src/spawn/model-routing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
|
-
// Pinned by:
|
|
2
|
+
// Pinned by: packages/daemon/src/spawn/hosted-codex-allowlist-parity.test.ts,
|
|
3
|
+
// packages/daemon/src/spawn/per-pass-spawn-model.test.ts
|
|
3
4
|
// PINNED-BY-END
|
|
4
5
|
import { loadEnvConfig, ESCALATION_REASONS } from '@telora/daemon-core';
|
|
5
6
|
import { createEscalation } from '../queries/escalations.js';
|
|
6
|
-
import { resolveTeamModel, resolveLocalModelRefPrecedence } from '../shell/model-resolution.js';
|
|
7
|
+
import { resolveTeamModel, resolveLocalModelRefPrecedence, focusPipelineModelForPass, formatPassModelLog } from '../shell/model-resolution.js';
|
|
7
8
|
import { getLocalModel, getLocalModelSecret } from '../queries/local-models.js';
|
|
8
9
|
import { codexSafeModelAlias, writeLocalModelCodexHome, TELORA_LOCAL_API_KEY_ENV, } from '../cli/codex-provision.js';
|
|
9
10
|
import { startCodexMcpProxy, shouldRouteLocalModelThroughProxy, } from '../backends/codex/codex-mcp-proxy.js';
|
|
@@ -76,6 +77,32 @@ export function resolveEffectiveModel(directiveModel, spawnCodexHome, codexModel
|
|
|
76
77
|
const focusOverrideModel = (spawnCodexHome && codexModel ? codexModel : null) ?? pipelineModel ?? null;
|
|
77
78
|
return resolveTeamModel(focusOverrideModel, directiveModel);
|
|
78
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Resolve the effective per-pass cloud model AND build the CLI args for a spawn --
|
|
82
|
+
* the model-selection tail of resolveSpawnModel (per-pass precedence, engine-compat
|
|
83
|
+
* prefilters, and the no-invisible-cascading model log) in one named place.
|
|
84
|
+
*/
|
|
85
|
+
function selectEffectiveModelAndArgs(args) {
|
|
86
|
+
const { resolvedEngine, enginePass, spawnCodexHome, spawnCodexModel, focusOverrideModel, directiveModel, pipelineConfig, backend, config, worktreePath, resumeId, role, readOnly, focusName, } = args;
|
|
87
|
+
const focusSelectedModel = selectPipelineModelForSpawn(resolvedEngine.engineId, spawnCodexHome, focusOverrideModel);
|
|
88
|
+
const effectiveDirectiveModel = selectDirectiveModelForSpawn(resolvedEngine.engineId, directiveModel, spawnCodexModel ?? focusSelectedModel);
|
|
89
|
+
const effectiveModel = resolveEffectiveModel(effectiveDirectiveModel, spawnCodexHome, spawnCodexModel, focusSelectedModel);
|
|
90
|
+
// No-invisible-cascading: log the RESOLVED model for THIS pass with its source,
|
|
91
|
+
// mirroring the engine axis. A routed local-Codex model (spawnCodexModel) folds
|
|
92
|
+
// into the focus-override slot exactly as resolveEffectiveModel does; a candidate
|
|
93
|
+
// the engine-compat guard dropped is named so a null is visible, not silent.
|
|
94
|
+
const focusOriginModel = (spawnCodexHome && spawnCodexModel ? spawnCodexModel : null) ?? focusSelectedModel;
|
|
95
|
+
log.info(formatPassModelLog({
|
|
96
|
+
focusName, enginePass, engineId: resolvedEngine.engineId, effectiveModel,
|
|
97
|
+
focusOriginModel, effectiveDirectiveModel,
|
|
98
|
+
rawFocusModel: focusOverrideModel, rawDirectiveModel: directiveModel,
|
|
99
|
+
}));
|
|
100
|
+
const effectivePipelineConfig = effectiveModel !== (pipelineConfig?.model ?? null)
|
|
101
|
+
? { ...pipelineConfig, model: effectiveModel }
|
|
102
|
+
: pipelineConfig;
|
|
103
|
+
const cliArgs = buildAgentArgs(backend, config, worktreePath, effectivePipelineConfig, resumeId, role.allowed_tools, readOnly);
|
|
104
|
+
return { effectiveModel, args: cliArgs };
|
|
105
|
+
}
|
|
79
106
|
/**
|
|
80
107
|
* A cloud model id the Claude backend can run: the full claude-* ids
|
|
81
108
|
* (claude-opus-4-8, claude-sonnet-4-6, ...) AND the bare aliases Claude Code
|
|
@@ -121,20 +148,15 @@ export function isForwardSafeHostedCodexModel(model) {
|
|
|
121
148
|
/**
|
|
122
149
|
* Select the pipeline model fallback to feed into resolveEffectiveModel().
|
|
123
150
|
*
|
|
124
|
-
* Hosted Codex runs through the user's Codex account
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
*
|
|
128
|
-
* keeps the existing pipeline model behavior.
|
|
151
|
+
* Hosted Codex runs through the user's Codex account; some registry labels (e.g.
|
|
152
|
+
* gpt-5-codex) are not valid `codex exec --model` values for every account and
|
|
153
|
+
* crash the run, so only forward-safe hosted ids forward. Local-model Codex needs
|
|
154
|
+
* an explicit model; Claude keeps existing pipeline-model behavior.
|
|
129
155
|
*
|
|
130
|
-
* Engine-compat (the per-pass bleed guard):
|
|
131
|
-
*
|
|
132
|
-
*
|
|
133
|
-
*
|
|
134
|
-
* must NOT bleed into a claude review pass. When it would, null it so the claude
|
|
135
|
-
* backend picks its own default rather than receiving `--model gpt-5-codex` and
|
|
136
|
-
* erroring out. (The symmetric codex case is handled above + by spawnCodexModel
|
|
137
|
-
* routing; local-codex models reach the spawn via spawnCodexModel, not here.)
|
|
156
|
+
* Engine-compat (the per-pass bleed guard): each pass resolves its own engine and
|
|
157
|
+
* its own model (focusPipelineModelForPass), so a model the resolved backend
|
|
158
|
+
* cannot run (a claude id on a codex pass, or vice versa) is nulled here -- the
|
|
159
|
+
* backend then picks its own default instead of receiving an unrunnable --model.
|
|
138
160
|
*/
|
|
139
161
|
export function selectPipelineModelForSpawn(engineId, spawnCodexHome, pipelineModel) {
|
|
140
162
|
// Hosted Codex (no local codexHome): forward a KNOWN-VALID hosted-Codex model
|
|
@@ -148,20 +170,21 @@ export function selectPipelineModelForSpawn(engineId, spawnCodexHome, pipelineMo
|
|
|
148
170
|
return pipelineModel ?? null;
|
|
149
171
|
}
|
|
150
172
|
/**
|
|
151
|
-
* Select whether a workflow directive's model may reach the backend.
|
|
152
|
-
*
|
|
153
|
-
*
|
|
154
|
-
*
|
|
155
|
-
*
|
|
156
|
-
*
|
|
173
|
+
* Select whether a workflow directive's model may reach the backend. The stage
|
|
174
|
+
* directive is the Workflow layer of Focus > Workflow > Default -- a fallback
|
|
175
|
+
* used only when the focus/pass pins no model. It now reaches Codex passes: a
|
|
176
|
+
* forward-safe hosted-Codex id is honored on a Codex pass, while a Claude id or
|
|
177
|
+
* a non-forward-safe id resolves to null (no bleed; gpt-5-codex crash guard
|
|
178
|
+
* preserved). The Claude pass keeps its pass-through fallback behavior.
|
|
157
179
|
*/
|
|
158
180
|
export function selectDirectiveModelForSpawn(engineId, directiveModel, focusSelectedModel) {
|
|
159
181
|
if (!directiveModel)
|
|
160
182
|
return null;
|
|
161
183
|
if (focusSelectedModel)
|
|
162
184
|
return null;
|
|
163
|
-
if (engineId === 'codex')
|
|
164
|
-
return null;
|
|
185
|
+
if (engineId === 'codex') {
|
|
186
|
+
return isForwardSafeHostedCodexModel(directiveModel) ? directiveModel : null;
|
|
187
|
+
}
|
|
165
188
|
return directiveModel;
|
|
166
189
|
}
|
|
167
190
|
/**
|
|
@@ -294,11 +317,11 @@ export async function surfaceSingleHostModelConflict(args, deps = {}) {
|
|
|
294
317
|
*/
|
|
295
318
|
export async function resolveSpawnModel(args) {
|
|
296
319
|
const { resolvedEngine, enginePass, localModelOverride, stageDirectiveLocalModel, config, directiveModel, pendingFocusOverrideModel, pipelineConfig, backend, worktreePath, resumeId, role, readOnly, focusName, focusId, } = args;
|
|
297
|
-
//
|
|
298
|
-
//
|
|
299
|
-
//
|
|
300
|
-
//
|
|
301
|
-
const focusOverrideModel = pendingFocusOverrideModel ?? pipelineConfig
|
|
320
|
+
// Focus override for this spawn, PER PASS: a respawn's snapshot wins over the
|
|
321
|
+
// live per-pass pin (focusPipelineModelForPass: models[pass], legacy model as
|
|
322
|
+
// the coding value) so no pass's model bleeds into the other's. Same precedence
|
|
323
|
+
// (focus override -> stage -> CLI) at initial spawn and respawn.
|
|
324
|
+
const focusOverrideModel = pendingFocusOverrideModel ?? focusPipelineModelForPass(pipelineConfig, enginePass);
|
|
302
325
|
// Resolve the per-product isolated CODEX_HOME for this spawn (undefined for
|
|
303
326
|
// claude engines and cloud products with no provisioned codexHome -- those
|
|
304
327
|
// spawns are byte-for-byte unaffected).
|
|
@@ -443,17 +466,12 @@ export async function resolveSpawnModel(args) {
|
|
|
443
466
|
}
|
|
444
467
|
}
|
|
445
468
|
}
|
|
446
|
-
// Model selection
|
|
447
|
-
//
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
const effectiveModel = resolveEffectiveModel(effectiveDirectiveModel, spawnCodexHome, spawnCodexModel, focusSelectedModel);
|
|
453
|
-
const effectivePipelineConfig = effectiveModel !== (pipelineConfig?.model ?? null)
|
|
454
|
-
? { ...pipelineConfig, model: effectiveModel }
|
|
455
|
-
: pipelineConfig;
|
|
456
|
-
const args2 = buildAgentArgs(backend, config, worktreePath, effectivePipelineConfig, resumeId, role.allowed_tools, readOnly);
|
|
469
|
+
// Model selection + CLI args (the per-pass precedence, engine-compat prefilters,
|
|
470
|
+
// and the no-invisible-cascading model log) -- extracted into one named helper.
|
|
471
|
+
const { effectiveModel, args: args2 } = selectEffectiveModelAndArgs({
|
|
472
|
+
resolvedEngine, enginePass, spawnCodexHome, spawnCodexModel, focusOverrideModel,
|
|
473
|
+
directiveModel, pipelineConfig, backend, config, worktreePath, resumeId, role, readOnly, focusName,
|
|
474
|
+
});
|
|
457
475
|
// Capability-driven (no operator flag): for a registered local-model route
|
|
458
476
|
// whose endpoint drops Codex's namespace tools (backendDropsNamespaceTools),
|
|
459
477
|
// insert a localhost translating proxy between Codex and the inference server
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-routing.js","sourceRoot":"","sources":["../../src/spawn/model-routing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-routing.js","sourceRoot":"","sources":["../../src/spawn/model-routing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn-cooldown.d.ts","sourceRoot":"","sources":["../../src/spawn/spawn-cooldown.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spawn-cooldown.d.ts","sourceRoot":"","sources":["../../src/spawn/spawn-cooldown.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
|
-
// Pinned by: packages/daemon/src/
|
|
2
|
+
// Pinned by: packages/daemon/src/completion/no-actionable-work-exit.test.ts,
|
|
3
|
+
// packages/daemon/src/focus/listener-auto-advance-teamless-wedge.test.ts,
|
|
3
4
|
// packages/daemon/src/shell/heartbeat-team-phases.test.ts,
|
|
4
5
|
// packages/daemon/src/spawn/pending-spawn-guard.test.ts, packages/daemon/src/spawn/spawn-cooldown.test.ts
|
|
5
6
|
// PINNED-BY-END
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn-cooldown.js","sourceRoot":"","sources":["../../src/spawn/spawn-cooldown.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"spawn-cooldown.js","sourceRoot":"","sources":["../../src/spawn/spawn-cooldown.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,13 +31,60 @@ export declare function createInitialTeamState(args: {
|
|
|
31
31
|
branchName: string;
|
|
32
32
|
readOnly: boolean;
|
|
33
33
|
}): FocusTeamState;
|
|
34
|
+
/**
|
|
35
|
+
* Outcome of {@link resolveSpawnWorktree}. Three distinct dispositions the caller
|
|
36
|
+
* must tell apart:
|
|
37
|
+
* - `ready` -- the worktree is prepared; spawn against `worktreePath`.
|
|
38
|
+
* - `deferred` -- a verify is running in the reused worktree, so its rewrite
|
|
39
|
+
* (rebase + hook reinstall) was NOT performed. This is a
|
|
40
|
+
* benign wait, NOT a failure: the helper recorded no teardown,
|
|
41
|
+
* filed no escalation, and left no state -- the caller simply
|
|
42
|
+
* returns and the next poll retries once the verify clears.
|
|
43
|
+
* - `unavailable` -- the spawn cannot proceed (repo has no commits, or inline
|
|
44
|
+
* creation failed). The helper already owns its teardown
|
|
45
|
+
* (activeTeams.delete + recordFocusTeardown).
|
|
46
|
+
*/
|
|
47
|
+
export type SpawnWorktreeResolution = {
|
|
48
|
+
kind: 'ready';
|
|
49
|
+
worktreePath: string;
|
|
50
|
+
} | {
|
|
51
|
+
kind: 'deferred';
|
|
52
|
+
} | {
|
|
53
|
+
kind: 'unavailable';
|
|
54
|
+
};
|
|
55
|
+
/**
|
|
56
|
+
* Injectable seam for {@link resolveSpawnWorktree}, mirroring the FocusHoldDeps
|
|
57
|
+
* model in focus/team-actionable-work.ts -- each defaults to the real
|
|
58
|
+
* implementation, so a unit test drives the deferral/proceed logic without a real
|
|
59
|
+
* worktree, a live verify, or the git/hook side effects.
|
|
60
|
+
*/
|
|
61
|
+
export interface ResolveSpawnWorktreeDeps {
|
|
62
|
+
isWorktreeUnderVerify?: (worktreePath: string) => boolean;
|
|
63
|
+
getFocusWorktree?: (focusId: string) => {
|
|
64
|
+
worktreePath: string;
|
|
65
|
+
} | undefined;
|
|
66
|
+
/** Rebase the reused worktree onto integration (aborting on conflict). */
|
|
67
|
+
rebaseOntoIntegration?: (worktreePath: string, integrationBranch: string, focusName: string) => void;
|
|
68
|
+
installGuards?: (worktreePath: string, readOnly: boolean) => void;
|
|
69
|
+
recordTeardown?: (focusId: string) => void;
|
|
70
|
+
}
|
|
34
71
|
/**
|
|
35
72
|
* Phase: resolve the focus worktree to spawn into. Reuses the persistent
|
|
36
73
|
* worktree (rebasing onto integration + re-asserting read-only guards) when one
|
|
37
|
-
* exists, else creates one inline.
|
|
38
|
-
*
|
|
39
|
-
* (
|
|
40
|
-
*
|
|
74
|
+
* exists, else creates one inline.
|
|
75
|
+
*
|
|
76
|
+
* The reused-worktree REWRITE (rebase + hook reinstall) runs through the shared
|
|
77
|
+
* verify interlock boundary (runWorktreeMutationUnderInterlock): while a verify
|
|
78
|
+
* command is running in that worktree, the rewrite is DEFERRED (`kind: 'deferred'`)
|
|
79
|
+
* -- rebasing or reinstalling hooks mid-verify would mutate a tree the commit path
|
|
80
|
+
* is already refusing to touch. A deferral is a benign wait, not a spawn failure:
|
|
81
|
+
* no teardown, no escalation, no state left behind. This is the SAME boundary the
|
|
82
|
+
* pending-spawn path reaches, because spawnFocusTeam (its one shared entry) calls
|
|
83
|
+
* this helper unconditionally.
|
|
84
|
+
*
|
|
85
|
+
* Returns `unavailable` when the spawn cannot proceed (repo has no commits, or
|
|
86
|
+
* inline creation failed) -- owning its own teardown (activeTeams.delete +
|
|
87
|
+
* recordFocusTeardown) so the caller just returns.
|
|
41
88
|
*/
|
|
42
89
|
export declare function resolveSpawnWorktree(args: {
|
|
43
90
|
config: DaemonConfig;
|
|
@@ -45,7 +92,8 @@ export declare function resolveSpawnWorktree(args: {
|
|
|
45
92
|
focusName: string;
|
|
46
93
|
branchName: string;
|
|
47
94
|
readOnly: boolean;
|
|
48
|
-
|
|
95
|
+
deps?: ResolveSpawnWorktreeDeps;
|
|
96
|
+
}): Promise<SpawnWorktreeResolution>;
|
|
49
97
|
/**
|
|
50
98
|
* Phase: create the team-lead session row + register it with the telemetry
|
|
51
99
|
* persistence gate, stamping its id onto the team state. Returns null when
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session.d.ts","sourceRoot":"","sources":["../../src/spawn/worktree-session.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,cAAc,EACd,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-session.d.ts","sourceRoot":"","sources":["../../src/spawn/worktree-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
|
-
// Pinned by:
|
|
2
|
+
// Pinned by: packages/daemon/src/spawn/worktree-session.test.ts
|
|
3
3
|
// PINNED-BY-END
|
|
4
4
|
import { createSession } from '../queries/sessions.js';
|
|
5
5
|
import { createWorktree, runGitSync, repoHasCommits } from '../git/exec.js';
|
|
6
6
|
import { installExecutionWorktreeGuards } from '../audit/audit-hooks.js';
|
|
7
7
|
import { getFocusWorktree, setFocusWorktree } from '../focus/focus-worktree-state.js';
|
|
8
|
+
import { runWorktreeMutationUnderInterlock } from '../worktree/verify-interlock.js';
|
|
8
9
|
import { reconcileAgentResolvableForFocus } from '../queries/agent-resolvable-promotion.js';
|
|
9
10
|
import { resolveLineageSpec } from '../session/session-lineage.js';
|
|
10
11
|
import { recordFocusTeardown } from './spawn-cooldown.js';
|
|
@@ -56,46 +57,77 @@ export function createInitialTeamState(args) {
|
|
|
56
57
|
lineage: 'coding',
|
|
57
58
|
};
|
|
58
59
|
}
|
|
60
|
+
/** Default rebase-onto-integration: aborts + continues on conflict (non-fatal). */
|
|
61
|
+
function defaultRebaseOntoIntegration(worktreePath, integrationBranch, focusName) {
|
|
62
|
+
const rebaseResult = runGitSync(['rebase', integrationBranch], worktreePath);
|
|
63
|
+
if (!rebaseResult.success) {
|
|
64
|
+
runGitSync(['rebase', '--abort'], worktreePath);
|
|
65
|
+
log.warn(`Rebase failed for "${focusName}", continuing with existing state`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
59
68
|
/**
|
|
60
69
|
* Phase: resolve the focus worktree to spawn into. Reuses the persistent
|
|
61
70
|
* worktree (rebasing onto integration + re-asserting read-only guards) when one
|
|
62
|
-
* exists, else creates one inline.
|
|
63
|
-
*
|
|
64
|
-
* (
|
|
65
|
-
*
|
|
71
|
+
* exists, else creates one inline.
|
|
72
|
+
*
|
|
73
|
+
* The reused-worktree REWRITE (rebase + hook reinstall) runs through the shared
|
|
74
|
+
* verify interlock boundary (runWorktreeMutationUnderInterlock): while a verify
|
|
75
|
+
* command is running in that worktree, the rewrite is DEFERRED (`kind: 'deferred'`)
|
|
76
|
+
* -- rebasing or reinstalling hooks mid-verify would mutate a tree the commit path
|
|
77
|
+
* is already refusing to touch. A deferral is a benign wait, not a spawn failure:
|
|
78
|
+
* no teardown, no escalation, no state left behind. This is the SAME boundary the
|
|
79
|
+
* pending-spawn path reaches, because spawnFocusTeam (its one shared entry) calls
|
|
80
|
+
* this helper unconditionally.
|
|
81
|
+
*
|
|
82
|
+
* Returns `unavailable` when the spawn cannot proceed (repo has no commits, or
|
|
83
|
+
* inline creation failed) -- owning its own teardown (activeTeams.delete +
|
|
84
|
+
* recordFocusTeardown) so the caller just returns.
|
|
66
85
|
*/
|
|
67
86
|
export async function resolveSpawnWorktree(args) {
|
|
68
|
-
const { config, focusId, focusName, branchName, readOnly } = args;
|
|
87
|
+
const { config, focusId, focusName, branchName, readOnly, deps = {} } = args;
|
|
69
88
|
const activeTeams = getActiveTeams();
|
|
89
|
+
const resolveWorktree = deps.getFocusWorktree ?? getFocusWorktree;
|
|
90
|
+
const rebase = deps.rebaseOntoIntegration ?? defaultRebaseOntoIntegration;
|
|
91
|
+
const installGuards = deps.installGuards ?? installExecutionWorktreeGuards;
|
|
92
|
+
const recordTeardown = deps.recordTeardown ?? recordFocusTeardown;
|
|
70
93
|
// Reuse persistent focus worktree (created by ensureFocusWorktrees in poll loop)
|
|
71
|
-
const existingWorktree =
|
|
94
|
+
const existingWorktree = resolveWorktree(focusId);
|
|
72
95
|
if (existingWorktree) {
|
|
73
96
|
const worktreePath = existingWorktree.worktreePath;
|
|
74
|
-
//
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
97
|
+
// Route the worktree REWRITE through the shared verify interlock boundary.
|
|
98
|
+
// Rebasing onto integration and re-asserting the per-worktree git guards
|
|
99
|
+
// (core.hooksPath + hook files -- config that does NOT survive as tree content,
|
|
100
|
+
// so it must be re-applied on every reuse) both MUTATE the worktree; neither
|
|
101
|
+
// may run while a verify command is mid-flight in it. When held, the boundary
|
|
102
|
+
// runs nothing and reports a deferral.
|
|
103
|
+
const prep = runWorktreeMutationUnderInterlock(worktreePath, () => {
|
|
104
|
+
rebase(worktreePath, config.integrationBranch, focusName);
|
|
105
|
+
log.info(` Worktree (reused): ${worktreePath}`);
|
|
106
|
+
installGuards(worktreePath, readOnly);
|
|
107
|
+
log.info(` Re-asserted execution worktree guards (reused worktree)`);
|
|
108
|
+
}, { isWorktreeUnderVerify: deps.isWorktreeUnderVerify });
|
|
109
|
+
if (prep.deferred) {
|
|
110
|
+
// Deferral, NOT a failure: leave the worktree untouched and record nothing
|
|
111
|
+
// (no teardown, no escalation). The caller returns and the next poll retries
|
|
112
|
+
// once the verify releases the hold. debug so a multi-minute verify does not
|
|
113
|
+
// spin-log at info.
|
|
114
|
+
log.debug(` Worktree preparation DEFERRED for "${focusName}": a verify command is running in ` +
|
|
115
|
+
`${worktreePath}; not rebasing or reinstalling hooks mid-verify. Retrying next poll (no teardown).`);
|
|
116
|
+
return { kind: 'deferred' };
|
|
79
117
|
}
|
|
80
|
-
|
|
81
|
-
// Re-assert execution-worktree git guards on the reused worktree.
|
|
82
|
-
// ensureFocusWorktrees installs them at provisioning time, but core.hooksPath
|
|
83
|
-
// and the hook files are per-worktree config that does NOT survive as tree
|
|
84
|
-
// content, and a worktree may be reused across daemon restarts -- re-applying
|
|
85
|
-
// here (idempotent) guarantees the delivery-trailer commit-msg hook (and, when
|
|
86
|
-
// read-only, the deny overlay + pre-commit block) are present before spawn.
|
|
87
|
-
installExecutionWorktreeGuards(worktreePath, readOnly);
|
|
88
|
-
log.info(` Re-asserted execution worktree guards (reused worktree)`);
|
|
89
|
-
return worktreePath;
|
|
118
|
+
return { kind: 'ready', worktreePath };
|
|
90
119
|
}
|
|
91
120
|
// Guard: can't create worktrees in a repo with no commits
|
|
92
121
|
if (!repoHasCommits(config.repoPath)) {
|
|
93
122
|
log.warn(`Repository has no commits -- cannot create worktree for "${focusName}"`);
|
|
94
123
|
activeTeams.delete(focusId);
|
|
95
|
-
|
|
96
|
-
return
|
|
124
|
+
recordTeardown(focusId);
|
|
125
|
+
return { kind: 'unavailable' };
|
|
97
126
|
}
|
|
98
|
-
// Fallback: worktree doesn't exist yet (race condition or first poll)
|
|
127
|
+
// Fallback: worktree doesn't exist yet (race condition or first poll). A fresh
|
|
128
|
+
// worktree cannot be under a verify hold -- nothing has run in it yet -- so the
|
|
129
|
+
// interlock is not consulted here; the boundary guards REWRITES of an existing
|
|
130
|
+
// worktree, which is exactly the reused branch above.
|
|
99
131
|
log.warn(`No persistent worktree for "${focusName}", creating inline`);
|
|
100
132
|
try {
|
|
101
133
|
const worktreePath = await createWorktree(config, branchName);
|
|
@@ -111,15 +143,15 @@ export async function resolveSpawnWorktree(args) {
|
|
|
111
143
|
log.info(` Worktree (created inline): ${worktreePath}`);
|
|
112
144
|
// Install execution-worktree git guards: the delivery-trailer commit-msg hook
|
|
113
145
|
// always, plus read-only audit guards when the focus is read-only.
|
|
114
|
-
|
|
146
|
+
installGuards(worktreePath, readOnly);
|
|
115
147
|
log.info(` Installed execution worktree guards`);
|
|
116
|
-
return worktreePath;
|
|
148
|
+
return { kind: 'ready', worktreePath };
|
|
117
149
|
}
|
|
118
150
|
catch (err) {
|
|
119
151
|
log.error(`Failed to create worktree for focus "${focusName}":`, err instanceof Error ? err.message : String(err));
|
|
120
152
|
activeTeams.delete(focusId);
|
|
121
|
-
|
|
122
|
-
return
|
|
153
|
+
recordTeardown(focusId);
|
|
154
|
+
return { kind: 'unavailable' };
|
|
123
155
|
}
|
|
124
156
|
}
|
|
125
157
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session.js","sourceRoot":"","sources":["../../src/spawn/worktree-session.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"worktree-session.js","sourceRoot":"","sources":["../../src/spawn/worktree-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
|
-
// Pinned by:
|
|
2
|
+
// Pinned by: 106 tests -- run: npm run gen:pinned-by -- --list packages/daemon/src/testing/fixtures/index.ts
|
|
3
3
|
// PINNED-BY-END
|
|
4
4
|
/**
|
|
5
5
|
* Build a FocusDeliveryInfo. Default executionStatus is 'queued' (the majority
|
package/dist/types/focus.d.ts
CHANGED
|
@@ -164,8 +164,18 @@ export interface FocusTeamState {
|
|
|
164
164
|
deliveryStageIds: Map<string, string | null>;
|
|
165
165
|
/** Whether the team lead is currently resolving a merge conflict. */
|
|
166
166
|
resolvingMergeConflict: boolean;
|
|
167
|
-
/**
|
|
168
|
-
|
|
167
|
+
/**
|
|
168
|
+
* Why the team was terminated (set by terminateTeam callers).
|
|
169
|
+
*
|
|
170
|
+
* `no_actionable_work` is the HONEST reason for the terminate_no_actionable_work
|
|
171
|
+
* exit while non-terminal held deliveries remain: unlike `work_complete` it does
|
|
172
|
+
* NOT classify as a completion (classifyTeamExit -> disposition 'stopped'), so the
|
|
173
|
+
* respawn-cycle streak accrues on every such teardown and the backoff/exhaustion
|
|
174
|
+
* bounds engage -- a hold that never clears terminates in a respawn_cycle_exhausted
|
|
175
|
+
* escalation instead of billing silently. A genuine completion still uses
|
|
176
|
+
* `work_complete`.
|
|
177
|
+
*/
|
|
178
|
+
shutdownReason: 'work_complete' | 'no_actionable_work' | 'deactivated' | 'error' | 'user_stopped' | 'handoff' | 'teardown' | null;
|
|
169
179
|
/** Whether this is a read-only audit session (no commits allowed). */
|
|
170
180
|
readOnly: boolean;
|
|
171
181
|
/**
|