memorix 1.6.0 → 1.6.1

package/src/orchestrate/adapters/opencode-stream.ts

@@ -1,143 +1,143 @@
-/**
- * OpenCode CLI JSON parser.
- *
- * Parses NDJSON from `opencode run --format json`
- * into AgentMessage events.
- *
- * Event types (from real opencode 1.2.27 output):
- *   - "step_start"  → snapshot, sessionID
- *   - "text"        → part.text
- *   - "tool"        → part.tool (tool name), part.state
- *   - "step_finish" → part.tokens (usage), part.reason
- */
-
-import type { AgentMessage, TokenUsage } from './types.js';
-
-// ── OpenCode JSON shapes ────────────────────────────────────
-
-interface OpenCodeEvent {
-  type: string;
-  timestamp?: number;
-  sessionID?: string;
-  part?: {
-    id?: string;
-    sessionID?: string;
-    messageID?: string;
-    type?: string;
-    text?: string;
-    tool?: string;
-    state?: {
-      status?: string;
-      output?: string;
-    };
-    reason?: string;
-    cost?: number;
-    tokens?: {
-      total?: number;
-      input?: number;
-      output?: number;
-      reasoning?: number;
-      cache?: {
-        read?: number;
-        write?: number;
-      };
-    };
-  };
-}
-
-// ── State ───────────────────────────────────────────────────
-
-export interface OpenCodeStreamState {
-  sessionId?: string;
-  usage: Record<string, TokenUsage>;
-  isError: boolean;
-}
-
-// ── Parser ──────────────────────────────────────────────────
-
-/**
- * Parse a single NDJSON line from OpenCode --format json output.
- * Returns zero or more AgentMessage events.
- */
-export function parseOpenCodeStreamLine(
-  raw: string,
-  state: OpenCodeStreamState,
-): AgentMessage[] {
-  const line = raw.trim();
-  if (!line) return [];
-
-  let parsed: OpenCodeEvent;
-  try {
-    parsed = JSON.parse(line);
-  } catch {
-    return [];
-  }
-
-  const messages: AgentMessage[] = [];
-
-  // Capture sessionID from any event
-  if (parsed.sessionID && !state.sessionId) {
-    state.sessionId = parsed.sessionID;
-  }
-
-  switch (parsed.type) {
-    case 'text':
-      if (parsed.part?.text) {
-        messages.push({ type: 'text', content: parsed.part.text });
-      }
-      break;
-
-    case 'tool':
-      if (parsed.part?.tool) {
-        if (parsed.part.state?.status === 'completed' || parsed.part.state?.status === 'error') {
-          // Tool result
-          const output = parsed.part.state.output;
-          messages.push({
-            type: 'tool_result',
-            callId: parsed.part.id,
-            output: output
-              ? (output.length > 4096 ? output.slice(0, 4096) : output)
-              : undefined,
-          });
-        } else {
-          // Tool call (pending/running)
-          messages.push({
-            type: 'tool_use',
-            tool: parsed.part.tool,
-            callId: parsed.part.id,
-          });
-        }
-      }
-      break;
-
-    case 'step_finish':
-      // Extract token usage
-      if (parsed.part?.tokens) {
-        const t = parsed.part.tokens;
-        // OpenCode doesn't expose model name in CLI output, use generic key
-        const model = 'opencode';
-        state.usage[model] = {
-          inputTokens: t.input ?? 0,
-          outputTokens: t.output ?? 0,
-          cacheReadTokens: t.cache?.read ?? 0,
-          cacheWriteTokens: t.cache?.write ?? 0,
-          model,
-        };
-      }
-      break;
-
-    case 'error':
-      state.isError = true;
-      messages.push({ type: 'error', content: parsed.part?.text ?? 'Unknown error' });
-      break;
-  }
-
-  return messages;
-}
-
-/**
- * Create a fresh parser state.
- */
-export function createOpenCodeStreamState(): OpenCodeStreamState {
-  return { usage: {}, isError: false };
-}
+/**
+ * OpenCode CLI JSON parser.
+ *
+ * Parses NDJSON from `opencode run --format json`
+ * into AgentMessage events.
+ *
+ * Event types (from real opencode 1.2.27 output):
+ *   - "step_start"  → snapshot, sessionID
+ *   - "text"        → part.text
+ *   - "tool"        → part.tool (tool name), part.state
+ *   - "step_finish" → part.tokens (usage), part.reason
+ */
+
+import type { AgentMessage, TokenUsage } from './types.js';
+
+// ── OpenCode JSON shapes ────────────────────────────────────
+
+interface OpenCodeEvent {
+  type: string;
+  timestamp?: number;
+  sessionID?: string;
+  part?: {
+    id?: string;
+    sessionID?: string;
+    messageID?: string;
+    type?: string;
+    text?: string;
+    tool?: string;
+    state?: {
+      status?: string;
+      output?: string;
+    };
+    reason?: string;
+    cost?: number;
+    tokens?: {
+      total?: number;
+      input?: number;
+      output?: number;
+      reasoning?: number;
+      cache?: {
+        read?: number;
+        write?: number;
+      };
+    };
+  };
+}
+
+// ── State ───────────────────────────────────────────────────
+
+export interface OpenCodeStreamState {
+  sessionId?: string;
+  usage: Record<string, TokenUsage>;
+  isError: boolean;
+}
+
+// ── Parser ──────────────────────────────────────────────────
+
+/**
+ * Parse a single NDJSON line from OpenCode --format json output.
+ * Returns zero or more AgentMessage events.
+ */
+export function parseOpenCodeStreamLine(
+  raw: string,
+  state: OpenCodeStreamState,
+): AgentMessage[] {
+  const line = raw.trim();
+  if (!line) return [];
+
+  let parsed: OpenCodeEvent;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    return [];
+  }
+
+  const messages: AgentMessage[] = [];
+
+  // Capture sessionID from any event
+  if (parsed.sessionID && !state.sessionId) {
+    state.sessionId = parsed.sessionID;
+  }
+
+  switch (parsed.type) {
+    case 'text':
+      if (parsed.part?.text) {
+        messages.push({ type: 'text', content: parsed.part.text });
+      }
+      break;
+
+    case 'tool':
+      if (parsed.part?.tool) {
+        if (parsed.part.state?.status === 'completed' || parsed.part.state?.status === 'error') {
+          // Tool result
+          const output = parsed.part.state.output;
+          messages.push({
+            type: 'tool_result',
+            callId: parsed.part.id,
+            output: output
+              ? (output.length > 4096 ? output.slice(0, 4096) : output)
+              : undefined,
+          });
+        } else {
+          // Tool call (pending/running)
+          messages.push({
+            type: 'tool_use',
+            tool: parsed.part.tool,
+            callId: parsed.part.id,
+          });
+        }
+      }
+      break;
+
+    case 'step_finish':
+      // Extract token usage
+      if (parsed.part?.tokens) {
+        const t = parsed.part.tokens;
+        // OpenCode doesn't expose model name in CLI output, use generic key
+        const model = 'opencode';
+        state.usage[model] = {
+          inputTokens: t.input ?? 0,
+          outputTokens: t.output ?? 0,
+          cacheReadTokens: t.cache?.read ?? 0,
+          cacheWriteTokens: t.cache?.write ?? 0,
+          model,
+        };
+      }
+      break;
+
+    case 'error':
+      state.isError = true;
+      messages.push({ type: 'error', content: parsed.part?.text ?? 'Unknown error' });
+      break;
+  }
+
+  return messages;
+}
+
+/**
+ * Create a fresh parser state.
+ */
+export function createOpenCodeStreamState(): OpenCodeStreamState {
+  return { usage: {}, isError: false };
+}

