@meetopenbot/claude-code 0.1.15 → 0.1.17

package/dist/index.js

@@ -29,13 +29,12 @@ var resolveClaudeConfig = (context) => {
 import { execSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import { query } from "@anthropic-ai/claude-agent-sdk";
 import {
-  creditsErrorMessage,
   llmAuthNotConfiguredMessage,
   resolveByokApiKey,
   resolveCreditsAuthConfig as resolveCreditsAuthConfig2,
-  isCloudMode
+  isCloudMode,
+  textReply as textReply2
 } from "@meetopenbot/plugin-sdk";
 
 // src/credits.ts
@@ -62,6 +61,109 @@ var buildCreditsAnthropicEnv = () => {
 import { threadSession } from "@meetopenbot/plugin-sdk";
 var claudeSession = threadSession("claudeSessionId");
 
+// src/stream.ts
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import {
+  createTextReplyBuffer,
+  creditsErrorMessage,
+  textReply
+} from "@meetopenbot/plugin-sdk";
+var extractText = (content) => {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  const parts = [];
+  for (const block of content) {
+    if (block && typeof block === "object" && block.type === "text") {
+      const text = block.text;
+      if (typeof text === "string" && text) parts.push(text);
+    }
+  }
+  return parts.join("\n");
+};
+var streamEventText = (event) => {
+  if (!event || typeof event !== "object") return "";
+  const delta = event.delta;
+  if (delta?.type === "text_delta" && typeof delta.text === "string") return delta.text;
+  return "";
+};
+var parseToolUse = (block) => {
+  if (!block || typeof block !== "object" || !("type" in block)) return null;
+  const type = block.type;
+  if (type !== "tool_use" && type !== "mcp_tool_use" && type !== "server_tool_use") return null;
+  const { id, name, input, server_name } = block;
+  if (typeof id !== "string" || typeof name !== "string") return null;
+  const title = typeof server_name === "string" ? `${server_name}: ${name}` : name;
+  return { type: "tool_call", id, name: title, input };
+};
+var parseToolResult = (block) => {
+  if (!block || typeof block !== "object" || !("type" in block)) return null;
+  const type = block.type;
+  if (type !== "tool_result" && type !== "mcp_tool_result") return null;
+  const { tool_use_id, content, is_error } = block;
+  if (typeof tool_use_id !== "string") return null;
+  return { type: "tool_result", id: tool_use_id, output: content, error: is_error };
+};
+var classifyClaudeEvent = (message) => {
+  if (message.type === "assistant") {
+    const content = message.message?.content;
+    const hints = [];
+    const text = extractText(content);
+    if (text) hints.push({ type: "text", text });
+    if (Array.isArray(content)) {
+      for (const block of content) {
+        const tool = parseToolUse(block);
+        if (tool) hints.push(tool);
+      }
+    }
+    return hints.length > 0 ? hints : { type: "skip" };
+  }
+  if (message.type === "user") {
+    const content = message.message?.content;
+    if (!Array.isArray(content)) return { type: "skip" };
+    const hints = [];
+    for (const block of content) {
+      const result = parseToolResult(block);
+      if (result) hints.push(result);
+    }
+    return hints.length > 0 ? hints : { type: "skip" };
+  }
+  if (message.type === "stream_event") {
+    const text = streamEventText(message.event);
+    return text ? { type: "delta", text } : { type: "skip" };
+  }
+  return { type: "skip" };
+};
+async function* runClaudeQuery(args) {
+  const { prompt, sdkOptions, resumeId, state, storage } = args;
+  const replies = createTextReplyBuffer({ groupId: "claude-code:tools" });
+  let lastSessionId = resumeId;
+  try {
+    for await (const message of query({ prompt, options: sdkOptions })) {
+      if ("session_id" in message && typeof message.session_id === "string") {
+        lastSessionId = message.session_id;
+      }
+      if (message.type === "result" && message.subtype !== "success") {
+        yield* replies.end();
+        const resultText = "result" in message && typeof message.result === "string" ? message.result : message.subtype;
+        yield textReply(
+          creditsErrorMessage(resultText, {
+            agentName: "Claude",
+            providerLabel: "Anthropic",
+            provider: "anthropic"
+          }) ?? resultText
+        );
+        return;
+      }
+      yield* replies.apply(classifyClaudeEvent(message));
+    }
+    yield* replies.end();
+  } finally {
+    if (lastSessionId && lastSessionId !== resumeId) {
+      await claudeSession.write(state, storage, lastSessionId);
+    }
+  }
+}
+
 // src/system-prompt.ts
 var CLAUDE_CODE_SYSTEM_PROMPT = `
 You are Claude, an AI assistant powered by Anthropic's Claude Agent SDK (Claude Code).
@@ -83,23 +185,16 @@ var findClaudeExecutable = () => {
   }
   return void 0;
 };
-var extractText = (content) => {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  const parts = [];
-  for (const block of content) {
-    if (block && typeof block === "object" && block.type === "text") {
-      const text = block.text;
-      if (typeof text === "string" && text) parts.push(text);
-    }
-  }
-  return parts.join("\n");
-};
-async function runClaudeTurn({ prompt, handlerCtx, context }) {
+async function* runClaudeTurn({
+  prompt,
+  handlerCtx,
+  context
+}) {
   const byok = resolveByokApiKey("anthropic");
   const credits = !byok && isCloudMode() ? resolveCreditsAuthConfig2() : void 0;
   if (!byok && !credits) {
-    return llmAuthNotConfiguredMessage("ANTHROPIC_API_KEY");
+    yield textReply2(llmAuthNotConfiguredMessage("ANTHROPIC_API_KEY"));
+    return;
   }
   const config = resolveClaudeConfig(context);
   const workingDir = handlerCtx.state.channelDetails?.cwd;
@@ -122,30 +217,13 @@ async function runClaudeTurn({ prompt, handlerCtx, context }) {
     ...workingDir ? { cwd: workingDir } : {},
     ...executablePath ? { pathToClaudeCodeExecutable: executablePath } : {}
   };
-  let lastSessionId = resumeId;
-  let text = "";
-  for await (const message of query({ prompt, options: sdkOptions })) {
-    if ("session_id" in message && typeof message.session_id === "string") {
-      lastSessionId = message.session_id;
-    }
-    if (message.type === "assistant") {
-      const next = extractText(message.message?.content);
-      if (next) text = text ? `${text}
-${next}` : next;
-    }
-    if (message.type === "result" && message.subtype !== "success") {
-      const resultText = "result" in message && typeof message.result === "string" ? message.result : message.subtype;
-      return creditsErrorMessage(resultText, {
-        agentName: "Claude",
-        providerLabel: "Anthropic",
-        provider: "anthropic"
-      }) ?? resultText;
-    }
-  }
-  if (lastSessionId && lastSessionId !== resumeId) {
-    await claudeSession.write(handlerCtx.state, context.storage, lastSessionId);
-  }
-  return text.trim();
+  yield* runClaudeQuery({
+    prompt,
+    sdkOptions,
+    resumeId,
+    state: handlerCtx.state,
+    storage: context.storage
+  });
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meetopenbot/claude-code",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "description": "Claude Code plugin for OpenBot",
   "main": "./dist/index.js",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.138",
-    "@meetopenbot/plugin-sdk": "^0.3.0"
+    "@meetopenbot/plugin-sdk": "^0.5.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.1",