@sma1lboy/kobe 0.5.0 → 0.5.2

package/dist/bin/kobed.js

@@ -353,7 +353,24 @@ function extractMessage(record, fallbackSessionId) {
   const content = inner.content;
   const ts = typeof record.timestamp === "string" ? record.timestamp : new Date().toISOString();
   const sid = typeof record.sessionId === "string" ? record.sessionId : fallbackSessionId;
-  return { role, content, timestamp: ts, sessionId: sid };
+  const usage = extractUsage(inner.usage);
+  return usage ? { role, content, timestamp: ts, sessionId: sid, usage } : { role, content, timestamp: ts, sessionId: sid };
+}
+function extractUsage(v) {
+  if (!isObject(v))
+    return;
+  const inTok = typeof v.input_tokens === "number" ? v.input_tokens : undefined;
+  const outTok = typeof v.output_tokens === "number" ? v.output_tokens : undefined;
+  if (inTok === undefined || outTok === undefined)
+    return;
+  const cacheRead = typeof v.cache_read_input_tokens === "number" ? v.cache_read_input_tokens : undefined;
+  const cacheCreate = typeof v.cache_creation_input_tokens === "number" ? v.cache_creation_input_tokens : undefined;
+  return {
+    input_tokens: inTok,
+    output_tokens: outTok,
+    ...cacheRead !== undefined ? { cache_read_input_tokens: cacheRead } : {},
+    ...cacheCreate !== undefined ? { cache_creation_input_tokens: cacheCreate } : {}
+  };
 }
 function isObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
