takomi 2.1.36 → 2.1.38

package/.pi/README.md

@@ -37,7 +37,8 @@ Inside Pi, use:
 - `/takomi gate auto` to continue approved plans automatically
 - `/takomi gate review` to return to the user after each task with results and verification guidance
 - `/takomi subagents on` or `/takomi subagents off` to allow or disable delegated subagents
-- `/takomi subagents status|expand|collapse|fullscreen|next|prev|toggle` to inspect or reshape the active subagent stack
+- `/takomi subagents list` to list available Takomi agents without exposing the raw `subagent` tool
+- `/takomi subagents status` to inspect active subagent state
 - `/takomi-status` to show lifecycle, gate, session, and active subagent state
 - `/takomi-reset` to reset session-local Takomi runtime state
 - `/context-report` to inspect prompt compaction, skill loading, policy gates, model routing corrections, and duplicate extension diagnostics
@@ -107,9 +108,9 @@ So when working on packaging, agents should distinguish between:
 - Task packets can carry `workflow`, `skills`, `preferredModel`, `fallbackModels`, `preferredThinking`, `executionHint`, `conversationId`, and `checklist` metadata.
 - Direct `takomi_subagent` calls build a `TakomiDelegationPlan` before launch. In auto mode the plan launches immediately; in manual mode the plan is returned for review until `confirmLaunch=true` is supplied.
 - The subagent tool supports `conversationId`, so reviewed work can be sent back to the same agent for continuation instead of restarting from scratch.
-- The subagent tool supports Pi-style single, parallel `tasks`, and sequential `chain` modes.
+- The subagent tool supports Pi-style single, parallel `tasks`, sequential `chain`, explicit `context=fork|fresh`, `async=true`, and native read/control actions such as `action=list`, `action=status`, `action=doctor`, `action=interrupt`, and `action=resume`.
 - The subagent tool supports `agentScope` values of `user`, `project`, and `both`; project-local agents require confirmation by default.
-- The subagent tool also supports per-run `workflow`, `skills`, `model`, `fallbackModels`, `thinking`, and `checklist` overrides.
+- The subagent tool also supports per-run `workflow`, `skills`, `model`, `fallbackModels`, `thinking`, `checklist`, `concurrency`, and `worktree` overrides.
 - `takomi_board` records session/state/markdown artifacts only; it does not run subagents.
 - Pi's default `subagent` tool remains owned by the user-level/default subagent extension to avoid tool-name conflicts; Takomi uses `takomi_subagent` as the preferred lifecycle-aware execution interface and renders it with the native Pi-style result surface.
 - Treat raw `subagent` usage as advanced/internal. Normal Takomi lifecycle execution should go through `takomi_subagent`, then `takomi_board update_task` should record the outcome.
@@ -121,6 +122,8 @@ So when working on packaging, agents should distinguish between:
 - `takomi-context-manager` gates `takomi_subagent` when model-routing context has not been loaded, provides the routing policy, and tells the agent to retry.
 - `takomi-context-manager` can correct safe wrong-provider model requests, block or pause on policy violations, and ask the user whether to retry with an approved model or stop.
 - `takomi-context-manager` detects known duplicate global/project Takomi extension paths in `context_report` to help diagnose tool registration conflicts.
+- `context_report` restores context-manager snapshots and Pi tool-result history after reload/restart and explicitly labels gaps; it is not a replacement for Pi's Alt-C token/session stats.
+- `context_report` defaults to compact `mode: "summary"`; use `mode: "verbose"` for full diagnostics or `mode: "problems"` for attention-only output. `verbose: true` remains a compatibility alias. `/context-report` exposes `summary`, `verbose`, and `problems` as slash-command argument completions.
 - `takomi_board` can:
   - create a Genesis-first lifecycle session by default
   - preserve authored `master_plan.md` and task packet markdown

package/.pi/agents/orchestrator.md

@@ -106,11 +106,15 @@ Before calling `takomi_board expand_stage`:
 - Do not leave generated task files with `Scope: None specified`, `Definition Of Done: None specified`, or `Expected Artifacts: None specified`.
 - If `takomi_board` produced generic task packets, immediately repair them with detailed markdown before dispatching more work.
 
