@jingyi0605/codingns 0.3.5 → 0.3.6
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/README.md +13 -0
- package/bin/codingns.mjs +880 -9
- package/dist/public/assets/{TerminalPage-CgrfstRm.js → TerminalPage-D00S4KM6.js} +16 -16
- package/dist/public/assets/index-BlOinYqR.js +122 -0
- package/dist/public/assets/index-Dg_7g6lA.css +1 -0
- package/dist/public/index.html +2 -2
- package/dist/server/config/opencode-base-url-resolver.d.ts +7 -0
- package/dist/server/config/opencode-base-url-resolver.js +48 -11
- package/dist/server/config/opencode-base-url-resolver.js.map +1 -1
- package/dist/server/config/opencode-system-probe-helper-client.d.ts +4 -0
- package/dist/server/config/opencode-system-probe-helper-client.js +29 -0
- package/dist/server/config/opencode-system-probe-helper-client.js.map +1 -1
- package/dist/server/config/opencode-system-probe-helper-process.d.ts +12 -0
- package/dist/server/config/opencode-system-probe-helper-process.js +34 -7
- package/dist/server/config/opencode-system-probe-helper-process.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-controller.d.ts +144 -0
- package/dist/server/modules/assistant-capability/assistant-capability-controller.js +242 -1
- package/dist/server/modules/assistant-capability/assistant-capability-controller.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.d.ts +133 -2
- package/dist/server/modules/assistant-capability/assistant-capability-service.js +395 -2
- package/dist/server/modules/assistant-capability/assistant-capability-service.js.map +1 -1
- package/dist/server/modules/butler/butler-inbox-instruction-adapter.js +7 -6
- package/dist/server/modules/butler/butler-inbox-instruction-adapter.js.map +1 -1
- package/dist/server/modules/butler/butler-workspace-context.js +24 -13
- package/dist/server/modules/butler/butler-workspace-context.js.map +1 -1
- package/dist/server/modules/debug-target/debug-target-controller.d.ts +13 -0
- package/dist/server/modules/debug-target/debug-target-controller.js +77 -2
- package/dist/server/modules/debug-target/debug-target-controller.js.map +1 -1
- package/dist/server/modules/debug-target/debug-target-service.d.ts +11 -2
- package/dist/server/modules/debug-target/debug-target-service.js +138 -3
- package/dist/server/modules/debug-target/debug-target-service.js.map +1 -1
- package/dist/server/modules/git/git-command-helper-client.d.ts +2 -0
- package/dist/server/modules/git/git-command-helper-client.js +52 -3
- package/dist/server/modules/git/git-command-helper-client.js.map +1 -1
- package/dist/server/modules/git/git-command-helper-process.js +62 -9
- package/dist/server/modules/git/git-command-helper-process.js.map +1 -1
- package/dist/server/modules/git/git-command-runner.d.ts +1 -0
- package/dist/server/modules/git/git-command-runner.js +25 -0
- package/dist/server/modules/git/git-command-runner.js.map +1 -1
- package/dist/server/modules/git/git-controller.js +8 -7
- package/dist/server/modules/git/git-controller.js.map +1 -1
- package/dist/server/modules/git/git-read-service.d.ts +7 -7
- package/dist/server/modules/git/git-read-service.js +41 -24
- package/dist/server/modules/git/git-read-service.js.map +1 -1
- package/dist/server/modules/model-switch/cc-switch-adapter.js +6 -2
- package/dist/server/modules/model-switch/cc-switch-adapter.js.map +1 -1
- package/dist/server/modules/provider/codex-model-options.js +2 -3
- package/dist/server/modules/provider/codex-model-options.js.map +1 -1
- package/dist/server/modules/provider/opencode-model-options.js +2 -3
- package/dist/server/modules/provider/opencode-model-options.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-client.d.ts +9 -4
- package/dist/server/modules/provider/provider-discovery-helper-client.js +87 -11
- package/dist/server/modules/provider/provider-discovery-helper-client.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js +52 -47
- package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-runtime.d.ts +4 -0
- package/dist/server/modules/provider/provider-discovery-runtime.js +65 -0
- package/dist/server/modules/provider/provider-discovery-runtime.js.map +1 -0
- package/dist/server/modules/sessions/session-history-service.d.ts +5 -2
- package/dist/server/modules/sessions/session-history-service.js +214 -26
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-service.d.ts +2 -0
- package/dist/server/modules/sessions/session-live-runtime-service.js +67 -23
- package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
- package/dist/server/modules/skills/builtin-skill-service.d.ts +12 -0
- package/dist/server/modules/skills/builtin-skill-service.js +49 -0
- package/dist/server/modules/skills/builtin-skill-service.js.map +1 -0
- package/dist/server/modules/skills/builtin-skills/codingns-assistant/SKILL.md +75 -0
- package/dist/server/modules/skills/builtin-skills/codingns-assistant/agents/openai.yaml +4 -0
- package/dist/server/modules/skills/builtin-skills/codingns-assistant/references/cli-workflow.md +130 -0
- package/dist/server/modules/skills/skill-manager-service.d.ts +7 -0
- package/dist/server/modules/skills/skill-manager-service.js +98 -0
- package/dist/server/modules/skills/skill-manager-service.js.map +1 -1
- package/dist/server/modules/tailscale/tailscale-helper-client.d.ts +1 -0
- package/dist/server/modules/tailscale/tailscale-helper-client.js +12 -0
- package/dist/server/modules/tailscale/tailscale-helper-client.js.map +1 -1
- package/dist/server/modules/tasks/task-helper-client.d.ts +5 -0
- package/dist/server/modules/tasks/task-helper-client.js +45 -0
- package/dist/server/modules/tasks/task-helper-client.js.map +1 -1
- package/dist/server/modules/tasks/task-helper-process-handlers.d.ts +10 -3
- package/dist/server/modules/tasks/task-helper-process-handlers.js +7 -5
- package/dist/server/modules/tasks/task-helper-process-handlers.js.map +1 -1
- package/dist/server/modules/tasks/task-helper-process.js +11 -1
- package/dist/server/modules/tasks/task-helper-process.js.map +1 -1
- package/dist/server/modules/tasks/task-lane-executors.js +2 -2
- package/dist/server/modules/tasks/task-lane-executors.js.map +1 -1
- package/dist/server/modules/tasks/task-types.d.ts +1 -0
- package/dist/server/modules/tasks/task-types.js +1 -0
- package/dist/server/modules/tasks/task-types.js.map +1 -1
- package/dist/server/modules/terminal/command-template-service.d.ts +2 -2
- package/dist/server/modules/terminal/command-template-service.js +4 -4
- package/dist/server/modules/terminal/command-template-service.js.map +1 -1
- package/dist/server/modules/terminal/runtime/terminal-log-writer-client.js +1 -1
- package/dist/server/modules/terminal/runtime/terminal-log-writer-client.js.map +1 -1
- package/dist/server/modules/terminal/runtime/terminal-log-writer-process.js +160 -11
- package/dist/server/modules/terminal/runtime/terminal-log-writer-process.js.map +1 -1
- package/dist/server/modules/terminal/template-port-runtime.d.ts +1 -1
- package/dist/server/modules/terminal/template-port-runtime.js +87 -37
- package/dist/server/modules/terminal/template-port-runtime.js.map +1 -1
- package/dist/server/modules/terminal/terminal-service.d.ts +4 -0
- package/dist/server/modules/terminal/terminal-service.js +35 -1
- package/dist/server/modules/terminal/terminal-service.js.map +1 -1
- package/dist/server/modules/workbench/workbench-service.js +3 -3
- package/dist/server/modules/workbench/workbench-service.js.map +1 -1
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.d.ts +1 -0
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js +118 -39
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map +1 -1
- package/dist/server/modules/workspace/workspace-code-composition.d.ts +1 -0
- package/dist/server/modules/workspace/workspace-code-composition.js +183 -1
- package/dist/server/modules/workspace/workspace-code-composition.js.map +1 -1
- package/dist/server/modules/workspace/workspace-service.js +54 -17
- package/dist/server/modules/workspace/workspace-service.js.map +1 -1
- package/dist/server/modules/worktree/worktree-cleanup-service.d.ts +1 -1
- package/dist/server/modules/worktree/worktree-cleanup-service.js +22 -17
- package/dist/server/modules/worktree/worktree-cleanup-service.js.map +1 -1
- package/dist/server/modules/worktree/worktree-controller.js +6 -5
- package/dist/server/modules/worktree/worktree-controller.js.map +1 -1
- package/dist/server/modules/worktree/worktree-manager.d.ts +1 -1
- package/dist/server/modules/worktree/worktree-manager.js +26 -19
- package/dist/server/modules/worktree/worktree-manager.js.map +1 -1
- package/dist/server/modules/worktree/worktree-merge-service.d.ts +2 -2
- package/dist/server/modules/worktree/worktree-merge-service.js +34 -27
- package/dist/server/modules/worktree/worktree-merge-service.js.map +1 -1
- package/dist/server/modules/worktree/worktree-sync-service.d.ts +1 -1
- package/dist/server/modules/worktree/worktree-sync-service.js +5 -3
- package/dist/server/modules/worktree/worktree-sync-service.js.map +1 -1
- package/dist/server/routes/assistant.js +24 -0
- package/dist/server/routes/assistant.js.map +1 -1
- package/dist/server/server/create-server.js +16 -1
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/shared/http/request-abort.d.ts +2 -0
- package/dist/server/shared/http/request-abort.js +38 -0
- package/dist/server/shared/http/request-abort.js.map +1 -0
- package/dist/server/ws/workbench-ws-hub.d.ts +1 -0
- package/dist/server/ws/workbench-ws-hub.js +25 -3
- package/dist/server/ws/workbench-ws-hub.js.map +1 -1
- package/package.json +1 -1
- package/scripts/postinstall.mjs +33 -0
- package/dist/public/assets/index-Cek6u0b9.css +0 -1
- package/dist/public/assets/index-THHY79si.js +0 -122
package/dist/server/modules/skills/builtin-skills/codingns-assistant/references/cli-workflow.md
ADDED
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
# CodingNS Assistant CLI Workflow
|
|
2
|
+
|
|
3
|
+
## 1. 总原则
|
|
4
|
+
|
|
5
|
+
- 先确认认证入口可用,再查能力,再查对象,再执行动作。
|
|
6
|
+
- 不直接写项目代码。
|
|
7
|
+
- 不知道参数时先查 help,不要硬猜。
|
|
8
|
+
|
|
9
|
+
## 2. 先确认认证入口
|
|
10
|
+
|
|
11
|
+
- 显式传了 `--token` / `--base-url` 就直接用。
|
|
12
|
+
- 如果已设置 `CODINGNS_ACCESS_TOKEN` / `CODINGNS_BASE_URL`,直接继续执行。
|
|
13
|
+
- 如果设置了 `CODINGNS_AUTH_FILE` 或 `BUTLER_AUTH_FILE`,CLI 会从那个文件读取。
|
|
14
|
+
- 在 Butler 工作区里,CLI 默认会继续向上查找 `BUTLER_AUTH.json`,通常不需要手工 export 环境变量。
|
|
15
|
+
- 只有自动发现失败、当前目录不在 Butler 工作区,或者要切换到别的 Host / 凭证文件时,才手工导出环境变量或显式传 `--token`。
|
|
16
|
+
|
|
17
|
+
## 3. 先查哪些 help
|
|
18
|
+
|
|
19
|
+
全局入口:
|
|
20
|
+
|
|
21
|
+
```bash
|
|
22
|
+
codingns assistant --help
|
|
23
|
+
codingns assistant help debug-targets
|
|
24
|
+
codingns assistant help debug-runtimes
|
|
25
|
+
codingns assistant help workspaces
|
|
26
|
+
codingns assistant help worktrees
|
|
27
|
+
codingns assistant help sessions
|
|
28
|
+
codingns assistant help sessions send
|
|
29
|
+
```
|
|
30
|
+
|
|
31
|
+
按组查询:
|
|
32
|
+
|
|
33
|
+
```bash
|
|
34
|
+
codingns assistant capabilities --help
|
|
35
|
+
codingns assistant debug-targets --help
|
|
36
|
+
codingns assistant debug-runtimes --help
|
|
37
|
+
codingns assistant workspaces --help
|
|
38
|
+
codingns assistant worktrees --help
|
|
39
|
+
codingns assistant projects --help
|
|
40
|
+
codingns assistant sessions --help
|
|
41
|
+
codingns assistant terminals --help
|
|
42
|
+
```
|
|
43
|
+
|
|
44
|
+
按动作查询:
|
|
45
|
+
|
|
46
|
+
```bash
|
|
47
|
+
codingns assistant workspaces list --help
|
|
48
|
+
codingns assistant debug-targets launch-plan --help
|
|
49
|
+
codingns assistant debug-targets run --help
|
|
50
|
+
codingns assistant worktrees create --help
|
|
51
|
+
codingns assistant projects list --help
|
|
52
|
+
codingns assistant sessions get --help
|
|
53
|
+
codingns assistant sessions send --help
|
|
54
|
+
codingns assistant terminals send --help
|
|
55
|
+
```
|
|
56
|
+
|
|
57
|
+
## 4. 常用工作流
|
|
58
|
+
|
|
59
|
+
### 看工作区和工作树
|
|
60
|
+
|
|
61
|
+
```bash
|
|
62
|
+
codingns assistant workspaces list [--token <token>]
|
|
63
|
+
codingns assistant workspaces management <workspaceId> [--token <token>]
|
|
64
|
+
codingns assistant worktrees tree --root-workspace-id <workspaceId> [--token <token>]
|
|
65
|
+
codingns assistant worktrees merge-preview <workspaceId> [--token <token>]
|
|
66
|
+
```
|
|
67
|
+
|
|
68
|
+
### 分析调试目标并显式请求端口
|
|
69
|
+
|
|
70
|
+
```bash
|
|
71
|
+
codingns assistant debug-targets analyze --workspace-id <workspaceId> --root-path <path> [--token <token>]
|
|
72
|
+
codingns assistant debug-targets launch-plan <targetId> --port-request role=frontend,cwd=apps/web,port=43001 --port-request role=backend,cwd=apps/api,port=44001 [--token <token>]
|
|
73
|
+
codingns assistant debug-targets run <targetId> --port-request role=backend,cwd=apps/api,port=44001 [--token <token>]
|
|
74
|
+
codingns assistant debug-targets runtime-latest <targetId> [--token <token>]
|
|
75
|
+
codingns assistant debug-runtimes get <runtimeId> [--token <token>]
|
|
76
|
+
```
|
|
77
|
+
|
|
78
|
+
### 看项目和会话
|
|
79
|
+
|
|
80
|
+
```bash
|
|
81
|
+
codingns assistant capabilities list [--token <token>]
|
|
82
|
+
codingns assistant projects list [--token <token>]
|
|
83
|
+
codingns assistant projects get <projectId> [--token <token>]
|
|
84
|
+
codingns assistant sessions list --project <projectId> [--token <token>]
|
|
85
|
+
codingns assistant sessions get <sessionId> [--token <token>]
|
|
86
|
+
codingns assistant sessions runtime <sessionId> [--token <token>]
|
|
87
|
+
codingns assistant sessions messages <sessionId> --limit 20 [--token <token>]
|
|
88
|
+
```
|
|
89
|
+
|
|
90
|
+
### 通过真实会话推进开发
|
|
91
|
+
|
|
92
|
+
```bash
|
|
93
|
+
codingns assistant sessions send <sessionId> --message "继续修复类型错误" [--token <token>]
|
|
94
|
+
```
|
|
95
|
+
|
|
96
|
+
如果需要从某条消息重新开分支:
|
|
97
|
+
|
|
98
|
+
```bash
|
|
99
|
+
codingns assistant sessions fork <sessionId> --message-id <messageId> --token <token>
|
|
100
|
+
```
|
|
101
|
+
|
|
102
|
+
### 通过终端补命令
|
|
103
|
+
|
|
104
|
+
先看终端状态和最近输出:
|
|
105
|
+
|
|
106
|
+
```bash
|
|
107
|
+
codingns assistant terminals list --project-id <projectId> [--token <token>]
|
|
108
|
+
codingns assistant terminals history <terminalId> --limit 50 [--token <token>]
|
|
109
|
+
```
|
|
110
|
+
|
|
111
|
+
确认需要发命令后再执行:
|
|
112
|
+
|
|
113
|
+
```bash
|
|
114
|
+
codingns assistant terminals send <terminalId> --input "npm test\n" [--token <token>]
|
|
115
|
+
codingns assistant terminals close <terminalId> --token <token>
|
|
116
|
+
```
|
|
117
|
+
|
|
118
|
+
## 5. 什么时候优先用什么
|
|
119
|
+
|
|
120
|
+
- 需要看有哪些工作区或导入目标:优先 `workspaces list`、`workspaces browse`
|
|
121
|
+
- 需要看子工作树结构或回收状态:优先 `worktrees tree`
|
|
122
|
+
- 需要看子工作树能不能合并:优先 `worktrees merge-preview`
|
|
123
|
+
- 需要为并行工作区分析调试目标或固定端口:优先 `debug-targets analyze`、`debug-targets launch-plan`
|
|
124
|
+
- 需要看显式端口请求有没有落到实际运行时:优先 `debug-targets runtime-latest`、`debug-runtimes get`
|
|
125
|
+
- 需要继续已有开发上下文:优先 `sessions send`
|
|
126
|
+
- 需要查看会话是否还活着:优先 `sessions runtime`
|
|
127
|
+
- 需要看模型最近说了什么:优先 `sessions messages`
|
|
128
|
+
- 需要看构建、测试、脚本输出:优先 `terminals history`
|
|
129
|
+
- 需要补一条 shell 命令:优先 `terminals send`
|
|
130
|
+
- 需要停掉一个受控进程:优先 `terminals close`
|
|
@@ -16,6 +16,10 @@ export interface SyncManagedSkillInput {
|
|
|
16
16
|
skillId: string;
|
|
17
17
|
targetCli: readonly SkillTargetCli[];
|
|
18
18
|
}
|
|
19
|
+
export interface EnsureBuiltinSkillInput {
|
|
20
|
+
sourcePath: string;
|
|
21
|
+
targetCli: readonly SkillTargetCli[];
|
|
22
|
+
}
|
|
19
23
|
export interface ImportUnmanagedSkillInput {
|
|
20
24
|
targetCli: SkillTargetCli;
|
|
21
25
|
directoryPath: string;
|
|
@@ -73,9 +77,12 @@ export declare class SkillManagerService {
|
|
|
73
77
|
getOverview(options?: ScanSkillsOptions): SkillOverviewResult;
|
|
74
78
|
addManagedSkill(input: AddManagedSkillInput): ManagedSkillMutationResult;
|
|
75
79
|
syncManagedSkill(input: SyncManagedSkillInput): ManagedSkillMutationResult;
|
|
80
|
+
ensureBuiltinSkill(input: EnsureBuiltinSkillInput): ManagedSkillMutationResult;
|
|
76
81
|
importUnmanagedSkill(input: ImportUnmanagedSkillInput): ManagedSkillMutationResult;
|
|
77
82
|
private syncManagedSkillRecord;
|
|
83
|
+
private forceSyncManagedSkillRecord;
|
|
78
84
|
private syncOneTarget;
|
|
85
|
+
private forceSyncOneTarget;
|
|
79
86
|
private requireSsotRootDir;
|
|
80
87
|
private resolveSsotPath;
|
|
81
88
|
private createManagedSkillId;
|
|
@@ -144,6 +144,44 @@ export class SkillManagerService {
|
|
|
144
144
|
ssotPath: this.resolveSsotPath(skill.directoryName)
|
|
145
145
|
};
|
|
146
146
|
}
|
|
147
|
+
ensureBuiltinSkill(input) {
|
|
148
|
+
const sourcePath = resolveSourceDirectoryPath(input.sourcePath);
|
|
149
|
+
const sourceSnapshot = readSkillDirectorySnapshot("codex", sourcePath, sourcePath);
|
|
150
|
+
const existingSkill = this.managedSkillRepository.findByDirectoryName(sourceSnapshot.directoryName);
|
|
151
|
+
const ssotRootDir = this.requireSsotRootDir();
|
|
152
|
+
const timestamp = this.now();
|
|
153
|
+
const skill = existingSkill
|
|
154
|
+
? {
|
|
155
|
+
...existingSkill,
|
|
156
|
+
name: sourceSnapshot.name,
|
|
157
|
+
sourceType: "builtin",
|
|
158
|
+
sourcePath,
|
|
159
|
+
contentHash: sourceSnapshot.contentHash,
|
|
160
|
+
managedState: "active",
|
|
161
|
+
updatedAt: timestamp
|
|
162
|
+
}
|
|
163
|
+
: {
|
|
164
|
+
id: this.createManagedSkillId(),
|
|
165
|
+
name: sourceSnapshot.name,
|
|
166
|
+
directoryName: sourceSnapshot.directoryName,
|
|
167
|
+
sourceType: "builtin",
|
|
168
|
+
sourcePath,
|
|
169
|
+
contentHash: sourceSnapshot.contentHash,
|
|
170
|
+
managedState: "active",
|
|
171
|
+
createdAt: timestamp,
|
|
172
|
+
updatedAt: timestamp
|
|
173
|
+
};
|
|
174
|
+
const ssotPath = path.join(ssotRootDir, skill.directoryName);
|
|
175
|
+
copySkillDirectory(sourcePath, ssotPath);
|
|
176
|
+
this.managedSkillRepository.upsert(skill);
|
|
177
|
+
const targetResults = this.forceSyncManagedSkillRecord(skill, input.targetCli);
|
|
178
|
+
return {
|
|
179
|
+
skill: this.managedSkillRepository.findById(skill.id) ?? skill,
|
|
180
|
+
bindings: this.skillTargetBindingRepository.listBySkillId(skill.id),
|
|
181
|
+
targetResults,
|
|
182
|
+
ssotPath
|
|
183
|
+
};
|
|
184
|
+
}
|
|
147
185
|
importUnmanagedSkill(input) {
|
|
148
186
|
const sourceLocation = resolveSingleTargetLocation(this.targetAdapters, input.targetCli);
|
|
149
187
|
const directoryPath = path.resolve(input.directoryPath);
|
|
@@ -198,6 +236,24 @@ export class SkillManagerService {
|
|
|
198
236
|
const plannedTargets = this.skillSyncPlanner.planRequestedTargets(targetCli, this.skillTargetBindingRepository.listBySkillId(skill.id));
|
|
199
237
|
return plannedTargets.map((target) => this.syncOneTarget(skill, ssotPath, target.targetCli, timestamp));
|
|
200
238
|
}
|
|
239
|
+
forceSyncManagedSkillRecord(skill, targetCli) {
|
|
240
|
+
const ssotPath = this.resolveSsotPath(skill.directoryName);
|
|
241
|
+
const timestamp = this.now();
|
|
242
|
+
if (!isValidSkillDirectory(ssotPath)) {
|
|
243
|
+
this.managedSkillRepository.upsert({
|
|
244
|
+
...skill,
|
|
245
|
+
managedState: "missing",
|
|
246
|
+
updatedAt: timestamp
|
|
247
|
+
});
|
|
248
|
+
throw new AppError({
|
|
249
|
+
statusCode: 409,
|
|
250
|
+
errorCode: "SKILL_SSOT_MISSING",
|
|
251
|
+
detail: "受管 skill 的 SSOT 目录缺失或不合法"
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
const plannedTargets = this.skillSyncPlanner.planRequestedTargets(targetCli, this.skillTargetBindingRepository.listBySkillId(skill.id));
|
|
255
|
+
return plannedTargets.map((target) => this.forceSyncOneTarget(skill, ssotPath, target.targetCli, timestamp));
|
|
256
|
+
}
|
|
201
257
|
syncOneTarget(skill, ssotPath, targetCli, timestamp) {
|
|
202
258
|
const targetLocation = resolveSingleTargetLocation(this.targetAdapters, targetCli);
|
|
203
259
|
const targetDir = path.join(targetLocation.rootDir, skill.directoryName);
|
|
@@ -259,6 +315,48 @@ export class SkillManagerService {
|
|
|
259
315
|
};
|
|
260
316
|
}
|
|
261
317
|
}
|
|
318
|
+
forceSyncOneTarget(skill, ssotPath, targetCli, timestamp) {
|
|
319
|
+
const targetLocation = resolveSingleTargetLocation(this.targetAdapters, targetCli);
|
|
320
|
+
const targetDir = path.join(targetLocation.rootDir, skill.directoryName);
|
|
321
|
+
try {
|
|
322
|
+
copySkillDirectory(ssotPath, targetDir);
|
|
323
|
+
const binding = buildBindingRecord(skill.id, targetCli, {
|
|
324
|
+
enabled: true,
|
|
325
|
+
syncStatus: "synced",
|
|
326
|
+
lastSyncedAt: timestamp,
|
|
327
|
+
lastErrorCode: null,
|
|
328
|
+
lastErrorDetail: null
|
|
329
|
+
});
|
|
330
|
+
this.skillTargetBindingRepository.upsert(binding);
|
|
331
|
+
return {
|
|
332
|
+
targetCli,
|
|
333
|
+
targetDir,
|
|
334
|
+
syncStatus: "synced",
|
|
335
|
+
lastSyncedAt: timestamp,
|
|
336
|
+
errorCode: null,
|
|
337
|
+
errorDetail: null
|
|
338
|
+
};
|
|
339
|
+
}
|
|
340
|
+
catch (error) {
|
|
341
|
+
const errorDetail = error instanceof Error ? error.message : String(error);
|
|
342
|
+
const binding = buildBindingRecord(skill.id, targetCli, {
|
|
343
|
+
enabled: true,
|
|
344
|
+
syncStatus: "failed",
|
|
345
|
+
lastSyncedAt: null,
|
|
346
|
+
lastErrorCode: "SKILL_SYNC_FAILED",
|
|
347
|
+
lastErrorDetail: errorDetail
|
|
348
|
+
});
|
|
349
|
+
this.skillTargetBindingRepository.upsert(binding);
|
|
350
|
+
return {
|
|
351
|
+
targetCli,
|
|
352
|
+
targetDir,
|
|
353
|
+
syncStatus: "failed",
|
|
354
|
+
lastSyncedAt: null,
|
|
355
|
+
errorCode: "SKILL_SYNC_FAILED",
|
|
356
|
+
errorDetail
|
|
357
|
+
};
|
|
358
|
+
}
|
|
359
|
+
}
|
|
262
360
|
requireSsotRootDir() {
|
|
263
361
|
const ssotRootDir = this.options.ssotRootDir?.trim();
|
|
264
362
|
if (!ssotRootDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-manager-service.js","sourceRoot":"","sources":["../../../../src/modules/skills/skill-manager-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"skill-manager-service.js","sourceRoot":"","sources":["../../../../src/modules/skills/skill-manager-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export class TailscaleHelperClient {
|
|
|
7
7
|
stdoutReader;
|
|
8
8
|
pendingRequests = new Map();
|
|
9
9
|
nextRequestId = 1;
|
|
10
|
+
disposed = false;
|
|
10
11
|
constructor() {
|
|
11
12
|
const launch = resolveHelperLaunch();
|
|
12
13
|
this.child = spawn(launch.command, launch.args, {
|
|
@@ -30,6 +31,9 @@ export class TailscaleHelperClient {
|
|
|
30
31
|
this.rejectAll(error);
|
|
31
32
|
});
|
|
32
33
|
this.child.on("exit", (code, signal) => {
|
|
34
|
+
if (this.disposed && (code === 0 || signal === "SIGTERM")) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
33
37
|
this.rejectAll(new Error(`tailscale helper 已退出:code=${code ?? "null"} signal=${signal ?? "null"}`));
|
|
34
38
|
});
|
|
35
39
|
}
|
|
@@ -64,12 +68,20 @@ export class TailscaleHelperClient {
|
|
|
64
68
|
});
|
|
65
69
|
}
|
|
66
70
|
dispose() {
|
|
71
|
+
if (this.disposed) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
this.disposed = true;
|
|
67
75
|
this.stdoutReader.close();
|
|
68
76
|
if (!this.child.killed) {
|
|
69
77
|
this.child.kill("SIGTERM");
|
|
70
78
|
}
|
|
79
|
+
this.rejectAll(new Error("tailscale helper 已关闭"));
|
|
71
80
|
}
|
|
72
81
|
async sendRequest(payload) {
|
|
82
|
+
if (this.disposed) {
|
|
83
|
+
return Promise.reject(new Error("tailscale helper 已关闭"));
|
|
84
|
+
}
|
|
73
85
|
const id = String(this.nextRequestId++);
|
|
74
86
|
return await new Promise((resolve, reject) => {
|
|
75
87
|
this.pendingRequests.set(id, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tailscale-helper-client.js","sourceRoot":"","sources":["../../../../src/modules/tailscale/tailscale-helper-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAChF,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAuCzC,MAAM,OAAO,qBAAqB;IACf,KAAK,CAAiC;IACtC,YAAY,CAAqB;IACjC,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAC;IACtE,aAAa,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tailscale-helper-client.js","sourceRoot":"","sources":["../../../../src/modules/tailscale/tailscale-helper-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,13 @@ export declare class TaskHelperProcessClient {
|
|
|
4
4
|
private readonly stdoutReader;
|
|
5
5
|
private readonly pendingRequests;
|
|
6
6
|
private nextRequestId;
|
|
7
|
+
private disposed;
|
|
7
8
|
constructor();
|
|
8
9
|
execute<TResult>(handler: TaskHelperProcessHandlerName, input: unknown, signal?: AbortSignal): Promise<TResult>;
|
|
10
|
+
dispose(): void;
|
|
9
11
|
private handleResponseLine;
|
|
10
12
|
private rejectAll;
|
|
13
|
+
private sendCancel;
|
|
11
14
|
}
|
|
15
|
+
export declare function getSharedTaskHelperProcessClient(): TaskHelperProcessClient;
|
|
16
|
+
export declare function disposeSharedTaskHelperProcessClient(): void;
|
|
@@ -2,11 +2,13 @@ import { spawn } from "node:child_process";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import readline from "node:readline";
|
|
4
4
|
import { fileURLToPath } from "node:url";
|
|
5
|
+
let sharedTaskHelperProcessClient = null;
|
|
5
6
|
export class TaskHelperProcessClient {
|
|
6
7
|
child;
|
|
7
8
|
stdoutReader;
|
|
8
9
|
pendingRequests = new Map();
|
|
9
10
|
nextRequestId = 1;
|
|
11
|
+
disposed = false;
|
|
10
12
|
constructor() {
|
|
11
13
|
const launch = resolveHelperLaunch();
|
|
12
14
|
this.child = spawn(launch.command, launch.args, {
|
|
@@ -34,6 +36,9 @@ export class TaskHelperProcessClient {
|
|
|
34
36
|
});
|
|
35
37
|
}
|
|
36
38
|
async execute(handler, input, signal) {
|
|
39
|
+
if (this.disposed) {
|
|
40
|
+
return Promise.reject(new Error("task helper 已关闭"));
|
|
41
|
+
}
|
|
37
42
|
const id = String(this.nextRequestId++);
|
|
38
43
|
return await new Promise((resolve, reject) => {
|
|
39
44
|
let aborted = false;
|
|
@@ -42,6 +47,7 @@ export class TaskHelperProcessClient {
|
|
|
42
47
|
onAbort = () => {
|
|
43
48
|
aborted = true;
|
|
44
49
|
this.pendingRequests.delete(id);
|
|
50
|
+
void this.sendCancel(id);
|
|
45
51
|
reject(signal.reason ?? new Error("helper task aborted"));
|
|
46
52
|
};
|
|
47
53
|
if (signal.aborted) {
|
|
@@ -70,6 +76,7 @@ export class TaskHelperProcessClient {
|
|
|
70
76
|
});
|
|
71
77
|
this.child.stdin.write(`${JSON.stringify({
|
|
72
78
|
id,
|
|
79
|
+
type: "run",
|
|
73
80
|
handler,
|
|
74
81
|
input
|
|
75
82
|
})}\n`, (error) => {
|
|
@@ -84,6 +91,17 @@ export class TaskHelperProcessClient {
|
|
|
84
91
|
});
|
|
85
92
|
});
|
|
86
93
|
}
|
|
94
|
+
dispose() {
|
|
95
|
+
if (this.disposed) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
this.disposed = true;
|
|
99
|
+
this.stdoutReader.close();
|
|
100
|
+
if (!this.child.killed) {
|
|
101
|
+
this.child.kill("SIGTERM");
|
|
102
|
+
}
|
|
103
|
+
this.rejectAll(new Error("task helper 已关闭"));
|
|
104
|
+
}
|
|
87
105
|
handleResponseLine(line) {
|
|
88
106
|
const trimmed = line.trim();
|
|
89
107
|
if (!trimmed.startsWith("{")) {
|
|
@@ -113,6 +131,33 @@ export class TaskHelperProcessClient {
|
|
|
113
131
|
}
|
|
114
132
|
this.pendingRequests.clear();
|
|
115
133
|
}
|
|
134
|
+
async sendCancel(targetId) {
|
|
135
|
+
if (this.disposed || this.child.killed || this.child.stdin.destroyed) {
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
await new Promise((resolve) => {
|
|
139
|
+
this.child.stdin.write(`${JSON.stringify({
|
|
140
|
+
id: `cancel:${targetId}`,
|
|
141
|
+
type: "cancel",
|
|
142
|
+
targetId
|
|
143
|
+
})}\n`, () => {
|
|
144
|
+
resolve();
|
|
145
|
+
});
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
export function getSharedTaskHelperProcessClient() {
|
|
150
|
+
if (!sharedTaskHelperProcessClient) {
|
|
151
|
+
sharedTaskHelperProcessClient = new TaskHelperProcessClient();
|
|
152
|
+
}
|
|
153
|
+
return sharedTaskHelperProcessClient;
|
|
154
|
+
}
|
|
155
|
+
export function disposeSharedTaskHelperProcessClient() {
|
|
156
|
+
if (!sharedTaskHelperProcessClient) {
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
sharedTaskHelperProcessClient.dispose();
|
|
160
|
+
sharedTaskHelperProcessClient = null;
|
|
116
161
|
}
|
|
117
162
|
function resolveHelperLaunch() {
|
|
118
163
|
const currentFilePath = fileURLToPath(import.meta.url);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-helper-client.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAChF,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAuBzC,MAAM,OAAO,uBAAuB;IACjB,KAAK,CAAiC;IACtC,YAAY,CAAqB;IACjC,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAC;IACtE,aAAa,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"task-helper-client.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,23 @@
|
|
|
1
|
+
import type { ProviderSessionDiscovery, ProviderSessionSummary } from "@codingns/session-sync-core";
|
|
2
|
+
import type { ProviderSessionDiscoveryHelperConfig } from "../provider/provider-discovery-helper-client.js";
|
|
1
3
|
import type { TerminalTemplateRuntimeStatus } from "../../types/domain.js";
|
|
2
4
|
import type { WorkspaceCodeCompositionSummary } from "../workspace/workspace-service.js";
|
|
3
5
|
interface TaskHelperProcessHandlerMap {
|
|
4
6
|
"workspace.code_composition_scan": (input: {
|
|
5
7
|
workspacePath: string;
|
|
6
|
-
}) => WorkspaceCodeCompositionSummary | Promise<WorkspaceCodeCompositionSummary>;
|
|
8
|
+
}, signal?: AbortSignal) => WorkspaceCodeCompositionSummary | Promise<WorkspaceCodeCompositionSummary>;
|
|
7
9
|
"terminal.template_runtime_status_discovery": (input: {
|
|
8
10
|
items: Array<{
|
|
9
11
|
templateId: string;
|
|
10
12
|
port: number;
|
|
11
13
|
}>;
|
|
12
|
-
}) => TerminalTemplateRuntimeStatus[] | Promise<TerminalTemplateRuntimeStatus[]>;
|
|
14
|
+
}, signal?: AbortSignal) => TerminalTemplateRuntimeStatus[] | Promise<TerminalTemplateRuntimeStatus[]>;
|
|
15
|
+
"session.workspace_discovery": (input: {
|
|
16
|
+
config: ProviderSessionDiscoveryHelperConfig;
|
|
17
|
+
workspacePath: string;
|
|
18
|
+
knownSessions: ProviderSessionSummary[];
|
|
19
|
+
}, signal?: AbortSignal) => ProviderSessionDiscovery | Promise<ProviderSessionDiscovery>;
|
|
13
20
|
}
|
|
14
21
|
export type TaskHelperProcessHandlerName = keyof TaskHelperProcessHandlerMap;
|
|
15
|
-
export declare function runTaskHelperProcessHandler(handler: TaskHelperProcessHandlerName, input: unknown): Promise<unknown>;
|
|
22
|
+
export declare function runTaskHelperProcessHandler(handler: TaskHelperProcessHandlerName, input: unknown, signal?: AbortSignal): Promise<unknown>;
|
|
16
23
|
export {};
|
|
@@ -1,14 +1,16 @@
|
|
|
1
|
+
import { discoverWorkspaceSessionsInRuntime } from "../provider/provider-discovery-runtime.js";
|
|
1
2
|
import { discoverTemplateRuntimeStatuses } from "../terminal/template-port-runtime.js";
|
|
2
|
-
import {
|
|
3
|
+
import { readWorkspaceCodeCompositionWithSignal } from "../workspace/workspace-code-composition.js";
|
|
3
4
|
const TASK_HELPER_PROCESS_HANDLERS = {
|
|
4
|
-
"workspace.code_composition_scan": ({ workspacePath }) =>
|
|
5
|
-
"terminal.template_runtime_status_discovery": ({ items }) => discoverTemplateRuntimeStatuses(items)
|
|
5
|
+
"workspace.code_composition_scan": ({ workspacePath }, signal) => readWorkspaceCodeCompositionWithSignal(workspacePath, signal),
|
|
6
|
+
"terminal.template_runtime_status_discovery": ({ items }, signal) => discoverTemplateRuntimeStatuses(items, signal),
|
|
7
|
+
"session.workspace_discovery": ({ config, workspacePath, knownSessions }, signal) => discoverWorkspaceSessionsInRuntime(config, workspacePath, knownSessions, signal)
|
|
6
8
|
};
|
|
7
|
-
export async function runTaskHelperProcessHandler(handler, input) {
|
|
9
|
+
export async function runTaskHelperProcessHandler(handler, input, signal) {
|
|
8
10
|
const handlerFn = TASK_HELPER_PROCESS_HANDLERS[handler];
|
|
9
11
|
if (!handlerFn) {
|
|
10
12
|
throw new Error(`未知 helper_process 处理器: ${handler}`);
|
|
11
13
|
}
|
|
12
|
-
return await handlerFn(input);
|
|
14
|
+
return await handlerFn(input, signal);
|
|
13
15
|
}
|
|
14
16
|
//# sourceMappingURL=task-helper-process-handlers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-helper-process-handlers.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-process-handlers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-helper-process-handlers.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-process-handlers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAE/F,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EACL,sCAAsC,EACvC,MAAM,4CAA4C,CAAC;AAsBpD,MAAM,4BAA4B,GAAgC;IAChE,iCAAiC,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,CAC/D,sCAAsC,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/D,4CAA4C,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,CAClE,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC;IAChD,6BAA6B,EAAE,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,CAClF,kCAAkC,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC;CACnF,CAAC;AAIF,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,OAAqC,EACrC,KAAc,EACd,MAAoB;IAEpB,MAAM,SAAS,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAExD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,MAAM,SAAS,CAAC,KAAc,EAAE,MAAM,CAAC,CAAC;AACjD,CAAC"}
|