whale-code 6.5.6 → 6.5.8

package/dist/cli/services/session-client.js

@@ -0,0 +1,197 @@
+/**
+ * Session Client — thin HTTP client for the session API.
+ *
+ * Used by the CLI in session mode to create/resume sessions and send messages
+ * via the server-side SessionManager, gaining DB persistence, memory, identity,
+ * and cross-surface continuity.
+ */
+
+export class SessionClient {
+  constructor(serverUrl, getToken) {
+    this.serverUrl = serverUrl;
+    this.getToken = getToken;
+  }
+
+  /**
+   * Create a new session on the server.
+   */
+  async createSession(opts) {
+    const token = await this.getToken();
+    const resp = await fetch(`${this.serverUrl}/sessions`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        storeId: opts.storeId,
+        agentId: opts.agentId,
+        surface: opts.surface || "cli",
+        message: opts.message
+      })
+    });
+    if (!resp.ok) {
+      const err = await resp.json().catch(() => ({
+        error: resp.statusText
+      }));
+      throw new Error(err.error || `Session creation failed: ${resp.status}`);
+    }
+    const data = await resp.json();
+    return data.session;
+  }
+
+  /**
+   * Send a message to a session and stream the response via SSE.
+   */
+  async sendMessage(sessionId, message, callbacks, signal) {
+    const token = await this.getToken();
+    const resp = await fetch(`${this.serverUrl}/sessions/${sessionId}/messages`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        message,
+        streaming: true
+      }),
+      signal
+    });
+    if (!resp.ok) {
+      const err = await resp.json().catch(() => ({
+        error: resp.statusText
+      }));
+      const errorMsg = err.error || `Session message failed: ${resp.status}`;
+      callbacks.onError?.(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    // Parse SSE stream
+    const reader = resp.body?.getReader();
+    if (!reader) throw new Error("No response body");
+    const decoder = new TextDecoder();
+    let buffer = "";
+    let result = null;
+    try {
+      while (true) {
+        const {
+          done,
+          value
+        } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, {
+          stream: true
+        });
+        const lines = buffer.split("\n");
+        buffer = lines.pop() || ""; // keep incomplete line in buffer
+
+        for (const line of lines) {
+          if (!line.startsWith("data: ")) continue;
+          const json = line.slice(6).trim();
+          if (!json || json === "[DONE]") continue;
+          let event;
+          try {
+            event = JSON.parse(json);
+          } catch {
+            continue;
+          }
+          switch (event.type) {
+            case "text":
+              callbacks.onText?.(event.text);
+              break;
+            case "tool_start":
+              callbacks.onToolStart?.(event.name, event.input);
+              break;
+            case "tool_result":
+              callbacks.onToolResult?.(event.name, event.success, event.result);
+              break;
+            case "tool_progress":
+              callbacks.onToolProgress?.(event.name, event.progress);
+              break;
+            case "usage":
+              if (event.usage) {
+                callbacks.onUsage?.({
+                  input: event.usage.input_tokens,
+                  output: event.usage.output_tokens,
+                  cacheRead: event.usage.cache_read_tokens || 0,
+                  cacheCreation: event.usage.cache_creation_tokens || 0
+                }, event.usage.cost_usd || 0);
+              }
+              break;
+            case "done":
+              callbacks.onDone?.(event.conversationId);
+              break;
+            case "error":
+              callbacks.onError?.(event.error);
+              break;
+          }
+        }
+      }
+    } finally {
+      reader.releaseLock();
+    }
+    return result;
+  }
+
+  /**
+   * List sessions for a store.
+   */
+  async listSessions(storeId, opts) {
+    const token = await this.getToken();
+    const params = new URLSearchParams({
+      store_id: storeId
+    });
+    if (opts?.limit) params.set("limit", String(opts.limit));
+    if (opts?.surface) params.set("surface", opts.surface);
+    const resp = await fetch(`${this.serverUrl}/sessions?${params}`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!resp.ok) return [];
+    const data = await resp.json();
+    return data.sessions || [];
+  }
+
+  /**
+   * Get a single session by ID.
+   */
+  async getSession(sessionId) {
+    const token = await this.getToken();
+    const resp = await fetch(`${this.serverUrl}/sessions/${sessionId}`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!resp.ok) return null;
+    const data = await resp.json();
+    return data.session || null;
+  }
+
+  /**
+   * Health check — verify the session API is available (not just the server).
+   * Uses the /health endpoint first (no auth needed), then probes /sessions
+   * to confirm session routes exist. Does NOT call getToken to avoid side effects.
+   */
+  async healthCheck() {
+    try {
+      // Step 1: check server is up (no auth needed)
+      const healthResp = await fetch(`${this.serverUrl}/health`, {
+        signal: AbortSignal.timeout(3000)
+      });
+      if (!healthResp.ok) return false;
+
+      // Step 2: probe session route existence (no auth — just checking for 405 vs 401/200/400)
+      const probeResp = await fetch(`${this.serverUrl}/sessions?store_id=_probe&limit=1`, {
+        signal: AbortSignal.timeout(3000)
+      });
+      // 401 = route exists (auth required) — this is the expected response
+      // 200/400 = route exists
+      // 404/405 = server doesn't have session routes
+      return probeResp.status !== 404 && probeResp.status !== 405;
+    } catch {
+      return false;
+    }
+  }
+}
+//# sourceMappingURL=session-client.js.map

