@costrict/csc 4.1.3 → 4.1.4

package/dist/{chunk-61p1fy8g.js → chunk-x1ge840e.js}

@@ -1,16 +1,17 @@
 // @bun
 import"./chunk-tf4347nj.js";
-import"./chunk-1wp8ch0w.js";
+import"./chunk-9rq3w880.js";
 import {
-  getScriptArgsForChild
-} from "./chunk-v57at5qe.js";
+  getScriptArgsForChild,
+  getSubagentProgress
+} from "./chunk-ksav9jw1.js";
 import {
   init_favorite,
   listFavoriteItems,
   loadFavoriteItem,
   unloadFavoriteItem
-} from "./chunk-fgsdh4bh.js";
-import"./chunk-cznpjmse.js";
+} from "./chunk-9jftryb5.js";
+import"./chunk-k5a0g0n1.js";
 import {
   getBuiltInAgents,
   getCommandName,
@@ -18,75 +19,75 @@ import {
   init_builtInAgents,
   init_command,
   init_commands1 as init_commands
-} from "./chunk-zbdv3z8q.js";
+} from "./chunk-jdx6pqay.js";
 import {
   init_listSessionsImpl,
   listSessionsImpl
 } from "./chunk-j7g5prq1.js";
-import"./chunk-3s8sm6ef.js";
+import"./chunk-gkfhy27z.js";
 import"./chunk-et824jj8.js";
-import"./chunk-hvh7m0c2.js";
+import"./chunk-x8g49rpq.js";
 import"./chunk-dj0c74sd.js";
 import"./chunk-7cpxexw0.js";
 import"./chunk-2gzv8nrw.js";
 import"./chunk-ehtwnxpg.js";
-import"./chunk-j1gz4v4p.js";
-import"./chunk-f9vj65e1.js";
-import"./chunk-5ejqdjxh.js";
-import"./chunk-5hhgez0d.js";
-import"./chunk-aernevsv.js";
-import"./chunk-5zm0sq49.js";
+import"./chunk-6t7858mm.js";
+import"./chunk-my2v9ayn.js";
+import"./chunk-mb7ne7fv.js";
+import"./chunk-y3h553se.js";
+import"./chunk-wz2q3pmg.js";
+import"./chunk-454ty3a9.js";
 import"./chunk-cgfdkzhb.js";
 import"./chunk-x6pa9me9.js";
 import"./chunk-2f6hs25r.js";
-import"./chunk-v8cfb8af.js";
-import"./chunk-f21x038e.js";
+import"./chunk-5kwvenz7.js";
+import"./chunk-axh75nac.js";
 import"./chunk-9663bsk0.js";
-import"./chunk-swhfsn91.js";
+import"./chunk-e1rckp3d.js";
 import"./chunk-hnms0snx.js";
-import"./chunk-wkedz0qh.js";
+import"./chunk-wx81sgv6.js";
 import"./chunk-dg8c6j5q.js";
-import"./chunk-w827sfvb.js";
+import"./chunk-3ft93eyw.js";
 import"./chunk-qzp51m93.js";
-import"./chunk-xy8fvtmc.js";
-import"./chunk-j74ctwq9.js";
+import"./chunk-mzv3b466.js";
+import"./chunk-yat2gecz.js";
 import"./chunk-pdkfgve3.js";
 import"./chunk-a97kj439.js";
-import"./chunk-9qj9t1g4.js";
-import"./chunk-kbbjfeb8.js";
+import"./chunk-tq15k5ay.js";
+import"./chunk-5s1cmr4k.js";
 import"./chunk-t4kcvmes.js";
-import"./chunk-ga7r2n5h.js";
+import"./chunk-ee23jajz.js";
 import"./chunk-dx4aw2jf.js";
-import"./chunk-m65njcyf.js";
+import"./chunk-5511t18e.js";
 import"./chunk-14ya36qs.js";
 import"./chunk-edqtm6y0.js";
-import"./chunk-2dn4yh40.js";
+import"./chunk-yrc25q6d.js";
 import"./chunk-4vbza3s0.js";