-## Phase 4: Delegation
-When delegating:
-- send self-contained task instructions
-- include required workflow and relevant context
-- preserve conversation IDs for review loops
+## Phase 4: Delegation
+After decomposition, delegation is the default execution path. Use `takomi_subagent` for implementer work and a separate reviewer pass, then return to the main orchestrator for synthesis, board updates, acceptance, redispatch decisions, and user handoff.
+
+Direct execution remains appropriate for small one-shot tasks, unavailable delegation tooling, or explicit user overrides such as "do it yourself", "no subagents", "no new threads", or `/takomi subagents off`.
+
+When delegating:
+- send self-contained task instructions
+- include required workflow and relevant context
+- preserve conversation IDs for review loops
 - keep retries scoped and actionable
 - do not overload a subagent with unrelated work
 

package/.pi/extensions/oauth-router/commands.ts

@@ -273,13 +273,14 @@ export function formatUsageRawReport(runtime: RouterRuntime, accountId?: string)
   return ["# oauth-router usage raw", "", ...rows].join("\n");
 }
 
-function emitReport(pi: ExtensionAPI, text: string) {
-  pi.sendMessage({
-    customType: "oauth-router",
-    content: text,
-    display: true,
-    details: { source: "oauth-router" },
-  });
+function emitReport(ctx: ExtensionCommandContext, text: string) {
+  const lines = text.split(/\r?\n/);
+  const visibleLines = [
+    "oauth-router report (UI-only; not sent to the agent)",
+    ...lines,
+  ];
+  ctx.ui.setWidget("oauth-router-report", visibleLines, { placement: "belowEditor" });
+  ctx.ui.notify(lines[0] || "oauth-router report updated", "info");
 }
 
 async function pickUpstream(runtime: RouterRuntime, ctx: ExtensionCommandContext, requestedId?: string) {
@@ -388,12 +389,12 @@ function setFooterStatus(ctx: ExtensionCommandContext, runtime: RouterRuntime) {
   ctx.ui.setStatus("oauth-router", `oauth-router ${healthy}/${rows.length || 0} healthy | ${runtime.getPolicy()}`);
 }
 
-function showCommandHint(pi: ExtensionAPI, ctx: ExtensionCommandContext, title: string, lines: string[]) {
-  emitReport(pi, [`# ${title}`, "", ...lines].join("\n"));
+function showCommandHint(ctx: ExtensionCommandContext, title: string, lines: string[]) {
+  emitReport(ctx, [`# ${title}`, "", ...lines].join("\n"));
   ctx.ui.notify(title, "info");
 }
 
-async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args: string, ctx: ExtensionCommandContext) {
+async function handleRouterLogin(runtime: RouterRuntime, args: string, ctx: ExtensionCommandContext) {
   const [command = "help", first, ...rest] = parseArgs(args);
 
   switch (command) {
@@ -418,18 +419,18 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
         runtime.clearAccountHealth(duplicate.id);
         const usageMessage = await refreshUsageAfterCredentialChange(runtime, duplicate.id);
         setFooterStatus(ctx, runtime);
-        emitReport(pi, `Updated existing account ${duplicate.id} (${duplicate.label}) with fresh credentials instead of adding a duplicate.${usageMessage}`);
+        emitReport(ctx, `Updated existing account ${duplicate.id} (${duplicate.label}) with fresh credentials instead of adding a duplicate.${usageMessage}`);
         return;
       }
       runtime.addAccount(account);
       const usageMessage = await refreshUsageAfterCredentialChange(runtime, account.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Added account ${account.id} (${account.label}) for upstream ${upstream.id}.${usageMessage}`);
+      emitReport(ctx, `Added account ${account.id} (${account.label}) for upstream ${upstream.id}.${usageMessage}`);
       ctx.ui.notify(`Added ${account.id}`, "info");
       return;
     }
     case "list": {
-      emitReport(pi, formatAccountsReport(runtime));
+      emitReport(ctx, formatAccountsReport(runtime));
       setFooterStatus(ctx, runtime);
       return;
     }
@@ -442,7 +443,7 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
       }
       runtime.removeAccount(account.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Removed account ${account.id}.`);
+      emitReport(ctx, `Removed account ${account.id}.`);
       return;
     }
     case "rename": {
@@ -450,7 +451,7 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
       const label = await getRequiredLabel(ctx, account.label, rest.join(" "));
       runtime.renameAccount(account.id, label);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Renamed account ${account.id} to ${label}.`);
+      emitReport(ctx, `Renamed account ${account.id} to ${label}.`);
       return;
     }
     case "relogin": {
@@ -475,7 +476,7 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
       runtime.clearAccountHealth(existing.id);
       const usageMessage = await refreshUsageAfterCredentialChange(runtime, existing.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Re-logged account ${existing.id} (${existing.label}) and cleared auth state.${usageMessage}`);
+      emitReport(ctx, `Re-logged account ${existing.id} (${existing.label}) and cleared auth state.${usageMessage}`);
       return;
     }
     case "refresh": {
@@ -483,13 +484,13 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
       const refreshed = await runtime.refreshAccount(account.id);
       const usageMessage = await refreshUsageAfterCredentialChange(runtime, refreshed.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Refreshed account ${refreshed.id} (${refreshed.label}).${usageMessage}`);
+      emitReport(ctx, `Refreshed account ${refreshed.id} (${refreshed.label}).${usageMessage}`);
       return;
     }
     case "help":
     default: {
       emitReport(
-        pi,
+        ctx,
         [
           "# oauth-router commands",
           "",
@@ -519,13 +520,13 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
 export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime) {
   pi.registerCommand("router-login", {
     description: "Manage oauth-router accounts",
-    handler: async (args, ctx) => handleRouterLogin(pi, runtime, args || "", ctx),
+    handler: async (args, ctx) => handleRouterLogin(runtime, args || "", ctx),
   });
 
   pi.registerCommand("router-status", {
     description: "Show oauth-router health and routing state",
     handler: async (_args, ctx) => {
-      emitReport(pi, formatStatusReport(runtime));
+      emitReport(ctx, formatStatusReport(runtime));
       setFooterStatus(ctx, runtime);
     },
   });
@@ -533,7 +534,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
   pi.registerCommand("router-accounts", {
     description: "Show compact oauth-router account list",
     handler: async (_args, ctx) => {
-      emitReport(pi, formatAccountsReport(runtime));
+      emitReport(ctx, formatAccountsReport(runtime));
       setFooterStatus(ctx, runtime);
     },
   });
@@ -542,7 +543,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
     description: "Show oauth-router visual provider quota and local usage",
     handler: async (args, ctx) => {
       const [id] = parseArgs(args || "");
-      emitReport(pi, formatUsageReport(runtime, id));
+      emitReport(ctx, formatUsageReport(runtime, id));
       setFooterStatus(ctx, runtime);
     },
   });
@@ -551,7 +552,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
     description: "Show raw oauth-router usage/provider quota details",
     handler: async (args, ctx) => {
       const [id] = parseArgs(args || "");
-      emitReport(pi, formatUsageRawReport(runtime, id));
+      emitReport(ctx, formatUsageRawReport(runtime, id));
       setFooterStatus(ctx, runtime);
     },
   });
@@ -560,7 +561,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
     description: "Alias for visual oauth-router usage/quota",
     handler: async (args, ctx) => {
       const [id] = parseArgs(args || "");
-      emitReport(pi, formatUsageReport(runtime, id));
+      emitReport(ctx, formatUsageReport(runtime, id));
       setFooterStatus(ctx, runtime);
     },
   });
@@ -583,7 +584,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       }
 
       const report = formatUsageReport(runtime, target === "all" ? undefined : target);
-      emitReport(pi, failures.length ? [report, "", "## Refresh failures", ...failures].join("\n") : report);
+      emitReport(ctx, failures.length ? [report, "", "## Refresh failures", ...failures].join("\n") : report);
       if (failures.length) ctx.ui.notify(`oauth-router usage refreshed with ${failures.length} failure(s)`, "error");
       setFooterStatus(ctx, runtime);
     },
@@ -597,7 +598,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       const label = await getRequiredLabel(ctx, account.label, labelParts.join(" "));
       runtime.renameAccount(account.id, label);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Renamed account ${account.id} to ${label}.`);
+      emitReport(ctx, `Renamed account ${account.id} to ${label}.`);
     },
   });
 