package/src/orchestrate/adapters/opencode.ts

@@ -1,47 +1,47 @@
-/**
- * OpenCode CLI adapter.
- *
- * Invocation: echo "<prompt>" | opencode run
- * The `run` subcommand executes a one-shot task and exits.
- * Prompt is piped via stdin to avoid shell escaping issues.
- */
-
-import { spawnAgentWithStream, isCommandAvailable } from './spawn-helper.js';
-import { parseOpenCodeStreamLine, createOpenCodeStreamState } from './opencode-stream.js';
-import type { AgentAdapter, AgentProcess, SpawnOptions } from './types.js';
-
-export class OpenCodeAdapter implements AgentAdapter {
-  name = 'opencode';
-
-  async available(): Promise<boolean> {
-    return isCommandAvailable('opencode');
-  }
-
-  spawn(prompt: string, opts: SpawnOptions): AgentProcess {
-    const state = createOpenCodeStreamState();
-
-    // `opencode run` reads prompt from stdin and runs non-interactively.
-    // --dir sets the working directory for the agent.
-    // --format json: emit JSONL events for streaming + token tracking.
-    const args = ['run', '--format', 'json'];
-    if (opts.cwd) {
-      args.push('--dir', opts.cwd);
-    }
-    if (opts.resumeSessionId) {
-      args.push('--session', opts.resumeSessionId);
-    }
-
-    return spawnAgentWithStream(
-      'opencode',
-      args,
-      opts,
-      prompt,
-      (line) => parseOpenCodeStreamLine(line, state),
-      (result) => ({
-        ...result,
-        tokenUsage: Object.keys(state.usage).length > 0 ? { ...state.usage } : undefined,
-        sessionId: state.sessionId,
-      }),
-    );
-  }
-}
+/**
+ * OpenCode CLI adapter.
+ *
+ * Invocation: echo "<prompt>" | opencode run
+ * The `run` subcommand executes a one-shot task and exits.
+ * Prompt is piped via stdin to avoid shell escaping issues.
+ */
+
+import { spawnAgentWithStream, isCommandAvailable } from './spawn-helper.js';
+import { parseOpenCodeStreamLine, createOpenCodeStreamState } from './opencode-stream.js';
+import type { AgentAdapter, AgentProcess, SpawnOptions } from './types.js';
+
+export class OpenCodeAdapter implements AgentAdapter {
+  name = 'opencode';
+
+  async available(): Promise<boolean> {
+    return isCommandAvailable('opencode');
+  }
+
+  spawn(prompt: string, opts: SpawnOptions): AgentProcess {
+    const state = createOpenCodeStreamState();
+
+    // `opencode run` reads prompt from stdin and runs non-interactively.
+    // --dir sets the working directory for the agent.
+    // --format json: emit JSONL events for streaming + token tracking.
+    const args = ['run', '--format', 'json'];
+    if (opts.cwd) {
+      args.push('--dir', opts.cwd);
+    }
+    if (opts.resumeSessionId) {
+      args.push('--session', opts.resumeSessionId);
+    }
+
+    return spawnAgentWithStream(
+      'opencode',
+      args,
+      opts,
+      prompt,
+      (line) => parseOpenCodeStreamLine(line, state),
+      (result) => ({
+        ...result,
+        tokenUsage: Object.keys(state.usage).length > 0 ? { ...state.usage } : undefined,
+        sessionId: state.sessionId,
+      }),
+    );
+  }
+}