-import"./chunk-cn1gsn85.js";
-import"./chunk-en4g0hk8.js";
+import"./chunk-p6r9kbzs.js";
+import"./chunk-gh3sxpqt.js";
 import"./chunk-xcxcysx3.js";
 import"./chunk-4jm600zv.js";
-import"./chunk-7hhh1err.js";
+import"./chunk-ztetpy4q.js";
 import"./chunk-mh90mtzg.js";
-import"./chunk-wg8x1gvn.js";
-import"./chunk-gmasa1zr.js";
-import"./chunk-z018wk7e.js";
+import"./chunk-awsqxad3.js";
+import"./chunk-z08t19e5.js";
+import"./chunk-qy6y2jh6.js";
 import"./chunk-0k1kkyw8.js";
-import"./chunk-2k59dwt9.js";
+import"./chunk-fm1cnxaj.js";
 import"./chunk-2dtsff0m.js";
 import"./chunk-2w8qb2c2.js";
 import"./chunk-26jcng1n.js";
 import"./chunk-h6hgwf7t.js";
 import"./chunk-sq54cby2.js";
-import"./chunk-z1dwx148.js";
+import"./chunk-y01apqxs.js";
 import"./chunk-1xdybmyp.js";
 import"./chunk-8ye7m55r.js";
