@ai-support-agent/cli 0.0.5-beta.4 → 0.0.5

package/dist/commands/api-chat-executor.js

@@ -3,30 +3,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelApiChatProcess = cancelApiChatProcess;
+exports._getRunningApiChats = _getRunningApiChats;
 exports.executeApiChatCommand = executeApiChatCommand;
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("../constants");
 const logger_1 = require("../logger");
+const types_1 = require("../types");
 const utils_1 = require("../utils");
+const process_manager_1 = require("./process-manager");
 const shared_chat_utils_1 = require("./shared-chat-utils");
+/** 実行中の API チャットを commandId で管理 */
+const processManager = new process_manager_1.ProcessManager();
+/**
+ * 実行中の API チャットプロセスをキャンセルする
+ * @returns true: プロセスが見つかりキャンセルした, false: プロセスが見つからなかった
+ */
+function cancelApiChatProcess(commandId) {
+    return processManager.cancel(commandId);
+}
+/** テスト用: runningApiChats の内容を取得 */
+function _getRunningApiChats() {
+    return processManager._getRunning();
+}
 /**
  * Anthropic API を直接呼び出してチャットメッセージを処理する
  * エージェントが持つ ANTHROPIC_API_KEY で Claude を呼び出す
  */
 async function executeApiChatCommand(payload, commandId, client, config, agentId) {
     if (!agentId) {
-        return { success: false, error: constants_1.ERR_AGENT_ID_REQUIRED };
+        return (0, types_1.errorResult)(constants_1.ERR_AGENT_ID_REQUIRED);
     }
     const message = (0, utils_1.parseString)(payload.message);
     if (!message) {
-        return { success: false, error: constants_1.ERR_MESSAGE_REQUIRED };
+        return (0, types_1.errorResult)(constants_1.ERR_MESSAGE_REQUIRED);
     }
     const apiKey = process.env.ANTHROPIC_API_KEY;
     if (!apiKey) {
-        return {
-            success: false,
-            error: constants_1.ERR_ANTHROPIC_API_KEY_NOT_SET,
-        };
+        return (0, types_1.errorResult)(constants_1.ERR_ANTHROPIC_API_KEY_NOT_SET);
     }
     logger_1.logger.info(`[api-chat] Starting API chat command [${commandId}]: message="${(0, utils_1.truncateString)(message, constants_1.LOG_MESSAGE_LIMIT)}"`);
     const { sendChunk, getChunkIndex } = (0, shared_chat_utils_1.createChunkSender)(commandId, client, agentId, 'api-chat');
@@ -35,7 +49,15 @@ async function executeApiChatCommand(payload, commandId, client, config, agentId
         const maxTokens = config?.claudeCodeConfig?.maxTokens ?? constants_1.DEFAULT_MAX_TOKENS;
         const systemPrompt = config?.claudeCodeConfig?.systemPrompt;
         const historyMessages = (0, shared_chat_utils_1.parseHistory)(payload.history);
-        const result = await callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, historyMessages);
+        const abortController = new AbortController();
+        processManager.register(commandId, { cancel: () => abortController.abort() });
+        let result;
+        try {
+            result = await callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, historyMessages, abortController.signal);
+        }
+        finally {
+            processManager.remove(commandId);
+        }
         logger_1.logger.info(`[api-chat] API chat command completed [${commandId}]: output=${result.text.length} chars, ${getChunkIndex()} chunks sent, tokens: in=${result.usage.inputTokens} out=${result.usage.outputTokens}`);
         // done チャンクに usage 情報を含める
         const doneContent = JSON.stringify({
@@ -47,19 +69,16 @@ async function executeApiChatCommand(payload, commandId, client, config, agentId
             },
         });
         await sendChunk('done', doneContent);
-        return { success: true, data: result.text };
+        return (0, types_1.successResult)(result.text);
     }
     catch (error) {
-        const errorMessage = (0, utils_1.getErrorMessage)(error);
-        logger_1.logger.error(`[api-chat] API chat command failed [${commandId}]: ${errorMessage}`);
-        await sendChunk('error', errorMessage);
-        return { success: false, error: errorMessage };
+        return (0, shared_chat_utils_1.handleChatError)(error, commandId, 'api-chat', sendChunk);
     }
 }
 /**
  * Anthropic Messages API を呼び出し、ストリーミングレスポンスを処理する
  */
