dsh-subagent-control 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.3
+
+- `list_subagents` marks Team members, which are continuable subagents: each row carries
+  `team=teammate` (or `team=lead`) when the Agent Teams service can resolve it.
+- New `include_teammates` parameter (default `true`); set it to `false` to keep only plain
+  subagents. Existing behaviour is unchanged for callers that pass nothing.
+
 ## 1.0.2
 
 - New optional `extras` component (`dsh-subagent-control/extras`), shipped **disabled**:

package/README.md

@@ -45,6 +45,8 @@ interrupt_subagent subagent_id=3b0f9c1e
 
 Each listing line is `id  status  "label"  depth=`. `status` is `running` or `inactive` — **inactive means no turn is executing, not that the subagent is gone**. Use `send_subagent_message` to wake it.
 
+Team members are continuable subagents too, so they also appear in this list, marked `team=teammate` (or `team=lead`). Pass `include_teammates: false` when you want only the plain subagents you started.
+
 ### Behaviour and limits
 
 - **One-shot subagents are hidden.** They cannot accept a follow-up message, so listing them would only invite a call that is guaranteed to fail.
@@ -141,6 +143,8 @@ interrupt_subagent subagent_id=3b0f9c1e
 
 每行格式是 `id  status  "label"  depth=`。`status` 为 `running` 或 `inactive`——**inactive 表示当前没有在跑，不代表子代理已经消失**；用 `send_subagent_message` 可以把它叫醒。
 
+团队成员本身也是可续子代理，所以同样会出现在列表里，并带 `team=teammate`（或 `team=lead`）标记；只想看自己派的普通子代理时，传 `include_teammates: false`。
+
 ### 行为与边界
 
 - **一次性子代理不会被列出。** 它们无法接收后续消息，列出来只会诱导一次注定失败的调用。

package/index.js

@@ -37,6 +37,7 @@ const CHILD_ITEM = {
     status: { type: 'string', enum: ['running', 'inactive'] },
     parent: { type: 'string' },
     depth: { type: 'number' },
+    team: { type: 'string', enum: ['lead', 'teammate'] },
   },
 }
 
@@ -83,13 +84,42 @@ function project(agents, entry, position) {
   }
 }
 
+/**
+ * Team members are continuable subagents, so the subagent catalog cannot tell a
+ * teammate from a worker on its own. Resolve the Team role when the Agent Teams
+ * service is present, and answer `undefined` when the agent is not in a Team.
+ */
+function teamRoleResolver(ctx, caller) {
+  const teams = typeof ctx.get === 'function' ? ctx.get('agentTeams') : undefined
+  if (teams === undefined) return () => undefined
+  const roster = new Map()
+  try {
+    for (const member of teams.listMembers(caller) ?? []) roster.set(member.id, member.role)
+  } catch {
+    /* the caller is not part of a Team; the per-agent lookup below still works */
+  }
+  return (id) => {
+    const known = roster.get(id)
+    if (known !== undefined) return known
+    const agent = ctx.agents.get(id)
+    if (agent === undefined) return undefined
+    try {
+      const membership = teams.tryMembership?.(agent)
+      return membership === undefined ? undefined : membership.role
+    } catch {
+      return undefined
+    }
+  }
+}
+
 function renderEntry(entry) {
   if (entry.kind === 'diagnostic') {
     const at = entry.parent === undefined ? '' : `  parent=${entry.parent}`
     return `[${entry.reason}] ${entry.id}${at}`
   }
   const depth = entry.depth === undefined ? '' : `  depth=${entry.depth}`
-  return `${entry.id}  ${entry.status}  ${JSON.stringify(entry.label)}${depth}`
+  const team = entry.team === undefined ? '' : `  team=${entry.team}`
+  return `${entry.id}  ${entry.status}  ${JSON.stringify(entry.label)}${depth}${team}`
 }
 
 export function apply(ctx) {
@@ -100,6 +130,8 @@ export function apply(ctx) {
     description:
       'List the subagents you started, with their ids, labels and status. ' +
       'running means it is working; inactive means it is not working right now, which does not mean it is gone. ' +
+      'Team members are continuable subagents too, so they appear here marked team=teammate or team=lead; ' +
+      'use include_teammates:false when you only want the workers you started. ' +
       'You are notified when a subagent finishes, so there is no need to poll. ' +
       'Use send_subagent_message to continue a conversation with one of them.',
     parameters: {
@@ -114,6 +146,11 @@ export function apply(ctx) {
             'descendants lists the whole tree below you with each entry parent and depth; ' +
             'entries deeper than one level accept only interrupt_subagent.',
         },
+        include_teammates: {
+          type: 'boolean',
+          description:
+            'When false, leave out agents that belong to the current Team, keeping only plain subagents. Default true.',
+        },
       },
     },
     output: {
@@ -127,12 +164,22 @@ export function apply(ctx) {
     },
     async execute(args, exec) {
       const caller = requireAgent(exec, 'list_subagents')
+      const roleOf = teamRoleResolver(ctx, caller)
+      const wantsTeammates = args.include_teammates !== false
+      const emit = (entry, position) => {
+        const item = project(ctx.agents, entry, position)
+        if (item === undefined) return undefined
+        const role = roleOf(item.id)
+        if (role !== undefined) item.team = role
+        if (!wantsTeammates && role !== undefined) return undefined
+        return item
+      }
       if ((args.scope ?? 'children') === 'descendants') {
         const rows = await ctx.subagents.listDescendants(caller.id, exec.signal)
-        return rows.map((row) => project(ctx.agents, row, row)).filter(Boolean)
+        return rows.map((row) => emit(row, row)).filter(Boolean)
       }
       const rows = await ctx.subagents.listChildren(caller.id, exec.signal)
-      return rows.map((row) => project(ctx.agents, row)).filter(Boolean)
+      return rows.map((row) => emit(row)).filter(Boolean)
     },
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-subagent-control",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Three tools — list_subagents, send_subagent_message, interrupt_subagent — that let any agent, including a team member, list, steer and stop the subagents it started.",
   "license": "MIT",
   "author": {