@@ -612,13 +613,13 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       }
       runtime.removeAccount(account.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Deleted account ${account.id}.`);
+      emitReport(ctx, `Deleted account ${account.id}.`);
     },
   });
 
   pi.registerCommand("router-relogin", {
     description: "Re-login and recover an oauth-router account",
-    handler: async (args, ctx) => handleRouterLogin(pi, runtime, `relogin ${args || ""}`, ctx),
+    handler: async (args, ctx) => handleRouterLogin(runtime, `relogin ${args || ""}`, ctx),
   });
 
   pi.registerCommand("router-enable", {
@@ -628,7 +629,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       const account = await pickAccount(runtime, ctx, id, "Choose account to enable");
       runtime.setEnabled(account.id, true);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Enabled account ${account.id}.`);
+      emitReport(ctx, `Enabled account ${account.id}.`);
     },
   });
 
@@ -639,7 +640,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       const account = await pickAccount(runtime, ctx, id, "Choose account to disable");
       runtime.setEnabled(account.id, false);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Disabled account ${account.id}.`);
+      emitReport(ctx, `Disabled account ${account.id}.`);
     },
   });
 
@@ -649,7 +650,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       const raw = (args || "").trim();
       const policy = normalizePolicy(raw);
       if (!raw) {
-        showCommandHint(pi, ctx, "router-policy", [
+        showCommandHint(ctx, "router-policy", [
           `Current policy: ${runtime.getPolicy()}`,
           "",
           "Usage: /router-policy <round-robin|weighted-round-robin>",
@@ -658,7 +659,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
         return;
       }
       if (!policy) {
-        showCommandHint(pi, ctx, "router-policy", [
+        showCommandHint(ctx, "router-policy", [
           `Unrecognized policy: ${raw}`,
           "",
           `Current policy: ${runtime.getPolicy()}`,
@@ -668,7 +669,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
       }
       runtime.setPolicy(policy);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Routing policy set to ${policy}.`);
