@kodizm/acp 0.5.2 → 0.5.4

package/dist/index.js

@@ -4646,6 +4646,17 @@ function mapAssistantMessage(sessionId, message) {
       if (skillName !== undefined) {
         events.push({ sessionId, type: "skill_activation", skillName, source: "invoked" });
       }
+      const subagentType = extractSubagentType(block);
+      if (subagentType !== undefined) {
+        events.push({
+          sessionId,
+          type: "subagent_spawn",
+          childId: block.id,
+          parentSessionId: sessionId,
+          model: subagentType,
+          tools: []
+        });
+      }
       events.push({
         sessionId,
         type: "tool_call_begin",
@@ -4671,12 +4682,39 @@ function extractSkillName(block) {
   }
   return skill;
 }
+function extractSubagentType(block) {
+  if (block.name !== "Task" && block.name !== "Agent") {
+    return;
+  }
+  const input = block.input;
+  if (typeof input !== "object" || input === null) {
+    return "general-purpose";
+  }
+  const subagentType = input.subagent_type;
+  if (typeof subagentType === "string" && subagentType.length > 0) {
+    return subagentType;
+  }
+  return "general-purpose";
+}
 function mapUserMessage(sessionId, message) {
   const events = [];
   for (const block of message.message.content) {
     if (block.type === "tool_result") {
       const resultText = typeof block.content === "string" ? block.content : block.content.map((c) => c.text).join(`
 `);
+      const subagentUsage = extractTaskToolUsage(resultText);
+      if (subagentUsage !== undefined) {
+        events.push({
+          sessionId,
+          type: "subagent_complete",
+          childId: block.tool_use_id,
+          inputTokens: subagentUsage.totalTokens,
+          outputTokens: 0,
+          cacheReadTokens: 0,
+          cacheCreationTokens: 0,
+          costUsd: 0
+        });
+      }
       events.push({
         sessionId,
         type: "tool_call_end",
@@ -4688,6 +4726,22 @@ function mapUserMessage(sessionId, message) {
   }
   return events;
 }
+function extractTaskToolUsage(resultText) {
+  if (!resultText.includes("agentId:")) {
+    return;
+  }
+  const usageMatch = resultText.match(/<usage>([\s\S]*?)<\/usage>/);
+  if (usageMatch === null) {
+    return;
+  }
+  const totalMatch = usageMatch[1]?.match(/total_tokens:\s*(\d+)/);
+  if (totalMatch === null || totalMatch === undefined) {
+    return;
+  }
+  return {
+    totalTokens: Number.parseInt(totalMatch[1] ?? "0", 10)
+  };
+}
 function mapResult(sessionId, message) {
   const events = [];
   const usage = message.usage;
@@ -4928,6 +4982,17 @@ class ClaudeDriver {
     });
     return { sessionId };
   }
+  async compact(request, emit) {
+    const state = this.sessions.get(request.sessionId);
+    if (state === undefined) {
+      throw new SessionNotFoundError(request.sessionId);
+    }
+    state.pendingManualCompact = true;
+    await this.prompt(request.sessionId, {
+      sessionId: request.sessionId,
+      prompt: [{ type: "text", text: "/compact" }]
+    }, emit);
+  }
   async prompt(sessionId, params, emit) {
     const state = this.sessions.get(sessionId);
     if (state === undefined) {
@@ -5074,7 +5139,8 @@ class ClaudeDriver {
           }
         }
         tracker.observe(message);
-        const events = tracker.rewrite(mapSdkMessage(sessionId, message));
+        const rawEvents = tracker.rewrite(mapSdkMessage(sessionId, message));
+        const events = this.applyManualCompactLatch(state, rawEvents);
         for (const event of events) {
           emit.send(event);
         }
@@ -5271,6 +5337,21 @@ class ClaudeDriver {
     return text.join(`
 `);
   }
+  applyManualCompactLatch(state, events) {
+    if (state.pendingManualCompact !== true) {
+      return events;
+    }
+    return events.map((event) => {
+      if (event.type === "compaction_started") {
+        return { ...event, trigger: "manual" };
+      }
+      if (event.type === "compaction_completed") {
+        state.pendingManualCompact = false;
+        return { ...event, trigger: "manual" };
+      }
+      return event;
+    });
+  }
 }
 var FULL_CAPABILITIES;
 var init_driver = __esm(() => {
@@ -28775,6 +28856,9 @@ var LoadSessionRequestSchema = exports_external.object({
   mcpServers: exports_external.array(McpServerSchema),
   _meta: MetaSchema.optional()
 }).refine(metaCarriesNoCanonicalFields, { message: META_SMUGGLE_MESSAGE, path: ["_meta"] });
+var CompactSessionRequestSchema = exports_external.object({
+  sessionId: exports_external.string().min(1)
+});
 var ForkSessionRequestSchema = exports_external.object({
   sourceSessionId: exports_external.string().min(1),
   cwd: AbsolutePathSchema,
@@ -28839,6 +28923,14 @@ function wireBackendHandlers(server, backend) {
     const validated = validateOrThrow(ForkSessionRequestSchema, params);
     return await backend.forkSession(validated);
   });
+  server.on("session/compact", async (params) => {
+    const validated = validateOrThrow(CompactSessionRequestSchema, params);
+    const emit = {
+      send: (event) => server.notify("sessionUpdate", event)
+    };
+    await backend.compact(validated, emit);
+    return {};
+  });
 }
 function createAcpServer(options) {
   const { transport, backend, debugSink } = options;
@@ -29197,7 +29289,7 @@ async function buildClaudeBackend() {
   const claudePath = process.env.CLAUDE_CODE_PATH ?? "/usr/local/bin/claude";
   const driver = new ClaudeDriver2({
     credentials: pickClaudeCredentials(process.env),
-    agentInfo: { version: "0.5.2" },
+    agentInfo: { version: "0.5.4" },
     sdk: {
       async* query(args) {
         const optsIn = args.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kodizm/acp",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Custom ACP server bridging Claude Code, codex, and opencode CLIs through a single Kodizm-flavored protocol surface.",
   "type": "module",
   "bin": {