pi-herdr-subagents-lite 0.1.0 → 0.2.0

package/README.md

@@ -11,7 +11,7 @@ Experimental; compatibility across versions is not promised. Exact behavior live
 - **Separate process, human takeover**: each subagent is its own pi process in a herdr pane. Same cwd as the parent opens a tab in the same workspace, otherwise a new workspace. Switch into the pane and take over at any time.
 - **Profile layers**: Markdown + frontmatter under `<agent-dir>/pi-herdr-subagents-lite/profiles/`, plus a project layer under `.pi/pi-herdr-subagents-lite/profiles/` that wins on the same name.
 - **Async, merged results**: `run` returns at once. Each finished child reports one `subagent_result` message; results inside `aggregateWindowMs` merge into one. Oversize results go to an artifact file.
-- **Questions stay with the human**: a child prompt produces `subagent_question` plus a `herdr:blocked` event. The human answers in the child pane; the parent model never relays the answer.
+- **Questions stay with the human**: a child prompt marks its pane `herdr:blocked` and nothing goes to the parent. The human answers in the child pane; no model relays the answer.
 - **No nesting by default, no sandbox**: child tool sets drop this tool unless the profile names it. The profile picks tools; the extension does not restrict writes.
 
 ## Requirements
@@ -55,7 +55,7 @@ Global profiles live in `<agent-dir>/pi-herdr-subagents-lite/profiles/*.md`, pro
 
 ```markdown
 ---
-# Display name only; run takes the file name
+# Listed as "file (name)"; run takes the file name
 name: Explore
 description: "Read-only research: read code, answer questions, change nothing"
 

package/README.zh-CN.md

@@ -11,7 +11,7 @@ pi 扩展：让子代理作为独立 pi 进程跑在 herdr pane 里。一个工
 - **独立进程，可人工接管**：每个子代理是 herdr pane 里独立的 pi 进程。cwd 与父相同则同 workspace 新开 tab，否则新建 workspace。随时切进去接管。
 - **两层 profile**：Markdown + frontmatter，全局 `<agent-dir>/pi-herdr-subagents-lite/profiles/`，项目层 `.pi/pi-herdr-subagents-lite/profiles/`，同名时项目层覆盖。
 - **异步、可合并的结果**：`run` 立即返回。每个子代理收工时投一条 `subagent_result`；落在 `aggregateWindowMs` 内的结果合并成一条。超长结果落 artifact 文件。
-- **反问留在人这边**：子代理弹出对话框时，父侧收到 `subagent_question` 并发出 `herdr:blocked` 事件。人在子 pane 里回答，父模型不转达。
+- **反问留在人这边**：子代理弹出对话框时只发出 `herdr:blocked` 事件，父侧什么也收不到。人在子 pane 里回答，不经模型转达。
 - **默认不嵌套，也不是沙箱**：子代理的工具集默认去掉本工具，profile 里点名才授予。工具由 profile 决定，扩展不限制写操作。
 
 ## 要求
@@ -55,7 +55,7 @@ pi -e /path/to/pi-herdr-subagents-lite/src/index.ts        # 只对当前进程
 
 ```markdown
 ---
-# 只作显示名；run 取文件名
+# 列表写作「文件名 (显示名)」；run 取文件名
 name: Explore
 description: 只读调研：读代码、回答问题，不改动任何文件
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-herdr-subagents-lite",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Run pi subagents in herdr panes.",
   "type": "module",
   "license": "MIT",

package/src/extension/index.ts

@@ -6,7 +6,7 @@ import { drain, hasInbox, pumpInbox } from "../inbox/index.ts";
 import type { ProfileCatalog, ProfileSources } from "../profile/index.ts";
 import { createRunService, type RunService } from "../run/index.ts";
 import type { ExitReceiptReader, ExitReceiptWriter, SessionReader } from "../session-file/index.ts";
-import { createTool, type ResultMessage, type SubagentTool, sendQuestion, sendResults } from "../tool/index.ts";
+import { createTool, type ResultMessage, type SubagentTool, sendResults } from "../tool/index.ts";
 import { watchAutoExit } from "./auto-exit.ts";
 import { type ShutdownHandler, watchShutdown } from "./shutdown.ts";
 