+      emitReport(ctx, `Routing policy set to ${policy}.`);
     },
   });
 
@@ -683,12 +684,12 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
         weight = Number(response);
       }
       if (!Number.isFinite(weight)) {
-        showCommandHint(pi, ctx, "router-weight", ["Usage: /router-weight <id> <n>", "Example: /router-weight acct_ab12cd34 3"]);
+        showCommandHint(ctx, "router-weight", ["Usage: /router-weight <id> <n>", "Example: /router-weight acct_ab12cd34 3"]);
         return;
       }
       runtime.setWeight(account.id, weight);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Updated weight for ${account.id} to ${Math.max(1, Math.floor(weight))}.`);
+      emitReport(ctx, `Updated weight for ${account.id} to ${Math.max(1, Math.floor(weight))}.`);
     },
   });
 }

package/.pi/extensions/oauth-router/index.ts

@@ -117,14 +117,14 @@ export default function (pi: ExtensionAPI) {
   installRouterUiBridge(pi, runtime, false);
 
   pi.registerCommand("router-debug-report", {
-    description: "Emit a detailed oauth-router report",
-    handler: async () => {
-      pi.sendMessage({
-        customType: "oauth-router",
-        content: formatStatusReport(runtime),
-        display: true,
-        details: { source: "oauth-router", debug: true },
-      });
+    description: "Show a detailed oauth-router report in the UI only",
+    handler: async (_args, ctx) => {
+      const report = formatStatusReport(runtime);
+      ctx.ui.setWidget("oauth-router-report", [
+        "oauth-router debug report (UI-only; not sent to the agent)",
+        ...report.split(/\r?\n/),
+      ], { placement: "belowEditor" });
+      ctx.ui.notify("oauth-router debug report updated", "info");
     },
   });
 }

package/.pi/extensions/takomi-context-manager/diagnostics-tools.ts

@@ -1,28 +1,61 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { AutocompleteItem } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import type { ContextManagerState } from "./state";
-import { renderReport } from "./diagnostics";
+import { renderReport, type ContextReportMode } from "./diagnostics";
+import { discoverSkillsFromFilesystem, mergeSkills } from "./skill-registry";
+import { persistReportSnapshot, restoreReportFromSession } from "./session-state";
 
 export function registerDiagnostics(pi: ExtensionAPI, state: ContextManagerState): void {
   pi.registerTool({
     name: "context_report",
     label: "Context Report",
-    description: "Show takomi-context-manager diagnostics for prompt rewriting, candidates, policies, gates, and progressive skill loading.",
+    description: "Show takomi-context-manager diagnostics. Defaults to compact summary; use mode='verbose' for full details or mode='problems' for attention-only output.",
     promptSnippet: "Show context manager diagnostics and prompt composition decisions",
-    parameters: Type.Object({ verbose: Type.Optional(Type.Boolean({ description: "Include skill and policy indexes in the report" })) }),
+    parameters: Type.Object({
+      mode: Type.Optional(Type.Union([
+        Type.Literal("summary"),
+        Type.Literal("verbose"),
+        Type.Literal("problems"),
+      ], { description: "Report layout mode. Defaults to summary. Use verbose for full diagnostics or problems for attention-only output." })),
+      verbose: Type.Optional(Type.Boolean({ description: "Deprecated compatibility alias for mode='verbose'." })),
+    }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      restoreReportFromSession(state, ctx);
+      if (state.skills.size === 0) state.skills = mergeSkills(await discoverSkillsFromFilesystem(ctx.cwd));
+      state.report.timestamp = new Date().toISOString();
       state.report.cwd = ctx.cwd;
+      state.report.skillCount = state.skills.size;
       state.report.toolCalls.contextReport += 1;
-      return { content: [{ type: "text", text: renderReport(state, params.verbose ?? false) }], details: state.report };
+      persistReportSnapshot(pi, state, "context_report");
+      const mode = (params.verbose ? "verbose" : params.mode ?? "summary") as ContextReportMode;
+      return { content: [{ type: "text", text: renderReport(state, mode) }], details: { ...state.report, mode } };
     },
   });
 
   pi.registerCommand("context-report", {
-    description: "Show takomi-context-manager diagnostics",
-    handler: async (_args, ctx) => {
+    description: "Show takomi-context-manager diagnostics. Optional args: summary, verbose, problems",
+    getArgumentCompletions: (prefix: string): AutocompleteItem[] | null => {
+      const modes: AutocompleteItem[] = [
+        { value: "summary", label: "summary — compact health report" },
+        { value: "verbose", label: "verbose — full diagnostics" },
+        { value: "problems", label: "problems — only issues requiring attention" },
+      ];
+      const normalized = prefix.trim().toLowerCase();
+      const filtered = modes.filter((mode) => mode.value.startsWith(normalized));
+      return filtered.length ? filtered : null;
+    },
+    handler: async (args, ctx) => {
+      restoreReportFromSession(state, ctx);
+      if (state.skills.size === 0) state.skills = mergeSkills(await discoverSkillsFromFilesystem(ctx.cwd));
+      state.report.timestamp = new Date().toISOString();
       state.report.cwd = ctx.cwd;
+      state.report.skillCount = state.skills.size;
       state.report.toolCalls.contextReport += 1;
-      ctx.ui.notify(renderReport(state, true), "info");
+      persistReportSnapshot(pi, state, "context-report-command");
+      const requested = args.trim();
+      const mode: ContextReportMode = requested === "verbose" || requested === "problems" || requested === "summary" ? requested : "summary";
+      ctx.ui.notify(renderReport(state, mode), "info");
     },
   });
 }