takomi 2.1.42 → 2.1.44

package/.pi/extensions/oauth-router/README.md

@@ -41,12 +41,12 @@ The extension ships with two default upstream profiles:
    - auth mode: OAuth
    - oauth provider: `openai-codex`
    - api: `openai-codex-responses`
-   - default models: `gpt-5.1`, `gpt-5.4`, `gpt-5.4-mini`
+   - default models: `gpt-5.4-mini`, `gpt-5.4`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`
 
 2. `openai-compatible`
    - auth mode: API key fallback
    - api: `openai-responses`
-   - default models: `gpt-4o`, `gpt-4.1`, `o4-mini`
+   - default models: `gpt-5.4-mini`, `gpt-5.4`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`
 
 Edit `~/.pi/agent/oauth-router/config.json` to add more upstreams, swap endpoints, change model catalogs, or tune retry behavior. By default client-side transport failures such as `Codex SSE response headers timed out after 10000ms` retry the same account 5 times with exponential backoff (`5s`, `10s`, `20s`, `40s`, then capped at `60s`) before router failover. While this is happening, Pi's footer shows the active retry/failover/error state so the UI no longer looks frozen. These failures are recorded but do not cool down an account unless `clientNetworkPenaltyMs` is set above `0`.
 
@@ -62,8 +62,7 @@ Edit `~/.pi/agent/oauth-router/config.json` to add more upstreams, swap endpoint
    - `/router-status`
    - `/router-usage`
 5. Select a model:
-   - `oauth-router/gpt-5.4`
-   - `oauth-router/gpt-4o`
+   - `oauth-router/gpt-5.6-sol`
 
 ## Account storage format
 

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

@@ -275,11 +275,7 @@ export function formatUsageRawReport(runtime: RouterRuntime, accountId?: string)
 
 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.setWidget("oauth-router-report", lines, { placement: "belowEditor" });
   ctx.ui.notify(lines[0] || "oauth-router report updated", "info");
 }
 

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

@@ -11,42 +11,15 @@ export const STATE_PATH = join(DATA_ROOT, "state.json");
 
 const LEGACY_CODEX_CONTEXT_WINDOW = 272000;
 const SAFE_CODEX_CONTEXT_WINDOW = 240000;
