@townco/ui 0.1.28 → 0.1.30

package/dist/core/hooks/use-chat-messages.d.ts

@@ -16,6 +16,7 @@ export declare function useChatMessages(client: AcpClient | null): {
             title: string;
             kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "switch_mode" | "other";
             status: "pending" | "in_progress" | "completed" | "failed";
+            contentPosition?: number | undefined;
             locations?: {
                 path: string;
                 line?: number | null | undefined;

package/dist/core/hooks/use-chat-session.d.ts

@@ -3,7 +3,7 @@ import type { AcpClient } from "../../sdk/client/index.js";
  * Hook for managing chat session lifecycle
  */
 export declare function useChatSession(client: AcpClient | null, initialSessionId?: string | null): {
-    connectionStatus: "error" | "connecting" | "connected" | "disconnected";
+    connectionStatus: "error" | "disconnected" | "connecting" | "connected";
     sessionId: string | null;
     connect: () => Promise<void>;
     loadSession: (sessionIdToLoad: string) => Promise<void>;

package/dist/core/hooks/use-tool-calls.d.ts

@@ -14,6 +14,7 @@ export declare function useToolCalls(client: AcpClient | null): {
         title: string;
         kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "switch_mode" | "other";
         status: "pending" | "in_progress" | "completed" | "failed";
+        contentPosition?: number | undefined;
         locations?: {
             path: string;
             line?: number | null | undefined;

package/dist/core/schemas/chat.d.ts

@@ -38,6 +38,7 @@ export declare const DisplayMessage: z.ZodObject<{
             completed: "completed";
             failed: "failed";
         }>;
+        contentPosition: z.ZodOptional<z.ZodNumber>;
         locations: z.ZodOptional<z.ZodArray<z.ZodObject<{
             path: z.ZodString;
             line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -133,6 +134,7 @@ export declare const ChatSessionState: z.ZodObject<{
                 completed: "completed";
                 failed: "failed";
             }>;
+            contentPosition: z.ZodOptional<z.ZodNumber>;
             locations: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 path: z.ZodString;
                 line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -191,8 +193,8 @@ export type ChatSessionState = z.infer<typeof ChatSessionState>;
  */
 export declare const ConnectionStatus: z.ZodEnum<{
     error: "error";
+    disconnected: "disconnected";
     connecting: "connecting";
     connected: "connected";
-    disconnected: "disconnected";
 }>;
 export type ConnectionStatus = z.infer<typeof ConnectionStatus>;

package/dist/core/schemas/tool-call.d.ts

@@ -89,6 +89,7 @@ export declare const ToolCallSchema: z.ZodObject<{
         completed: "completed";
         failed: "failed";
     }>;
+    contentPosition: z.ZodOptional<z.ZodNumber>;
     locations: z.ZodOptional<z.ZodArray<z.ZodObject<{
         path: z.ZodString;
         line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;

package/dist/core/schemas/tool-call.js

@@ -79,6 +79,8 @@ export const ToolCallSchema = z.object({
     kind: ToolCallKindSchema,
     /** Current execution status */
     status: ToolCallStatusSchema,
+    /** Position in the message content where this tool call was invoked (character index) */
+    contentPosition: z.number().optional(),
     /** Affected file paths with optional line numbers */
     locations: z.array(FileLocationSchema).optional(),
     /** Raw parameters passed to the tool */

package/dist/core/store/chat-store.js

@@ -162,9 +162,18 @@ export const useChatStore = create((set) => ({
         const lastAssistantMsg = messages[lastAssistantIndex];
         if (!lastAssistantMsg)
             return state;
+        // Track the content position where this tool call was invoked
+        const contentPosition = lastAssistantMsg.content.length;
+        const toolCallWithPosition = {
+            ...toolCall,
+            contentPosition,
+        };
         messages[lastAssistantIndex] = {
             ...lastAssistantMsg,
-            toolCalls: [...(lastAssistantMsg.toolCalls || []), toolCall],
+            toolCalls: [
+                ...(lastAssistantMsg.toolCalls || []),
+                toolCallWithPosition,
+            ],
         };
         return { messages };
     }),

package/dist/gui/components/Message.d.ts

@@ -7,7 +7,7 @@ import type { DisplayMessage } from "./MessageList.js";
  */
 declare const messageVariants: (props?: ({
     role?: "user" | "assistant" | "system" | null | undefined;
-    layout?: "default" | "compact" | "full" | null | undefined;
+    layout?: "default" | "full" | "compact" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 export interface MessageProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof messageVariants> {
     /**

package/dist/gui/components/MessageContent.js

@@ -100,9 +100,42 @@ export const MessageContent = React.forwardRef(({ role: roleProp, variant, isStr
         const hasThinking = !!thinking;
         // Check if waiting (streaming but no content yet)
         const isWaiting = message.isStreaming && !message.content && message.role === "assistant";
-        content = (_jsxs(_Fragment, { children: [message.role === "assistant" && hasThinking && (_jsx(Reasoning, { content: thinking, isStreaming: message.isStreaming, mode: thinkingDisplayStyle, autoCollapse: true })), isWaiting && streamingStartTime && (_jsxs("div", { className: "flex items-center gap-2 opacity-50", children: [_jsx(Loader2Icon, { className: "size-4 animate-spin text-muted-foreground" }), _jsx(WaitingElapsedTime, { startTime: streamingStartTime })] })), message.role === "assistant" &&
-                    message.toolCalls &&
-                    message.toolCalls.length > 0 && (_jsx("div", { className: "flex flex-col gap-2 mb-3", children: message.toolCalls.map((toolCall) => (_jsx(ToolCall, { toolCall: toolCall }, toolCall.id))) })), message.role === "user" ? (_jsx("div", { className: "whitespace-pre-wrap", children: message.content })) : (_jsx(Response, { content: message.content, isStreaming: message.isStreaming, showEmpty: false })), message.role === "assistant" && message.tokenUsage && (_jsx("div", { className: "mt-3 pt-2 border-t border-border/30 text-xs text-muted-foreground/60", children: _jsxs("span", { children: ["Context:", " ", formatTokenPercentage(message.tokenUsage.totalTokens ?? 0, currentModel ?? undefined), " ", "(", (message.tokenUsage.totalTokens ?? 0).toLocaleString(), " ", "tokens)"] }) }))] }));
+        content = (_jsxs(_Fragment, { children: [message.role === "assistant" && hasThinking && (_jsx(Reasoning, { content: thinking, isStreaming: message.isStreaming, mode: thinkingDisplayStyle, autoCollapse: true })), isWaiting && streamingStartTime && (_jsxs("div", { className: "flex items-center gap-2 opacity-50", children: [_jsx(Loader2Icon, { className: "size-4 animate-spin text-muted-foreground" }), _jsx(WaitingElapsedTime, { startTime: streamingStartTime })] })), message.role === "assistant" ? ((() => {
+                    // Sort tool calls by content position
+                    const sortedToolCalls = (message.toolCalls || [])
+                        .slice()
+                        .sort((a, b) => (a.contentPosition ?? Infinity) -
+                        (b.contentPosition ?? Infinity));
+                    // If no tool calls or they don't have positions, render old way
+                    if (sortedToolCalls.length === 0 ||
+                        !sortedToolCalls.some((tc) => tc.contentPosition !== undefined)) {
+                        return (_jsxs(_Fragment, { children: [sortedToolCalls.length > 0 && (_jsx("div", { className: "flex flex-col gap-2 mb-3", children: sortedToolCalls.map((toolCall) => (_jsx(ToolCall, { toolCall: toolCall }, toolCall.id))) })), _jsx(Response, { content: message.content, isStreaming: message.isStreaming, showEmpty: false })] }));
+                    }
+                    // Render content interleaved with tool calls
+                    const elements = [];
+                    let currentPosition = 0;
+                    sortedToolCalls.forEach((toolCall) => {
+                        const position = toolCall.contentPosition ?? message.content.length;
+                        // Add text before this tool call
+                        if (position > currentPosition) {
+                            const textChunk = message.content.slice(currentPosition, position);
+                            if (textChunk) {
+                                elements.push(_jsx(Response, { content: textChunk, isStreaming: false, showEmpty: false }, `text-before-${toolCall.id}`));
+                            }
+                        }
+                        // Add the tool call
+                        elements.push(_jsx("div", { className: "my-2", children: _jsx(ToolCall, { toolCall: toolCall }) }, `tool-${toolCall.id}`));
+                        currentPosition = position;
+                    });
+                    // Add remaining text after the last tool call
+                    if (currentPosition < message.content.length) {
+                        const remainingText = message.content.slice(currentPosition);
+                        if (remainingText) {
+                            elements.push(_jsx(Response, { content: remainingText, isStreaming: message.isStreaming, showEmpty: false }, "text-end"));
+                        }
+                    }
+                    return _jsx(_Fragment, { children: elements });
+                })()) : (_jsx("div", { className: "whitespace-pre-wrap", children: message.content })), message.role === "assistant" && message.tokenUsage && (_jsx("div", { className: "mt-3 pt-2 border-t border-border/30 text-xs text-muted-foreground/60", children: _jsxs("span", { children: ["Context:", " ", formatTokenPercentage(message.tokenUsage.totalTokens ?? 0, currentModel ?? undefined), " ", "(", (message.tokenUsage.totalTokens ?? 0).toLocaleString(), " ", "tokens)"] }) }))] }));
     }
     return (_jsx("div", { ref: ref, className: cn(messageContentVariants({ role, variant }), isStreaming && "animate-pulse-subtle", className), ...props, children: content }));
 });

package/dist/sdk/schemas/session.d.ts

@@ -4,12 +4,12 @@ import { z } from "zod";
  */
 export declare const SessionStatus: z.ZodEnum<{
     error: "error";
-    idle: "idle";
+    disconnected: "disconnected";
     connecting: "connecting";
     connected: "connected";
+    idle: "idle";
     active: "active";
     streaming: "streaming";
-    disconnected: "disconnected";
 }>;
 export type SessionStatus = z.infer<typeof SessionStatus>;
 /**
@@ -41,12 +41,12 @@ export declare const Session: z.ZodObject<{
     id: z.ZodString;
     status: z.ZodEnum<{
         error: "error";
-        idle: "idle";
+        disconnected: "disconnected";
         connecting: "connecting";
         connected: "connected";
+        idle: "idle";
         active: "active";
         streaming: "streaming";
-        disconnected: "disconnected";
     }>;
     config: z.ZodObject<{
         agentPath: z.ZodString;
@@ -109,12 +109,12 @@ export declare const SessionUpdate: z.ZodUnion<readonly [z.ZodObject<{
     sessionId: z.ZodString;
     status: z.ZodOptional<z.ZodEnum<{
         error: "error";
-        idle: "idle";
+        disconnected: "disconnected";
         connecting: "connecting";
         connected: "connected";
+        idle: "idle";
         active: "active";
         streaming: "streaming";
-        disconnected: "disconnected";
     }>>;
     message: z.ZodOptional<z.ZodObject<{
         id: z.ZodString;
@@ -176,6 +176,7 @@ export declare const SessionUpdate: z.ZodUnion<readonly [z.ZodObject<{
             completed: "completed";
             failed: "failed";
         }>;
+        contentPosition: z.ZodOptional<z.ZodNumber>;
         locations: z.ZodOptional<z.ZodArray<z.ZodObject<{
             path: z.ZodString;
             line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -215,12 +216,12 @@ export declare const SessionUpdate: z.ZodUnion<readonly [z.ZodObject<{
     sessionId: z.ZodString;
     status: z.ZodOptional<z.ZodEnum<{
         error: "error";
-        idle: "idle";
+        disconnected: "disconnected";
         connecting: "connecting";
         connected: "connected";
+        idle: "idle";
         active: "active";
         streaming: "streaming";
-        disconnected: "disconnected";
     }>>;
     message: z.ZodOptional<z.ZodObject<{
         id: z.ZodString;
@@ -306,12 +307,12 @@ export declare const SessionUpdate: z.ZodUnion<readonly [z.ZodObject<{
     sessionId: z.ZodString;
     status: z.ZodOptional<z.ZodEnum<{
         error: "error";
-        idle: "idle";
+        disconnected: "disconnected";
         connecting: "connecting";
         connected: "connected";
+        idle: "idle";
         active: "active";
         streaming: "streaming";
-        disconnected: "disconnected";
     }>>;
     message: z.ZodOptional<z.ZodObject<{
         id: z.ZodString;
@@ -362,12 +363,12 @@ export declare const SessionUpdate: z.ZodUnion<readonly [z.ZodObject<{
     sessionId: z.ZodString;
     status: z.ZodOptional<z.ZodEnum<{
         error: "error";
-        idle: "idle";
+        disconnected: "disconnected";
         connecting: "connecting";
         connected: "connected";
+        idle: "idle";
         active: "active";
         streaming: "streaming";
-        disconnected: "disconnected";
     }>>;
     message: z.ZodOptional<z.ZodObject<{
         id: z.ZodString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@townco/ui",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.5.1",
-    "@townco/core": "0.0.6",
+    "@townco/core": "0.0.8",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-label": "^2.1.8",
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4.1.17",
-    "@townco/tsconfig": "0.1.25",
+    "@townco/tsconfig": "0.1.27",
     "@types/node": "^24.10.0",
     "@types/react": "^19.2.2",
     "ink": "^6.4.0",