@myrialabs/clopen 0.0.8 → 0.1.1

package/frontend/lib/utils/chat/tool-handler.ts

@@ -7,31 +7,44 @@ import type {
   ToolGroup,
   BackgroundBashData
 } from './message-grouper';
+import type { SDKMessageFormatter } from '$shared/types/database/schema';
+import type { SubAgentActivity } from '$shared/types/messaging';
 
-// Extended ToolUse with embedded result
+// Extended ToolUse with embedded result and metadata
 export interface ToolUseWithResult {
   type: 'tool_use';
   id: string;
   name: string;
   input: any;
   $result?: any;
+  $subMessages?: SubAgentActivity[];
+  metadata?: Record<string, unknown>;
 }
 
 // Process a tool message with embedded results
 export function processToolMessage(
   message: ProcessedMessage,
   toolUseMap: Map<string, ToolGroup>,
-  backgroundBashMap: Map<string, BackgroundBashData>
+  backgroundBashMap: Map<string, BackgroundBashData>,
+  subAgentMap: Map<string, SDKMessageFormatter[]>
 ): ProcessedMessage {
   const messageAny = message as any;
   const content = messageAny.message?.content ?
     (Array.isArray(messageAny.message.content) ? messageAny.message.content : [messageAny.message.content]) : [];
 
+  // Check if parent message is marked as interrupted
+  const isInterrupted = !!(messageAny.metadata?.interrupted);
+
   // Create modified content with embedded tool_result in tool_use objects
   const modifiedContent = content
     .map((item: any): any => {
       if (typeof item === 'object' && item && 'type' in item && item.type === 'tool_use') {
-        return processToolUse(item, toolUseMap, backgroundBashMap);
+        const processed = processToolUse(item, toolUseMap, backgroundBashMap, subAgentMap);
+        // Propagate message-level interrupted flag to ALL tool_use blocks
+        if (processed && isInterrupted) {
+          return { ...processed, metadata: { ...processed.metadata, interrupted: true } };
+        }
+        return processed;
       }
       return item;
     })
@@ -51,7 +64,8 @@ export function processToolMessage(
 function processToolUse(
   item: any,
   toolUseMap: Map<string, ToolGroup>,
-  backgroundBashMap: Map<string, BackgroundBashData>
+  backgroundBashMap: Map<string, BackgroundBashData>,
+  subAgentMap: Map<string, SDKMessageFormatter[]>
 ): ToolUseWithResult | null {
   // Hide certain tools completely
   if (shouldHideTool(item.name)) {
@@ -66,6 +80,11 @@ function processToolUse(
     return handleBackgroundBash(item, toolUseMap, backgroundBashMap);
   }
 
+  // Special handling for Agent tool — embed sub-agent activities
+  if (item.name === 'Agent' && item.id && subAgentMap.has(item.id)) {
+    return handleAgentTool(item, toolUseMap, subAgentMap);
+  }
+
   // Regular tool handling
   if (item.id && item.name && shouldEmbedResult(item.name) && toolUseMap.has(item.id)) {
     return handleRegularTool(item, toolUseMap);
@@ -74,6 +93,78 @@ function processToolUse(
   return item;
 }
 
+// Handle Agent tool — process sub-agent messages into activities
+function handleAgentTool(
+  item: any,
+  toolUseMap: Map<string, ToolGroup>,
+  subAgentMap: Map<string, SDKMessageFormatter[]>
+): ToolUseWithResult {
+  const subMessages = subAgentMap.get(item.id) || [];
+  const activities = processSubAgentMessages(subMessages);
+
+  // Also embed the $result if available
+  let result: any = undefined;
+  if (item.id && toolUseMap.has(item.id)) {
+    const group = toolUseMap.get(item.id);
+    if (group?.toolResultMessage) {
+      const resultMessage = group.toolResultMessage as any;
+      const resultContent = resultMessage.message ?
+        (Array.isArray(resultMessage.message.content) ? resultMessage.message.content : [resultMessage.message.content]) : [];
+      result = findToolResult(resultContent, item.id);
+    }
+  }
+
+  return {
+    ...item,
+    ...(result ? { $result: result } : {}),
+    ...(activities.length > 0 ? { $subMessages: activities } : {})
+  } as ToolUseWithResult;
+}
+
+// Process sub-agent messages into a flat activity list
+function processSubAgentMessages(messages: SDKMessageFormatter[]): SubAgentActivity[] {
+  const activities: SubAgentActivity[] = [];
+  const toolResultMap = new Map<string, any>();
+
+  // First pass: collect all tool_results from user messages
+  for (const msg of messages) {
+    if (msg.type === 'user' && 'message' in msg && msg.message?.content) {
+      const content = Array.isArray(msg.message.content) ? msg.message.content : [msg.message.content];
+      for (const item of content) {
+        if (typeof item === 'object' && item && item.type === 'tool_result' && item.tool_use_id) {
+          toolResultMap.set(item.tool_use_id, item);
+        }
+      }
+    }
+  }
+
+  // Second pass: build activity list from assistant messages
+  for (const msg of messages) {
+    if (msg.type === 'assistant' && 'message' in msg && msg.message?.content) {
+      const content = Array.isArray(msg.message.content) ? msg.message.content : [msg.message.content];
+      for (const item of content) {
+        if (typeof item === 'object' && item) {
+          if (item.type === 'tool_use') {
+            activities.push({
+              type: 'tool_use',
+              toolName: item.name,
+              toolInput: item.input,
+              toolResult: toolResultMap.get(item.id) || undefined
+            });
+          } else if (item.type === 'text' && item.text?.trim()) {
+            activities.push({
+              type: 'text',
+              text: item.text
+            });
+          }
+        }
+      }
+    }
+  }
+
+  return activities;
+}
+
 // Handle background bash commands
 function handleBackgroundBash(
   item: any,
@@ -158,4 +249,4 @@ function findToolResult(
     'tool_use_id' in resultItem &&
     resultItem.tool_use_id === toolUseId
   );
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myrialabs/clopen",
-  "version": "0.0.8",
+  "version": "0.1.1",
   "description": "All-in-one web workspace for Claude Code & OpenCode — chat, terminal, git, browser preview, checkpoints, and real-time collaboration",
   "author": "Myria Labs",
   "license": "MIT",
@@ -74,14 +74,14 @@
     "vite": "^7.0.4"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.7",
-    "@anthropic-ai/sdk": "^0.62.0",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.63",
+    "@anthropic-ai/sdk": "^0.78.0",
     "@elysiajs/cors": "^1.4.0",
     "@iconify-json/lucide": "^1.2.57",
     "@iconify-json/material-icon-theme": "^1.2.16",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@monaco-editor/loader": "^1.5.0",
-    "@opencode-ai/sdk": "^1.2.4",
+    "@opencode-ai/sdk": "^1.2.15",
     "@tailwindcss/typography": "^0.5.16",
     "@types/marked": "^5.0.2",
     "@types/node": "^24.0.14",

package/shared/constants/engines.ts

@@ -52,7 +52,7 @@ export const CLAUDE_CODE_MODELS: EngineModel[] = [
 		id: 'claude-code:sonnet',
 		engine: 'claude-code',
 		modelId: 'sonnet',
-		name: 'Sonnet 4.5',
+		name: 'Sonnet 4.6',
 		provider: 'anthropic',
 		description: 'High-performance model with excellent coding capabilities and extended thinking',
 		capabilities: ['Reasoning', 'Attachments'],

package/shared/types/database/schema.ts

@@ -69,6 +69,7 @@ export type SDKMessageFormatter = EngineSDKMessage & {
 		parent_message_id?: string | null; // Git-like parent pointer
 		engine?: string; // Engine type that produced this message (claude-code, opencode)
 		reasoning?: boolean; // Whether this message is a reasoning/thinking message
+		interrupted?: boolean; // Whether the stream ended before all tools got results
 	};
 };
 

package/shared/types/messaging/index.ts

@@ -65,6 +65,7 @@ import type { SDKUserMessage as _SDKUserMessage } from '@anthropic-ai/claude-age
 export type EngineSDKMessage = SDKMessage & {
   metadata?: {
     reasoning?: boolean;
+    interrupted?: boolean;
   };
 };
 
@@ -113,7 +114,7 @@ export type {
   ExitPlanModeToolInput,
   GlobToolInput,
   GrepToolInput,
-  KillShellToolInput,
+  TaskStopToolInput,
   ListMcpResourcesToolInput,
   NotebookEditToolInput,
   ReadMcpResourceToolInput,
@@ -123,30 +124,31 @@ export type {
   WebFetchToolInput,
   WebSearchToolInput,
   WriteToolInput,
+  AskUserQuestionToolInput,
+  ConfigToolInput,
+  EnterWorktreeToolInput,
+  AgentToolInput,
+  EnterPlanModeToolInput,
+  SubAgentActivity,
   ToolInput,
 
-  // Tool output types
+  // Tool output types (from SDK)
   TaskOutput,
+  AskUserQuestionOutput,
   BashOutput,
-  BashOutputToolOutput,
+  ConfigOutput,
+  EnterWorktreeOutput,
   EditOutput,
-  TextFileOutput,
-  ImageFileOutput,
-  PDFFileOutput,
-  NotebookFileOutput,
+  ExitPlanModeOutput,
   ReadOutput,
+  WriteOutput,
   GlobOutput,
   GrepOutput,
-  GrepContentOutput,
-  GrepFilesOutput,
-  GrepCountOutput,
   WebFetchOutput,
   WebSearchOutput,
-  WriteOutput,
   NotebookEditOutput,
   TodoWriteOutput,
-  ExitPlanModeOutput,
-  KillShellOutput,
+  TaskStopOutput,
   ListMcpResourcesOutput,
   ReadMcpResourceOutput,
   ToolOutput,