takomi 2.1.27 → 2.1.29

package/.pi/README.md

@@ -45,6 +45,7 @@ Inside Pi, use:
 - The old standalone commands (`/takomi-genesis`, `/takomi-design`, `/takomi-build`, `/takomi-kickoff`, `/autoorch`, `/orch`, `/architect`, `/code`, `/review`, and the `/takomi-subagent*` variants) are folded into `/takomi` subcommands so slash autocomplete stays small.
 - prompt shortcuts are suffixed with `-prompt` to avoid collisions with runtime commands, e.g. `/orch-prompt`, `/build-prompt`, `/design-prompt`, `/genesis-prompt`, `/takomi-prompt`, `/prime-prompt`
 - a project-local theme is available at `.pi/themes/takomi-noir.json`; select `takomi-noir` in `/settings` to use the Takomi UI palette
+- optional Pi feature packs are managed by `takomi setup pi` or `takomi setup pi-features` and refreshed by `takomi refresh`; current defaults install Takomi Interview (`npm:@juicesharp/rpiv-ask-user-question`) while Takomi Todo (`npm:@juicesharp/rpiv-todo`), Browser QA (`npm:pi-chrome`), and Doc Preview (`npm:pi-markdown-preview`) stay opt-in
 - additional workflow prompts are available as direct slash commands:
   - `/vibe-primeAgent`
   - `/vibe-spawnTask`
@@ -128,3 +129,12 @@ So when working on packaging, agents should distinguish between:
   - rewrite JSON machine state
   - keep task docs organized in `pending/`, `in-progress/`, `completed/`, and `blocked/`
 - `takomi_board` intentionally cannot dispatch or redispatch agents. Use `takomi_subagent` for single, parallel, or chain execution, then call `takomi_board update_task` with the result.
