@skillstate/core 2.0.7 → 2.2.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/dist/adapter-shared.d.ts +61 -0
- package/dist/adapter-shared.d.ts.map +1 -0
- package/dist/adapter-shared.js +96 -0
- package/dist/adapter-shared.js.map +1 -0
- package/dist/atomic-write.d.ts +17 -0
- package/dist/atomic-write.d.ts.map +1 -1
- package/dist/atomic-write.js +47 -0
- package/dist/atomic-write.js.map +1 -1
- package/dist/hook-runtime.d.ts +163 -0
- package/dist/hook-runtime.d.ts.map +1 -0
- package/dist/hook-runtime.js +364 -0
- package/dist/hook-runtime.js.map +1 -0
- package/dist/host-state.d.ts +3 -2
- package/dist/host-state.d.ts.map +1 -1
- package/dist/host-state.js +24 -11
- package/dist/host-state.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -0
- package/dist/index.js.map +1 -1
- package/dist/prompt-contract.d.ts +82 -0
- package/dist/prompt-contract.d.ts.map +1 -0
- package/dist/prompt-contract.js +129 -0
- package/dist/prompt-contract.js.map +1 -0
- package/dist/prompt-transformer.d.ts +0 -4
- package/dist/prompt-transformer.d.ts.map +1 -1
- package/dist/prompt-transformer.js +8 -43
- package/dist/prompt-transformer.js.map +1 -1
- package/dist/session-meta.d.ts +58 -0
- package/dist/session-meta.d.ts.map +1 -0
- package/dist/session-meta.js +101 -0
- package/dist/session-meta.js.map +1 -0
- package/dist/state-manager.d.ts.map +1 -1
- package/dist/state-manager.js +6 -30
- package/dist/state-manager.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The two-key response directive (without the fenced example). Adapters
|
|
3
|
+
* prepend their own lead-in ("Based on your current state, provide your
|
|
4
|
+
* response with:" etc.) and append the numbered items via
|
|
5
|
+
* {@link STATE_PATCH_CONTRACT}.
|
|
6
|
+
*/
|
|
7
|
+
export const STATE_PATCH_CONTRACT_HEADER = 'A JSON block containing both your State Patch and your Action. The JSON block MUST have exactly these two keys:';
|
|
8
|
+
/** Canonical fenced ```json example block for the two-key contract. */
|
|
9
|
+
export const STATE_PATCH_EXAMPLE_JSON = [
|
|
10
|
+
'```json',
|
|
11
|
+
'{',
|
|
12
|
+
' "state_patch": { "key": "new_value", "obsolete_key": null },',
|
|
13
|
+
' "action": "your_action_here"',
|
|
14
|
+
'}',
|
|
15
|
+
'```',
|
|
16
|
+
].join('\n');
|
|
17
|
+
/** Canonical sparse-patch rules: null deletes, omissions leave state unchanged. */
|
|
18
|
+
export const STATE_PATCH_RULES = 'In `state_patch`, set keys to null to delete them. Only include fields you want to change. Omit fields to leave them unchanged.';
|
|
19
|
+
/**
|
|
20
|
+
* The reasoning-is-discarded persistence bullet (paper §3.2, §4): any fact
|
|
21
|
+
* that must survive belongs in `state_patch`, never in the conversation.
|
|
22
|
+
*/
|
|
23
|
+
export const REASONING_DISCARDED_NOTE = 'Reasoning is discarded after execution — put anything you need to persist into `state_patch`.';
|
|
24
|
+
/**
|
|
25
|
+
* The full numbered response contract: reasoning is discarded (paper §3.2),
|
|
26
|
+
* the JSON block carries exactly the two keys, and the patch follows the
|
|
27
|
+
* sparse ⊕ semantics. Includes the example block and the rules — no lead-in.
|
|
28
|
+
*/
|
|
29
|
+
export const STATE_PATCH_CONTRACT = [
|
|
30
|
+
'1. Step-by-step reasoning (will be discarded after execution)',
|
|
31
|
+
`2. ${STATE_PATCH_CONTRACT_HEADER}`,
|
|
32
|
+
'',
|
|
33
|
+
STATE_PATCH_EXAMPLE_JSON,
|
|
34
|
+
'',
|
|
35
|
+
STATE_PATCH_RULES,
|
|
36
|
+
].join('\n');
|
|
37
|
+
/**
|
|
38
|
+
* The single history-unreliability hint appended to the additionalContext
|
|
39
|
+
* of every inject-style hook script (claude + codex alike). Names the MCP
|
|
40
|
+
* tools AND the fenced ```json state_patch channel — one text for all
|
|
41
|
+
* hosts, so the Bash-carried patch option can no longer drift away.
|
|
42
|
+
*/
|
|
43
|
+
export const HISTORY_UNRELIABLE_NOTE = '\nHistory is not reliable. Persist anything you need via the skillstate MCP tools (state.summary / state.patch) or a fenced ```json state_patch block.';
|
|
44
|
+
/**
|
|
45
|
+
* The interrupted-session hint injected by the SessionStart hooks
|
|
46
|
+
* (claude + codex alike) when the session-meta sidecar carries
|
|
47
|
+
* `status: "interrupted"` — a previous run of this session was killed
|
|
48
|
+
* (SIGINT/SIGTERM) mid-procedure. The hook appends the preserved state
|
|
49
|
+
* path so the agent can review progress/blockers before continuing.
|
|
50
|
+
* A fresh launch overwrites the status back to `running`.
|
|
51
|
+
*/
|
|
52
|
+
export const INTERRUPTED_SESSION_NOTE = '\nPrevious session was interrupted; state preserved at <path>; review progress/blockers before continuing.';
|
|
53
|
+
/**
|
|
54
|
+
* Render a state schema as the shared `## Schema` markdown block used by
|
|
55
|
+
* every prompt formatter and adapter `injectState`. Fields without a
|
|
56
|
+
* description fall back to "no description".
|
|
57
|
+
*/
|
|
58
|
+
export function describeSchema(schema) {
|
|
59
|
+
const fields = Object.entries(schema)
|
|
60
|
+
.map(([name, field]) => `- ${name} (${field.type}): ${field.description ?? 'no description'}`)
|
|
61
|
+
.join('\n');
|
|
62
|
+
return `## Schema\n${fields}`;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Generate the whole SKILL.md document shared by the hook-wiring adapters
|
|
66
|
+
* (claude, codex): identical frontmatter, Execution Context, and Process
|
|
67
|
+
* sections; the ONLY brand-specific parts are `hostLabel` (hooks intro)
|
|
68
|
+
* and `injectionPhrase` (how the state reaches the model). OpenCode keeps
|
|
69
|
+
* its own body — its history is trimmed by the plugin, not by hooks, so
|
|
70
|
+
* its Execution Context and Process genuinely differ.
|
|
71
|
+
*/
|
|
72
|
+
export function skillMdBody(options) {
|
|
73
|
+
const resolvedStatePath = options.statePath ?? './.skillstate/skillstate.json';
|
|
74
|
+
return [
|
|
75
|
+
'---',
|
|
76
|
+
`name: ${JSON.stringify(options.spec.name)}`,
|
|
77
|
+
`description: ${JSON.stringify(options.spec.instructions)}`,
|
|
78
|
+
`version: ${options.spec.version}`,
|
|
79
|
+
'execution_context:',
|
|
80
|
+
` state_path: ${resolvedStatePath}`,
|
|
81
|
+
' format: json',
|
|
82
|
+
'---',
|
|
83
|
+
'',
|
|
84
|
+
`# ${options.spec.name}`,
|
|
85
|
+
'',
|
|
86
|
+
options.spec.instructions,
|
|
87
|
+
'',
|
|
88
|
+
'## Execution Context',
|
|
89
|
+
'',
|
|
90
|
+
`Your execution state lives at \`${resolvedStatePath}\` (per project; a`,
|
|
91
|
+
'session started in $HOME uses `~/.skillstate/global/skillstate.json`).',
|
|
92
|
+
`The skillstate ${options.hostLabel} hooks:`,
|
|
93
|
+
'',
|
|
94
|
+
`- the CURRENT state is ${options.injectionPhrase} on every prompt submit`,
|
|
95
|
+
' (`UserPromptSubmit`) and is re-injected after compaction',
|
|
96
|
+
' (`SessionStart` matcher `^compact$`);',
|
|
97
|
+
'- watch every Bash tool result and merge a fenced ```json block carrying',
|
|
98
|
+
' a `state_patch` into the state file (`PostToolUse`).',
|
|
99
|
+
'',
|
|
100
|
+
'Sub-agents automatically get isolated state copies (agents/<session-id>);',
|
|
101
|
+
'merge them with `agent.merge` when their task completes.',
|
|
102
|
+
'',
|
|
103
|
+
'The injected state is authoritative — history is not reliable. Never',
|
|
104
|
+
'reconstruct execution context from the conversation.',
|
|
105
|
+
'',
|
|
106
|
+
'## Process',
|
|
107
|
+
'',
|
|
108
|
+
'1. Orient yourself: read the injected state, or call the skillstate MCP',
|
|
109
|
+
' tools `state.summary` (compact) / `state.get` (full dump).',
|
|
110
|
+
'2. Observe the result of your last action.',
|
|
111
|
+
'3. Reason about what to do next, given the state and the observation.',
|
|
112
|
+
'4. Persist progress with the skillstate MCP tool `state.patch` (sparse',
|
|
113
|
+
' patch; set a key to `null` to delete it; dry-run first with',
|
|
114
|
+
' `state.validate` when unsure; `state.diff` shows what changed since',
|
|
115
|
+
' your last look), and/or emit a fenced JSON block with exactly two',
|
|
116
|
+
' keys inside a Bash tool call so the `PostToolUse` hook merges it:',
|
|
117
|
+
'',
|
|
118
|
+
STATE_PATCH_EXAMPLE_JSON,
|
|
119
|
+
'',
|
|
120
|
+
`- ${STATE_PATCH_RULES}`,
|
|
121
|
+
'- Put anything you need to survive into `state_patch`; never rely on',
|
|
122
|
+
' the conversation remembering it.',
|
|
123
|
+
'- `action` names what you will do next (e.g. "continue", "done").',
|
|
124
|
+
'- When the task is done, call state.finalize {status:"completed"} so the',
|
|
125
|
+
' orchestrator knows (state.finalize {status:"failed"} on failure).',
|
|
126
|
+
'',
|
|
127
|
+
].join('\n');
|
|
128
|
+
}
|
|
129
|
+
//# sourceMappingURL=prompt-contract.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompt-contract.js","sourceRoot":"","sources":["../src/prompt-contract.ts"],"names":[],"mappings":"AAcA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,GACtC,iHAAiH,CAAC;AAEpH,uEAAuE;AACvE,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,SAAS;IACT,GAAG;IACH,gEAAgE;IAChE,gCAAgC;IAChC,GAAG;IACH,KAAK;CACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,mFAAmF;AACnF,MAAM,CAAC,MAAM,iBAAiB,GAC5B,iIAAiI,CAAC;AAEpI;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GACnC,+FAA+F,CAAC;AAElG;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,+DAA+D;IAC/D,MAAM,2BAA2B,EAAE;IACnC,EAAE;IACF,wBAAwB;IACxB,EAAE;IACF,iBAAiB;CAClB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb;;;;;GAKG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAClC,wJAAwJ,CAAC;AAE3J;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,wBAAwB,GACnC,4GAA4G,CAAC;AAE/G;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,MAAmB;IAChD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAClC,GAAG,CACF,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAChB,KAAK,IAAI,KAAK,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,WAAW,IAAI,gBAAgB,EAAE,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO,cAAc,MAAM,EAAE,CAAC;AAChC,CAAC;AAkBD;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CAAC,OAA2B;IACrD,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,IAAI,+BAA+B,CAAC;IAC/E,OAAO;QACL,KAAK;QACL,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,gBAAgB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;QAC3D,YAAY,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;QAClC,oBAAoB;QACpB,iBAAiB,iBAAiB,EAAE;QACpC,gBAAgB;QAChB,KAAK;QACL,EAAE;QACF,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;QACxB,EAAE;QACF,OAAO,CAAC,IAAI,CAAC,YAAY;QACzB,EAAE;QACF,sBAAsB;QACtB,EAAE;QACF,mCAAmC,iBAAiB,oBAAoB;QACxE,wEAAwE;QACxE,kBAAkB,OAAO,CAAC,SAAS,SAAS;QAC5C,EAAE;QACF,0BAA0B,OAAO,CAAC,eAAe,yBAAyB;QAC1E,4DAA4D;QAC5D,yCAAyC;QACzC,0EAA0E;QAC1E,wDAAwD;QACxD,EAAE;QACF,2EAA2E;QAC3E,0DAA0D;QAC1D,EAAE;QACF,sEAAsE;QACtE,sDAAsD;QACtD,EAAE;QACF,YAAY;QACZ,EAAE;QACF,yEAAyE;QACzE,+DAA+D;QAC/D,4CAA4C;QAC5C,uEAAuE;QACvE,wEAAwE;QACxE,gEAAgE;QAChE,wEAAwE;QACxE,sEAAsE;QACtE,sEAAsE;QACtE,EAAE;QACF,wBAAwB;QACxB,EAAE;QACF,KAAK,iBAAiB,EAAE;QACxB,sEAAsE;QACtE,oCAAoC;QACpC,mEAAmE;QACnE,0EAA0E;QAC1E,qEAAqE;QACrE,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}
|
|
@@ -98,9 +98,5 @@ export declare class PromptTransformer {
|
|
|
98
98
|
serializeState(state: SkillState, options?: {
|
|
99
99
|
pretty?: boolean;
|
|
100
100
|
}, schema?: StateSchema): string;
|
|
101
|
-
/**
|
|
102
|
-
* Describe the schema fields for inclusion in prompts.
|
|
103
|
-
*/
|
|
104
|
-
private describeSchema;
|
|
105
101
|
}
|
|
106
102
|
//# sourceMappingURL=prompt-transformer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-transformer.d.ts","sourceRoot":"","sources":["../src/prompt-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,WAAW,EACZ,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"prompt-transformer.d.ts","sourceRoot":"","sources":["../src/prompt-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,WAAW,EACZ,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,GAC1B,UAAU,GACV,gBAAgB,GAChB,qBAAqB,GACrB,gBAAgB,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAC3B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC/C;IACE,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAMN;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAoC;IAEpD,YAAY,OAAO,CAAC,EAAE,wBAAwB,EAE7C;IAED;;;;;OAKG;IACH,YAAY,CACV,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,EACxB,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,GAC3C,MAAM,CASR;IAED;;;;;OAKG;IACH,eAAe,CACb,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,GACvB,MAAM,CAyBR;IAED;;;;OAIG;IACH,iBAAiB,CACf,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,GACvB,MAAM,CAkBR;IAED;;;;;;;;;OASG;IACH,WAAW,CACT,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,GACvB,MAAM,CAmBR;IAED;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IA2BrB;;OAEG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAGrD;IAED;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG7C;IAED;;;;;;;OAOG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,mBAAmB,CA2CnD;IAMD;;;;;OAKG;IACH,cAAc,CACZ,KAAK,EAAE,UAAU,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,EAC9B,MAAM,CAAC,EAAE,WAAW,GACnB,MAAM,CAcR;CACF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { STATE_PATCH_CONTRACT, describeSchema } from './prompt-contract.js';
|
|
1
2
|
function isPlainObject(value) {
|
|
2
3
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
3
4
|
}
|
|
@@ -38,7 +39,7 @@ export class PromptTransformer {
|
|
|
38
39
|
*/
|
|
39
40
|
formatForClaude(spec, state, observation) {
|
|
40
41
|
const stateJson = this.serializeState(state, undefined, spec.schema);
|
|
41
|
-
const schemaDesc =
|
|
42
|
+
const schemaDesc = describeSchema(spec.schema);
|
|
42
43
|
return `# System
|
|
43
44
|
|
|
44
45
|
You are ${spec.name}. ${spec.instructions}
|
|
@@ -59,17 +60,7 @@ ${observation.content}
|
|
|
59
60
|
|
|
60
61
|
Based on the observation and your current state, provide your response with:
|
|
61
62
|
|
|
62
|
-
|
|
63
|
-
2. A JSON block containing both your State Patch and your Action. The JSON block MUST have exactly these two keys:
|
|
64
|
-
|
|
65
|
-
\`\`\`json
|
|
66
|
-
{
|
|
67
|
-
"state_patch": { "key": "new_value", "obsolete_key": null },
|
|
68
|
-
"action": "your_action_here"
|
|
69
|
-
}
|
|
70
|
-
\`\`\`
|
|
71
|
-
|
|
72
|
-
In \`state_patch\`, set keys to null to delete them. Only include fields you want to change. Omit fields to leave them unchanged.`;
|
|
63
|
+
${STATE_PATCH_CONTRACT}`;
|
|
73
64
|
}
|
|
74
65
|
/**
|
|
75
66
|
* OpenCode-specific prompt format adapted for the opencode skill system.
|
|
@@ -78,7 +69,7 @@ In \`state_patch\`, set keys to null to delete them. Only include fields you wan
|
|
|
78
69
|
*/
|
|
79
70
|
formatForOpenCode(spec, state, observation) {
|
|
80
71
|
const stateJson = this.serializeState(state, undefined, spec.schema);
|
|
81
|
-
const schemaDesc =
|
|
72
|
+
const schemaDesc = describeSchema(spec.schema);
|
|
82
73
|
return `<skill name="${spec.id}">
|
|
83
74
|
<instructions>${spec.instructions}</instructions>
|
|
84
75
|
${schemaDesc}
|
|
@@ -90,16 +81,9 @@ ${observation.content}
|
|
|
90
81
|
</observation>
|
|
91
82
|
</skill>
|
|
92
83
|
|
|
93
|
-
Respond with
|
|
94
|
-
|
|
95
|
-
\`\`\`json
|
|
96
|
-
{
|
|
97
|
-
"state_patch": { "key": "new_value", "obsolete_key": null },
|
|
98
|
-
"action": "action_name"
|
|
99
|
-
}
|
|
100
|
-
\`\`\`
|
|
84
|
+
Respond with:
|
|
101
85
|
|
|
102
|
-
|
|
86
|
+
${STATE_PATCH_CONTRACT}`;
|
|
103
87
|
}
|
|
104
88
|
/**
|
|
105
89
|
* Paper-exact prompt format — byte-verbatim Appendix A.4.
|
|
@@ -138,7 +122,7 @@ Provide your response with:
|
|
|
138
122
|
*/
|
|
139
123
|
formatGeneric(spec, state, observation) {
|
|
140
124
|
const stateJson = this.serializeState(state, undefined, spec.schema);
|
|
141
|
-
const schemaDesc =
|
|
125
|
+
const schemaDesc = describeSchema(spec.schema);
|
|
142
126
|
return `${spec.instructions}
|
|
143
127
|
|
|
144
128
|
${schemaDesc}
|
|
@@ -155,17 +139,7 @@ ${observation.content}
|
|
|
155
139
|
|
|
156
140
|
Provide your response with:
|
|
157
141
|
|
|
158
|
-
|
|
159
|
-
2. A JSON block containing both your State Patch and your Action. The JSON block MUST have exactly these two keys:
|
|
160
|
-
|
|
161
|
-
\`\`\`json
|
|
162
|
-
{
|
|
163
|
-
"state_patch": { "key": "value", "obsolete_key": null },
|
|
164
|
-
"action": "action_name"
|
|
165
|
-
}
|
|
166
|
-
\`\`\`
|
|
167
|
-
|
|
168
|
-
In \`state_patch\`, set keys to null to delete them.`;
|
|
142
|
+
${STATE_PATCH_CONTRACT}`;
|
|
169
143
|
}
|
|
170
144
|
/**
|
|
171
145
|
* Extract the state_patch from an LLM response containing a fenced JSON block.
|
|
@@ -252,14 +226,5 @@ In \`state_patch\`, set keys to null to delete them.`;
|
|
|
252
226
|
}
|
|
253
227
|
return JSON.stringify(toSerialize);
|
|
254
228
|
}
|
|
255
|
-
/**
|
|
256
|
-
* Describe the schema fields for inclusion in prompts.
|
|
257
|
-
*/
|
|
258
|
-
describeSchema(schema) {
|
|
259
|
-
const fields = Object.entries(schema)
|
|
260
|
-
.map(([name, field]) => `- ${name} (${field.type}): ${field.description ?? 'no description'}`)
|
|
261
|
-
.join('\n');
|
|
262
|
-
return `## Schema\n${fields}`;
|
|
263
|
-
}
|
|
264
229
|
}
|
|
265
230
|
//# sourceMappingURL=prompt-transformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-transformer.js","sourceRoot":"","sources":["../src/prompt-transformer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prompt-transformer.js","sourceRoot":"","sources":["../src/prompt-transformer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA+B5E,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAiB;IACpB,QAAQ,CAAoC;IAEpD,YAAY,OAAkC;QAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,SAAS,CAAC;IACjD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CACV,IAAoB,EACpB,KAAiB,EACjB,WAAwB,EACxB,QAA4C;QAE5C,MAAM,CAAC,GAAG,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;QACpC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;;;;OAKG;IACH,eAAe,CACb,IAAoB,EACpB,KAAiB,EACjB,WAAwB;QAExB,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE/C,OAAO;;UAED,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,YAAY;;EAEvC,UAAU;;;;;EAKV,SAAS;;;;;EAKT,WAAW,CAAC,OAAO;;;;;;EAMnB,oBAAoB,EAAE,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CACf,IAAoB,EACpB,KAAiB,EACjB,WAAwB;QAExB,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE/C,OAAO,gBAAgB,IAAI,CAAC,EAAE;gBAClB,IAAI,CAAC,YAAY;EAC/B,UAAU;;EAEV,SAAS;;;EAGT,WAAW,CAAC,OAAO;;;;;;EAMnB,oBAAoB,EAAE,CAAC;IACvB,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW,CACT,IAAoB,EACpB,KAAiB,EACjB,WAAwB;QAExB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAExC,OAAO;;EAET,IAAI,CAAC,YAAY;;;;;EAKjB,SAAS;;sBAEW,WAAW,CAAC,OAAO;;;;;;oRAM2O,CAAC;IACnR,CAAC;IAED;;;;;OAKG;IACK,aAAa,CACnB,IAAoB,EACpB,KAAiB,EACjB,WAAwB;QAExB,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE/C,OAAO,GAAG,IAAI,CAAC,YAAY;;EAE7B,UAAU;;;;EAIV,SAAS;;;;EAIT,WAAW,CAAC,OAAO;;;;;;EAMnB,oBAAoB,EAAE,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,QAAgB;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,QAAgB;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED;;;;;;;OAOG;IACH,aAAa,CAAC,QAAgB;QAC5B,iCAAiC;QACjC,EAAE;QACF,mEAAmE;QACnE,sEAAsE;QACtE,kEAAkE;QAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QAC3C,CAAC;QAED,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gEAAgE;YAChE,uCAAuC;YACvC,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,gBAAgB;gBACxB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;aACtB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,4DAA4D;YAC5D,4BAA4B;YAC5B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;QACtD,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAEnD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;QACtD,CAAC;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QACjD,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAwB,EAAE,MAAM,EAAE,CAAC;IAC/D,CAAC;IAED,wEAAwE;IACxE,yEAAyE;IACzE,wEAAwE;IAExE;;;;;OAKG;IACH,cAAc,CACZ,KAAiB,EACjB,OAA8B,EAC9B,MAAoB;QAEpB,IAAI,WAAW,GAAe,KAAK,CAAC;QACpC,IAAI,MAAM,EAAE,CAAC;YACX,WAAW,GAAG,EAAE,CAAC;YACjB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrC,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;oBAClB,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/** Every lifecycle status the session meta sidecar may carry. */
|
|
2
|
+
export type SessionStatus = 'running' | 'interrupted' | 'completed' | 'merged' | 'failed';
|
|
3
|
+
/** All {@link SessionStatus} values. */
|
|
4
|
+
export declare const SESSION_STATUSES: readonly ["running", "interrupted", "completed", "merged", "failed"];
|
|
5
|
+
/** Sidecar file name living next to every state file. */
|
|
6
|
+
export declare const SESSION_META_FILE = ".session-meta.json";
|
|
7
|
+
/**
|
|
8
|
+
* A `running` session whose `lastActivityAt` is older than this (5 min)
|
|
9
|
+
* reports `stale` — the provider process died without a signal.
|
|
10
|
+
*/
|
|
11
|
+
export declare const STALE_MS: number;
|
|
12
|
+
/** Session lifecycle metadata (the sidecar's JSON body). */
|
|
13
|
+
export interface SessionMeta {
|
|
14
|
+
status?: SessionStatus;
|
|
15
|
+
/** ISO timestamp of the last state write (debounced to 5s by MCP). */
|
|
16
|
+
lastActivityAt?: string;
|
|
17
|
+
/** ISO timestamp stamped by `launch()` when the session starts. */
|
|
18
|
+
startedAt?: string;
|
|
19
|
+
/** ISO timestamp stamped by `state.finalize`. */
|
|
20
|
+
finishedAt?: string;
|
|
21
|
+
/** ISO timestamp stamped by `agent.merge` on the sub-agent copy. */
|
|
22
|
+
mergedAt?: string;
|
|
23
|
+
/** Free-text result carried by `state.finalize`. */
|
|
24
|
+
result?: string;
|
|
25
|
+
/** Sanitized agent scope the session runs under (`''` = main). */
|
|
26
|
+
agentId?: string;
|
|
27
|
+
/** MCP protocol revision the server session speaks. */
|
|
28
|
+
protocolVersion?: string;
|
|
29
|
+
/** Tolerated: unknown extra fields survive read/merge round-trips. */
|
|
30
|
+
[key: string]: unknown;
|
|
31
|
+
}
|
|
32
|
+
/** Sidecar path for a state directory: `<dir>/.session-meta.json`. */
|
|
33
|
+
export declare function sessionMetaPath(dir: string): string;
|
|
34
|
+
/**
|
|
35
|
+
* Read the session meta sidecar for `dir`. Returns `null` when the file
|
|
36
|
+
* is missing, unreadable, corrupt, or not a JSON object — callers treat
|
|
37
|
+
* that as "no lifecycle marker" (staleness `orphan`), never a crash.
|
|
38
|
+
*/
|
|
39
|
+
export declare function readSessionMeta(dir: string): SessionMeta | null;
|
|
40
|
+
/**
|
|
41
|
+
* Merge `patch` into the session meta sidecar for `dir` and persist it
|
|
42
|
+
* atomically under the meta lock (`<metaPath>.lock`). Creates the file
|
|
43
|
+
* (and the directory) when absent; unknown existing fields survive.
|
|
44
|
+
* Returns the merged meta as written.
|
|
45
|
+
*/
|
|
46
|
+
export declare function writeSessionMeta(dir: string, patch: Partial<SessionMeta>): Promise<SessionMeta>;
|
|
47
|
+
/** Staleness verdict for an agent session (see the module doc). */
|
|
48
|
+
export type SessionStaleness = 'active' | 'stale' | 'orphan';
|
|
49
|
+
/**
|
|
50
|
+
* Classify a session's liveness from its meta:
|
|
51
|
+
* `orphan` — no/corrupt meta; `stale` — status `running` but the last
|
|
52
|
+
* activity (falling back to `startedAt`) is older than {@link STALE_MS};
|
|
53
|
+
* `active` — everything else (fresh running sessions AND terminal
|
|
54
|
+
* statuses: completed/failed/merged/interrupted runs are not stale, their
|
|
55
|
+
* `status` already says so).
|
|
56
|
+
*/
|
|
57
|
+
export declare function sessionStaleness(meta: SessionMeta | null, nowMs?: number): SessionStaleness;
|
|
58
|
+
//# sourceMappingURL=session-meta.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-meta.d.ts","sourceRoot":"","sources":["../src/session-meta.ts"],"names":[],"mappings":"AA8BA,iEAAiE;AACjE,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE1F,wCAAwC;AACxC,eAAO,MAAM,gBAAgB,sEAMgB,CAAC;AAE9C,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,QAAQ,QAAgB,CAAC;AAEtC,4DAA4D;AAC5D,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,sEAAsE;IACtE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mEAAmE;IACnE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAU/D;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,GAC1B,OAAO,CAAC,WAAW,CAAC,CAQtB;AAED,mEAAmE;AACnE,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE7D;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,KAAK,GAAE,MAAmB,GACzB,gBAAgB,CAWlB"}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @non-paper Session lifecycle marker (release 2.3.0).
|
|
3
|
+
*
|
|
4
|
+
* The state envelope (`<stateDir>/skillstate.json`) belongs to the
|
|
5
|
+
* PROCEDURE (paper §3.2) — the agent's data, nothing else. The session
|
|
6
|
+
* lifecycle is ORCHESTRATION metadata and lives in a separate sidecar:
|
|
7
|
+
* `<stateDir>/.session-meta.json`, written with `atomicWriteFile` under
|
|
8
|
+
* the same cross-process `withStateLock` primitive (its own lock file,
|
|
9
|
+
* `<metaPath>.lock` — never the state lock, so meta writes cannot
|
|
10
|
+
* deadlock against state writes).
|
|
11
|
+
*
|
|
12
|
+
* Statuses:
|
|
13
|
+
* - `running` — a live session (MCP `launch()` stamps it at start);
|
|
14
|
+
* - `interrupted` — SIGINT/SIGTERM hit the server before a final status
|
|
15
|
+
* (the interrupt handler flushes this + the diff baseline);
|
|
16
|
+
* - `completed` / `failed` — the agent called MCP `state.finalize`;
|
|
17
|
+
* - `merged` — the orchestrator folded the sub-agent state into the main
|
|
18
|
+
* state via `agent.merge`.
|
|
19
|
+
*
|
|
20
|
+
* STALE DETECTION: a `running` meta whose `lastActivityAt` is older than
|
|
21
|
+
* {@link STALE_MS} (5 min) is `stale` (the provider died without a
|
|
22
|
+
* signal); missing/corrupt meta next to an existing state file is
|
|
23
|
+
* `orphan`. Everything else is `active`.
|
|
24
|
+
*
|
|
25
|
+
* Zero dependencies, Node >= 20, ESM.
|
|
26
|
+
*/
|
|
27
|
+
import * as fs from 'node:fs';
|
|
28
|
+
import * as path from 'node:path';
|
|
29
|
+
import { atomicWriteFile, withStateLock } from './atomic-write.js';
|
|
30
|
+
/** All {@link SessionStatus} values. */
|
|
31
|
+
export const SESSION_STATUSES = [
|
|
32
|
+
'running',
|
|
33
|
+
'interrupted',
|
|
34
|
+
'completed',
|
|
35
|
+
'merged',
|
|
36
|
+
'failed',
|
|
37
|
+
];
|
|
38
|
+
/** Sidecar file name living next to every state file. */
|
|
39
|
+
export const SESSION_META_FILE = '.session-meta.json';
|
|
40
|
+
/**
|
|
41
|
+
* A `running` session whose `lastActivityAt` is older than this (5 min)
|
|
42
|
+
* reports `stale` — the provider process died without a signal.
|
|
43
|
+
*/
|
|
44
|
+
export const STALE_MS = 5 * 60 * 1000;
|
|
45
|
+
/** Sidecar path for a state directory: `<dir>/.session-meta.json`. */
|
|
46
|
+
export function sessionMetaPath(dir) {
|
|
47
|
+
return path.join(dir, SESSION_META_FILE);
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Read the session meta sidecar for `dir`. Returns `null` when the file
|
|
51
|
+
* is missing, unreadable, corrupt, or not a JSON object — callers treat
|
|
52
|
+
* that as "no lifecycle marker" (staleness `orphan`), never a crash.
|
|
53
|
+
*/
|
|
54
|
+
export function readSessionMeta(dir) {
|
|
55
|
+
try {
|
|
56
|
+
const parsed = JSON.parse(fs.readFileSync(sessionMetaPath(dir), 'utf-8'));
|
|
57
|
+
if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
|
|
58
|
+
return parsed;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
// Missing or corrupt sidecar — no lifecycle marker.
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Merge `patch` into the session meta sidecar for `dir` and persist it
|
|
68
|
+
* atomically under the meta lock (`<metaPath>.lock`). Creates the file
|
|
69
|
+
* (and the directory) when absent; unknown existing fields survive.
|
|
70
|
+
* Returns the merged meta as written.
|
|
71
|
+
*/
|
|
72
|
+
export async function writeSessionMeta(dir, patch) {
|
|
73
|
+
const metaPath = sessionMetaPath(dir);
|
|
74
|
+
return withStateLock(metaPath, async () => {
|
|
75
|
+
const current = readSessionMeta(dir);
|
|
76
|
+
const merged = { ...(current ?? {}), ...patch };
|
|
77
|
+
await atomicWriteFile(metaPath, `${JSON.stringify(merged, null, 2)}\n`);
|
|
78
|
+
return merged;
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Classify a session's liveness from its meta:
|
|
83
|
+
* `orphan` — no/corrupt meta; `stale` — status `running` but the last
|
|
84
|
+
* activity (falling back to `startedAt`) is older than {@link STALE_MS};
|
|
85
|
+
* `active` — everything else (fresh running sessions AND terminal
|
|
86
|
+
* statuses: completed/failed/merged/interrupted runs are not stale, their
|
|
87
|
+
* `status` already says so).
|
|
88
|
+
*/
|
|
89
|
+
export function sessionStaleness(meta, nowMs = Date.now()) {
|
|
90
|
+
if (meta === null) {
|
|
91
|
+
return 'orphan';
|
|
92
|
+
}
|
|
93
|
+
if (meta.status === 'running') {
|
|
94
|
+
const last = Date.parse(meta.lastActivityAt ?? meta.startedAt ?? '');
|
|
95
|
+
if (Number.isNaN(last) || nowMs - last > STALE_MS) {
|
|
96
|
+
return 'stale';
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return 'active';
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=session-meta.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-meta.js","sourceRoot":"","sources":["../src/session-meta.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKnE,wCAAwC;AACxC,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,SAAS;IACT,aAAa;IACb,WAAW;IACX,QAAQ;IACR,QAAQ;CACmC,CAAC;AAE9C,yDAAyD;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC;AAEtD;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAuBtC,sEAAsE;AACtE,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACnF,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5E,OAAO,MAAqB,CAAC;QAC/B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,oDAAoD;IACtD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,KAA2B;IAE3B,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACtC,OAAO,aAAa,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,MAAM,GAAgB,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC;QAC7D,MAAM,eAAe,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAKD;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAwB,EACxB,KAAK,GAAW,IAAI,CAAC,GAAG,EAAE;IAE1B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACrE,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,GAAG,QAAQ,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-manager.d.ts","sourceRoot":"","sources":["../src/state-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,WAAW,EAEX,gBAAgB,EACjB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"state-manager.d.ts","sourceRoot":"","sources":["../src/state-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,WAAW,EAEX,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAOpB,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,EACnB,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAC9B,UAAU,CAWZ;AAkBD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAE3E;AAyBD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,GAChB,gBAAgB,CAkBlB;AAMD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,UAAU,EACjB,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7B,MAAM,CAKR;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAEzD;AAMD,qBAAa,YAAY;IACvB,MAAM,CAAC,kBAAkB,4BAAsB;IAC/C,MAAM,CAAC,UAAU,oBAAc;IAC/B,MAAM,CAAC,aAAa,uBAAiB;IACrC,MAAM,CAAC,cAAc,wBAAkB;IACvC,MAAM,CAAC,gBAAgB,0BAAoB;CAC5C;AAMD,wBAAgB,kBAAkB;;;;;;EAQjC"}
|
package/dist/state-manager.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { mergePatch } from './hook-runtime.js';
|
|
1
2
|
// ---------------------------------------------------------------------------
|
|
2
3
|
// 1. createInitialState — Σ₀ from schema defaults + optional overrides
|
|
3
4
|
// ---------------------------------------------------------------------------
|
|
@@ -19,41 +20,16 @@ export function createInitialState(schema, overrides) {
|
|
|
19
20
|
// - null values DELETE the key entirely
|
|
20
21
|
// - Nested dicts are merged recursively
|
|
21
22
|
// - Original state is NOT mutated
|
|
23
|
+
//
|
|
24
|
+
// Delegates to the hook-runtime {@link mergePatch} — the single ⊕
|
|
25
|
+
// implementation shared with the generated hook scripts and the
|
|
26
|
+
// OpenCode plugin (one merge semantics everywhere).
|
|
22
27
|
// ---------------------------------------------------------------------------
|
|
23
28
|
function isPlainObject(value) {
|
|
24
29
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
25
30
|
}
|
|
26
31
|
export function mergeState(state, patch) {
|
|
27
|
-
|
|
28
|
-
for (const [key, value] of Object.entries(patch)) {
|
|
29
|
-
if (value === null) {
|
|
30
|
-
delete result[key];
|
|
31
|
-
}
|
|
32
|
-
else if (isPlainObject(value) && isPlainObject(result[key])) {
|
|
33
|
-
// Recursive merge for nested objects — apply null-deletion inside too
|
|
34
|
-
result[key] = mergeNestedObjects(result[key], value);
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
result[key] = value;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
return result;
|
|
41
|
-
}
|
|
42
|
-
/** Deep merge two plain objects with null-deletion semantics. */
|
|
43
|
-
function mergeNestedObjects(base, patch) {
|
|
44
|
-
const result = { ...base };
|
|
45
|
-
for (const [key, value] of Object.entries(patch)) {
|
|
46
|
-
if (value === null) {
|
|
47
|
-
delete result[key];
|
|
48
|
-
}
|
|
49
|
-
else if (isPlainObject(value) && isPlainObject(result[key])) {
|
|
50
|
-
result[key] = mergeNestedObjects(result[key], value);
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
result[key] = value;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
return result;
|
|
32
|
+
return mergePatch(state, patch);
|
|
57
33
|
}
|
|
58
34
|
// ---------------------------------------------------------------------------
|
|
59
35
|
// 3. validatePatch — reject unknown keys, wrong types; accept null for deletion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-manager.js","sourceRoot":"","sources":["../src/state-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state-manager.js","sourceRoot":"","sources":["../src/state-manager.ts"],"names":[],"mappings":"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"}
|