amalgm 0.1.73 → 0.1.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,
@@ -15,6 +15,7 @@
   ],
   "scripts": {
     "sync-runtime": "node ../../scripts/sync-npm-package-runtime.mjs",
+    "prepack": "node ../../scripts/sync-npm-package-runtime.mjs",
     "pack:dry": "npm pack --dry-run",
     "check": "node --check bin/amalgm.js && node --check lib/auth-store.js && node --check lib/cli.js && node --check lib/paths.js && node --check lib/process-cleanup.js && node --check lib/runtime-identity.js && node --check lib/runtime-manifest.js && node --check lib/service.js && node --check lib/state-migration.js && node --check lib/supervisor.js && node --check lib/tunnel-chat.js && node --check lib/tunnel-events.js && node --check runtime/lib/runtime-manifest.js && node --check runtime/scripts/runtime-auth.js && node --check runtime/scripts/proxy-token-store.js && node --check runtime/scripts/local-gateway.js && node --check runtime/scripts/port-monitor.js && node --check runtime/scripts/chat-server.js && node --check runtime/scripts/chat-server/index.js && node --check runtime/scripts/chat-server/config.js && node --check runtime/scripts/chat-core/tooling/native-binaries.js && node --check runtime/scripts/chat-core/tooling/package-import.js && node --check runtime/scripts/chat-core/tooling/runtime-home.js && node --check runtime/scripts/amalgm-mcp/index.js && node --check runtime/scripts/amalgm-mcp/config.js && node --check runtime/scripts/lib/project-paths.js && node --check runtime/scripts/lib/runtime-paths.js"
   },

package/runtime/scripts/chat-core/engine.js

@@ -217,9 +217,19 @@ class ChatCore {
     let stopReason = 'end_turn';
     let sawDone = false;
     let finalDoneEvent = null;
+    let finalDoneChunk = null;
 
     const append = (e, options = {}) => {
       const emitFrame = options.emitFrame !== false;
+      const visible = options.visible !== false;
+      const nextProviderSessionId = e.providerSessionId || providerSessionId;
+      const nextUsage = e.type === 'usage.final' ? e.usage : usage;
+      let chunk = null;
+      if (emitFrame) {
+        const frame = frameFor(e, { sessionId: contract.sessionId, providerSessionId: nextProviderSessionId, usage: nextUsage });
+        chunk = this.turns.addChunk(turnId, (index) => withSseId(frame, index), { visible, seal: e.type === 'done' });
+        if (!chunk) throw new Error('Raw stream write failed before event application');
+      }
       if (e.providerSessionId) providerSessionId = e.providerSessionId;
       if (e.type === 'usage.final') {
         usage = e.usage;
@@ -229,27 +239,26 @@ class ChatCore {
         sawDone = true;
         stopReason = e.stopReason || stopReason;
         finalDoneEvent = e;
+        finalDoneChunk = chunk;
       }
       parts.apply(e);
-      if (!emitFrame) return;
-      const frame = frameFor(e, { sessionId: contract.sessionId, providerSessionId, usage });
-      this.turns.addChunk(turnId, (index) => withSseId(frame, index));
+      return chunk;
     };
 
     try {
       try {
         const stream = await this.runtime.prompt(contract, runtimeInput);
-        for await (const e of stream) append(e, { emitFrame: e.type !== 'done' });
+        for await (const e of stream) append(e, { visible: e.type !== 'done' });
         const current = this.turns.get(turnId);
         if (!sawDone) {
           append(done({
             providerSessionId,
             stopReason: current?.status === 'cancelling' ? 'cancelled' : stopReason,
-          }), { emitFrame: false });
+          }), { visible: false });
         }
       } catch (err) {
         append(errorEvent(err.message, { providerSessionId }));
-        append(done({ providerSessionId, stopReason: 'error' }), { emitFrame: false });
+        append(done({ providerSessionId, stopReason: 'error' }), { visible: false });
         stopReason = 'error';
       }
       entry.streamEnded = true;
@@ -279,7 +288,11 @@ class ChatCore {
         this.turns.mark(turnId, 'save_failed');
         throw err;
       }
-      append(finalDoneEvent || done({ providerSessionId, stopReason }));
+      if (finalDoneChunk) {
+        this.turns.releaseChunk(turnId, finalDoneChunk.index);
+      } else {
+        append(finalDoneEvent || done({ providerSessionId, stopReason }));
+      }
       this.turns.mark(turnId, stopReason === 'error' ? 'error' : stopReason === 'cancelled' ? 'cancelled' : 'complete');
       this.turns.clear(turnId);
       return { providerSessionId, usage, parts: savedParts, stopReason };

