@tjamescouch/gro 1.3.10 → 1.3.12

package/dist/main.js

@@ -22,7 +22,8 @@ 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";
+// Stream marker imports — parser disabled for now, markers pass through as visible text.
+// import { createMarkerParser, extractMarkers } from "./stream-markers.js";
 const VERSION = getGroVersion();
 // ---------------------------------------------------------------------------
 // Graceful shutdown state — module-level so signal handlers can save sessions.
@@ -520,29 +521,15 @@ async function executeTurn(driver, memory, mcp, cfg, sessionId) {
     let brokeCleanly = false;
     let idleNudges = 0;
     for (let round = 0; round < cfg.maxToolRounds; round++) {
-        // 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;
-                    cfg.model = newModel; // persist across turns
-                    memory.setModel(newModel); // persist in session metadata on save
-                }
-                else {
-                    Logger.debug(`Stream marker: ${marker.name}('${marker.arg}')`);
-                }
-            },
-        });
+        // Stream markers: currently pass-through (visible in output).
+        // Model-change and other marker actions are disabled until the
+        // infrastructure is ready for hot-swapping.
+        const onToken = rawOnToken;
         const output = await driver.chat(memory.messages(), {
             model: activeModel,
             tools: tools.length > 0 ? tools : undefined,
-            onToken: markerParser.onToken,
+            onToken,
         });
-        // Flush any remaining buffered tokens from the marker parser
-        markerParser.flush();
         // Track token usage for niki budget enforcement
         if (output.usage) {
             turnTokensIn += output.usage.inputTokens;
@@ -550,13 +537,10 @@ async function executeTurn(driver, memory, mcp, cfg, sessionId) {
             // Log cumulative usage to stderr — niki parses these patterns for budget enforcement
             process.stderr.write(`"input_tokens": ${turnTokensIn}, "output_tokens": ${turnTokensOut}\n`);
         }
-        // Accumulate clean text (markers stripped) for the return value
-        const cleanText = markerParser.getCleanText();
-        if (cleanText)
-            finalText += cleanText;
-        // Store clean text in memory — markers are runtime directives, not conversation content.
-        // The original output.text is preserved in case we need it for debugging.
-        const assistantMsg = { role: "assistant", from: "Assistant", content: cleanText || "" };
+        // Accumulate output text
+        if (output.text)
+            finalText += output.text;
+        const assistantMsg = { role: "assistant", from: "Assistant", content: output.text || "" };
         if (output.toolCalls.length > 0) {
             assistantMsg.tool_calls = output.toolCalls;
         }
@@ -686,12 +670,6 @@ 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;
@@ -741,12 +719,6 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tjamescouch/gro",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "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.10",
+  "version": "1.3.12",
   "description": "Provider-agnostic LLM runtime with context management",
   "bin": {
     "gro": "./dist/main.js"