@@ -1021,13 +1038,15 @@ __export(exports_bridge, {
 import { writeFile } from "fs/promises";
 import { homedir as homedir4 } from "os";
 import { join } from "path";
+import { fileURLToPath } from "url";
 async function startBridge(orch, opts = {}) {
   const home = opts.homeDir ?? process.env.KOBE_HOME_DIR ?? homedir4();
   const runDir = join(home, ".kobe", "run");
   const socketPath = join(runDir, `bridge-${process.pid}.sock`);
   const mcpConfigPath = join(runDir, `mcp-${process.pid}.json`);
   const server = await startBridgeServer(orch, socketPath);
-  const entry = process.argv[1] ?? "";
+  const moduleExt = import.meta.url.endsWith(".ts") ? ".ts" : ".js";
+  const entry = fileURLToPath(new URL(`../../cli/index${moduleExt}`, import.meta.url));
   const mcpConfig = {
     mcpServers: {
       kobe: {
@@ -2961,6 +2980,9 @@ class Orchestrator {
   tasksSignal() {
     return this.tasksAcc;
   }
+  planUsageSignal() {
+    return () => null;
+  }
   subscribeTasks(listener) {
     return this.store.subscribe(listener);
   }
@@ -4294,9 +4316,166 @@ init_paths2();
 
 // src/daemon/server.ts
 init_paths2();
-import { mkdir as mkdir3, readFile as readFile4, unlink as unlink4, writeFile as writeFile3 } from "fs/promises";
+import { mkdir as mkdir3, readFile as readFile5, unlink as unlink4, writeFile as writeFile3 } from "fs/promises";
 import { createServer as createServer2 } from "net";
 import { dirname as dirname4 } from "path";
+
+// src/engine/claude-code-local/plan-usage.ts
+import { execFile } from "child_process";
+import { createHash } from "crypto";
+import { readFile as readFile4 } from "fs/promises";
+import { homedir as homedir10, userInfo } from "os";
+import { join as join6 } from "path";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
+var FETCH_TIMEOUT_MS = 5000;
+var KEYCHAIN_BASE = "Claude Code";
+var KEYCHAIN_SUFFIX = "-credentials";
+function keychainServiceName() {
+  const configDir = process.env.CLAUDE_CONFIG_DIR;
+  if (!configDir)
+    return `${KEYCHAIN_BASE}${KEYCHAIN_SUFFIX}`;
+  const hash = createHash("sha256").update(configDir).digest("hex").slice(0, 8);
+  return `${KEYCHAIN_BASE}${KEYCHAIN_SUFFIX}-${hash}`;
+}
+function keychainAccount() {
+  return process.env.USER || userInfo().username || "claude-code-user";
+}
+async function readKeychainToken() {
+  if (process.platform !== "darwin")
+    return null;
+  try {
+    const { stdout } = await execFileAsync("security", [
+      "find-generic-password",
+      "-a",
+      keychainAccount(),
+      "-w",
+      "-s",
+      keychainServiceName()
+    ]);
+    return parseStoredOAuth(stdout);
+  } catch {
+    return null;
+  }
+}
+async function readPlainTextToken() {
+  const configDir = process.env.CLAUDE_CONFIG_DIR ?? join6(homedir10(), ".claude");
+  const path7 = join6(configDir, ".credentials.json");
+  try {
+    const raw = await readFile4(path7, "utf8");
+    return parseStoredOAuth(raw);
+  } catch {
+    return null;
+  }
+}
+function parseStoredOAuth(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed)
+    return null;
+  try {
+    const parsed = JSON.parse(trimmed);
+    const tok = parsed.claudeAiOauth;
+    if (!tok || typeof tok.accessToken !== "string" || tok.accessToken.length === 0)
+      return null;
+    return tok;
+  } catch {
+    return null;
+  }
+}
+async function loadToken() {
+  return await readKeychainToken() ?? await readPlainTextToken();
+}
+function normalizeBucket(b) {
+  if (!b)
+    return null;
+  return {
+    utilization: typeof b.utilization === "number" && Number.isFinite(b.utilization) ? b.utilization : null,
+    resetsAt: typeof b.resets_at === "string" && b.resets_at.length > 0 ? b.resets_at : null
+  };
+}
+async function fetchPlanUsage(now = Date.now()) {
+  const token = await loadToken();
+  if (!token)
+    return null;
+  if (typeof token.expiresAt === "number" && token.expiresAt > 0 && token.expiresAt < now)
+    return null;
+  const ctrl = new AbortController;
+  const timer = setTimeout(() => ctrl.abort(), FETCH_TIMEOUT_MS);
+  try {
+    const res = await fetch(USAGE_URL, {
+      signal: ctrl.signal,
+      headers: {
+        accept: "application/json",
+        "content-type": "application/json",
+        "user-agent": "kobe-plan-usage",
+        "anthropic-beta": "oauth-2025-04-20",
+        authorization: `Bearer ${token.accessToken}`
+      }
+    });
+    if (!res.ok)
+      return null;
+    const body = await res.json();
+    return {
+      fiveHour: normalizeBucket(body.five_hour),
+      sevenDay: normalizeBucket(body.seven_day),
+      sevenDayOpus: normalizeBucket(body.seven_day_opus),
+      sevenDaySonnet: normalizeBucket(body.seven_day_sonnet),
+      fetchedAt: new Date(now).toISOString()
+    };
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+// src/daemon/plan-usage-poller.ts
+var DEFAULT_INTERVAL_MS = 60000;
+function createPlanUsagePoller(options) {
+  const intervalMs = options.intervalMs ?? DEFAULT_INTERVAL_MS;
+  const fetcher = options.fetcher ?? fetchPlanUsage;
+  let timer = null;
+  let last = null;
+  let inflight = false;
+  async function tick() {
+    if (inflight)
+      return;
+    inflight = true;
+    try {
+      const usage = await fetcher();
+      if (usage) {
+        last = usage;
+        options.onUpdate(usage);
+      }
+    } finally {
+      inflight = false;
+    }
+  }
+  return {
+    start() {
+      if (timer)
+        return;
+      tick();
+      timer = setInterval(() => void tick(), intervalMs);
+      timer.unref?.();
+    },
+    stop() {
+      if (timer) {
+        clearInterval(timer);
+        timer = null;
+      }
+    },
+    current() {
+      return last;
+    },
+    async refresh() {
+      await tick();
+    }
+  };
+}
+
+// src/daemon/server.ts
 async function startDaemonServer(orch, options = {}) {
   const socketPath = options.socketPath ?? defaultDaemonSocketPath(options.homeDir);
   const pidPath = options.pidPath ?? defaultDaemonPidPath(options.homeDir);
@@ -4327,12 +4506,16 @@ async function startDaemonServer(orch, options = {}) {
       clients.delete(client);
     });
   });
+  const planUsagePoller = options.planUsagePoller ?? createPlanUsagePoller({
+    onUpdate: (usage) => broadcast(clients, { type: "event", name: "plan.usage", payload: { usage } })
+  });
   const serverApi = {
     socketPath,
     pidPath,
     startedAt,
     clients,
     async close() {
+      planUsagePoller.stop();
       broadcast(clients, { type: "event", name: "daemon.stopping", payload: {} });
       await new Promise((resolve) => server.close(() => resolve()));
       for (const client of Array.from(clients)) {
@@ -4345,6 +4528,7 @@ async function startDaemonServer(orch, options = {}) {
       await unlink4(pidPath).catch(() => {});
     }
   };
+  planUsagePoller.start();
   await new Promise((resolve, reject) => {
     server.once("error", reject);
     server.listen(socketPath, () => {
@@ -4380,7 +4564,8 @@ async function startDaemonServer(orch, options = {}) {
           clientId: client.id,
           tasks: tasks.map(serializeTask),
           pending,
-          runState
+          runState,
+          planUsage: planUsagePoller.current()
         };
       }
       case "daemon.status":
@@ -4606,7 +4791,7 @@ async function startDaemonServer(orch, options = {}) {
 }
 async function readPidFile(pidPath) {
   try {
-    const raw = await readFile4(pidPath, "utf8");
+    const raw = await readFile5(pidPath, "utf8");
     const pid = Number(raw.trim());
     return Number.isFinite(pid) ? pid : null;
   } catch {

package/dist/cli/index.js

@@ -8825,7 +8825,7 @@ var init_package = __esm(() => {
   package_default = {
     $schema: "https://json.schemastore.org/package.json",
     name: "@sma1lboy/kobe",
-    version: "0.5.0",
+    version: "0.5.2",
     description: "TUI orchestrator for Claude Code (codename)",
     type: "module",
     packageManager: "bun@1.3.13",
@@ -10584,6 +10584,9 @@ class Orchestrator {
   tasksSignal() {
     return this.tasksAcc;
   }
+  planUsageSignal() {
+    return () => null;
+  }
   subscribeTasks(listener2) {
     return this.store.subscribe(listener2);
   }
@@ -11287,16 +11290,21 @@ class RemoteOrchestrator {
   setTasks;
   runStateAcc;
   setRunState;
+  planUsageAcc;
+  setPlanUsage;
   subscribers = new Map;
   pendingInputBroker = new InMemoryPendingInputBroker;
   constructor(client) {
     this.client = client;
     const [tasks, setTasks] = createSignal([]);
     const [runState, setRunState] = createSignal(new Map);
+    const [planUsage, setPlanUsage] = createSignal(null);
     this.tasksAcc = tasks;
     this.setTasks = (next) => setTasks(() => next);
     this.runStateAcc = runState;
     this.setRunState = (next) => setRunState(() => next);
+    this.planUsageAcc = planUsage;
+    this.setPlanUsage = (next) => setPlanUsage(() => next);
     this.client.on("*", (frame) => this.handleEvent(frame.name, frame.payload));
   }
   async init() {
@@ -11316,6 +11324,8 @@ class RemoteOrchestrator {
       if (seed.size > 0)
         this.setRunState(seed);
     }
+    if (hello.planUsage)
+      this.setPlanUsage(hello.planUsage);
     await this.client.request("subscribe", { taskIds: "all" });
     if (hello.pending) {
       for (const [taskId, entries] of Object.entries(hello.pending)) {
@@ -11345,6 +11355,9 @@ class RemoteOrchestrator {
   chatRunStateSignal() {
     return this.runStateAcc;
   }
+  planUsageSignal() {
+    return this.planUsageAcc;
+  }
   listTasks() {
     return this.tasksAcc().slice();
   }
@@ -11477,6 +11490,11 @@ class RemoteOrchestrator {
       }
       return;
     }
+    if (name === "plan.usage") {
+      const usage = obj.usage;
+      this.setPlanUsage(usage ?? null);
+      return;
+    }
     const taskId = obj.taskId;
     const tabId = obj.tabId;
     if (!taskId || !tabId)
@@ -13179,8 +13197,10 @@ var init_resizable_edge = __esm(() => {
 // src/tui/context/focus.tsx
 function FocusProvider(props) {
   const [focused, setFocusedSignal] = createSignal(props.initial ?? "sidebar");
+  const [refocusTick, setRefocusTick] = createSignal(0);
   const renderer = useRenderer();
   function setFocused(pane) {
+    setRefocusTick((t) => t + 1);
     if (focused() === pane)
       return;
     const current = renderer?.currentFocusedRenderable;
@@ -13209,7 +13229,8 @@ function FocusProvider(props) {
     focused,
     is,
     setFocused,
-    cycle
+    cycle,
+    refocusTick
   };
   return createComponent2(FocusContext.Provider, {
     value,
@@ -14704,7 +14725,24 @@ function extractMessage(record, fallbackSessionId) {
   const content = inner.content;
   const ts = typeof record.timestamp === "string" ? record.timestamp : new Date().toISOString();
   const sid = typeof record.sessionId === "string" ? record.sessionId : fallbackSessionId;
-  return { role, content, timestamp: ts, sessionId: sid };
+  const usage = extractUsage(inner.usage);
+  return usage ? { role, content, timestamp: ts, sessionId: sid, usage } : { role, content, timestamp: ts, sessionId: sid };
+}
+function extractUsage(v) {
+  if (!isObject(v))
+    return;
+  const inTok = typeof v.input_tokens === "number" ? v.input_tokens : undefined;
+  const outTok = typeof v.output_tokens === "number" ? v.output_tokens : undefined;
+  if (inTok === undefined || outTok === undefined)
+    return;
+  const cacheRead = typeof v.cache_read_input_tokens === "number" ? v.cache_read_input_tokens : undefined;
+  const cacheCreate = typeof v.cache_creation_input_tokens === "number" ? v.cache_creation_input_tokens : undefined;
+  return {
+    input_tokens: inTok,
+    output_tokens: outTok,
+    ...cacheRead !== undefined ? { cache_read_input_tokens: cacheRead } : {},
+    ...cacheCreate !== undefined ? { cache_creation_input_tokens: cacheCreate } : {}
+  };
 }
 function isObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
@@ -15598,6 +15636,27 @@ var init_engine_bootstrap = __esm(() => {
   init_claude_code_local();
 });
 
+// src/tui/lib/format-plan-usage.ts
+function pct(value) {
+  if (typeof value !== "number" || !Number.isFinite(value))
+    return null;
+  return `${Math.round(value)}%`;
+}
+function formatPlanUsageCompact(usage) {
+  if (!usage)
+    return null;
+  const fiveHour = pct(usage.fiveHour?.utilization);
+  const sevenDay = pct(usage.sevenDay?.utilization);
+  const parts = [];
+  if (fiveHour)
+    parts.push(`5h ${fiveHour}`);
+  if (sevenDay)
+    parts.push(`7d ${sevenDay}`);
+  if (parts.length === 0)
+    return null;
+  return `Plan ${parts.join(" \xB7 ")}`;
+}
+
 // src/tui/lib/use-pane-sizes.ts
 function usePaneSizes(kv) {
   const dims = useTerminalDimensions();
@@ -17020,6 +17079,7 @@ function Composer(props) {
   const {
     theme
   } = useTheme();
+  const focusCtx = useFocus();
   let textareaRef;
   let historyIndex = null;
   let liveDraftSnapshot = "";
@@ -17054,6 +17114,7 @@ function Composer(props) {
     setSlashCursor((cur) => len === 0 ? 0 : Math.min(cur, len - 1));
   });
   createEffect(() => {
+    focusCtx.refocusTick();
     const ref = textareaRef;
     if (!ref)
       return;
@@ -17888,6 +17949,7 @@ var init_Composer = __esm(() => {
   init_solid();
   init_dev();
   init_border();
+  init_focus();
   init_theme();
   init_clipboard_image();
   init_history2();
@@ -20349,7 +20411,7 @@ var init_user_slashes = () => {};
 
 // src/tui/panes/chat/context-meter.ts
 function totalContextTokens(u) {
-  return u.input_tokens + u.output_tokens + (u.cache_read_input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0);
+  return u.input_tokens + (u.cache_read_input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0);
 }
 function contextWindowTokensForModel(modelId) {
   const id = modelId ?? resolveDefaultModelId();
@@ -20378,8 +20440,8 @@ function formatContextUsageCompact(u, modelId) {
   const total = totalContextTokens(u);
   if (total <= 0 || window <= 0)
     return null;
-  const pct = Math.min(100, Math.max(0, Math.round(total / window * 100)));
-  return `${pct}% \xB7 ${formatTokShort(total)}/${formatTokShort(window)}`;
+  const pct2 = Math.min(100, Math.max(0, Math.round(total / window * 100)));
+  return `${pct2}% \xB7 ${formatTokShort(total)}/${formatTokShort(window)}`;
 }
 var LONG_CTX = 1e6, STD_CTX = 200000;
 var init_context_meter = __esm(() => {
@@ -20431,7 +20493,19 @@ function setMessagesFromHistory(state, past) {
   for (const m of past) {
     appendRowsFromMessage(rows, toolIndexById, m);
   }
-  return { ...state, messages: capMessages(rows, new Date().toISOString()) };
+  let latestUsage;
+  for (let i = past.length - 1;i >= 0; i--) {
+    const u = past[i]?.usage;
+    if (u) {
+      latestUsage = u;
+      break;
+    }
+  }
+  return {
+    ...state,
+    messages: capMessages(rows, new Date().toISOString()),
+    ...latestUsage ? { lastUsage: latestUsage } : {}
+  };
 }
 function enqueuePrompt(state, prompt, nowIso = new Date().toISOString()) {
   if (state.queue.length >= QUEUE_SOFT_CAP)
@@ -22305,13 +22379,15 @@ __export(exports_bridge, {
 import { writeFile as writeFile3 } from "fs/promises";
 import { homedir as homedir11 } from "os";
 import { join as join14 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 async function startBridge(orch, opts = {}) {
   const home = opts.homeDir ?? process.env.KOBE_HOME_DIR ?? homedir11();
   const runDir = join14(home, ".kobe", "run");
   const socketPath = join14(runDir, `bridge-${process.pid}.sock`);
   const mcpConfigPath = join14(runDir, `mcp-${process.pid}.json`);
   const server = await startBridgeServer(orch, socketPath);
-  const entry = process.argv[1] ?? "";
+  const moduleExt = import.meta.url.endsWith(".ts") ? ".ts" : ".js";
+  const entry = fileURLToPath2(new URL(`../../cli/index${moduleExt}`, import.meta.url));
   const mcpConfig = {
     mcpServers: {
       kobe: {
@@ -22351,6 +22427,8 @@ function Shell(props) {
   const [selectedId, setSelectedId] = createSignal(null);
   const [pendingPrompt, setPendingPrompt] = createSignal(null);
   const [workspaceContextAside, setWorkspaceContextAside] = createSignal(null);
+  const planUsageAcc = props.orchestrator.planUsageSignal();
+  const workspacePlanAside = createMemo(() => formatPlanUsageCompact(planUsageAcc()));
   const [updateInfo, setUpdateInfo] = createSignal(null);
   onMount(() => {
     checkLatestVersion().then((info) => {
@@ -22433,6 +22511,14 @@ function Shell(props) {
     selectFileTab,
     closeFileTab
   } = workspaceTabs;
+  const workspaceAsideRight = createMemo(() => {
+    const plan = workspacePlanAside();
+    const ctx3 = isChatTabActive() ? workspaceContextAside() : null;
+    const parts = [plan, ctx3].filter((v) => Boolean(v));
+    if (parts.length === 0)
+      return;
+    return parts.join("  \u2022  ");
+  });
   let pendingPersistedId = persistedSelectedId ?? null;
   createEffect(() => {
     const tasks = tasksAcc();
@@ -22565,7 +22651,7 @@ function Shell(props) {
         return activeTask()?.title ?? "no task";
       },
       get asideRight() {
-        return memo2(() => !!isChatTabActive())() ? workspaceContextAside() ?? undefined : undefined;
+        return workspaceAsideRight();
       },
       get focused() {
         return focusedPane() === "workspace";

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@sma1lboy/kobe",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "TUI orchestrator for Claude Code (codename)",
   "type": "module",
   "packageManager": "bun@1.3.13",