@jungjaehoon/mama-os 0.31.4 → 0.32.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/agent/agent-loop.d.ts.map +1 -1
- package/dist/agent/agent-loop.js +55 -1
- package/dist/agent/agent-loop.js.map +1 -1
- package/dist/agent/claude-cli-wrapper.d.ts +2 -17
- package/dist/agent/claude-cli-wrapper.d.ts.map +1 -1
- package/dist/agent/claude-cli-wrapper.js.map +1 -1
- package/dist/agent/code-act/completed-terminal-result.d.ts +5 -0
- package/dist/agent/code-act/completed-terminal-result.d.ts.map +1 -0
- package/dist/agent/code-act/completed-terminal-result.js +83 -0
- package/dist/agent/code-act/completed-terminal-result.js.map +1 -0
- package/dist/agent/code-act/host-bridge.d.ts +1 -0
- package/dist/agent/code-act/host-bridge.d.ts.map +1 -1
- package/dist/agent/code-act/host-bridge.js +66 -23
- package/dist/agent/code-act/host-bridge.js.map +1 -1
- package/dist/agent/code-act/run-context-registry.d.ts +36 -0
- package/dist/agent/code-act/run-context-registry.d.ts.map +1 -0
- package/dist/agent/code-act/run-context-registry.js +143 -0
- package/dist/agent/code-act/run-context-registry.js.map +1 -0
- package/dist/agent/gateway-tool-executor.d.ts.map +1 -1
- package/dist/agent/gateway-tool-executor.js +63 -3
- package/dist/agent/gateway-tool-executor.js.map +1 -1
- package/dist/agent/gateway-tools.md +2 -2
- package/dist/agent/model-runner.d.ts +6 -18
- package/dist/agent/model-runner.d.ts.map +1 -1
- package/dist/agent/model-runner.js +3 -1
- package/dist/agent/model-runner.js.map +1 -1
- package/dist/agent/persistent-cli-adapter.d.ts +3 -10
- package/dist/agent/persistent-cli-adapter.d.ts.map +1 -1
- package/dist/agent/persistent-cli-adapter.js +73 -2
- package/dist/agent/persistent-cli-adapter.js.map +1 -1
- package/dist/agent/persistent-cli-process.d.ts +21 -16
- package/dist/agent/persistent-cli-process.d.ts.map +1 -1
- package/dist/agent/persistent-cli-process.js +275 -29
- package/dist/agent/persistent-cli-process.js.map +1 -1
- package/dist/agent/tool-registry.d.ts.map +1 -1
- package/dist/agent/tool-registry.js +2 -2
- package/dist/agent/tool-registry.js.map +1 -1
- package/dist/agent/types.d.ts +44 -1
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/agent/types.js +31 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/api/graph-api-types.d.ts +8 -0
- package/dist/api/graph-api-types.d.ts.map +1 -1
- package/dist/api/graph-api.d.ts.map +1 -1
- package/dist/api/graph-api.js +14 -0
- package/dist/api/graph-api.js.map +1 -1
- package/dist/cli/commands/start.d.ts +5 -1
- package/dist/cli/commands/start.d.ts.map +1 -1
- package/dist/cli/commands/start.js +22 -3
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/runtime/code-act-executor.d.ts +14 -0
- package/dist/cli/runtime/code-act-executor.d.ts.map +1 -0
- package/dist/cli/runtime/code-act-executor.js +103 -0
- package/dist/cli/runtime/code-act-executor.js.map +1 -0
- package/dist/envelope/enforcer.d.ts.map +1 -1
- package/dist/envelope/enforcer.js +9 -1
- package/dist/envelope/enforcer.js.map +1 -1
- package/dist/mcp/code-act-api-client.d.ts +12 -0
- package/dist/mcp/code-act-api-client.d.ts.map +1 -1
- package/dist/mcp/code-act-api-client.js.map +1 -1
- package/dist/mcp/code-act-server.js +9 -27
- package/dist/mcp/code-act-server.js.map +1 -1
- package/dist/mcp/code-act-terminal-transport.d.ts +27 -0
- package/dist/mcp/code-act-terminal-transport.d.ts.map +1 -1
- package/dist/mcp/code-act-terminal-transport.js +70 -7
- package/dist/mcp/code-act-terminal-transport.js.map +1 -1
- package/dist/operator/report-run.d.ts.map +1 -1
- package/dist/operator/report-run.js +38 -97
- package/dist/operator/report-run.js.map +1 -1
- package/dist/operator/workorder-consumer.d.ts.map +1 -1
- package/dist/operator/workorder-consumer.js +8 -1
- package/dist/operator/workorder-consumer.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-runner.js","sourceRoot":"","sources":["../../src/agent/model-runner.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"model-runner.js","sourceRoot":"","sources":["../../src/agent/model-runner.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAkEH,wDAKC;AALD,SAAgB,sBAAsB,CAAC,KAAc;IACnD,OAAO,CACL,KAAK,KAAK,yCAAyC;QACnD,KAAK,KAAK,mCAAmC,CAC9C,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAa,qBAAsB,SAAQ,KAAK;IAInC;IAEA;IALF,SAAS,GAAG,KAAK,CAAC;IAE3B,YACW,YAAkC,EAC3C,OAAe,EACN,sBAAyD;QAElE,KAAK,CAAC,OAAO,CAAC,CAAC;QAJN,iBAAY,GAAZ,YAAY,CAAsB;QAElC,2BAAsB,GAAtB,sBAAsB,CAAmC;QAGlE,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AAXD,sDAWC;AAoED;;GAEG;AACH,MAAa,gBAAiB,SAAQ,KAAK;IAChC,IAAI,CAAuB;IAC3B,SAAS,CAAU;IAE5B,YAAY,OAAe,EAAE,IAA0B,EAAE,SAAS,GAAG,KAAK;QACxE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;CACF;AAVD,4CAUC"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* - System prompt sent only once at process start
|
|
13
13
|
*/
|
|
14
14
|
import type { ClaudeCLIWrapperOptions, PromptCallbacks, PromptResult, ToolUseBlock } from './claude-cli-wrapper.js';
|
|
15
|
-
import type
|
|
15
|
+
import { type IModelRunner, type PromptOptions, type RunnerMetrics } from './model-runner.js';
|
|
16
16
|
export type { ClaudeCLIWrapperOptions, PromptCallbacks, PromptResult, ToolUseBlock };
|
|
17
17
|
/**
|
|
18
18
|
* PersistentCLIAdapter - Drop-in replacement for ClaudeCLIWrapper
|
|
@@ -28,6 +28,7 @@ export declare class PersistentCLIAdapter implements IModelRunner {
|
|
|
28
28
|
private currentProcess;
|
|
29
29
|
private pendingToolResults;
|
|
30
30
|
private lastToolUseBlocks;
|
|
31
|
+
private contextRegistry;
|
|
31
32
|
private _requestCount;
|
|
32
33
|
private _failureCount;
|
|
33
34
|
private _totalLatencyMs;
|
|
@@ -42,15 +43,7 @@ export declare class PersistentCLIAdapter implements IModelRunner {
|
|
|
42
43
|
* 3. Parses the response from stdout
|
|
43
44
|
* 4. Returns PromptResult compatible with ClaudeCLIWrapper
|
|
44
45
|
*/
|
|
45
|
-
prompt(content: string, callbacks?: PromptCallbacks, options?:
|
|
46
|
-
model?: string;
|
|
47
|
-
resumeSession?: boolean;
|
|
48
|
-
allowedTools?: string[];
|
|
49
|
-
disallowedTools?: string[];
|
|
50
|
-
systemPrompt?: string;
|
|
51
|
-
sessionId?: string;
|
|
52
|
-
requestTimeout?: number;
|
|
53
|
-
}): Promise<PromptResult>;
|
|
46
|
+
prompt(content: string, callbacks?: PromptCallbacks, options?: PromptOptions): Promise<PromptResult>;
|
|
54
47
|
/**
|
|
55
48
|
* Send a tool result back to Claude
|
|
56
49
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistent-cli-adapter.d.ts","sourceRoot":"","sources":["../../src/agent/persistent-cli-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,YAAY,EACZ,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"persistent-cli-adapter.d.ts","sourceRoot":"","sources":["../../src/agent/persistent-cli-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,YAAY,EACZ,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAC;AAa3B,YAAY,EAAE,uBAAuB,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AAErF;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,QAAQ,CAAC,WAAW,EAAG,QAAQ,CAAU;IAEzC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,cAAc,CAAwC;IAC9D,OAAO,CAAC,kBAAkB,CAAgE;IAC1F,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,eAAe,CAA0C;IAGjE,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,cAAc,CAAuB;gBAEjC,OAAO,GAAE,uBAA4B;IAkBjD;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,eAAe,EAC3B,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,YAAY,CAAC;IAwIxB;;;;;OAKG;IACG,cAAc,CAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,EACxB,SAAS,CAAC,EAAE,eAAe,GAC1B,OAAO,CAAC,YAAY,CAAC;IAQxB;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI;IAIlF;;OAEG;IACH,qBAAqB,IAAI,OAAO;IAIhC;;OAEG;IACH,oBAAoB,IAAI,YAAY,EAAE;IAItC;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,YAAY,IAAI,IAAI;IAOpB;;;;;;;;OAQG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IASrC;;;;;;;OAOG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMrC;;OAEG;IACH,UAAU,IAAI,uBAAuB;IAMrC;;OAEG;IACH,SAAS,IAAI,OAAO;IAKpB;;OAEG;IACH,UAAU,IAAI,aAAa;IAU3B;;OAEG;IACH,IAAI,IAAI,IAAI;IAIZ;;OAEG;IACH,OAAO,IAAI,IAAI;IAOf;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,qBAAqB,IAAI,MAAM;CAGhC;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,uBAA4B,GACpC,oBAAoB,CAEtB"}
|
|
@@ -16,6 +16,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.PersistentCLIAdapter = void 0;
|
|
17
17
|
exports.createPersistentCLIAdapter = createPersistentCLIAdapter;
|
|
18
18
|
const persistent_cli_process_js_1 = require("./persistent-cli-process.js");
|
|
19
|
+
const model_runner_js_1 = require("./model-runner.js");
|
|
20
|
+
const run_context_registry_js_1 = require("./code-act/run-context-registry.js");
|
|
21
|
+
const completed_terminal_result_js_1 = require("./code-act/completed-terminal-result.js");
|
|
22
|
+
const types_js_1 = require("./types.js");
|
|
19
23
|
/**
|
|
20
24
|
* PersistentCLIAdapter - Drop-in replacement for ClaudeCLIWrapper
|
|
21
25
|
*
|
|
@@ -30,6 +34,7 @@ class PersistentCLIAdapter {
|
|
|
30
34
|
currentProcess = null;
|
|
31
35
|
pendingToolResults = new Map();
|
|
32
36
|
lastToolUseBlocks = [];
|
|
37
|
+
contextRegistry = run_context_registry_js_1.runContextRegistry;
|
|
33
38
|
// ─── Metrics tracking ───
|
|
34
39
|
_requestCount = 0;
|
|
35
40
|
_failureCount = 0;
|
|
@@ -49,6 +54,7 @@ class PersistentCLIAdapter {
|
|
|
49
54
|
pluginDir: options.pluginDir,
|
|
50
55
|
allowedTools: options.allowedTools,
|
|
51
56
|
disallowedTools: options.disallowedTools,
|
|
57
|
+
bindRunContext: true,
|
|
52
58
|
});
|
|
53
59
|
}
|
|
54
60
|
/**
|
|
@@ -110,18 +116,83 @@ class PersistentCLIAdapter {
|
|
|
110
116
|
const startTime = Date.now();
|
|
111
117
|
this._requestCount++;
|
|
112
118
|
this._lastRequestAt = startTime;
|
|
119
|
+
const attemptController = options?.toolExecutionContext ? new AbortController() : null;
|
|
120
|
+
const contextKey = options?.toolExecutionContext ? proc.getRunContextKey() : null;
|
|
121
|
+
let leaseId = null;
|
|
122
|
+
let ownsPromptAttempt = false;
|
|
123
|
+
let latencyRecorded = false;
|
|
124
|
+
const recordLatency = () => {
|
|
125
|
+
if (!latencyRecorded) {
|
|
126
|
+
latencyRecorded = true;
|
|
127
|
+
this._totalLatencyMs += Date.now() - startTime;
|
|
128
|
+
}
|
|
129
|
+
};
|
|
113
130
|
try {
|
|
131
|
+
if (options?.toolExecutionContext) {
|
|
132
|
+
if (!contextKey) {
|
|
133
|
+
throw new Error('Persistent Claude process is missing its run-context binding key');
|
|
134
|
+
}
|
|
135
|
+
const ownerSignal = options.toolExecutionContext.signal;
|
|
136
|
+
const signal = ownerSignal
|
|
137
|
+
? AbortSignal.any([ownerSignal, attemptController.signal])
|
|
138
|
+
: attemptController.signal;
|
|
139
|
+
leaseId = this.contextRegistry.register(contextKey, {
|
|
140
|
+
...options.toolExecutionContext,
|
|
141
|
+
signal,
|
|
142
|
+
});
|
|
143
|
+
ownsPromptAttempt = true;
|
|
144
|
+
}
|
|
114
145
|
const result = await proc.sendMessage(content, callbacks);
|
|
115
|
-
|
|
146
|
+
recordLatency();
|
|
147
|
+
const terminalError = result.terminalError ?? (0, completed_terminal_result_js_1.completedCodeActTerminalError)(result.completedToolExchanges);
|
|
148
|
+
if (terminalError) {
|
|
149
|
+
result.terminalError = terminalError;
|
|
150
|
+
attemptController?.abort(new Error(terminalError.message));
|
|
151
|
+
if (contextKey && leaseId) {
|
|
152
|
+
this.contextRegistry.close(contextKey, leaseId);
|
|
153
|
+
}
|
|
154
|
+
this.processPool.retireProcess(channelKey, proc);
|
|
155
|
+
return result;
|
|
156
|
+
}
|
|
157
|
+
const unresolvedMcpToolUseIds = (result.toolUseBlocks ?? [])
|
|
158
|
+
.filter((toolUse) => toolUse.name === 'mcp__code-act__code_act')
|
|
159
|
+
.map((toolUse) => toolUse.id);
|
|
160
|
+
if (unresolvedMcpToolUseIds.length > 0) {
|
|
161
|
+
if ((0, completed_terminal_result_js_1.completedCodeActMutationWasObserved)(result.completedToolExchanges)) {
|
|
162
|
+
throw new types_js_1.McpCompletedMutationInterruptedError([
|
|
163
|
+
...(result.completedToolExchanges ?? []),
|
|
164
|
+
]);
|
|
165
|
+
}
|
|
166
|
+
throw new types_js_1.McpResultMissingError(unresolvedMcpToolUseIds);
|
|
167
|
+
}
|
|
116
168
|
// Track tool use blocks for potential tool result sending
|
|
117
169
|
this.lastToolUseBlocks = result.toolUseBlocks || [];
|
|
118
170
|
return result;
|
|
119
171
|
}
|
|
120
172
|
catch (err) {
|
|
121
173
|
this._failureCount++;
|
|
122
|
-
|
|
174
|
+
recordLatency();
|
|
175
|
+
const mustRetireProcess = ownsPromptAttempt ||
|
|
176
|
+
err instanceof model_runner_js_1.HostToolTerminalError ||
|
|
177
|
+
err instanceof types_js_1.McpCompletedMutationInterruptedError ||
|
|
178
|
+
err instanceof types_js_1.McpResultMissingError ||
|
|
179
|
+
err instanceof types_js_1.ClaudeToolStreamProtocolError;
|
|
180
|
+
if (mustRetireProcess) {
|
|
181
|
+
if (ownsPromptAttempt) {
|
|
182
|
+
attemptController?.abort(err);
|
|
183
|
+
}
|
|
184
|
+
if (contextKey && leaseId) {
|
|
185
|
+
this.contextRegistry.close(contextKey, leaseId);
|
|
186
|
+
}
|
|
187
|
+
this.processPool.retireProcess(channelKey, proc);
|
|
188
|
+
}
|
|
123
189
|
throw err;
|
|
124
190
|
}
|
|
191
|
+
finally {
|
|
192
|
+
if (contextKey && leaseId) {
|
|
193
|
+
this.contextRegistry.close(contextKey, leaseId);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
125
196
|
}
|
|
126
197
|
/**
|
|
127
198
|
* Send a tool result back to Claude
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistent-cli-adapter.js","sourceRoot":"","sources":["../../src/agent/persistent-cli-adapter.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;
|
|
1
|
+
{"version":3,"file":"persistent-cli-adapter.js","sourceRoot":"","sources":["../../src/agent/persistent-cli-adapter.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;AAoYH,gEAIC;AAtYD,2EAA6F;AAO7F,uDAK2B;AAC3B,gFAAiG;AACjG,0FAGiD;AACjD,yCAIoB;AAKpB;;;;;GAKG;AACH,MAAa,oBAAoB;IACtB,WAAW,GAAG,QAAiB,CAAC;IAEjC,OAAO,CAA0B;IACjC,WAAW,CAAwB;IACnC,UAAU,CAAS;IACnB,cAAc,GAAmC,IAAI,CAAC;IACtD,kBAAkB,GAAsD,IAAI,GAAG,EAAE,CAAC;IAClF,iBAAiB,GAAmB,EAAE,CAAC;IACvC,eAAe,GAAuB,4CAAkB,CAAC;IAEjE,2BAA2B;IACnB,aAAa,GAAG,CAAC,CAAC;IAClB,aAAa,GAAG,CAAC,CAAC;IAClB,eAAe,GAAG,CAAC,CAAC;IACpB,cAAc,GAAkB,IAAI,CAAC;IAE7C,YAAY,UAAmC,EAAE;QAC/C,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;QACjD,IAAI,CAAC,WAAW,GAAG,IAAI,iDAAqB,CAAC;YAC3C,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;YAC9D,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,MAAM,CACV,OAAe,EACf,SAA2B,EAC3B,OAAuB;QAEvB,yCAAyC;QACzC,yFAAyF;QACzF,uFAAuF;QACvF,sFAAsF;QACtF,8EAA8E;QAC9E,MAAM,UAAU,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE;YACzD,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK;YAC3C,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY;YAChE,0BAA0B,EAAE,IAAI,CAAC,OAAO,CAAC,0BAA0B;YACnE,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;YAC7C,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY;YAChE,eAAe,EAAE,OAAO,EAAE,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe;YACzE,0EAA0E;YAC1E,uEAAuE;YACvE,cAAc,EAAE,OAAO,EAAE,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc;YACtE,GAAG,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE;SAC5C,CAAC,CAAC;QACH,0EAA0E;QAC1E,8EAA8E;QAC9E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAE3B,4EAA4E;QAC5E,0EAA0E;QAC1E,oDAAoD;QACpD,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACvE,sEAAsE;YACtE,yFAAyF;YACzF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CACV,qDAAqD,IAAI,CAAC,kBAAkB,CAAC,IAAI,uBAAuB,CACzG,CAAC;gBACF,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,KAAK,MAAM,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACvE,IAAI,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,oDAAoD,SAAS,EAAE,CAAC,CAAC;wBAC7E,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;oBACxD,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,OAAO,CAAC,KAAK,CAAC,kDAAkD,SAAS,GAAG,EAAE,GAAG,CAAC,CAAC;oBACrF,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;YAClC,CAAC;QACH,CAAC;QAED,8CAA8C;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,MAAM,iBAAiB,GAAG,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACvF,MAAM,UAAU,GAAG,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAClF,IAAI,OAAO,GAAkB,IAAI,CAAC;QAClC,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,eAAe,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YACjD,CAAC;QACH,CAAC,CAAC;QACF,IAAI,CAAC;YACH,IAAI,OAAO,EAAE,oBAAoB,EAAE,CAAC;gBAClC,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;gBACtF,CAAC;gBACD,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC;gBACxD,MAAM,MAAM,GAAG,WAAW;oBACxB,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,iBAAkB,CAAC,MAAM,CAAC,CAAC;oBAC3D,CAAC,CAAC,iBAAkB,CAAC,MAAM,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,EAAE;oBAClD,GAAG,OAAO,CAAC,oBAAoB;oBAC/B,MAAM;iBACP,CAAC,CAAC;gBACH,iBAAiB,GAAG,IAAI,CAAC;YAC3B,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAC1D,aAAa,EAAE,CAAC;YAEhB,MAAM,aAAa,GACjB,MAAM,CAAC,aAAa,IAAI,IAAA,4DAA6B,EAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACvF,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;gBACrC,iBAAiB,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3D,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBACjD,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,MAAM,uBAAuB,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;iBACzD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,yBAAyB,CAAC;iBAC/D,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvC,IAAI,IAAA,kEAAmC,EAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;oBACvE,MAAM,IAAI,+CAAoC,CAAC;wBAC7C,GAAG,CAAC,MAAM,CAAC,sBAAsB,IAAI,EAAE,CAAC;qBACzC,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,IAAI,gCAAqB,CAAC,uBAAuB,CAAC,CAAC;YAC3D,CAAC;YAED,0DAA0D;YAC1D,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;YAEpD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,aAAa,EAAE,CAAC;YAChB,MAAM,iBAAiB,GACrB,iBAAiB;gBACjB,GAAG,YAAY,uCAAqB;gBACpC,GAAG,YAAY,+CAAoC;gBACnD,GAAG,YAAY,gCAAqB;gBACpC,GAAG,YAAY,wCAA6B,CAAC;YAC/C,IAAI,iBAAiB,EAAE,CAAC;gBACtB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,iBAAiB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;gBACD,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;gBAAS,CAAC;YACT,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;gBAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAClB,SAAiB,EACjB,MAAc,EACd,UAAmB,KAAK,EACxB,SAA2B;QAE3B,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACnF,CAAC;IAED;;;;OAIG;IACH,eAAe,CAAC,SAAiB,EAAE,MAAc,EAAE,UAAmB,KAAK;QACzE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,oBAAoB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,YAAY;QACV,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;;OAQG;IACH,YAAY,CAAC,SAAiB;QAC5B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,kDAAkD;QAClD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,eAAe,CAAC,MAAc;QAC5B,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;QACnC,wCAAwC;QACxC,wEAAwE;IAC1E,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,4EAA4E;IAE5E;;OAEG;IACH,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,CAAC,wCAAwC;QAC/E,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO;YACL,YAAY,EAAE,IAAI,CAAC,aAAa;YAChC,YAAY,EAAE,IAAI,CAAC,aAAa;YAChC,YAAY,EACV,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YACpF,aAAa,EAAE,IAAI,CAAC,cAAc;SACnC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,YAAY,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IAC3C,CAAC;CACF;AAtVD,oDAsVC;AAED;;;;;;;;GAQG;AACH,SAAgB,0BAA0B,CACxC,UAAmC,EAAE;IAErC,OAAO,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
* Result: {"type":"result","subtype":"success",...}
|
|
25
25
|
*/
|
|
26
26
|
import { EventEmitter } from 'events';
|
|
27
|
-
import
|
|
27
|
+
import { type PromptCallbacks, type PromptResult, type TokenUsageRecord } from './types.js';
|
|
28
28
|
export interface PersistentProcessOptions {
|
|
29
29
|
sessionId: string;
|
|
30
30
|
model?: string;
|
|
@@ -48,6 +48,8 @@ export interface PersistentProcessOptions {
|
|
|
48
48
|
pendingToolUseTimeoutMs?: number;
|
|
49
49
|
/** Environment variables to pass to the Claude CLI process */
|
|
50
50
|
env?: Record<string, string>;
|
|
51
|
+
/** Bind this process generation's MCP child calls to host-issued run context leases. */
|
|
52
|
+
bindRunContext?: boolean;
|
|
51
53
|
/** Structurally allowed tools (--allowedTools CLI flag) */
|
|
52
54
|
allowedTools?: string[];
|
|
53
55
|
/** Structurally disallowed tools (--disallowedTools CLI flag) */
|
|
@@ -81,6 +83,7 @@ export interface ContentBlock {
|
|
|
81
83
|
type: string;
|
|
82
84
|
text?: string;
|
|
83
85
|
}>;
|
|
86
|
+
is_error?: boolean;
|
|
84
87
|
}
|
|
85
88
|
export interface StreamMessage {
|
|
86
89
|
type: 'system' | 'assistant' | 'result' | 'error' | 'user';
|
|
@@ -111,21 +114,7 @@ export interface StreamMessage {
|
|
|
111
114
|
is_error?: boolean;
|
|
112
115
|
error?: string;
|
|
113
116
|
}
|
|
114
|
-
export
|
|
115
|
-
response: string;
|
|
116
|
-
usage: {
|
|
117
|
-
input_tokens: number;
|
|
118
|
-
output_tokens: number;
|
|
119
|
-
cache_creation_input_tokens?: number;
|
|
120
|
-
cache_read_input_tokens?: number;
|
|
121
|
-
};
|
|
122
|
-
session_id: string;
|
|
123
|
-
cost_usd?: number;
|
|
124
|
-
toolUseBlocks?: ToolUseBlock[];
|
|
125
|
-
hasToolUse?: boolean;
|
|
126
|
-
duration_ms?: number;
|
|
127
|
-
}
|
|
128
|
-
export type { PromptCallbacks };
|
|
117
|
+
export type { PromptCallbacks, PromptResult };
|
|
129
118
|
type ProcessState = 'idle' | 'busy' | 'starting' | 'dead';
|
|
130
119
|
/**
|
|
131
120
|
* PersistentClaudeProcess - Manages a single long-lived Claude CLI process
|
|
@@ -146,11 +135,14 @@ export declare class PersistentClaudeProcess extends EventEmitter {
|
|
|
146
135
|
private currentReject;
|
|
147
136
|
private requestTimeoutHandle;
|
|
148
137
|
private toolUseBlocks;
|
|
138
|
+
private readonly promptToolExchanges;
|
|
139
|
+
private completedToolExchanges;
|
|
149
140
|
private awaitingToolResults;
|
|
150
141
|
private pendingToolUseStartedAt;
|
|
151
142
|
private accumulatedText;
|
|
152
143
|
private startPromise;
|
|
153
144
|
private onTokenUsage?;
|
|
145
|
+
private readonly runContextKey;
|
|
154
146
|
/**
|
|
155
147
|
* Resolve the effective request timeout in ms.
|
|
156
148
|
* 0 = unlimited (no timeout). Returns the configured or default value.
|
|
@@ -195,6 +187,10 @@ export declare class PersistentClaudeProcess extends EventEmitter {
|
|
|
195
187
|
* Process a parsed event from stdout
|
|
196
188
|
*/
|
|
197
189
|
private processEvent;
|
|
190
|
+
private recordToolUse;
|
|
191
|
+
private recordToolResult;
|
|
192
|
+
private failToolStreamProtocol;
|
|
193
|
+
private promptTerminalError;
|
|
198
194
|
/**
|
|
199
195
|
* Handle stderr data
|
|
200
196
|
*/
|
|
@@ -246,6 +242,8 @@ export declare class PersistentClaudeProcess extends EventEmitter {
|
|
|
246
242
|
* Get session ID
|
|
247
243
|
*/
|
|
248
244
|
getSessionId(): string;
|
|
245
|
+
/** Process-generation key inherited by the Code-Act MCP child, never a routing/session ID. */
|
|
246
|
+
getRunContextKey(): string | null;
|
|
249
247
|
}
|
|
250
248
|
export declare function formatClaudeArgsForLog(args: readonly string[]): string[];
|
|
251
249
|
/**
|
|
@@ -284,6 +282,13 @@ export declare class PersistentProcessPool {
|
|
|
284
282
|
* Stop a specific process
|
|
285
283
|
*/
|
|
286
284
|
stopProcess(channelKey: string): void;
|
|
285
|
+
/**
|
|
286
|
+
* Stop the exact process generation acquired by the caller. Only remove the pool entry when it
|
|
287
|
+
* still points at that generation, so stale cleanup cannot stop or evict a replacement. The
|
|
288
|
+
* expected process may already be absent after its error listener ran; it still must be stopped
|
|
289
|
+
* or the child would remain alive outside pool lifecycle management.
|
|
290
|
+
*/
|
|
291
|
+
retireProcess(channelKey: string, expectedProcess: PersistentClaudeProcess): boolean;
|
|
287
292
|
/**
|
|
288
293
|
* Stop all processes
|
|
289
294
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistent-cli-process.d.ts","sourceRoot":"","sources":["../../src/agent/persistent-cli-process.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAOH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"persistent-cli-process.d.ts","sourceRoot":"","sources":["../../src/agent/persistent-cli-process.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAOH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAGtB,MAAM,YAAY,CAAC;AA8CpB,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uDAAuD;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2FAA2F;IAC3F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+GAA+G;IAC/G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,8DAA8D;IAC9D,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,wFAAwF;IACxF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,kFAAkF;IAClF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAClD,2CAA2C;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC;CAC5C;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,uBAAuB,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,CAAC;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,YAAY,EAAE,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE;YACN,YAAY,EAAE,MAAM,CAAC;YACrB,aAAa,EAAE,MAAM,CAAC;YACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;YACjC,2BAA2B,CAAC,EAAE,MAAM,CAAC;SACtC,CAAC;KACH,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,2BAA2B,CAAC,EAAE,MAAM,CAAC;KACtC,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AAE9C,KAAK,YAAY,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;AA+G1D;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,YAAY;IACvD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,gBAAgB,CAAgC;IACxD,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,aAAa,CAAyC;IAC9D,OAAO,CAAC,oBAAoB,CAA+B;IAC3D,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8C;IAClF,OAAO,CAAC,sBAAsB,CAA+B;IAC7D,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,uBAAuB,CAAuB;IACtD,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,YAAY,CAAC,CAAqC;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C;;;OAGG;IACH,OAAO,CAAC,oBAAoB;gBAYhB,OAAO,EAAE,wBAAwB;IAY7C;;;;;;OAMG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAmBd,OAAO;IA2FrB;;OAEG;IACH,OAAO,CAAC,SAAS;IAgFjB;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAmEtF;;OAEG;IACG,cAAc,CAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,EACxB,SAAS,CAAC,EAAE,eAAe,GAC1B,OAAO,CAAC,YAAY,CAAC;IAOxB;;;OAGG;IACG,eAAe,CACnB,OAAO,EAAE,KAAK,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,EAC3E,SAAS,CAAC,EAAE,eAAe,GAC1B,OAAO,CAAC,YAAY,CAAC;IA8DxB;;OAEG;IACH,OAAO,CAAC,YAAY;IA+BpB;;OAEG;IACH,OAAO,CAAC,YAAY;IAsIpB,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,gBAAgB;IAyCxB,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,mBAAmB;IA2B3B;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,WAAW;IAgBnB;;OAEG;IACH,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACH,OAAO,CAAC,aAAa;IA2BrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAWzB;;OAEG;IACH,IAAI,IAAI,IAAI;IAqCZ;;OAEG;IACH,OAAO,IAAI,OAAO;IAIlB;;OAEG;IACH,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,iBAAiB,IAAI,OAAO;IAI5B,0BAA0B,IAAI,MAAM,GAAG,IAAI;IAI3C;;OAEG;IACH,QAAQ,IAAI,YAAY;IAIxB;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB,8FAA8F;IAC9F,gBAAgB,IAAI,MAAM,GAAG,IAAI;CAGlC;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAExE;AAED;;;;;;;GAOG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,SAAS,CAGH;IACd,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,uBAAuB,CAAS;IACxC,OAAO,CAAC,YAAY,CAA+B;gBAEvC,cAAc,GAAE,OAAO,CAAC,wBAAwB,CAAM;IAQlE,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,wBAAwB;IAgBhC,OAAO,CAAC,8BAA8B;IAiBtC,OAAO,CAAC,iBAAiB;IAWzB;;OAEG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAC1C,OAAO,CAAC,uBAAuB,CAAC;IAInC;;OAEG;IACG,oBAAoB,CACxB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAC1C,OAAO,CAAC,8BAA8B,CAAC;IAkE1C;;OAEG;IACH,oBAAoB,CAAC,GAAG,GAAE,MAAmB,GAAG,MAAM;IA4CtD;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAQrC;;;;;OAKG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,uBAAuB,GAAG,OAAO;IAUpF;;OAEG;IACH,OAAO,IAAI,IAAI;IAYf;;OAEG;IACH,cAAc,IAAI,MAAM;IAIxB;;OAEG;IACH,iBAAiB,IAAI,MAAM,EAAE;IAI7B;;;OAGG;IACH,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAOxC"}
|