pi-harness-delegate 0.2.0 → 0.2.2

package/extensions/config.ts

@@ -61,16 +61,17 @@ export function loadConfig(): DelegateConfig {
     // Legacy claudeDelegate -> delegate.harnesses.claude migration
     if (settings.claudeDelegate && !settings.delegate) {
       const c = settings.claudeDelegate as Partial<DelegateConfig>;
-      if (typeof c.model === 'string') cfg.harnesses['claude'] = { ...(cfg.harnesses['claude'] ?? {}), model: c.model };
+      if (typeof c.model === 'string') cfg.harnesses.claude = { ...(cfg.harnesses.claude ?? {}), model: c.model };
       if (typeof c.timeoutMs === 'number' && c.timeoutMs > 0) cfg.timeoutMs = c.timeoutMs;
       if (typeof c.defaultMode === 'string') cfg.defaultMode = c.defaultMode;
       if (typeof c.allowDangerous === 'boolean') cfg.allowDangerous = c.allowDangerous;
       if (typeof c.inspectThinking === 'boolean') cfg.inspectThinking = c.inspectThinking;
-      if (typeof (c as DelegateConfig).maxBudgetUsd === 'number' && (c as DelegateConfig).maxBudgetUsd! > 0)
-        cfg.maxBudgetUsd = (c as DelegateConfig).maxBudgetUsd;
+      const maxBudgetLegacy = (c as DelegateConfig).maxBudgetUsd;
+      if (typeof maxBudgetLegacy === 'number' && maxBudgetLegacy > 0) cfg.maxBudgetUsd = maxBudgetLegacy;
       if (typeof c.autoDelegateHints === 'boolean') cfg.autoDelegateHints = c.autoDelegateHints;
-      if ((c as DelegateConfig).modelAliases && typeof (c as DelegateConfig).modelAliases === 'object') {
-        for (const [k, v] of Object.entries((c as DelegateConfig).modelAliases!)) {
+      const legacyAliases = (c as DelegateConfig).modelAliases;
+      if (legacyAliases && typeof legacyAliases === 'object') {
+        for (const [k, v] of Object.entries(legacyAliases)) {
           if (typeof v === 'string' && v) cfg.modelAliases[k] = v;
         }
       }
@@ -134,8 +135,8 @@ export function loadConfig(): DelegateConfig {
     // also support legacy claudeDelegate merged when delegate also present (delegate wins)
     if (settings.claudeDelegate) {
       const c = settings.claudeDelegate as Partial<DelegateConfig>;
-      if (typeof c.model === 'string' && !cfg.harnesses['claude']?.model) {
-        cfg.harnesses['claude'] = { ...(cfg.harnesses['claude'] ?? {}), model: c.model };
+      if (typeof c.model === 'string' && !cfg.harnesses.claude?.model) {
+        cfg.harnesses.claude = { ...(cfg.harnesses.claude ?? {}), model: c.model };
       }
     }
   } catch {
@@ -158,7 +159,10 @@ export function getMaxConcurrent(cfg: DelegateConfig, harness?: string): number
   if (typeof cfg.maxConcurrent === 'number') return cfg.maxConcurrent;
   // if object shape {global, perHarness}
   const mc = cfg.maxConcurrent as unknown as { global?: number; perHarness?: Record<string, number> };
-  if (harness && mc.perHarness && typeof mc.perHarness[harness] === 'number') return mc.perHarness[harness]!;
+  if (harness && mc.perHarness && typeof mc.perHarness[harness] === 'number') {
+    const v = mc.perHarness[harness];
+    if (typeof v === 'number') return v;
+  }
   if (typeof mc.global === 'number') return mc.global;
   return 1;
 }

package/extensions/harnesses/amp.ts

@@ -10,82 +10,179 @@ import type {
 } from './types.ts';
 
 const execFileAsync = promisify(execFile);
-
 function isRecord(v: unknown): v is Record<string, unknown> {
   return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
-
 const PERMISSION_MAP: Record<NormalizedPermission, string> = {
   readonly: 'read-only',
   edit: 'workspace',
   danger: 'danger',
 };
-
 function extractAmpText(o: Record<string, unknown>): string | undefined {
   if (typeof o.text === 'string') return o.text;
   if (typeof o.output === 'string') return o.output;
   if (typeof o.delta === 'string') return o.delta;
   if (typeof o.content === 'string') return o.content;
+  if (isRecord(o.part) && typeof o.part.text === 'string') return o.part.text;
   return undefined;
 }
-
 export function parseAmpLine(line: string, state: ParseState): ParseOutcome {
   let o: unknown;
   try {
     o = JSON.parse(line);
   } catch {
-    if (line.trim().length > 0) return { streamedText: line + '\n', activities: [] };
+    if (line.trim().length > 0) return { streamedText: `${line}\n`, activities: [] };
     return { activities: [] };
   }
   if (!isRecord(o)) return { activities: [] };
   const activities: ParseOutcome['activities'] = [];
   let streamedText: string | undefined;
   const typeStr = typeof o.type === 'string' ? o.type : '';
-
+  // latch session id
+  if (typeStr === 'session' && typeof o.id === 'string') {
+    (state as unknown as Record<string, unknown>)._harness = {
+      ...(((state as unknown as Record<string, unknown>)._harness as Record<string, unknown>) ?? {}),
+      sessionId: o.id,
+    };
+  }
+  if (isRecord(o.part) && typeof (o.part as Record<string, unknown>).sessionID === 'string') {
+    (state as unknown as Record<string, unknown>)._harness = {
+      ...(((state as unknown as Record<string, unknown>)._harness as Record<string, unknown>) ?? {}),
+      sessionId: (o.part as Record<string, unknown>).sessionID as string,
+    };
+  }
+  if (typeStr === 'session' && typeof (o as Record<string, unknown>).sessionID === 'string') {
+    (state as unknown as Record<string, unknown>)._harness = {
+      ...(((state as unknown as Record<string, unknown>)._harness as Record<string, unknown>) ?? {}),
+      sessionId: (o as Record<string, unknown>).sessionID as string,
+    };
+  }
   if (typeStr.includes('tool') || o.type === 'tool_use') {
     const name = typeof o.name === 'string' ? o.name : 'tool';
     if (typeStr.includes('start') || o.type === 'tool_use') {
       activities.push({ kind: 'tool_start', name });
       if (isRecord(o.input)) activities.push({ kind: 'tool_input', name, input: o.input as Record<string, unknown> });
-    } else {
-      activities.push({ kind: 'tool_result', isError: o.is_error === true });
-    }
+    } else activities.push({ kind: 'tool_result', isError: o.is_error === true });
   }
   if (typeStr.includes('thinking')) activities.push({ kind: 'thinking', chars: 10 });
-
+  if (typeStr === 'message_update' && isRecord(o.assistantMessageEvent)) {
+    const ev = o.assistantMessageEvent as Record<string, unknown>;
+    if (ev.type === 'thinking_delta' && typeof ev.delta === 'string')
+      activities.push({ kind: 'thinking', chars: ev.delta.length });
+    else if (ev.type === 'text_delta' && typeof ev.delta === 'string') streamedText = ev.delta;
+    else if (ev.type === 'thinking_start') activities.push({ kind: 'thinking', chars: 5 });
+  }
+  if (typeStr === 'turn_end' || typeStr === 'agent_end') {
+    const msg = isRecord(o.message) ? o.message : null;
+    if (msg && Array.isArray(msg.content)) {
+      for (const block of msg.content as unknown[]) {
+        if (isRecord(block) && block.type === 'text' && typeof block.text === 'string') streamedText = block.text;
+        if (isRecord(block) && block.type === 'thinking' && typeof block.thinking === 'string')
+          activities.push({ kind: 'thinking', chars: (block.thinking as string).length });
+      }
+    }
+    if (Array.isArray(o.messages)) {
+      const last = o.messages[o.messages.length - 1] as unknown;
+      if (isRecord(last) && Array.isArray(last.content)) {
+        for (const block of last.content as unknown[]) {
+          if (isRecord(block) && block.type === 'text' && typeof block.text === 'string' && !streamedText)
+            streamedText = block.text as string;
+        }
+      }
+    }
+  }
   const text = extractAmpText(o);
-  if (text && !typeStr.includes('tool')) streamedText = text;
-
-  if (o.type === 'result' || o.type === 'done' || o.type === 'completed') {
-    const usage = isRecord(o.usage) ? o.usage : null;
+  if (text && !typeStr.includes('tool') && !streamedText) streamedText = text;
+  if (
+    o.type === 'result' ||
+    o.type === 'done' ||
+    o.type === 'completed' ||
+    typeStr === 'turn_end' ||
+    typeStr === 'agent_end'
+  ) {
+    const usage = isRecord(o.usage)
+      ? o.usage
+      : isRecord(o.message) && isRecord((o.message as Record<string, unknown>).usage)
+        ? ((o.message as Record<string, unknown>).usage as Record<string, unknown>)
+        : null;
+    const actualUsage = isRecord(usage)
+      ? usage
+      : isRecord(o.message) && isRecord((o.message as Record<string, unknown>).usage)
+        ? ((o.message as Record<string, unknown>).usage as Record<string, unknown>)
+        : null;
+    const msg = isRecord(o.message) ? o.message : null;
+    const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+      ?.sessionId as string | undefined;
+    const cost =
+      isRecord(actualUsage) && typeof (actualUsage as Record<string, unknown>).total === 'number'
+        ? ((actualUsage as Record<string, unknown>).total as number)
+        : typeof o.total_cost_usd === 'number'
+          ? o.total_cost_usd
+          : 0;
+    const inputTokens = isRecord(actualUsage)
+      ? typeof (actualUsage as Record<string, unknown>).input === 'number'
+        ? ((actualUsage as Record<string, unknown>).input as number)
+        : typeof (actualUsage as Record<string, unknown>).input_tokens === 'number'
+          ? ((actualUsage as Record<string, unknown>).input_tokens as number)
+          : 0
+      : 0;
+    const outputTokens = isRecord(actualUsage)
+      ? typeof (actualUsage as Record<string, unknown>).output === 'number'
+        ? ((actualUsage as Record<string, unknown>).output as number)
+        : typeof (actualUsage as Record<string, unknown>).output_tokens === 'number'
+          ? ((actualUsage as Record<string, unknown>).output_tokens as number)
+          : 0
+      : 0;
     const result: StreamedResult = {
-      result: typeof o.result === 'string' ? o.result : state.streamedText + (streamedText ?? ''),
+      result:
+        typeof o.result === 'string'
+          ? o.result
+          : streamedText
+            ? state.streamedText + streamedText
+            : state.streamedText || (text ?? ''),
       isError: o.is_error === true,
-      numTurns: typeof o.num_turns === 'number' ? o.num_turns : 0,
-      totalCostUsd: typeof o.total_cost_usd === 'number' ? o.total_cost_usd : 0,
-      sessionId: typeof o.session_id === 'string' ? o.session_id : null,
-      stopReason: typeof o.stop_reason === 'string' ? o.stop_reason : null,
+      numTurns: 1,
+      totalCostUsd: typeof cost === 'number' ? cost : 0,
+      sessionId: typeof o.session_id === 'string' ? o.session_id : typeof o.id === 'string' ? o.id : (latched ?? null),
+      stopReason:
+        typeof o.stop_reason === 'string'
+          ? o.stop_reason
+          : typeof msg?.stopReason === 'string'
+            ? (msg.stopReason as string)
+            : null,
       permissionDenials: [],
-      durationMs: typeof o.duration_ms === 'number' ? o.duration_ms : null,
+      durationMs:
+        typeof o.duration_ms === 'number'
+          ? o.duration_ms
+          : typeof (o as Record<string, unknown>).duration === 'number'
+            ? ((o as Record<string, unknown>).duration as number)
+            : null,
       durationApiMs: null,
-      ttftMs: null,
-      model: typeof o.model === 'string' ? o.model : null,
+      ttftMs:
+        typeof (o as Record<string, unknown>).ttft === 'number'
+          ? ((o as Record<string, unknown>).ttft as number)
+          : null,
+      model: typeof o.model === 'string' ? o.model : typeof msg?.model === 'string' ? (msg.model as string) : null,
       contextWindow: null,
       maxOutputTokens: null,
-      usage: usage
-        ? {
-            inputTokens: typeof usage.input_tokens === 'number' ? usage.input_tokens : 0,
-            outputTokens: typeof usage.output_tokens === 'number' ? usage.output_tokens : 0,
-            cacheCreationInputTokens: 0,
-            cacheReadInputTokens: 0,
-          }
-        : null,
+      usage:
+        actualUsage && (inputTokens || outputTokens)
+          ? {
+              inputTokens,
+              outputTokens,
+              cacheCreationInputTokens: 0,
+              cacheReadInputTokens:
+                typeof (actualUsage as Record<string, unknown>).cacheRead === 'number'
+                  ? ((actualUsage as Record<string, unknown>).cacheRead as number)
+                  : 0,
+            }
+          : null,
     };
+    if (!result.result) result.result = state.streamedText + (streamedText ?? '');
     return { activities, streamedText, result };
   }
   return { activities, streamedText };
 }
-
 export const ampHarness: Harness = {
   name: 'amp',
   displayName: 'Amp',
@@ -117,12 +214,14 @@ export const ampHarness: Harness = {
   extractResult(state: ParseState): StreamedResult | null {
     if (state.result) return state.result;
     if (state.streamedText.trim().length > 0) {
+      const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+        ?.sessionId as string | undefined;
       return {
         result: state.streamedText,
         isError: false,
         numTurns: 1,
         totalCostUsd: 0,
-        sessionId: null,
+        sessionId: latched ?? null,
         stopReason: null,
         permissionDenials: [],
         durationMs: null,
@@ -136,9 +235,5 @@ export const ampHarness: Harness = {
     }
     return null;
   },
-  permissionMap: {
-    readonly: ['read-only'],
-    edit: ['workspace'],
-    danger: ['danger'],
-  },
+  permissionMap: { readonly: ['read-only'], edit: ['workspace'], danger: ['danger'] },
 };

package/extensions/harnesses/codex.ts

@@ -10,23 +10,15 @@ import type {
 } from './types.ts';
 
 const execFileAsync = promisify(execFile);
-
 function isRecord(v: unknown): v is Record<string, unknown> {
   return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
-
 const SANDBOX_MAP: Record<NormalizedPermission, string> = {
   readonly: 'read-only',
   edit: 'workspace-write',
   danger: 'danger-full-access',
 };
-
-function extractTextFromCodexEvent(o: Record<string, unknown>, state: ParseState): string | undefined {
-  // Codex JSON variants: try common shapes
-  // 1. {type:"item.completed", item:{type:"agent_message", text:"..."}}
-  // 2. {type:"thread.item.completed", item:{type:"agent_message", ...}}
-  // 3. {type:"event", event:{type:"response.output_text.delta", delta:"..."}}
-  // 4. Plain {"text":"..."} or {"output":"..."}
+function extractTextFromCodexEvent(o: Record<string, unknown>, _state: ParseState): string | undefined {
   if (typeof o.text === 'string' && o.type !== 'tool_use') return o.text;
   if (typeof o.output === 'string') return o.output;
   if (typeof o.delta === 'string') return o.delta;
@@ -35,31 +27,66 @@ function extractTextFromCodexEvent(o: Record<string, unknown>, state: ParseState
     return (o.event as Record<string, unknown>).delta as string;
   if (isRecord(o.item) && typeof o.item.text === 'string') return o.item.text;
   if (isRecord(o.item) && typeof o.item.output === 'string') return o.item.output;
-  // agent_message
   if (o.type === 'agent_message' && typeof o.text === 'string') return o.text;
+  if (o.type === 'error' && typeof o.message === 'string') return o.message;
+  if (typeof o.error === 'string') return o.error;
   return undefined;
 }
-
 export function parseCodexLine(line: string, state: ParseState): ParseOutcome {
   let o: unknown;
   try {
     o = JSON.parse(line);
   } catch {
-    // Non-JSON line: treat as streamed text (codex may emit plain text)
-    if (line.trim().length > 0) return { streamedText: line + '\n', activities: [] };
+    if (line.trim().length > 0) return { streamedText: `${line}\n`, activities: [] };
     return { activities: [] };
   }
   if (!isRecord(o)) return { activities: [] };
-
   const activities: ParseOutcome['activities'] = [];
   let streamedText: string | undefined;
-
-  // Tool activity heuristics
-  // Codex may emit: {type:"item.started", item:{type:"tool_use", name:"...", input:{}}}
-  // or {type:"tool_use", name:"..."}
-  const item = isRecord(o.item) ? o.item : null;
   const typeStr = typeof o.type === 'string' ? o.type : '';
-
+  const item = isRecord(o.item) ? o.item : null;
+  // latch thread_id from thread.started
+  if (typeStr === 'thread.started' && typeof o.thread_id === 'string') {
+    (state as unknown as Record<string, unknown>)._harness = {
+      ...(((state as unknown as Record<string, unknown>)._harness as Record<string, unknown>) ?? {}),
+      sessionId: o.thread_id,
+    };
+    return { activities, streamedText };
+  }
+  if (typeStr === 'turn.started') return { activities, streamedText };
+  if (typeStr === 'error' && typeof o.message === 'string') {
+    streamedText = o.message;
+  }
+  if (typeof o.error === 'string' && !streamedText) streamedText = o.error;
+  if (typeStr === 'turn.failed') {
+    const msg =
+      isRecord(o.error) && typeof o.error.message === 'string'
+        ? o.error.message
+        : typeof o.error === 'string'
+          ? o.error
+          : typeof o.message === 'string'
+            ? o.message
+            : state.streamedText + (streamedText ?? '');
+    const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+      ?.sessionId as string | undefined;
+    const result: StreamedResult = {
+      result: msg,
+      isError: true,
+      numTurns: 1,
+      totalCostUsd: 0,
+      sessionId: typeof o.thread_id === 'string' ? o.thread_id : (latched ?? null),
+      stopReason: 'error',
+      permissionDenials: [],
+      durationMs: null,
+      durationApiMs: null,
+      ttftMs: null,
+      model: null,
+      contextWindow: null,
+      maxOutputTokens: null,
+      usage: null,
+    };
+    return { activities, streamedText, result };
+  }
   if (typeStr.includes('tool') || typeStr.includes('item.started') || typeStr.includes('function_call')) {
     const toolName = (item && typeof item.name === 'string' ? item.name : typeof o.name === 'string' ? o.name : null) as
       | string
@@ -68,38 +95,33 @@ export function parseCodexLine(line: string, state: ParseState): ParseOutcome {
       if (typeStr.includes('started') || o.type === 'tool_use') {
         activities.push({ kind: 'tool_start', name: toolName });
         if (item && isRecord(item.input))
-          activities.push({
-            kind: 'tool_input',
-            name: toolName,
-            input: item.input as Record<string, unknown>,
-          });
+          activities.push({ kind: 'tool_input', name: toolName, input: item.input as Record<string, unknown> });
         else if (isRecord(o.input))
           activities.push({ kind: 'tool_input', name: toolName, input: o.input as Record<string, unknown> });
-      } else if (typeStr.includes('completed') || typeStr.includes('result')) {
+      } else if (typeStr.includes('completed') || typeStr.includes('result'))
         activities.push({ kind: 'tool_result', isError: o.is_error === true || o.error === true });
-      }
     }
   }
-  if (o.type === 'tool_result' || (typeStr === 'item.completed' && item?.type === 'tool_result')) {
+  if (o.type === 'tool_result' || (typeStr === 'item.completed' && item?.type === 'tool_result'))
     activities.push({ kind: 'tool_result', isError: (o as Record<string, unknown>).is_error === true });
-  }
   if (typeStr.includes('thinking') || o.type === 'reasoning' || item?.type === 'reasoning') {
     const thinkingText = extractTextFromCodexEvent(o, state);
     if (thinkingText) activities.push({ kind: 'thinking', chars: thinkingText.length });
     else activities.push({ kind: 'thinking', chars: 10 });
   }
-
-  // Text extraction
   const text = extractTextFromCodexEvent(o, state);
-  if (text && !typeStr.includes('tool') && !typeStr.includes('thinking')) {
-    // Avoid double-counting tool inputs as text
+  if (
+    text &&
+    !typeStr.includes('tool') &&
+    !typeStr.includes('thinking') &&
+    typeStr !== 'error' &&
+    typeStr !== 'turn.failed'
+  )
     streamedText = text;
-  }
-
-  // Result detection: final result often {type:"result", result:"...", total_cost_usd, usage, ...}
-  // or {type:"thread.completed", ...}
   if (o.type === 'result' || o.type === 'thread.completed' || o.type === 'task.completed') {
     const usage = isRecord(o.usage) ? o.usage : null;
+    const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+      ?.sessionId as string | undefined;
     const result: StreamedResult = {
       result:
         typeof o.result === 'string'
@@ -117,7 +139,7 @@ export function parseCodexLine(line: string, state: ParseState): ParseOutcome {
             ? o.thread_id
             : typeof o.id === 'string'
               ? o.id
-              : null,
+              : (latched ?? null),
       stopReason: typeof o.stop_reason === 'string' ? o.stop_reason : null,
       permissionDenials: Array.isArray(o.permission_denials) ? o.permission_denials : [],
       durationMs: typeof o.duration_ms === 'number' ? o.duration_ms : null,
@@ -153,10 +175,8 @@ export function parseCodexLine(line: string, state: ParseState): ParseOutcome {
     };
     return { activities, streamedText, result };
   }
-
   return { activities, streamedText };
 }
-
 export const codexHarness: Harness = {
   name: 'codex',
   displayName: 'Muse',
@@ -170,7 +190,6 @@ export const codexHarness: Harness = {
     }
   },
   buildArgs(opts: BuildArgsOpts): string[] {
-    // codex exec --json <prompt> --sandbox <level> --ask-for-approval <level>
     const sandbox = opts.nativePermission ?? SANDBOX_MAP[opts.permission] ?? 'workspace-write';
     const args = ['exec', '--json', opts.prompt, '--sandbox', sandbox];
     if (opts.permission === 'danger' || sandbox === 'danger-full-access') args.push('--ask-for-approval', 'never');
@@ -178,7 +197,6 @@ export const codexHarness: Harness = {
     else args.push('--ask-for-approval', 'on-request');
     if (opts.model) args.push('--model', opts.model);
     if (opts.resumeSessionId) args.push('--thread-id', opts.resumeSessionId);
-    // maxBudgetUsd not natively supported; pass as env hint via --config if needed
     for (const dir of opts.addDirs ?? []) args.push('--add-dir', dir);
     return args;
   },
@@ -187,14 +205,15 @@ export const codexHarness: Harness = {
   },
   extractResult(state: ParseState): StreamedResult | null {
     if (state.result) return state.result;
-    // Fallback: if no explicit result, synthesize from streamed text if any
     if (state.streamedText.trim().length > 0) {
+      const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+        ?.sessionId as string | undefined;
       return {
         result: state.streamedText,
         isError: false,
         numTurns: 1,
         totalCostUsd: 0,
-        sessionId: null,
+        sessionId: latched ?? null,
         stopReason: null,
         permissionDenials: [],
         durationMs: null,
@@ -208,9 +227,5 @@ export const codexHarness: Harness = {
     }
     return null;
   },
-  permissionMap: {
-    readonly: ['read-only'],
-    edit: ['workspace-write'],
-    danger: ['danger-full-access'],
-  },
+  permissionMap: { readonly: ['read-only'], edit: ['workspace-write'], danger: ['danger-full-access'] },
 };

package/extensions/harnesses/opencode.ts

@@ -10,40 +10,53 @@ import type {
 } from './types.ts';
 
 const execFileAsync = promisify(execFile);
-
 function isRecord(v: unknown): v is Record<string, unknown> {
   return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
-
 const PERMISSION_MAP: Record<NormalizedPermission, string> = {
   readonly: 'read-only',
   edit: 'allow-edit',
   danger: 'danger',
 };
-
 function extractOpencodeText(o: Record<string, unknown>): string | undefined {
   if (typeof o.text === 'string') return o.text;
   if (typeof o.output === 'string') return o.output;
   if (typeof o.delta === 'string') return o.delta;
   if (typeof o.content === 'string') return o.content;
+  if (isRecord(o.part) && typeof o.part.text === 'string') return o.part.text;
   if (isRecord(o.event) && typeof o.event.text === 'string') return o.event.text;
   if (isRecord(o.message) && typeof o.message.text === 'string') return o.message.text;
   return undefined;
 }
-
 export function parseOpencodeLine(line: string, state: ParseState): ParseOutcome {
   let o: unknown;
   try {
     o = JSON.parse(line);
   } catch {
-    if (line.trim().length > 0) return { streamedText: line + '\n', activities: [] };
+    if (line.trim().length > 0) return { streamedText: `${line}\n`, activities: [] };
     return { activities: [] };
   }
   if (!isRecord(o)) return { activities: [] };
   const activities: ParseOutcome['activities'] = [];
   let streamedText: string | undefined;
   const typeStr = typeof o.type === 'string' ? o.type : '';
-
+  // latch sessionID from step_start
+  if (typeStr === 'step_start' && typeof o.sessionID === 'string') {
+    (state as unknown as Record<string, unknown>)._harness = {
+      ...(((state as unknown as Record<string, unknown>)._harness as Record<string, unknown>) ?? {}),
+      sessionId: o.sessionID,
+    };
+  }
+  if (
+    isRecord(o.part) &&
+    typeof (o.part as Record<string, unknown>).sessionID === 'string' &&
+    !((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)?.sessionId
+  ) {
+    (state as unknown as Record<string, unknown>)._harness = {
+      ...(((state as unknown as Record<string, unknown>)._harness as Record<string, unknown>) ?? {}),
+      sessionId: (o.part as Record<string, unknown>).sessionID as string,
+    };
+  }
   if (typeStr.includes('tool') || o.type === 'tool_use' || o.type === 'tool_result') {
     const name =
       typeof o.name === 'string'
@@ -54,19 +67,59 @@ export function parseOpencodeLine(line: string, state: ParseState): ParseOutcome
     if (typeStr.includes('start') || o.type === 'tool_use') {
       activities.push({ kind: 'tool_start', name });
       if (isRecord(o.input)) activities.push({ kind: 'tool_input', name, input: o.input as Record<string, unknown> });
-    } else if (typeStr.includes('result') || typeStr.includes('completed') || o.type === 'tool_result') {
+    } else if (typeStr.includes('result') || typeStr.includes('completed') || o.type === 'tool_result')
       activities.push({ kind: 'tool_result', isError: o.is_error === true || o.error === true });
-    }
   }
-  if (typeStr.includes('thinking') || o.type === 'reasoning') {
-    activities.push({ kind: 'thinking', chars: 10 });
-  }
-
-  const text = extractOpencodeText(o);
-  if (text && !typeStr.includes('tool') && !typeStr.includes('thinking')) streamedText = text;
-
-  if (o.type === 'result' || o.type === 'completed' || o.type === 'done') {
-    const usage = isRecord(o.usage) ? o.usage : null;
+  if (typeStr.includes('thinking') || o.type === 'reasoning') activities.push({ kind: 'thinking', chars: 10 });
+  const directText = extractOpencodeText(o);
+  if (directText && !typeStr.includes('tool') && !typeStr.includes('thinking')) streamedText = directText;
+  if (o.type === 'text' && isRecord(o.part) && typeof o.part.text === 'string') streamedText = o.part.text;
+  if (o.type === 'result' || o.type === 'completed' || o.type === 'done' || o.type === 'step_finish') {
+    const part = isRecord(o.part) ? (o.part as Record<string, unknown>) : null;
+    const usageRaw = isRecord(o.usage)
+      ? o.usage
+      : part && isRecord((part as Record<string, unknown>).tokens)
+        ? ((part as Record<string, unknown>).tokens as Record<string, unknown>)
+        : isRecord(o.part) && isRecord((o.part as Record<string, unknown>).tokens)
+          ? ((o.part as Record<string, unknown>).tokens as Record<string, unknown>)
+          : null;
+    const usage = isRecord(usageRaw) ? usageRaw : null;
+    const tokensInput = isRecord(usage)
+      ? typeof usage.input === 'number'
+        ? usage.input
+        : typeof usage.input_tokens === 'number'
+          ? usage.input_tokens
+          : 0
+      : 0;
+    const tokensOutput = isRecord(usage)
+      ? typeof usage.output === 'number'
+        ? usage.output
+        : typeof usage.output_tokens === 'number'
+          ? usage.output_tokens
+          : 0
+      : 0;
+    const cost =
+      typeof o.total_cost_usd === 'number'
+        ? o.total_cost_usd
+        : part && typeof (part as Record<string, unknown>).cost === 'number'
+          ? ((part as Record<string, unknown>).cost as number)
+          : typeof o.cost === 'number'
+            ? (o.cost as number)
+            : 0;
+    const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+      ?.sessionId as string | undefined;
+    const sessionId =
+      typeof o.session_id === 'string'
+        ? o.session_id
+        : typeof o.sessionID === 'string'
+          ? o.sessionID
+          : typeof (o as Record<string, unknown>).sessionID === 'string'
+            ? ((o as Record<string, unknown>).sessionID as string)
+            : part && typeof (part as Record<string, unknown>).sessionID === 'string'
+              ? ((part as Record<string, unknown>).sessionID as string)
+              : typeof o.id === 'string'
+                ? o.id
+                : (latched ?? null);
     const result: StreamedResult = {
       result:
         typeof o.result === 'string'
@@ -76,9 +129,14 @@ export function parseOpencodeLine(line: string, state: ParseState): ParseOutcome
             : state.streamedText + (streamedText ?? ''),
       isError: o.is_error === true,
       numTurns: typeof o.num_turns === 'number' ? o.num_turns : 0,
-      totalCostUsd: typeof o.total_cost_usd === 'number' ? o.total_cost_usd : 0,
-      sessionId: typeof o.session_id === 'string' ? o.session_id : typeof o.id === 'string' ? o.id : null,
-      stopReason: typeof o.stop_reason === 'string' ? o.stop_reason : null,
+      totalCostUsd: cost,
+      sessionId,
+      stopReason:
+        typeof o.stop_reason === 'string'
+          ? o.stop_reason
+          : part && typeof (part as Record<string, unknown>).reason === 'string'
+            ? ((part as Record<string, unknown>).reason as string)
+            : null,
       permissionDenials: [],
       durationMs: typeof o.duration_ms === 'number' ? o.duration_ms : null,
       durationApiMs: null,
@@ -87,19 +145,13 @@ export function parseOpencodeLine(line: string, state: ParseState): ParseOutcome
       contextWindow: null,
       maxOutputTokens: null,
       usage: usage
-        ? {
-            inputTokens: typeof usage.input_tokens === 'number' ? usage.input_tokens : 0,
-            outputTokens: typeof usage.output_tokens === 'number' ? usage.output_tokens : 0,
-            cacheCreationInputTokens: 0,
-            cacheReadInputTokens: 0,
-          }
+        ? { inputTokens: tokensInput, outputTokens: tokensOutput, cacheCreationInputTokens: 0, cacheReadInputTokens: 0 }
         : null,
     };
     return { activities, streamedText, result };
   }
   return { activities, streamedText };
 }
-
 export const opencodeHarness: Harness = {
   name: 'opencode',
   displayName: 'OpenCode',
@@ -113,10 +165,8 @@ export const opencodeHarness: Harness = {
     }
   },
   buildArgs(opts: BuildArgsOpts): string[] {
-    const args = ['run', '--format', 'json', opts.prompt];
-    // permission not fully standardized; pass as --permission if supported
     const perm = opts.nativePermission ?? PERMISSION_MAP[opts.permission] ?? 'allow-edit';
-    args.push('--permission', perm);
+    const args = ['run', '--format', 'json', opts.prompt, '--permission', perm];
     if (opts.model) args.push('--model', opts.model);
     if (opts.resumeSessionId) args.push('--session', opts.resumeSessionId);
     for (const dir of opts.addDirs ?? []) args.push('--add-dir', dir);
@@ -128,12 +178,14 @@ export const opencodeHarness: Harness = {
   extractResult(state: ParseState): StreamedResult | null {
     if (state.result) return state.result;
     if (state.streamedText.trim().length > 0) {
+      const latched = ((state as unknown as Record<string, unknown>)._harness as Record<string, unknown> | undefined)
+        ?.sessionId as string | undefined;
       return {
         result: state.streamedText,
         isError: false,
         numTurns: 1,
         totalCostUsd: 0,
-        sessionId: null,
+        sessionId: latched ?? null,
         stopReason: null,
         permissionDenials: [],
         durationMs: null,
@@ -147,9 +199,5 @@ export const opencodeHarness: Harness = {
     }
     return null;
   },
-  permissionMap: {
-    readonly: ['read-only'],
-    edit: ['allow-edit'],
-    danger: ['danger'],
-  },
+  permissionMap: { readonly: ['read-only'], edit: ['allow-edit'], danger: ['danger'] },
 };

package/extensions/index.ts

@@ -451,10 +451,11 @@ async function delegate(
     throw new Error('another delegate run is already in progress (global limit)');
   // per-harness limit if configured as object
   const perHarnessLimit = (() => {
-    // SAFETY: maxConcurrent shape checked for perHarness record before access
-    const mc = config.maxConcurrent as unknown as { perHarness?: Record<string, number> }; // SAFETY: shape checked before access
-    if (mc && typeof mc === 'object' && mc.perHarness && typeof mc.perHarness[harnessName] === 'number')
-      return mc.perHarness[harnessName]!;
+    const mc = config.maxConcurrent as unknown as { perHarness?: Record<string, number> };
+    if (mc && typeof mc === 'object' && mc.perHarness && typeof mc.perHarness[harnessName] === 'number') {
+      const v = mc.perHarness[harnessName];
+      if (typeof v === 'number') return v;
+    }
     return maxGlobal;
   })();
   if (perHarnessLimit > 0 && perHarnessCount >= perHarnessLimit)
@@ -1034,7 +1035,7 @@ export default function (pi: ExtensionAPI) {
       } else if (ev.kind === 'tool_result') {
         if (chipActivity.startsWith('▶')) chipActivity += ev.isError ? ' ✗' : ' ✓';
         const last = feed.length - 1;
-        if (last >= 0 && feed[last].kind === 'tool') feed[last] = { ...feed[last], ok: ev.isError ? false : true };
+        if (last >= 0 && feed[last].kind === 'tool') feed[last] = { ...feed[last], ok: !ev.isError };
       } else if (ev.kind === 'thinking') {
         chipActivity = '💭 thinking…';
         thinkingChars += ev.chars;

package/extensions/run-claude.ts

@@ -32,7 +32,7 @@ function mapPerm(mode: string): 'readonly' | 'edit' | 'danger' {
 
 export function runClaude(opts: RunClaudeOptions): Promise<ClaudeResult> {
   const perm = mapPerm(opts.permissionMode);
-  const nativePerm =
+  const _nativePerm =
     perm === 'readonly' && opts.permissionMode !== 'plan'
       ? opts.permissionMode
       : perm === 'danger' && opts.permissionMode !== 'bypassPermissions'

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pi-harness-delegate",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Delegate work to any harness (Claude Code, Muse, OpenCode, Amp) from the pi coding agent \u2014 code reviews, plans, implementation, security audits, docs, or your own custom templates.",
   "type": "module",
   "packageManager": "bun@1.3.14",
   "engines": {
-    "node": "26.x"
+    "node": "22 || 24 || 26"
   },
   "files": [
     "extensions",
@@ -58,7 +58,7 @@
     "@earendil-works/pi-ai": "0.84.3",
     "@earendil-works/pi-coding-agent": "0.84.3",
     "@earendil-works/pi-tui": "0.84.3",
-    "@types/node": "26.3.0",
+    "@types/node": "22.15.32",
     "typebox": "1.3.18",
     "typescript": "7.0.2"
   },