amalgm 0.1.84 → 0.1.85

package/lib/supervisor.js

@@ -402,9 +402,17 @@ function sleep(ms) {
 
 function writeAutoUpdateState(update) {
   const current = readJson(AUTO_UPDATE_STATE_FILE, {});
+  const updateValue = (key, fallback = null) => (
+    Object.prototype.hasOwnProperty.call(update, key) ? update[key] : fallback
+  );
   const next = {
     ...current,
     ...update,
+    active_turns: updateValue('active_turns'),
+    tempstore_count: updateValue('tempstore_count'),
+    mcp_active: updateValue('mcp_active'),
+    tunnel_active: updateValue('tunnel_active'),
+    idle_blocked_reason: updateValue('idle_blocked_reason'),
     updated_at: new Date().toISOString(),
   };
   writeJsonSecret(AUTO_UPDATE_STATE_FILE, next);
@@ -419,6 +427,7 @@ function writeAutoUpdateState(update) {
       last_checked_at: next.last_checked_at || null,
       last_error: next.last_error || null,
       active_turns: next.active_turns ?? null,
+      tempstore_count: next.tempstore_count ?? null,
       mcp_active: next.mcp_active ?? null,
       tunnel_active: next.tunnel_active ?? null,
     },
@@ -462,20 +471,43 @@ function localJsonRequest(port, requestPath, runtimeToken, timeoutMs) {
   });
 }
 
-async function runtimeIdleStatus({ ports, runtimeToken, tunnels }) {
-  const tunnelActive = tunnels.reduce((sum, tunnel) => (
+function runtimeTunnelActive(tunnels = []) {
+  return tunnels.reduce((sum, tunnel) => (
     sum + (typeof tunnel.activeCount === 'function' ? Number(tunnel.activeCount()) || 0 : 0)
   ), 0);
+}
+
+function autoUpdateIdleBlockedReason(idle) {
+  if (idle.idle) return null;
+  if (idle.reason) return idle.reason;
+
+  const tempstoreCount = Number(idle.tempstore_count ?? idle.active_turns) || 0;
+  if (tempstoreCount > 0) {
+    return `tempstore has ${tempstoreCount} active turn${tempstoreCount === 1 ? '' : 's'}`;
+  }
+
+  const mcpActive = Number(idle.mcp_active) || 0;
+  if (mcpActive > 0) {
+    return `mcp has ${mcpActive} active agent conversation${mcpActive === 1 ? '' : 's'}`;
+  }
+
+  return 'runtime is busy';
+}
+
+async function runtimeIdleStatus({ ports, runtimeToken, tunnels }) {
+  const tunnelActive = runtimeTunnelActive(tunnels);
   const timeoutMs = numberFromEnv('AMALGM_UPDATE_IDLE_TIMEOUT_MS', AUTO_UPDATE_POLICY.idleTimeoutMs, 500);
   const [chat, mcp] = await Promise.all([
     localJsonRequest(ports.chatServer, '/runtime-idle', runtimeToken, timeoutMs),
     localJsonRequest(ports.amalgmMcp, '/healthz', runtimeToken, timeoutMs),
   ]);
-  const activeTurns = Number(chat?.active_turns) || 0;
+  const tempstoreCount = Number(chat?.tempstore_count ?? chat?.active_turns) || 0;
+  const activeTurns = Number(chat?.active_turns ?? tempstoreCount) || 0;
   const mcpActive = Number(mcp?.activeAgentConversations) || 0;
   return {
-    idle: activeTurns === 0 && mcpActive === 0 && tunnelActive === 0,
+    idle: tempstoreCount === 0 && mcpActive === 0,
     active_turns: activeTurns,
+    tempstore_count: tempstoreCount,
     mcp_active: mcpActive,
     tunnel_active: tunnelActive,
   };
@@ -573,8 +605,9 @@ function createAutoUpdateManager({ ports, runtimeToken, tunnels, foreground, req
         idle = {
           idle: false,
           active_turns: null,
+          tempstore_count: null,
           mcp_active: null,
-          tunnel_active: null,
+          tunnel_active: runtimeTunnelActive(tunnels),
           reason: error.message,
         };
       }
@@ -587,9 +620,10 @@ function createAutoUpdateManager({ ports, runtimeToken, tunnels, foreground, req
         critical: false,
         service_managed: true,
         active_turns: idle.active_turns,
+        tempstore_count: idle.tempstore_count,
         mcp_active: idle.mcp_active,
         tunnel_active: idle.tunnel_active,
-        idle_blocked_reason: idle.idle ? null : idle.reason || 'runtime is busy',
+        idle_blocked_reason: autoUpdateIdleBlockedReason(idle),
       });
 
       if (idle.idle) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.84",
+  "version": "0.1.85",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,

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

@@ -109,10 +109,11 @@ class ChatCore {
   }
 
   idleStatus() {
-    const activeTurns = typeof this.turns.activeCount === 'function' ? this.turns.activeCount() : 0;
+    const tempstoreCount = typeof this.turns.activeCount === 'function' ? this.turns.activeCount() : 0;
     return {
-      idle: activeTurns === 0,
-      active_turns: activeTurns,
+      idle: tempstoreCount === 0,
+      active_turns: tempstoreCount,
+      tempstore_count: tempstoreCount,
     };
   }
 

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

@@ -118,7 +118,7 @@ test('POST /chat streams from the same indexed raw chunks as /raw-temp', async (
   }
 });
 
-test('GET /runtime-idle reports active turn count', async () => {
+test('GET /runtime-idle reports tempstore count', async () => {
   process.env.AMALGM_RUNTIME_AUTH = 'disabled';
 
   const core = new ChatCore({
@@ -137,7 +137,7 @@ test('GET /runtime-idle reports active turn count', async () => {
   try {
     let res = await fetch(`${baseUrl}/runtime-idle`);
     assert.equal(res.status, 200);
-    assert.deepEqual(await res.json(), { idle: true, active_turns: 0 });
+    assert.deepEqual(await res.json(), { idle: true, active_turns: 0, tempstore_count: 0 });
 
     const entry = core.turns.start({
       sessionId: 'session-test',
@@ -147,12 +147,12 @@ test('GET /runtime-idle reports active turn count', async () => {
     });
     res = await fetch(`${baseUrl}/runtime-idle`);
     assert.equal(res.status, 200);
-    assert.deepEqual(await res.json(), { idle: false, active_turns: 1 });
+    assert.deepEqual(await res.json(), { idle: false, active_turns: 1, tempstore_count: 1 });
 
     core.turns.mark(entry.turnId, 'complete');
     res = await fetch(`${baseUrl}/runtime-idle`);
     assert.equal(res.status, 200);
-    assert.deepEqual(await res.json(), { idle: true, active_turns: 0 });
+    assert.deepEqual(await res.json(), { idle: true, active_turns: 0, tempstore_count: 0 });
   } finally {
     await new Promise((resolve) => server.close(resolve));
   }