@towles/tool 0.0.118 → 0.0.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towles/tool",
-  "version": "0.0.118",
+  "version": "0.0.120",
   "description": "One off quality of life scripts that I use on a daily basis.",
   "homepage": "https://github.com/ChrisTowles/towles-tool#readme",
   "bugs": {

package/packages/agentboard/packages/runtime/src/agents/watchers/claude-code.ts

@@ -25,6 +25,7 @@ import { JOURNAL_IDLE_TIMEOUT_MS } from "../../shared";
 interface ContentItem {
   type?: string;
   text?: string;
+  name?: string;
 }
 
 interface JournalEntry {
@@ -61,7 +62,7 @@ export function determineStatus(entry: JournalEntry): AgentStatus | null {
   if (msg.role === "assistant") {
     const toolUses = items.filter((c) => c.type === "tool_use");
     if (toolUses.length === 0) return "done";
-    const allAsking = toolUses.every((c) => (c as any).name === "AskUserQuestion");
+    const allAsking = toolUses.every((c) => c.name === "AskUserQuestion");
     return allAsking ? "question" : "running";
   }
 

package/packages/agentboard/packages/runtime/src/server/index.ts

@@ -133,18 +133,36 @@ export function startServer(
       const map = getDirSessionMap();
       const direct = map.get(projectDir);
       if (direct) return direct;
+      // Find the most specific (longest) matching session dir.
+      // Without this, a project dir like /a/b could match /a/b/c (session1)
+      // before /a/b/c/d (session2), assigning it to the wrong session.
+      let bestMatch: string | null = null;
+      let bestLen = 0;
       for (const [dir, name] of map) {
-        if (projectDir.startsWith(dir + "/") || dir.startsWith(projectDir + "/")) return name;
+        if (projectDir.startsWith(dir + "/") || dir.startsWith(projectDir + "/")) {
+          if (dir.length > bestLen) {
+            bestLen = dir.length;
+            bestMatch = name;
+          }
+        }
       }
+      if (bestMatch) return bestMatch;
       // Fallback: the decoded projectDir may be wrong due to dash ambiguity.
       // Re-encode each known session dir and check if the encoded form matches
       // as a prefix of the (still-encoded) input.
       const encoded = encodeProjectDir(projectDir);
+      bestMatch = null;
+      bestLen = 0;
       for (const [dir, name] of map) {
         const encodedDir = encodeProjectDir(dir);
-        if (encoded.startsWith(encodedDir) || encodedDir.startsWith(encoded)) return name;
+        if (encoded.startsWith(encodedDir) || encodedDir.startsWith(encoded)) {
+          if (encodedDir.length > bestLen) {
+            bestLen = encodedDir.length;
+            bestMatch = name;
+          }
+        }
       }
-      return null;
+      return bestMatch;
     },
     emit(event: AgentEvent) {
       tracker.applyEvent(event, { seed: !watchersSeeded });

package/src/commands/auto-claude/run-claude.test.ts

@@ -83,7 +83,7 @@ describe("runClaude (injected spawnFn)", () => {
       type: "stream_event",
       event: {
         type: "content_block_start",
-        content_block: { type: "thinking" },
+        content_block: { type: "thinking", thinking: "Let me consider this" },
       },
     };
     const toolEvent = {

package/src/commands/auto-claude/stream-parser.test.ts

@@ -263,7 +263,7 @@ describe("parseStreamLine", () => {
       }
     });
 
-    it("handles empty thinking", () => {
+    it("rejects thinking block without string thinking field", () => {
       const line = JSON.stringify({
         type: "stream_event",
         event: {
@@ -272,10 +272,7 @@ describe("parseStreamLine", () => {
         },
       });
 
-      const event = parseStreamLine(line);
-      if (event?.kind === "thinking") {
-        expect(event.summary).toBe("");
-      }
+      expect(parseStreamLine(line)).toBeNull();
     });
   });
 

package/src/commands/auto-claude/stream-parser.ts

@@ -1,3 +1,25 @@
+import type {
+  TextBlock,
+  ThinkingBlock,
+  ToolUseBlock,
+} from "@anthropic-ai/sdk/resources/messages/messages";
+
+function isToolUseBlock(
+  block: Record<string, unknown>,
+): block is ToolUseBlock & Record<string, unknown> {
+  return block.type === "tool_use" && typeof block.name === "string";
+}
+
+function isThinkingBlock(
+  block: Record<string, unknown>,
+): block is ThinkingBlock & Record<string, unknown> {
+  return block.type === "thinking" && typeof block.thinking === "string";
+}
+
+function isTextBlock(block: Record<string, unknown>): block is TextBlock & Record<string, unknown> {
+  return block.type === "text" && typeof block.text === "string";
+}
+
 export interface AgentToolEvent {
   kind: "tool_use";
   name: string;
@@ -57,7 +79,7 @@ function toolDetail(block: Record<string, unknown>): string {
 }
 
 function parseContentBlock(block: Record<string, unknown>): AgentActivityEvent | null {
-  if (block.type === "tool_use" && typeof block.name === "string") {
+  if (isToolUseBlock(block)) {
     return {
       kind: "tool_use",
       name: block.name,
@@ -69,15 +91,14 @@ function parseContentBlock(block: Record<string, unknown>): AgentActivityEvent |
     };
   }
 
-  if (block.type === "thinking") {
-    const text = typeof block.thinking === "string" ? block.thinking : "";
+  if (isThinkingBlock(block)) {
     return {
       kind: "thinking",
-      summary: truncate(text.split("\n")[0].trim(), 120),
+      summary: truncate(block.thinking.split("\n")[0].trim(), 120),
     };
   }
 
-  if (block.type === "text" && typeof block.text === "string") {
+  if (isTextBlock(block)) {
     return {
       kind: "text",
       content: block.text,

package/src/commands/graph/analyzer.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { ContentBlock, JournalEntry } from "./types";
+import type { Usage } from "@anthropic-ai/sdk/resources/messages/messages";
 import {
   aggregateSessionTools,
   analyzeSession,
@@ -12,6 +13,26 @@ import { extractToolData, extractToolDetail, sanitizeString, truncateDetail } fr
 
 // ── Helpers ──
 
+function textBlock(text: string): ContentBlock {
+  return { type: "text" as const, text, citations: null };
+}
+
+function toolUseBlock(name: string, input: Record<string, unknown>): ContentBlock {
+  return { type: "tool_use" as const, id: "tool-stub", name, input };
+}
+
+function makeUsage(overrides: Partial<Usage> = {}): Usage {
+  return {
+    input_tokens: 0,
+    output_tokens: 0,
+    cache_read_input_tokens: null,
+    cache_creation_input_tokens: null,
+    server_tool_use: null,
+    service_tier: null,
+    ...overrides,
+  };
+}
+
 function makeEntry(overrides: Partial<JournalEntry> = {}): JournalEntry {
   return {
     type: "assistant",
@@ -33,8 +54,8 @@ function makeAssistantEntry(
     message: {
       role: "assistant",
       model,
-      usage: { input_tokens: inputTokens, output_tokens: outputTokens },
-      content: content ?? [{ type: "text", text: "response" }],
+      usage: makeUsage({ input_tokens: inputTokens, output_tokens: outputTokens }),
+      content: content ?? [textBlock("response")],
       ...extra,
     },
   });
@@ -76,8 +97,8 @@ describe("analyzeSession", () => {
         message: {
           role: "assistant",
           model: "claude-opus-4",
-          usage: { input_tokens: 1000, output_tokens: 0, cache_read_input_tokens: 800 },
-          content: [{ type: "text", text: "hi" }],
+          usage: makeUsage({ input_tokens: 1000, output_tokens: 0, cache_read_input_tokens: 800 }),
+          content: [textBlock("hi")],
         },
       }),
     ];
@@ -87,9 +108,9 @@ describe("analyzeSession", () => {
 
   it("counts repeated file reads", () => {
     const content: ContentBlock[] = [
-      { type: "tool_use", name: "Read", input: { file_path: "/a.ts" } },
-      { type: "tool_use", name: "Read", input: { file_path: "/a.ts" } },
-      { type: "tool_use", name: "Read", input: { file_path: "/b.ts" } },
+      toolUseBlock("Read", { file_path: "/a.ts" }),
+      toolUseBlock("Read", { file_path: "/a.ts" }),
+      toolUseBlock("Read", { file_path: "/b.ts" }),
     ];
     const entries = [makeAssistantEntry("claude-opus-4", 100, 50, content)];
     const result = analyzeSession(entries);
@@ -145,7 +166,7 @@ describe("extractSessionLabel", () => {
         type: "user",
         message: {
           role: "user",
-          content: [{ type: "text", text: "Array content message" }],
+          content: [textBlock("Array content message")],
         },
       }),
     ];
@@ -158,7 +179,7 @@ describe("extractSessionLabel", () => {
         type: "assistant",
         message: {
           role: "assistant",
-          content: [{ type: "text", text: "I'll help you with that" }],
+          content: [textBlock("I'll help you with that")],
         },
       }),
     ];
@@ -314,14 +335,14 @@ describe("extractToolData", () => {
   });
 
   it("returns empty when no tool_use blocks", () => {
-    const content: ContentBlock[] = [{ type: "text", text: "hello" }];
+    const content: ContentBlock[] = [textBlock("hello")];
     expect(extractToolData(content, 100, 50)).toEqual([]);
   });
 
   it("extracts tool calls and distributes tokens", () => {
     const content: ContentBlock[] = [
-      { type: "tool_use", name: "Read", input: { file_path: "/a.ts" } },
-      { type: "tool_use", name: "Bash", input: { command: "ls" } },
+      toolUseBlock("Read", { file_path: "/a.ts" }),
+      toolUseBlock("Bash", { command: "ls" }),
     ];
     const result = extractToolData(content, 200, 100);
     expect(result).toHaveLength(2);
@@ -342,12 +363,10 @@ describe("aggregateSessionTools", () => {
 
   it("aggregates tools across entries", () => {
     const entries = [
-      makeAssistantEntry("claude-opus-4", 100, 50, [
-        { type: "tool_use", name: "Read", input: { file_path: "/a.ts" } },
-      ]),
+      makeAssistantEntry("claude-opus-4", 100, 50, [toolUseBlock("Read", { file_path: "/a.ts" })]),
       makeAssistantEntry("claude-opus-4", 200, 100, [
-        { type: "tool_use", name: "Read", input: { file_path: "/b.ts" } },
-        { type: "tool_use", name: "Bash", input: { command: "ls" } },
+        toolUseBlock("Read", { file_path: "/b.ts" }),
+        toolUseBlock("Bash", { command: "ls" }),
       ]),
     ];
     const result = aggregateSessionTools(entries);
@@ -358,11 +377,9 @@ describe("aggregateSessionTools", () => {
 
   it("sorts by total token usage descending", () => {
     const entries = [
-      makeAssistantEntry("claude-opus-4", 100, 50, [
-        { type: "tool_use", name: "Bash", input: { command: "ls" } },
-      ]),
+      makeAssistantEntry("claude-opus-4", 100, 50, [toolUseBlock("Bash", { command: "ls" })]),
       makeAssistantEntry("claude-opus-4", 1000, 500, [
-        { type: "tool_use", name: "Read", input: { file_path: "/a.ts" } },
+        toolUseBlock("Read", { file_path: "/a.ts" }),
       ]),
     ];
     const result = aggregateSessionTools(entries);

package/src/commands/graph/tools.ts

@@ -68,7 +68,7 @@ export function extractToolData(
   const toolBlocks: Array<{ name: string; detail?: string }> = [];
   for (const block of content) {
     if (block.type === "tool_use" && block.name) {
-      const detail = extractToolDetail(block.name, block.input);
+      const detail = extractToolDetail(block.name, block.input as Record<string, unknown>);
       toolBlocks.push({ name: block.name, detail });
     }
   }

package/src/commands/graph/types.ts

@@ -1,11 +1,7 @@
 // Types for parsing Claude Code session JSONL files
-export interface ContentBlock {
-  type: string;
-  text?: string;
-  id?: string;
-  name?: string;
-  input?: Record<string, unknown>;
-}
+import type { ContentBlock, Usage } from "@anthropic-ai/sdk/resources/messages/messages";
+
+export type { ContentBlock };
 
 export interface JournalEntry {
   type: string;
@@ -14,12 +10,7 @@ export interface JournalEntry {
   message?: {
     role: "user" | "assistant";
     model?: string;
-    usage?: {
-      input_tokens?: number;
-      output_tokens?: number;
-      cache_read_input_tokens?: number;
-      cache_creation_input_tokens?: number;
-    };
+    usage?: Usage;
     content?: ContentBlock[] | string;
   };
   uuid?: string;

package/src/commands/graph.test.ts

@@ -2,8 +2,21 @@
  * Tests for graph command --days filtering and bar chart data
  */
 import { describe, it, expect } from "vitest";
+import type { Usage } from "@anthropic-ai/sdk/resources/messages/messages";
 import { analyzeSession, calculateCutoffMs, filterByDays } from "./graph/index.js";
 
+function makeUsage(overrides: Partial<Usage> = {}): Usage {
+  return {
+    input_tokens: 0,
+    output_tokens: 0,
+    cache_read_input_tokens: null,
+    cache_creation_input_tokens: null,
+    server_tool_use: null,
+    service_tier: null,
+    ...overrides,
+  };
+}
+
 describe("graph --days filtering", () => {
   describe("calculateCutoffMs", () => {
     it("returns 0 when days <= 0", () => {
@@ -98,7 +111,7 @@ describe("analyzeSession (bar chart token aggregation)", () => {
       message: {
         role: "assistant" as const,
         model,
-        usage: { input_tokens: inputTokens, output_tokens: outputTokens },
+        usage: makeUsage({ input_tokens: inputTokens, output_tokens: outputTokens }),
       },
     };
   }