oira666_pi-subagent 0.5.3 → 0.5.4

package/README.md

@@ -111,9 +111,9 @@ Collapsed results show each child's name, task, status, and most recent activity
 | T | Current turn's tool list |
 | Up / Down, Enter | Select and open a tool or nested child |
 | C | Children across all turns |
-| Esc | Return to the parent view |
+| Esc | Back one level: tool detail, tools/children, parent subagent, then the searchable list. From the list or a directly named subagent, close. |
 | /, n, N | Search, next match, previous match |
-| q | Close |
+| q | Close from any transcript view |
 
 While workers run, steering input can be broadcast to selected names, including nested paths such as `John > Maria`. Only inputs marked as streaming `steer` open the routing prompt. Idle prompts and queued follow-ups remain with the parent.
 

package/docs/configuration.md

@@ -63,6 +63,7 @@ Optionally let TypeSafe's Jev choose a model for each subagent task. Add this se
   "smart-decision": {
     "enabled": true,
     "fallback": true,
+    "timeout_seconds": 1200,
     "model": "jev",
     "provider_url": "https://api.typesafe.ai",
     "api_key": "YOUR_TYPESAFE_API_KEY",
@@ -80,9 +81,10 @@ Replace the example choices with models available in your Pi installation. Each
 
 - `enabled` must be `true`. Missing settings, disabled settings, or an empty model list leave existing behavior unchanged and make no Jev requests.
 - `model` selects the decision model, not the worker model. `jev` maps to TypeSafe's `jev-latest`; explicit TypeSafe model IDs also work.
+- `timeout_seconds` defaults to `1200` seconds and bounds the whole Jev request, including reading the response body. Set a number from `0.001` to `2147483.647` seconds. Invalid values follow the `fallback` policy.
 - `provider_url` is the provider base URL, defaulting to `https://api.typesafe.ai`. For a local compatible server, use `http://localhost:8765`. The extension appends `/v1/systemone`; trailing slashes are ignored. Use an HTTP or HTTPS URL without credentials, query parameters, or a fragment.
 - `api_key` is your TypeSafe API key. Worker providers still need their own Pi credentials.
-- `fallback` defaults to `true`. When a loaded `smart-decision` object omits it, the extension adds `"fallback": true` and saves that configuration file at runtime. Existing values, including `false`, are left untouched. Untrusted project files are never changed. If saving fails, a warning is emitted and the runtime default still applies. If selection fails, a short warning is written and the worker uses the original launch settings. Set it to `false` to return a tool error without launching the affected worker. This covers network errors, the 10-second request timeout, API errors, invalid answers, and invalid enabled configuration. Cancellation cancels the task instead of falling back.
+- `fallback` defaults to `true`. When a loaded `smart-decision` object omits it, the extension adds `"fallback": true` and saves that configuration file at runtime. Existing values, including `false`, are left untouched. Untrusted project files are never changed. If saving fails, a warning is emitted and the runtime default still applies. If selection fails, a short warning is written and the worker uses the original launch settings. Set it to `false` to return a tool error without launching the affected worker. This covers network errors, the configured request timeout, API errors, invalid answers, and invalid enabled configuration. Cancellation cancels the task instead of falling back.
 
 Each fresh launch and actual resume sends the agent definition's system prompt, the assigned task, and the candidate descriptions to `<provider_url>/v1/systemone`. Jev must select a configured candidate. When a task refers to a separate task-description or handoff file whose contents were not supplied, Jev is instructed to assume higher complexity and prefer a more capable model or higher reasoning level. It does not read that file. Mentioning a source filename alone does not trigger this guidance. Its provider, model, and thinking level override the parent model and agent frontmatter for that run. The parent's explicit `--provider` and `--api-key` are not forwarded when a Jev choice is applied. Startup retries reuse the choice. Finished results reused without launching a process make no request.
 

package/extension/expand-command.ts

@@ -1,6 +1,7 @@
 import { buildSubagentDetail, findNameRecord, type SubagentDetail } from "../detail.js";
 import { readNamesRegistry, type NamesRegistry, type SubagentNameRecord } from "../names.js";
-import { SubagentPager, SubagentPicker, filterPickerItems, type PickerItem } from "../overlay.js";
+import { filterPickerItems, type PickerItem } from "../overlay.js";
+import { SubagentExpandView } from "../ui/expand-view.js";
 import type { SessionContext } from "./contracts.js";
 import type { ExtensionState } from "./state.js";
 
@@ -66,63 +67,43 @@ export function registerSubagentExpandCommand(state: ExtensionState): void {
         return;
       }
 
-      let record = name ? findNameRecord(registry, name) : undefined;
-      if (!record) {
-        if (name) {
-          const suggestions = filterPickerItems(
-            sortedRecords.map((item) => ({ name: item.name, agent: item.agent, task: item.task })),
-            name,
-          )
-            .slice(0, 10)
-            .map((item) => item.name);
+      const record = name ? findNameRecord(registry, name) : undefined;
+      if (!record && name) {
+        const suggestions = filterPickerItems(
+          sortedRecords.map((item) => ({ name: item.name, agent: item.agent, task: item.task })),
+          name,
+        )
+          .slice(0, 10)
+          .map((item) => item.name);
+        ctx.ui.notify(
+          `Unknown subagent "${name}".${suggestions.length > 0 ? ` Did you mean: ${suggestions.join(", ")}?` : ""}`,
+          "error",
+        );
+        return;
+      }
+
+      const resolveDetail = (selectedName: string): SubagentDetail | undefined => {
+        const selected = findNameRecord(registry, selectedName);
+        if (!selected) return undefined;
+        try {
+          return buildSubagentDetail(selected, { sessionDir: resolveDetailSessionDir(state, selected) });
+        } catch (err) {
           ctx.ui.notify(
-            `Unknown subagent "${name}".${suggestions.length > 0 ? ` Did you mean: ${suggestions.join(", ")}?` : ""}`,
+            `Failed to read subagent session: ${err instanceof Error ? err.message : String(err)}`,
             "error",
           );
-          return;
+          return undefined;
         }
-        // A delegation tree can hold hundreds of names, so the chooser is a
-        // searchable overlay rather than a flat select list.
-        const picked = await ctx.ui.custom(
-          (tui, theme, _keybindings, done: (value: string | undefined) => void) =>
-            new SubagentPicker({
-              items: sortedRecords.map((item) => ({ name: item.name, agent: item.agent, task: item.task })),
-              getRows: () => tui?.terminal?.rows ?? 30,
-              theme,
-              requestRender: () => tui?.requestRender?.(),
-              onPick: (value) => done(value),
-            }),
-          {
-            overlay: true,
-            overlayOptions: { anchor: "center", width: "80%", maxHeight: "90%", margin: 1 },
-          },
-        );
-        if (!picked) return;
-        record = findNameRecord(registry, picked);
-        if (!record) return;
-      }
-
-      let detail: SubagentDetail;
-      try {
-        detail = buildSubagentDetail(record, { sessionDir: resolveDetailSessionDir(state, record) });
-      } catch (err) {
-        ctx.ui.notify(`Failed to read subagent session: ${err instanceof Error ? err.message : String(err)}`, "error");
-        return;
-      }
+      };
+      const detail = record ? resolveDetail(record.name) : undefined;
+      if (record && !detail) return;
 
       await ctx.ui.custom(
         (tui, theme, _keybindings, done: (value: void) => void) =>
-          new SubagentPager({
+          new SubagentExpandView({
+            items: sortedRecords.map((item) => ({ name: item.name, agent: item.agent, task: item.task })),
             detail,
-            resolveDetail: (childName) => {
-              const childRecord = findNameRecord(registry, childName);
-              if (!childRecord) return undefined;
-              try {
-                return buildSubagentDetail(childRecord, { sessionDir: resolveDetailSessionDir(state, childRecord) });
-              } catch {
-                return undefined;
-              }
-            },
+            resolveDetail,
             getRows: () => tui?.terminal?.rows ?? 30,
             theme,
             requestRender: () => tui?.requestRender?.(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-subagent",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
   "type": "module",
   "main": "index.ts",

package/runner/smart-decision.ts

@@ -2,6 +2,7 @@ type Selection = { provider: string; model: string; thinking: string };
 
 export interface SmartDecisionConfig {
   readonly fallback: boolean;
+  readonly timeoutSeconds: number;
   readonly invalid?: boolean;
   readonly model: string;
   readonly apiKey: string;
@@ -59,6 +60,7 @@ export function parseSmartDecisionConfig(value: unknown): SmartDecisionConfig |
   const invalid = (): SmartDecisionConfig => ({
     fallback: value.fallback !== false,
     invalid: true,
+    timeoutSeconds: 1200,
     model: "",
     apiKey: "",
     providerUrl: DEFAULT_PROVIDER_URL,
@@ -67,6 +69,14 @@ export function parseSmartDecisionConfig(value: unknown): SmartDecisionConfig |
   if (!nonempty(value.model) || !nonempty(value.api_key) || !Array.isArray(value.use_models)) return invalid();
   const providerUrl = parseProviderUrl(value.provider_url);
   if (!providerUrl) return invalid();
+  const timeoutSeconds = value.timeout_seconds === undefined ? 1200 : value.timeout_seconds;
+  if (
+    typeof timeoutSeconds !== "number" ||
+    !Number.isFinite(timeoutSeconds) ||
+    timeoutSeconds < 0.001 ||
+    timeoutSeconds > 2_147_483.647
+  )
+    return invalid();
   const candidates: (Selection & { key: string; description: string })[] = [];
   const seen = new Set<string>();
   let count = 0;
@@ -86,6 +96,7 @@ export function parseSmartDecisionConfig(value: unknown): SmartDecisionConfig |
   const model = value.model.trim();
   return {
     fallback: value.fallback !== false,
+    timeoutSeconds,
     model: model === "jev" ? "jev-latest" : model,
     apiKey: value.api_key.trim(),
     providerUrl,
@@ -109,7 +120,7 @@ export async function selectSmartDecision(
   });
   controller.signal.addEventListener("abort", rejectAborted, { once: true });
   signal?.addEventListener("abort", cancel, { once: true });
-  const timer = setTimeout(cancel, 10_000);
+  const timer = setTimeout(cancel, config.timeoutSeconds * 1000);
 
   try {
     if (config.invalid || !config.candidates.length) throw new Error("Invalid smart-decision settings");

package/ui/expand-view.ts

@@ -0,0 +1,62 @@
+import type { DetailTheme, SubagentDetail } from "../detail.js";
+import { SubagentPager } from "./pager.js";
+import { SubagentPicker, type PickerItem } from "./picker.js";
+
+export interface ExpandViewOptions {
+  items: PickerItem[];
+  detail?: SubagentDetail;
+  resolveDetail: (name: string) => SubagentDetail | undefined;
+  getRows: () => number;
+  theme: DetailTheme;
+  requestRender: () => void;
+  onClose: () => void;
+}
+
+/** Keep the picker alive while browsing transcripts so Esc restores its search and selection. */
+export class SubagentExpandView {
+  private readonly picker?: SubagentPicker;
+  private pager?: SubagentPager;
+
+  constructor(private readonly options: ExpandViewOptions) {
+    if (options.detail) {
+      this.openDetail(options.detail);
+    } else {
+      this.picker = new SubagentPicker({
+        ...options,
+        onPick: (name) => {
+          if (!name) options.onClose();
+          else {
+            const detail = options.resolveDetail(name);
+            if (detail) this.openDetail(detail);
+          }
+        },
+      });
+    }
+  }
+
+  private openDetail(detail: SubagentDetail): void {
+    this.pager = new SubagentPager({
+      ...this.options,
+      detail,
+      onBack: this.picker
+        ? () => {
+            this.pager = undefined;
+          }
+        : undefined,
+    });
+    this.options.requestRender();
+  }
+
+  handleInput(data: string): void {
+    (this.pager ?? this.picker)?.handleInput(data);
+  }
+
+  render(width: number): string[] {
+    return (this.pager ?? this.picker)?.render(width) ?? [];
+  }
+
+  invalidate(): void {
+    this.picker?.invalidate();
+    this.pager?.invalidate();
+  }
+}

package/ui/pager-view.ts

@@ -23,6 +23,7 @@ export interface PagerOptions {
   theme: DetailTheme;
   requestRender: () => void;
   onClose: () => void;
+  onBack?: () => void;
 }
 
 export class PagerView {
@@ -190,8 +191,8 @@ export class PagerView {
     if (this.status) return `${this.status}   n/N next/previous • / new search`;
     const position = `${this.scroll + 1}-${Math.min(this.lines.length, this.scroll + this.viewport)}/${this.lines.length}`;
     if (this.mode === "turn") {
-      const back = this.parentStack.length > 0 ? "Esc parent" : "Esc close";
-      return `${position}   ←/→ turn • T tools • C children • / search • ${back}`;
+      const back = this.parentStack.length > 0 ? "Esc parent" : this.options.onBack ? "Esc list" : "Esc close";
+      return `${position}   ←/→ turn • T tools • C children • / search • ${back} • q close`;
     }
     if (this.mode === "tools")
       return `${position}   ↑/↓ row • Enter inspect/expand child • / search • Esc back • q close`;

package/ui/pager.ts

@@ -28,7 +28,7 @@ export class SubagentPager extends PagerView {
         this.childIndex = 0;
         this.resetView();
       } else {
-        this.options.onClose();
+        (this.options.onBack ?? this.options.onClose)();
       }
       this.options.requestRender();
       return;