@@ -120,7 +120,6 @@ export function createExtension(deps: ExtensionDeps): (pi: ExtensionRegistrar) =
         onDeliveryError: (error) => ctx.ui.notify(`delivery failed: ${errorText(error)}`, "error"),
       });
       service.onResult((results) => sendResults(pi, results));
-      service.onQuestion((question) => sendQuestion(pi, question));
     };
 
     pi.on("session_start", (_event, ctx) => {

package/src/run/index.ts

@@ -5,7 +5,6 @@ import { createAggregator } from "./aggregate.ts";
 import { type CloseChildrenResult, closeRuns } from "./close.ts";
 import { createNamer } from "./naming.ts";
 import { stopPoll } from "./poll.ts";
-import type { QuestionHandler } from "./question.ts";
 import type { ResultHandler, RunResult } from "./result.ts";
 import { type SendResult, send } from "./send.ts";
 import { type RunStarted, start } from "./start.ts";
@@ -15,7 +14,6 @@ export interface RunService {
   run(profile: string, task: string, cwd?: string): Promise<RunStarted>;
   send(name: string, message: string): Promise<SendResult>;
   onResult(handler: ResultHandler): void;
-  onQuestion(handler: QuestionHandler): void;
   shutdown(): void;
   closeChildren(): Promise<CloseChildrenResult>;
   active(): string[];
@@ -42,7 +40,6 @@ export function createRunService(deps: RunServiceDeps): RunService {
     runs: [],
     resultHandler: undefined,
     results: undefined,
-    questionHandler: undefined,
     pollBusy: false,
     nextName: createNamer(),
     active() {
@@ -88,9 +85,6 @@ export function createRunService(deps: RunServiceDeps): RunService {
     onResult(handler) {
       state.resultHandler = handler;
     },
-    onQuestion(handler) {
-      state.questionHandler = handler;
-    },
     shutdown() {
       stopService(state);
       takeRuns(state);
@@ -105,7 +99,6 @@ export function createRunService(deps: RunServiceDeps): RunService {
 
 export type { CloseChildrenResult } from "./close.ts";
 export { ToolError } from "./errors.ts";
-export type { QuestionHandler, RunQuestion } from "./question.ts";
 export { profileLabel } from "./resolve.ts";
 export type { ResultHandler, RunResult } from "./result.ts";
 export type { SendResult } from "./send.ts";

package/src/run/poll.ts

@@ -1,7 +1,6 @@
 import type { AgentEntry } from "../herdr/index.ts";
 import { closeTab, shouldClose } from "./close.ts";
 import { findAgent } from "./find.ts";
-import { askBlocked } from "./question.ts";
 import type { RunResult } from "./result.ts";
 import { doneResult, unknownResult } from "./result.ts";
 import type { RunRecord, RunState } from "./state.ts";
@@ -66,11 +65,6 @@ async function pollRuns(state: RunState): Promise<void> {
       await exited(state, run);
       continue;
     }
-    if (agent.status === "blocked") {
-      await askBlocked(state, run);
-      continue;
-    }
-    run.blocked = false;
     run.pollFailures = 0;
     if (agent.completionSeq > run.lastHandledSeq && (agent.status === "idle" || agent.status === "done")) {
       await readResult(state, run, agent.completionSeq, 1);

package/src/run/resolve.ts

@@ -2,7 +2,8 @@ import type { Profile, ProfileCatalog } from "../profile/index.ts";
 import { ToolError } from "./errors.ts";
 
 export function profileLabel(profile: Profile): string {
-  return profile.description === "" ? profile.displayName : `${profile.displayName} — ${profile.description}`;
+  const label = profile.displayName === profile.name ? profile.name : `${profile.name} (${profile.displayName})`;
+  return profile.description === "" ? label : `${label} — ${profile.description}`;
 }
 
 export function resolveProfile({ profiles, problems }: ProfileCatalog, name: string): Profile {

package/src/run/send.ts

@@ -40,7 +40,6 @@ export async function send(state: RunState, name: string, message: string): Prom
       run.lastHandledSeq = agent.completionSeq;
       run.live = true;
       run.pollFailures = 0;
-      run.blocked = false;
       ensurePoll(state);
     }
     await enqueue(run.sessionFile, inboxMessage(message));
@@ -94,7 +93,6 @@ export async function send(state: RunState, name: string, message: string): Prom
 
   run.live = true;
   run.pollFailures = 0;
-  run.blocked = false;
   ensurePoll(state);
   await enqueue(run.sessionFile, inboxMessage(message));
   return { state: "restarted", name: run.name, paneId: run.paneId };

package/src/run/start.ts

@@ -70,7 +70,6 @@ export async function start(state: RunState, profileName: string, task: string,
     lastDeliveredText: null,
     artifactSeq: 0,
     pollFailures: 0,
-    blocked: false,
     live: true,
   };
   // 先占槽再 await：并发的 run() 必须立刻看到它。

package/src/run/state.ts

@@ -2,7 +2,6 @@ import type { HerdrHost } from "../herdr/index.ts";
 import type { ProfileCatalog } from "../profile/index.ts";
 import type { ExitReceiptReader, SessionReader } from "../session-file/index.ts";
 import type { Aggregator } from "./aggregate.ts";
-import type { QuestionHandler } from "./question.ts";
 import type { ResultHandler, RunResult } from "./result.ts";
 
 export interface RunServiceDeps {
@@ -32,7 +31,6 @@ export interface RunRecord {
   artifactSeq: number;
   timer?: ReturnType<typeof setTimeout>;
   pollFailures: number;
-  blocked: boolean;
   live: boolean;
 }
 
@@ -41,7 +39,6 @@ export interface RunState extends RunServiceDeps {
   runs: RunRecord[];
   resultHandler: ResultHandler | undefined;
   results: Aggregator<RunResult> | undefined;
-  questionHandler: QuestionHandler | undefined;
   pollTimer?: ReturnType<typeof setTimeout>;
   pollBusy: boolean;
   nextName(profile: string): string;

package/src/session-file/index.ts

@@ -1,5 +1,5 @@
 import { readFileSync } from "node:fs";
-import { parseLastAssistant, type SessionSnapshot, type ToolCall } from "./jsonl.ts";
+import { parseLastAssistant, type SessionSnapshot } from "./jsonl.ts";
 
 export {
   type ExitReceipt,
@@ -8,7 +8,6 @@ export {
   readExitReceipt,
   writeExitReceipt,
 } from "./receipt.ts";
-export type { ToolCall };
 
 export type SessionReader = (path: string) => SessionSnapshot;
 

package/src/session-file/jsonl.ts

@@ -1,12 +1,6 @@
-export interface ToolCall {
-  name: string;
-  arguments: unknown;
-}
-
 export interface SessionSnapshot {
   text: string | null;
   pendingToolCall: boolean;
-  toolCall?: ToolCall;
   empty: boolean;
 }
 
@@ -26,21 +20,17 @@ function isTextBlock(block: unknown): block is { type: "text"; text: string } {
   return candidate.type === "text" && typeof candidate.text === "string";
 }
 
-function lastToolCall(content: unknown): ToolCall | undefined {
+function hasToolCall(content: unknown): boolean {
   if (!Array.isArray(content)) {
-    return undefined;
+    return false;
   }
-  for (let index = content.length - 1; index >= 0; index--) {
-    const block = content[index];
+  return content.some((block) => {
     if (typeof block !== "object" || block === null) {
-      continue;
-    }
-    const candidate = block as { type?: unknown; name?: unknown; arguments?: unknown };
-    if (candidate.type === "toolCall" && typeof candidate.name === "string") {
-      return { name: candidate.name, arguments: candidate.arguments };
+      return false;
     }
-  }
-  return undefined;
+    const candidate = block as { type?: unknown; name?: unknown };
+    return candidate.type === "toolCall" && typeof candidate.name === "string";
+  });
 }
 
 function textOf(entry: SessionEntry): string | null {
@@ -77,10 +67,7 @@ export function parseLastAssistant(raw: string): SessionSnapshot {
     if (entry.type !== "message" || entry.message?.role !== "assistant") {
       continue;
     }
-    const toolCall = lastToolCall(entry.message?.content);
-    return toolCall === undefined
-      ? { text: textOf(entry), pendingToolCall: false, empty: false }
-      : { text: textOf(entry), pendingToolCall: true, toolCall, empty: false };
+    return { text: textOf(entry), pendingToolCall: hasToolCall(entry.message?.content), empty: false };
   }
   return { text: null, pendingToolCall: false, empty: true };
 }

package/src/tool/index.ts

@@ -55,4 +55,4 @@ export function createTool({ config, profiles, service }: ToolDeps) {
   };
 }
 
-export { type ResultMessage, sendQuestion, sendResults } from "./message.ts";
+export { type ResultMessage, sendResults } from "./message.ts";

package/src/tool/message.ts

@@ -1,4 +1,4 @@
-import type { RunQuestion, RunResult } from "../run/index.ts";
+import type { RunResult } from "../run/index.ts";
 
 export interface ResultMessage {
   customType: string;
@@ -19,17 +19,6 @@ function resultText(result: RunResult): string {
   return `[subagent ${result.name}] done\n\n${result.text}${artifact}${warning}`;
 }
 
-const QUESTION_FOOTER = [
-  "The human answers it in the child's pane. A follow-up sent with send is",
-  "queued until the dialog closes.",
-].join("\n");
-
-export function sendQuestion(sink: MessageSink, question: RunQuestion): void {
-  const body = question.text.trim() === "" ? "" : `\n\n${question.text.trim()}`;
-  const content = `[subagent ${question.name}] blocked (question)${body}\n\n${QUESTION_FOOTER}`;
-  sink.sendMessage({ customType: "subagent_question", content, display: true }, { triggerTurn: true });
-}
-
 export function sendResults(sink: MessageSink, results: RunResult[]): void {
   const content = results.map(resultText).join("\n\n");
   sink.sendMessage({ customType: "subagent_result", content, display: true }, { triggerTurn: true });

package/src/run/question.ts

@@ -1,88 +0,0 @@
-import type { ToolCall } from "../session-file/index.ts";
-import type { RunRecord, RunState } from "./state.ts";
-
-export interface RunQuestion {
-  name: string;
-  text: string;
-}
-
-export type QuestionHandler = (question: RunQuestion) => void | Promise<void>;
-
-function record(value: unknown): Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? (value as Record<string, unknown>) : {};
-}
-
-function line(value: unknown): string | undefined {
-  return typeof value === "string" && value.trim() !== "" ? value.trim() : undefined;
-}
-
-function optionLines(options: unknown): string[] {
-  if (!Array.isArray(options)) {
-    return [];
-  }
-  const lines: string[] = [];
-  for (const entry of options) {
-    const label = line(record(entry).label);
-    if (label === undefined) {
-      continue;
-    }
-    const description = line(record(entry).description);
-    lines.push(description === undefined ? `- ${label}` : `- ${label} — ${description}`);
-  }
-  return lines;
-}
-
-function groupLines(questions: unknown): string[] {
-  if (!Array.isArray(questions)) {
-    return [];
-  }
-  const lines: string[] = [];
-  for (const entry of questions) {
-    const group = record(entry);
-    const question = line(group.question);
-    if (question === undefined) {
-      continue;
-    }
-    const header = line(group.header);
-    lines.push(header === undefined ? question : `${header}: ${question}`, ...optionLines(group.options), "");
-  }
-  return lines;
-}
-
-function plainLine(args: unknown): string | undefined {
-  const values = record(args);
-  for (const key of ["question", "title", "message", "prompt", "text"]) {
-    const found = line(values[key]);
-    if (found !== undefined) {
-      return found;
-    }
-  }
-  return undefined;
-}
-
-export function questionText(call: ToolCall | undefined): string {
-  if (call === undefined) {
-    return "";
-  }
-  const lines = groupLines(record(call.arguments).questions);
-  if (lines.length > 0) {
-    return lines.join("\n").trim();
-  }
-  return plainLine(call.arguments) ?? "";
-}
-
-export async function askBlocked(state: RunState, run: RunRecord): Promise<void> {
-  if (run.blocked) {
-    return;
-  }
-  run.blocked = true;
-  try {
-    await state.questionHandler?.({
-      name: run.name,
-      text: questionText(state.readLastAssistant(run.sessionFile).toolCall),
-    });
-    run.pollFailures = 0;
-  } catch (error) {
-    state.onDeliveryError(error);
-  }
-}