volute 0.33.0 → 0.34.0

package/templates/pi/src/agent.ts

@@ -10,12 +10,19 @@ import {
   SettingsManager,
 } from "@mariozechner/pi-coding-agent";
 import { extractImages, extractText } from "./lib/content.js";
+import {
+  countSdkInstructionTokens,
+  countSkillDescriptionTokens,
+  countSystemPromptTokens,
+  findPiSessionFile,
+  parsePiSessionJSONL,
+} from "./lib/context-breakdown.js";
 import { createEventHandler, emit } from "./lib/event-handler.js";
 import { runHooks } from "./lib/hook-loader.js";
 import { log } from "./lib/logger.js";
 import { createReplyInstructionsExtension } from "./lib/reply-instructions-extension.js";
 import { resolveModel } from "./lib/resolve-model.js";
-import { loadPrompts, type SubagentConfig } from "./lib/startup.js";
+import { getStartupContext, loadPrompts, type SubagentConfig } from "./lib/startup.js";
 import { createSubagentExtension, type SubagentDefinition } from "./lib/subagents.js";
 import type {
   HandlerMeta,
@@ -25,6 +32,7 @@ import type {
   VoluteContentPart,
   VoluteEvent,
 } from "./lib/types.js";
+import type { ContextInfo } from "./lib/volute-server.js";
 
 type PiAgentSession = Awaited<ReturnType<typeof createAgentSession>>["session"];
 
@@ -36,7 +44,8 @@ type PiSession = {
   unsubscribe?: () => void;
   messageIds: (string | undefined)[];
   currentMessageId?: string;
-  messageChannels: Map<string, string>;
+  messageChannels: Map<string, { channel: string; sender?: string }>;
+  contextTokens: number;
 };
 
 export function createMind(options: {
@@ -48,7 +57,7 @@ export function createMind(options: {
   compactionMessage?: string;
   maxContextTokens?: number;
   subagents?: Record<string, SubagentConfig>;
-}): { resolve: HandlerResolver } {
+}): { resolve: HandlerResolver; getContextInfo: () => ContextInfo } {
   const sessions = new Map<string, PiSession>();
   const prompts = loadPrompts();
   const today = new Date().toLocaleDateString("en-CA");
@@ -109,13 +118,40 @@ export function createMind(options: {
       ? createSubagentExtension(subagents, { cwd: options.cwd, model, authStorage, modelRegistry })
       : undefined;
 
+  // --- Startup context (loaded once, injected on first turn per session) ---
+
+  const startupContextPromise = getStartupContext().catch(() => null);
+
   // --- Dynamic hook extension ---
 
   const hooksDir = resolvePath(options.cwd, ".local/hooks");
 
   function createDynamicHookExtension(session: PiSession): ExtensionFactory {
+    let startupContextInjected = false;
+    const pendingToolArgs = new Map<string, Record<string, unknown>>();
+
     return (pi) => {
+      pi.on("tool_execution_start", (event) => {
+        pendingToolArgs.set(event.toolCallId, event.args);
+      });
+
       pi.on("before_agent_start", async () => {
+        const parts: string[] = [];
+
+        // Inject startup context on the first turn of each session
+        if (!startupContextInjected) {
+          startupContextInjected = true;
+          const startupContext = await startupContextPromise;
+          if (startupContext) {
+            emit(session, {
+              type: "context",
+              content: startupContext,
+              metadata: { source: "startup-context" },
+            });
+            parts.push(startupContext);
+          }
+        }
+
         try {
           const result = await runHooks(hooksDir, "pre-prompt", {
             event: "pre-prompt",
@@ -127,26 +163,32 @@ export function createMind(options: {
               content: result.additionalContext,
               metadata: { source: "dynamic:pre-prompt", ...result.metadata },
             });
-            return {
-              message: {
-                customType: "dynamic-hook",
-                content: result.additionalContext,
-                display: true,
-              },
-            };
+            parts.push(result.additionalContext);
           }
         } catch (err) {
           log("mind", "dynamic pre-prompt hook failed:", err);
         }
+
+        if (parts.length > 0) {
+          return {
+            message: {
+              customType: "dynamic-hook",
+              content: parts.join("\n\n"),
+              display: true,
+            },
+          };
+        }
         return {};
       });
 
-      pi.on("tool_execution_end", async (event: any) => {
+      pi.on("tool_execution_end", async (event) => {
+        const toolInput = pendingToolArgs.get(event.toolCallId);
+        pendingToolArgs.delete(event.toolCallId);
         try {
           const result = await runHooks(hooksDir, "post-tool-use", {
             event: "post-tool-use",
             tool_name: event.toolName,
-            tool_input: event.args,
+            tool_input: toolInput,
           });
           if (result.additionalContext) {
             emit(session, {
@@ -175,6 +217,7 @@ export function createMind(options: {
       listeners: new Set(),
       messageIds: [],
       messageChannels: new Map(),
+      contextTokens: 0,
     };
     sessions.set(name, session);
 
@@ -280,29 +323,33 @@ export function createMind(options: {
       createEventHandler(session, {
         cwd: options.cwd,
         broadcast: (event) => broadcast(session, event),
-        onContextTokens: maxContextTokens
-          ? (tokens: number) => {
-              if (tokens >= maxContextTokens && !compactionTriggered && !compactionInProgress) {
-                if (!session.agentSession) {
-                  log(
-                    "mind",
-                    `session "${session.name}": compaction threshold hit but session not ready`,
-                  );
-                  return;
-                }
-                compactionTriggered = true;
-                log(
-                  "mind",
-                  `session "${session.name}": ${tokens} tokens >= ${maxContextTokens} — triggering compaction`,
-                );
-                // Send compaction warning; compaction will follow after the mind finishes its response turn
-                session.messageIds.push(undefined);
-                session.agentSession.prompt(compactionMessage, {
-                  streamingBehavior: "followUp",
-                });
-              }
+        onContextTokens: (tokens: number) => {
+          session.contextTokens = tokens;
+          if (
+            maxContextTokens &&
+            tokens >= maxContextTokens &&
+            !compactionTriggered &&
+            !compactionInProgress
+          ) {
+            if (!session.agentSession) {
+              log(
+                "mind",
+                `session "${session.name}": compaction threshold hit but session not ready`,
+              );
+              return;
             }
-          : undefined,
+            compactionTriggered = true;
+            log(
+              "mind",
+              `session "${session.name}": ${tokens} tokens >= ${maxContextTokens} — triggering compaction`,
+            );
+            // Send compaction warning; compaction will follow after the mind finishes its response turn
+            session.messageIds.push(undefined);
+            session.agentSession.prompt(compactionMessage, {
+              streamingBehavior: "followUp",
+            });
+          }
+        },
         onTurnEnd: maxContextTokens
           ? () => {
               try {
@@ -378,7 +425,10 @@ export function createMind(options: {
 
         // Track channel for reply instructions
         if (meta.channel) {
-          session.messageChannels.set(meta.messageId, meta.channel);
+          session.messageChannels.set(meta.messageId, {
+            channel: meta.channel,
+            sender: meta.sender,
+          });
         }
 
         // Track messageId (must be pushed before prompt)
@@ -433,5 +483,34 @@ export function createMind(options: {
     return handler;
   }
 
-  return { resolve };
+  const piSessionsDir = resolvePath(options.mindDir, ".mind/pi-sessions");
+  const systemPromptTokens = countSystemPromptTokens(options.systemPrompt);
+  const claudeMdTokens = countSdkInstructionTokens(options.cwd);
+  const skillDescTokens = countSkillDescriptionTokens([resolvePath(options.cwd, ".pi/skills")]);
+
+  function getContextInfo(): ContextInfo {
+    return {
+      sessions: Array.from(sessions.values()).map((s) => {
+        try {
+          const jsonlPath = findPiSessionFile(piSessionsDir, s.name);
+          const parsed = jsonlPath
+            ? parsePiSessionJSONL(jsonlPath, systemPromptTokens, claudeMdTokens, skillDescTokens)
+            : null;
+
+          return {
+            name: s.name,
+            contextTokens: parsed?.contextTokens ?? s.contextTokens,
+            contextWindow: maxContextTokens,
+            breakdown: parsed?.breakdown,
+          };
+        } catch (err) {
+          log("mind", `failed to get context breakdown for session "${s.name}":`, err);
+          return { name: s.name, contextTokens: s.contextTokens, contextWindow: maxContextTokens };
+        }
+      }),
+      systemPrompt: systemPromptTokens,
+    };
+  }
+
+  return { resolve, getContextInfo };
 }

package/templates/pi/src/lib/event-handler.ts

@@ -1,14 +1,29 @@
+import type { AgentSessionEvent } from "@mariozechner/pi-coding-agent";
 import { flushFileChanges, trackFileChange } from "./auto-commit.js";
 import { daemonEmit, type EventType } from "./daemon-client.js";
 import { log, warn } from "./logger.js";
 import { filterEvent, loadTransparencyPreset } from "./transparency.js";
 import type { VoluteEvent } from "./types.js";
 
+/** Minimal shape of the messages in an agent_end event (subset of AgentMessage). */
+type AgentEndMessage = {
+  role?: string;
+  errorMessage?: string;
+  usage?: {
+    input?: number;
+    output?: number;
+    cacheWrite?: number;
+    cache_creation?: number;
+    cacheRead?: number;
+    cache_read?: number;
+  };
+};
+
 export type EventSession = {
   name: string;
   messageIds: (string | undefined)[];
   currentMessageId?: string;
-  messageChannels: Map<string, string>;
+  messageChannels: Map<string, { channel: string; sender?: string }>;
 };
 
 export type EventHandlerOptions = {
@@ -26,7 +41,7 @@ export function emit(
   event: { type: EventType; content?: string; metadata?: Record<string, unknown> },
 ) {
   const channel = session.currentMessageId
-    ? session.messageChannels.get(session.currentMessageId)
+    ? session.messageChannels.get(session.currentMessageId)?.channel
     : undefined;
   const filtered = filterEvent(preset, {
     ...event,
@@ -38,7 +53,7 @@ export function emit(
 }
 
 export function createEventHandler(session: EventSession, options: EventHandlerOptions) {
-  const toolArgs = new Map<string, any>();
+  const toolArgs = new Map<string, Record<string, unknown>>();
   let textBuf = "";
   let thinkingBuf = "";
 
@@ -63,7 +78,7 @@ export function createEventHandler(session: EventSession, options: EventHandlerO
 
   let sessionStarted = false;
 
-  return (event: any) => {
+  return (event: AgentSessionEvent) => {
     try {
       if (!sessionStarted && event.type === "agent_start") {
         sessionStarted = true;
@@ -108,7 +123,7 @@ export function createEventHandler(session: EventSession, options: EventHandlerO
         // Auto-commit file changes in home/
         if ((event.toolName === "edit" || event.toolName === "write") && !event.isError) {
           const args = toolArgs.get(event.toolCallId);
-          const filePath = (args as { path?: string })?.path;
+          const filePath = typeof args?.path === "string" ? args.path : undefined;
           if (filePath) {
             trackFileChange(filePath, options.cwd);
           }
@@ -124,7 +139,7 @@ export function createEventHandler(session: EventSession, options: EventHandlerO
         log("mind", `session "${session.name}": turn done`);
         // Log any error messages from the agent
         if (event.messages) {
-          for (const msg of event.messages as any[]) {
+          for (const msg of event.messages as AgentEndMessage[]) {
             if (msg.errorMessage) {
               warn("mind", `session "${session.name}": agent error: ${msg.errorMessage}`);
             }
@@ -136,7 +151,7 @@ export function createEventHandler(session: EventSession, options: EventHandlerO
           let inputTokens = 0;
           let outputTokens = 0;
           let lastInputTokens = 0;
-          for (const msg of event.messages as any[]) {
+          for (const msg of event.messages as AgentEndMessage[]) {
             if (msg.role === "assistant" && msg.usage) {
               inputTokens += msg.usage.input ?? 0;
               outputTokens += msg.usage.output ?? 0;

package/templates/pi/src/lib/reply-instructions-extension.ts

@@ -4,7 +4,7 @@ import { log } from "./logger.js";
 import { loadPrompts } from "./startup.js";
 
 export function createReplyInstructionsExtension(
-  messageChannels: Map<string, string>,
+  messageChannels: Map<string, { channel: string; sender?: string }>,
   emitContext?: (
     session: EventSession,
     event: { type: "context"; content: string; metadata: Record<string, unknown> },
@@ -18,12 +18,31 @@ export function createReplyInstructionsExtension(
       try {
         if (fired) return {};
 
-        const channel = messageChannels.values().next().value;
-        if (!channel) return {};
+        const entry = messageChannels.values().next().value;
+        if (!entry) return {};
 
         fired = true;
 
-        const content = prompts.reply_instructions.replace(/\$\{channel\}/g, channel);
+        // System messages don't need reply instructions
+        if (entry.sender === "volute") {
+          const content = "This is a system message — no reply is needed.";
+          if (emitContext && session) {
+            emitContext(session, {
+              type: "context",
+              content,
+              metadata: { source: "reply-instructions" },
+            });
+          }
+          return {
+            message: {
+              customType: "reply-instructions",
+              content,
+              display: true,
+            },
+          };
+        }
+
+        const content = prompts.reply_instructions.replace(/\$\{channel\}/g, entry.channel);
         if (emitContext && session) {
           emitContext(session, {
             type: "context",

package/templates/pi/src/lib/subagents.ts

@@ -72,12 +72,26 @@ export function createSubagentExtension(
                 reject(new Error(`Subagent "${name}" timed out after 5 minutes`));
               }, 300_000);
 
-              session.subscribe((event: any) => {
-                if (event.type === "agent_error") {
+              session.subscribe((event) => {
+                if (event.type === "agent_end") {
                   clearTimeout(timeout);
-                  reject(
-                    new Error(`Subagent "${name}" error: ${event.error?.message ?? "unknown"}`),
-                  );
+                  // Check for error messages first
+                  for (const msg of event.messages ?? []) {
+                    const m = msg as { errorMessage?: string };
+                    if (m.errorMessage) {
+                      reject(new Error(`Subagent "${name}" error: ${m.errorMessage}`));
+                      return;
+                    }
+                  }
+                  for (const msg of event.messages ?? []) {
+                    const m = msg as { role?: string; content?: { type: string; text?: string }[] };
+                    if (m.role === "assistant" && m.content) {
+                      for (const block of m.content) {
+                        if (block.type === "text" && block.text) textParts.push(block.text);
+                      }
+                    }
+                  }
+                  resolve();
                   return;
                 }
                 if (event.type === "turn_end") {
@@ -86,17 +100,6 @@ export function createSubagentExtension(
                     session.abort();
                   }
                 }
-                if (event.type === "agent_end") {
-                  clearTimeout(timeout);
-                  for (const msg of event.messages ?? []) {
-                    if (msg.role === "assistant" && msg.content) {
-                      for (const block of msg.content) {
-                        if (block.type === "text") textParts.push(block.text);
-                      }
-                    }
-                  }
-                  resolve();
-                }
               });
             });
 
@@ -122,7 +125,7 @@ export function createSubagentExtension(
   };
 }
 
-const TOOL_MAP: Record<string, any> = {
+const TOOL_MAP: Record<string, (typeof codingTools)[number]> = {
   Read: readTool,
   Write: writeTool,
   Bash: bashTool,

package/templates/pi/src/server.ts

@@ -4,7 +4,6 @@ import { createFileHandlerResolver } from "./lib/file-handler.js";
 import { log, setLevel } from "./lib/logger.js";
 import { createRouter } from "./lib/router.js";
 import {
-  handleStartupContext,
   loadConfig,
   loadPackageInfo,
   loadSystemPrompt,
@@ -45,15 +44,13 @@ const server = createVoluteServer({
   port,
   name: pkg.name,
   version: pkg.version,
+  getContextInfo: mind.getContextInfo,
 });
 
-server.listen(port, async () => {
+server.listen(port, () => {
   const addr = server.address();
   const actualPort = typeof addr === "object" && addr ? addr.port : port;
   log("server", `listening on :${actualPort}`);
-  await handleStartupContext((content) =>
-    router.route([{ type: "text", text: content }], { channel: "system" }),
-  );
 });
 
 setupShutdown();

package/dist/chunk-K3NQKI34.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-export {
-  __export
-};

package/dist/daemon-client-6QXHZ7US.js

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-import {
-  daemonFetch,
-  readSessionFile
-} from "./chunk-UKVWJRKN.js";
-import "./chunk-LRCG2JLP.js";
-import "./chunk-RPZZSXV3.js";
-import "./chunk-K3NQKI34.js";
-export {
-  daemonFetch,
-  readSessionFile
-};

package/dist/db-F34YLV7D.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-import {
-  getDb
-} from "./chunk-LRCG2JLP.js";
-import "./chunk-RPZZSXV3.js";
-import "./chunk-K3NQKI34.js";
-export {
-  getDb
-};

package/dist/delivery-manager-PFAKEJTC.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-import {
-  DeliveryManager,
-  getDeliveryManager,
-  initDeliveryManager
-} from "./chunk-3Z2DPESO.js";
-import "./chunk-SKLSMHXO.js";
-import "./chunk-LOEJ4HPQ.js";
-import "./chunk-RVGLDGMI.js";
-import "./chunk-GY5HBI7A.js";
-import "./chunk-7J3HEVR7.js";
-import "./chunk-G53F3JA4.js";
-import "./chunk-OYAKCAVY.js";
-import "./chunk-2NGTS5UU.js";
-import "./chunk-A2A4KLFE.js";
-import "./chunk-PB65JZK2.js";
-import "./chunk-JYVGHWEJ.js";
-import "./chunk-KVK2DLWI.js";
-import "./chunk-C7I35G4R.js";
-import "./chunk-QTUVYI7W.js";
-import "./chunk-YUIHSKR6.js";
-import "./chunk-KIEPMIM5.js";
-import "./chunk-VH33ZWMW.js";
-import "./chunk-N432I7QH.js";
-import "./chunk-LRCG2JLP.js";
-import "./chunk-RPZZSXV3.js";
-import "./chunk-K3NQKI34.js";
-export {
-  DeliveryManager,
-  getDeliveryManager,
-  initDeliveryManager
-};

package/dist/down-FWWTEKXM.js

@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-import {
-  run,
-  stopDaemon
-} from "./chunk-JUKK7FPS.js";
-import "./chunk-NNB4WIG7.js";
-import "./chunk-KIEPMIM5.js";
-import "./chunk-VH33ZWMW.js";
-import "./chunk-LRCG2JLP.js";
-import "./chunk-RPZZSXV3.js";
-import "./chunk-K3NQKI34.js";
-export {
-  run,
-  stopDaemon
-};