@pikiloom/kernel 0.1.4 → 0.1.5

package/dist/drivers/claude.js

@@ -232,6 +232,23 @@ export function handleClaudeEvent(ev, s, emit) {
             s.cacheCreation = u?.cache_creation_input_tokens ?? 0;
             s.output = 0;
         }
+        else if (inner.type === 'content_block_start') {
+            // Claude emits multiple text/thinking blocks per turn (one set per tool-use round). Insert a
+            // paragraph break before a NEW block when prior content exists, so the live preview shows
+            // breaks between segments instead of running them together. Mirrors the legacy driver; the
+            // separator is emitted as a delta so the runtime's accumulated snapshot stays in sync with s.
+            const bt = inner.content_block?.type;
+            if (bt === 'text' && s.text && !s.text.endsWith('\n\n')) {
+                const sep = s.text.endsWith('\n') ? '\n' : '\n\n';
+                s.text += sep;
+                emit({ type: 'text', delta: sep });
+            }
+            else if (bt === 'thinking' && s.reasoning && !s.reasoning.endsWith('\n\n')) {
+                const sep = s.reasoning.endsWith('\n') ? '\n' : '\n\n';
+                s.reasoning += sep;
+                emit({ type: 'reasoning', delta: sep });
+            }
+        }
         else if (inner.type === 'content_block_delta') {
             const d = inner.delta || {};
             if (d.type === 'text_delta' && d.text) {

package/dist/drivers/codex.d.ts

@@ -1,5 +1,22 @@
-import type { AgentDriver, AgentTurnInput, DriverContext, DriverResult, TuiInput, TuiSpec } from '../contracts/driver.js';
+import type { AgentDriver, AgentTurnInput, DriverContext, DriverEvent, DriverResult, TuiInput, TuiSpec } from '../contracts/driver.js';
 import type { UniversalUsage } from '../protocol/index.js';
+export declare function codexToolSummary(item: any): {
+    id: string;
+    name: string;
+    summary: string;
+} | null;
+export interface CodexContentState {
+    text: string;
+    reasoning: string;
+    streamedReasoning: boolean;
+    msgs: string[];
+    thinkParts: string[];
+}
+export declare function codexReasoningItemText(item: any): string;
+export declare function captureCodexAgentMessage(item: any, s: CodexContentState, deltaItems: Set<string>, phases: Map<string, string>, emit: (e: DriverEvent) => void): void;
+export declare function captureCodexReasoning(text: string, s: CodexContentState, emit: (e: DriverEvent) => void): void;
+export declare function codexFinalText(s: CodexContentState): string;
+export declare function codexFinalReasoning(s: CodexContentState): string;
 export declare class CodexDriver implements AgentDriver {
     private readonly bin;
     readonly id = "codex";

package/dist/drivers/codex.js

@@ -20,7 +20,12 @@ class AppServer {
     onServerRequest(cb) { this.requestResponder = cb; }
     async start() {
         const args = ['app-server'];
-        const overrides = this.configOverrides.some(c => /^features\.goals\s*=/.test(c)) ? this.configOverrides : [...this.configOverrides, 'features.goals=true'];
+        // Do NOT force model_reasoning_summary — codex reasoning summaries stay OFF by default
+        // (respecting ~/.codex/config.toml, which is the original behavior). A caller that wants
+        // thinking can pass `model_reasoning_summary=...` via configOverrides; we never inject it.
+        const overrides = [...this.configOverrides];
+        if (!overrides.some(c => /^features\.goals\s*=/.test(c)))
+            overrides.push('features.goals=true');
         for (const c of overrides)
             args.push('-c', c);
         try {
@@ -126,7 +131,12 @@ function codexFileChangeSummary(item) {
 }
 // Normalize a codex app-server item -> {id, name, summary}. The summary mirrors pikiloom's
 // vocabulary ("Run shell: <cmd>", "Edit <path>") so the activity projection reads naturally.
-function codexToolSummary(item) {
+// Only ACTUAL tool calls become Activity rows. agentMessage (the answer text) and reasoning
+// (thinking) are CONTENT — they render below as message text / thinking, never as tools. The old
+// fallback to `item.type` wrongly turned every item (incl. agentMessage/reasoning) into a bogus
+// "tool" in the Activity card. Mirrors the legacy driver's isCodexToolCallItem whitelist.
+const CODEX_TOOL_CALL_TYPES = new Set(['dynamicToolCall', 'mcpToolCall', 'collabAgentToolCall']);
+export function codexToolSummary(item) {
     const id = String(item?.id || '');
     if (!id)
         return null;
@@ -136,8 +146,13 @@ function codexToolSummary(item) {
     }
     if (item.type === 'fileChange' || item.type === 'patch')
         return { id, name: 'edit', summary: codexFileChangeSummary(item) };
-    const tool = typeof item?.tool === 'string' ? item.tool : typeof item?.name === 'string' ? item.name : item?.type;
-    return tool ? { id, name: String(tool), summary: String(tool) } : null;
+    if (CODEX_TOOL_CALL_TYPES.has(item.type)) {
+        const raw = typeof item.tool === 'string' && item.tool.trim() ? item.tool.trim()
+            : typeof item.name === 'string' && item.name.trim() ? item.name.trim() : '';
+        const name = raw ? (raw.split('.').pop() || raw) : 'tool';
+        return { id, name, summary: raw ? `Use ${name}` : 'Use tool' };
+    }
+    return null;
 }
 // codex `item/tool/requestUserInput` params -> a normalized UniversalInteraction
 // (faithful to the legacy codex driver's toAgentInteraction shape).
@@ -160,6 +175,51 @@ function codexUserInputToInteraction(params, promptId) {
         return null;
     return { promptId, kind: 'user-input', title: 'User Input Required', hint: 'Use the buttons when available, or reply with text.', questions };
 }
+// Reasoning text from a completed `reasoning` item (item/completed or rawResponseItem/completed):
+// summary/content arrays of plain strings or {text} objects.
+export function codexReasoningItemText(item) {
+    const parts = [
+        ...(Array.isArray(item?.summary) ? item.summary : []),
+        ...(Array.isArray(item?.content) ? item.content : []),
+    ];
+    return parts.map((p) => (typeof p === 'string' ? p : p?.text || '')).filter(Boolean).join('\n').trim();
+}
+// A completed final_answer agentMessage that did NOT stream deltas: append + emit it live.
+// deltaItems holds the ids already streamed, so a completed item echoing a streamed one is
+// not double-counted (matches the legacy driver's deltaSeenForItem guard).
+export function captureCodexAgentMessage(item, s, deltaItems, phases, emit) {
+    const phase = item?.phase || (item?.id ? phases.get(item.id) : null) || 'final_answer';
+    if (phase !== 'final_answer')
+        return;
+    const text = typeof item?.text === 'string' ? item.text.trim() : '';
+    if (!text)
+        return;
+    s.msgs.push(text);
+    if (item.id && deltaItems.has(item.id))
+        return;
+    const delta = s.text.trim() ? `\n\n${text}` : text;
+    s.text += delta;
+    emit({ type: 'text', delta });
+}
+// A completed reasoning item: keep it for the end-of-turn fallback, and stream it live only
+// when nothing arrived as reasoning deltas (so the streamed path is never double-emitted).
+export function captureCodexReasoning(text, s, emit) {
+    if (!text)
+        return;
+    s.thinkParts.push(text);
+    if (s.streamedReasoning)
+        return;
+    const delta = s.reasoning.trim() ? `\n\n${text}` : text;
+    s.reasoning += delta;
+    emit({ type: 'reasoning', delta });
+}
+// End-of-turn finalizers: prefer streamed text/reasoning, fall back to completed-item parts.
+export function codexFinalText(s) {
+    return s.text.trim() ? s.text : s.msgs.join('\n\n');
+}
+export function codexFinalReasoning(s) {
+    return s.reasoning.trim() ? s.reasoning : s.thinkParts.join('\n\n');
+}
 export class CodexDriver {
     bin;
     id = 'codex';
@@ -173,9 +233,10 @@ export class CodexDriver {
         // to the native account.
         const config = [...(input.configOverrides || [])];
         const srv = new AppServer(this.bin, config, input.env);
-        const state = { text: '', reasoning: '', sessionId: input.sessionId ?? null, input: null, output: null, cached: null, contextUsed: null, contextWindow: null, status: null, error: null, turnId: null };
+        const state = { text: '', reasoning: '', streamedReasoning: false, msgs: [], thinkParts: [], sessionId: input.sessionId ?? null, input: null, output: null, cached: null, contextUsed: null, contextWindow: null, status: null, error: null, turnId: null };
         const phases = new Map();
         const toolSummaries = new Map();
+        const deltaItems = new Set();
         let steerRegistered = false;
         const ok = await srv.start();
         if (!ok)
@@ -239,6 +300,8 @@ export class CodexDriver {
                         const phase = params?.itemId ? (phases.get(params.itemId) || 'final_answer') : 'final_answer';
                         if (phase === 'final_answer' && params?.delta) {
                             state.text += params.delta;
+                            if (params.itemId)
+                                deltaItems.add(params.itemId);
                             ctx.emit({ type: 'text', delta: params.delta });
                         }
                         break;
@@ -247,16 +310,28 @@ export class CodexDriver {
                     case 'item/reasoning/summaryTextDelta':
                         if (params?.delta) {
                             state.reasoning += params.delta;
+                            state.streamedReasoning = true;
                             ctx.emit({ type: 'reasoning', delta: params.delta });
                         }
                         break;
                     case 'item/completed': {
                         const item = params?.item || {};
+                        // Final answer / reasoning delivered as a completed item (no preceding deltas).
+                        if (item.type === 'agentMessage')
+                            captureCodexAgentMessage(item, state, deltaItems, phases, ctx.emit);
+                        else if (item.type === 'reasoning')
+                            captureCodexReasoning(codexReasoningItemText(item), state, ctx.emit);
                         const t = codexToolSummary(item);
                         if (t && toolSummaries.has(t.id))
                             ctx.emit({ type: 'tool', call: { id: t.id, name: t.name, summary: toolSummaries.get(t.id) || t.summary, status: item.status === 'failed' ? 'failed' : 'done' } });
                         break;
                     }
+                    case 'rawResponseItem/completed': {
+                        const item = params?.item || {};
+                        if (item?.type === 'reasoning')
+                            captureCodexReasoning(codexReasoningItemText(item), state, ctx.emit);
+                        break;
+                    }
                     case 'turn/plan/updated': {
                         const plan = planFromUpdate(params);
                         if (plan)
@@ -307,10 +382,11 @@ export class CodexDriver {
             await turnDone;
             const usage = codexUsageOf(state);
             const ok2 = (state.status === 'completed' || state.status == null) && !state.error && !ctx.signal.aborted;
+            const finalReasoning = codexFinalReasoning(state);
             return {
                 ok: ok2,
-                text: state.text,
-                reasoning: state.reasoning || undefined,
+                text: codexFinalText(state),
+                reasoning: finalReasoning || undefined,
                 error: state.error || (ctx.signal.aborted ? 'Interrupted by user.' : null),
                 stopReason: ctx.signal.aborted ? 'interrupted' : (state.status || 'end_turn'),
                 sessionId: state.sessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikiloom/kernel",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Heterogeneous coding agents (Claude / Codex / Gemini / ACP) -> an interaction-friendly, accumulating session snapshot + control handle, over pluggable surfaces (IM, Web, tunnel, TUI). The reusable core pikiloom itself is built on.",
   "type": "module",
   "license": "MIT",