oh-my-codex 0.14.0 → 0.14.2
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/Cargo.lock +5 -5
- package/Cargo.toml +1 -1
- package/README.md +14 -8
- package/crates/omx-explore/src/main.rs +94 -1
- package/crates/omx-sparkshell/src/codex_bridge.rs +59 -12
- package/crates/omx-sparkshell/tests/execution.rs +48 -0
- package/dist/cli/__tests__/explore.test.js +33 -1
- package/dist/cli/__tests__/explore.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +11 -2
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/package-bin-contract.test.js +5 -0
- package/dist/cli/__tests__/package-bin-contract.test.js.map +1 -1
- package/dist/cli/__tests__/question.test.js +139 -25
- package/dist/cli/__tests__/question.test.js.map +1 -1
- package/dist/cli/__tests__/session-scoped-runtime.test.js +30 -0
- package/dist/cli/__tests__/session-scoped-runtime.test.js.map +1 -1
- package/dist/cli/__tests__/setup-agents-overwrite.test.js +32 -7
- package/dist/cli/__tests__/setup-agents-overwrite.test.js.map +1 -1
- package/dist/cli/__tests__/setup-refresh.test.js +8 -6
- package/dist/cli/__tests__/setup-refresh.test.js.map +1 -1
- package/dist/cli/__tests__/sparkshell-cli.test.js +23 -0
- package/dist/cli/__tests__/sparkshell-cli.test.js.map +1 -1
- package/dist/cli/__tests__/uninstall.test.js +65 -5
- package/dist/cli/__tests__/uninstall.test.js.map +1 -1
- package/dist/cli/__tests__/update.test.js +360 -26
- package/dist/cli/__tests__/update.test.js.map +1 -1
- package/dist/cli/explore.d.ts.map +1 -1
- package/dist/cli/explore.js +18 -3
- package/dist/cli/explore.js.map +1 -1
- package/dist/cli/index.d.ts +2 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +7 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +25 -3
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/sparkshell.d.ts.map +1 -1
- package/dist/cli/sparkshell.js +11 -1
- package/dist/cli/sparkshell.js.map +1 -1
- package/dist/cli/team.d.ts.map +1 -1
- package/dist/cli/team.js +159 -394
- package/dist/cli/team.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +3 -1
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/update.d.ts +37 -9
- package/dist/cli/update.d.ts.map +1 -1
- package/dist/cli/update.js +204 -26
- package/dist/cli/update.js.map +1 -1
- package/dist/config/__tests__/generator-idempotent.test.js +51 -14
- package/dist/config/__tests__/generator-idempotent.test.js.map +1 -1
- package/dist/config/__tests__/generator-notify.test.js +35 -10
- package/dist/config/__tests__/generator-notify.test.js.map +1 -1
- package/dist/config/generator.d.ts +1 -0
- package/dist/config/generator.d.ts.map +1 -1
- package/dist/config/generator.js +61 -7
- package/dist/config/generator.js.map +1 -1
- package/dist/hooks/__tests__/code-review-skill-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/code-review-skill-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/code-review-skill-contract.test.js +56 -0
- package/dist/hooks/__tests__/code-review-skill-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/deep-interview-contract.test.js +31 -0
- package/dist/hooks/__tests__/deep-interview-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.js +43 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.js +38 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/keyword-detector.test.js +108 -0
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/__tests__/prompt-guidance-test-helpers.d.ts.map +1 -1
- package/dist/hooks/__tests__/prompt-guidance-test-helpers.js +16 -1
- package/dist/hooks/__tests__/prompt-guidance-test-helpers.js.map +1 -1
- package/dist/hooks/keyword-detector.d.ts.map +1 -1
- package/dist/hooks/keyword-detector.js +34 -8
- package/dist/hooks/keyword-detector.js.map +1 -1
- package/dist/mcp/__tests__/bootstrap.test.js +7 -25
- package/dist/mcp/__tests__/bootstrap.test.js.map +1 -1
- package/dist/mcp/__tests__/server-lifecycle.test.js +60 -0
- package/dist/mcp/__tests__/server-lifecycle.test.js.map +1 -1
- package/dist/mcp/__tests__/state-server.test.js +177 -0
- package/dist/mcp/__tests__/state-server.test.js.map +1 -1
- package/dist/mcp/bootstrap.d.ts.map +1 -1
- package/dist/mcp/bootstrap.js +36 -18
- package/dist/mcp/bootstrap.js.map +1 -1
- package/dist/mcp/state-server.d.ts +17 -0
- package/dist/mcp/state-server.d.ts.map +1 -1
- package/dist/mcp/state-server.js +55 -1
- package/dist/mcp/state-server.js.map +1 -1
- package/dist/notifications/__tests__/index.test.js +0 -3
- package/dist/notifications/__tests__/index.test.js.map +1 -1
- package/dist/notifications/__tests__/session-status.test.js +90 -0
- package/dist/notifications/__tests__/session-status.test.js.map +1 -1
- package/dist/notifications/session-status.d.ts +2 -0
- package/dist/notifications/session-status.d.ts.map +1 -1
- package/dist/notifications/session-status.js +19 -4
- package/dist/notifications/session-status.js.map +1 -1
- package/dist/question/__tests__/deep-interview.test.js +44 -0
- package/dist/question/__tests__/deep-interview.test.js.map +1 -1
- package/dist/question/__tests__/renderer.test.js +192 -12
- package/dist/question/__tests__/renderer.test.js.map +1 -1
- package/dist/question/__tests__/state.test.js +21 -1
- package/dist/question/__tests__/state.test.js.map +1 -1
- package/dist/question/deep-interview.d.ts +3 -0
- package/dist/question/deep-interview.d.ts.map +1 -1
- package/dist/question/deep-interview.js +18 -1
- package/dist/question/deep-interview.js.map +1 -1
- package/dist/question/renderer.d.ts +4 -2
- package/dist/question/renderer.d.ts.map +1 -1
- package/dist/question/renderer.js +87 -18
- package/dist/question/renderer.js.map +1 -1
- package/dist/runtime/__tests__/run-outcome.test.js +38 -0
- package/dist/runtime/__tests__/run-outcome.test.js.map +1 -1
- package/dist/runtime/__tests__/run-state.test.d.ts +2 -0
- package/dist/runtime/__tests__/run-state.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/run-state.test.js +37 -0
- package/dist/runtime/__tests__/run-state.test.js.map +1 -0
- package/dist/runtime/run-loop.d.ts +5 -1
- package/dist/runtime/run-loop.d.ts.map +1 -1
- package/dist/runtime/run-loop.js +8 -3
- package/dist/runtime/run-loop.js.map +1 -1
- package/dist/runtime/run-outcome.d.ts +18 -0
- package/dist/runtime/run-outcome.d.ts.map +1 -1
- package/dist/runtime/run-outcome.js +156 -7
- package/dist/runtime/run-outcome.js.map +1 -1
- package/dist/runtime/run-state.d.ts +5 -1
- package/dist/runtime/run-state.d.ts.map +1 -1
- package/dist/runtime/run-state.js +13 -3
- package/dist/runtime/run-state.js.map +1 -1
- package/dist/runtime/terminal-lifecycle.d.ts +11 -0
- package/dist/runtime/terminal-lifecycle.d.ts.map +1 -0
- package/dist/runtime/terminal-lifecycle.js +52 -0
- package/dist/runtime/terminal-lifecycle.js.map +1 -0
- package/dist/scripts/__tests__/codex-native-hook.test.js +370 -56
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/postinstall.test.d.ts +2 -0
- package/dist/scripts/__tests__/postinstall.test.d.ts.map +1 -0
- package/dist/scripts/__tests__/postinstall.test.js +178 -0
- package/dist/scripts/__tests__/postinstall.test.js.map +1 -0
- package/dist/scripts/codex-native-hook.d.ts +1 -0
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +115 -56
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/postinstall.d.ts +22 -0
- package/dist/scripts/postinstall.d.ts.map +1 -0
- package/dist/scripts/postinstall.js +105 -0
- package/dist/scripts/postinstall.js.map +1 -0
- package/dist/state/__tests__/operations.test.js +60 -0
- package/dist/state/__tests__/operations.test.js.map +1 -1
- package/dist/state/operations.d.ts.map +1 -1
- package/dist/state/operations.js +18 -1
- package/dist/state/operations.js.map +1 -1
- package/dist/team/__tests__/role-router.test.js +6 -0
- package/dist/team/__tests__/role-router.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +108 -2
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +18 -4
- package/dist/team/runtime.js.map +1 -1
- package/dist/utils/__tests__/dep-versions.test.js +25 -8
- package/dist/utils/__tests__/dep-versions.test.js.map +1 -1
- package/dist/utils/__tests__/paths.test.js +45 -0
- package/dist/utils/__tests__/paths.test.js.map +1 -1
- package/dist/utils/paths.d.ts +2 -0
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +22 -7
- package/dist/utils/paths.js.map +1 -1
- package/dist/verification/__tests__/ci-rust-gates.test.js +1 -1
- package/dist/verification/__tests__/ci-rust-gates.test.js.map +1 -1
- package/package.json +3 -2
- package/prompts/architect.md +4 -0
- package/prompts/code-reviewer.md +3 -0
- package/skills/code-review/SKILL.md +94 -28
- package/skills/deep-interview/SKILL.md +91 -0
- package/src/scripts/__tests__/codex-native-hook.test.ts +468 -64
- package/src/scripts/__tests__/postinstall.test.ts +210 -0
- package/src/scripts/codex-native-hook.ts +136 -53
- package/src/scripts/postinstall-bootstrap.js +23 -0
- package/src/scripts/postinstall.ts +161 -0
- package/templates/AGENTS.md +1 -1
- package/templates/model-instructions/explore-lightweight-AGENTS.md +11 -0
- package/templates/model-instructions/sparkshell-lightweight-AGENTS.md +10 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/question/renderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/question/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { describe, it } from 'node:test';
|
|
2
2
|
import assert from 'node:assert/strict';
|
|
3
3
|
import { applyRunOutcomeContract, inferRunOutcome, isTerminalRunOutcome, normalizeRunOutcome, } from '../run-outcome.js';
|
|
4
|
+
import { compatibilityRunOutcomeFromTerminalLifecycleOutcome, inferTerminalLifecycleOutcome, normalizeTerminalLifecycleOutcome, preferredRunOutcomeForLifecycleOutcome, } from '../terminal-lifecycle.js';
|
|
4
5
|
import { shouldContinueRun } from '../run-loop.js';
|
|
5
6
|
describe('run outcome contract', () => {
|
|
6
7
|
it('normalizes legacy outcome aliases', () => {
|
|
@@ -60,5 +61,42 @@ describe('run outcome contract', () => {
|
|
|
60
61
|
run_outcome: 'continue',
|
|
61
62
|
}), true);
|
|
62
63
|
});
|
|
64
|
+
it('normalizes canonical terminal lifecycle outcomes and legacy aliases', () => {
|
|
65
|
+
assert.deepEqual(normalizeTerminalLifecycleOutcome('askuserQuestion'), {
|
|
66
|
+
outcome: 'askuserQuestion',
|
|
67
|
+
});
|
|
68
|
+
assert.deepEqual(normalizeTerminalLifecycleOutcome('complete'), {
|
|
69
|
+
outcome: 'finished',
|
|
70
|
+
warning: 'normalized legacy lifecycle outcome "complete" -> "finished"',
|
|
71
|
+
});
|
|
72
|
+
assert.deepEqual(normalizeTerminalLifecycleOutcome('cancelled'), {
|
|
73
|
+
outcome: 'userinterlude',
|
|
74
|
+
warning: 'normalized legacy lifecycle outcome "cancelled" -> "userinterlude"',
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
it('infers terminal lifecycle outcome from legacy run_outcome when no canonical field exists', () => {
|
|
78
|
+
assert.deepEqual(inferTerminalLifecycleOutcome({ run_outcome: 'finish' }), {
|
|
79
|
+
outcome: 'finished',
|
|
80
|
+
});
|
|
81
|
+
assert.deepEqual(inferTerminalLifecycleOutcome({ run_outcome: 'blocked_on_user' }), {
|
|
82
|
+
outcome: 'blocked',
|
|
83
|
+
});
|
|
84
|
+
assert.deepEqual(inferTerminalLifecycleOutcome({ run_outcome: 'cancelled' }), {
|
|
85
|
+
outcome: 'userinterlude',
|
|
86
|
+
warning: 'normalized legacy run outcome "cancelled" -> "userinterlude"',
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
it('maps canonical lifecycle outcomes to compatibility run_outcome values', () => {
|
|
90
|
+
assert.equal(preferredRunOutcomeForLifecycleOutcome('finished'), 'finish');
|
|
91
|
+
assert.equal(preferredRunOutcomeForLifecycleOutcome('blocked'), 'blocked_on_user');
|
|
92
|
+
assert.equal(preferredRunOutcomeForLifecycleOutcome('failed'), 'failed');
|
|
93
|
+
assert.equal(preferredRunOutcomeForLifecycleOutcome('userinterlude'), 'cancelled');
|
|
94
|
+
assert.equal(preferredRunOutcomeForLifecycleOutcome('askuserQuestion'), 'blocked_on_user');
|
|
95
|
+
});
|
|
96
|
+
it('keeps terminal lifecycle compatibility helpers aligned with the shared run outcome contract', () => {
|
|
97
|
+
for (const outcome of ['finished', 'blocked', 'failed', 'userinterlude', 'askuserQuestion']) {
|
|
98
|
+
assert.equal(preferredRunOutcomeForLifecycleOutcome(outcome), compatibilityRunOutcomeFromTerminalLifecycleOutcome(outcome));
|
|
99
|
+
}
|
|
100
|
+
});
|
|
63
101
|
});
|
|
64
102
|
//# sourceMappingURL=run-outcome.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-outcome.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/run-outcome.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-outcome.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/run-outcome.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-state.test.d.ts","sourceRoot":"","sources":["../../../src/runtime/__tests__/run-state.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { mkdtemp, readFile, rm } from 'node:fs/promises';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { describe, it } from 'node:test';
|
|
6
|
+
import { buildRunState, syncRunStateFromModeState } from '../run-state.js';
|
|
7
|
+
describe('run state sync', () => {
|
|
8
|
+
it('preserves canonical askuserQuestion lifecycle while keeping legacy blocked_on_user outcome', () => {
|
|
9
|
+
const state = buildRunState({
|
|
10
|
+
mode: 'deep-interview',
|
|
11
|
+
active: false,
|
|
12
|
+
run_outcome: 'blocked_on_user',
|
|
13
|
+
lifecycle_outcome: 'askuserQuestion',
|
|
14
|
+
}, null, '2026-04-19T00:00:00.000Z');
|
|
15
|
+
assert.equal(state.outcome, 'blocked_on_user');
|
|
16
|
+
assert.equal(state.lifecycle_outcome, 'askuserQuestion');
|
|
17
|
+
});
|
|
18
|
+
it('writes canonical askuserQuestion lifecycle to run-state.json during sync', async () => {
|
|
19
|
+
const wd = await mkdtemp(join(tmpdir(), 'omx-run-state-'));
|
|
20
|
+
try {
|
|
21
|
+
const synced = await syncRunStateFromModeState({
|
|
22
|
+
mode: 'deep-interview',
|
|
23
|
+
active: false,
|
|
24
|
+
run_outcome: 'blocked_on_user',
|
|
25
|
+
lifecycle_outcome: 'askuserQuestion',
|
|
26
|
+
}, wd);
|
|
27
|
+
const persisted = JSON.parse(await readFile(join(wd, '.omx', 'state', 'run-state.json'), 'utf-8'));
|
|
28
|
+
assert.equal(synced.outcome, 'blocked_on_user');
|
|
29
|
+
assert.equal(synced.lifecycle_outcome, 'askuserQuestion');
|
|
30
|
+
assert.equal(persisted.lifecycle_outcome, 'askuserQuestion');
|
|
31
|
+
}
|
|
32
|
+
finally {
|
|
33
|
+
await rm(wd, { recursive: true, force: true });
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
//# sourceMappingURL=run-state.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-state.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/run-state.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,4FAA4F,EAAE,GAAG,EAAE;QACpG,MAAM,KAAK,GAAG,aAAa,CACzB;YACE,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,iBAAiB;YAC9B,iBAAiB,EAAE,iBAAiB;SACrC,EACD,IAAI,EACJ,0BAA0B,CAC3B,CAAC;QAEF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACxF,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C;gBACE,IAAI,EAAE,gBAAgB;gBACtB,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,iBAAiB;gBAC9B,iBAAiB,EAAE,iBAAiB;aACrC,EACD,EAAE,CACH,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAC1B,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC,CACpD,CAAC;YAEnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;QAC/D,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type RunOutcome, type TerminalRunOutcome } from './run-outcome.js';
|
|
1
|
+
import { type RunOutcome, type TerminalLifecycleOutcome, type TerminalRunOutcome } from './run-outcome.js';
|
|
2
2
|
export interface RunLoopIteration<TState> {
|
|
3
3
|
outcome: unknown;
|
|
4
4
|
state: TState;
|
|
@@ -22,12 +22,16 @@ export interface RunUntilTerminalOptions<TState> {
|
|
|
22
22
|
export interface RunContinuationStateLike {
|
|
23
23
|
current_phase?: unknown;
|
|
24
24
|
run_outcome?: unknown;
|
|
25
|
+
lifecycle_outcome?: unknown;
|
|
26
|
+
terminal_outcome?: unknown;
|
|
27
|
+
question_enforcement?: unknown;
|
|
25
28
|
active?: unknown;
|
|
26
29
|
completed_at?: unknown;
|
|
27
30
|
[key: string]: unknown;
|
|
28
31
|
}
|
|
29
32
|
export interface RunContinuationSnapshot {
|
|
30
33
|
outcome: RunOutcome;
|
|
34
|
+
lifecycleOutcome?: TerminalLifecycleOutcome;
|
|
31
35
|
terminal: boolean;
|
|
32
36
|
phase: string;
|
|
33
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-loop.d.ts","sourceRoot":"","sources":["../../src/runtime/run-loop.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"run-loop.d.ts","sourceRoot":"","sources":["../../src/runtime/run-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,UAAU,EACf,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,gBAAgB,CAAC,MAAM;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B,CAAC,MAAM;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB,CAAC,MAAM;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB,CAAC,MAAM;IAC7C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACpF;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,UAAU,CAAC;IACpB,gBAAgB,CAAC,EAAE,wBAAwB,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAMD,wBAAsB,gBAAgB,CAAC,MAAM,EAC3C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,EAC9D,OAAO,GAAE,uBAAuB,CAAC,MAAM,CAAM,GAC5C,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CA8BxC;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,EACtD,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAO,GACvC,uBAAuB,GAAG,IAAI,CAchC;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,EACtD,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAO,GACvC,OAAO,CAGT"}
|
package/dist/runtime/run-loop.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { classifyRunOutcome, inferRunOutcome, isTerminalRunOutcome, } from './run-outcome.js';
|
|
1
|
+
import { classifyRunOutcome, inferRunOutcome, inferTerminalLifecycleOutcome, isTerminalRunOutcome, } from './run-outcome.js';
|
|
2
2
|
function safeString(value) {
|
|
3
3
|
return typeof value === 'string' ? value.trim() : '';
|
|
4
4
|
}
|
|
@@ -31,11 +31,16 @@ export async function runUntilTerminal(step, options = {}) {
|
|
|
31
31
|
export function getRunContinuationSnapshot(candidate, options = {}) {
|
|
32
32
|
if (!candidate || typeof candidate !== 'object')
|
|
33
33
|
return null;
|
|
34
|
-
const
|
|
34
|
+
const record = candidate;
|
|
35
|
+
const outcome = inferRunOutcome(record);
|
|
36
|
+
const lifecycleOutcome = inferTerminalLifecycleOutcome(record, {
|
|
37
|
+
includeQuestionEnforcement: true,
|
|
38
|
+
});
|
|
35
39
|
const phase = safeString(candidate.current_phase) || options.phaseFallback || 'active';
|
|
36
40
|
return {
|
|
37
41
|
outcome,
|
|
38
|
-
|
|
42
|
+
lifecycleOutcome,
|
|
43
|
+
terminal: lifecycleOutcome !== undefined || isTerminalRunOutcome(outcome),
|
|
39
44
|
phase,
|
|
40
45
|
};
|
|
41
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-loop.js","sourceRoot":"","sources":["../../src/runtime/run-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,oBAAoB,
|
|
1
|
+
{"version":3,"file":"run-loop.js","sourceRoot":"","sources":["../../src/runtime/run-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,6BAA6B,EAC7B,oBAAoB,GAIrB,MAAM,kBAAkB,CAAC;AA4C1B,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAA8D,EAC9D,UAA2C,EAAE;IAE7C,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,CAAC;IAExE,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,IAAI,aAAa,EAAE,SAAS,IAAI,CAAC,EAAE,CAAC;QACnE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtB,MAAM,UAAU,GAAuC;YACrD,SAAS;YACT,OAAO;YACP,QAAQ;YACR,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC;QAEF,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;QAExC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO;gBACL,SAAS;gBACT,OAAO;gBACP,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,OAAO;aACR,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,aAAa,sCAAsC,CAAC,CAAC;AAC1G,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,SAAsD,EACtD,UAAsC,EAAE;IAExC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC7D,MAAM,MAAM,GAAG,SAAoC,CAAC;IACpD,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,MAAM,EAAE;QAC7D,0BAA0B,EAAE,IAAI;KACjC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,aAAa,IAAI,QAAQ,CAAC;IACvF,OAAO;QACL,OAAO;QACP,gBAAgB;QAChB,QAAQ,EAAE,gBAAgB,KAAK,SAAS,IAAI,oBAAoB,CAAC,OAAO,CAAC;QACzE,KAAK;KACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,SAAsD,EACtD,UAAsC,EAAE;IAExC,MAAM,QAAQ,GAAG,0BAA0B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChE,OAAO,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;AACjD,CAAC"}
|
|
@@ -1,26 +1,44 @@
|
|
|
1
1
|
export declare const TERMINAL_RUN_OUTCOMES: readonly ["finish", "blocked_on_user", "failed", "cancelled"];
|
|
2
2
|
export declare const NON_TERMINAL_RUN_OUTCOMES: readonly ["progress", "continue"];
|
|
3
3
|
export declare const RUN_OUTCOMES: readonly ["progress", "continue", "finish", "blocked_on_user", "failed", "cancelled"];
|
|
4
|
+
export declare const TERMINAL_LIFECYCLE_OUTCOMES: readonly ["finished", "blocked", "failed", "userinterlude", "askuserQuestion"];
|
|
4
5
|
export type TerminalRunOutcome = (typeof TERMINAL_RUN_OUTCOMES)[number];
|
|
5
6
|
export type NonTerminalRunOutcome = (typeof NON_TERMINAL_RUN_OUTCOMES)[number];
|
|
6
7
|
export type RunOutcome = (typeof RUN_OUTCOMES)[number];
|
|
8
|
+
export type TerminalLifecycleOutcome = (typeof TERMINAL_LIFECYCLE_OUTCOMES)[number];
|
|
7
9
|
export interface RunOutcomeNormalizationResult {
|
|
8
10
|
outcome?: RunOutcome;
|
|
9
11
|
warning?: string;
|
|
10
12
|
error?: string;
|
|
11
13
|
}
|
|
14
|
+
export interface TerminalLifecycleOutcomeNormalizationOptions {
|
|
15
|
+
blockedOnUserStrategy?: 'blocked' | 'askuserQuestion' | 'userinterlude';
|
|
16
|
+
}
|
|
17
|
+
export interface TerminalLifecycleOutcomeNormalizationResult {
|
|
18
|
+
outcome?: TerminalLifecycleOutcome;
|
|
19
|
+
warning?: string;
|
|
20
|
+
error?: string;
|
|
21
|
+
}
|
|
12
22
|
export interface RunOutcomeValidationResult {
|
|
13
23
|
ok: boolean;
|
|
14
24
|
state?: Record<string, unknown>;
|
|
15
25
|
warning?: string;
|
|
16
26
|
error?: string;
|
|
17
27
|
}
|
|
28
|
+
export declare function compatibilityRunOutcomeFromTerminalLifecycleOutcome(outcome: TerminalLifecycleOutcome): TerminalRunOutcome;
|
|
29
|
+
export declare function terminalLifecycleOutcomeFromRunOutcome(outcome: TerminalRunOutcome, options?: TerminalLifecycleOutcomeNormalizationOptions): TerminalLifecycleOutcome;
|
|
18
30
|
export declare function normalizeRunOutcome(value: unknown): RunOutcomeNormalizationResult;
|
|
31
|
+
export declare function normalizeTerminalLifecycleOutcome(value: unknown, options?: TerminalLifecycleOutcomeNormalizationOptions): TerminalLifecycleOutcomeNormalizationResult;
|
|
19
32
|
export declare function classifyRunOutcome(value: unknown): RunOutcome;
|
|
20
33
|
export declare function isTerminalRunOutcome(value: unknown): value is TerminalRunOutcome;
|
|
34
|
+
export declare function isTerminalLifecycleOutcome(value: unknown, options?: TerminalLifecycleOutcomeNormalizationOptions): value is TerminalLifecycleOutcome;
|
|
21
35
|
export declare function isNonTerminalRunOutcome(value: unknown): value is NonTerminalRunOutcome;
|
|
22
36
|
export declare function isNonTerminalRunState(value: unknown): boolean;
|
|
23
37
|
export declare function isTerminalRunState(value: unknown): boolean;
|
|
38
|
+
export declare function inferTerminalLifecycleOutcome(candidate: Record<string, unknown>, options?: {
|
|
39
|
+
includeQuestionEnforcement?: boolean;
|
|
40
|
+
blockedOnUserStrategy?: 'blocked' | 'askuserQuestion' | 'userinterlude';
|
|
41
|
+
}): TerminalLifecycleOutcome | undefined;
|
|
24
42
|
export declare function inferRunOutcome(candidate: Record<string, unknown>): RunOutcome;
|
|
25
43
|
export declare function applyRunOutcomeContract(candidate: Record<string, unknown>, options?: {
|
|
26
44
|
nowIso?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-outcome.d.ts","sourceRoot":"","sources":["../../src/runtime/run-outcome.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,+DAKxB,CAAC;AAEX,eAAO,MAAM,yBAAyB,mCAG5B,CAAC;AAEX,eAAO,MAAM,YAAY,uFAGf,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AACxE,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAC/E,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"run-outcome.d.ts","sourceRoot":"","sources":["../../src/runtime/run-outcome.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,17 @@ export const RUN_OUTCOMES = [
|
|
|
12
12
|
...NON_TERMINAL_RUN_OUTCOMES,
|
|
13
13
|
...TERMINAL_RUN_OUTCOMES,
|
|
14
14
|
];
|
|
15
|
+
export const TERMINAL_LIFECYCLE_OUTCOMES = [
|
|
16
|
+
'finished',
|
|
17
|
+
'blocked',
|
|
18
|
+
'failed',
|
|
19
|
+
'userinterlude',
|
|
20
|
+
'askuserQuestion',
|
|
21
|
+
];
|
|
15
22
|
const TERMINAL_RUN_OUTCOME_SET = new Set(TERMINAL_RUN_OUTCOMES);
|
|
16
23
|
const NON_TERMINAL_RUN_OUTCOME_SET = new Set(NON_TERMINAL_RUN_OUTCOMES);
|
|
17
24
|
const RUN_OUTCOME_SET = new Set(RUN_OUTCOMES);
|
|
25
|
+
const TERMINAL_LIFECYCLE_OUTCOME_SET = new Set(TERMINAL_LIFECYCLE_OUTCOMES);
|
|
18
26
|
const RUN_OUTCOME_ALIASES = {
|
|
19
27
|
finish: 'finish',
|
|
20
28
|
finished: 'finish',
|
|
@@ -36,6 +44,30 @@ const RUN_OUTCOME_ALIASES = {
|
|
|
36
44
|
continue: 'continue',
|
|
37
45
|
continued: 'continue',
|
|
38
46
|
};
|
|
47
|
+
const TERMINAL_LIFECYCLE_OUTCOME_ALIASES = {
|
|
48
|
+
finished: 'finished',
|
|
49
|
+
finish: 'finished',
|
|
50
|
+
complete: 'finished',
|
|
51
|
+
completed: 'finished',
|
|
52
|
+
done: 'finished',
|
|
53
|
+
blocked: 'blocked',
|
|
54
|
+
failed: 'failed',
|
|
55
|
+
fail: 'failed',
|
|
56
|
+
error: 'failed',
|
|
57
|
+
userinterlude: 'userinterlude',
|
|
58
|
+
'user-interlude': 'userinterlude',
|
|
59
|
+
interrupted: 'userinterlude',
|
|
60
|
+
interrupt: 'userinterlude',
|
|
61
|
+
cancelled: 'userinterlude',
|
|
62
|
+
canceled: 'userinterlude',
|
|
63
|
+
cancel: 'userinterlude',
|
|
64
|
+
aborted: 'userinterlude',
|
|
65
|
+
abort: 'userinterlude',
|
|
66
|
+
askuserquestion: 'askuserQuestion',
|
|
67
|
+
'ask-user-question': 'askuserQuestion',
|
|
68
|
+
askuser: 'askuserQuestion',
|
|
69
|
+
question: 'askuserQuestion',
|
|
70
|
+
};
|
|
39
71
|
const TERMINAL_PHASE_TO_RUN_OUTCOME = {
|
|
40
72
|
complete: 'finish',
|
|
41
73
|
completed: 'finish',
|
|
@@ -46,12 +78,46 @@ const TERMINAL_PHASE_TO_RUN_OUTCOME = {
|
|
|
46
78
|
cancelled: 'cancelled',
|
|
47
79
|
cancel: 'cancelled',
|
|
48
80
|
};
|
|
81
|
+
const RUN_OUTCOME_FROM_LIFECYCLE = {
|
|
82
|
+
finished: 'finish',
|
|
83
|
+
blocked: 'blocked_on_user',
|
|
84
|
+
failed: 'failed',
|
|
85
|
+
userinterlude: 'cancelled',
|
|
86
|
+
askuserQuestion: 'blocked_on_user',
|
|
87
|
+
};
|
|
49
88
|
function normalizeRunOutcomeValue(value) {
|
|
50
89
|
return typeof value === 'string' ? value.trim().toLowerCase() : '';
|
|
51
90
|
}
|
|
52
91
|
function safeString(value) {
|
|
53
92
|
return typeof value === 'string' ? value.trim() : '';
|
|
54
93
|
}
|
|
94
|
+
function resolveBlockedOnUserLifecycleOutcome(options = {}) {
|
|
95
|
+
return options.blockedOnUserStrategy ?? 'blocked';
|
|
96
|
+
}
|
|
97
|
+
function hasPendingQuestionEnforcement(candidate) {
|
|
98
|
+
const enforcement = candidate.question_enforcement;
|
|
99
|
+
if (!enforcement || typeof enforcement !== 'object')
|
|
100
|
+
return false;
|
|
101
|
+
const record = enforcement;
|
|
102
|
+
const obligationId = safeString(record.obligation_id);
|
|
103
|
+
const status = safeString(record.status).toLowerCase();
|
|
104
|
+
return obligationId !== '' && status === 'pending';
|
|
105
|
+
}
|
|
106
|
+
export function compatibilityRunOutcomeFromTerminalLifecycleOutcome(outcome) {
|
|
107
|
+
return RUN_OUTCOME_FROM_LIFECYCLE[outcome];
|
|
108
|
+
}
|
|
109
|
+
export function terminalLifecycleOutcomeFromRunOutcome(outcome, options = {}) {
|
|
110
|
+
switch (outcome) {
|
|
111
|
+
case 'finish':
|
|
112
|
+
return 'finished';
|
|
113
|
+
case 'blocked_on_user':
|
|
114
|
+
return resolveBlockedOnUserLifecycleOutcome(options);
|
|
115
|
+
case 'failed':
|
|
116
|
+
return 'failed';
|
|
117
|
+
case 'cancelled':
|
|
118
|
+
return 'userinterlude';
|
|
119
|
+
}
|
|
120
|
+
}
|
|
55
121
|
export function normalizeRunOutcome(value) {
|
|
56
122
|
const normalized = normalizeRunOutcomeValue(value);
|
|
57
123
|
if (!normalized)
|
|
@@ -68,6 +134,31 @@ export function normalizeRunOutcome(value) {
|
|
|
68
134
|
}
|
|
69
135
|
return { error: `run_outcome must be one of: ${RUN_OUTCOMES.join(', ')}` };
|
|
70
136
|
}
|
|
137
|
+
export function normalizeTerminalLifecycleOutcome(value, options = {}) {
|
|
138
|
+
const normalized = normalizeRunOutcomeValue(value);
|
|
139
|
+
if (!normalized)
|
|
140
|
+
return {};
|
|
141
|
+
if (TERMINAL_LIFECYCLE_OUTCOME_SET.has(normalized)) {
|
|
142
|
+
return { outcome: normalized };
|
|
143
|
+
}
|
|
144
|
+
if (normalized === 'blocked_on_user' || normalized === 'blocked-on-user') {
|
|
145
|
+
const outcome = resolveBlockedOnUserLifecycleOutcome(options);
|
|
146
|
+
return {
|
|
147
|
+
outcome,
|
|
148
|
+
warning: `normalized legacy terminal lifecycle outcome "${value}" -> "${outcome}"`,
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
const alias = TERMINAL_LIFECYCLE_OUTCOME_ALIASES[normalized];
|
|
152
|
+
if (alias) {
|
|
153
|
+
return {
|
|
154
|
+
outcome: alias,
|
|
155
|
+
warning: `normalized legacy terminal lifecycle outcome "${value}" -> "${alias}"`,
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
return {
|
|
159
|
+
error: `lifecycle_outcome must be one of: ${TERMINAL_LIFECYCLE_OUTCOMES.join(', ')}`,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
71
162
|
export function classifyRunOutcome(value) {
|
|
72
163
|
return normalizeRunOutcome(value).outcome ?? 'progress';
|
|
73
164
|
}
|
|
@@ -75,6 +166,10 @@ export function isTerminalRunOutcome(value) {
|
|
|
75
166
|
const normalized = normalizeRunOutcome(value).outcome;
|
|
76
167
|
return normalized !== undefined && TERMINAL_RUN_OUTCOME_SET.has(normalized);
|
|
77
168
|
}
|
|
169
|
+
export function isTerminalLifecycleOutcome(value, options = {}) {
|
|
170
|
+
const normalized = normalizeTerminalLifecycleOutcome(value, options).outcome;
|
|
171
|
+
return normalized !== undefined && TERMINAL_LIFECYCLE_OUTCOME_SET.has(normalized);
|
|
172
|
+
}
|
|
78
173
|
export function isNonTerminalRunOutcome(value) {
|
|
79
174
|
const normalized = normalizeRunOutcome(value).outcome;
|
|
80
175
|
return normalized !== undefined && NON_TERMINAL_RUN_OUTCOME_SET.has(normalized);
|
|
@@ -85,10 +180,45 @@ export function isNonTerminalRunState(value) {
|
|
|
85
180
|
export function isTerminalRunState(value) {
|
|
86
181
|
return isTerminalRunOutcome(classifyRunOutcome(value));
|
|
87
182
|
}
|
|
183
|
+
export function inferTerminalLifecycleOutcome(candidate, options = {}) {
|
|
184
|
+
const blockedOnUserStrategy = options.blockedOnUserStrategy
|
|
185
|
+
?? (options.includeQuestionEnforcement && hasPendingQuestionEnforcement(candidate)
|
|
186
|
+
? 'askuserQuestion'
|
|
187
|
+
: 'blocked');
|
|
188
|
+
const explicit = normalizeTerminalLifecycleOutcome(candidate.lifecycle_outcome ?? candidate.terminal_outcome, { blockedOnUserStrategy });
|
|
189
|
+
if (explicit.outcome)
|
|
190
|
+
return explicit.outcome;
|
|
191
|
+
const runOutcome = normalizeRunOutcome(candidate.run_outcome).outcome;
|
|
192
|
+
if (runOutcome && isTerminalRunOutcome(runOutcome)) {
|
|
193
|
+
return terminalLifecycleOutcomeFromRunOutcome(runOutcome, { blockedOnUserStrategy });
|
|
194
|
+
}
|
|
195
|
+
const phase = safeString(candidate.current_phase).toLowerCase();
|
|
196
|
+
if (phase) {
|
|
197
|
+
const normalizedPhase = normalizeTerminalLifecycleOutcome(phase, { blockedOnUserStrategy });
|
|
198
|
+
if (normalizedPhase.outcome)
|
|
199
|
+
return normalizedPhase.outcome;
|
|
200
|
+
}
|
|
201
|
+
if (options.includeQuestionEnforcement && hasPendingQuestionEnforcement(candidate)) {
|
|
202
|
+
return 'askuserQuestion';
|
|
203
|
+
}
|
|
204
|
+
if (candidate.active === true)
|
|
205
|
+
return undefined;
|
|
206
|
+
if (safeString(candidate.completed_at))
|
|
207
|
+
return 'finished';
|
|
208
|
+
if (candidate.active === false)
|
|
209
|
+
return 'finished';
|
|
210
|
+
return undefined;
|
|
211
|
+
}
|
|
88
212
|
export function inferRunOutcome(candidate) {
|
|
89
213
|
const explicit = normalizeRunOutcome(candidate.run_outcome);
|
|
90
214
|
if (explicit.outcome)
|
|
91
215
|
return explicit.outcome;
|
|
216
|
+
const lifecycleOutcome = inferTerminalLifecycleOutcome(candidate, {
|
|
217
|
+
includeQuestionEnforcement: false,
|
|
218
|
+
});
|
|
219
|
+
if (lifecycleOutcome) {
|
|
220
|
+
return compatibilityRunOutcomeFromTerminalLifecycleOutcome(lifecycleOutcome);
|
|
221
|
+
}
|
|
92
222
|
const phase = safeString(candidate.current_phase).toLowerCase();
|
|
93
223
|
if (phase && TERMINAL_PHASE_TO_RUN_OUTCOME[phase]) {
|
|
94
224
|
return TERMINAL_PHASE_TO_RUN_OUTCOME[phase];
|
|
@@ -104,14 +234,33 @@ export function inferRunOutcome(candidate) {
|
|
|
104
234
|
export function applyRunOutcomeContract(candidate, options) {
|
|
105
235
|
const nowIso = options?.nowIso ?? new Date().toISOString();
|
|
106
236
|
const next = { ...candidate };
|
|
107
|
-
const
|
|
108
|
-
if (
|
|
109
|
-
return { ok: false, error:
|
|
110
|
-
const
|
|
237
|
+
const normalizedLifecycle = normalizeTerminalLifecycleOutcome(next.lifecycle_outcome ?? next.terminal_outcome);
|
|
238
|
+
if (normalizedLifecycle.error)
|
|
239
|
+
return { ok: false, error: normalizedLifecycle.error };
|
|
240
|
+
const normalizedRunOutcome = normalizeRunOutcome(next.run_outcome);
|
|
241
|
+
if (normalizedRunOutcome.error)
|
|
242
|
+
return { ok: false, error: normalizedRunOutcome.error };
|
|
243
|
+
const lifecycleOutcome = normalizedLifecycle.outcome ?? inferTerminalLifecycleOutcome(next, {
|
|
244
|
+
includeQuestionEnforcement: false,
|
|
245
|
+
});
|
|
246
|
+
const outcome = normalizedLifecycle.outcome
|
|
247
|
+
? compatibilityRunOutcomeFromTerminalLifecycleOutcome(normalizedLifecycle.outcome)
|
|
248
|
+
: normalizedRunOutcome.outcome ?? inferRunOutcome(next);
|
|
249
|
+
delete next.terminal_outcome;
|
|
111
250
|
next.run_outcome = outcome;
|
|
112
|
-
if (
|
|
251
|
+
if (lifecycleOutcome) {
|
|
252
|
+
next.lifecycle_outcome = lifecycleOutcome;
|
|
253
|
+
}
|
|
254
|
+
else {
|
|
255
|
+
delete next.lifecycle_outcome;
|
|
256
|
+
}
|
|
257
|
+
const terminal = lifecycleOutcome !== undefined || isTerminalRunOutcome(outcome);
|
|
258
|
+
if (terminal) {
|
|
113
259
|
if (next.active === true) {
|
|
114
|
-
return {
|
|
260
|
+
return {
|
|
261
|
+
ok: false,
|
|
262
|
+
error: `terminal run outcome "${lifecycleOutcome ?? outcome}" requires active=false`,
|
|
263
|
+
};
|
|
115
264
|
}
|
|
116
265
|
next.active = false;
|
|
117
266
|
if (!safeString(next.completed_at)) {
|
|
@@ -130,7 +279,7 @@ export function applyRunOutcomeContract(candidate, options) {
|
|
|
130
279
|
return {
|
|
131
280
|
ok: true,
|
|
132
281
|
state: next,
|
|
133
|
-
warning:
|
|
282
|
+
warning: normalizedLifecycle.warning ?? normalizedRunOutcome.warning,
|
|
134
283
|
};
|
|
135
284
|
}
|
|
136
285
|
//# sourceMappingURL=run-outcome.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-outcome.js","sourceRoot":"","sources":["../../src/runtime/run-outcome.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,QAAQ;IACR,iBAAiB;IACjB,QAAQ;IACR,WAAW;CACH,CAAC;AAEX,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,UAAU;IACV,UAAU;CACF,CAAC;AAEX,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,GAAG,yBAAyB;IAC5B,GAAG,qBAAqB;CAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"run-outcome.js","sourceRoot":"","sources":["../../src/runtime/run-outcome.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,QAAQ;IACR,iBAAiB;IACjB,QAAQ;IACR,WAAW;CACH,CAAC;AAEX,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,UAAU;IACV,UAAU;CACF,CAAC;AAEX,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,GAAG,yBAAyB;IAC5B,GAAG,qBAAqB;CAChB,CAAC;AAEX,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,UAAU;IACV,SAAS;IACT,QAAQ;IACR,eAAe;IACf,iBAAiB;CACT,CAAC;AAOX,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAS,qBAAqB,CAAC,CAAC;AACxE,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAS,yBAAyB,CAAC,CAAC;AAChF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAS,YAAY,CAAC,CAAC;AACtD,MAAM,8BAA8B,GAAG,IAAI,GAAG,CAAS,2BAA2B,CAAC,CAAC;AAEpF,MAAM,mBAAmB,GAAyC;IAChE,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,QAAQ;IACnB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,iBAAiB;IAC1B,iBAAiB,EAAE,iBAAiB;IACpC,eAAe,EAAE,iBAAiB;IAClC,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,QAAQ;IACf,SAAS,EAAE,WAAW;IACtB,QAAQ,EAAE,WAAW;IACrB,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,UAAU;CACb,CAAC;AAEX,MAAM,kCAAkC,GAAuD;IAC7F,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,UAAU;IAChB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,QAAQ;IACf,aAAa,EAAE,eAAe;IAC9B,gBAAgB,EAAE,eAAe;IACjC,WAAW,EAAE,eAAe;IAC5B,SAAS,EAAE,eAAe;IAC1B,SAAS,EAAE,eAAe;IAC1B,QAAQ,EAAE,eAAe;IACzB,MAAM,EAAE,eAAe;IACvB,OAAO,EAAE,eAAe;IACxB,KAAK,EAAE,eAAe;IACtB,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,iBAAiB;IACtC,OAAO,EAAE,iBAAiB;IAC1B,QAAQ,EAAE,iBAAiB;CACnB,CAAC;AAEX,MAAM,6BAA6B,GAAiD;IAClF,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,QAAQ;IACnB,OAAO,EAAE,iBAAiB;IAC1B,eAAe,EAAE,iBAAiB;IAClC,iBAAiB,EAAE,iBAAiB;IACpC,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,WAAW;CACpB,CAAC;AAEF,MAAM,0BAA0B,GAAmE;IACjG,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,iBAAiB;IAC1B,MAAM,EAAE,QAAQ;IAChB,aAAa,EAAE,WAAW;IAC1B,eAAe,EAAE,iBAAiB;CACnC,CAAC;AAyBF,SAAS,wBAAwB,CAAC,KAAc;IAC9C,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACrE,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,oCAAoC,CAC3C,UAAwD,EAAE;IAE1D,OAAO,OAAO,CAAC,qBAAqB,IAAI,SAAS,CAAC;AACpD,CAAC;AAED,SAAS,6BAA6B,CAAC,SAAkC;IACvE,MAAM,WAAW,GAAG,SAAS,CAAC,oBAAoB,CAAC;IACnD,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAClE,MAAM,MAAM,GAAG,WAAsC,CAAC;IACtD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,OAAO,YAAY,KAAK,EAAE,IAAI,MAAM,KAAK,SAAS,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,mDAAmD,CACjE,OAAiC;IAEjC,OAAO,0BAA0B,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,sCAAsC,CACpD,OAA2B,EAC3B,UAAwD,EAAE;IAE1D,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,UAAU,CAAC;QACpB,KAAK,iBAAiB;YACpB,OAAO,oCAAoC,CAAC,OAAO,CAAC,CAAC;QACvD,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,eAAe,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,MAAM,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,IAAI,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,UAAwB,EAAE,CAAC;IAC/C,CAAC;IACD,MAAM,KAAK,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC9C,IAAI,KAAK,EAAE,CAAC;QACV,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAAkC,KAAK,SAAS,KAAK,GAAG;SAClE,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,+BAA+B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,KAAc,EACd,UAAwD,EAAE;IAE1D,MAAM,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,IAAI,8BAA8B,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACnD,OAAO,EAAE,OAAO,EAAE,UAAsC,EAAE,CAAC;IAC7D,CAAC;IACD,IAAI,UAAU,KAAK,iBAAiB,IAAI,UAAU,KAAK,iBAAiB,EAAE,CAAC;QACzE,MAAM,OAAO,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO;YACL,OAAO;YACP,OAAO,EAAE,iDAAiD,KAAK,SAAS,OAAO,GAAG;SACnF,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,kCAAkC,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,KAAK,EAAE,CAAC;QACV,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,iDAAiD,KAAK,SAAS,KAAK,GAAG;SACjF,CAAC;IACJ,CAAC;IACD,OAAO;QACL,KAAK,EAAE,qCAAqC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;KACrF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;IACtD,OAAO,UAAU,KAAK,SAAS,IAAI,wBAAwB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAAc,EACd,UAAwD,EAAE;IAE1D,MAAM,UAAU,GAAG,iCAAiC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC;IAC7E,OAAO,UAAU,KAAK,SAAS,IAAI,8BAA8B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;IACtD,OAAO,UAAU,KAAK,SAAS,IAAI,4BAA4B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,OAAO,uBAAuB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,SAAkC,EAClC,UAGI,EAAE;IAEN,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB;WACtD,CACD,OAAO,CAAC,0BAA0B,IAAI,6BAA6B,CAAC,SAAS,CAAC;YAC5E,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,SAAS,CACd,CAAC;IAEJ,MAAM,QAAQ,GAAG,iCAAiC,CAChD,SAAS,CAAC,iBAAiB,IAAI,SAAS,CAAC,gBAAgB,EACzD,EAAE,qBAAqB,EAAE,CAC1B,CAAC;IACF,IAAI,QAAQ,CAAC,OAAO;QAAE,OAAO,QAAQ,CAAC,OAAO,CAAC;IAE9C,MAAM,UAAU,GAAG,mBAAmB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;IACtE,IAAI,UAAU,IAAI,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnD,OAAO,sCAAsC,CAAC,UAAU,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;IAChE,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,eAAe,GAAG,iCAAiC,CAAC,KAAK,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAC5F,IAAI,eAAe,CAAC,OAAO;YAAE,OAAO,eAAe,CAAC,OAAO,CAAC;IAC9D,CAAC;IAED,IAAI,OAAO,CAAC,0BAA0B,IAAI,6BAA6B,CAAC,SAAS,CAAC,EAAE,CAAC;QACnF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAChD,IAAI,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC;QAAE,OAAO,UAAU,CAAC;IAC1D,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK;QAAE,OAAO,UAAU,CAAC;IAClD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,SAAkC;IAChE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,QAAQ,CAAC,OAAO;QAAE,OAAO,QAAQ,CAAC,OAAO,CAAC;IAE9C,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,SAAS,EAAE;QAChE,0BAA0B,EAAE,KAAK;KAClC,CAAC,CAAC;IACH,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,mDAAmD,CAAC,gBAAgB,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;IAChE,IAAI,KAAK,IAAI,6BAA6B,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IACjD,IAAI,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxD,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK;QAAE,OAAO,QAAQ,CAAC;IAChD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,SAAkC,EAClC,OAA6B;IAE7B,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3D,MAAM,IAAI,GAA4B,EAAE,GAAG,SAAS,EAAE,CAAC;IACvD,MAAM,mBAAmB,GAAG,iCAAiC,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/G,IAAI,mBAAmB,CAAC,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,CAAC,KAAK,EAAE,CAAC;IAEtF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnE,IAAI,oBAAoB,CAAC,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,CAAC,KAAK,EAAE,CAAC;IAExF,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,IAAI,6BAA6B,CAAC,IAAI,EAAE;QAC1F,0BAA0B,EAAE,KAAK;KAClC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO;QACzC,CAAC,CAAC,mDAAmD,CAAC,mBAAmB,CAAC,OAAO,CAAC;QAClF,CAAC,CAAC,oBAAoB,CAAC,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC7B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;IAC3B,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;IAC5C,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,MAAM,QAAQ,GAAG,gBAAgB,KAAK,SAAS,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjF,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,yBAAyB,gBAAgB,IAAI,OAAO,yBAAyB;aACrF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC1B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,6BAA6B,OAAO,wBAAwB,EAAE,CAAC;QAC5F,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,mBAAmB,CAAC,OAAO,IAAI,oBAAoB,CAAC,OAAO;KACrE,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type RunOutcome } from './run-outcome.js';
|
|
1
|
+
import { type RunOutcome, type TerminalLifecycleOutcome } from './run-outcome.js';
|
|
2
2
|
export interface RunStateLike {
|
|
3
3
|
active?: unknown;
|
|
4
4
|
mode?: unknown;
|
|
@@ -11,6 +11,9 @@ export interface RunStateLike {
|
|
|
11
11
|
error?: unknown;
|
|
12
12
|
outcome?: unknown;
|
|
13
13
|
run_outcome?: unknown;
|
|
14
|
+
lifecycle_outcome?: unknown;
|
|
15
|
+
terminal_outcome?: unknown;
|
|
16
|
+
question_enforcement?: unknown;
|
|
14
17
|
owner_omx_session_id?: unknown;
|
|
15
18
|
[key: string]: unknown;
|
|
16
19
|
}
|
|
@@ -19,6 +22,7 @@ export interface RunState {
|
|
|
19
22
|
mode: string;
|
|
20
23
|
active: boolean;
|
|
21
24
|
outcome: RunOutcome;
|
|
25
|
+
lifecycle_outcome?: TerminalLifecycleOutcome;
|
|
22
26
|
updated_at: string;
|
|
23
27
|
current_phase?: string;
|
|
24
28
|
task_description?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-state.d.ts","sourceRoot":"","sources":["../../src/runtime/run-state.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"run-state.d.ts","sourceRoot":"","sources":["../../src/runtime/run-state.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,KAAK,UAAU,EACf,KAAK,wBAAwB,EAC9B,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,UAAU,CAAC;IACpB,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAkBD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,YAAY,GAAG,UAAU,CAkB7E;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,YAAY,EACnB,QAAQ,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,EACnC,MAAM,GAAE,MAAiC,GACxC,QAAQ,CA8CV;AAiBD,wBAAsB,YAAY,CAChC,gBAAgB,CAAC,EAAE,MAAM,EACzB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAU1B;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,YAAY,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,QAAQ,CAAC,CASnB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
|
|
3
3
|
import { getStateFilePath, resolveStateScope } from '../mcp/state-paths.js';
|
|
4
|
-
import { classifyRunOutcome, isTerminalRunOutcome, normalizeRunOutcome, } from './run-outcome.js';
|
|
4
|
+
import { classifyRunOutcome, compatibilityRunOutcomeFromTerminalLifecycleOutcome, inferTerminalLifecycleOutcome, isTerminalRunOutcome, normalizeTerminalLifecycleOutcome, normalizeRunOutcome, } from './run-outcome.js';
|
|
5
5
|
const RUN_STATE_FILENAME = 'run-state.json';
|
|
6
6
|
function optionalString(value) {
|
|
7
7
|
if (typeof value !== 'string')
|
|
@@ -15,12 +15,17 @@ function optionalFiniteNumber(value) {
|
|
|
15
15
|
function terminalOutcomeFromPhase(phase) {
|
|
16
16
|
if (!phase)
|
|
17
17
|
return null;
|
|
18
|
-
const
|
|
19
|
-
return
|
|
18
|
+
const normalized = normalizeRunOutcome(phase).outcome;
|
|
19
|
+
return normalized && isTerminalRunOutcome(normalized) ? normalized : null;
|
|
20
20
|
}
|
|
21
21
|
export function deriveRunOutcomeFromModeState(state) {
|
|
22
22
|
if (state.active === true)
|
|
23
23
|
return 'continue';
|
|
24
|
+
const lifecycleOutcome = inferTerminalLifecycleOutcome(state, {
|
|
25
|
+
includeQuestionEnforcement: true,
|
|
26
|
+
});
|
|
27
|
+
if (lifecycleOutcome)
|
|
28
|
+
return compatibilityRunOutcomeFromTerminalLifecycleOutcome(lifecycleOutcome);
|
|
24
29
|
const explicitOutcome = normalizeRunOutcome(state.outcome ?? state.run_outcome).outcome;
|
|
25
30
|
if (explicitOutcome)
|
|
26
31
|
return explicitOutcome;
|
|
@@ -34,6 +39,9 @@ export function deriveRunOutcomeFromModeState(state) {
|
|
|
34
39
|
return classifyRunOutcome(state.current_phase);
|
|
35
40
|
}
|
|
36
41
|
export function buildRunState(state, existing, nowIso = new Date().toISOString()) {
|
|
42
|
+
const lifecycleOutcome = normalizeTerminalLifecycleOutcome(state.lifecycle_outcome ?? state.terminal_outcome).outcome ?? inferTerminalLifecycleOutcome(state, {
|
|
43
|
+
includeQuestionEnforcement: true,
|
|
44
|
+
}) ?? existing?.lifecycle_outcome;
|
|
37
45
|
const outcome = deriveRunOutcomeFromModeState(state);
|
|
38
46
|
const active = state.active === true;
|
|
39
47
|
const next = {
|
|
@@ -43,6 +51,8 @@ export function buildRunState(state, existing, nowIso = new Date().toISOString()
|
|
|
43
51
|
outcome,
|
|
44
52
|
updated_at: nowIso,
|
|
45
53
|
};
|
|
54
|
+
if (lifecycleOutcome)
|
|
55
|
+
next.lifecycle_outcome = lifecycleOutcome;
|
|
46
56
|
const currentPhase = optionalString(state.current_phase);
|
|
47
57
|
if (currentPhase)
|
|
48
58
|
next.current_phase = currentPhase;
|