@tjamescouch/gro 1.3.9 → 1.3.11

package/dist/main.js

@@ -22,7 +22,7 @@ import { groError, asError, isGroError, errorLogFields } from "./errors.js";
 import { bashToolDefinition, executeBash } from "./tools/bash.js";
 import { agentpatchToolDefinition, executeAgentpatch } from "./tools/agentpatch.js";
 import { groVersionToolDefinition, executeGroVersion, getGroVersion } from "./tools/version.js";
-import { createMarkerParser } from "./stream-markers.js";
+import { createMarkerParser, extractMarkers } from "./stream-markers.js";
 const VERSION = getGroVersion();
 // ---------------------------------------------------------------------------
 // Graceful shutdown state — module-level so signal handlers can save sessions.
@@ -520,19 +520,23 @@ async function executeTurn(driver, memory, mcp, cfg, sessionId) {
     let brokeCleanly = false;
     let idleNudges = 0;
     for (let round = 0; round < cfg.maxToolRounds; round++) {
+        // Shared marker handler — used by both streaming parser and tool-arg scanner
+        const handleMarker = (marker) => {
+            if (marker.name === "model-change") {
+                const newModel = resolveModelAlias(marker.arg);
+                Logger.info(`Stream marker: model-change '${marker.arg}' → ${newModel}`);
+                activeModel = newModel;
+                cfg.model = newModel; // persist across turns
+                memory.setModel(newModel); // persist in session metadata on save
+            }
+            else {
+                Logger.debug(`Stream marker: ${marker.name}('${marker.arg}')`);
+            }
+        };
         // Create a fresh marker parser per round so partial state doesn't leak
         const markerParser = createMarkerParser({
             onToken: rawOnToken,
-            onMarker(marker) {
-                if (marker.name === "model-change") {
-                    const newModel = resolveModelAlias(marker.arg);
-                    Logger.info(`Stream marker: model-change '${marker.arg}' → ${newModel}`);
-                    activeModel = newModel;
-                }
-                else {
-                    Logger.debug(`Stream marker: ${marker.name}('${marker.arg}')`);
-                }
-            },
+            onMarker: handleMarker,
         });
         const output = await driver.chat(memory.messages(), {
             model: activeModel,
@@ -593,6 +597,14 @@ async function executeTurn(driver, memory, mcp, cfg, sessionId) {
                 Logger.debug(`Failed to parse args for ${fnName}: ${asError(e).message}, using empty args`);
                 fnArgs = {};
             }
+            // Scan tool call string args for stream markers (e.g. model sends
+            // @@model-change('haiku')@@ inside an agentchat_send message).
+            // Strip markers from args so they don't leak into tool output.
+            for (const key of Object.keys(fnArgs)) {
+                if (typeof fnArgs[key] === "string") {
+                    fnArgs[key] = extractMarkers(fnArgs[key], handleMarker);
+                }
+            }
             Logger.debug(`Tool call: ${fnName}(${JSON.stringify(fnArgs)})`);
             let result;
             try {
@@ -684,6 +696,12 @@ async function singleShot(cfg, driver, mcp, sessionId, positionalArgs) {
     // Resume existing session if requested
     if (cfg.continueSession || cfg.resumeSession) {
         await memory.load(sessionId);
+        const sess = loadSession(sessionId);
+        if (sess?.meta.model && sess.meta.model !== cfg.model) {
+            Logger.info(`Restoring model from session: ${cfg.model} → ${sess.meta.model}`);
+            cfg.model = sess.meta.model;
+            memory.setModel(sess.meta.model);
+        }
     }
     await memory.add({ role: "user", from: "User", content: prompt });
     let text;
@@ -733,6 +751,12 @@ async function interactive(cfg, driver, mcp, sessionId) {
         if (sess) {
             const msgCount = sess.messages.filter((m) => m.role !== "system").length;
             Logger.info(C.gray(`Resumed session ${sessionId} (${msgCount} messages)`));
+            // Restore model from session metadata (e.g. after a stream marker model-change)
+            if (sess.meta.model && sess.meta.model !== cfg.model) {
+                Logger.info(`Restoring model from session: ${cfg.model} → ${sess.meta.model}`);
+                cfg.model = sess.meta.model;
+                memory.setModel(sess.meta.model);
+            }
         }
     }
     const rl = readline.createInterface({

package/dist/memory/advanced-memory.js

@@ -24,6 +24,9 @@ export class AdvancedMemory extends AgentMemory {
         this.keepRecentPerLane = Math.max(1, Math.floor(args.keepRecentPerLane ?? 4));
         this.keepRecentTools = Math.max(0, Math.floor(args.keepRecentTools ?? 3));
     }
+    setModel(model) {
+        this.model = model;
+    }
     async load(id) {
         const session = loadSession(id);
         if (session) {

package/dist/memory/agent-memory.js

@@ -22,6 +22,8 @@ export class AgentMemory {
             await this.onAfterAdd();
         }
     }
+    /** Update the active model (used by stream markers to persist model changes across turns). */
+    setModel(_model) { }
     messages() {
         return [...this.messagesBuffer];
     }

package/dist/memory/simple-memory.js

@@ -15,6 +15,9 @@ export class SimpleMemory extends AgentMemory {
         this.provider = provider;
         this.model = model;
     }
+    setModel(model) {
+        this.model = model;
+    }
     async load(id) {
         const session = loadSession(id);
         if (session) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tjamescouch/gro",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "Provider-agnostic LLM runtime with context management",
   "bin": {
     "gro": "./dist/main.js"

package/dist/stream-markers.js

@@ -27,6 +27,31 @@ import { Logger } from "./logger.js";
 const MARKER_RE = /@@([a-zA-Z][a-zA-Z0-9_-]*)\((?:'([^']*)'|"([^"]*)"|([^)]*?))\)@@/g;
 /** Partial marker detection — we might be mid-stream in a marker */
 const PARTIAL_MARKER_RE = /@@[a-zA-Z][a-zA-Z0-9_-]*(?:\([^)]*)?$/;
+/**
+ * Scan a string for markers, fire the handler for each, and return cleaned text.
+ * Unlike the streaming parser, this operates on a complete string (e.g. tool call arguments).
+ */
+export function extractMarkers(text, onMarker) {
+    let cleaned = "";
+    let lastIndex = 0;
+    const regex = new RegExp(MARKER_RE.source, "g");
+    let match;
+    while ((match = regex.exec(text)) !== null) {
+        cleaned += text.slice(lastIndex, match.index);
+        const marker = {
+            name: match[1],
+            arg: match[2] ?? match[3] ?? match[4] ?? "",
+            raw: match[0],
+        };
+        try {
+            onMarker(marker);
+        }
+        catch { /* handled by caller */ }
+        lastIndex = match.index + match[0].length;
+    }
+    cleaned += text.slice(lastIndex);
+    return cleaned;
+}
 export function createMarkerParser(opts) {
     const { onMarker, onToken } = opts;
     let buffer = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tjamescouch/gro",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "Provider-agnostic LLM runtime with context management",
   "bin": {
     "gro": "./dist/main.js"