+
+## Attribution Notes
+
+- Pi-native Takomi runs on [Pi](https://github.com/earendil-works/pi) / `@earendil-works/pi-coding-agent`, authored by Mario Zechner and Earendil Works.
+- Takomi subagent execution builds on [`pi-subagents`](https://github.com/nicobailon/pi-subagents) by Nico Bailon, with Takomi adding lifecycle orchestration, board/state artifacts, model-routing policy, and review-loop conventions.
+- Optional Takomi Interview and Todo feature packs integrate [`@juicesharp/rpiv-ask-user-question`](https://github.com/juicesharp/rpiv-mono/tree/main/packages/rpiv-ask-user-question) and [`@juicesharp/rpiv-todo`](https://github.com/juicesharp/rpiv-mono/tree/main/packages/rpiv-todo) by juicesharp.
+- Optional Browser QA can use [`pi-chrome`](https://github.com/tianrendong/pi-chrome) by tianrendong.
+- Optional Doc Preview can use [`pi-markdown-preview`](https://github.com/omaclaren/pi-markdown-preview) by omaclaren.
+- [`context-mode`](https://github.com/mksglu/context-mode) by Mert Koseoğlu is credited as external research/power-user context tooling; it is not a Takomi default bundle.

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

@@ -404,15 +404,13 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
           updatedAt: Date.now(),
         });
         runtime.clearAccountHealth(duplicate.id);
-        await runtime.refreshUsageSnapshot(duplicate.id);
         setFooterStatus(ctx, runtime);
-        emitReport(pi, `Updated existing account ${duplicate.id} (${duplicate.label}) with fresh credentials instead of adding a duplicate.`);
+        emitReport(pi, `Updated existing account ${duplicate.id} (${duplicate.label}) with fresh credentials instead of adding a duplicate. Run /router-refresh-usage ${duplicate.id} to refresh provider quota metadata.`);
         return;
       }
       runtime.addAccount(account);
-      await runtime.refreshUsageSnapshot(account.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Added account ${account.id} (${account.label}) for upstream ${upstream.id}.`);
+      emitReport(pi, `Added account ${account.id} (${account.label}) for upstream ${upstream.id}. Run /router-refresh-usage ${account.id} to refresh provider quota metadata.`);
       ctx.ui.notify(`Added ${account.id}`, "info");
       return;
     }
@@ -461,17 +459,15 @@ async function handleRouterLogin(pi: ExtensionAPI, runtime: RouterRuntime, args:
         updatedAt: Date.now(),
       });
       runtime.clearAccountHealth(existing.id);
-      await runtime.refreshUsageSnapshot(existing.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Re-logged account ${existing.id} (${existing.label}) and cleared auth state.`);
+      emitReport(pi, `Re-logged account ${existing.id} (${existing.label}) and cleared auth state. Run /router-refresh-usage ${existing.id} to refresh provider quota metadata.`);
       return;
     }
     case "refresh": {
       const account = await pickAccount(runtime, ctx, first, "Choose account to refresh");
       const refreshed = await runtime.refreshAccount(account.id);
-      await runtime.refreshUsageSnapshot(refreshed.id);
       setFooterStatus(ctx, runtime);
-      emitReport(pi, `Refreshed account ${refreshed.id} (${refreshed.label}).`);
+      emitReport(pi, `Refreshed account ${refreshed.id} (${refreshed.label}). Run /router-refresh-usage ${refreshed.id} to refresh provider quota metadata.`);
       return;
     }
     case "help":
@@ -554,7 +550,7 @@ export function registerRouterCommands(pi: ExtensionAPI, runtime: RouterRuntime)
   });
 
   pi.registerCommand("router-refresh-usage", {
-    description: "Refresh oauth-router account metadata from token claims",
+    description: "Refresh oauth-router account metadata and best-effort provider quota",
     handler: async (args, ctx) => {
       const [requestedId] = parseArgs(args || "");
       const target = await pickUsageTarget(runtime, ctx, requestedId);

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

@@ -98,6 +98,7 @@ const DEFAULT_UPSTREAMS: RouterUpstreamConfig[] = [
     modelIds: ["gpt-5.1", "gpt-5.4", "gpt-5.4-mini", "gpt-5.5"],
     usageProbe: {
       enabled: true,
+      timeoutMs: 2_500,
       endpoints: [
         "/wham/usage",
         "/codex/usage",
@@ -138,6 +139,8 @@ function sleepSync(ms: number): void {
 }
 
 const HELD_JSON_LOCKS = new Set<string>();
+const JSON_LOCK_WAIT_TIMEOUT_MS = 2_000;
+const JSON_LOCK_STALE_AFTER_MS = 5_000;
 
 export function withJsonFileLock<T>(filePath: string, fn: () => T): T {
   const lockPath = `${filePath}.lock`;
@@ -150,12 +153,12 @@ export function withJsonFileLock<T>(filePath: string, fn: () => T): T {
     } catch {
       try {
         const ageMs = Date.now() - statSync(lockPath).mtimeMs;
-        if (ageMs > 30_000) rmSync(lockPath, { recursive: true, force: true });
+        if (ageMs > JSON_LOCK_STALE_AFTER_MS) rmSync(lockPath, { recursive: true, force: true });
       } catch {
         // The lock disappeared between mkdir attempts.
       }
-      if (Date.now() - started > 10_000) {
-        throw new Error(`Timed out waiting for oauth-router JSON lock: ${lockPath}`);
+      if (Date.now() - started > JSON_LOCK_WAIT_TIMEOUT_MS) {
+        throw new Error(`Timed out after ${JSON_LOCK_WAIT_TIMEOUT_MS}ms waiting for oauth-router JSON lock: ${lockPath}`);
       }
       sleepSync(50);
     }

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

@@ -331,6 +331,30 @@ function collectRateLimitHeaders(headers: Headers): Record<string, string> {
   return result;
 }
 
+const DEFAULT_USAGE_PROBE_TIMEOUT_MS = 2_500;
+
+function getUsageProbeTimeoutMs(upstream: RouterUpstreamConfig): number {
+  const configured = upstream.usageProbe?.timeoutMs;
+  return typeof configured === "number" && Number.isFinite(configured) && configured > 0
+    ? Math.min(configured, 10_000)
+    : DEFAULT_USAGE_PROBE_TIMEOUT_MS;
+}
+
+async function fetchJsonWithTimeout(url: string, init: RequestInit, timeoutMs: number): Promise<{ response: Response; text: string }> {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(url, { ...init, signal: controller.signal });
+    const text = await response.text();
+    return { response, text };
+  } catch (error) {
+    if (controller.signal.aborted) throw new Error(`timed out after ${Math.round(timeoutMs)}ms`);
+    throw error;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 export async function refreshProviderUsageSnapshot(account: StoredRouterAccount, upstream: RouterUpstreamConfig): Promise<RouterProviderUsageSnapshot> {
   const base = inspectAccountToken(account);
   if (account.provider !== "openai-codex" || upstream.usageProbe?.enabled === false) return base;
@@ -345,12 +369,20 @@ export async function refreshProviderUsageSnapshot(account: StoredRouterAccount,
   let lastEndpoint: string | undefined;
   let lastHeaders: Record<string, string> | undefined;
   const errors: string[] = [];
+  const startedAt = now();
+  const totalTimeoutMs = getUsageProbeTimeoutMs(upstream);
 
   for (const endpoint of endpoints) {
+    const remainingMs = totalTimeoutMs - (now() - startedAt);
+    if (remainingMs <= 0) {
+      errors.push(`probe timed out after ${Math.round(totalTimeoutMs)}ms`);
+      break;
+    }
+
     const url = resolveProbeUrl(upstream.baseUrl, endpoint);
     lastEndpoint = url;
     try {
-      const response = await fetch(url, {
+      const { response, text } = await fetchJsonWithTimeout(url, {
         method: "GET",
         headers: {
           Authorization: `Bearer ${account.access}`,
@@ -361,10 +393,9 @@ export async function refreshProviderUsageSnapshot(account: StoredRouterAccount,
           "User-Agent": "codex_cli_rs/0.133.0 (Windows; x86_64) pi/oauth-router",
           accept: "application/json",
         },
-      });
+      }, Math.max(1, remainingMs));
       lastStatus = response.status;
       lastHeaders = collectRateLimitHeaders(response.headers);
-      const text = await response.text();
       const json = text ? JSON.parse(text) : undefined;
       const extracted = extractProviderUsage(json);
       const hasQuota = Boolean(extracted.fiveHour || extracted.weekly || extracted.planType);

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

@@ -27,6 +27,8 @@ export interface RouterModelConfig {
 export interface RouterProviderUsageProbeConfig {
   enabled?: boolean;
   endpoints?: string[];
+  /** Total best-effort probe budget per account. Provider usage checks must not block login/refresh UX. */
+  timeoutMs?: number;
 }
 
 export interface RouterUpstreamConfig {

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

@@ -41,7 +41,7 @@ export function renderReport(state: ContextManagerState, verbose = false): strin
     lines.push("- Candidates: none");
   }
   if (report.duplicateExtensionWarnings.length > 0 || verbose) {
-    lines.push("", "Extension Conflict Diagnostics:", ...renderDuplicateExtensionGuidance(report.duplicateExtensionWarnings));
+    lines.push("", "Extension Conflict Diagnostics:", ...renderDuplicateExtensionGuidance(report.duplicateExtensionWarnings, report.cwd));
   }
   if (verbose) {
     lines.push("", "Skill Index:", ...sortedSkills(state.skills).map((skill) => `- ${skill.name}`));

package/.pi/extensions/takomi-context-manager/extension-conflicts.ts

@@ -1,7 +1,7 @@
 import { access } from "node:fs/promises";
+import { existsSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import type { ContextManagerState } from "./state";
 
 type KnownTakomiExtension = {
   toolName: string;
@@ -43,9 +43,20 @@ export async function detectDuplicateTakomiExtensions(cwd: string): Promise<Arra
   return warnings;
 }
 
-export function renderDuplicateExtensionGuidance(warnings: Array<{ toolName: string; paths: string[] }>): string[] {
+function isTakomiSourceRepo(cwd: string): boolean {
+  return [
+    path.join(cwd, "package.json"),
+    path.join(cwd, "scripts", "pi-dev.ps1"),
+    path.join(cwd, ".pi", "extensions", "takomi-runtime", "index.ts"),
+  ].every((filePath) => existsSync(filePath));
+}
+
+export function renderDuplicateExtensionGuidance(warnings: Array<{ toolName: string; paths: string[] }>, cwd?: string): string[] {
   if (warnings.length === 0) return ["- Duplicate Takomi extensions: none detected"];
-  const lines = ["- Duplicate Takomi extensions detected:"];
+  const sourceRepo = cwd ? isTakomiSourceRepo(cwd) : false;
+  const lines = [sourceRepo
+    ? "- Duplicate Takomi extensions detected (expected when running normal Pi inside the Takomi source repo):"
+    : "- Duplicate Takomi extensions detected:"];
   for (const warning of warnings) {
     lines.push(`  - ${warning.toolName}`);
     for (const filePath of warning.paths) lines.push(`    - ${filePath}`);