oira666_pi-subagent 0.5.0 → 0.5.1

package/README.md

@@ -75,7 +75,7 @@ See [configuration](docs/configuration.md) for frontmatter, layer restrictions,
 
 Collapsed results show each child's name, task, status, and most recent activity anywhere in its subtree. `Ctrl+O` expands the newest call from memory without reading historical transcripts.
 
-`/subagent-expand <name>` opens a saved worker transcript. With no name, it opens a searchable picker. Name completion is fuzzy.
+`/subagent-expand <name>` opens a saved worker transcript. With no name, it opens a searchable picker. Name completion is fuzzy. Each task or resume shows its actual provider/model and thinking level from the worker's session, not the parent's settings. Missing historical metadata appears as `unknown`.
 
 | Key | Action |
 | --- | --- |

package/config.ts

@@ -30,6 +30,77 @@ function readConfig(filePath: string): Record<string, unknown> {
   }
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+let tempFileCounter = 0;
+
+/** Add the explicit default without allowing a failed write to change runtime behavior. */
+function persistSmartDecisionFallback(config: Record<string, unknown>, filePath: string): void {
+  const smartDecision = config["smart-decision"];
+  if (!isRecord(smartDecision) || Object.hasOwn(smartDecision, "fallback")) return;
+
+  smartDecision.fallback = true;
+  let tempPath: string | undefined;
+  let ownsTemp = false;
+  try {
+    // Replace the target rather than a symlink that points to it.
+    const targetPath = fs.realpathSync(filePath);
+    // Re-read immediately before writing so unrelated edits made since the initial load survive.
+    // Retrying also makes concurrent nested-worker migrations converge without clobbering one another.
+    for (let attempt = 0; attempt < 3; attempt++) {
+      const source = fs.readFileSync(targetPath, "utf8");
+      const latest = JSON.parse(source) as unknown;
+      if (!isRecord(latest)) return;
+      const latestSmartDecision = latest["smart-decision"];
+      if (!isRecord(latestSmartDecision)) return;
+      if (Object.hasOwn(latestSmartDecision, "fallback")) {
+        smartDecision.fallback = latestSmartDecision.fallback;
+        return;
+      }
+
+      latestSmartDecision.fallback = true;
+      const mode = fs.statSync(targetPath).mode & 0o7777;
+      const candidatePath = path.join(
+        path.dirname(targetPath),
+        `.${path.basename(targetPath)}.${process.pid}.${tempFileCounter++}.tmp`,
+      );
+      const fd = fs.openSync(candidatePath, "wx", mode);
+      tempPath = candidatePath;
+      ownsTemp = true;
+      try {
+        fs.writeFileSync(fd, `${JSON.stringify(latest, null, 2)}\n`, "utf8");
+        fs.fchmodSync(fd, mode);
+        fs.fsyncSync(fd);
+      } finally {
+        fs.closeSync(fd);
+      }
+
+      if (fs.readFileSync(targetPath, "utf8") !== source) {
+        fs.unlinkSync(tempPath);
+        tempPath = undefined;
+        ownsTemp = false;
+        continue;
+      }
+      fs.renameSync(tempPath, targetPath);
+      tempPath = undefined;
+      ownsTemp = false;
+      return;
+    }
+    throw new Error("config changed during fallback migration");
+  } catch {
+    if (ownsTemp && tempPath) {
+      try {
+        fs.unlinkSync(tempPath);
+      } catch {
+        // Best-effort cleanup. Do not expose filesystem errors or configuration contents.
+      }
+    }
+    console.warn("[pi-subagent] Failed to save the default smart-decision fallback.");
+  }
+}
+
 function readToolPrompts(config: Record<string, unknown>, filePath: string): Record<string, string> {
   const toolPrompts = config["tool-prompts"];
   if (toolPrompts === undefined) return {};
@@ -85,6 +156,7 @@ export function loadPiSubagentsConfig(cwd?: string, includeProject = false): PiS
   let smartDecision: SmartDecisionConfig | undefined;
   for (const filePath of new Set(paths)) {
     const config = readConfig(filePath);
+    persistSmartDecisionFallback(config, filePath);
     Object.assign(toolPrompts, readToolPrompts(config, filePath));
     if (Object.hasOwn(config, "smart-decision")) {
       smartDecision = parseSmartDecisionConfig(config["smart-decision"]);

package/docs/configuration.md

@@ -80,7 +80,7 @@ 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.
 - `api_key` is your TypeSafe API key. Worker providers still need their own Pi credentials.
-- `fallback` defaults to `true`. 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 10-second 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 `https://api.typesafe.ai/v1/systemone`. Jev must select a configured candidate. 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/package.json

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

package/ui/detail-lines.ts

@@ -93,11 +93,11 @@ export function renderTurnOverviewLines(
   const meta = [
     `Turn ${blockIndex + 1} of ${detail.blocks.length}: ${turnTitle}`,
     block.at ? formatClockTime(block.at) : "",
-    detail.model ?? "",
   ]
     .filter(Boolean)
     .join(" • ");
   out.wrap(meta, "", "dim");
+  out.wrap(`Model: ${block.model ?? "unknown"} • Thinking: ${block.thinkingLevel ?? "unknown"}`, "", "dim");
   out.wrap(`session total: ${usageLine(detail.usage)}`, "", "dim");
   for (const note of detail.notes) out.wrap(note, "", "warning");
 

package/ui/detail-model.ts

@@ -16,6 +16,9 @@ export interface DetailBlock {
   index: number;
   prompt: string;
   at?: number;
+  /** Actual settings recorded for this task or resume, not the parent's model. */
+  model?: string;
+  thinkingLevel?: string;
   events: DetailEvent[];
 }
 
@@ -32,6 +35,7 @@ export interface SubagentDetail {
   name: string;
   agent: string;
   model?: string;
+  thinkingLevel?: string;
   tools?: string[];
   createdAt?: number;
   sessionDir: string;

package/ui/detail-transcript.ts

@@ -1,4 +1,4 @@
-import { sessionFilesIn, readSessionMessages } from "./session.js";
+import { sessionFilesIn, readSessionEntries } from "./session.js";
 export { sessionFilesIn, readSessionMessages } from "./session.js";
 import * as os from "node:os";
 import type { NamesRegistry, SubagentNameRecord } from "../names.js";
@@ -92,23 +92,41 @@ export interface ParsedTranscript {
   blocks: DetailBlock[];
   usage: DetailUsage;
   toolCallCount: number;
+  model?: string;
+  thinkingLevel?: string;
 }
 
 export function parseTranscriptMessages(messages: unknown[]): ParsedTranscript {
   const blocks: DetailBlock[] = [];
   const usage: DetailUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
   let toolCallCount = 0;
+  let model: string | undefined;
+  let thinkingLevel: string | undefined;
   const pendingTools = new Map<string, Extract<DetailEvent, { type: "tool" }>>();
+  const observedModels = new Set<DetailBlock>();
 
   const currentBlock = (): DetailBlock => {
     if (blocks.length === 0) {
-      blocks.push({ kind: "task", index: 0, prompt: "", events: [] });
+      blocks.push({ kind: "task", index: 0, prompt: "", model, thinkingLevel, events: [] });
     }
     return blocks[blocks.length - 1];
   };
 
   for (const entry of messages) {
     const wrapper = asRecord(entry);
+    if (wrapper.type === "model_change") {
+      if (typeof wrapper.modelId === "string" && wrapper.modelId && wrapper.modelId !== "synthetic-tool-call") {
+        model =
+          typeof wrapper.provider === "string" && wrapper.provider
+            ? `${wrapper.provider}/${wrapper.modelId}`
+            : wrapper.modelId;
+      }
+      continue;
+    }
+    if (wrapper.type === "thinking_level_change") {
+      if (typeof wrapper.thinkingLevel === "string" && wrapper.thinkingLevel) thinkingLevel = wrapper.thinkingLevel;
+      continue;
+    }
     const message = asRecord(wrapper.message);
     const at = parseTimestamp(wrapper.timestamp ?? message.timestamp);
     const role = message.role;
@@ -121,6 +139,8 @@ export function parseTranscriptMessages(messages: unknown[]): ParsedTranscript {
         index,
         prompt,
         at,
+        model,
+        thinkingLevel,
         events: [],
       });
       continue;
@@ -138,6 +158,19 @@ export function parseTranscriptMessages(messages: unknown[]): ParsedTranscript {
       usage.cost += typeof cost === "number" ? cost : Number(asRecord(cost).total) || 0;
 
       const block = currentBlock();
+      // Legacy transcripts may have messages but no model-change entries.
+      if (typeof message.model === "string" && message.model && message.model !== "synthetic-tool-call") {
+        const actualModel =
+          typeof message.provider === "string" && message.provider
+            ? `${message.provider}/${message.model}`
+            : message.model;
+        if (!observedModels.has(block)) {
+          block.model = actualModel;
+          block.thinkingLevel = thinkingLevel;
+          observedModels.add(block);
+        }
+        model = actualModel;
+      }
       for (const rawPart of Array.isArray(message.content) ? message.content : []) {
         const part = asRecord(rawPart);
         if (part.type === "thinking" && typeof part.thinking === "string") {
@@ -188,7 +221,7 @@ export function parseTranscriptMessages(messages: unknown[]): ParsedTranscript {
     }
   }
 
-  return { blocks, usage, toolCallCount };
+  return { blocks, usage, toolCallCount, model, thinkingLevel };
 }
 
 export function buildSubagentDetail(record: SubagentNameRecord, options: { sessionDir?: string } = {}): SubagentDetail {
@@ -200,11 +233,15 @@ export function buildSubagentDetail(record: SubagentNameRecord, options: { sessi
   let blocks: DetailBlock[] = [];
   let usage: DetailUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
   let toolCallCount = 0;
+  let model: string | undefined;
+  let thinkingLevel: string | undefined;
 
   if (!sessionFile) {
     notes.push(`No session transcript found in ${shortenPath(sessionDir)}`);
   } else {
-    const parsed = parseTranscriptMessages(readSessionMessages(sessionFile));
+    const parsed = parseTranscriptMessages(readSessionEntries(sessionFile));
+    model = parsed.model;
+    thinkingLevel = parsed.thinkingLevel;
     blocks = parsed.blocks;
     usage = parsed.usage;
     toolCallCount = parsed.toolCallCount;
@@ -214,7 +251,7 @@ export function buildSubagentDetail(record: SubagentNameRecord, options: { sessi
   }
 
   if (blocks.length === 0 && record.task) {
-    blocks = [{ kind: "task", index: 0, prompt: record.task, at: record.createdAt, events: [] }];
+    blocks = [{ kind: "task", index: 0, prompt: record.task, at: record.createdAt, model, thinkingLevel, events: [] }];
   }
   if (blocks.length > 0 && !blocks[0].prompt && record.task) {
     blocks[0].prompt = record.task;
@@ -223,7 +260,8 @@ export function buildSubagentDetail(record: SubagentNameRecord, options: { sessi
   return {
     name: record.name,
     agent: record.agent,
-    model: record.model,
+    model,
+    thinkingLevel,
     tools: record.tools,
     createdAt: record.createdAt,
     sessionDir,

package/ui/session.ts

@@ -18,8 +18,8 @@ export function sessionFilesIn(sessionDir: string): string[] {
   }
 }
 
-export function readSessionMessages(file: string): unknown[] {
-  const messages: unknown[] = [];
+export function readSessionEntries(file: string): Record<string, unknown>[] {
+  const messages: Record<string, unknown>[] = [];
   let raw: string;
   try {
     raw = fs.readFileSync(file, "utf8");
@@ -34,7 +34,11 @@ export function readSessionMessages(file: string): unknown[] {
     } catch {
       continue;
     }
-    if (entry?.type === "message" && entry.message) messages.push(entry);
+    messages.push(entry);
   }
   return messages;
 }
+
+export function readSessionMessages(file: string): unknown[] {
+  return readSessionEntries(file).filter((entry) => entry.type === "message" && entry.message);
+}