-import"./chunk-8vg1bd0f.js";
+import"./chunk-47mtpn1d.js";
 import"./chunk-nvce80tx.js";
 import {
   init_PermissionMode,
   permissionModeFromString
-} from "./chunk-ebtaxjae.js";
+} from "./chunk-t55pghx5.js";
 import {
   init_json,
   safeParseJSON
@@ -107,7 +108,7 @@ import"./chunk-pe9b769s.js";
 import"./chunk-64c1avct.js";
 import"./chunk-8g5pe1gr.js";
 import"./chunk-nq504fa3.js";
-import"./chunk-52f3aqnq.js";
+import"./chunk-ehc914vn.js";
 import"./chunk-qxp3d963.js";
 import"./chunk-6dpcm4za.js";
 import"./chunk-p26t5d5e.js";
@@ -124,9 +125,9 @@ import"./chunk-4f8eq6n2.js";
 import"./chunk-v9smspw2.js";
 import"./chunk-v1kzp02e.js";
 import"./chunk-p2816w9z.js";
-import"./chunk-5e4sk6wr.js";
+import"./chunk-x7hqhzet.js";
 import"./chunk-crmjpsqe.js";
-import"./chunk-zyhpq0w1.js";
+import"./chunk-96012zrd.js";
 import"./chunk-64k6ybmm.js";
 import"./chunk-qr5vq8ys.js";
 import"./chunk-f2mhrmww.js";
@@ -1854,7 +1855,7 @@ function createHealthRoutes(sessionManager) {
     const uptime = process.uptime() * 1000;
     return c.json({
       status: "ok",
-      version: "4.1.3",
+      version: "4.1.4",
       uptime_ms: Math.round(uptime),
       active_sessions: sessionManager.getActiveCount()
     });
@@ -2579,8 +2580,13 @@ function createSessionRoutes(sessionManager, eventBus) {
   }).post("/session/:sessionID/abort", async (c) => {
     const id = c.req.param("sessionID");
     const handle = sessionManager.getSession(id);
-    if (!handle)
+    if (!handle) {
+      eventBus.publish("session.status", {
+        sessionID: id,
+        status: { type: "idle" }
+      });
       return c.json({ aborted: true });
+    }
     await handle.abort();
     return c.json({ aborted: true });
   }).post("/session/:sessionID/shell", async (c) => {
@@ -2896,6 +2902,86 @@ init_json();
 import { readFile, readdir, stat } from "fs/promises";
 import { existsSync } from "fs";
 import { join } from "path";
+var TOOL_NAME_MAP = {
+  Read: "read",
+  Edit: "edit",
+  Write: "edit",
+  Glob: "glob",
+  Grep: "grep",
+  LS: "list",
+  Bash: "bash",
+  PowerShell: "bash",
+  Agent: "task",
+  WebFetch: "webfetch",
+  WebSearch: "websearch",
+  TodoRead: "todoread",
+  TodoWrite: "todowrite"
+};
+function normalizeToolName(name) {
+  return TOOL_NAME_MAP[name] ?? name.toLowerCase();
+}
+function contentToParts(content, role) {
+  const parts = [];
+  if (!Array.isArray(content))
+    return parts;
+  for (const block of content) {
+    if (!block || typeof block !== "object")
+      continue;
+    const b = block;
+    switch (b.type) {
+      case "text":
+        parts.push({ type: "text", id: crypto.randomUUID(), text: b.text ?? "" });
+        break;
+      case "thinking":
+        parts.push({ type: "reasoning", id: crypto.randomUUID(), text: b.thinking ?? "" });
+        break;
+      case "redacted_thinking":
+        parts.push({ type: "reasoning", id: crypto.randomUUID(), text: "", redacted: true });
+        break;
+      case "tool_use":
+        parts.push({
+          type: "tool",
+          id: crypto.randomUUID(),
+          callID: b.id ?? "",
+          tool: normalizeToolName(b.name ?? ""),
+          state: {
+            status: "completed",
+            input: b.input ?? {},
+            output: "",
+            title: b.name ?? "",
+            time: { start: Date.now(), end: Date.now() }
+          }
+        });
+        break;
+      case "tool_result": {
+        parts.push({
+          type: "tool-result",
+          id: crypto.randomUUID(),
+          toolUseID: b.tool_use_id ?? "",
+          content: b.content
+        });
+        break;
+      }
+    }
+  }
+  return parts;
+}
+function decomposeMessageToParts(msg) {
+  if (msg.parts && msg.parts.length > 0)
+    return msg;
+  const content = msg.content;
+  const role = msg.role;
+  if (!content || !role)
+    return msg;
+  if (role === "assistant" || role === "user") {
+    const parts = contentToParts(content, role);
+    const filtered = msg.error ? parts.filter((p) => p.type !== "text") : parts;
+    if (filtered.length > 0) {
+      return { ...msg, parts: filtered };
+    }
+  }
+  return msg;
+}
 var MESSAGE_TYPES = new Set(["user", "assistant"]);
 var SKIP_TYPES = new Set([
   "summary",
@@ -2910,6 +2996,15 @@ var SKIP_TYPES = new Set([
   "context-collapse-snapshot"
 ]);
 var pathCache = new Map;
+var subagentPathCache = new Map;
+async function readAgentMeta(metaPath) {
+  try {
+    const raw2 = await readFile(metaPath, "utf-8");
+    return JSON.parse(raw2);
+  } catch {
+    return null;
+  }
+}
 async function resolveTranscriptPath(sessionId, cwd) {
   const cacheKey = `${sessionId}:${cwd ?? ""}`;
   const cached = pathCache.get(cacheKey);
@@ -2964,18 +3059,37 @@ function entryToSessionMessage(entry, includeSystem) {
     return null;
   const role = entry.role ?? entry.message?.role ?? entry.type;
   const content = entry.message?.content ?? entry.content ?? "";
+  if (role === "user" && isTaskNotificationContent(content))
+    return null;
   const timestamp = entry.timestamp ? new Date(entry.timestamp).getTime() : 0;
+  const errorRaw = extractApiErrorText(content);
+  const detail = errorRaw ? parseApiErrorDetail(errorRaw) : undefined;
+  const error = detail ? { name: "APIError", data: detail } : undefined;
   return {
     uuid: entry.uuid,
     type: entry.type,
     role: role ?? entry.type,
-    content,
+    content: error ? [] : content,
     timestamp,
     parent_uuid: entry.parentUuid ?? null,
-    usage: entry.usage
+    usage: entry.usage,
+    error
   };
 }
 function readMessagesFromLines(lines, includeSystem) {
+  const tombstoned = new Set;
+  for (const line of lines) {
+    if (!line)
+      continue;
+    const entry = parseEntry(line);
+    if (!entry)
+      continue;
+    if (entry.type === "tombstone") {
+      const targetUuid = entry.message?.uuid;
+      if (typeof targetUuid === "string")
+        tombstoned.add(targetUuid);
+    }
+  }
   const messages = [];
   for (const line of lines) {
     if (!line)
@@ -2983,6 +3097,8 @@ function readMessagesFromLines(lines, includeSystem) {
     const entry = parseEntry(line);
     if (!entry)
       continue;
+    if (entry.uuid && tombstoned.has(entry.uuid))
+      continue;
     const msg = entryToSessionMessage(entry, includeSystem);
     if (msg)
       messages.push(msg);
@@ -2990,8 +3106,35 @@ function readMessagesFromLines(lines, includeSystem) {
   return messages;
 }
 async function findSubagentTranscriptPath(agentId, cwd) {
+  const cacheKey = `${agentId}:${cwd ?? ""}`;
+  const cached = subagentPathCache.get(cacheKey);
+  if (cached !== undefined)
+    return cached;
+  const result = await findSubagentTranscriptPathUncached(agentId, cwd);
+  if (result)
+    subagentPathCache.set(cacheKey, result);
+  return result;
+}
+async function findSubagentTranscriptPathUncached(agentId, cwd) {
   const fileName = `agent-${agentId}.jsonl`;
+  const metaFileName = `agent-${agentId}.meta.json`;
+  const tryDirect = async (projectDir) => {
+    const metaPath = join(projectDir, metaFileName);
+    const meta = await readAgentMeta(metaPath);
+    if (meta?.parent_session_id) {
+      const direct = join(projectDir, meta.parent_session_id, "subagents", fileName);
+      if (existsSync(direct)) {
+        const s = await stat(direct);
+        if (s.isFile() && s.size > 0)
+          return direct;
+      }
+    }
+    return null;
+  };
   const searchProject = async (projectDir) => {
+    const directHit = await tryDirect(projectDir);
+    if (directHit)
+      return directHit;
     let sessionDirs;
     try {
       sessionDirs = await readdir(projectDir);
@@ -3185,8 +3328,168 @@ async function readSessionDiff(opts) {
     return { diffs: [] };
   }
 }
+var TASK_NOTIFICATION_RE = /^<task-notification>[\s\S]*<\/task-notification>\s*$/;
+var TASK_ID_RE = /<task-id>([^<]+)<\/task-id>/;
+var API_ERROR_RE = /^API Error:\s*/;
+var COSTRICT_API_ERROR_RE = /^CoStrict API Error:\s*/;
+function extractApiErrorText(content) {
+  if (typeof content === "string") {
+    if (API_ERROR_RE.test(content))
+      return content.replace(API_ERROR_RE, "");
+    if (COSTRICT_API_ERROR_RE.test(content))
+      return content.replace(COSTRICT_API_ERROR_RE, "");
+  }
+  if (!Array.isArray(content))
+    return null;
+  for (const block of content) {
+    if (!block || typeof block !== "object")
+      continue;
+    const b = block;
+    if (b.type === "text" && typeof b.text === "string") {
+      const text = b.text;
+      if (API_ERROR_RE.test(text))
+        return text.replace(API_ERROR_RE, "");
+      if (COSTRICT_API_ERROR_RE.test(text))
+        return text.replace(COSTRICT_API_ERROR_RE, "");
+    }
+  }
+  return null;
+}
+function parseApiErrorDetail(raw2) {
+  const statusMatch = raw2.match(/^(\d{3})\s+/);
+  const statusCode = statusMatch ? parseInt(statusMatch[1], 10) : undefined;
+  const isRetryable = statusCode === 429 || statusCode === 503 || statusCode === 529;
+  let message = raw2;
+  try {
+    const jsonStart = raw2.indexOf("{");
+    if (jsonStart !== -1) {
+      const parsed = JSON.parse(raw2.slice(jsonStart));
+      if (parsed?.error?.message) {
+        message = parsed.error.message;
+      } else if (typeof parsed?.message === "string") {
+        message = parsed.message;
+      }
+    }
+  } catch {}
+  return { message, statusCode, isRetryable };
+}
+var TOOL_USE_ID_RE = /<tool-use-id>([^<]+)<\/tool-use-id>/;
+var TASK_STATUS_RE = /<status>([^<]+)<\/status>/;
+var TASK_SUMMARY_RE = /<summary>([^<]*)<\/summary>/;
+function isTaskNotificationContent(content) {
+  return typeof content === "string" && TASK_NOTIFICATION_RE.test(content);
+}
+function parseTaskNotificationXml(xml) {
+  const taskID = TASK_ID_RE.exec(xml)?.[1];
+  if (!taskID)
+    return null;
+  const rawStatus = TASK_STATUS_RE.exec(xml)?.[1] ?? "completed";
+  const status = rawStatus === "completed" || rawStatus === "failed" || rawStatus === "stopped" ? rawStatus : "completed";
+  const toolUseID = TOOL_USE_ID_RE.exec(xml)?.[1];
+  const summary = TASK_SUMMARY_RE.exec(xml)?.[1];
+  return { taskID, toolUseID, status, summary };
+}
+async function readSessionTasks(opts) {
+  const path = await resolveTranscriptPath(opts.sessionId, opts.cwd);
+  if (!path || !existsSync(path))
+    return [];
+  const raw2 = await readFile(path, "utf-8");
+  const lines = raw2.split(`
+`).filter(Boolean);
+  const tasks = new Map;
+  const descriptions = new Map;
+  for (const line of lines) {
+    const entry = parseEntry(line);
+    if (!entry)
+      continue;
+    if (entry.type === "assistant" && entry.message?.content) {
+      const content = entry.message.content;
+      if (!Array.isArray(content))
+        continue;
+      for (const block of content) {
+        if (!block || typeof block !== "object")
+          continue;
+        const b = block;
+        if (b.type === "tool_use" && (b.name === "Agent" || b.name === "LocalMainSessionTask")) {
+          const input = b.input;
+          const callID = b.id;
+          if (input?.description && callID) {
+            descriptions.set(callID, input.description);
+          }
+        }
+      }
+    }
+    if (entry.type === "user" && entry.message?.content) {
+      const content = entry.message.content;
+      if (!isTaskNotificationContent(content))
+        continue;
+      const parsed = parseTaskNotificationXml(content);
+      if (!parsed)
+        continue;
+      const existing = tasks.get(parsed.taskID);
+      const endTime = entry.timestamp ? new Date(entry.timestamp).getTime() : Date.now();
+      const desc = existing?.description ?? descriptions.get(parsed.toolUseID ?? "") ?? "";
+      tasks.set(parsed.taskID, {
+        taskID: parsed.taskID,
+        status: parsed.status,
+        description: desc,
+        toolUseID: parsed.toolUseID ?? existing?.toolUseID,
+        summary: parsed.summary ?? existing?.summary,
+        usage: existing?.usage,
+        startTime: existing?.startTime ?? endTime,
+        endTime
+      });
+    }
+  }
+  return [...tasks.values()];
+}
 
 // src/server/routes/message.ts
+function findParentCwd(sessionManager, id) {
+  for (const handle of sessionManager.getAllSessions()) {
+    if (handle.subagentIndex.has(id)) {
+      return handle.spawnCwd ?? handle.cwd;
+    }
+    if (handle.activeSubagents.has(id)) {
+      return handle.spawnCwd ?? handle.cwd;
+    }
+  }
+  return;
+}
+function patchActiveSubagentsInMessages(messages, activeSubagents) {
+  if (activeSubagents.size === 0)
+    return;
+  const runningCallIDs = new Set;
+  const progressByCallID = new Map;
+  for (const [, info] of activeSubagents) {
+    if (info.toolUseId) {
+      runningCallIDs.add(info.toolUseId);
+      const progress = getSubagentProgress(info.agentId);
+      if (progress?.progressLines?.length) {
+        progressByCallID.set(info.toolUseId, progress.progressLines);
+      }
+    }
+  }
+  if (runningCallIDs.size === 0)
+    return;
+  for (const msg of messages) {
+    if (!Array.isArray(msg.parts))
+      continue;
+    for (const part of msg.parts) {
+      if (part.type !== "tool")
+        continue;
+      const toolPart = part;
+      if (!runningCallIDs.has(toolPart.callID))
+        continue;
+      toolPart.state = {
+        ...toolPart.state,
+        status: "running",
+        progress: progressByCallID.get(toolPart.callID) ?? [],
+        time: { start: toolPart.state.time?.start ?? Date.now() }
+      };
+    }
+  }
+}
 function dedupeMessages(disk, memory) {
   if (disk.length === 0)
     return memory;
@@ -3198,23 +3501,32 @@ function createMessageRoutes(sessionManager) {
   return new Hono2().get("/session/:sessionID/message", async (c) => {
     const id = c.req.param("sessionID");
     const handle = sessionManager.getSession(id);
+    const parentCwd = handle ? undefined : findParentCwd(sessionManager, id);
+    const effectiveCwd = handle?.spawnCwd ?? handle?.cwd ?? parentCwd;
     const url = new URL(c.req.url);
     const limit = parseInt(url.searchParams.get("limit") ?? "50", 10);
     const before = url.searchParams.get("before") ?? undefined;
     const includeSystem = url.searchParams.get("include_system") === "true";
     const { messages: diskMessages, nextCursor } = await readSessionMessages({
       sessionId: id,
-      cwd: handle?.spawnCwd ?? handle?.cwd,
+      cwd: effectiveCwd,
       limit,
       before,
       includeSystem
     });
     const messages = handle && handle.messageBuffer.length > 0 ? dedupeMessages(diskMessages, [...handle.messageBuffer]) : diskMessages;
+    const tombstoned = handle?.tombstonedUuids;
+    const filtered = tombstoned && tombstoned.size > 0 ? messages.filter((m) => !tombstoned.has(m.uuid)) : messages;
+    const decomposed = filtered.map(decomposeMessageToParts);
+    if (handle) {
+      patchActiveSubagentsInMessages(decomposed, handle.activeSubagents);
+    }
+    const result = decomposed;
     if (nextCursor) {
       c.header("Link", `<${url.pathname}?limit=${limit}&before=${nextCursor}>; rel="prev"`);
       c.header("X-Next-Cursor", nextCursor);
     }
-    return c.json({ messages });
+    return c.json({ messages: result });
   }).get("/session/:sessionID/todo", async (c) => {
     const id = c.req.param("sessionID");
     const handle = sessionManager.getSession(id);
@@ -3223,6 +3535,14 @@ function createMessageRoutes(sessionManager) {
       cwd: handle?.spawnCwd ?? handle?.cwd
     });
     return c.json({ todos });
+  }).get("/session/:sessionID/tasks", async (c) => {
+    const id = c.req.param("sessionID");
+    const handle = sessionManager.getSession(id);
+    const tasks = await readSessionTasks({
+      sessionId: id,
+      cwd: handle?.spawnCwd ?? handle?.cwd
+    });
+    return c.json({ tasks });
   }).get("/session/:sessionID/diff", async (c) => {
     const id = c.req.param("sessionID");
     const handle = sessionManager.getSession(id);
@@ -3349,7 +3669,8 @@ init_favorite();
 function createFavoriteRoutes() {
   return new Hono2().get("/global/favorite/skills", async (c) => {
     try {
-      const items = await listFavoriteItems("skill");
+      const type = c.req.query("type");
+      const items = await listFavoriteItems(type);
       return c.json({ success: true, items });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -3421,5 +3742,5 @@ export {
   startServer
 };
 
-//# debugId=EBF0BC5AB0C1AD6964756E2164756E21
-//# sourceMappingURL=chunk-61p1fy8g.js.map
+//# debugId=E926D43305A1379264756E2164756E21
+//# sourceMappingURL=chunk-x1ge840e.js.map