@pikiloom/kernel 0.1.2 → 0.1.4

package/README.md

@@ -250,7 +250,28 @@ add an IM channel or your own UI.
 | `Catalog` | `NoopCatalog` | model/effort/tool/skill discovery for composers |
 | `InteractionHandler` | `DeferToTerminalInteractionHandler` | programmatic HITL answers (`AutoCancelInteractionHandler` for one-shots) |
 
-**Plugins** contribute per-session tools (`tools()`) and/or augment snapshots (`decorateSnapshot()`).
+**Plugins** are the registration unit for everything ONE capability adds to a session —
+register many, composed deterministically (and dynamically via `loom.registerPlugin(...)`):
+
+```ts
+interface Plugin {
+  id: string;
+  tools?(opts: { agent; workdir }): McpServerSpec[];                          // MCP servers
+  promptFragment?(opts: { agent; workdir; isFirstTurn }): string | null;       // how-to-use / behavior prompt
+  contributeSpawn?(opts: { agent; workdir; mode: 'run'|'tui'; sessionId?; model? }): SpawnContribution | null; // { env?, extraArgs?, configOverrides? }
+  decorateSnapshot?(snapshot): UniversalSnapshot;
+}
+```
+
+The kernel merges contributions per spawn — **never mutating global `process.env`** — in order
+`[ModelResolver → ToolProvider.env → plugins (registration order)]`, so a plugin can override
+the resolver (e.g. point an agent's `ANTHROPIC_BASE_URL` at a local proxy). `promptFragment`s are
+appended to the `SystemPromptBuilder` base and delivered via each agent's native mechanism. This
+is how a capability registers its tools **and** their usage prompt **and** any env/flags in one
+place — and how a model-traffic interceptor injects a redirect on both the `run()` and `tui()`
+rails without the kernel knowing anything about it. (The singular `ModelResolver` /
+`SystemPromptBuilder` ports remain the one authoritative model-credential / base-prompt source;
+plugins are the composable per-capability layer on top.)
 
 ---
 
@@ -264,7 +285,7 @@ Main entry `@pikiloom/kernel` re-exports everything. Subpaths: `@pikiloom/kernel
 - Surfaces: `WebSurface`, `CliSurface`
 - Ports/defaults: `FsSessionStore`, `NullModelResolver`, `NoopToolProvider`, `PassthroughSystemPromptBuilder`, `AutoCancelInteractionHandler`, `DeferToTerminalInteractionHandler`, `NoopCatalog`, `defaultBaseDir`
 - Protocol: `UniversalSnapshot`, `diffSnapshot`, `applySnapshotPatch`, `emptySnapshot`, `PROTOCOL_VERSION`, all wire/`Client*`/`Server*` message types
-- Types: `AgentDriver`, `AgentTurnInput`, `DriverContext`, `DriverEvent`, `DriverResult`, `LoomIO`, `PromptInput`, `Surface`, `Plugin`, `SessionStore`, `ModelResolver`, `ToolProvider`, `SystemPromptBuilder`, `InteractionHandler`, `Catalog`, …
+- Types: `AgentDriver`, `AgentTurnInput`, `DriverContext`, `DriverEvent`, `DriverResult`, `LoomIO`, `PromptInput`, `Surface`, `Plugin`, `SpawnContribution`, `SessionStore`, `ModelResolver`, `ToolProvider`, `SystemPromptBuilder`, `InteractionHandler`, `Catalog`, …
 
 ---
 

package/dist/contracts/surface.d.ts

@@ -65,11 +65,28 @@ export interface Surface {
     start(io: LoomIO, host?: TuiHost): Promise<void>;
     stop(): Promise<void>;
 }
+export interface SpawnContribution {
+    env?: Record<string, string>;
+    extraArgs?: string[];
+    configOverrides?: string[];
+}
 export interface Plugin {
     readonly id: string;
     tools?(opts: {
         agent: string;
         workdir: string;
     }): McpServerSpec[] | Promise<McpServerSpec[]>;
+    promptFragment?(opts: {
+        agent: string;
+        workdir: string;
+        isFirstTurn: boolean;
+    }): string | null | undefined | Promise<string | null | undefined>;
+    contributeSpawn?(opts: {
+        agent: string;
+        workdir: string;
+        mode: 'run' | 'tui';
+        sessionId?: string | null;
+        model?: string | null;
+    }): SpawnContribution | null | undefined | Promise<SpawnContribution | null | undefined>;
     decorateSnapshot?(snapshot: UniversalSnapshot): UniversalSnapshot;
 }

package/dist/drivers/claude.d.ts

@@ -1,5 +1,5 @@
 import type { AgentDriver, AgentTurnInput, DriverContext, DriverResult, DriverEvent, TuiInput, TuiSpec } from '../contracts/driver.js';
-import type { UniversalPlan } from '../protocol/index.js';
+import type { UniversalUsage, UniversalPlan } from '../protocol/index.js';
 export declare class ClaudeDriver implements AgentDriver {
     private readonly bin;
     readonly id = "claude";
@@ -14,6 +14,17 @@ export declare class ClaudeDriver implements AgentDriver {
     run(input: AgentTurnInput, ctx: DriverContext): Promise<DriverResult>;
     private usage;
 }
+export interface ClaudeUsageState {
+    input: number | null;
+    output: number | null;
+    cached: number | null;
+    cacheCreation?: number | null;
+    contextWindow?: number | null;
+    turnOutputTokensBase?: number | null;
+}
+export declare function claudeUsageOf(s: ClaudeUsageState): UniversalUsage;
+export declare function claudeContextWindowFromModel(model: unknown): number | null;
+export declare function claudeEffectiveContextWindow(advertised: number | null): number | null;
 export declare function handleClaudeEvent(ev: any, s: any, emit: (e: DriverEvent) => void): void;
 export declare function claudeUserMessage(text: string): string;
 export declare function emitClaudeImages(blocks: any[], s: any, emit: (e: DriverEvent) => void): void;

package/dist/drivers/claude.js

@@ -46,6 +46,8 @@ export class ClaudeDriver {
             sessionId: null, model: null,
             stopReason: null, error: null,
             input: null, output: null, cached: null,
+            cacheCreation: null,
+            contextWindow: null, turnOutputTokensBase: 0,
             subAgents: new Map(),
             tools: new Map(),
         };
@@ -141,9 +143,45 @@ export class ClaudeDriver {
         });
     }
     usage(s) {
-        return { inputTokens: s.input, outputTokens: s.output, cachedInputTokens: s.cached, contextPercent: null };
+        return claudeUsageOf(s);
     }
 }
+export function claudeUsageOf(s) {
+    const used = (s.input ?? 0) + (s.cached ?? 0) + (s.cacheCreation ?? 0) + (s.output ?? 0);
+    const window = s.contextWindow ?? null;
+    const contextPercent = window && used > 0 ? Math.min(99.9, Math.round((used / window) * 1000) / 10) : null;
+    const turnOutput = (s.turnOutputTokensBase ?? 0) + (s.output ?? 0);
+    return {
+        inputTokens: s.input,
+        outputTokens: s.output,
+        cachedInputTokens: s.cached,
+        contextUsedTokens: used > 0 ? used : null,
+        contextPercent,
+        turnOutputTokens: turnOutput > 0 ? turnOutput : null,
+    };
+}
+// Advertised context window by Claude model id (best-effort; unknown -> null so the
+// percent simply stays absent rather than wrong). Anchor-free so vendor-prefixed ids
+// (us.anthropic.claude-…) still match.
+export function claudeContextWindowFromModel(model) {
+    const id = String(model ?? '').trim().toLowerCase();
+    if (!id)
+        return null;
+    if (id === 'haiku' || /claude-haiku-/.test(id))
+        return 200_000;
+    if (id === 'opus' || id === 'sonnet' || id === 'fable')
+        return 1_000_000;
+    if (/claude-(opus|sonnet)-/.test(id) || /claude-fable-/.test(id))
+        return 1_000_000;
+    return null;
+}
+// Usable window = advertised minus Claude's max-output (20k) + autocompact (13k) reserve.
+const CLAUDE_USABLE_WINDOW_RESERVE = 33_000;
+export function claudeEffectiveContextWindow(advertised) {
+    if (advertised == null)
+        return null;
+    return advertised <= CLAUDE_USABLE_WINDOW_RESERVE ? advertised : advertised - CLAUDE_USABLE_WINDOW_RESERVE;
+}
 // Parse one claude stream-json event into kernel DriverEvents (pure + exported for
 // hermetic testing). Faithful to pikiloom's claudeParse shapes.
 export function handleClaudeEvent(ev, s, emit) {
@@ -178,16 +216,21 @@ export function handleClaudeEvent(ev, s, emit) {
             emit({ type: 'session', sessionId: ev.session_id });
         }
         s.model = ev.model ?? s.model;
+        s.contextWindow = claudeEffectiveContextWindow(claudeContextWindowFromModel(s.model)) ?? s.contextWindow;
         return;
     }
     if (t === 'stream_event') {
         const inner = ev.event || {};
         if (inner.type === 'message_start') {
             const u = inner.message?.usage;
-            if (u) {
-                s.input = u.input_tokens ?? s.input;
-                s.cached = u.cache_read_input_tokens ?? s.cached;
-            }
+            // Claude emits one message per tool-use round within a single turn. Carry the prior
+            // message's output into the per-turn base, then reset to the new message's prompt size
+            // so contextUsedTokens tracks current occupancy while turnOutputTokens sums the turn.
+            s.turnOutputTokensBase = (s.turnOutputTokensBase ?? 0) + (s.output ?? 0);
+            s.input = u?.input_tokens ?? 0;
+            s.cached = u?.cache_read_input_tokens ?? 0;
+            s.cacheCreation = u?.cache_creation_input_tokens ?? 0;
+            s.output = 0;
         }
         else if (inner.type === 'content_block_delta') {
             const d = inner.delta || {};
@@ -211,7 +254,9 @@ export function handleClaudeEvent(ev, s, emit) {
                     s.input = u.input_tokens;
                 if (u.cache_read_input_tokens != null)
                     s.cached = u.cache_read_input_tokens;
-                emit({ type: 'usage', usage: { inputTokens: s.input, outputTokens: s.output, cachedInputTokens: s.cached, contextPercent: null } });
+                if (u.cache_creation_input_tokens != null)
+                    s.cacheCreation = u.cache_creation_input_tokens;
+                emit({ type: 'usage', usage: claudeUsageOf(s) });
             }
             if (inner.delta?.stop_reason)
                 s.stopReason = inner.delta.stop_reason;
@@ -312,6 +357,8 @@ export function handleClaudeEvent(ev, s, emit) {
             const cached = u.cache_read_input_tokens ?? u.cached_input_tokens;
             if (s.cached == null && cached != null)
                 s.cached = cached;
+            if (s.cacheCreation == null && u.cache_creation_input_tokens != null)
+                s.cacheCreation = u.cache_creation_input_tokens;
         }
         return;
     }

package/dist/drivers/codex.d.ts

@@ -1,4 +1,5 @@
 import type { AgentDriver, AgentTurnInput, DriverContext, DriverResult, TuiInput, TuiSpec } from '../contracts/driver.js';
+import type { UniversalUsage } from '../protocol/index.js';
 export declare class CodexDriver implements AgentDriver {
     private readonly bin;
     readonly id = "codex";
@@ -12,3 +13,12 @@ export declare class CodexDriver implements AgentDriver {
     run(input: AgentTurnInput, ctx: DriverContext): Promise<DriverResult>;
     tui(input: TuiInput): TuiSpec;
 }
+export interface CodexUsageState {
+    input: number | null;
+    output: number | null;
+    cached: number | null;
+    contextUsed?: number | null;
+    contextWindow?: number | null;
+}
+export declare function applyCodexTokenUsage(s: CodexUsageState, rawUsage: any): void;
+export declare function codexUsageOf(s: CodexUsageState): UniversalUsage;

package/dist/drivers/codex.js

@@ -173,7 +173,7 @@ 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, status: null, error: null, turnId: null };
+        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 phases = new Map();
         const toolSummaries = new Map();
         let steerRegistered = false;
@@ -264,14 +264,8 @@ export class CodexDriver {
                         break;
                     }
                     case 'thread/tokenUsage/updated': {
-                        const u = params?.tokenUsage || params?.usage || {};
-                        if (u.input_tokens != null || u.inputTokens != null)
-                            state.input = u.input_tokens ?? u.inputTokens;
-                        if (u.output_tokens != null || u.outputTokens != null)
-                            state.output = u.output_tokens ?? u.outputTokens;
-                        if (u.cached_input_tokens != null || u.cachedInputTokens != null)
-                            state.cached = u.cached_input_tokens ?? u.cachedInputTokens;
-                        ctx.emit({ type: 'usage', usage: { inputTokens: state.input, outputTokens: state.output, cachedInputTokens: state.cached, contextPercent: null } });
+                        applyCodexTokenUsage(state, params?.tokenUsage || params?.usage);
+                        ctx.emit({ type: 'usage', usage: codexUsageOf(state) });
                         break;
                     }
                     case 'turn/completed': {
@@ -279,6 +273,8 @@ export class CodexDriver {
                         state.status = turn.status ?? 'completed';
                         if (turn.error)
                             state.error = turn.error.message || turn.error.code || 'turn error';
+                        applyCodexTokenUsage(state, params?.tokenUsage || turn.tokenUsage || turn.usage);
+                        ctx.emit({ type: 'usage', usage: codexUsageOf(state) });
                         settle();
                         break;
                     }
@@ -309,7 +305,7 @@ export class CodexDriver {
             if (turnResp.error)
                 return { ok: false, text: state.text, error: turnResp.error.message || 'turn/start failed', stopReason: 'error', sessionId: state.sessionId };
             await turnDone;
-            const usage = { inputTokens: state.input, outputTokens: state.output, cachedInputTokens: state.cached, contextPercent: null };
+            const usage = codexUsageOf(state);
             const ok2 = (state.status === 'completed' || state.status == null) && !state.error && !ctx.signal.aborted;
             return {
                 ok: ok2,
@@ -344,3 +340,76 @@ function buildTurnInput(prompt, attachments) {
     input.push({ type: 'text', text: prompt });
     return input;
 }
+function codexNum(...vals) {
+    for (const v of vals) {
+        const n = typeof v === 'number' ? v : Number(v);
+        if (Number.isFinite(n))
+            return n;
+    }
+    return null;
+}
+// Context occupancy from one usage record: prefer total_tokens, else input(+output).
+function codexContextUsed(raw) {
+    if (!raw || typeof raw !== 'object')
+        return null;
+    const total = codexNum(raw.total_tokens, raw.totalTokens);
+    if (total != null && total >= 0)
+        return total;
+    const i = codexNum(raw.input_tokens, raw.inputTokens);
+    const o = codexNum(raw.output_tokens, raw.outputTokens);
+    if (i != null && o != null)
+        return i + o;
+    return i;
+}
+// Fold a codex tokenUsage payload into driver state: last-turn counts, context
+// occupancy, and the model window. Tolerant of nested {info:{…}} and flat shapes.
+export function applyCodexTokenUsage(s, rawUsage) {
+    if (!rawUsage || typeof rawUsage !== 'object')
+        return;
+    const info = rawUsage.info && typeof rawUsage.info === 'object' ? rawUsage.info : rawUsage;
+    const last = info.last ?? info.lastTokenUsage ?? info.last_token_usage ?? rawUsage.last;
+    const li = codexNum(last?.input_tokens, last?.inputTokens);
+    const lo = codexNum(last?.output_tokens, last?.outputTokens);
+    const lc = codexNum(last?.cached_input_tokens, last?.cachedInputTokens);
+    if (li != null)
+        s.input = li;
+    if (lo != null)
+        s.output = lo;
+    if (lc != null)
+        s.cached = lc;
+    const used = codexContextUsed(last);
+    if (used != null)
+        s.contextUsed = used;
+    // Cumulative total as fallback for the per-turn counts (the trailing `?? rawUsage`
+    // also catches the flat shape, where there is no nested `last`).
+    const total = info.total ?? info.totalTokenUsage ?? info.total_token_usage ?? rawUsage.total ?? rawUsage;
+    if (total && typeof total === 'object') {
+        const ti = codexNum(total.input_tokens, total.inputTokens);
+        const to = codexNum(total.output_tokens, total.outputTokens);
+        const tc = codexNum(total.cached_input_tokens, total.cachedInputTokens);
+        if (li == null && ti != null)
+            s.input = ti;
+        if (lo == null && to != null)
+            s.output = to;
+        if (lc == null && tc != null)
+            s.cached = tc;
+    }
+    const cw = codexNum(info.modelContextWindow, info.model_context_window, rawUsage.modelContextWindow, rawUsage.model_context_window);
+    if (cw != null && cw > 0)
+        s.contextWindow = cw;
+}
+export function codexUsageOf(s) {
+    const fallback = (s.input ?? 0) + (s.cached ?? 0);
+    const used = s.contextUsed ?? (fallback > 0 ? fallback : null);
+    const window = s.contextWindow ?? null;
+    const contextPercent = used != null && window ? Math.min(99.9, Math.round((used / window) * 1000) / 10) : null;
+    const turnOutput = s.output ?? 0;
+    return {
+        inputTokens: s.input,
+        outputTokens: s.output,
+        cachedInputTokens: s.cached,
+        contextUsedTokens: used,
+        contextPercent,
+        turnOutputTokens: turnOutput > 0 ? turnOutput : null,
+    };
+}

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { PtyBridge, ptyAvailable, type PtyExit, type PtyOpenOpts } from './runti
 export { attachTui, type AttachTuiOptions } from './runtime/tui.js';
 export type { AgentDriver, AgentTurnInput, DriverContext, DriverEvent, DriverResult, SteerFn, McpServerSpec, TuiInput, TuiSpec, } from './contracts/driver.js';
 export type { SessionStore, CoreSessionRecord, ModelResolver, ModelInjection, ToolProvider, SystemPromptBuilder, InteractionHandler, Catalog, } from './contracts/ports.js';
-export type { LoomIO, PromptInput, Surface, SurfaceCapabilities, Plugin, } from './contracts/surface.js';
+export type { LoomIO, PromptInput, Surface, SurfaceCapabilities, Plugin, SpawnContribution, } from './contracts/surface.js';
 export { FsSessionStore, NullModelResolver, NoopToolProvider, PassthroughSystemPromptBuilder, AutoCancelInteractionHandler, DeferToTerminalInteractionHandler, NoopCatalog, defaultBaseDir, } from './ports/defaults.js';
 export { EchoDriver } from './drivers/echo.js';
 export { ClaudeDriver } from './drivers/claude.js';

package/dist/runtime/hub.d.ts

@@ -49,6 +49,9 @@ export declare class Hub implements LoomIO {
     private queueView;
     private publishQueued;
     private collectTools;
+    private mergeSpawn;
+    private pluginSpawn;
+    private composeSystemPrompt;
     private onRunnerUpdate;
     stop(sessionKey: string): boolean;
     steer(taskId: string, prompt: string, attachments?: string[]): Promise<boolean>;

package/dist/runtime/hub.js

@@ -45,7 +45,11 @@ export class Hub {
             throw new Error(`Driver "${agent}" does not support TUI mode`);
         const workdir = opts.workdir || this.deps.workdir;
         const injection = await this.deps.modelResolver.resolve(agent, { model: opts.model, profileId: null }).catch(() => null);
-        return driver.tui({ workdir, model: injection?.model ?? opts.model ?? null, sessionId: opts.sessionId ?? null, env: injection?.env });
+        const model = injection?.model ?? opts.model ?? null;
+        // Same merge as run(), so the raw-PTY rail also gets plugin env/args (e.g. a hijack redirect).
+        const pluginParts = await this.pluginSpawn(agent, workdir, 'tui', opts.sessionId ?? null, model);
+        const spawn = this.mergeSpawn([{ env: injection?.env, extraArgs: injection?.extraArgs }, ...pluginParts]);
+        return driver.tui({ workdir, model, sessionId: opts.sessionId ?? null, env: spawn.env, extraArgs: spawn.extraArgs });
     }
     async prompt(input) {
         const agent = (input.agent || this.deps.defaultAgent || '').trim();
@@ -98,20 +102,28 @@ export class Hub {
         // prior turn's native session id and any refreshed credentials/tools.
         const rec = await this.deps.sessionStore.get(agent, sessionId);
         const injection = await this.deps.modelResolver.resolve(agent, { model: input.model, profileId: null }).catch(() => null);
-        const tools = await this.collectTools(agent, workdir, workspacePath);
         const model = injection?.model ?? input.model ?? null;
         const effort = input.effort ?? null;
-        const systemPrompt = this.deps.systemPromptBuilder.compose({ agent, base: this.deps.systemPromptBase, isFirstTurn: !preExisted });
+        const tools = await this.collectTools(agent, workdir, workspacePath);
+        const pluginParts = await this.pluginSpawn(agent, workdir, 'run', sessionId, model);
+        // precedence: ModelResolver (model/creds) -> ToolProvider.env -> plugins (last, so a
+        // model-traffic hijack plugin can override the resolver's base URL).
+        const spawn = this.mergeSpawn([
+            { env: injection?.env, extraArgs: injection?.extraArgs, configOverrides: injection?.configOverrides },
+            { env: tools.env },
+            ...pluginParts,
+        ]);
+        const systemPrompt = await this.composeSystemPrompt(agent, workdir, !preExisted);
         const turnInput = {
             prompt: input.prompt,
             attachments: input.attachments,
             sessionId: rec?.nativeSessionId || (input.sessionKey ? sessionId : null),
             workdir,
             model, effort, systemPrompt,
-            env: injection?.env,
-            extraArgs: injection?.extraArgs, // BYOK flags from the ModelResolver
-            configOverrides: injection?.configOverrides, // codex BYOK -c routing
-            extraMcpServers: tools,
+            env: spawn.env,
+            extraArgs: spawn.extraArgs,
+            configOverrides: spawn.configOverrides,
+            extraMcpServers: tools.servers,
         };
         runner.run(driver, turnInput, input.prompt, model, effort)
             .then(async (result) => {
@@ -154,11 +166,16 @@ export class Hub {
         if (entry?.runner)
             this.onRunnerUpdate(sessionKey, entry.runner.snapshot, entry.runner.currentSeq);
     }
+    // MCP servers (ToolProvider + each plugin) PLUS the ToolProvider's session env (previously
+    // dropped) — surfaced so the spawn env merge can apply it.
     async collectTools(agent, workdir, workspacePath) {
-        const out = [];
+        const servers = [];
+        let env;
         try {
             const base = await this.deps.toolProvider.provideForSession({ agent, workdir, workspacePath });
-            out.push(...base.servers);
+            servers.push(...base.servers);
+            if (base.env && Object.keys(base.env).length)
+                env = base.env;
         }
         catch (e) {
             this.deps.log?.(`[hub] toolProvider failed: ${e?.message || e}`);
@@ -167,14 +184,71 @@ export class Hub {
             if (!plugin.tools)
                 continue;
             try {
-                out.push(...(await plugin.tools({ agent, workdir })));
+                servers.push(...(await plugin.tools({ agent, workdir })));
             }
             catch (e) {
                 this.deps.log?.(`[hub] plugin ${plugin.id} tools failed: ${e?.message || e}`);
             }
         }
+        return { servers, env };
+    }
+    // Merge ordered spawn contributions: env keys later-wins, extraArgs/configOverrides concatenate.
+    // Callers order parts [ModelResolver, ToolProvider.env, ...plugins] so a plugin (e.g. a model-
+    // traffic hijack) can override the resolver's base URL. Never touches global process.env.
+    mergeSpawn(parts) {
+        let env;
+        const extraArgs = [];
+        const configOverrides = [];
+        for (const p of parts) {
+            if (!p)
+                continue;
+            if (p.env && Object.keys(p.env).length)
+                env = { ...(env || {}), ...p.env };
+            if (p.extraArgs?.length)
+                extraArgs.push(...p.extraArgs);
+            if (p.configOverrides?.length)
+                configOverrides.push(...p.configOverrides);
+        }
+        return { env, extraArgs: extraArgs.length ? extraArgs : undefined, configOverrides: configOverrides.length ? configOverrides : undefined };
+    }
+    async pluginSpawn(agent, workdir, mode, sessionId, model) {
+        const out = [];
+        for (const plugin of this.deps.plugins) {
+            if (!plugin.contributeSpawn)
+                continue;
+            try {
+                const c = await plugin.contributeSpawn({ agent, workdir, mode, sessionId, model });
+                if (c)
+                    out.push(c);
+            }
+            catch (e) {
+                this.deps.log?.(`[hub] plugin ${plugin.id} contributeSpawn failed: ${e?.message || e}`);
+            }
+        }
         return out;
     }
+    // Final system/developer prompt = the singular SystemPromptBuilder base + each plugin's
+    // promptFragment (in registration order), joined. Delivered via AgentTurnInput.systemPrompt,
+    // which each driver applies its own way (claude --append-system-prompt / codex / gemini).
+    async composeSystemPrompt(agent, workdir, isFirstTurn) {
+        const parts = [];
+        const base = this.deps.systemPromptBuilder.compose({ agent, base: this.deps.systemPromptBase, isFirstTurn });
+        if (base && base.trim())
+            parts.push(base);
+        for (const plugin of this.deps.plugins) {
+            if (!plugin.promptFragment)
+                continue;
+            try {
+                const f = await plugin.promptFragment({ agent, workdir, isFirstTurn });
+                if (f && f.trim())
+                    parts.push(f);
+            }
+            catch (e) {
+                this.deps.log?.(`[hub] plugin ${plugin.id} promptFragment failed: ${e?.message || e}`);
+            }
+        }
+        return parts.length ? parts.join('\n\n') : undefined;
+    }
     onRunnerUpdate(sessionKey, snapshot, _seq) {
         const entry = this.sessions.get(sessionKey);
         if (!entry)

package/dist/runtime/loom.d.ts

@@ -28,6 +28,7 @@ export interface LoomConfig {
 export interface Loom {
     readonly io: LoomIO;
     registerDriver(driver: AgentDriver): void;
+    registerPlugin(plugin: Plugin): void;
     start(): Promise<void>;
     stop(): Promise<void>;
     status(): {

package/dist/runtime/loom.js

@@ -10,6 +10,8 @@ export function createLoom(config = {}) {
     for (const d of config.drivers || [])
         drivers.set(d.id, d);
     const defaultAgent = config.defaultAgent || config.drivers?.[0]?.id || 'echo';
+    // Held as a live reference so registerPlugin() mutates the same array the Hub iterates.
+    const plugins = [...(config.plugins || [])];
     const hub = new Hub({
         drivers,
         defaultAgent,
@@ -21,7 +23,7 @@ export function createLoom(config = {}) {
         catalog: config.catalog || new NoopCatalog(),
         interactionHandler: config.interactionHandler || new DeferToTerminalInteractionHandler(),
         serialPerSession: config.serialPerSession,
-        plugins: config.plugins || [],
+        plugins,
         systemPromptBase: config.systemPromptBase,
         log,
     });
@@ -36,6 +38,7 @@ export function createLoom(config = {}) {
     return {
         io: hub,
         registerDriver(driver) { drivers.set(driver.id, driver); },
+        registerPlugin(plugin) { plugins.push(plugin); },
         async start() {
             if (started)
                 return;

package/llms.txt

@@ -86,7 +86,9 @@ Write a driver: implement `AgentDriver { id; capabilities?; run(input, ctx); tui
 ## Surfaces & Ports
 
 - Surface (上层, binds LoomIO): built-in `WebSurface` (ws host, wire protocol), `CliSurface`. Implement `Surface { id; capabilities?; start(io, host?); stop() }` for an IM channel.
-- Plugin: `{ id; tools?({agent,workdir}); decorateSnapshot?(snapshot) }`.
+- Plugin = the registration unit for everything ONE capability adds to a session (register via `createLoom({plugins})` or `loom.registerPlugin(p)`):
+  `{ id; tools?({agent,workdir})=>McpServerSpec[]; promptFragment?({agent,workdir,isFirstTurn})=>string|null; contributeSpawn?({agent,workdir,mode:'run'|'tui',sessionId?,model?})=>SpawnContribution|null; decorateSnapshot?(snap) }`.
+  `SpawnContribution = { env?; extraArgs?; configOverrides? }`. Kernel merges per-spawn (NEVER touches global process.env), order `[ModelResolver → ToolProvider.env → plugins]` (plugin overrides resolver — e.g. a hijack redirecting `ANTHROPIC_BASE_URL` to a local proxy, applied on BOTH run() and tui()). `promptFragment`s append to the SystemPromptBuilder base. So tools + their usage-prompt + env/flags register in ONE place. The singular ModelResolver/SystemPromptBuilder remain the authoritative model-cred/base-prompt source; plugins are the composable layer on top.
 - Ports (defaults in parens): SessionStore (FsSessionStore), ModelResolver (NullModelResolver = native login; override for BYOK), ToolProvider (NoopToolProvider), SystemPromptBuilder (PassthroughSystemPromptBuilder), Catalog (NoopCatalog), InteractionHandler (DeferToTerminalInteractionHandler; AutoCancelInteractionHandler for one-shots). `defaultBaseDir(ns)`.
 
 ## Gotchas (read before using)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikiloom/kernel",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "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",