dsh-plugin-subagent-bridge 0.8.0 → 0.9.0

package/README.md

@@ -11,6 +11,30 @@
 
 ---
 
+## 创建项目（workspace）
+
+DSH 的侧边栏分组是"项目（workspace）"，和会话的工作目录是两回事：新建会话默认落在「未分组」，除非它所在的目录已经是一个项目。
+
+`dsh_task` / `dsh_spawn` 的 `workspace` 参数把这一步也接管了：
+
+```js
+// 目录不是项目 → 用它创建项目（标题取目录名），会话直接归到项目下
+dsh_task({ prompt: "…", cwd: "/repo/clawer", workspace: true })
+
+// 用指定标题创建
+dsh_spawn({ task_name: "w1", message: "…", cwd: "/repo/clawer", workspace: "Clawer" })
+
+// 不传 → 只复用已有项目；目录没有项目就保持未分组（和以前一样）
+dsh_task({ prompt: "…", cwd: "/repo/clawer" })
+```
+
+行为细节：
+
+- 目录不存在时先递归创建，再做项目登记（登记要求目录已存在）；
+- 目录已经是项目 → **直接复用，不改标题**（底层 `create` 对同一路径返回已有记录）；
+- 返回结果里带上 `workspace: { id, title, path }`，方便确认落在哪个项目；
+- 项目操作失败不影响派发本身（分组是外观，不因此让任务失败）。
+
 ## 指定模型
 
 `dsh_task`、`dsh_spawn`、`dsh_followup` 都可以带 `model`，让 worker 跑在指定模型上：

package/index.js

@@ -99,6 +99,11 @@ const TOOLS = [
           description:
             'Model to run this worker on, as "provider/model" (for example "zai-coding-cn/glm-5.3"). A bare model id keeps the current default provider. Omit to use whatever the session already uses.',
         },
+        workspace: {
+          type: ['boolean', 'string'],
+          description:
+            'Grouping for the new session. true creates a DSH project (workspace) for `cwd`, titled after its last path segment, when none owns that directory yet; a string uses that title instead. Omit (or false) to only reuse an existing project, leaving the session ungrouped when the directory has none.',
+        },
         reasoningEffort: {
           type: 'string',
           description: 'Reasoning level for `model`, if that model offers levels (low, medium, high, max...).',
@@ -130,6 +135,11 @@ const TOOLS = [
           description:
             'Model for this worker, as "provider/model" (for example "opencode-go/deepseek-v4.1-flash"). A bare model id keeps the current default provider.',
         },
+        workspace: {
+          type: ['boolean', 'string'],
+          description:
+            'Grouping for the new worker. true creates a DSH project (workspace) for `cwd` when none owns it; a string uses that title. Omit to only reuse an existing project.',
+        },
         reasoningEffort: { type: 'string', description: 'Reasoning level for `model`, when that model offers levels.' },
       },
       required: ['task_name', 'message'],
@@ -512,6 +522,7 @@ async function callTool(id, params, api, signal) {
               forkTurns,
               from: args.from,
               cwd: args.cwd,
+              workspace: args.workspace === true || (typeof args.workspace === 'string' && args.workspace !== '') ? args.workspace : undefined,
               model: typeof args.model === 'string' && args.model !== '' ? args.model : undefined,
               reasoningEffort:
                 typeof args.reasoningEffort === 'string' && args.reasoningEffort !== '' ? args.reasoningEffort : undefined,
@@ -565,6 +576,7 @@ async function callTool(id, params, api, signal) {
               cwd: typeof args.cwd === 'string' && args.cwd !== '' ? args.cwd : undefined,
               sessionId,
               agentPreset: typeof args.agentPreset === 'string' && args.agentPreset !== '' ? args.agentPreset : undefined,
+              workspace: args.workspace === true || (typeof args.workspace === 'string' && args.workspace !== '') ? args.workspace : undefined,
               model: typeof args.model === 'string' && args.model !== '' ? args.model : undefined,
               reasoningEffort:
                 typeof args.reasoningEffort === 'string' && args.reasoningEffort !== '' ? args.reasoningEffort : undefined,
@@ -639,7 +651,7 @@ export function createApi(ctx, state, settings) {
       })
     },
 