-const CODEX_MODEL_IDS = new Set(["gpt-5.1", "gpt-5.4", "gpt-5.4-mini", "gpt-5.5"]);
+const CODEX_MODEL_IDS = new Set(["gpt-5.4", "gpt-5.4-mini", "gpt-5.5", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra"]);
 
 const DEFAULT_MODELS: RouterModelConfig[] = [
   {
-    id: "gpt-4o",
-    name: "GPT-4o",
-    reasoning: false,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 128000,
-    maxTokens: 16384,
-  },
-  {
-    id: "gpt-4.1",
-    name: "GPT-4.1",
-    reasoning: false,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 128000,
-    maxTokens: 16384,
-  },
-  {
-    id: "o4-mini",
-    name: "o4-mini",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 200000,
-    maxTokens: 100000,
-  },
-  {
-    id: "gpt-5.1",
-    name: "GPT-5.1",
+    id: "gpt-5.4-mini",
+    name: "GPT-5.4 Mini",
     reasoning: true,
     input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    cost: { input: 0.75, output: 4.50, cacheRead: 0.075, cacheWrite: 0.9375 },
     contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
     maxTokens: 128000,
   },
@@ -55,28 +28,46 @@ const DEFAULT_MODELS: RouterModelConfig[] = [
     name: "GPT-5.4",
     reasoning: true,
     input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    cost: { input: 2.50, output: 15.00, cacheRead: 0.25, cacheWrite: 3.125 },
     contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
     maxTokens: 128000,
   },
-  {
-    id: "gpt-5.4-mini",
-    name: "GPT-5.4 Mini",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
-    maxTokens: 128000,
-  },
-  {
-    id: "gpt-5.5",
+  {
+    id: "gpt-5.5",
     name: "GPT-5.5",
     reasoning: true,
     input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    cost: { input: 5.00, output: 30.00, cacheRead: 0.50, cacheWrite: 6.25 },
     contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
-    maxTokens: 128000,
-  },
+    maxTokens: 128000,
+  },
+  {
+    id: "gpt-5.6-luna",
+    name: "GPT-5.6 Luna",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 1.00, output: 6.00, cacheRead: 0.10, cacheWrite: 1.25 },
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
+    maxTokens: 128000,
+  },
+  {
+    id: "gpt-5.6-sol",
+    name: "GPT-5.6 Sol",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 5.00, output: 30.00, cacheRead: 0.50, cacheWrite: 6.25 },
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
+    maxTokens: 128000,
+  },
+  {
+    id: "gpt-5.6-terra",
+    name: "GPT-5.6 Terra",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 2.50, output: 15.00, cacheRead: 0.25, cacheWrite: 3.125 },
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
+    maxTokens: 128000,
+  },
 ];
 
 const DEFAULT_UPSTREAMS: RouterUpstreamConfig[] = [
@@ -88,7 +79,7 @@ const DEFAULT_UPSTREAMS: RouterUpstreamConfig[] = [
     api: "openai-responses",
     authMode: "api-key",
     enabled: true,
-    modelIds: ["gpt-4o", "gpt-4.1", "o4-mini"],
+    modelIds: ["gpt-5.4-mini", "gpt-5.4", "gpt-5.5", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra"],
   },
   {
     id: "chatgpt-codex",
@@ -99,7 +90,7 @@ const DEFAULT_UPSTREAMS: RouterUpstreamConfig[] = [
     authMode: "oauth",
     oauthProviderId: "openai-codex",
     enabled: true,
-    modelIds: ["gpt-5.1", "gpt-5.4", "gpt-5.4-mini", "gpt-5.5"],
+    modelIds: ["gpt-5.4-mini", "gpt-5.4", "gpt-5.5", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra"],
     usageProbe: {
       enabled: true,
       timeoutMs: 8_000,
@@ -209,8 +200,12 @@ function mergeModelConfigs(candidateModels: RouterModelConfig[] | undefined): Ro
     return deepClone(DEFAULT_CONFIG.models);
   }
 
+  const defaultIds = new Set(DEFAULT_CONFIG.models.map((m) => m.id));
   const merged = new Map(DEFAULT_CONFIG.models.map((model) => [model.id, deepClone(model)]));
   for (const model of candidateModels) {
+    if (!defaultIds.has(model.id)) {
+      continue;
+    }
     const previous = merged.get(model.id) ?? ({} as RouterModelConfig);
     merged.set(model.id, { ...previous, ...deepClone(model), id: model.id });
   }
@@ -227,6 +222,7 @@ function mergeUpstreamConfigs(candidateUpstreams: RouterUpstreamConfig[] | undef
     return deepClone(DEFAULT_CONFIG.upstreams);
   }
 
+  const defaultModelIds = new Set(DEFAULT_CONFIG.models.map((m) => m.id));
   const merged = new Map(DEFAULT_CONFIG.upstreams.map((upstream) => [upstream.id, deepClone(upstream)]));
   for (const upstream of candidateUpstreams) {
     const previous = merged.get(upstream.id);
@@ -235,7 +231,8 @@ function mergeUpstreamConfigs(candidateUpstreams: RouterUpstreamConfig[] | undef
       continue;
     }
 
-    const modelIds = Array.from(new Set([...(previous.modelIds ?? []), ...(upstream.modelIds ?? [])]));
+    const modelIds = Array.from(new Set([...(previous.modelIds ?? []), ...(upstream.modelIds ?? [])]))
+      .filter((id) => defaultModelIds.has(id));
     const usageProbe = {
       ...(previous.usageProbe ?? {}),
       ...(upstream.usageProbe ?? {}),

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

@@ -120,10 +120,7 @@ export default function (pi: ExtensionAPI) {
     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.setWidget("oauth-router-report", report.split(/\r?\n/), { placement: "belowEditor" });
       ctx.ui.notify("oauth-router debug report updated", "info");
     },
   });

package/.pi/extensions/oauth-router/scripts/vibe-verify.py

@@ -21,7 +21,7 @@ REQUIRED = [
     ROOT / "types.ts",
     ROOT / "README.md",
 ]
-EXPECTED_MODELS = ["oauth-router", "gpt-4o", "gpt-4.1", "o4-mini", "gpt-5.4"]
+EXPECTED_MODELS = ["oauth-router", "gpt-5.4-mini", "gpt-5.4", "gpt-5.5", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra"]
 PI_CANDIDATES = [
     os.environ.get("PI_BIN"),
     shutil.which("pi"),
@@ -77,12 +77,12 @@ def main() -> int:
             failed = True
         else:
             print("[ OK ] `pi --list-models` executed")
-            for token in EXPECTED_MODELS:
-                if token not in output:
+            for token in EXPECTED_MODELS:
+                if token not in output:
                     print(f"[FAIL] model token not found in list output: {token}")
                     failed = True
-                else:
-                    print(f"[ OK ] model token present: {token}")
+                else:
+                    print(f"[ OK ] model token present: {token}")
     except Exception as exc:
         print(f"[FAIL] unable to execute `pi --list-models`: {exc}")
         failed = True

package/.pi/extensions/takomi-context-manager/index.ts

@@ -18,6 +18,7 @@ import type { ContextManagerConfig } from "./types";
 export default function takomiContextManager(pi: ExtensionAPI) {
   const state = createState();
   let config: ContextManagerConfig = DEFAULT_CONFIG;
+  let duplicateExtensionWarnings: Array<{ toolName: string; paths: string[] }> = [];
 
   registerSkillTools(pi, state);
   registerPolicyTools(pi, state);
@@ -27,21 +28,30 @@ export default function takomiContextManager(pi: ExtensionAPI) {
 
   pi.on("session_start", async (_event, ctx) => {
     config = await loadConfig(ctx.cwd);
-    state.policies = await discoverPolicies(ctx.cwd, config);
-    state.skills = mergeSkills(await discoverSkillsFromFilesystem(ctx.cwd));
+    [state.policies, duplicateExtensionWarnings] = await Promise.all([
+      discoverPolicies(ctx.cwd, config),
+      detectDuplicateTakomiExtensions(ctx.cwd),
+    ]);
+
+    // Pi already discovers skills while building systemPromptOptions. Rewalking
+    // every global/project skill tree here made startup block on thousands of
+    // filesystem calls, then repeated the same work before the first request.
+    // Keep filesystem discovery lazy for direct skill-tool calls and as a
+    // compatibility fallback when Pi supplies no skill metadata.
+    state.skills = new Map();
     state.report.cwd = ctx.cwd;
-    state.report.skillCount = state.skills.size;
+    state.report.skillCount = 0;
     restoreReportFromSession(state, ctx);
   });
 
   pi.on("before_agent_start", async (event, ctx) => {
-    config = await loadConfig(ctx.cwd);
-    state.policies = await discoverPolicies(ctx.cwd, config);
-    const duplicateExtensionWarnings = await detectDuplicateTakomiExtensions(ctx.cwd);
     const optionSkills = collectSkillsFromOptions(event.systemPromptOptions);
     const xmlSkills = collectSkillsFromXml(event.systemPrompt);
-    const filesystemSkills = await discoverSkillsFromFilesystem(ctx.cwd);
-    state.skills = mergeSkills([...filesystemSkills, ...optionSkills, ...xmlSkills]);
+    const suppliedSkills = [...optionSkills, ...xmlSkills];
+    const filesystemSkills = suppliedSkills.length === 0
+      ? await discoverSkillsFromFilesystem(ctx.cwd)
+      : [];
+    state.skills = mergeSkills([...filesystemSkills, ...suppliedSkills]);
 
     const candidates = findCandidates(event.prompt, state.skills, config);
     const rewrite = rewritePrompt(event.systemPrompt, state.skills, candidates, config);

package/.pi/extensions/takomi-runtime/index.ts

@@ -34,7 +34,6 @@ import {
   type VibeLifecycleStage,
 } from "../../../src/pi-takomi-core";
 import {
-  renderRuntimeStatus,
   renderRuntimeWidget,
   renderTakomiHeader,
   TakomiFooterComponent,
@@ -689,10 +688,11 @@ function installTakomiFooter(ctx: ExtensionContext, stateRef: { current: TakomiS
   ctx.ui.setFooter((tui, theme, footerData) => new TakomiFooterComponent(tui, theme, footerData, ctx, () => stateRef.current));
 }
 
-// Mutable state ref so the footer closure always reads the latest state
-const footerStateRef: { current: TakomiState; installed: boolean } = { current: cloneState(DEFAULT_STATE), installed: false };
-
-async function refreshUi(ctx: ExtensionContext, state: TakomiState) {
+async function refreshUi(
+  ctx: ExtensionContext,
+  state: TakomiState,
+  footerStateRef: { current: TakomiState; context?: ExtensionContext },
+) {
   if (!ctx.hasUI) return;
   ctx.ui.setTitle("Takomi");
   ctx.ui.setHeader((_tui, theme) => ({
@@ -702,17 +702,25 @@ async function refreshUi(ctx: ExtensionContext, state: TakomiState) {
     },
   }));
   footerStateRef.current = state;
-  ctx.ui.setStatus("takomi-runtime", renderRuntimeStatus(ctx.ui.theme, state));
+
+  // The mode indicator belongs in the widget above the editor. Keeping a
+  // second setStatus copy makes Pi's default footer duplicate it whenever a
+  // custom footer is replaced or a session is rebound.
+  ctx.ui.setStatus("takomi-runtime", undefined);
   const widget = renderRuntimeWidget(ctx.ui.theme, state);
   ctx.ui.setWidget("takomi-runtime", widget.length > 0 ? widget : undefined);
-  if (!footerStateRef.installed) {
+
+  // A replacement session receives a fresh UI context even when extension
+  // modules remain cached. Install once per context, not once per module.
+  if (footerStateRef.context !== ctx) {
     installTakomiFooter(ctx, footerStateRef);
-    footerStateRef.installed = true;
+    footerStateRef.context = ctx;
   }
 }
 
 export default function takomiRuntime(pi: ExtensionAPI) {
   let state = cloneState(DEFAULT_STATE);
+  const footerStateRef: { current: TakomiState; context?: ExtensionContext } = { current: state };
   const subagentController = getTakomiSubagentController();
   const contextPanel = new TakomiContextPanel();
   let runtimeCtx: ExtensionContext | undefined;
@@ -798,7 +806,7 @@ export default function takomiRuntime(pi: ExtensionAPI) {
     mutator();
     persistState();
     syncContextPanelState();
-    await refreshUi(ctx, state);
+    await refreshUi(ctx, state, footerStateRef);
     const resolvedMessage = typeof message === "function" ? message() : message;
     if (resolvedMessage) ctx.ui.notify(resolvedMessage, "info");
   }
@@ -910,7 +918,7 @@ export default function takomiRuntime(pi: ExtensionAPI) {
 
     persistState();
     syncContextPanelState();
-    await refreshUi(ctx, state);
+    await refreshUi(ctx, state, footerStateRef);
     const label = state.modeSource === "idle" ? "idle" : `${state.modeSource}:${state.stage ?? state.role}`;
     return `Takomi mode set to ${label}${state.modeReason ? ` (${state.modeReason})` : ""}.`;
   }
@@ -1137,7 +1145,7 @@ ${stateJson}`
         state.modeReason = state.modeReason ?? "board task update";
         persistState();
         syncContextPanelState();
-        await refreshUi(ctx, state);
+        await refreshUi(ctx, state, footerStateRef);
         const nextState = buildSessionState(
           sessionState.sessionId,
           sessionState.title,
@@ -1197,7 +1205,7 @@ ${stateJson}`
         state.modeReason = `expanded ${params.stage} stage`;
         persistState();
         syncContextPanelState();
-        await refreshUi(ctx, state);
+        await refreshUi(ctx, state, footerStateRef);
 
         return {
           content: [{ type: "text", text: `Expanded ${params.stage} stage in session ${nextState.sessionId}.\n\nDocs: ${paths.root}\nState: ${paths.stateFile}\n\n${buildTaskRows(nextState.tasks)}` }],
@@ -1242,7 +1250,7 @@ ${stateJson}`
       state.modeReason = "orchestrator session";
       persistState();
       syncContextPanelState();
-      await refreshUi(ctx, state);
+      await refreshUi(ctx, state, footerStateRef);
 
       return {
         content: [{ type: "text", text: `Created Takomi orchestrator session ${nextState.sessionId} in hybrid mode\n\nDocs: ${paths.root}\nState: ${paths.stateFile}\n\n${buildTaskRows(nextState.tasks) || "No tasks provided."}` }],
@@ -1356,7 +1364,7 @@ ${stateJson}`
     }
     persistState();
     syncContextPanelState();
-    await refreshUi(ctx, state);
+    await refreshUi(ctx, state, footerStateRef);
 
     const routingPolicy = await resolveTakomiRoutingPolicy(runtimeCwd);
     const optionalFeatureContext = (() => {
@@ -1458,7 +1466,7 @@ ${stateJson}`
 
     syncContextPanelState();
     contextPanel.rebuildFromSession(ctx);
-    await refreshUi(ctx, state);
+    await refreshUi(ctx, state, footerStateRef);
     contextPanel.show(ctx);
     flushPendingSubagentEvents();
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takomi",
-  "version": "2.1.42",
+  "version": "2.1.44",
   "description": "🎯 Stop wrestling with AI. Start building with purpose. The artisan's toolkit for agent workflows, Codex skills, and original Takomi capabilities like 21st.dev integration.",
   "type": "module",
   "bin": {

package/src/pi-harness.js

@@ -575,6 +575,45 @@ function printFirstRunGuidance(reason) {
   console.log(pc.dim('  takomi --help             Show all commands\n'));
 }
 
+export function getSourceCheckoutLaunchArgs(cwd) {
+  const packageJson = path.join(cwd, 'package.json');
+  const extensionsRoot = path.join(cwd, '.pi', 'extensions');
+  const required = [
+    path.join(extensionsRoot, 'oauth-router', 'index.ts'),
+    path.join(extensionsRoot, 'takomi-runtime', 'index.ts'),
+    path.join(extensionsRoot, 'takomi-subagents', 'index.ts'),
+    path.join(extensionsRoot, 'takomi-context-manager', 'index.ts'),
+    path.join(extensionsRoot, 'notify-sound', 'index.ts'),
+  ];
+  const promptsRoot = path.join(cwd, '.pi', 'prompts');
+  const theme = path.join(cwd, '.pi', 'themes', 'takomi-noir.json');
+
+  let isTakomiSourceCheckout = false;
+  try {
+    const pkg = fs.readJsonSync(packageJson);
+    isTakomiSourceCheckout = pkg?.name === 'takomi'
+      && required.every((entry) => fs.existsSync(entry))
+      && fs.existsSync(promptsRoot)
+      && fs.existsSync(theme);
+  } catch {}
+
+  if (!isTakomiSourceCheckout) return [];
+
+  // Normal Pi auto-discovery would load both the globally installed Takomi
+  // extensions and this checkout's project copies. Besides tool conflicts,
+  // both runtime instances register lifecycle/UI handlers, which causes slow
+  // startup and duplicated headers/widgets/footers. Match scripts/pi-dev.ps1:
+  // disable discovery and load exactly one local development set.
+  return [
+    '--no-extensions',
+    ...required.flatMap((entry) => ['--extension', entry]),
+    '--no-prompt-templates',
+    '--prompt-template', promptsRoot,
+    '--no-themes',
+    '--theme', theme,
+  ];
+}
+
 export async function launchTakomiHarness(cwd = process.cwd()) {
   // Keep the common `takomi` path lean. A full environment inspection shells out
   // to `pi --version`, which costs multiple seconds on Windows before Pi even
@@ -606,7 +645,8 @@ export async function launchTakomiHarness(cwd = process.cwd()) {
   };
 
   return await new Promise((resolve) => {
-    const resolved = resolveCommandForSpawn(pi.path || 'pi', []);
+    const launchArgs = getSourceCheckoutLaunchArgs(cwd);
+    const resolved = resolveCommandForSpawn(pi.path || 'pi', launchArgs);
     const child = spawn(resolved.command, resolved.args, {
       cwd,
       stdio: 'inherit',

package/src/takomi-stats.js

@@ -16,8 +16,11 @@ const pc = {
   magenta: ansi(35, 39),
 };
 
-const PRICES = {
-  'gpt-5.5': [5.00, 0.50, 30.00],
+const PRICES = {
+  'gpt-5.6-luna': [1.00, 0.10, 6.00],
+  'gpt-5.6-sol': [5.00, 0.50, 30.00],
+  'gpt-5.6-terra': [2.50, 0.25, 15.00],
+  'gpt-5.5': [5.00, 0.50, 30.00],
   'gpt-5.4': [2.50, 0.25, 15.00],
   'gpt-5.4-mini': [0.75, 0.075, 4.50],
   'gpt-5.4-nano': [0.20, 0.02, 1.25],