zerg-ztc 0.1.4 → 0.1.6

package/src/agent/tools/file.ts

@@ -1,9 +1,14 @@
 import { readFile, writeFile, readdir, stat } from 'fs/promises';
 import { dirname, resolve } from 'path';
-import { Tool } from './types.js';
+import { Tool, ToolContext } from './types.js';
 import { ToolCapability } from '../runtime/capabilities.js';
 import { buildSimpleDiff } from '../../utils/diff.js';
 
+function resolvePath(path: string, context?: ToolContext): string {
+  const base = context?.cwd || process.cwd();
+  return resolve(base, path);
+}
+
 // --- File Tools ---
 
 export const readFileTool: Tool = {
@@ -27,10 +32,10 @@ export const readFileTool: Tool = {
       required: ['path']
     }
   },
-  execute: async (args) => {
-    const path = resolve(String(args.path));
+  execute: async (args, context) => {
+    const path = resolvePath(String(args.path), context);
     const encoding = (args.encoding as BufferEncoding) || 'utf-8';
-    
+
     try {
       const content = await readFile(path, { encoding });
       const stats = await stat(path);
@@ -70,16 +75,16 @@ export const writeFileTool: Tool = {
       required: ['path', 'content']
     }
   },
-  execute: async (args) => {
-    const path = resolve(String(args.path));
+  execute: async (args, context) => {
+    const path = resolvePath(String(args.path), context);
     const content = String(args.content);
     const append = args.append === 'true';
-    
+
     try {
       // Ensure directory exists
       const { mkdir, appendFile } = await import('fs/promises');
       await mkdir(dirname(path), { recursive: true });
-      
+
       let beforeContent = '';
       try {
         beforeContent = await readFile(path, { encoding: 'utf-8' });
@@ -92,7 +97,7 @@ export const writeFileTool: Tool = {
       } else {
         await writeFile(path, content, 'utf-8');
       }
-      
+
       const stats = await stat(path);
       const afterContent = await readFile(path, { encoding: 'utf-8' });
       const diff = buildSimpleDiff(beforeContent, afterContent);
@@ -131,38 +136,38 @@ export const listDirectoryTool: Tool = {
       required: ['path']
     }
   },
-  execute: async (args) => {
-    const path = resolve(String(args.path));
+  execute: async (args, context) => {
+    const path = resolvePath(String(args.path), context);
     const recursive = args.recursive === 'true';
-    
+
     async function listDir(dir: string, depth = 0): Promise<object[]> {
       if (depth > 3) return [];
-      
+
       const entries = await readdir(dir, { withFileTypes: true });
       const results: object[] = [];
-      
+
       for (const entry of entries.slice(0, 100)) { // Limit entries
         const entryPath = resolve(dir, entry.name);
         const info: Record<string, unknown> = {
           name: entry.name,
           type: entry.isDirectory() ? 'directory' : 'file'
         };
-        
+
         if (entry.isFile()) {
           const s = await stat(entryPath);
           info.size = s.size;
         }
-        
+
         if (recursive && entry.isDirectory() && !entry.name.startsWith('.')) {
           info.children = await listDir(entryPath, depth + 1);
         }
-        
+
         results.push(info);
       }
-      
+
       return results;
     }
-    
+
     try {
       const entries = await listDir(path);
       return JSON.stringify({ path, entries });

package/src/agent/tools/index.ts

@@ -1,4 +1,4 @@
-import { Tool } from './types.js';
+import { Tool, ToolContext } from './types.js';
 import { ToolDefinition } from '../../types.js';
 import { readFileTool, writeFileTool, listDirectoryTool } from './file.js';
 import { runCommandTool } from './shell.js';
@@ -27,15 +27,16 @@ export function getTool(name: string, tools: Tool[] = defaultTools): Tool | unde
 }
 
 export async function executeTool(
-  name: string, 
+  name: string,
   args: Record<string, unknown>,
-  tools: Tool[] = defaultTools
+  tools: Tool[] = defaultTools,
+  context?: ToolContext
 ): Promise<string> {
   const tool = getTool(name, tools);
   if (!tool) {
     throw new Error(`Unknown tool: ${name}`);
   }
-  return tool.execute(args);
+  return tool.execute(args, context);
 }
 
 export { readFileTool, writeFileTool, listDirectoryTool } from './file.js';

package/src/agent/tools/search.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'child_process';
 import { resolve } from 'path';
-import { Tool } from './types.js';
+import { Tool, ToolContext } from './types.js';
 import { ToolCapability } from '../runtime/capabilities.js';
 
 interface RunResult {
@@ -58,9 +58,10 @@ export const searchTool: Tool = {
       required: ['pattern']
     }
   },
-  execute: async (args) => {
+  execute: async (args, context) => {
+    const baseCwd = context?.cwd || process.cwd();
     const pattern = String(args.pattern || '');
-    const path = resolve(String(args.path || '.'));
+    const path = resolve(baseCwd, String(args.path || '.'));
     const glob = args.glob ? String(args.glob) : undefined;
     const outputMode = args.output_mode === 'files' ? 'files' : 'content';
     const maxResults = Math.max(1, Math.min(200, parseInt(String(args.max_results || '20'), 10)));
@@ -82,14 +83,14 @@ export const searchTool: Tool = {
 
     let result: RunResult | null = null;
     try {
-      result = await runCommand('rg', rgArgs, process.cwd());
+      result = await runCommand('rg', rgArgs, baseCwd);
     } catch {
       result = null;
     }
 
     if (!result || (result.code !== 0 && result.code !== 1)) {
       const grepArgs = ['-R', '-n', pattern, path];
-      const fallback = await runCommand('grep', grepArgs, process.cwd());
+      const fallback = await runCommand('grep', grepArgs, baseCwd);
       if (fallback.code !== 0 && fallback.code !== 1) {
         throw new Error(fallback.stderr || 'Search failed');
       }

package/src/agent/tools/shell.ts

@@ -1,7 +1,7 @@
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { resolve } from 'path';
-import { Tool } from './types.js';
+import { Tool, ToolContext } from './types.js';
 import { ToolCapability } from '../runtime/capabilities.js';
 
 const execAsync = promisify(exec);
@@ -32,24 +32,25 @@ export const runCommandTool: Tool = {
       required: ['command']
     }
   },
-  execute: async (args) => {
+  execute: async (args, context) => {
     const command = String(args.command);
-    const cwd = args.cwd ? resolve(String(args.cwd)) : process.cwd();
+    const baseCwd = context?.cwd || process.cwd();
+    const cwd = args.cwd ? resolve(baseCwd, String(args.cwd)) : baseCwd;
     const timeout = parseInt(String(args.timeout || '30000'), 10);
-    
+
     // Basic safety checks
     const dangerous = ['rm -rf /', 'mkfs', ':(){:|:&};:'];
     if (dangerous.some(d => command.includes(d))) {
       throw new Error('Command rejected for safety reasons');
     }
-    
+
     try {
-      const { stdout, stderr } = await execAsync(command, { 
-        cwd, 
+      const { stdout, stderr } = await execAsync(command, {
+        cwd,
         timeout,
         maxBuffer: 1024 * 1024 // 1MB
       });
-      
+
       return JSON.stringify({
         command,
         cwd,
@@ -59,7 +60,10 @@ export const runCommandTool: Tool = {
       });
     } catch (err) {
       const e = err as Error & { stdout?: string; stderr?: string; code?: number };
-      throw new Error(`Command failed: ${e.message}\nstderr: ${e.stderr || ''}`);
+      // Include both stdout and stderr in error - many tools output errors to stdout
+      const output = [e.stdout, e.stderr].filter(Boolean).join('\n').trim();
+      const outputSnippet = output.slice(0, 2000) || '(no output)';
+      throw new Error(`Command failed (exit ${e.code || '?'}):\n${outputSnippet}`);
     }
   }
 };

package/src/agent/tools/types.ts

@@ -3,8 +3,12 @@ import { ToolCapability } from '../runtime/capabilities.js';
 
 // --- Tool Interface ---
 
+export interface ToolContext {
+  cwd: string;  // Working directory for path resolution
+}
+
 export interface Tool {
   definition: ToolDefinition;
   capabilities?: ToolCapability[];
-  execute: (args: Record<string, unknown>) => Promise<string>;
+  execute: (args: Record<string, unknown>, context?: ToolContext) => Promise<string>;
 }

package/src/cli.tsx

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import React from 'react';
 import { render } from 'ink';
-import { resolve, dirname } from 'path';
-import { statSync, readFileSync } from 'fs';
-import { fileURLToPath } from 'url';
+import { resolve } from 'path';
+import { statSync } from 'fs';
 import { App } from './App.js';
 import { configStore } from './config.js';
+import { getVersion } from './utils/version.js';
 
 // --- CLI Entry Point ---
 
@@ -76,15 +76,43 @@ async function main(): Promise<void> {
   await configStore.load(true);
 
   const isTty = Boolean(process.stdout.isTTY);
-  const useAltScreen = isTty && process.env.ZTC_ALT_SCREEN !== '0' && process.env.ZTC_NO_ALT_SCREEN !== '1';
+  const useAltScreen = isTty
+    && process.env.ZTC_ALT_SCREEN === '1'
+    && process.env.ZTC_NO_ALT_SCREEN !== '1'
+    && process.env.ZTC_SCROLLBACK !== '1';
 
   if (useAltScreen) {
     process.stdout.write('\x1b[?1049h');
     process.stdout.write('\x1b[?25l');
+  }
+
+  if (isTty) {
+    // Clear screen and move cursor home for a clean start
     process.stdout.write('\x1b[2J');
     process.stdout.write('\x1b[H');
   }
 
+  // In scrollback mode, print a static header once at startup
+  const scrollback = !useAltScreen;
+  if (scrollback && isTty) {
+    const version = getVersion();
+    const dateLabel = new Date().toLocaleDateString('en-US', {
+      month: 'short',
+      day: '2-digit',
+      year: 'numeric'
+    });
+    const cols = process.stdout.columns || 80;
+    const title = 'Zerg Terminal Client';
+    const right = `${dateLabel} • v${version} • Ctrl+C exit • /help`;
+    const padding = Math.max(0, cols - title.length - right.length - 4);
+    const borderLine = '─'.repeat(cols - 2);
+
+    console.log(`┌${borderLine}┐`);
+    console.log(`│ ${title}${' '.repeat(padding)}${right} │`);
+    console.log(`└${borderLine}┘`);
+    console.log(''); // Extra line after header
+  }
+
   // Enable bracketed paste mode so we can detect paste boundaries
   process.stdout.write('\x1b[?2004h');
 
@@ -94,21 +122,23 @@ async function main(): Promise<void> {
   // Using flags=1 for basic disambiguation which reports Cmd+V as CSI sequence
   process.stdout.write('\x1b[>1u');
 
-  // Wrap stdout.write to use synchronized output (reduces flicker)
-  // DECSM/DECRM 2026 tells terminal to batch updates
-  const originalWrite = process.stdout.write.bind(process.stdout);
-  let syncPending = false;
-  process.stdout.write = function(chunk: any, encoding?: any, callback?: any): boolean {
-    if (!syncPending) {
-      syncPending = true;
-      originalWrite('\x1b[?2026h'); // Begin synchronized update
-      setImmediate(() => {
-        originalWrite('\x1b[?2026l'); // End synchronized update
-        syncPending = false;
-      });
-    }
-    return originalWrite(chunk, encoding, callback);
-  } as typeof process.stdout.write;
+  if (useAltScreen) {
+    // Wrap stdout.write to use synchronized output (reduces flicker)
+    // DECSM/DECRM 2026 tells terminal to batch updates
+    const originalWrite = process.stdout.write.bind(process.stdout);
+    let syncPending = false;
+    process.stdout.write = function(chunk: any, encoding?: any, callback?: any): boolean {
+      if (!syncPending) {
+        syncPending = true;
+        originalWrite('\x1b[?2026h'); // Begin synchronized update
+        setImmediate(() => {
+          originalWrite('\x1b[?2026l'); // End synchronized update
+          syncPending = false;
+        });
+      }
+      return originalWrite(chunk, encoding, callback);
+    } as typeof process.stdout.write;
+  }
 
   // Render the app
   const { waitUntilExit } = render(<App />);
@@ -130,14 +160,4 @@ async function main(): Promise<void> {
 
 void main();
 
-function getVersion(): string {
-  try {
-    const here = dirname(fileURLToPath(import.meta.url));
-    const pkgPath = resolve(here, '../package.json');
-    const raw = readFileSync(pkgPath, 'utf-8');
-    const parsed = JSON.parse(raw) as { version?: string };
-    return parsed.version || '0.0.0';
-  } catch {
-    return '0.0.0';
-  }
-}
+// getVersion moved to utils/version.ts

package/src/components/ActivityLine.tsx

@@ -0,0 +1,23 @@
+import React from 'react';
+import { AgentState } from '../types.js';
+import { InkNode } from '../ui/ink/index.js';
+import { buildActivityLineView } from '../ui/views/activity_line.js';
+
+interface ActivityLineProps {
+  state: AgentState;
+  spinnerLabel?: string | null;
+  spinnerFrame?: string | null;
+  inputMode?: 'queue' | 'interrupt';
+}
+
+export const ActivityLine: React.FC<ActivityLineProps> = ({
+  state,
+  spinnerLabel,
+  spinnerFrame,
+  inputMode
+}) => {
+  const node = buildActivityLineView({ state, spinnerLabel, spinnerFrame, inputMode });
+  return <InkNode node={node} />;
+};
+
+export default ActivityLine;

package/src/components/FullScreen.tsx

@@ -18,6 +18,7 @@ import { Box } from 'ink';
 
 interface FullScreenProps extends PropsWithChildren {
   debug?: boolean;
+  scrollback?: boolean;
 }
 
 function getTerminalSize() {
@@ -27,15 +28,15 @@ function getTerminalSize() {
   };
 }
 
-export const FullScreen: React.FC<FullScreenProps> = ({ children, debug = false }) => {
+export const FullScreen: React.FC<FullScreenProps> = ({ children, debug = false, scrollback = false }) => {
   const { rows, columns } = useScreenSize();
 
   return (
     <Box
       flexDirection="column"
       width={columns}
-      height={rows}
-      overflow="hidden"
+      height={scrollback ? undefined : rows}
+      overflow={scrollback ? undefined : 'hidden'}
       borderStyle={debug ? 'single' : undefined}
       borderColor={debug ? 'red' : undefined}
     >

package/src/components/MessageList.tsx

@@ -1,24 +1,70 @@
-import React from 'react';
+import React, { useRef, useMemo } from 'react';
 import { Message } from '../types.js';
 import { InkNode } from '../ui/ink/index.js';
 import { buildMessageListView } from '../ui/views/message_list.js';
 
 interface MessageListProps {
   messages: Message[];
-  height: number;
+  height?: number;
   maxMessages?: number;
   debug?: boolean;
   expandToolOutputs?: boolean;
+  scrollback?: boolean;
 }
 
-export const MessageList: React.FC<MessageListProps> = ({ 
-  messages, 
+export const MessageList: React.FC<MessageListProps> = ({
+  messages,
   height,
   maxMessages = 50,
   debug = false,
-  expandToolOutputs = false
+  expandToolOutputs = false,
+  scrollback = false
 }) => {
-  const node = buildMessageListView({ messages, height, maxMessages, debug, expandToolOutputs });
+  // In scrollback mode, track which messages have been rendered to avoid duplication
+  const renderedIdsRef = useRef<Set<string>>(new Set());
+
+  // Filter to only new, complete messages in scrollback mode
+  const messagesToRender = useMemo(() => {
+    if (!scrollback) {
+      return messages;
+    }
+
+    // In scrollback mode, only render messages that:
+    // 1. Are NOT currently streaming (wait for completion)
+    // 2. Haven't been rendered yet
+    const newMessages: Message[] = [];
+    for (const msg of messages) {
+      // Skip streaming messages - we'll render them when complete
+      if (msg.isStreaming) {
+        continue;
+      }
+
+      // Skip already rendered messages
+      if (renderedIdsRef.current.has(msg.id)) {
+        continue;
+      }
+
+      // This is a new, complete message - render it
+      newMessages.push(msg);
+      // Mark as rendered immediately
+      renderedIdsRef.current.add(msg.id);
+    }
+    return newMessages;
+  }, [messages, scrollback]);
+
+  // Don't render anything if there are no new messages in scrollback mode
+  if (scrollback && messagesToRender.length === 0) {
+    return null;
+  }
+
+  const node = buildMessageListView({
+    messages: messagesToRender,
+    height,
+    maxMessages,
+    debug,
+    expandToolOutputs,
+    scrollback
+  });
   return <InkNode node={node} />;
 };
 

package/src/components/SingleMessage.tsx

@@ -0,0 +1,59 @@
+import React from 'react';
+import { Box, Text } from 'ink';
+import { Message } from '../types.js';
+
+interface SingleMessageProps {
+  message: Message;
+  expandToolOutputs?: boolean;
+}
+
+interface RoleConfig {
+  icon: string;
+  color: string;
+  label: string;
+}
+
+const roleConfigs: Record<string, RoleConfig> = {
+  user: { icon: '❯', color: 'blue', label: 'You' },
+  assistant: { icon: '◆', color: 'magenta', label: 'Zerg' },
+  tool: { icon: '⏺', color: 'yellow', label: 'Trace' },
+  system: { icon: '●', color: 'gray', label: 'System' }
+};
+
+function formatTime(date: Date): string {
+  return date.toLocaleTimeString('en-US', {
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false
+  });
+}
+
+export const SingleMessage: React.FC<SingleMessageProps> = ({
+  message,
+  expandToolOutputs = false
+}) => {
+  const config = roleConfigs[message.role] || roleConfigs.system;
+  const toolOutput = message.metadata && (message.metadata as Record<string, any>).toolOutput;
+  const content = toolOutput && expandToolOutputs && toolOutput.full
+    ? toolOutput.full
+    : toolOutput && toolOutput.preview
+      ? toolOutput.preview
+      : message.content;
+
+  return (
+    <Box flexDirection="column" marginY={1} paddingX={1}>
+      <Box flexDirection="row">
+        <Text color={config.color} bold>{config.icon} {config.label}</Text>
+        <Text color="gray" dimColor> • {formatTime(message.timestamp)}</Text>
+        {message.isStreaming && <Text color="yellow" bold> ▌</Text>}
+      </Box>
+      <Box flexDirection="column" marginLeft={2}>
+        {content.split('\n').map((line: string, i: number) => (
+          <Text key={i}>{line}</Text>
+        ))}
+      </Box>
+    </Box>
+  );
+};
+
+export default SingleMessage;

package/src/components/StatusBar.tsx

@@ -15,6 +15,7 @@ interface StatusBarProps {
   emulationId?: string;
   inputMode?: 'queue' | 'interrupt';
   toast?: string | null;
+  spinnerLabel?: string | null;
   debug?: boolean;
 }
 
@@ -30,6 +31,7 @@ export const StatusBar: React.FC<StatusBarProps> = ({
   emulationId,
   inputMode,
   toast,
+  spinnerLabel,
   debug = false
 }) => {
   const node = buildStatusBarView({
@@ -44,6 +46,7 @@ export const StatusBar: React.FC<StatusBarProps> = ({
     emulationId,
     inputMode,
     toast,
+    spinnerLabel,
     debug
   });
   return <InkNode node={node} />;

package/src/components/index.tsx

@@ -1,6 +1,8 @@
 // Component exports
 export { Header } from './Header.js';
 export { MessageList } from './MessageList.js';
+export { SingleMessage } from './SingleMessage.js';
 export { InputArea } from './InputArea.js';
 export { StatusBar } from './StatusBar.js';
-export { FullScreen, useScreenSize } from './FullScreen.js';
+export { FullScreen, useScreenSize } from './FullScreen.js';
+export { ActivityLine } from './ActivityLine.js';

package/src/config/types.ts

@@ -7,5 +7,6 @@ export interface ZTCConfig {
   maxTokens: number;
   zergEndpoint?: string;
   emulationId?: string;
+  spinnerVerbs?: string[];
   toolPermissions?: Partial<Record<'file_read' | 'file_write' | 'shell_exec' | 'network', boolean>>;
 }

package/src/config.ts

@@ -3,6 +3,7 @@ import { join } from 'path';
 import { readFile, writeFile, mkdir } from 'fs/promises';
 
 import { ZTCConfig } from './config/types.js';
+import { DEFAULT_SPINNER_VERBS } from './utils/spinner_verbs.js';
 
 // --- Configuration Store ---
 
@@ -15,6 +16,7 @@ const DEFAULT_CONFIG: ZTCConfig = {
   maxTokens: 4096,
   zergEndpoint: undefined,
   emulationId: undefined,
+  spinnerVerbs: DEFAULT_SPINNER_VERBS,
   toolPermissions: {
     file_read: true,
     file_write: true,
@@ -46,6 +48,9 @@ class ConfigStore {
       if (this.config.model === 'claude-opus-4-5-20250514') {
         this.config.model = 'claude-opus-4-20250514';
       }
+      if (!this.config.spinnerVerbs) {
+        this.config.spinnerVerbs = DEFAULT_SPINNER_VERBS;
+      }
       if (!this.config.toolPermissions) {
         this.config.toolPermissions = { ...DEFAULT_CONFIG.toolPermissions };
       }
@@ -92,6 +97,9 @@ class ConfigStore {
     if (this.config.model === 'claude-opus-4-5-20250514') {
       this.config.model = 'claude-opus-4-20250514';
     }
+    if (!this.config.spinnerVerbs) {
+      this.config.spinnerVerbs = DEFAULT_SPINNER_VERBS;
+    }
     if (!this.config.toolPermissions) {
       this.config.toolPermissions = { ...DEFAULT_CONFIG.toolPermissions };
     }

package/src/ui/views/activity_line.ts

@@ -0,0 +1,33 @@
+import { AgentState } from '../../types.js';
+import { box, text, LayoutNode } from '../core/index.js';
+
+interface ActivityLineProps {
+  state: AgentState;
+  spinnerLabel?: string | null;
+  spinnerFrame?: string | null;
+  inputMode?: 'queue' | 'interrupt';
+}
+
+export function buildActivityLineView({
+  state,
+  spinnerLabel,
+  spinnerFrame,
+  inputMode
+}: ActivityLineProps): LayoutNode {
+  const active = state.status === 'thinking' || state.status === 'streaming';
+  if (!active || !spinnerLabel) {
+    return box([], { height: 0 });
+  }
+  const frame = spinnerFrame || '✽';
+  const hint = inputMode === 'interrupt' ? ' (esc to interrupt)' : '';
+  return box([
+    text(`${frame} ${spinnerLabel}…${hint}`, { color: 'yellow' })
+  ], {
+    flexDirection: 'row',
+    paddingX: 2,
+    paddingY: 0,
+    marginTop: 1,
+    marginBottom: 1,
+    height: 1
+  });
+}