-async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, history) {
+async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, history, abortSignal) {
     const messages = [
         ...(history ?? []).map((msg) => ({
             role: msg.role === 'assistant' ? 'assistant' : 'user',
@@ -84,50 +103,62 @@ async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt,
         },
         responseType: 'stream',
         timeout: constants_1.CHAT_TIMEOUT,
+        ...(abortSignal ? { signal: abortSignal } : {}),
     });
     return new Promise((resolve, reject) => {
         let fullOutput = '';
         let buffer = '';
         const usage = { inputTokens: 0, outputTokens: 0 };
         const stream = response.data;
+        // アクティビティベースタイムアウト: ストリームデータ受信が途絶えたら中止
+        let activityTimer;
+        const resetActivityTimer = () => {
+            if (activityTimer)
+                clearTimeout(activityTimer);
+            activityTimer = setTimeout(() => {
+                logger_1.logger.warn(`[api-chat] Stream timed out after ${constants_1.CHAT_TIMEOUT / 1000}s of inactivity`);
+                stream.destroy(new Error(`Stream timed out after ${constants_1.CHAT_TIMEOUT / 1000}s of inactivity`));
+            }, constants_1.CHAT_TIMEOUT);
+        };
+        resetActivityTimer();
         stream.on('data', (chunk) => {
+            resetActivityTimer();
             buffer += chunk.toString();
             const lines = buffer.split('\n');
             // Keep the last incomplete line in the buffer
             buffer = lines.pop() ?? '';
             for (const line of lines) {
-                if (!line.startsWith('data: '))
+                if (!line.startsWith(constants_1.SSE_PREFIX))
                     continue;
-                const data = line.slice(6).trim();
-                if (data === '[DONE]')
+                const data = line.slice(constants_1.SSE_PREFIX.length).trim();
+                if (data === constants_1.SSE_DONE)
                     continue;
                 try {
                     const event = JSON.parse(data);
-                    if (event.type === 'message_start') {
+                    if (event.type === constants_1.SSE_EVENT.MESSAGE_START) {
                         // message_start イベントから input_tokens を取得
-                        const msg = event.message;
-                        const msgUsage = msg?.usage;
-                        if (typeof msgUsage?.input_tokens === 'number') {
-                            usage.inputTokens = msgUsage.input_tokens;
+                        const inputTokens = event.message?.usage?.input_tokens;
+                        if (typeof inputTokens === 'number') {
+                            usage.inputTokens = inputTokens;
                         }
                     }
-                    else if (event.type === 'message_delta') {
+                    else if (event.type === constants_1.SSE_EVENT.MESSAGE_DELTA) {
                         // message_delta イベントから output_tokens を取得
-                        const deltaUsage = event.usage;
-                        if (typeof deltaUsage?.output_tokens === 'number') {
-                            usage.outputTokens = deltaUsage.output_tokens;
+                        const outputTokens = event.usage?.output_tokens;
+                        if (typeof outputTokens === 'number') {
+                            usage.outputTokens = outputTokens;
                         }
                     }
-                    else if (event.type === 'content_block_delta') {
+                    else if (event.type === constants_1.SSE_EVENT.CONTENT_BLOCK_DELTA) {
                         const delta = event.delta;
-                        if (delta?.type === 'text_delta' && typeof delta.text === 'string') {
+                        if (delta?.type === constants_1.ANTHROPIC_CONTENT_TYPE.TEXT_DELTA && typeof delta.text === 'string') {
                             fullOutput += delta.text;
                             void sendChunk('delta', delta.text);
                         }
                     }
-                    else if (event.type === 'content_block_start') {
+                    else if (event.type === constants_1.SSE_EVENT.CONTENT_BLOCK_START) {
                         const contentBlock = event.content_block;
-                        if (contentBlock?.type === 'tool_use') {
+                        if (contentBlock?.type === constants_1.ANTHROPIC_CONTENT_TYPE.TOOL_USE) {
                             const toolName = contentBlock.name ?? 'unknown';
                             logger_1.logger.info(`[api-chat] Tool use requested: ${toolName} (not supported in API mode)`);
                             void sendChunk('delta', `\n[Tool call: ${toolName} — tool use is not supported in API chat mode]\n`);
@@ -140,9 +171,13 @@ async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt,
             }
         });
         stream.on('end', () => {
+            if (activityTimer)
+                clearTimeout(activityTimer);
             resolve({ text: fullOutput, usage });
         });
         stream.on('error', (error) => {
+            if (activityTimer)
+                clearTimeout(activityTimer);
             reject(error);
         });
     });

package/dist/commands/api-chat-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-chat-executor.js","sourceRoot":"","sources":["../../src/commands/api-chat-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-chat-executor.js","sourceRoot":"","sources":["../../src/commands/api-chat-executor.ts"],"names":[],"mappings":"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"}

package/dist/commands/chat-executor.d.ts

@@ -1,6 +1,15 @@
 import { ApiClient } from '../api-client';
-import type { AgentChatMode, AgentServerConfig, ChatPayload, CommandResult, ProjectConfigResponse } from '../types';
-export { buildClaudeArgs, buildCleanEnv } from './claude-code-runner';
+import { type AgentChatMode, type AgentServerConfig, type ChatFileInfo, type ChatPayload, type CommandResult, type ProjectConfigResponse } from '../types';
+export { buildClaudeArgs, buildCleanEnv, _resetCleanEnvCache } from './claude-code-runner';
+/**
+ * 実行中のチャットプロセスをキャンセルする
+ * @returns true: プロセスが見つかりキルした, false: プロセスが見つからなかった
+ */
+export declare function cancelChatProcess(commandId: string): boolean;
+/** テスト用: runningProcesses の内容を取得 */
+export declare function _getRunningProcesses(): Map<string, {
+    cancel: () => void;
+}>;
 /**
  * エージェントチャットモードに応じてチャットメッセージを処理する
  * - claude_code: Claude Code CLI を使用（デフォルト）
@@ -9,4 +18,6 @@ export { buildClaudeArgs, buildCleanEnv } from './claude-code-runner';
  * activeChatMode はサーバーの chatMode ではなく、エージェント内部の実行方式を指す
  */
 export declare function executeChatCommand(payload: ChatPayload, commandId: string, client: ApiClient, serverConfig?: AgentServerConfig, activeChatMode?: AgentChatMode, agentId?: string, projectDir?: string, projectConfig?: ProjectConfigResponse, mcpConfigPath?: string): Promise<CommandResult>;
+export declare function buildConversationFileNotice(conversationFiles: ChatFileInfo[]): string;
+export declare function buildMetadataNotice(conversationId: string | null, commandId: string, projectCode: string | undefined, mcpConfigPath?: string): string;
 //# sourceMappingURL=chat-executor.d.ts.map

package/dist/commands/chat-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAIzC,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAiB,WAAW,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAUlI,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAErE;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,YAAY,CAAC,EAAE,iBAAiB,EAChC,cAAc,CAAC,EAAE,aAAa,EAC9B,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,aAAa,CAAC,CAcxB"}
+{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAIzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAe,KAAK,qBAAqB,EAAiB,MAAM,UAAU,CAAA;AAW1M,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1F;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,oCAAoC;AACpC,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAE1E;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,YAAY,CAAC,EAAE,iBAAiB,EAChC,cAAc,CAAC,EAAE,aAAa,EAC9B,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,aAAa,CAAC,CAcxB;AAwID,wBAAgB,2BAA2B,CAAC,iBAAiB,EAAE,YAAY,EAAE,GAAG,MAAM,CAMrF;AAED,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAGR"}

package/dist/commands/chat-executor.js

@@ -1,20 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCleanEnv = exports.buildClaudeArgs = void 0;
+exports._resetCleanEnvCache = exports.buildCleanEnv = exports.buildClaudeArgs = void 0;
+exports.cancelChatProcess = cancelChatProcess;
+exports._getRunningProcesses = _getRunningProcesses;
 exports.executeChatCommand = executeChatCommand;
+exports.buildConversationFileNotice = buildConversationFileNotice;
+exports.buildMetadataNotice = buildMetadataNotice;
 const aws_credential_builder_1 = require("../aws-credential-builder");
 const constants_1 = require("../constants");
 const logger_1 = require("../logger");
+const types_1 = require("../types");
 const utils_1 = require("../utils");
 const project_dir_1 = require("../project-dir");
 const api_chat_executor_1 = require("./api-chat-executor");
 const claude_code_runner_1 = require("./claude-code-runner");
 const file_transfer_1 = require("./file-transfer");
+const process_manager_1 = require("./process-manager");
 const shared_chat_utils_1 = require("./shared-chat-utils");
 // Re-export for backward compatibility with existing consumers
 var claude_code_runner_2 = require("./claude-code-runner");
 Object.defineProperty(exports, "buildClaudeArgs", { enumerable: true, get: function () { return claude_code_runner_2.buildClaudeArgs; } });
 Object.defineProperty(exports, "buildCleanEnv", { enumerable: true, get: function () { return claude_code_runner_2.buildCleanEnv; } });
+Object.defineProperty(exports, "_resetCleanEnvCache", { enumerable: true, get: function () { return claude_code_runner_2._resetCleanEnvCache; } });
+/** 実行中のチャットプロセスを commandId で管理 */
+const processManager = new process_manager_1.ProcessManager();
+/**
+ * 実行中のチャットプロセスをキャンセルする
+ * @returns true: プロセスが見つかりキルした, false: プロセスが見つからなかった
+ */
+function cancelChatProcess(commandId) {
+    return processManager.cancel(commandId);
+}
+/** テスト用: runningProcesses の内容を取得 */
+function _getRunningProcesses() {
+    return processManager._getRunning();
+}
 /**
  * エージェントチャットモードに応じてチャットメッセージを処理する
  * - claude_code: Claude Code CLI を使用（デフォルト）
@@ -24,7 +44,7 @@ Object.defineProperty(exports, "buildCleanEnv", { enumerable: true, get: functio
  */
 async function executeChatCommand(payload, commandId, client, serverConfig, activeChatMode, agentId, projectDir, projectConfig, mcpConfigPath) {
     if (!agentId) {
-        return { success: false, error: constants_1.ERR_AGENT_ID_REQUIRED };
+        return (0, types_1.errorResult)(constants_1.ERR_AGENT_ID_REQUIRED);
     }
     const mode = activeChatMode ?? 'claude_code';
     switch (mode) {
@@ -43,7 +63,7 @@ async function executeChatCommand(payload, commandId, client, serverConfig, acti
 async function executeClaudeCodeChat(payload, commandId, client, agentId, serverConfig, projectDir, projectConfig, mcpConfigPath) {
     const message = (0, utils_1.parseString)(payload.message);
     if (!message) {
-        return { success: false, error: constants_1.ERR_MESSAGE_REQUIRED };
+        return (0, types_1.errorResult)(constants_1.ERR_MESSAGE_REQUIRED);
     }
     logger_1.logger.info(`[chat] Starting chat command [${commandId}]: message="${(0, utils_1.truncateString)(message, constants_1.LOG_MESSAGE_LIMIT)}"`);
     const { sendChunk, getChunkIndex } = (0, shared_chat_utils_1.createChunkSender)(commandId, client, agentId, 'chat', { debugLog: true });
@@ -93,14 +113,17 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
                 await sendChunk('delta', `⚠️ ${downloadResult.failedCount}件のファイルのダウンロードに失敗しました\n\n`);
             }
         }
+        // 会話全体のファイルリファレンスを埋め込み（MCPツール経由で読み取り可能）
+        const conversationFiles = (0, file_transfer_1.parseConversationFiles)(payload.conversationFiles);
+        const conversationFileNotice = buildConversationFileNotice(conversationFiles);
+        if (conversationFiles.length > 0) {
+            logger_1.logger.info(`[chat] ${conversationFiles.length} conversation file references embedded for command [${commandId}]`);
+        }
         // 会話履歴をメッセージに埋め込む（Claude Code CLI用）
         const history = (0, shared_chat_utils_1.parseHistory)(payload.history);
         // file_upload ツールに必要なメタデータをメッセージに付加
-        let metadataNotice = '';
-        if (conversationId && mcpConfigPath) {
-            metadataNotice = `\n\n<message_metadata>\nconversationId: ${conversationId}\nmessageId: ${commandId}\nprojectCode: ${projectCode ?? ''}\n</message_metadata>`;
-        }
-        const messageWithHistory = (0, shared_chat_utils_1.formatHistoryForClaudeCode)(history, message + filePathsNotice + metadataNotice);
+        const metadataNotice = buildMetadataNotice(conversationId, commandId, projectCode, mcpConfigPath);
+        const messageWithHistory = (0, shared_chat_utils_1.formatHistoryForClaudeCode)(history, message + filePathsNotice + conversationFileNotice + metadataNotice);
         const logDetails = [
             allowedTools?.length ? `allowedTools: ${allowedTools.join(', ')}` : '(no allowedTools)',
             addDirs?.length ? `addDirs: ${addDirs.join(', ')}` : null,
@@ -109,10 +132,30 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
             mcpConfigPath ? 'MCP config' : null,
             history.length > 0 ? `${history.length} history messages` : null,
             chatFiles.length > 0 ? `${chatFiles.length} attached files` : null,
+            conversationFiles.length > 0 ? `${conversationFiles.length} conversation files` : null,
         ].filter(Boolean).join(', ');
         logger_1.logger.debug(`[chat] Spawning claude CLI for command [${commandId}]: ${logDetails}`);
         logger_1.logger.debug(`[chat] serverConfig.claudeCodeConfig: ${JSON.stringify(serverConfig?.claudeCodeConfig ?? null)}`);
-        const result = await (0, claude_code_runner_1.runClaudeCode)(messageWithHistory, sendChunk, allowedTools, addDirs, locale, awsEnv, mcpConfigPath, projectDir, systemPrompt);
+        const handle = (0, claude_code_runner_1.runClaudeCode)({
+            message: messageWithHistory,
+            sendChunk,
+            allowedTools,
+            addDirs,
+            locale,
+            awsEnv,
+            mcpConfigPath,
+            cwd: projectDir,
+            systemPrompt,
+        });
+        // プロセスを管理 Map に登録
+        processManager.register(commandId, handle);
+        let result;
+        try {
+            result = await handle.result;
+        }
+        finally {
+            processManager.remove(commandId);
+        }
         logger_1.logger.info(`[chat] Chat command completed [${commandId}]: output=${result.text.length} chars, ${getChunkIndex()} chunks sent, duration=${result.metadata.durationMs}ms`);
         // 完了チャンクを送信（metadata を含める）
         const doneContent = JSON.stringify({
@@ -122,15 +165,23 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
         await sendChunk('done', doneContent);
         // ダウンロードした一時ファイルをクリーンアップ
         cleanupDownloads?.();
-        return { success: true, data: result.text };
+        return (0, types_1.successResult)(result.text);
     }
     catch (error) {
-        const errorMessage = (0, utils_1.getErrorMessage)(error);
-        logger_1.logger.error(`[chat] Chat command failed [${commandId}]: ${errorMessage}`);
-        await sendChunk('error', errorMessage);
-        return { success: false, error: errorMessage };
+        return (0, shared_chat_utils_1.handleChatError)(error, commandId, 'chat', sendChunk);
     }
 }
+function buildConversationFileNotice(conversationFiles) {
+    if (conversationFiles.length === 0)
+        return '';
+    const fileList = conversationFiles.map((f) => `- fileId: ${f.fileId}, s3Key: ${f.s3Key}, filename: ${f.filename} (${f.contentType}, ${f.fileSize} bytes)`).join('\n');
+    return `\n\n<conversation_files>\nFiles shared in this conversation. Use read_conversation_file tool to read their contents.\n${fileList}\n</conversation_files>`;
+}
+function buildMetadataNotice(conversationId, commandId, projectCode, mcpConfigPath) {
+    if (!conversationId || !mcpConfigPath)
+        return '';
+    return `\n\n<message_metadata>\nconversationId: ${conversationId}\nmessageId: ${commandId}\nprojectCode: ${projectCode ?? ''}\n</message_metadata>`;
+}
 async function sendAwsCredentialNotices(awsResult, projectCode, sendChunk) {
     if (awsResult.errors.length > 0) {
         const notice = `⚠️ ${awsResult.errors.join('\n')}\n\n`;

package/dist/commands/chat-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"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"}

package/dist/commands/claude-code-runner.d.ts

@@ -9,9 +9,40 @@ export interface ClaudeCodeResult {
         durationMs: number;
     };
 }
-/** CLAUDECODE / CLAUDE_CODE_* 環境変数を除外した env を構築
- *  ただし CLAUDE_CODE_OAUTH_TOKEN は認証に必要なため保持する */
+/** stream-json の assistant/user メッセージ内のコンテンツブロック */
+export interface StreamJsonContentBlock {
+    type: 'text' | 'tool_use' | 'tool_result' | 'tool_reference';
+    text?: string;
+    name?: string;
+    id?: string;
+    input?: Record<string, unknown>;
+    tool_use_id?: string;
+    /** 組み込みツールでは string、MCP ツールでは {type, text}[] の配列 */
+    content?: string | Array<{
+        type: string;
+        text?: string;
+    }>;
+}
+/** stream-json の MCP サーバー接続情報 */
+export interface StreamJsonMcpServer {
+    name: string;
+    status: string;
+    error?: string;
+}
+/** stream-json の1行（NDJSON）の型定義 */
+export interface StreamJsonLine {
+    type: string;
+    subtype?: string;
+    message?: {
+        content?: StreamJsonContentBlock[];
+    };
+    result?: string;
+    tools?: string[];
+    mcp_servers?: StreamJsonMcpServer[];
+}
 export declare function buildCleanEnv(): Record<string, string>;
+/** テスト用のキャッシュリセット */
+export declare function _resetCleanEnvCache(): void;
 /** Claude CLI の引数配列を構築 */
 export declare function buildClaudeArgs(message: string, options?: {
     allowedTools?: string[];
@@ -20,10 +51,28 @@ export declare function buildClaudeArgs(message: string, options?: {
     mcpConfigPath?: string;
     systemPrompt?: string;
 }): string[];
+/** Claude Code CLI の実行ハンドル（プロセス管理用） */
+export interface ClaudeCodeHandle {
+    result: Promise<ClaudeCodeResult>;
+    cancel: () => void;
+}
+/** runClaudeCode のオプション */
+export interface RunClaudeCodeOptions {
+    message: string;
+    sendChunk: (type: ChatChunkType, content: string) => Promise<void>;
+    allowedTools?: string[];
+    addDirs?: string[];
+    locale?: string;
+    awsEnv?: Record<string, string>;
+    mcpConfigPath?: string;
+    cwd?: string;
+    systemPrompt?: string;
+}
 /**
  * Claude Code CLI をサブプロセスとして実行し、出力をストリーミングで返す
+ * ClaudeCodeHandle を返す: result Promise と kill 関数
  */
-export declare function runClaudeCode(message: string, sendChunk: (type: ChatChunkType, content: string) => Promise<void>, allowedTools?: string[], addDirs?: string[], locale?: string, awsEnv?: Record<string, string>, mcpConfigPath?: string, cwd?: string, systemPrompt?: string): Promise<ClaudeCodeResult>;
+export declare function runClaudeCode(options: RunClaudeCodeOptions): ClaudeCodeHandle;
 /**
  * stream-json の NDJSON 1行をパースし、テキストやツール呼び出し情報を処理する
  * sendChunk は fire-and-forget で呼び出される（同期的に状態を返すため）
@@ -33,6 +82,7 @@ export declare function runClaudeCode(message: string, sendChunk: (type: ChatChu
 export declare function processStreamJsonLine(line: string, sendChunk: (type: ChatChunkType, content: string) => Promise<void>, pid: number, state: {
     sentTextLength: number;
     pendingFileUploadIds?: Set<string>;
+    pendingToolNames?: Map<string, string>;
 }): {
     newSentTextLength: number;
     text?: string;

package/dist/commands/claude-code-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAmCD;gDACgD;AAChD,wBAAgB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOtD;AAED,0BAA0B;AAC1B,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GACA,MAAM,EAAE,CA6CV;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAClE,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,aAAa,CAAC,EAAE,MAAM,EACtB,GAAG,CAAC,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAiG3B;AAKD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAClE,GAAG,EAAE,MAAM,EACX,KAAK,EAAE;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACpE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAiF9C;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG;IAC3G,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;CACjB,GAAG,IAAI,CA+BP"}
+{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"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"}