package/src/orchestrate/adapters/types.ts

@@ -1,77 +1,77 @@
-/**
- * Agent Adapter types — Phase 4c spawn + handle model.
- *
- * Each agent CLI adapter implements this interface.
- * spawn() returns a process handle immediately (NOT exec + string).
- * Bounded memory via RingBuffer. Cancellation via abort().
- */
-
-export interface AgentProcess {
-  /** Underlying child process PID */
-  pid: number;
-
-  /** Resolves when process exits */
-  completion: Promise<AgentProcessResult>;
-
-  /** Abort the process (SIGTERM, then SIGKILL after grace period) */
-  abort(): void;
-
-  /** Streaming messages from the agent process (if supported by the adapter) */
-  messages?: AsyncIterable<AgentMessage>;
-}
-
-export type AgentMessageType = 'text' | 'thinking' | 'tool_use' | 'tool_result' | 'error' | 'status';
-
-export interface AgentMessage {
-  type: AgentMessageType;
-  content?: string;
-  tool?: string;
-  callId?: string;
-  input?: Record<string, unknown>;
-  output?: string;
-  /** Token usage snapshot (cumulative, present on 'assistant' messages from Claude) */
-  usage?: TokenUsage;
-}
-
-export interface TokenUsage {
-  inputTokens: number;
-  outputTokens: number;
-  cacheReadTokens: number;
-  cacheWriteTokens: number;
-  model?: string;
-}
-
-export interface AgentProcessResult {
-  exitCode: number | null;
-  signal: string | null;
-  /** Last N lines of combined stdout+stderr (ring buffer, not full capture) */
-  tailOutput: string;
-  /** Whether the process was killed by timeout or abort */
-  killed: boolean;
-  /** Accumulated token usage per model (populated by streaming adapters) */
-  tokenUsage?: Record<string, TokenUsage>;
-  /** Session ID (populated by Claude stream-json adapter for session reuse) */
-  sessionId?: string;
-}
-
-export interface SpawnOptions {
-  cwd: string;
-  env?: Record<string, string>;
-  /** Per-task timeout in ms (default: 600_000 = 10 min) */
-  timeoutMs?: number;
-  /** Ring buffer size in lines (default: 50) */
-  tailLines?: number;
-  /** Resume a previous agent session (supported by Claude --resume) */
-  resumeSessionId?: string;
-}
-
-export interface AgentAdapter {
-  /** Adapter display name (e.g. 'claude', 'codex', 'gemini') */
-  name: string;
-
-  /** Check if the CLI tool is installed and accessible */
-  available(): Promise<boolean>;
-
-  /** Spawn agent process — returns handle immediately, does NOT wait for completion */
-  spawn(prompt: string, opts: SpawnOptions): AgentProcess;
-}
+/**
+ * Agent Adapter types — Phase 4c spawn + handle model.
+ *
+ * Each agent CLI adapter implements this interface.
+ * spawn() returns a process handle immediately (NOT exec + string).
+ * Bounded memory via RingBuffer. Cancellation via abort().
+ */
+
+export interface AgentProcess {
+  /** Underlying child process PID */
+  pid: number;
+
+  /** Resolves when process exits */
+  completion: Promise<AgentProcessResult>;
+
+  /** Abort the process (SIGTERM, then SIGKILL after grace period) */
+  abort(): void;
+
+  /** Streaming messages from the agent process (if supported by the adapter) */
+  messages?: AsyncIterable<AgentMessage>;
+}
+
+export type AgentMessageType = 'text' | 'thinking' | 'tool_use' | 'tool_result' | 'error' | 'status';
+
+export interface AgentMessage {
+  type: AgentMessageType;
+  content?: string;
+  tool?: string;
+  callId?: string;
+  input?: Record<string, unknown>;
+  output?: string;
+  /** Token usage snapshot (cumulative, present on 'assistant' messages from Claude) */
+  usage?: TokenUsage;
+}
+
+export interface TokenUsage {
+  inputTokens: number;
+  outputTokens: number;
+  cacheReadTokens: number;
+  cacheWriteTokens: number;
+  model?: string;
+}
+
+export interface AgentProcessResult {
+  exitCode: number | null;
+  signal: string | null;
+  /** Last N lines of combined stdout+stderr (ring buffer, not full capture) */
+  tailOutput: string;
+  /** Whether the process was killed by timeout or abort */
+  killed: boolean;
+  /** Accumulated token usage per model (populated by streaming adapters) */
+  tokenUsage?: Record<string, TokenUsage>;
+  /** Session ID (populated by Claude stream-json adapter for session reuse) */
+  sessionId?: string;
+}
+
+export interface SpawnOptions {
+  cwd: string;
+  env?: Record<string, string>;
+  /** Per-task timeout in ms (default: 600_000 = 10 min) */
+  timeoutMs?: number;
+  /** Ring buffer size in lines (default: 50) */
+  tailLines?: number;
+  /** Resume a previous agent session (supported by Claude --resume) */
+  resumeSessionId?: string;
+}
+
+export interface AgentAdapter {
+  /** Adapter display name (e.g. 'claude', 'codex', 'gemini') */
+  name: string;
+
+  /** Check if the CLI tool is installed and accessible */
+  available(): Promise<boolean>;
+
+  /** Spawn agent process — returns handle immediately, does NOT wait for completion */
+  spawn(prompt: string, opts: SpawnOptions): AgentProcess;
+}