package/runtime/scripts/chat-core/stores.js

@@ -41,13 +41,28 @@ class TurnStore {
     return this.turns.get(turnId) || null;
   }
 
-  addChunk(turnId, frame) {
+  addChunk(turnId, frame, options = {}) {
     const entry = this.turns.get(turnId);
     if (!entry || !['streaming', 'cancelling'].includes(entry.status)) return null;
+    if (Number.isInteger(entry.sealedIndex)) return null;
     const index = entry.chunks.length;
     const data = typeof frame === 'function' ? frame(index) : frame;
-    const chunk = { index, data, timestamp: Date.now() };
+    const visible = options.visible !== false;
+    const chunk = { index, data, timestamp: Date.now(), visible };
     entry.chunks.push(chunk);
+    if (options.seal === true) entry.sealedIndex = index;
+    entry.updatedAt = Date.now();
+    if (visible) this.emit(turnId, chunk, entry);
+    return chunk;
+  }
+
+  releaseChunk(turnId, index) {
+    const entry = this.turns.get(turnId);
+    if (!entry || !['streaming', 'cancelling'].includes(entry.status)) return null;
+    const chunk = entry.chunks.find((candidate) => candidate.index === index);
+    if (!chunk) return null;
+    if (chunk.visible !== false) return chunk;
+    chunk.visible = true;
     entry.updatedAt = Date.now();
     this.emit(turnId, chunk, entry);
     return chunk;
@@ -75,9 +90,12 @@ class TurnStore {
     this.listeners.delete(turnId);
   }
 
-  chunksAfter(turnId, afterIndex = -1) {
+  chunksAfter(turnId, afterIndex = -1, options = {}) {
     const entry = this.turns.get(turnId);
-    return entry ? entry.chunks.filter((chunk) => chunk.index > afterIndex) : [];
+    const visibleOnly = options.visibleOnly === true;
+    return entry
+      ? entry.chunks.filter((chunk) => chunk.index > afterIndex && (!visibleOnly || chunk.visible !== false))
+      : [];
   }
 
   subscribe(turnId, callback) {

package/runtime/scripts/chat-core/streams.js

@@ -59,6 +59,10 @@ function normalizeAfterIndex(afterIndex) {
   return Number.isFinite(afterIndex) ? afterIndex : -1;
 }
 
+function visibleChunks(entry) {
+  return entry.chunks.filter((chunk) => chunk.visible !== false);
+}
+
 function writeTurnTail(core, entry, sse, options = {}) {
   const format = options.format || 'frame';
   let lastSent = normalizeAfterIndex(options.afterIndex);
@@ -69,7 +73,7 @@ function writeTurnTail(core, entry, sse, options = {}) {
       sse.write(namedSse('chunk', {
         codeSessionId: current.sessionId,
         chunk,
-        total: current.chunks.length,
+        total: visibleChunks(current).length,
       }));
     } else {
       sse.write(chunk.data);
@@ -81,7 +85,7 @@ function writeTurnTail(core, entry, sse, options = {}) {
     if (format === 'raw-temp') {
       sse.write(namedSse('complete', {
         codeSessionId: current.sessionId,
-        total: current.chunks.length,
+        total: visibleChunks(current).length,
       }));
       sse.end();
       return;
@@ -101,7 +105,7 @@ function writeTurnTail(core, entry, sse, options = {}) {
   });
   sse.addCleanup(off);
 
-  const existing = entry.chunks.filter((chunk) => chunk.index > lastSent);
+  const existing = visibleChunks(entry).filter((chunk) => chunk.index > lastSent);
   if (format === 'raw-temp') {
     sse.write(namedSse('existing', {
       codeSessionId: entry.sessionId,

package/runtime/scripts/chat-core/tests/engine.test.js

@@ -129,6 +129,11 @@ test('complete frame waits for assistant message save', async () => {
   assert.equal(frames.some((frame) => frame.includes('agent_message_chunk')), true, 'content should still stream immediately');
   assert.equal(frames.some((frame) => frame.includes('"complete"')), false, 'complete must not outrun assistant save');
   assert.equal(core.active('session-test').active, true, 'turn remains active while persistence is pending');
+  const pendingEntry = core.turns.latest('session-test');
+  const pendingComplete = pendingEntry.chunks.find((chunk) => chunk.data.includes('"_type":"complete"'));
+  assert.ok(pendingComplete, 'raw-temp stores final complete before assistant save');
+  assert.equal(pendingComplete.visible, false, 'final complete is hidden from UI until assistant save succeeds');
+  assert.equal(pendingEntry.sealedIndex, pendingComplete.index, 'final complete seals the raw-temp log');
 
   resolveAssistantSave();
   await run;