@coralai/sps-cli 0.60.1 → 0.61.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/commands/agentCommand.js +4 -4
- package/dist/commands/agentCommand.js.map +1 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +0 -41
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/workerDashboard.js +2 -2
- package/dist/commands/workerDashboard.js.map +1 -1
- package/dist/console/routes/cards.d.ts.map +1 -1
- package/dist/console/routes/cards.js +9 -3
- package/dist/console/routes/cards.js.map +1 -1
- package/dist/core/agents/agentRegistry.d.ts +7 -0
- package/dist/core/agents/agentRegistry.d.ts.map +1 -0
- package/dist/core/agents/agentRegistry.js +49 -0
- package/dist/core/agents/agentRegistry.js.map +1 -0
- package/dist/core/agents/resolveBackend.d.ts +3 -3
- package/dist/core/agents/resolveBackend.d.ts.map +1 -1
- package/dist/core/agents/resolveBackend.js +1 -8
- package/dist/core/agents/resolveBackend.js.map +1 -1
- package/dist/core/intel/agentsConfig.d.ts +1 -1
- package/dist/core/intel/agentsConfig.d.ts.map +1 -1
- package/dist/core/intel/agentsConfig.js +4 -3
- package/dist/core/intel/agentsConfig.js.map +1 -1
- package/dist/core/intel/types.d.ts +2 -2
- package/dist/core/intel/types.d.ts.map +1 -1
- package/dist/core/runtimeTypes.d.ts +4 -4
- package/dist/core/runtimeTypes.d.ts.map +1 -1
- package/dist/core/runtimeTypes.js +3 -3
- package/dist/daemon/sessionDaemon.js +1 -1
- package/dist/daemon/sessionDaemon.js.map +1 -1
- package/dist/main.js +1 -24
- package/dist/main.js.map +1 -1
- package/dist/providers/RuntimeSessionRuntime.d.ts.map +1 -1
- package/dist/providers/RuntimeSessionRuntime.js +9 -4
- package/dist/providers/RuntimeSessionRuntime.js.map +1 -1
- package/dist/providers/mcp/spsMcpServer.d.ts.map +1 -1
- package/dist/providers/mcp/spsMcpServer.js +16 -0
- package/dist/providers/mcp/spsMcpServer.js.map +1 -1
- package/dist/providers/registry.d.ts +3 -16
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +3 -10
- package/dist/providers/registry.js.map +1 -1
- package/dist/providers/subagent/runSubAgent.d.ts +13 -0
- package/dist/providers/subagent/runSubAgent.d.ts.map +1 -0
- package/dist/providers/subagent/runSubAgent.js +37 -0
- package/dist/providers/subagent/runSubAgent.js.map +1 -0
- package/dist/services/CardService.d.ts.map +1 -1
- package/dist/services/CardService.js +17 -10
- package/dist/services/CardService.js.map +1 -1
- package/dist/services/PipelineService.d.ts +4 -0
- package/dist/services/PipelineService.d.ts.map +1 -1
- package/dist/services/PipelineService.js +16 -0
- package/dist/services/PipelineService.js.map +1 -1
- package/dist/services/executors.d.ts +6 -0
- package/dist/services/executors.d.ts.map +1 -1
- package/dist/services/executors.js +26 -0
- package/dist/services/executors.js.map +1 -1
- package/dist/shared/runtimeSchemas.d.ts +3 -3
- package/package.json +3 -4
- package/skills/sps-subagent/SKILL.md +60 -0
- package/dist/commands/acpCommand.d.ts +0 -2
- package/dist/commands/acpCommand.d.ts.map +0 -1
- package/dist/commands/acpCommand.js +0 -161
- package/dist/commands/acpCommand.js.map +0 -1
- package/dist/core/agents/AcpBackend.d.ts +0 -43
- package/dist/core/agents/AcpBackend.d.ts.map +0 -1
- package/dist/core/agents/AcpBackend.js +0 -157
- package/dist/core/agents/AcpBackend.js.map +0 -1
- package/dist/core/agents/ClaudeAcpBackend.d.ts +0 -13
- package/dist/core/agents/ClaudeAcpBackend.d.ts.map +0 -1
- package/dist/core/agents/ClaudeAcpBackend.js +0 -14
- package/dist/core/agents/ClaudeAcpBackend.js.map +0 -1
- package/dist/core/agents/CodexAppServerBackend.d.ts +0 -32
- package/dist/core/agents/CodexAppServerBackend.d.ts.map +0 -1
- package/dist/core/agents/CodexAppServerBackend.js +0 -168
- package/dist/core/agents/CodexAppServerBackend.js.map +0 -1
- package/dist/providers/ACPWorkerRuntime.d.ts +0 -45
- package/dist/providers/ACPWorkerRuntime.d.ts.map +0 -1
- package/dist/providers/ACPWorkerRuntime.js +0 -283
- package/dist/providers/ACPWorkerRuntime.js.map +0 -1
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"CodexAppServerBackend.d.ts","sourceRoot":"","sources":["../../../src/core/agents/CodexAppServerBackend.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAExF,MAAM,WAAW,yBAAyB;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,qBAAsB,YAAW,YAAY;IAU5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IATjC,QAAQ,CAAC,IAAI,WAAW;IACxB,OAAO,CAAC,IAAI,CAA+C;IAC3D,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8C;gBAE3C,IAAI,EAAE,yBAAyB;IAE5D,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,IAAI,GAAG,MAAM,IAAI;IAIhE,OAAO,CAAC,IAAI;IAUZ,OAAO,CAAC,IAAI;IAGZ,0CAA0C;IAC1C,OAAO,CAAC,GAAG;IAQX,kEAAkE;IAClE,OAAO,CAAC,MAAM;IAyBd,qCAAqC;IACrC,OAAO,CAAC,cAAc;IA+BhB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevC,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;IAIlC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAU5B"}
|
|
@@ -1,168 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @module core/agents/CodexAppServerBackend
|
|
3
|
-
* @description AgentBackend 的 codex 适配器:把 **`codex app-server`(JSON-RPC over stdio)** 包成一个
|
|
4
|
-
* 保活会话。codex 是 openai 的 CLI——对应矩阵 openai×acp 格子(子进程/可隔离)。
|
|
5
|
-
* 完成检测**权威**:监听 `turn/completed` notification(带 Turn.status),非 60s idle 猜;
|
|
6
|
-
* 取消用 `turn/interrupt`;用量从 `thread/tokenUsage/updated` 取。SPS 专属能力(skill/memory)
|
|
7
|
-
* 经 codex 的 `mcp_servers` 配置注入同一个 spsMcpServer(stdio),与 claude-sdk/openai-sdk 同源。
|
|
8
|
-
* 协议字段对 codex 0.142.2 `app-server generate-ts` 绑定核实。
|
|
9
|
-
* @layer core
|
|
10
|
-
* @boundedContext agents
|
|
11
|
-
*/
|
|
12
|
-
import { spawn } from 'node:child_process';
|
|
13
|
-
import { spsMcpStdioConfig } from '../../providers/mcp/spsMcpStdioConfig.js';
|
|
14
|
-
export class CodexAppServerBackend {
|
|
15
|
-
opts;
|
|
16
|
-
kind = 'codex';
|
|
17
|
-
proc = null;
|
|
18
|
-
threadId = null;
|
|
19
|
-
state = 'idle';
|
|
20
|
-
nextId = 1;
|
|
21
|
-
buf = '';
|
|
22
|
-
waiters = new Map();
|
|
23
|
-
listeners = new Set();
|
|
24
|
-
constructor(opts) {
|
|
25
|
-
this.opts = opts;
|
|
26
|
-
}
|
|
27
|
-
subscribe(listener) {
|
|
28
|
-
this.listeners.add(listener);
|
|
29
|
-
return () => this.listeners.delete(listener);
|
|
30
|
-
}
|
|
31
|
-
emit(ev) {
|
|
32
|
-
for (const l of this.listeners) {
|
|
33
|
-
try {
|
|
34
|
-
l(ev);
|
|
35
|
-
}
|
|
36
|
-
catch {
|
|
37
|
-
/* listener 异常不阻塞 */
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
send(obj) {
|
|
42
|
-
this.proc?.stdin.write(JSON.stringify(obj) + '\n');
|
|
43
|
-
}
|
|
44
|
-
/** 发一个 JSON-RPC 请求,等其 result/error 返回。 */
|
|
45
|
-
rpc(method, params) {
|
|
46
|
-
const id = this.nextId++;
|
|
47
|
-
return new Promise((resolve) => {
|
|
48
|
-
this.waiters.set(id, resolve);
|
|
49
|
-
this.send({ jsonrpc: '2.0', id, method, params });
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
|
-
/** stdout 按行解析 JSON-RPC(newline-delimited);分流 响应 / 通知 / 服务器请求。 */
|
|
53
|
-
onData(chunk) {
|
|
54
|
-
this.buf += chunk;
|
|
55
|
-
let i;
|
|
56
|
-
while ((i = this.buf.indexOf('\n')) >= 0) {
|
|
57
|
-
const line = this.buf.slice(0, i).trim();
|
|
58
|
-
this.buf = this.buf.slice(i + 1);
|
|
59
|
-
if (!line)
|
|
60
|
-
continue;
|
|
61
|
-
let msg;
|
|
62
|
-
try {
|
|
63
|
-
msg = JSON.parse(line);
|
|
64
|
-
}
|
|
65
|
-
catch {
|
|
66
|
-
continue;
|
|
67
|
-
}
|
|
68
|
-
if (msg.id !== undefined && (msg.result !== undefined || msg.error !== undefined)) {
|
|
69
|
-
this.waiters.get(msg.id)?.({ result: msg.result, error: msg.error });
|
|
70
|
-
this.waiters.delete(msg.id);
|
|
71
|
-
}
|
|
72
|
-
else if (msg.id !== undefined && msg.method) {
|
|
73
|
-
// 服务器→客户端 请求(如审批):approvalPolicy=never 下少见;一律放行,避免阻塞。
|
|
74
|
-
this.send({ jsonrpc: '2.0', id: msg.id, result: { decision: 'approved' } });
|
|
75
|
-
}
|
|
76
|
-
else if (msg.method) {
|
|
77
|
-
this.onNotification(msg.method, msg.params);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
/** 通知 → WorkerOutputEvent + 权威终态。 */
|
|
82
|
-
onNotification(method, params) {
|
|
83
|
-
const p = params;
|
|
84
|
-
switch (method) {
|
|
85
|
-
case 'item/agentMessage/delta':
|
|
86
|
-
if (p.delta)
|
|
87
|
-
this.emit({ kind: 'text', text: p.delta });
|
|
88
|
-
break;
|
|
89
|
-
case 'item/started':
|
|
90
|
-
if (p.item?.type || p.item?.itemType)
|
|
91
|
-
this.emit({ kind: 'tool', name: p.item.type ?? p.item.itemType ?? 'item', phase: 'start' });
|
|
92
|
-
break;
|
|
93
|
-
case 'item/completed':
|
|
94
|
-
if (p.item?.type || p.item?.itemType)
|
|
95
|
-
this.emit({ kind: 'tool', name: p.item.type ?? p.item.itemType ?? 'item', phase: 'end' });
|
|
96
|
-
break;
|
|
97
|
-
case 'thread/tokenUsage/updated': {
|
|
98
|
-
const u = p.tokenUsage?.total; // 累计用量(TokenUsageBreakdown)
|
|
99
|
-
if (u)
|
|
100
|
-
this.emit({ kind: 'usage', inputTokens: u.inputTokens ?? 0, outputTokens: u.outputTokens ?? 0 });
|
|
101
|
-
break;
|
|
102
|
-
}
|
|
103
|
-
case 'turn/completed': {
|
|
104
|
-
const ok = (p.turn?.status ?? 'completed') === 'completed';
|
|
105
|
-
this.emit({ kind: 'result', text: p.turn?.status ?? 'completed', status: ok ? 'completed' : 'failed' });
|
|
106
|
-
this.state = ok ? 'completed' : 'failed'; // 权威完成检测(turn/completed,非 idle 猜)
|
|
107
|
-
break;
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
async ensure() {
|
|
112
|
-
if (this.threadId)
|
|
113
|
-
return; // 幂等:已建会话
|
|
114
|
-
this.proc = spawn('codex', ['app-server', '--stdio'], { stdio: ['pipe', 'pipe', 'pipe'] });
|
|
115
|
-
this.proc.stdout.on('data', (d) => this.onData(d.toString()));
|
|
116
|
-
this.proc.stderr.on('data', () => {
|
|
117
|
-
/* codex app-server 杂项日志,忽略 */
|
|
118
|
-
});
|
|
119
|
-
this.proc.on('exit', () => {
|
|
120
|
-
if (this.state === 'running')
|
|
121
|
-
this.state = 'lost';
|
|
122
|
-
});
|
|
123
|
-
await this.rpc('initialize', { clientInfo: { name: 'sps', title: null, version: '0.1' }, capabilities: null });
|
|
124
|
-
this.send({ jsonrpc: '2.0', method: 'initialized' });
|
|
125
|
-
// SPS 专属能力(skill/memory)经 codex mcp_servers 注入——与其它后端同一个 spsMcpServer(stdio)。
|
|
126
|
-
const sps = spsMcpStdioConfig({ cwd: this.opts.cwd, project: this.opts.project });
|
|
127
|
-
const ts = await this.rpc('thread/start', {
|
|
128
|
-
cwd: this.opts.cwd,
|
|
129
|
-
model: this.opts.model,
|
|
130
|
-
sandbox: 'workspace-write',
|
|
131
|
-
approvalPolicy: 'never',
|
|
132
|
-
config: { mcp_servers: { sps: { command: sps.command, args: sps.args } } },
|
|
133
|
-
});
|
|
134
|
-
if (ts.error)
|
|
135
|
-
throw new Error(`codex thread/start 失败: ${JSON.stringify(ts.error).slice(0, 200)}`);
|
|
136
|
-
this.threadId = ts.result.thread?.id ?? null;
|
|
137
|
-
if (!this.threadId)
|
|
138
|
-
throw new Error('codex thread/start 未返回 threadId');
|
|
139
|
-
}
|
|
140
|
-
async dispatch(prompt) {
|
|
141
|
-
await this.ensure();
|
|
142
|
-
this.state = 'running';
|
|
143
|
-
// 不 await turn 完成:turn/start 立即返回 inProgress,完成由 turn/completed notification 落终态。
|
|
144
|
-
void this.rpc('turn/start', {
|
|
145
|
-
threadId: this.threadId,
|
|
146
|
-
input: [{ type: 'text', text: prompt, text_elements: [] }],
|
|
147
|
-
}).then((r) => {
|
|
148
|
-
if (r.error && this.state === 'running') {
|
|
149
|
-
this.emit({ kind: 'result', text: JSON.stringify(r.error).slice(0, 200), status: 'failed' });
|
|
150
|
-
this.state = 'failed';
|
|
151
|
-
}
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
|
-
async runState() {
|
|
155
|
-
return this.state;
|
|
156
|
-
}
|
|
157
|
-
async stop() {
|
|
158
|
-
if (this.proc && this.threadId && this.state === 'running') {
|
|
159
|
-
this.send({ jsonrpc: '2.0', id: this.nextId++, method: 'turn/interrupt', params: { threadId: this.threadId } });
|
|
160
|
-
}
|
|
161
|
-
this.state = 'cancelled';
|
|
162
|
-
this.proc?.kill();
|
|
163
|
-
this.proc = null;
|
|
164
|
-
this.threadId = null;
|
|
165
|
-
this.waiters.clear();
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
//# sourceMappingURL=CodexAppServerBackend.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"CodexAppServerBackend.js","sourceRoot":"","sources":["../../../src/core/agents/CodexAppServerBackend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
import type { ProjectContext } from '../core/context.js';
|
|
2
|
-
import type { ACPClient } from '@coralai/claude-code-agent';
|
|
3
|
-
import type { AgentRuntime } from '@coralai/claude-code-agent';
|
|
4
|
-
import type { ACPSessionRecord, ACPState, ACPTool } from '@coralai/claude-code-agent';
|
|
5
|
-
export declare class ACPWorkerRuntime implements AgentRuntime {
|
|
6
|
-
private readonly ctx;
|
|
7
|
-
private readonly client;
|
|
8
|
-
private readonly runtimeStore;
|
|
9
|
-
constructor(ctx: ProjectContext, client?: ACPClient);
|
|
10
|
-
ensureSession(slot: string, tool?: ACPTool, cwdOverride?: string, opts?: {
|
|
11
|
-
mcpServers?: import('@coralai/claude-code-agent').McpServerConfig[];
|
|
12
|
-
extraEnv?: Record<string, string>;
|
|
13
|
-
/** durable resume:透传给底层适配器,触发 loadSession(<sessionId>) 重载 transcript。 */
|
|
14
|
-
resumeSessionId?: string;
|
|
15
|
-
/** skills 上下文白名单(按名):按卡砍无关技能税;省略=全量。仅 newSession(冷启动)生效。 */
|
|
16
|
-
skills?: string[];
|
|
17
|
-
/** per-agent 人设:Output Style 名 → cc-agent `_meta.claudeCode.options.settings.outputStyle`(两路都带、resume 不丢)。 */
|
|
18
|
-
outputStyle?: string;
|
|
19
|
-
}): Promise<ACPSessionRecord>;
|
|
20
|
-
startRun(slot: string, prompt: string, tool?: ACPTool, cwdOverride?: string, opts?: {
|
|
21
|
-
extraEnv?: Record<string, string>;
|
|
22
|
-
resumeSessionId?: string;
|
|
23
|
-
skills?: string[];
|
|
24
|
-
}): Promise<ACPSessionRecord>;
|
|
25
|
-
resumeRun(slot: string, prompt: string): Promise<ACPSessionRecord>;
|
|
26
|
-
inspect(slot?: string): Promise<ACPState>;
|
|
27
|
-
stopSession(slot: string): Promise<void>;
|
|
28
|
-
/**
|
|
29
|
-
* GC:删掉 state.json 里早已死掉的会话记录 —— sessionState==='offline'、无 currentRun、
|
|
30
|
-
* 且 createdAt 早于 staleMs 前。返回删除条数。这些记录进程本就没了(不释放内存),纯粹让 state.json
|
|
31
|
-
* 收敛、不随建/删无限膨胀(曾攒到 139 条)。活着/在跑/近期的会话一律不动。
|
|
32
|
-
* ⚠️ 用 createdAt 而非 updatedAt:inspect() 每 2s 刷 updatedAt(含 offline 记录),会让它永不过期;
|
|
33
|
-
* createdAt 只在首次创建时写、稳定,才是真正的"这条记录多老"。
|
|
34
|
-
*/
|
|
35
|
-
gcOfflineSessions(staleMs: number): number;
|
|
36
|
-
private normalizeSlot;
|
|
37
|
-
private defaultTool;
|
|
38
|
-
subscribe(slot: string, listener: import('@coralai/claude-code-agent').AccumulatorListener): () => void;
|
|
39
|
-
cancelRun(slot: string): Promise<void>;
|
|
40
|
-
private buildSessionName;
|
|
41
|
-
private slotStatusFromRun;
|
|
42
|
-
private upsertSession;
|
|
43
|
-
private launchRun;
|
|
44
|
-
}
|
|
45
|
-
//# sourceMappingURL=ACPWorkerRuntime.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ACPWorkerRuntime.d.ts","sourceRoot":"","sources":["../../src/providers/ACPWorkerRuntime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAEV,gBAAgB,EAEhB,QAAQ,EACR,OAAO,EACR,MAAM,4BAA4B,CAAC;AAgBpC,qBAAa,gBAAiB,YAAW,YAAY;IAIjD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAGzB,GAAG,EAAE,cAAc,EACnB,MAAM,GAAE,SAAgC;IAKrD,aAAa,CACjB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;QACL,UAAU,CAAC,EAAE,OAAO,4BAA4B,EAAE,eAAe,EAAE,CAAC;QACpE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClC,yEAAyE;QACzE,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,4DAA4D;QAC5D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB,8GAA8G;QAC9G,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GACA,OAAO,CAAC,gBAAgB,CAAC;IAgDtB,QAAQ,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,OAAO,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACxF,OAAO,CAAC,gBAAgB,CAAC;IAgBtB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAgBlE,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IA8DzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC9C;;;;;;OAMG;IACH,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAa1C,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,WAAW;IAInB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,4BAA4B,EAAE,mBAAmB,GAAG,MAAM,IAAI;IAMjG,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5C,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,aAAa;YASP,SAAS;CA0CxB"}
|
|
@@ -1,283 +0,0 @@
|
|
|
1
|
-
import { RuntimeStore } from '../core/runtimeStore.js';
|
|
2
|
-
import { LocalACPClient } from '@coralai/claude-code-agent';
|
|
3
|
-
function now() {
|
|
4
|
-
return new Date().toISOString();
|
|
5
|
-
}
|
|
6
|
-
function previewPrompt(prompt) {
|
|
7
|
-
const oneLine = prompt.replace(/\s+/g, ' ').trim();
|
|
8
|
-
return oneLine.length > 120 ? `${oneLine.slice(0, 117)}...` : oneLine;
|
|
9
|
-
}
|
|
10
|
-
function isTerminalRunStatus(status) {
|
|
11
|
-
return ['completed', 'failed', 'cancelled', 'lost'].includes(status);
|
|
12
|
-
}
|
|
13
|
-
export class ACPWorkerRuntime {
|
|
14
|
-
ctx;
|
|
15
|
-
client;
|
|
16
|
-
runtimeStore;
|
|
17
|
-
constructor(ctx, client = new LocalACPClient()) {
|
|
18
|
-
this.ctx = ctx;
|
|
19
|
-
this.client = client;
|
|
20
|
-
this.runtimeStore = new RuntimeStore(ctx);
|
|
21
|
-
}
|
|
22
|
-
async ensureSession(slot, tool, cwdOverride, opts) {
|
|
23
|
-
const state = this.runtimeStore.readACPState();
|
|
24
|
-
const normalizedSlot = this.normalizeSlot(slot);
|
|
25
|
-
const selectedTool = tool || this.defaultTool();
|
|
26
|
-
const existing = state.sessions[normalizedSlot];
|
|
27
|
-
const sessionName = existing?.sessionName || this.buildSessionName(normalizedSlot);
|
|
28
|
-
const cwd = cwdOverride || existing?.cwd || this.ctx.paths.repoDir;
|
|
29
|
-
const resetExisting = !existing || (!!cwdOverride && existing.cwd !== cwdOverride);
|
|
30
|
-
const retainedRun = resetExisting ? null : (existing?.currentRun || null);
|
|
31
|
-
const result = await this.client.ensureSession({
|
|
32
|
-
sessionName,
|
|
33
|
-
tool: selectedTool,
|
|
34
|
-
cwd,
|
|
35
|
-
resetExisting,
|
|
36
|
-
logsDir: this.ctx.paths.logsDir,
|
|
37
|
-
mcpServers: opts?.mcpServers,
|
|
38
|
-
extraEnv: opts?.extraEnv,
|
|
39
|
-
...(opts?.resumeSessionId ? { resumeSessionId: opts.resumeSessionId } : {}),
|
|
40
|
-
...(opts?.skills ? { skills: opts.skills } : {}),
|
|
41
|
-
...(opts?.outputStyle ? { outputStyle: opts.outputStyle } : {}),
|
|
42
|
-
});
|
|
43
|
-
const session = this.upsertSession(state, normalizedSlot, {
|
|
44
|
-
slot: normalizedSlot,
|
|
45
|
-
tool: selectedTool,
|
|
46
|
-
sessionId: result.sessionId,
|
|
47
|
-
sessionName,
|
|
48
|
-
pid: result.pid ?? existing?.pid ?? null,
|
|
49
|
-
cwd,
|
|
50
|
-
status: result.sessionState === 'ready'
|
|
51
|
-
? (retainedRun ? 'active' : 'idle')
|
|
52
|
-
: 'launching',
|
|
53
|
-
sessionState: result.sessionState,
|
|
54
|
-
currentRun: retainedRun,
|
|
55
|
-
createdAt: existing?.createdAt || now(),
|
|
56
|
-
updatedAt: now(),
|
|
57
|
-
lastSeenAt: result.lastSeenAt,
|
|
58
|
-
lastPaneText: result.paneText,
|
|
59
|
-
pendingInput: null,
|
|
60
|
-
});
|
|
61
|
-
this.runtimeStore.updateACPState('acp-ensure-session', (draft) => {
|
|
62
|
-
draft.sessions[normalizedSlot] = session;
|
|
63
|
-
});
|
|
64
|
-
return session;
|
|
65
|
-
}
|
|
66
|
-
async startRun(slot, prompt, tool, cwdOverride, opts) {
|
|
67
|
-
const normalizedSlot = this.normalizeSlot(slot);
|
|
68
|
-
const _state = this.runtimeStore.readACPState();
|
|
69
|
-
const session = await this.ensureSession(normalizedSlot, tool, cwdOverride, {
|
|
70
|
-
extraEnv: opts?.extraEnv,
|
|
71
|
-
resumeSessionId: opts?.resumeSessionId,
|
|
72
|
-
skills: opts?.skills,
|
|
73
|
-
});
|
|
74
|
-
if (session.sessionState !== 'ready') {
|
|
75
|
-
throw new Error(`ACP session ${session.sessionId} is not ready (state=${session.sessionState})`);
|
|
76
|
-
}
|
|
77
|
-
const freshState = this.runtimeStore.readACPState();
|
|
78
|
-
const existing = freshState.sessions[normalizedSlot] || session;
|
|
79
|
-
return this.launchRun(freshState, normalizedSlot, existing, prompt, 'acp-start-run');
|
|
80
|
-
}
|
|
81
|
-
async resumeRun(slot, prompt) {
|
|
82
|
-
const normalizedSlot = this.normalizeSlot(slot);
|
|
83
|
-
const inspected = await this.inspect(normalizedSlot);
|
|
84
|
-
const existing = inspected.sessions[normalizedSlot];
|
|
85
|
-
if (!existing) {
|
|
86
|
-
throw new Error(`ACP session not found for slot ${normalizedSlot}`);
|
|
87
|
-
}
|
|
88
|
-
if (existing.sessionState === 'offline') {
|
|
89
|
-
throw new Error(`ACP session ${existing.sessionId} is offline`);
|
|
90
|
-
}
|
|
91
|
-
if (existing.sessionState !== 'ready') {
|
|
92
|
-
throw new Error(`ACP session ${existing.sessionId} is not ready for resume (state=${existing.sessionState})`);
|
|
93
|
-
}
|
|
94
|
-
return this.launchRun(inspected, normalizedSlot, existing, prompt, 'acp-resume-run');
|
|
95
|
-
}
|
|
96
|
-
async inspect(slot) {
|
|
97
|
-
const state = this.runtimeStore.readACPState();
|
|
98
|
-
const slots = slot ? [this.normalizeSlot(slot)] : Object.keys(state.sessions);
|
|
99
|
-
for (const slotName of slots) {
|
|
100
|
-
const session = state.sessions[slotName];
|
|
101
|
-
if (!session)
|
|
102
|
-
continue;
|
|
103
|
-
const sessionInfo = await this.client.inspectSession({
|
|
104
|
-
sessionName: session.sessionName,
|
|
105
|
-
tool: session.tool,
|
|
106
|
-
pid: session.pid,
|
|
107
|
-
});
|
|
108
|
-
let nextStatus = session.status;
|
|
109
|
-
let currentRun = session.currentRun;
|
|
110
|
-
let paneText = sessionInfo.paneText;
|
|
111
|
-
if (session.currentRun && !(sessionInfo.sessionState === 'offline' && isTerminalRunStatus(session.currentRun.status))) {
|
|
112
|
-
const runInfo = await this.client.inspectRun({
|
|
113
|
-
sessionName: session.sessionName,
|
|
114
|
-
tool: session.tool,
|
|
115
|
-
activeRun: true,
|
|
116
|
-
pid: session.pid,
|
|
117
|
-
});
|
|
118
|
-
paneText = runInfo.paneText || paneText;
|
|
119
|
-
if (runInfo.runState) {
|
|
120
|
-
currentRun = {
|
|
121
|
-
...session.currentRun,
|
|
122
|
-
status: runInfo.runState,
|
|
123
|
-
updatedAt: now(),
|
|
124
|
-
completedAt: runInfo.runState === 'completed' ? (session.currentRun.completedAt || now()) : session.currentRun.completedAt,
|
|
125
|
-
};
|
|
126
|
-
nextStatus = this.slotStatusFromRun(runInfo.runState);
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
else if (sessionInfo.sessionState === 'ready') {
|
|
130
|
-
nextStatus = 'idle';
|
|
131
|
-
}
|
|
132
|
-
else if (sessionInfo.sessionState === 'offline') {
|
|
133
|
-
nextStatus = 'offline';
|
|
134
|
-
}
|
|
135
|
-
else {
|
|
136
|
-
nextStatus = 'launching';
|
|
137
|
-
}
|
|
138
|
-
state.sessions[slotName] = {
|
|
139
|
-
...session,
|
|
140
|
-
status: nextStatus,
|
|
141
|
-
sessionState: sessionInfo.sessionState,
|
|
142
|
-
currentRun,
|
|
143
|
-
updatedAt: now(),
|
|
144
|
-
lastSeenAt: sessionInfo.lastSeenAt,
|
|
145
|
-
lastOutputAt: paneText ? now() : session.lastOutputAt,
|
|
146
|
-
lastPaneText: paneText,
|
|
147
|
-
pendingInput: null,
|
|
148
|
-
};
|
|
149
|
-
}
|
|
150
|
-
this.runtimeStore.updateACPState('acp-inspect', (draft) => {
|
|
151
|
-
draft.sessions = state.sessions;
|
|
152
|
-
});
|
|
153
|
-
return state;
|
|
154
|
-
}
|
|
155
|
-
async stopSession(slot) {
|
|
156
|
-
const normalizedSlot = this.normalizeSlot(slot);
|
|
157
|
-
const state = this.runtimeStore.readACPState();
|
|
158
|
-
const session = state.sessions[normalizedSlot];
|
|
159
|
-
if (!session) {
|
|
160
|
-
throw new Error(`ACP session not found for slot ${normalizedSlot}`);
|
|
161
|
-
}
|
|
162
|
-
await this.client.stopSession({
|
|
163
|
-
sessionName: session.sessionName,
|
|
164
|
-
tool: session.tool,
|
|
165
|
-
});
|
|
166
|
-
state.sessions[normalizedSlot] = {
|
|
167
|
-
...session,
|
|
168
|
-
status: 'offline',
|
|
169
|
-
sessionState: 'offline',
|
|
170
|
-
currentRun: session.currentRun
|
|
171
|
-
? {
|
|
172
|
-
...session.currentRun,
|
|
173
|
-
status: session.currentRun.status === 'completed' ? 'completed' : 'cancelled',
|
|
174
|
-
updatedAt: now(),
|
|
175
|
-
completedAt: session.currentRun.completedAt || now(),
|
|
176
|
-
}
|
|
177
|
-
: null,
|
|
178
|
-
updatedAt: now(),
|
|
179
|
-
lastSeenAt: now(),
|
|
180
|
-
lastPaneText: '',
|
|
181
|
-
pendingInput: null,
|
|
182
|
-
};
|
|
183
|
-
this.runtimeStore.updateACPState('acp-stop-session', (draft) => {
|
|
184
|
-
draft.sessions[normalizedSlot] = state.sessions[normalizedSlot];
|
|
185
|
-
});
|
|
186
|
-
}
|
|
187
|
-
/**
|
|
188
|
-
* GC:删掉 state.json 里早已死掉的会话记录 —— sessionState==='offline'、无 currentRun、
|
|
189
|
-
* 且 createdAt 早于 staleMs 前。返回删除条数。这些记录进程本就没了(不释放内存),纯粹让 state.json
|
|
190
|
-
* 收敛、不随建/删无限膨胀(曾攒到 139 条)。活着/在跑/近期的会话一律不动。
|
|
191
|
-
* ⚠️ 用 createdAt 而非 updatedAt:inspect() 每 2s 刷 updatedAt(含 offline 记录),会让它永不过期;
|
|
192
|
-
* createdAt 只在首次创建时写、稳定,才是真正的"这条记录多老"。
|
|
193
|
-
*/
|
|
194
|
-
gcOfflineSessions(staleMs) {
|
|
195
|
-
const now = Date.now();
|
|
196
|
-
const state = this.runtimeStore.readACPState();
|
|
197
|
-
const dead = Object.entries(state.sessions)
|
|
198
|
-
.filter(([, s]) => s.sessionState === 'offline' && !s.currentRun && now - (s.createdAt ? Date.parse(s.createdAt) : 0) > staleMs)
|
|
199
|
-
.map(([slot]) => slot);
|
|
200
|
-
if (dead.length === 0)
|
|
201
|
-
return 0;
|
|
202
|
-
this.runtimeStore.updateACPState('acp-gc', (draft) => {
|
|
203
|
-
for (const slot of dead)
|
|
204
|
-
delete draft.sessions[slot];
|
|
205
|
-
});
|
|
206
|
-
return dead.length;
|
|
207
|
-
}
|
|
208
|
-
normalizeSlot(slot) {
|
|
209
|
-
if (/^worker-\d+$/.test(slot))
|
|
210
|
-
return slot;
|
|
211
|
-
if (/^\d+$/.test(slot))
|
|
212
|
-
return `worker-${slot}`;
|
|
213
|
-
if (/^session-/.test(slot))
|
|
214
|
-
return slot; // harness mode session namespace
|
|
215
|
-
throw new Error(`Invalid slot: ${slot}. Use worker-N, N, or session-<name>`);
|
|
216
|
-
}
|
|
217
|
-
defaultTool() {
|
|
218
|
-
return 'claude';
|
|
219
|
-
}
|
|
220
|
-
subscribe(slot, listener) {
|
|
221
|
-
const normalizedSlot = this.normalizeSlot(slot);
|
|
222
|
-
const sessionName = this.buildSessionName(normalizedSlot);
|
|
223
|
-
return this.client.subscribe(sessionName, listener);
|
|
224
|
-
}
|
|
225
|
-
async cancelRun(slot) {
|
|
226
|
-
const normalizedSlot = this.normalizeSlot(slot);
|
|
227
|
-
const sessionName = this.buildSessionName(normalizedSlot);
|
|
228
|
-
return this.client.cancelRun(sessionName);
|
|
229
|
-
}
|
|
230
|
-
buildSessionName(slot) {
|
|
231
|
-
if (slot.startsWith('session-'))
|
|
232
|
-
return `sps-${slot}`;
|
|
233
|
-
return `sps-acp-${this.ctx.projectName}-${slot}`;
|
|
234
|
-
}
|
|
235
|
-
slotStatusFromRun(status) {
|
|
236
|
-
switch (status) {
|
|
237
|
-
case 'completed':
|
|
238
|
-
case 'cancelled':
|
|
239
|
-
case 'failed':
|
|
240
|
-
case 'lost':
|
|
241
|
-
return 'idle';
|
|
242
|
-
default:
|
|
243
|
-
return 'active';
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
upsertSession(state, slot, session) {
|
|
247
|
-
state.sessions[slot] = session;
|
|
248
|
-
return session;
|
|
249
|
-
}
|
|
250
|
-
async launchRun(state, slot, session, prompt, updatedBy) {
|
|
251
|
-
if (session.currentRun && !isTerminalRunStatus(session.currentRun.status)) {
|
|
252
|
-
throw new Error(`Slot ${slot} already has an active run (${session.currentRun.runId})`);
|
|
253
|
-
}
|
|
254
|
-
const result = await this.client.startRun({
|
|
255
|
-
sessionName: session.sessionName,
|
|
256
|
-
tool: session.tool,
|
|
257
|
-
prompt,
|
|
258
|
-
});
|
|
259
|
-
const run = {
|
|
260
|
-
runId: result.runId,
|
|
261
|
-
status: result.runState,
|
|
262
|
-
promptPreview: previewPrompt(prompt),
|
|
263
|
-
startedAt: now(),
|
|
264
|
-
updatedAt: now(),
|
|
265
|
-
completedAt: result.runState === 'completed' ? now() : null,
|
|
266
|
-
};
|
|
267
|
-
const updated = this.upsertSession(state, slot, {
|
|
268
|
-
...session,
|
|
269
|
-
status: this.slotStatusFromRun(result.runState),
|
|
270
|
-
sessionState: result.runState === 'completed' ? 'ready' : 'busy',
|
|
271
|
-
currentRun: run,
|
|
272
|
-
updatedAt: now(),
|
|
273
|
-
lastSeenAt: result.lastSeenAt,
|
|
274
|
-
lastPaneText: result.paneText,
|
|
275
|
-
pendingInput: null,
|
|
276
|
-
});
|
|
277
|
-
this.runtimeStore.updateACPState(updatedBy, (draft) => {
|
|
278
|
-
draft.sessions[slot] = updated;
|
|
279
|
-
});
|
|
280
|
-
return updated;
|
|
281
|
-
}
|
|
282
|
-
}
|
|
283
|
-
//# sourceMappingURL=ACPWorkerRuntime.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ACPWorkerRuntime.js","sourceRoot":"","sources":["../../src/providers/ACPWorkerRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAUvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,SAAS,GAAG;IACV,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;AACxE,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA8B;IACzD,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,OAAO,gBAAgB;IAIR;IACA;IAJF,YAAY,CAAe;IAE5C,YACmB,GAAmB,EACnB,SAAoB,IAAI,cAAc,EAAE;QADxC,QAAG,GAAH,GAAG,CAAgB;QACnB,WAAM,GAAN,MAAM,CAAkC;QAEzD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAY,EACZ,IAAc,EACd,WAAoB,EACpB,IASC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,QAAQ,EAAE,WAAW,IAAI,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QACnF,MAAM,GAAG,GAAG,WAAW,IAAI,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QACnE,MAAM,aAAa,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC;QACnF,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;QAE1E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC7C,WAAW;YACX,IAAI,EAAE,YAAY;YAClB,GAAG;YACH,aAAa;YACb,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YAC/B,UAAU,EAAE,IAAI,EAAE,UAAU;YAC5B,QAAQ,EAAE,IAAI,EAAE,QAAQ;YACxB,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3E,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChE,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE;YACxD,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW;YACX,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,QAAQ,EAAE,GAAG,IAAI,IAAI;YACxC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,YAAY,KAAK,OAAO;gBACrC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnC,CAAC,CAAC,WAAW;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,UAAU,EAAE,WAAW;YACvB,SAAS,EAAE,QAAQ,EAAE,SAAS,IAAI,GAAG,EAAE;YACvC,SAAS,EAAE,GAAG,EAAE;YAChB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,QAAQ;YAC7B,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/D,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,MAAc,EACd,IAAc,EACd,WAAoB,EACpB,IAAyF;QAEzF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE;YAC1E,QAAQ,EAAE,IAAI,EAAE,QAAQ;YACxB,eAAe,EAAE,IAAI,EAAE,eAAe;YACtC,MAAM,EAAE,IAAI,EAAE,MAAM;SACrB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,YAAY,KAAK,OAAO,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,SAAS,wBAAwB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC;QAChE,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,MAAc;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,CAAC,SAAS,aAAa,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,QAAQ,CAAC,YAAY,KAAK,OAAO,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,CAAC,SAAS,mCAAmC,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAC;QAChH,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAa;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE9E,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,OAAO;gBAAE,SAAS;YAEvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;gBACnD,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;YAEH,IAAI,UAAU,GAAkB,OAAO,CAAC,MAAM,CAAC;YAC/C,IAAI,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;YACpC,IAAI,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;YAEpC,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC,WAAW,CAAC,YAAY,KAAK,SAAS,IAAI,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBACtH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;oBAC3C,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,SAAS,EAAE,IAAI;oBACf,GAAG,EAAE,OAAO,CAAC,GAAG;iBACjB,CAAC,CAAC;gBACH,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC;gBACxC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACrB,UAAU,GAAG;wBACX,GAAG,OAAO,CAAC,UAAU;wBACrB,MAAM,EAAE,OAAO,CAAC,QAAQ;wBACxB,SAAS,EAAE,GAAG,EAAE;wBAChB,WAAW,EAAE,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW;qBAC3H,CAAC;oBACF,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;iBAAM,IAAI,WAAW,CAAC,YAAY,KAAK,OAAO,EAAE,CAAC;gBAChD,UAAU,GAAG,MAAM,CAAC;YACtB,CAAC;iBAAM,IAAI,WAAW,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBAClD,UAAU,GAAG,SAAS,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,WAAW,CAAC;YAC3B,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG;gBACzB,GAAG,OAAO;gBACV,MAAM,EAAE,UAAU;gBAClB,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,UAAU;gBACV,SAAS,EAAE,GAAG,EAAE;gBAChB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY;gBACrD,YAAY,EAAE,QAAQ;gBACtB,YAAY,EAAE,IAAI;aACnB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACxD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC,CAAC;QAEH,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG;YAC/B,GAAG,OAAO;YACV,MAAM,EAAE,SAAS;YACjB,YAAY,EAAE,SAAS;YACvB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC5B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,UAAU;oBACrB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW;oBAC7E,SAAS,EAAE,GAAG,EAAE;oBAChB,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,IAAI,GAAG,EAAE;iBACrD;gBACH,CAAC,CAAC,IAAI;YACR,SAAS,EAAE,GAAG,EAAE;YAChB,UAAU,EAAE,GAAG,EAAE;YACjB,YAAY,EAAE,EAAE;YAChB,YAAY,EAAE,IAAI;SACnB,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7D,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,iBAAiB,CAAC,OAAe;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;aACxC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;aAC/H,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YACnD,KAAK,MAAM,IAAI,IAAI,IAAI;gBAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEO,aAAa,CAAC,IAAY;QAChC,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,UAAU,IAAI,EAAE,CAAC;QAChD,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,CAAE,iCAAiC;QAC3E,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,sCAAsC,CAAC,CAAC;IAC/E,CAAC;IAEO,WAAW;QACjB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,QAAkE;QACxF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEO,gBAAgB,CAAC,IAAY;QACnC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO,OAAO,IAAI,EAAE,CAAC;QACtD,OAAO,WAAW,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;IACnD,CAAC;IAEO,iBAAiB,CAAC,MAA8B;QACtD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,WAAW,CAAC;YACjB,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,MAAM;gBACT,OAAO,MAAM,CAAC;YAChB;gBACE,OAAO,QAAQ,CAAC;QACpB,CAAC;IACH,CAAC;IAEO,aAAa,CACnB,KAAe,EACf,IAAY,EACZ,OAAyB;QAEzB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QAC/B,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,SAAS,CACrB,KAAe,EACf,IAAY,EACZ,OAAyB,EACzB,MAAc,EACd,SAAiB;QAEjB,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,+BAA+B,OAAO,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,GAAG,GAAiB;YACxB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,QAAQ;YACvB,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;YAChB,SAAS,EAAE,GAAG,EAAE;YAChB,WAAW,EAAE,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI;SAC5D,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE;YAC9C,GAAG,OAAO;YACV,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC/C,YAAY,EAAE,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;YAChE,UAAU,EAAE,GAAG;YACf,SAAS,EAAE,GAAG,EAAE;YAChB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,QAAQ;YAC7B,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACpD,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|