@coralai/sps-cli 0.60.2 → 0.62.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/index.d.ts.map +1 -1
- package/dist/console/index.js +2 -0
- package/dist/console/index.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/console/routes/mediaProviders.d.ts +10 -0
- package/dist/console/routes/mediaProviders.d.ts.map +1 -0
- package/dist/console/routes/mediaProviders.js +59 -0
- package/dist/console/routes/mediaProviders.js.map +1 -0
- package/dist/console-assets/assets/{index-ejSTHvCc.js → index-B5aqtaR6.js} +205 -205
- package/dist/console-assets/assets/{index-MCJOz4CB.css → index-IdqQLk1r.css} +1 -1
- package/dist/console-assets/index.html +2 -2
- 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/core/tts/DoubaoTts.d.ts +2 -1
- package/dist/core/tts/DoubaoTts.d.ts.map +1 -1
- package/dist/core/tts/DoubaoTts.js +24 -1
- package/dist/core/tts/DoubaoTts.js.map +1 -1
- 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 +5 -3
- package/dist/providers/RuntimeSessionRuntime.js.map +1 -1
- package/dist/providers/llm/codexModel.d.ts +6 -0
- package/dist/providers/llm/codexModel.d.ts.map +1 -1
- package/dist/providers/llm/codexModel.js +29 -0
- package/dist/providers/llm/codexModel.js.map +1 -1
- package/dist/providers/mcp/spsMcpServer.d.ts.map +1 -1
- package/dist/providers/mcp/spsMcpServer.js +38 -0
- package/dist/providers/mcp/spsMcpServer.js.map +1 -1
- package/dist/providers/media/adapters.d.ts +20 -0
- package/dist/providers/media/adapters.d.ts.map +1 -0
- package/dist/providers/media/adapters.js +585 -0
- package/dist/providers/media/adapters.js.map +1 -0
- package/dist/providers/media/generateAsset.d.ts +20 -0
- package/dist/providers/media/generateAsset.d.ts.map +1 -0
- package/dist/providers/media/generateAsset.js +34 -0
- package/dist/providers/media/generateAsset.js.map +1 -0
- package/dist/providers/media/mediaProviders.d.ts +46 -0
- package/dist/providers/media/mediaProviders.d.ts.map +1 -0
- package/dist/providers/media/mediaProviders.js +104 -0
- package/dist/providers/media/mediaProviders.js.map +1 -0
- 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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateAsset.d.ts","sourceRoot":"","sources":["../../../src/providers/media/generateAsset.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,qBAAqB,CAAC;AAEjF,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,eAAe,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAID,sFAAsF;AACtF,wBAAsB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqB3F"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module providers/media/generateAsset
|
|
3
|
+
* @description 媒体生成的引擎侧入口:按 capability(kind)解析当前上下文的 provider(项目级注入 >
|
|
4
|
+
* 全局默认)→ 按 adapter 调 API → 把产物写进 cwd → 返回路径。worker 经 `generate_asset`
|
|
5
|
+
* MCP 工具调它;密钥全程留服务端,skill 只给 kind + prompt,不碰 provider/key。
|
|
6
|
+
* @layer provider
|
|
7
|
+
* @boundedContext media
|
|
8
|
+
*/
|
|
9
|
+
import { mkdirSync, writeFileSync } from 'node:fs';
|
|
10
|
+
import { dirname, isAbsolute, join } from 'node:path';
|
|
11
|
+
import { ADAPTERS } from './adapters.js';
|
|
12
|
+
import { resolveMediaProvider } from './mediaProviders.js';
|
|
13
|
+
const EXT_DIR = { png: 'assets', jpg: 'assets', mp3: 'assets/audio', mp4: 'assets/video', glb: 'assets/models' };
|
|
14
|
+
/** 按 kind 解析 provider + adapter,生成并落盘。抛错时消息含原因(未配 provider / adapter 未实现 / API 错)。 */
|
|
15
|
+
export async function generateAsset(input) {
|
|
16
|
+
const resolved = resolveMediaProvider(input.capability);
|
|
17
|
+
if (!resolved) {
|
|
18
|
+
throw new Error(`未配置 ${input.capability} 生成 provider —— 请在控制台"资源模型"页配一个,或让上层应用注入`);
|
|
19
|
+
}
|
|
20
|
+
const { provider, model } = resolved;
|
|
21
|
+
const adapter = ADAPTERS[provider.adapter];
|
|
22
|
+
if (!adapter) {
|
|
23
|
+
throw new Error(`adapter "${provider.adapter}"(${input.capability})尚未实现`);
|
|
24
|
+
}
|
|
25
|
+
const opts = { prompt: input.prompt, model, size: input.size, referenceUrl: input.referenceUrl };
|
|
26
|
+
const { bytes, ext } = await adapter(provider, opts);
|
|
27
|
+
// 命名:调用方给了 outPath 就用它;否则 assets/<capability>-<时间戳>.<ext>。
|
|
28
|
+
const rel = input.outPath?.trim() || join(EXT_DIR[ext] ?? 'assets', `${input.capability}-${Date.now()}.${ext}`);
|
|
29
|
+
const abs = isAbsolute(rel) ? rel : join(input.cwd, rel);
|
|
30
|
+
mkdirSync(dirname(abs), { recursive: true });
|
|
31
|
+
writeFileSync(abs, bytes);
|
|
32
|
+
return { path: rel, provider: provider.name, model, bytes: bytes.length };
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=generateAsset.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateAsset.js","sourceRoot":"","sources":["../../../src/providers/media/generateAsset.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAgB,MAAM,eAAe,CAAC;AACvD,OAAO,EAAwB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAoBjF,MAAM,OAAO,GAA2B,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC;AAEzI,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAyB;IAC3D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,UAAU,0CAA0C,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,CAAC,OAAO,KAAK,KAAK,CAAC,UAAU,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,IAAI,GAAY,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;IAC1G,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAErD,2DAA2D;IAC3D,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,QAAQ,EAAE,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAChH,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACzD,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAE1B,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;AAC5E,CAAC"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/** 媒体能力类别(= console 标签 = skill 引用的 kind)。 */
|
|
2
|
+
export type MediaCapability = 'image' | 'video' | 'music' | 'voice' | '3d';
|
|
3
|
+
export declare const MEDIA_CAPABILITIES: readonly MediaCapability[];
|
|
4
|
+
export interface MediaProvider {
|
|
5
|
+
id: string;
|
|
6
|
+
name: string;
|
|
7
|
+
/** 能力类别(image/video/music/voice/3d)。 */
|
|
8
|
+
capability: MediaCapability;
|
|
9
|
+
/** 适配器名 —— 决定用哪套 API 请求/响应实现(tripo / volcengine / minimax / doubao …)。 */
|
|
10
|
+
adapter: string;
|
|
11
|
+
/** 根地址。 */
|
|
12
|
+
baseUrl: string;
|
|
13
|
+
/** API Key(只服务端持有,列表出站脱敏)。 */
|
|
14
|
+
apiKey: string;
|
|
15
|
+
/** 该 provider 提供的模型名(可多个)。 */
|
|
16
|
+
models: string[];
|
|
17
|
+
/** 能力特有的额外配置(如 voice 的 {speaker, resourceId})。 */
|
|
18
|
+
extra?: Record<string, unknown>;
|
|
19
|
+
createdAt?: string;
|
|
20
|
+
}
|
|
21
|
+
/** 列全部,或按能力过滤。 */
|
|
22
|
+
export declare function listMediaProviders(capability?: MediaCapability): MediaProvider[];
|
|
23
|
+
/** 按 id 取一个(供工具解析端点+key)。 */
|
|
24
|
+
export declare function getMediaProvider(id: string): MediaProvider | undefined;
|
|
25
|
+
/** 新增或按 id 覆盖。apiKey 传空串 = 保留原 key(前端不回传明文时用)。 */
|
|
26
|
+
export declare function upsertMediaProvider(entry: MediaProvider): MediaProvider;
|
|
27
|
+
/** 按 id 删。 */
|
|
28
|
+
export declare function deleteMediaProvider(id: string): boolean;
|
|
29
|
+
/** 出站脱敏:不回明文 apiKey,只留末 4 位提示。 */
|
|
30
|
+
export declare function publicMediaProvider(p: MediaProvider): Omit<MediaProvider, 'apiKey'> & {
|
|
31
|
+
keyMasked: string;
|
|
32
|
+
};
|
|
33
|
+
export interface MediaDefault {
|
|
34
|
+
providerId: string;
|
|
35
|
+
model?: string;
|
|
36
|
+
}
|
|
37
|
+
/** 读全部默认(按 capability)。 */
|
|
38
|
+
export declare function readMediaDefaults(): Partial<Record<MediaCapability, MediaDefault>>;
|
|
39
|
+
/** 设某能力的默认 provider/model。 */
|
|
40
|
+
export declare function setMediaDefault(capability: MediaCapability, def: MediaDefault): void;
|
|
41
|
+
/** 解析某能力当前该用的 provider:优先默认;默认缺失/失效则取该能力第一个。 */
|
|
42
|
+
export declare function resolveMediaProvider(capability: MediaCapability): {
|
|
43
|
+
provider: MediaProvider;
|
|
44
|
+
model?: string;
|
|
45
|
+
} | undefined;
|
|
46
|
+
//# sourceMappingURL=mediaProviders.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mediaProviders.d.ts","sourceRoot":"","sources":["../../../src/providers/media/mediaProviders.ts"],"names":[],"mappings":"AAcA,6CAA6C;AAC7C,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,IAAI,CAAC;AAE3E,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAA+C,CAAC;AAEzG,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,UAAU,EAAE,eAAe,CAAC;IAC5B,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAsBD,kBAAkB;AAClB,wBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAGhF;AAED,6BAA6B;AAC7B,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAEtE;AAED,kDAAkD;AAClD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,CAYvE;AAED,cAAc;AACd,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAMvD;AAED,kCAAkC;AAClC,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAI3G;AAKD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD,2BAA2B;AAC3B,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC,CAOlF;AAED,8BAA8B;AAC9B,wBAAgB,eAAe,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,EAAE,YAAY,GAAG,IAAI,CAMpF;AAED,gDAAgD;AAChD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,eAAe,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAOzH"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module providers/media/mediaProviders
|
|
3
|
+
* @description **sps 自有** 的媒体生成 provider 注册表(图片/视频/音乐/语音/3D)。一张扁平表,靠
|
|
4
|
+
* `capability` 分类、`adapter` 决定调用哪套 API(各家请求/响应差异大)。schema 对齐
|
|
5
|
+
* gameforge 的 ImageProvider,但落 sps 自有位置 `~/.coral/media-providers.json`(不再
|
|
6
|
+
* 反向读 gameforge 的 game-platform 目录)。密钥只服务端持有,出站脱敏。
|
|
7
|
+
* skill 只按 `capability`(kind)引用能力,不碰 provider/key —— 见 `generate_asset` 工具。
|
|
8
|
+
* @layer provider
|
|
9
|
+
* @boundedContext media
|
|
10
|
+
*/
|
|
11
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
12
|
+
import { homedir } from 'node:os';
|
|
13
|
+
import { dirname, join } from 'node:path';
|
|
14
|
+
export const MEDIA_CAPABILITIES = ['image', 'video', 'music', 'voice', '3d'];
|
|
15
|
+
/** sps 自有位置(不再读 game-platform)。 */
|
|
16
|
+
function file() {
|
|
17
|
+
return join(homedir(), '.coral', 'media-providers.json');
|
|
18
|
+
}
|
|
19
|
+
function readAll() {
|
|
20
|
+
const p = file();
|
|
21
|
+
try {
|
|
22
|
+
return existsSync(p) ? JSON.parse(readFileSync(p, 'utf-8')) : [];
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return [];
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function writeAll(list) {
|
|
29
|
+
const p = file();
|
|
30
|
+
mkdirSync(dirname(p), { recursive: true });
|
|
31
|
+
writeFileSync(p, `${JSON.stringify(list, null, 2)}\n`);
|
|
32
|
+
}
|
|
33
|
+
/** 列全部,或按能力过滤。 */
|
|
34
|
+
export function listMediaProviders(capability) {
|
|
35
|
+
const all = readAll();
|
|
36
|
+
return capability ? all.filter((p) => p.capability === capability) : all;
|
|
37
|
+
}
|
|
38
|
+
/** 按 id 取一个(供工具解析端点+key)。 */
|
|
39
|
+
export function getMediaProvider(id) {
|
|
40
|
+
return readAll().find((p) => p.id === id);
|
|
41
|
+
}
|
|
42
|
+
/** 新增或按 id 覆盖。apiKey 传空串 = 保留原 key(前端不回传明文时用)。 */
|
|
43
|
+
export function upsertMediaProvider(entry) {
|
|
44
|
+
const list = readAll();
|
|
45
|
+
const idx = list.findIndex((p) => p.id === entry.id);
|
|
46
|
+
const merged = {
|
|
47
|
+
...entry,
|
|
48
|
+
apiKey: entry.apiKey || (idx >= 0 ? list[idx].apiKey : ''),
|
|
49
|
+
createdAt: idx >= 0 ? (list[idx].createdAt ?? entry.createdAt) : (entry.createdAt ?? new Date().toISOString()),
|
|
50
|
+
};
|
|
51
|
+
if (idx >= 0)
|
|
52
|
+
list[idx] = merged;
|
|
53
|
+
else
|
|
54
|
+
list.push(merged);
|
|
55
|
+
writeAll(list);
|
|
56
|
+
return merged;
|
|
57
|
+
}
|
|
58
|
+
/** 按 id 删。 */
|
|
59
|
+
export function deleteMediaProvider(id) {
|
|
60
|
+
const list = readAll();
|
|
61
|
+
const next = list.filter((p) => p.id !== id);
|
|
62
|
+
if (next.length === list.length)
|
|
63
|
+
return false;
|
|
64
|
+
writeAll(next);
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
/** 出站脱敏:不回明文 apiKey,只留末 4 位提示。 */
|
|
68
|
+
export function publicMediaProvider(p) {
|
|
69
|
+
const { apiKey, ...rest } = p;
|
|
70
|
+
const keyMasked = apiKey ? `••••${apiKey.slice(-4)}` : '';
|
|
71
|
+
return { ...rest, keyMasked };
|
|
72
|
+
}
|
|
73
|
+
function defaultsFile() {
|
|
74
|
+
return join(homedir(), '.coral', 'media-defaults.json');
|
|
75
|
+
}
|
|
76
|
+
/** 读全部默认(按 capability)。 */
|
|
77
|
+
export function readMediaDefaults() {
|
|
78
|
+
try {
|
|
79
|
+
const p = defaultsFile();
|
|
80
|
+
return existsSync(p) ? JSON.parse(readFileSync(p, 'utf-8')) : {};
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
return {};
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/** 设某能力的默认 provider/model。 */
|
|
87
|
+
export function setMediaDefault(capability, def) {
|
|
88
|
+
const all = readMediaDefaults();
|
|
89
|
+
all[capability] = def;
|
|
90
|
+
const p = defaultsFile();
|
|
91
|
+
mkdirSync(dirname(p), { recursive: true });
|
|
92
|
+
writeFileSync(p, `${JSON.stringify(all, null, 2)}\n`);
|
|
93
|
+
}
|
|
94
|
+
/** 解析某能力当前该用的 provider:优先默认;默认缺失/失效则取该能力第一个。 */
|
|
95
|
+
export function resolveMediaProvider(capability) {
|
|
96
|
+
const list = listMediaProviders(capability);
|
|
97
|
+
if (list.length === 0)
|
|
98
|
+
return undefined;
|
|
99
|
+
const def = readMediaDefaults()[capability];
|
|
100
|
+
const provider = (def?.providerId && list.find((p) => p.id === def.providerId)) || list[0];
|
|
101
|
+
const model = def?.model ?? provider.models[0];
|
|
102
|
+
return { provider, model };
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=mediaProviders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mediaProviders.js","sourceRoot":"","sources":["../../../src/providers/media/mediaProviders.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@
|
|
|
14
14
|
* @boundedContext registry
|
|
15
15
|
*/
|
|
16
16
|
import type { ProjectConfig } from '../core/config.js';
|
|
17
|
-
import type { ProjectContext } from '../core/context.js';
|
|
18
17
|
import type { AgentRuntime } from '../core/runtimeTypes.js';
|
|
19
18
|
import type { Notifier } from '../interfaces/Notifier.js';
|
|
20
19
|
import type { RepoBackend } from '../interfaces/RepoBackend.js';
|
|
@@ -22,24 +21,12 @@ import type { TaskBackend } from '../interfaces/TaskBackend.js';
|
|
|
22
21
|
export declare function createTaskBackend(config: ProjectConfig, customStates?: string[]): TaskBackend;
|
|
23
22
|
export declare function createRepoBackend(config: ProjectConfig): RepoBackend;
|
|
24
23
|
export declare function createNotifier(config: ProjectConfig): Notifier;
|
|
25
|
-
export declare function createAgentRuntime(ctx: ProjectContext): AgentRuntime;
|
|
26
24
|
/** daemon 消费的会话宿主类型:AgentRuntime 契约 + sps 专属 gcOfflineSessions。
|
|
27
|
-
*
|
|
25
|
+
* RuntimeSessionRuntime(直连 agent-runtime 人才市场内核)满足。 */
|
|
28
26
|
export type SessionRuntime = AgentRuntime & {
|
|
29
27
|
gcOfflineSessions(staleMs: number): number;
|
|
30
28
|
};
|
|
31
29
|
/** Create session runtime for harness/daemon mode (sps agent) — no project config required.
|
|
32
|
-
*
|
|
33
|
-
export declare function createSessionRuntime(
|
|
34
|
-
projectName: string;
|
|
35
|
-
paths: {
|
|
36
|
-
repoDir: string;
|
|
37
|
-
logsDir: string;
|
|
38
|
-
stateFile: string;
|
|
39
|
-
acpStateFile?: string;
|
|
40
|
-
};
|
|
41
|
-
config: {
|
|
42
|
-
raw: Record<string, string>;
|
|
43
|
-
};
|
|
44
|
-
}): SessionRuntime;
|
|
30
|
+
* 统一宿主/人才市场(agent-runtime 市场内核):claude ACP 删除后为唯一会话宿主。 */
|
|
31
|
+
export declare function createSessionRuntime(): SessionRuntime;
|
|
45
32
|
//# sourceMappingURL=registry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAQhE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,CAG7F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAKpE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,QAAQ,CAE9D;AAED;wDACwD;AACxD,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG;IAAE,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE3F;2DAC2D;AAC3D,wBAAgB,oBAAoB,IAAI,cAAc,CAErD"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import { resolveGitHost } from '../core/gitHost.js';
|
|
2
|
-
import { loadAgentsConfig } from '../core/intel/agentsConfig.js';
|
|
3
|
-
import { ACPWorkerRuntime } from './ACPWorkerRuntime.js';
|
|
4
2
|
import { RuntimeSessionRuntime } from './RuntimeSessionRuntime.js';
|
|
5
3
|
import { GitHubRepoBackend } from './GitHubRepoBackend.js';
|
|
6
4
|
import { GitLabRepoBackend } from './GitLabRepoBackend.js';
|
|
@@ -19,14 +17,9 @@ export function createRepoBackend(config) {
|
|
|
19
17
|
export function createNotifier(config) {
|
|
20
18
|
return new MatrixNotifier(config);
|
|
21
19
|
}
|
|
22
|
-
export function createAgentRuntime(ctx) {
|
|
23
|
-
return new ACPWorkerRuntime(ctx);
|
|
24
|
-
}
|
|
25
20
|
/** Create session runtime for harness/daemon mode (sps agent) — no project config required.
|
|
26
|
-
*
|
|
27
|
-
export function createSessionRuntime(
|
|
28
|
-
|
|
29
|
-
return new RuntimeSessionRuntime();
|
|
30
|
-
return new ACPWorkerRuntime(sessionCtx);
|
|
21
|
+
* 统一宿主/人才市场(agent-runtime 市场内核):claude ACP 删除后为唯一会话宿主。 */
|
|
22
|
+
export function createSessionRuntime() {
|
|
23
|
+
return new RuntimeSessionRuntime();
|
|
31
24
|
}
|
|
32
25
|
//# sourceMappingURL=registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,UAAU,iBAAiB,CAAC,MAAqB,EAAE,YAAuB;IAC9E,8BAA8B;IAC9B,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAqB;IACrD,gDAAgD;IAChD,OAAO,cAAc,CAAC,MAAM,CAAC,KAAK,QAAQ;QACxC,CAAC,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAqB;IAClD,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAMD;2DAC2D;AAC3D,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,qBAAqB,EAAE,CAAC;AACrC,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface SubAgentSpec {
|
|
2
|
+
/** 交给子 agent 的完整任务描述。 */
|
|
3
|
+
task: string;
|
|
4
|
+
/** 运行目录(= 主 worker 的 worktree,产物落这)。 */
|
|
5
|
+
cwd: string;
|
|
6
|
+
/** 可选:覆盖子 agent 的角色 / 约束。 */
|
|
7
|
+
instructions?: string;
|
|
8
|
+
}
|
|
9
|
+
/** 起一个 openai 子 agent 跑 spec.task,await 返回最终文本结果(跑完即退,不对外流式)。 */
|
|
10
|
+
export declare function runSubAgent(spec: SubAgentSpec): Promise<{
|
|
11
|
+
output: string;
|
|
12
|
+
}>;
|
|
13
|
+
//# sourceMappingURL=runSubAgent.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runSubAgent.d.ts","sourceRoot":"","sources":["../../../src/providers/subagent/runSubAgent.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,YAAY;IAC3B,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,6BAA6B;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,iEAAiE;AACjE,wBAAsB,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAcjF"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module providers/subagent/runSubAgent
|
|
3
|
+
* @description 精简 **openai 子 agent** runner:主 worker 经 `run_subagent` MCP 工具把一个子任务
|
|
4
|
+
* 委托给一个独立 openai agent(@openai/agents),在同一个 cwd/worktree 里干活,await
|
|
5
|
+
* 拿最终结果返回。区别于 `OpenAiAgentBackend`(worker 生命周期,dispatch/subscribe)——
|
|
6
|
+
* 这里是**一次性调用、跑完即退**,专为"子 agent 当工具"用(skill 里让 worker 调它做
|
|
7
|
+
* 生成/转换/专项子任务)。卡片生命周期仍全在主 worker,子 agent 只是它调的一个工具。
|
|
8
|
+
* @layer provider
|
|
9
|
+
* @boundedContext agents
|
|
10
|
+
*/
|
|
11
|
+
import { Agent, run } from '@openai/agents';
|
|
12
|
+
import { loadAgentsConfig } from '../../core/intel/agentsConfig.js';
|
|
13
|
+
import { useLocalTracing } from '../../core/agents/localTracing.js';
|
|
14
|
+
import { createReviewerModel } from '../llm/modelFactory.js';
|
|
15
|
+
import { workerTools } from '../llm/workerTools.js';
|
|
16
|
+
// 本地 trace 处理器(不外发),与 LLMClient / OpenAiAgentBackend 同源。
|
|
17
|
+
useLocalTracing();
|
|
18
|
+
const DEFAULT_SUBAGENT_INSTRUCTIONS = '你是被主 worker 委托的**子 agent**,只完成交给你的这一个子任务。' +
|
|
19
|
+
'工具:read_file / list_dir / write_file / run_bash。' +
|
|
20
|
+
'**务必真实落地产物(写文件 / 跑命令),不要只在回复里描述**。完成后用一两句话说明你产出了什么(如文件路径)。';
|
|
21
|
+
/** 起一个 openai 子 agent 跑 spec.task,await 返回最终文本结果(跑完即退,不对外流式)。 */
|
|
22
|
+
export async function runSubAgent(spec) {
|
|
23
|
+
const cfg = loadAgentsConfig();
|
|
24
|
+
// 子 agent 用 openai 兼容 model —— 复用 reviewer 的 provider/model(已配好的 openai 路)。
|
|
25
|
+
const model = createReviewerModel({ providerId: cfg.reviewer.providerId, model: cfg.reviewer.model });
|
|
26
|
+
const agent = new Agent({
|
|
27
|
+
name: 'subagent',
|
|
28
|
+
instructions: spec.instructions ?? DEFAULT_SUBAGENT_INSTRUCTIONS,
|
|
29
|
+
model,
|
|
30
|
+
tools: workerTools(spec.cwd),
|
|
31
|
+
});
|
|
32
|
+
const r = await run(agent, spec.task, { stream: true });
|
|
33
|
+
await r.completed;
|
|
34
|
+
const output = String(r.finalOutput ?? '(子 agent 无输出)');
|
|
35
|
+
return { output };
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=runSubAgent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runSubAgent.js","sourceRoot":"","sources":["../../../src/providers/subagent/runSubAgent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,yDAAyD;AACzD,eAAe,EAAE,CAAC;AAElB,MAAM,6BAA6B,GACjC,2CAA2C;IAC3C,kDAAkD;IAClD,4DAA4D,CAAC;AAW/D,iEAAiE;AACjE,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAkB;IAClD,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAC;IAC/B,4EAA4E;IAC5E,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IACtG,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,6BAA6B;QAChE,KAAK;QACL,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;KAC7B,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,CAAC,CAAC,SAAS,CAAC;IAClB,MAAM,MAAM,GAAG,MAAM,CAAE,CAA+B,CAAC,WAAW,IAAI,eAAe,CAAC,CAAC;IACvF,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CardService.d.ts","sourceRoot":"","sources":["../../src/services/CardService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CardService.d.ts","sourceRoot":"","sources":["../../src/services/CardService.ts"],"names":[],"mappings":"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"}
|
|
@@ -263,19 +263,26 @@ export class CardService {
|
|
|
263
263
|
const oldState = card.state; // 同 update:snapshot 避免 move 后回读失真
|
|
264
264
|
const seqStr = String(seq);
|
|
265
265
|
try {
|
|
266
|
-
//
|
|
267
|
-
|
|
268
|
-
|
|
266
|
+
// 清生命周期/瞬态 label 让卡真正从头跑;**保留 AI-PIPELINE**(流水线成员标记,删了落 Backlog 也不会被派)
|
|
267
|
+
// + PRIORITY(修正卡优先级)+ 用户自定义。与 CLI `sps reset` 的 label 集对齐。
|
|
268
|
+
const cleanLabels = (card.labels ?? []).filter((l) => l !== 'NEEDS-FIX' &&
|
|
269
269
|
l !== 'CLAIMED' &&
|
|
270
|
-
l !== '
|
|
270
|
+
l !== 'STALE-RUNTIME' &&
|
|
271
|
+
l !== 'BLOCKED' &&
|
|
272
|
+
l !== 'CONFLICT' &&
|
|
273
|
+
l !== 'WAITING-CONFIRMATION' &&
|
|
274
|
+
l !== 'ACK-TIMEOUT' &&
|
|
271
275
|
l !== 'REVIEWING' &&
|
|
272
276
|
!l.startsWith('STARTED-') &&
|
|
273
|
-
!l.startsWith('COMPLETED-')
|
|
277
|
+
!l.startsWith('COMPLETED-') &&
|
|
278
|
+
!l.startsWith('ACK-RETRIED-'));
|
|
274
279
|
await backend.value.setLabels(seqStr, cleanLabels);
|
|
275
280
|
await backend.value.releaseClaim(seqStr);
|
|
276
281
|
await backend.value.resetRetryCount(seqStr);
|
|
277
|
-
|
|
278
|
-
|
|
282
|
+
// v0.51.9 起 SchedulerEngine 休眠、Planning 不再自动提升 → reset 必须落 Backlog(与 CLI `sps reset` 一致),
|
|
283
|
+
// 否则卡死在 Planning 没人派。语义:reset = "清干净并重新跑"。
|
|
284
|
+
if (oldState !== 'Backlog') {
|
|
285
|
+
await backend.value.move(seqStr, 'Backlog');
|
|
279
286
|
}
|
|
280
287
|
}
|
|
281
288
|
catch (cause) {
|
|
@@ -289,16 +296,16 @@ export class CardService {
|
|
|
289
296
|
type: 'card.updated',
|
|
290
297
|
project,
|
|
291
298
|
seq,
|
|
292
|
-
patch: { state: '
|
|
299
|
+
patch: { state: 'Backlog' },
|
|
293
300
|
ts: now,
|
|
294
301
|
});
|
|
295
|
-
if (oldState !== '
|
|
302
|
+
if (oldState !== 'Backlog') {
|
|
296
303
|
this.deps.events.emit({
|
|
297
304
|
type: 'card.moved',
|
|
298
305
|
project,
|
|
299
306
|
seq,
|
|
300
307
|
from: oldState,
|
|
301
|
-
to: '
|
|
308
|
+
to: 'Backlog',
|
|
302
309
|
ts: now,
|
|
303
310
|
});
|
|
304
311
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CardService.js","sourceRoot":"","sources":["../../src/services/CardService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CardService.js","sourceRoot":"","sources":["../../src/services/CardService.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ export interface PipelineExecutor {
|
|
|
36
36
|
stop(project: string): Promise<void>;
|
|
37
37
|
reset(project: string, opts: ResetPipelineOpts): Promise<void>;
|
|
38
38
|
recoverOrphans(project: string): Promise<number>;
|
|
39
|
+
clearCardRuntime(project: string, seq: number): Promise<void>;
|
|
39
40
|
}
|
|
40
41
|
export interface PipelineServiceDeps {
|
|
41
42
|
readonly fs: FileSystem;
|
|
@@ -51,6 +52,9 @@ export declare class PipelineService {
|
|
|
51
52
|
start(project: string): Promise<Result<PipelineStatusInfo, DomainError>>;
|
|
52
53
|
stop(project: string): Promise<Result<void, DomainError>>;
|
|
53
54
|
reset(project: string, opts?: ResetPipelineOpts): Promise<Result<void, DomainError>>;
|
|
55
|
+
/** 单卡运行时清理:删 lease/activeCard + 释放该卡占用的 worker slot(不停 tick)。
|
|
56
|
+
* console 单卡 reset 在 CardService.reset(清 PM 层)之后调它补齐运行时层,避免残留 lease 致卡被跳过。 */
|
|
57
|
+
clearCardRuntime(project: string, seq: number): Promise<Result<void, DomainError>>;
|
|
54
58
|
status(project: string): Promise<Result<PipelineStatusInfo, DomainError>>;
|
|
55
59
|
listPipelines(project: string): Promise<Result<PipelineSummary>>;
|
|
56
60
|
readPipeline(project: string, filename: string): Promise<Result<PipelineFileContent, DomainError>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PipelineService.d.ts","sourceRoot":"","sources":["../../src/services/PipelineService.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,KAAK,WAAW,EAAe,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAW3D,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;AAEhD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAM/D,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"PipelineService.d.ts","sourceRoot":"","sources":["../../src/services/PipelineService.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,6 +132,22 @@ export class PipelineService {
|
|
|
132
132
|
}
|
|
133
133
|
return ok(undefined);
|
|
134
134
|
}
|
|
135
|
+
/** 单卡运行时清理:删 lease/activeCard + 释放该卡占用的 worker slot(不停 tick)。
|
|
136
|
+
* console 单卡 reset 在 CardService.reset(清 PM 层)之后调它补齐运行时层,避免残留 lease 致卡被跳过。 */
|
|
137
|
+
async clearCardRuntime(project, seq) {
|
|
138
|
+
if (!isValidProject(project))
|
|
139
|
+
return err(invalidProject());
|
|
140
|
+
if (!this.deps.executor) {
|
|
141
|
+
return err(domainError('internal', 'EXECUTOR_MISSING', 'PipelineExecutor not injected'));
|
|
142
|
+
}
|
|
143
|
+
try {
|
|
144
|
+
await this.deps.executor.clearCardRuntime(project, seq);
|
|
145
|
+
}
|
|
146
|
+
catch (cause) {
|
|
147
|
+
return err(domainError('external', 'CARD_RUNTIME_CLEAR_FAIL', 'Failed to clear card runtime state', { cause }));
|
|
148
|
+
}
|
|
149
|
+
return ok(undefined);
|
|
150
|
+
}
|
|
135
151
|
async status(project) {
|
|
136
152
|
if (!isValidProject(project))
|
|
137
153
|
return err(invalidProject());
|