package/dist/cli/services/session-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-client.js","names":["SessionClient","constructor","serverUrl","getToken","createSession","opts","token","resp","fetch","method","headers","Authorization","body","JSON","stringify","storeId","agentId","surface","message","ok","err","json","catch","error","statusText","Error","status","data","session","sendMessage","sessionId","callbacks","signal","streaming","errorMsg","onError","reader","getReader","decoder","TextDecoder","buffer","result","done","value","read","decode","stream","lines","split","pop","line","startsWith","slice","trim","event","parse","type","onText","text","onToolStart","name","input","onToolResult","success","onToolProgress","progress","usage","onUsage","input_tokens","output","output_tokens","cacheRead","cache_read_tokens","cacheCreation","cache_creation_tokens","cost_usd","onDone","conversationId","releaseLock","listSessions","params","URLSearchParams","store_id","limit","set","String","sessions","getSession","healthCheck","healthResp","AbortSignal","timeout","probeResp"],"sources":["../../../src/cli/services/session-client.ts"],"sourcesContent":["/**\n * Session Client — thin HTTP client for the session API.\n *\n * Used by the CLI in session mode to create/resume sessions and send messages\n * via the server-side SessionManager, gaining DB persistence, memory, identity,\n * and cross-surface continuity.\n */\n\nexport interface SessionInfo {\n  id: string;\n  store_id: string;\n  agent_id: string;\n  surface: string;\n  status: string;\n  created_at: string;\n  updated_at: string;\n  metadata: Record<string, unknown>;\n}\n\nexport interface SessionTurnResult {\n  finalText: string;\n  tokens: { input: number; output: number; cacheRead: number; cacheCreation: number };\n  costUsd: number;\n  turnCount: number;\n  toolsUsed: string[];\n}\n\nexport interface SessionTurnCallbacks {\n  onText?: (text: string) => void;\n  onToolStart?: (name: string, input?: unknown) => void;\n  onToolResult?: (name: string, success: boolean, result?: unknown) => void;\n  onToolProgress?: (name: string, progress: unknown) => void;\n  onUsage?: (tokens: { input: number; output: number; cacheRead: number; cacheCreation: number }, costUsd: number) => void;\n  onDone?: (conversationId: string) => void;\n  onError?: (error: string) => void;\n}\n\nexport class SessionClient {\n  constructor(\n    private serverUrl: string,\n    private getToken: () => Promise<string | null>,\n  ) {}\n\n  /**\n   * Create a new session on the server.\n   */\n  async createSession(opts: {\n    storeId: string;\n    agentId: string;\n    surface?: string;\n    message?: string;\n  }): Promise<SessionInfo> {\n    const token = await this.getToken();\n    const resp = await fetch(`${this.serverUrl}/sessions`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        Authorization: `Bearer ${token}`,\n      },\n      body: JSON.stringify({\n        storeId: opts.storeId,\n        agentId: opts.agentId,\n        surface: opts.surface || \"cli\",\n        message: opts.message,\n      }),\n    });\n\n    if (!resp.ok) {\n      const err = await resp.json().catch(() => ({ error: resp.statusText }));\n      throw new Error((err as any).error || `Session creation failed: ${resp.status}`);\n    }\n\n    const data = await resp.json();\n    return (data as any).session;\n  }\n\n  /**\n   * Send a message to a session and stream the response via SSE.\n   */\n  async sendMessage(\n    sessionId: string,\n    message: string,\n    callbacks: SessionTurnCallbacks,\n    signal?: AbortSignal,\n  ): Promise<SessionTurnResult | null> {\n    const token = await this.getToken();\n    const resp = await fetch(`${this.serverUrl}/sessions/${sessionId}/messages`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        Authorization: `Bearer ${token}`,\n      },\n      body: JSON.stringify({ message, streaming: true }),\n      signal,\n    });\n\n    if (!resp.ok) {\n      const err = await resp.json().catch(() => ({ error: resp.statusText }));\n      const errorMsg = (err as any).error || `Session message failed: ${resp.status}`;\n      callbacks.onError?.(errorMsg);\n      throw new Error(errorMsg);\n    }\n\n    // Parse SSE stream\n    const reader = resp.body?.getReader();\n    if (!reader) throw new Error(\"No response body\");\n\n    const decoder = new TextDecoder();\n    let buffer = \"\";\n    let result: SessionTurnResult | null = null;\n\n    try {\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) break;\n\n        buffer += decoder.decode(value, { stream: true });\n        const lines = buffer.split(\"\\n\");\n        buffer = lines.pop() || \"\"; // keep incomplete line in buffer\n\n        for (const line of lines) {\n          if (!line.startsWith(\"data: \")) continue;\n          const json = line.slice(6).trim();\n          if (!json || json === \"[DONE]\") continue;\n\n          let event: any;\n          try { event = JSON.parse(json); } catch { continue; }\n\n          switch (event.type) {\n            case \"text\":\n              callbacks.onText?.(event.text);\n              break;\n            case \"tool_start\":\n              callbacks.onToolStart?.(event.name, event.input);\n              break;\n            case \"tool_result\":\n              callbacks.onToolResult?.(event.name, event.success, event.result);\n              break;\n            case \"tool_progress\":\n              callbacks.onToolProgress?.(event.name, event.progress);\n              break;\n            case \"usage\":\n              if (event.usage) {\n                callbacks.onUsage?.(\n                  {\n                    input: event.usage.input_tokens,\n                    output: event.usage.output_tokens,\n                    cacheRead: event.usage.cache_read_tokens || 0,\n                    cacheCreation: event.usage.cache_creation_tokens || 0,\n                  },\n                  event.usage.cost_usd || 0,\n                );\n              }\n              break;\n            case \"done\":\n              callbacks.onDone?.(event.conversationId);\n              break;\n            case \"error\":\n              callbacks.onError?.(event.error);\n              break;\n          }\n        }\n      }\n    } finally {\n      reader.releaseLock();\n    }\n\n    return result;\n  }\n\n  /**\n   * List sessions for a store.\n   */\n  async listSessions(storeId: string, opts?: { limit?: number; surface?: string }): Promise<SessionInfo[]> {\n    const token = await this.getToken();\n    const params = new URLSearchParams({ store_id: storeId });\n    if (opts?.limit) params.set(\"limit\", String(opts.limit));\n    if (opts?.surface) params.set(\"surface\", opts.surface);\n\n    const resp = await fetch(`${this.serverUrl}/sessions?${params}`, {\n      headers: { Authorization: `Bearer ${token}` },\n    });\n\n    if (!resp.ok) return [];\n\n    const data = await resp.json();\n    return (data as any).sessions || [];\n  }\n\n  /**\n   * Get a single session by ID.\n   */\n  async getSession(sessionId: string): Promise<SessionInfo | null> {\n    const token = await this.getToken();\n    const resp = await fetch(`${this.serverUrl}/sessions/${sessionId}`, {\n      headers: { Authorization: `Bearer ${token}` },\n    });\n\n    if (!resp.ok) return null;\n\n    const data = await resp.json();\n    return (data as any).session || null;\n  }\n\n  /**\n   * Health check — verify the session API is available (not just the server).\n   * Uses the /health endpoint first (no auth needed), then probes /sessions\n   * to confirm session routes exist. Does NOT call getToken to avoid side effects.\n   */\n  async healthCheck(): Promise<boolean> {\n    try {\n      // Step 1: check server is up (no auth needed)\n      const healthResp = await fetch(`${this.serverUrl}/health`, {\n        signal: AbortSignal.timeout(3000),\n      });\n      if (!healthResp.ok) return false;\n\n      // Step 2: probe session route existence (no auth — just checking for 405 vs 401/200/400)\n      const probeResp = await fetch(`${this.serverUrl}/sessions?store_id=_probe&limit=1`, {\n        signal: AbortSignal.timeout(3000),\n      });\n      // 401 = route exists (auth required) — this is the expected response\n      // 200/400 = route exists\n      // 404/405 = server doesn't have session routes\n      return probeResp.status !== 404 && probeResp.status !== 405;\n    } catch {\n      return false;\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/cli/services/session-persistence.d.ts

@@ -13,6 +13,8 @@ export interface SessionMeta {
     createdAt: string;
     updatedAt: string;
     cwd?: string;
+    serverSessionId?: string;
+    synced?: boolean;
 }
 export declare function saveSession(messages: Anthropic.MessageParam[], sessionId?: string): string;
 export declare function loadSession(sessionId: string): {
@@ -21,3 +23,4 @@ export declare function loadSession(sessionId: string): {
 } | null;
 export declare function listSessions(limit?: number): SessionMeta[];
 export declare function findLatestSessionForCwd(): SessionMeta | null;
+export declare function updateSessionMeta(sessionId: string, updates: Partial<SessionMeta>): void;

package/dist/cli/services/session-persistence.js

@@ -75,6 +75,18 @@ export function findLatestSessionForCwd() {
   const sessions = listSessions(100);
   return sessions.find(s => s.cwd === cwd) || null;
 }
+export function updateSessionMeta(sessionId, updates) {
+  const path = join(SESSIONS_DIR, `${sessionId}.json`);
+  if (!existsSync(path)) return;
+  try {
+    const data = JSON.parse(readFileSync(path, "utf-8"));
+    if (data.meta) {
+      Object.assign(data.meta, updates);
+      data.meta.updatedAt = new Date().toISOString();
+      writeFileSync(path, JSON.stringify(data, null, 2), "utf-8");
+    }
+  } catch {/* best effort */}
+}
 function extractSessionTitle(messages) {
   // Use first user message as title (truncated)
   for (const m of messages) {

package/dist/cli/services/session-persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-persistence.js","names":["readFileSync","existsSync","mkdirSync","writeFileSync","readdirSync","appendFileSync","join","getModel","SESSIONS_DIR","APP_DATA_DIR","ensureDataDir","ensureSessionsDir","recursive","saveSession","messages","sessionId","id","Date","now","meta","title","extractSessionTitle","model","messageCount","length","createdAt","toISOString","updatedAt","cwd","process","data","JSON","stringify","logSessionHistory","loadSession","path","parse","listSessions","limit","files","filter","f","endsWith","sort","reverse","slice","sessions","push","HISTORY_FILE","entry","display","project","timestamp","findLatestSessionForCwd","find","s","m","role","content","Array","isArray","block","text"],"sources":["../../../src/cli/services/session-persistence.ts"],"sourcesContent":["/**\n * Session Persistence — save/load conversations to disk\n *\n * Extracted from agent-loop.ts for single-responsibility.\n * All consumers should import from agent-loop.ts (re-export facade).\n */\n\nimport type Anthropic from \"@anthropic-ai/sdk\";\nimport { readFileSync, existsSync, mkdirSync, writeFileSync, readdirSync, appendFileSync } from \"fs\";\nimport { join } from \"path\";\nimport { getModel } from \"./model-manager.js\";\nimport { SESSIONS_DIR, APP_DATA_DIR, ensureDataDir } from \"./paths.js\";\n\nfunction ensureSessionsDir(): void {\n  ensureDataDir();\n  if (!existsSync(SESSIONS_DIR)) mkdirSync(SESSIONS_DIR, { recursive: true });\n}\n\nexport interface SessionMeta {\n  id: string;\n  title: string;\n  model: string;\n  messageCount: number;\n  createdAt: string;\n  updatedAt: string;\n  cwd?: string;\n}\n\nexport function saveSession(\n  messages: Anthropic.MessageParam[],\n  sessionId?: string\n): string {\n  ensureSessionsDir();\n  const id = sessionId || `session-${Date.now()}`;\n  const meta: SessionMeta = {\n    id,\n    title: extractSessionTitle(messages),\n    model: getModel(),\n    messageCount: messages.length,\n    createdAt: new Date().toISOString(),\n    updatedAt: new Date().toISOString(),\n    cwd: process.cwd(),\n  };\n  const data = JSON.stringify({ meta, messages }, null, 2);\n  writeFileSync(join(SESSIONS_DIR, `${id}.json`), data, \"utf-8\");\n  logSessionHistory(meta);\n  return id;\n}\n\nexport function loadSession(sessionId: string): { meta: SessionMeta; messages: Anthropic.MessageParam[] } | null {\n  const path = join(SESSIONS_DIR, `${sessionId}.json`);\n  if (!existsSync(path)) return null;\n  try {\n    return JSON.parse(readFileSync(path, \"utf-8\"));\n  } catch { return null; }\n}\n\nexport function listSessions(limit = 20): SessionMeta[] {\n  ensureSessionsDir();\n  const files = readdirSync(SESSIONS_DIR)\n    .filter((f) => f.endsWith(\".json\"))\n    .sort()\n    .reverse()\n    .slice(0, limit);\n  const sessions: SessionMeta[] = [];\n  for (const f of files) {\n    try {\n      const data = JSON.parse(readFileSync(join(SESSIONS_DIR, f), \"utf-8\"));\n      if (data.meta) sessions.push(data.meta);\n    } catch { /* skip corrupted */ }\n  }\n  return sessions;\n}\n\nconst HISTORY_FILE = join(APP_DATA_DIR, \"history.jsonl\");\n\nfunction logSessionHistory(meta: SessionMeta): void {\n  try {\n    ensureDataDir();\n    const entry = {\n      display: meta.title,\n      project: meta.cwd || process.cwd(),\n      timestamp: meta.updatedAt,\n      sessionId: meta.id,\n      model: meta.model,\n    };\n    appendFileSync(HISTORY_FILE, JSON.stringify(entry) + \"\\n\");\n  } catch { /* best effort */ }\n}\n\nexport function findLatestSessionForCwd(): SessionMeta | null {\n  const cwd = process.cwd();\n  const sessions = listSessions(100);\n  return sessions.find(s => s.cwd === cwd) || null;\n}\n\nfunction extractSessionTitle(messages: Anthropic.MessageParam[]): string {\n  // Use first user message as title (truncated)\n  for (const m of messages) {\n    if (m.role === \"user\" && typeof m.content === \"string\") {\n      return m.content.slice(0, 60) + (m.content.length > 60 ? \"...\" : \"\");\n    }\n    if (m.role === \"user\" && Array.isArray(m.content)) {\n      for (const block of m.content) {\n        if (\"text\" in block && typeof block.text === \"string\") {\n          return block.text.slice(0, 60) + (block.text.length > 60 ? \"...\" : \"\");\n        }\n      }\n    }\n  }\n  return \"Untitled session\";\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"session-persistence.js","names":["readFileSync","existsSync","mkdirSync","writeFileSync","readdirSync","appendFileSync","join","getModel","SESSIONS_DIR","APP_DATA_DIR","ensureDataDir","ensureSessionsDir","recursive","saveSession","messages","sessionId","id","Date","now","meta","title","extractSessionTitle","model","messageCount","length","createdAt","toISOString","updatedAt","cwd","process","data","JSON","stringify","logSessionHistory","loadSession","path","parse","listSessions","limit","files","filter","f","endsWith","sort","reverse","slice","sessions","push","HISTORY_FILE","entry","display","project","timestamp","findLatestSessionForCwd","find","s","updateSessionMeta","updates","Object","assign","m","role","content","Array","isArray","block","text"],"sources":["../../../src/cli/services/session-persistence.ts"],"sourcesContent":["/**\n * Session Persistence — save/load conversations to disk\n *\n * Extracted from agent-loop.ts for single-responsibility.\n * All consumers should import from agent-loop.ts (re-export facade).\n */\n\nimport type Anthropic from \"@anthropic-ai/sdk\";\nimport { readFileSync, existsSync, mkdirSync, writeFileSync, readdirSync, appendFileSync } from \"fs\";\nimport { join } from \"path\";\nimport { getModel } from \"./model-manager.js\";\nimport { SESSIONS_DIR, APP_DATA_DIR, ensureDataDir } from \"./paths.js\";\n\nfunction ensureSessionsDir(): void {\n  ensureDataDir();\n  if (!existsSync(SESSIONS_DIR)) mkdirSync(SESSIONS_DIR, { recursive: true });\n}\n\nexport interface SessionMeta {\n  id: string;\n  title: string;\n  model: string;\n  messageCount: number;\n  createdAt: string;\n  updatedAt: string;\n  cwd?: string;\n  serverSessionId?: string;  // links to server session (unified session architecture)\n  synced?: boolean;          // true if persisted in DB via session API\n}\n\nexport function saveSession(\n  messages: Anthropic.MessageParam[],\n  sessionId?: string\n): string {\n  ensureSessionsDir();\n  const id = sessionId || `session-${Date.now()}`;\n  const meta: SessionMeta = {\n    id,\n    title: extractSessionTitle(messages),\n    model: getModel(),\n    messageCount: messages.length,\n    createdAt: new Date().toISOString(),\n    updatedAt: new Date().toISOString(),\n    cwd: process.cwd(),\n  };\n  const data = JSON.stringify({ meta, messages }, null, 2);\n  writeFileSync(join(SESSIONS_DIR, `${id}.json`), data, \"utf-8\");\n  logSessionHistory(meta);\n  return id;\n}\n\nexport function loadSession(sessionId: string): { meta: SessionMeta; messages: Anthropic.MessageParam[] } | null {\n  const path = join(SESSIONS_DIR, `${sessionId}.json`);\n  if (!existsSync(path)) return null;\n  try {\n    return JSON.parse(readFileSync(path, \"utf-8\"));\n  } catch { return null; }\n}\n\nexport function listSessions(limit = 20): SessionMeta[] {\n  ensureSessionsDir();\n  const files = readdirSync(SESSIONS_DIR)\n    .filter((f) => f.endsWith(\".json\"))\n    .sort()\n    .reverse()\n    .slice(0, limit);\n  const sessions: SessionMeta[] = [];\n  for (const f of files) {\n    try {\n      const data = JSON.parse(readFileSync(join(SESSIONS_DIR, f), \"utf-8\"));\n      if (data.meta) sessions.push(data.meta);\n    } catch { /* skip corrupted */ }\n  }\n  return sessions;\n}\n\nconst HISTORY_FILE = join(APP_DATA_DIR, \"history.jsonl\");\n\nfunction logSessionHistory(meta: SessionMeta): void {\n  try {\n    ensureDataDir();\n    const entry = {\n      display: meta.title,\n      project: meta.cwd || process.cwd(),\n      timestamp: meta.updatedAt,\n      sessionId: meta.id,\n      model: meta.model,\n    };\n    appendFileSync(HISTORY_FILE, JSON.stringify(entry) + \"\\n\");\n  } catch { /* best effort */ }\n}\n\nexport function findLatestSessionForCwd(): SessionMeta | null {\n  const cwd = process.cwd();\n  const sessions = listSessions(100);\n  return sessions.find(s => s.cwd === cwd) || null;\n}\n\nexport function updateSessionMeta(sessionId: string, updates: Partial<SessionMeta>): void {\n  const path = join(SESSIONS_DIR, `${sessionId}.json`);\n  if (!existsSync(path)) return;\n  try {\n    const data = JSON.parse(readFileSync(path, \"utf-8\"));\n    if (data.meta) {\n      Object.assign(data.meta, updates);\n      data.meta.updatedAt = new Date().toISOString();\n      writeFileSync(path, JSON.stringify(data, null, 2), \"utf-8\");\n    }\n  } catch { /* best effort */ }\n}\n\nfunction extractSessionTitle(messages: Anthropic.MessageParam[]): string {\n  // Use first user message as title (truncated)\n  for (const m of messages) {\n    if (m.role === \"user\" && typeof m.content === \"string\") {\n      return m.content.slice(0, 60) + (m.content.length > 60 ? \"...\" : \"\");\n    }\n    if (m.role === \"user\" && Array.isArray(m.content)) {\n      for (const block of m.content) {\n        if (\"text\" in block && typeof block.text === \"string\") {\n          return block.text.slice(0, 60) + (block.text.length > 60 ? \"...\" : \"\");\n        }\n      }\n    }\n  }\n  return \"Untitled session\";\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/cli/services/subagent-execution.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Subagent Execution — Core execution loop for subagents
+ *
+ * Contains the main runSubagent function that orchestrates the agent loop:
+ * API calls, tool execution, compaction, and telemetry.
+ */
+import type { SubagentOptions, SubagentResult } from "./subagent-types.js";
+export declare function runSubagent(options: SubagentOptions): Promise<SubagentResult>;
+export declare function runSubagentBackground(options: SubagentOptions): Promise<{
+    agentId: string;
+    outputFile: string;
+}>;

package/dist/cli/services/subagent-loop-v2.d.ts

@@ -0,0 +1,36 @@
+/**
+ * SubagentLoop — AgentLoopBase subclass for subagent execution.
+ *
+ * Delegates to callAgentAPI for API calls and executeToolBlocks for tool dispatch.
+ * Overrides preCompactMessages for aggressive compaction (strip thinking, lower max chars).
+ * Handles abort via signal, state persistence, and turn-limit nudge warnings.
+ */
+import { AgentLoopBase, type AgentLoopConfig, type AgentLoopEvents, type TurnResult } from "../../shared/agent-loop-base.js";
+import { type CompactableMessage } from "../../shared/compaction.js";
+import type { ToolExecutor } from "../../shared/tool-dispatch.js";
+import { type AgentState, type SubagentType } from "./subagent-types.js";
+export interface SubagentLoopConfig extends AgentLoopConfig {
+    agentId: string;
+    subagentType: SubagentType;
+    agentState: AgentState;
+    signal?: AbortSignal;
+    maxRetries?: number;
+    thinkingEnabled?: boolean;
+    maxOutputTokens?: number;
+    turnCtx?: Record<string, unknown>;
+}
+export declare class SubagentLoop extends AgentLoopBase {
+    private subConfig;
+    constructor(config: SubagentLoopConfig, events?: AgentLoopEvents);
+    protected executeTurn(messages: CompactableMessage[], iteration: number): Promise<TurnResult>;
+    protected createToolExecutor(): ToolExecutor;
+    protected checkAbort(): boolean;
+    protected onAborted(): void;
+    protected preCompactMessages(msgs: CompactableMessage[]): CompactableMessage[];
+    protected onMessagesUpdated(_reason: "compaction" | "continuation" | "tool_results"): Promise<void>;
+    /**
+     * Override tool dispatch to use executeToolBlocks (subagent-specific tool routing)
+     * instead of the shared dispatchTools.
+     */
+    protected dispatchToolsAndAppend(turnResult: TurnResult): Promise<boolean>;
+}

package/dist/cli/services/subagent-loop-v2.js

@@ -0,0 +1,238 @@
+/**
+ * SubagentLoop — AgentLoopBase subclass for subagent execution.
+ *
+ * Delegates to callAgentAPI for API calls and executeToolBlocks for tool dispatch.
+ * Overrides preCompactMessages for aggressive compaction (strip thinking, lower max chars).
+ * Handles abort via signal, state persistence, and turn-limit nudge warnings.
+ */
+
+import { AgentLoopBase } from "../../shared/agent-loop-base.js";
+import { preCompact } from "../../shared/compaction.js";
+import { callAgentAPI, executeToolBlocks, extractTextBlocks, extractToolUseBlocks, getResponseText, yieldToEventLoop, yieldForRender } from "./agent-worker-base.js";
+import { saveAgentState } from "./subagent-types.js";
+import { getGlobalEmitter } from "./agent-events.js";
+
+// ============================================================================
+// TYPES
+// ============================================================================
+
+// ============================================================================
+// SUBAGENT LOOP
+// ============================================================================
+
+export class SubagentLoop extends AgentLoopBase {
+  constructor(config, events = {}) {
+    super(config, events);
+    this.subConfig = config;
+    // Use subagent's state messages instead of config messages
+    this.messages = config.agentState.messages;
+  }
+
+  // ============================================================================
+  // ABSTRACT IMPLEMENTATIONS
+  // ============================================================================
+
+  async executeTurn(messages, iteration) {
+    const {
+      agentId,
+      subagentType,
+      signal,
+      maxRetries = 2,
+      thinkingEnabled = true,
+      maxOutputTokens
+    } = this.subConfig;
+    const emitter = getGlobalEmitter();
+    emitter.emitSubagentProgress(agentId, subagentType, `turn ${iteration + 1}: calling API...`, iteration + 1);
+    await yieldForRender();
+
+    // Call API with retry
+    let response;
+    let lastError = null;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        response = await callAgentAPI({
+          modelId: this.config.model,
+          contextProfile: "subagent",
+          systemPrompt: this.config.systemPrompt,
+          messages: messages,
+          tools: [],
+          // Tools are injected by executeToolBlocks
+          thinkingEnabled,
+          maxOutputTokens: maxOutputTokens || this.config.maxTurns,
+          cacheLastTool: true,
+          abortSignal: signal
+        });
+        lastError = null;
+        break;
+      } catch (err) {
+        lastError = err;
+        if (attempt < maxRetries && (err.status === 429 || err.status === 500 || err.status === 529)) {
+          await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt)));
+          continue;
+        }
+        throw err;
+      }
+    }
+    if (lastError) throw lastError;
+    await yieldToEventLoop();
+    const u = response.usage;
+    const textBlocks = extractTextBlocks(response.content);
+    const toolBlocks = extractToolUseBlocks(response.content);
+    const text = textBlocks.length ? getResponseText(response.content) : "";
+
+    // Extract compaction content if present
+    let compactionContent = null;
+    if (response.stop_reason === "compaction") {
+      const compactionBlock = response.content.find(b => b.type === "compaction");
+      if (compactionBlock) {
+        compactionContent = compactionBlock.content;
+      }
+    }
+
+    // Extract thinking blocks
+    const thinkingBlocks = response.content.filter(b => b.type === "thinking").map(b => ({
+      type: "thinking",
+      thinking: b.thinking,
+      signature: b.signature || ""
+    }));
+    return {
+      text,
+      toolUseBlocks: toolBlocks.map(b => ({
+        id: b.id,
+        name: b.name,
+        input: b.input
+      })),
+      thinkingBlocks,
+      compactionContent,
+      stopReason: response.stop_reason,
+      usage: {
+        inputTokens: u.input_tokens,
+        outputTokens: u.output_tokens,
+        cacheRead: u.cache_read_tokens,
+        cacheCreation: u.cache_creation_tokens
+      }
+    };
+  }
+  createToolExecutor() {
+    // SubagentLoop overrides dispatchToolsAndAppend entirely, so this is not used.
+    return async (_name, _input) => ({
+      success: false,
+      output: "Not implemented"
+    });
+  }
+
+  // ============================================================================
+  // OVERRIDES
+  // ============================================================================
+
+  checkAbort() {
+    return this.subConfig.signal?.aborted === true;
+  }
+  onAborted() {
+    const {
+      agentId,
+      subagentType
+    } = this.subConfig;
+    getGlobalEmitter().emitSubagentProgress(agentId, subagentType, "cancelled");
+  }
+  preCompactMessages(msgs) {
+    const {
+      messages: compacted
+    } = preCompact(msgs, {
+      maxToolResultChars: this.config.maxToolResultChars ?? 2048,
+      stripThinking: true
+    });
+    return compacted;
+  }
+  async onMessagesUpdated(_reason) {
+    // Sync messages back to agent state and persist
+    this.subConfig.agentState.messages = this.messages;
+    this.subConfig.agentState.updatedAt = new Date().toISOString();
+    saveAgentState(this.subConfig.agentState);
+  }
+
+  /**
+   * Override tool dispatch to use executeToolBlocks (subagent-specific tool routing)
+   * instead of the shared dispatchTools.
+   */
+  async dispatchToolsAndAppend(turnResult) {
+    const {
+      agentId,
+      subagentType,
+      signal,
+      agentState
+    } = this.subConfig;
+    const emitter = getGlobalEmitter();
+
+    // Record tool names
+    for (const tb of turnResult.toolUseBlocks) {
+      this.toolsUsed.add(tb.name);
+      this.toolCallCount++;
+    }
+    const toolNames = turnResult.toolUseBlocks.map(b => b.name).join(", ");
+    emitter.emitSubagentProgress(agentId, subagentType, `using: ${toolNames}`);
+    const {
+      toolResults,
+      toolsUsed: turnToolsUsed
+    } = await executeToolBlocks({
+      toolBlocks: turnResult.toolUseBlocks,
+      loopDetector: this.loopDetector,
+      signal,
+      callbacks: {
+        onToolStart: (toolName, input) => {
+          emitter.emitSubagentProgress(agentId, subagentType, `running ${toolName}`, undefined, toolName);
+          emitter.emitSubagentToolStart(agentId, toolName, input);
+          this.events.onToolStart?.(toolName, input);
+        },
+        onToolEnd: (toolName, success, durationMs) => {
+          emitter.emitSubagentToolEnd(agentId, toolName, success, durationMs);
+          this.events.onToolResult?.(toolName, success, "", durationMs);
+        }
+      }
+    });
+
+    // Record tools used in state
+    for (const tn of turnToolsUsed) {
+      if (!agentState.toolsUsed.includes(tn)) agentState.toolsUsed.push(tn);
+    }
+
+    // End-of-turn loop detector check
+    const bailCheck = this.loopDetector.endTurn();
+    if (bailCheck.shouldBail) {
+      this.events.onText?.(bailCheck.message || "\n[Consecutive failures detected. Stopping.]");
+      return false;
+    }
+
+    // Append messages
+    const assistantContent = this.buildAssistantContent(turnResult);
+    this.messages.push({
+      role: "assistant",
+      content: assistantContent
+    });
+    this.messages.push({
+      role: "user",
+      content: toolResults
+    });
+
+    // Turn limit nudge warning
+    const turnsRemaining = this.config.maxTurns - this.turnCount - 1;
+    const nudgeThreshold = Math.ceil(this.config.maxTurns * 0.25);
+    if (turnsRemaining === nudgeThreshold && turnsRemaining > 0) {
+      const editTools = ["write_file", "edit_file", "create_file", "notebook_edit"];
+      const hasEdited = agentState.toolsUsed.some(t => editTools.includes(t));
+      if (!hasEdited) {
+        this.messages.push({
+          role: "user",
+          content: [{
+            type: "text",
+            text: `\u26A0\uFE0F TURN LIMIT WARNING: You have ${turnsRemaining} turns remaining and have NOT made any file edits yet. Start producing output NOW.`
+          }]
+        });
+      }
+    }
+    await this.onMessagesUpdated("tool_results");
+    await yieldToEventLoop();
+    return true;
+  }
+}
+//# sourceMappingURL=subagent-loop-v2.js.map

package/dist/cli/services/subagent-loop-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-loop-v2.js","names":["AgentLoopBase","preCompact","callAgentAPI","executeToolBlocks","extractTextBlocks","extractToolUseBlocks","getResponseText","yieldToEventLoop","yieldForRender","saveAgentState","getGlobalEmitter","SubagentLoop","constructor","config","events","subConfig","messages","agentState","executeTurn","iteration","agentId","subagentType","signal","maxRetries","thinkingEnabled","maxOutputTokens","emitter","emitSubagentProgress","response","lastError","attempt","modelId","model","contextProfile","systemPrompt","tools","maxTurns","cacheLastTool","abortSignal","err","status","Promise","r","setTimeout","Math","pow","u","usage","textBlocks","content","toolBlocks","text","length","compactionContent","stop_reason","compactionBlock","find","b","type","thinkingBlocks","filter","map","thinking","signature","toolUseBlocks","id","name","input","stopReason","inputTokens","input_tokens","outputTokens","output_tokens","cacheRead","cache_read_tokens","cacheCreation","cache_creation_tokens","createToolExecutor","_name","_input","success","output","checkAbort","aborted","onAborted","preCompactMessages","msgs","compacted","maxToolResultChars","stripThinking","onMessagesUpdated","_reason","updatedAt","Date","toISOString","dispatchToolsAndAppend","turnResult","tb","toolsUsed","add","toolCallCount","toolNames","join","toolResults","turnToolsUsed","loopDetector","callbacks","onToolStart","toolName","undefined","emitSubagentToolStart","onToolEnd","durationMs","emitSubagentToolEnd","onToolResult","tn","includes","push","bailCheck","endTurn","shouldBail","onText","message","assistantContent","buildAssistantContent","role","turnsRemaining","turnCount","nudgeThreshold","ceil","editTools","hasEdited","some","t"],"sources":["../../../src/cli/services/subagent-loop-v2.ts"],"sourcesContent":["/**\n * SubagentLoop — AgentLoopBase subclass for subagent execution.\n *\n * Delegates to callAgentAPI for API calls and executeToolBlocks for tool dispatch.\n * Overrides preCompactMessages for aggressive compaction (strip thinking, lower max chars).\n * Handles abort via signal, state persistence, and turn-limit nudge warnings.\n */\n\nimport { AgentLoopBase, type AgentLoopConfig, type AgentLoopEvents, type TurnResult } from \"../../shared/agent-loop-base.js\";\nimport { preCompact, type CompactableMessage } from \"../../shared/compaction.js\";\nimport { LoopDetector, AGENT_DEFAULTS } from \"../../shared/agent-core.js\";\nimport type { ToolExecutor } from \"../../shared/tool-dispatch.js\";\nimport type { ToolUseBlock, ToolResultMessage } from \"../../shared/types.js\";\nimport {\n  callAgentAPI,\n  executeToolBlocks,\n  extractTextBlocks,\n  extractToolUseBlocks,\n  getResponseText,\n  yieldToEventLoop,\n  yieldForRender,\n} from \"./agent-worker-base.js\";\nimport type { AgentAPIResponse } from \"./agent-worker-base.js\";\nimport { saveAgentState, type AgentState, type SubagentType } from \"./subagent-types.js\";\nimport { getGlobalEmitter } from \"./agent-events.js\";\nimport { logSpan, generateSpanId } from \"./telemetry.js\";\n\n// ============================================================================\n// TYPES\n// ============================================================================\n\nexport interface SubagentLoopConfig extends AgentLoopConfig {\n  agentId: string;\n  subagentType: SubagentType;\n  agentState: AgentState;\n  signal?: AbortSignal;\n  maxRetries?: number;\n  thinkingEnabled?: boolean;\n  maxOutputTokens?: number;\n  turnCtx?: Record<string, unknown>;\n}\n\n// ============================================================================\n// SUBAGENT LOOP\n// ============================================================================\n\nexport class SubagentLoop extends AgentLoopBase {\n  private subConfig: SubagentLoopConfig;\n\n  constructor(config: SubagentLoopConfig, events: AgentLoopEvents = {}) {\n    super(config, events);\n    this.subConfig = config;\n    // Use subagent's state messages instead of config messages\n    this.messages = config.agentState.messages as CompactableMessage[];\n  }\n\n  // ============================================================================\n  // ABSTRACT IMPLEMENTATIONS\n  // ============================================================================\n\n  protected async executeTurn(messages: CompactableMessage[], iteration: number): Promise<TurnResult> {\n    const { agentId, subagentType, signal, maxRetries = 2, thinkingEnabled = true, maxOutputTokens } = this.subConfig;\n    const emitter = getGlobalEmitter();\n\n    emitter.emitSubagentProgress(agentId, subagentType, `turn ${iteration + 1}: calling API...`, iteration + 1);\n    await yieldForRender();\n\n    // Call API with retry\n    let response!: AgentAPIResponse;\n    let lastError: Error | null = null;\n    for (let attempt = 0; attempt <= maxRetries; attempt++) {\n      try {\n        response = await callAgentAPI({\n          modelId: this.config.model,\n          contextProfile: \"subagent\",\n          systemPrompt: this.config.systemPrompt,\n          messages: messages as any,\n          tools: [], // Tools are injected by executeToolBlocks\n          thinkingEnabled,\n          maxOutputTokens: maxOutputTokens || this.config.maxTurns,\n          cacheLastTool: true,\n          abortSignal: signal,\n        });\n        lastError = null;\n        break;\n      } catch (err: any) {\n        lastError = err;\n        if (attempt < maxRetries && (err.status === 429 || err.status === 500 || err.status === 529)) {\n          await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt)));\n          continue;\n        }\n        throw err;\n      }\n    }\n    if (lastError) throw lastError;\n\n    await yieldToEventLoop();\n\n    const u = response.usage;\n    const textBlocks = extractTextBlocks(response.content);\n    const toolBlocks = extractToolUseBlocks(response.content);\n    const text = textBlocks.length ? getResponseText(response.content) : \"\";\n\n    // Extract compaction content if present\n    let compactionContent: string | null = null;\n    if (response.stop_reason === \"compaction\") {\n      const compactionBlock = response.content.find((b: any) => b.type === \"compaction\") as any;\n      if (compactionBlock) {\n        compactionContent = compactionBlock.content;\n      }\n    }\n\n    // Extract thinking blocks\n    const thinkingBlocks = response.content\n      .filter((b: any) => b.type === \"thinking\")\n      .map((b: any) => ({ type: \"thinking\" as const, thinking: b.thinking, signature: b.signature || \"\" }));\n\n    return {\n      text,\n      toolUseBlocks: toolBlocks.map(b => ({ id: b.id, name: b.name, input: b.input as Record<string, unknown> })),\n      thinkingBlocks,\n      compactionContent,\n      stopReason: response.stop_reason,\n      usage: {\n        inputTokens: u.input_tokens,\n        outputTokens: u.output_tokens,\n        cacheRead: u.cache_read_tokens,\n        cacheCreation: u.cache_creation_tokens,\n      },\n    };\n  }\n\n  protected createToolExecutor(): ToolExecutor {\n    // SubagentLoop overrides dispatchToolsAndAppend entirely, so this is not used.\n    return async (_name, _input) => ({ success: false, output: \"Not implemented\" });\n  }\n\n  // ============================================================================\n  // OVERRIDES\n  // ============================================================================\n\n  protected checkAbort(): boolean {\n    return this.subConfig.signal?.aborted === true;\n  }\n\n  protected onAborted(): void {\n    const { agentId, subagentType } = this.subConfig;\n    getGlobalEmitter().emitSubagentProgress(agentId, subagentType, \"cancelled\");\n  }\n\n  protected preCompactMessages(msgs: CompactableMessage[]): CompactableMessage[] {\n    const { messages: compacted } = preCompact(msgs, {\n      maxToolResultChars: this.config.maxToolResultChars ?? 2048,\n      stripThinking: true,\n    });\n    return compacted;\n  }\n\n  protected async onMessagesUpdated(_reason: \"compaction\" | \"continuation\" | \"tool_results\"): Promise<void> {\n    // Sync messages back to agent state and persist\n    this.subConfig.agentState.messages = this.messages as any;\n    this.subConfig.agentState.updatedAt = new Date().toISOString();\n    saveAgentState(this.subConfig.agentState);\n  }\n\n  /**\n   * Override tool dispatch to use executeToolBlocks (subagent-specific tool routing)\n   * instead of the shared dispatchTools.\n   */\n  protected async dispatchToolsAndAppend(turnResult: TurnResult): Promise<boolean> {\n    const { agentId, subagentType, signal, agentState } = this.subConfig;\n    const emitter = getGlobalEmitter();\n\n    // Record tool names\n    for (const tb of turnResult.toolUseBlocks) {\n      this.toolsUsed.add(tb.name);\n      this.toolCallCount++;\n    }\n\n    const toolNames = turnResult.toolUseBlocks.map(b => b.name).join(\", \");\n    emitter.emitSubagentProgress(agentId, subagentType, `using: ${toolNames}`);\n\n    const { toolResults, toolsUsed: turnToolsUsed } = await executeToolBlocks({\n      toolBlocks: turnResult.toolUseBlocks as any,\n      loopDetector: this.loopDetector,\n      signal,\n      callbacks: {\n        onToolStart: (toolName, input) => {\n          emitter.emitSubagentProgress(agentId, subagentType, `running ${toolName}`, undefined, toolName);\n          emitter.emitSubagentToolStart(agentId, toolName, input);\n          this.events.onToolStart?.(toolName, input);\n        },\n        onToolEnd: (toolName, success, durationMs) => {\n          emitter.emitSubagentToolEnd(agentId, toolName, success, durationMs);\n          this.events.onToolResult?.(toolName, success, \"\", durationMs);\n        },\n      },\n    });\n\n    // Record tools used in state\n    for (const tn of turnToolsUsed) {\n      if (!agentState.toolsUsed.includes(tn)) agentState.toolsUsed.push(tn);\n    }\n\n    // End-of-turn loop detector check\n    const bailCheck = this.loopDetector.endTurn();\n    if (bailCheck.shouldBail) {\n      this.events.onText?.(bailCheck.message || \"\\n[Consecutive failures detected. Stopping.]\");\n      return false;\n    }\n\n    // Append messages\n    const assistantContent = this.buildAssistantContent(turnResult);\n    this.messages.push({ role: \"assistant\", content: assistantContent });\n    this.messages.push({ role: \"user\", content: toolResults as any });\n\n    // Turn limit nudge warning\n    const turnsRemaining = this.config.maxTurns - this.turnCount - 1;\n    const nudgeThreshold = Math.ceil(this.config.maxTurns * 0.25);\n    if (turnsRemaining === nudgeThreshold && turnsRemaining > 0) {\n      const editTools = [\"write_file\", \"edit_file\", \"create_file\", \"notebook_edit\"];\n      const hasEdited = agentState.toolsUsed.some(t => editTools.includes(t));\n      if (!hasEdited) {\n        this.messages.push({\n          role: \"user\",\n          content: [{ type: \"text\", text: `\\u26A0\\uFE0F TURN LIMIT WARNING: You have ${turnsRemaining} turns remaining and have NOT made any file edits yet. Start producing output NOW.` }] as any,\n        });\n      }\n    }\n\n    await this.onMessagesUpdated(\"tool_results\");\n    await yieldToEventLoop();\n    return true;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/cli/services/subagent-tools.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Subagent tool filtering — restrict tools per agent type
+ *
+ * Extracted from subagent.ts for single-responsibility.
+ */
+import type Anthropic from "@anthropic-ai/sdk";
+import type { SubagentType } from "./subagent-types.js";
+export declare function getToolsForAgent(type: SubagentType | string): string[];
+export declare function getFilteredTools(type: SubagentType): Promise<Anthropic.Tool[]>;
+export declare const TASK_TOOL_DEFINITION: Anthropic.Tool;