-    async spawn({ taskName, message, forkTurns, from, cwd, model, reasoningEffort }) {
+    async spawn({ taskName, message, forkTurns, from, cwd, model, reasoningEffort, workspace }) {
       const service = controller()
       if (service === undefined || service === null) throw new Error('session controller is unavailable')
       if (state.workers.has(taskName)) throw new Error(`task_name ${JSON.stringify(taskName)} is already in use`)
@@ -648,6 +660,7 @@ export function createApi(ctx, state, settings) {
       takeDispatchSlot(state, settings)
       assertCapacity(state, settings, root)
 
+      let placed
       let sessionId
       if (forkTurns === 'all') {
         const parent = sessions()?.get?.(from)
@@ -660,7 +673,9 @@ export function createApi(ctx, state, settings) {
       } else {
         const opened = await service.create(cwd === undefined ? {} : { cwd })
         sessionId = opened?.sessionId
-        if (typeof sessionId === 'string' && sessionId !== '') await attachToWorkspace(ctx, sessionId, cwd ?? undefined)
+        if (typeof sessionId === 'string' && sessionId !== '') {
+          placed = await attachToWorkspace(ctx, sessionId, cwd ?? undefined, workspaceOptions(workspace))
+        }
         if (typeof sessionId !== 'string' || sessionId === '') throw new Error('session controller did not return a session id')
       }
 
@@ -689,6 +704,7 @@ export function createApi(ctx, state, settings) {
         accepted: accepted?.accepted === true,
         fork_turns: forkTurns,
         ...(appliedModel === undefined ? {} : { model: appliedModel }),
+        ...(placed === undefined ? {} : { workspace: placed }),
       }
     },
 
@@ -741,7 +757,7 @@ export function createApi(ctx, state, settings) {
       return rows
     },
 
-    async task({ prompt, cwd, sessionId, agentPreset, timeoutSeconds, model, reasoningEffort }) {
+    async task({ prompt, cwd, sessionId, agentPreset, timeoutSeconds, model, reasoningEffort, workspace }) {
       const service = controller()
       if (service === undefined || service === null) throw new Error('session controller is unavailable')
       const seconds = Math.min(
@@ -752,12 +768,15 @@ export function createApi(ctx, state, settings) {
       takeDispatchSlot(state, settings)
       const started = Date.now()
 
+      let placed
       let targetId = sessionId
       let created = false
       if (targetId === undefined) {
         const opened = await service.create(cwd === undefined ? {} : { cwd })
         targetId = opened?.sessionId
-        if (typeof targetId === 'string' && targetId !== '') await attachToWorkspace(ctx, targetId, cwd ?? undefined)
+        if (typeof targetId === 'string' && targetId !== '') {
+          placed = await attachToWorkspace(ctx, targetId, cwd ?? undefined, workspaceOptions(workspace))
+        }
         if (typeof targetId !== 'string' || targetId === '') throw new Error('session controller did not return a session id')
         created = true
       } else if (ctx.get('agents')?.get?.(targetId)?.status === 'running') {
@@ -808,6 +827,7 @@ export function createApi(ctx, state, settings) {
             }
           : {}),
         ...(appliedModel === undefined ? {} : { model: appliedModel }),
+        ...(placed === undefined ? {} : { workspace: placed }),
         text: collected.text,
         truncated: collected.truncated,
         turns: lastTurn(ctx, targetId),
@@ -1132,6 +1152,20 @@ async function applyModelSpec(ctx, sessionId, spec, reasoningEffort) {
   }
 }
 
+/**
+ * Translate the `workspace` argument into attach options.
+ * - absent / `false` → never create, only reuse an existing project for the directory
+ * - `true` → create a project titled after the directory when none owns it
+ * - a string → same, with that title
+ * @param workspace - raw argument from the tool call.
+ * @returns options for {@link attachToWorkspace}.
+ */
+function workspaceOptions(workspace) {
+  if (workspace === true) return { create: true }
+  if (typeof workspace === 'string' && workspace.trim() !== '') return { create: true, title: workspace.trim() }
+  return {}
+}
+
 /**
  * Place a freshly created session in the workspace its directory belongs to.
  * `sessionController.create` only records a working directory; the sidebar groups
@@ -1140,14 +1174,32 @@ async function applyModelSpec(ctx, sessionId, spec, reasoningEffort) {
  * @param sessionId - session just created.
  * @param cwd - directory the session was opened in.
  */
-async function attachToWorkspace(ctx, sessionId, cwd) {
-  if (typeof cwd !== 'string' || cwd === '') return
+async function attachToWorkspace(ctx, sessionId, cwd, options = {}) {
+  if (typeof cwd !== 'string' || cwd === '') return undefined
   try {
     const registry = ctx.get('workspaceRegistry')
-    const workspace = await registry?.resolveByPath?.(cwd)
+    if (registry === undefined || registry === null) return undefined
+
+    /* Only create when the caller asked for it: an existing project is reused either way,
+     * because `create` returns the record that already owns the canonical path. */
+    let workspace
+    if (options.create === true && typeof registry.create === 'function') {
+      /* The registry rejects a directory that does not exist yet, and a brand-new project
+       * is exactly that, so the path is materialised first. */
+      await mkdir(cwd, { recursive: true }).catch(() => {})
+      const title = typeof options.title === 'string' && options.title.trim() !== '' ? options.title.trim() : undefined
+      workspace = await registry.create(cwd, title)
+    } else {
+      workspace = await registry.resolveByPath?.(cwd)
+    }
+
     await workspace?.attachSession?.(sessionId)
+    return workspace === undefined || workspace === null
+      ? undefined
+      : { id: workspace.id, title: workspace.title, path: workspace.path }
   } catch {
     /* Grouping is cosmetic: a failure here must not fail the dispatch. */
+    return undefined
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subagent-bridge",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "type": "module",
   "description": "Subagent bridge: lets Codex delegate a task to DeepSeek Harness the way it would spawn a subagent (one call, waits for the answer), plus a codex_dispatch tool for the reverse direction.",
   "keywords": [

package/skills/deepseek-worker/SKILL.md

@@ -121,6 +121,33 @@ DSH **自带** `subagent` 工具（和这座桥无关，是它自己的能力，
 
 DSH 自己的委派深度上限是 1：worker（depth 0）能开子 agent（depth 1），子 agent 不能再往下开。所以不会无限递归。
 
+## 指定 worker 用哪个模型
+
+`dsh_task`、`dsh_spawn`、`dsh_followup` 都支持 `model`。默认不传，worker 跟随会话默认模型。
+
+```json
+{ "prompt": "…", "cwd": "/repo", "model": "zai-coding-cn/glm-5.3", "reasoningEffort": "max" }
+```
+
+- 写法是 **`provider/model`**，中间一个斜杠；
+- **只写模型名**（`"glm-5.3"`）会沿用当前默认 provider——省事但容易踩空，见下；
+- `reasoningEffort` 可选，取值随模型（`low` / `medium` / `high` / `max` 等），模型不支持该档会直接报错；
+- 不传 `model` 的调用行为完全不变，不要为了"保险"而乱传。
+
+什么时候值得指定：
+
+| 场景 | 做法 |
+| --- | --- |
+| 任务要长上下文 / 大文件 | 挑窗口大的模型 |
+| 要跨模型复核同一件事 | 第二次派发换另一家的模型 |
+| 便宜模型够用（改文档、跑格式） | 显式指定小模型省钱 |
+| 用同一个 worker 干不同类型活 | `dsh_followup` 里换 `model` |
+
+**只写模型名的坑**：`glm-5.3`、`deepseek-v4.1-flash` 这类模型同时挂在多个 provider 下（`zai-coding-cn`、`opencode-go`、`newapi`…），只写名字会落到当前默认 provider 上，可能和你想的不是同一家。**要么写全 `provider/model`，要么先确认当前默认是什么。**
+
+写错了（`/glm-5.3`、`a/b/c`）桥会在**发 prompt 之前**报错，不会白跑一轮。
+
+
 ## 怎么写 prompt
 
 worker **看不到你这段对话**，它只有 `prompt` 和 `cwd`。写成可以独立开工的工单：