shraga 0.1.57 → 0.1.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shraga",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "The teammate you delegate coding to — a self-hostable, multi-user AI coding agent web UI (Claude Code, with a pluggable engine seam).",
   "type": "module",
   "main": "./src/index.ts",

package/src/server/boot.ts

@@ -26,7 +26,7 @@ import { mountFeatures, registerFeature, resumeFeatureSession, collectFeatureFla
 import { registerSpaCatchAll } from './spa-catchall.ts';
 import { slackFeature } from './slack/feature.ts';
 import { dataPath } from './paths.ts';
-import { getAllSessions, getSession, getSessionHistory, upsertSession, appendMessage, saveConversation, loadConversation, setSessionDirectives, getAutoApprove, setAutoApprove, getSessionsByScheduleId, getSessionsVisibleTo, isSessionVisibleTo, setRunStatus, incrementRetryCount, resetRetryCount, getRunningSessions, getActiveLockCount, updateScheduledSessionStatus, setShuttingDown, backfillSessionVisibility, writePartial, readPartial, clearPartial, registerLivePartial, unregisterLivePartial, readLivePartial, acquireSessionLock, releaseSessionLock, replaceSessionLock, isSessionLocked, getSessionAbortController, forkSession, generateSessionTitle, type ConvBlock, type ConvMessage, type SessionMeta } from './sessions.ts';
+import { getAllSessions, getSession, getSessionHistory, upsertSession, appendMessage, saveConversation, loadConversation, setSessionDirectives, getAutoApprove, setAutoApprove, getSessionsByScheduleId, getSessionsVisibleTo, isSessionVisibleTo, setRunStatus, incrementRetryCount, getRunningSessions, getActiveLockCount, updateScheduledSessionStatus, setShuttingDown, backfillSessionVisibility, writePartial, readPartial, clearPartial, registerLivePartial, unregisterLivePartial, readLivePartial, acquireSessionLock, releaseSessionLock, replaceSessionLock, isSessionLocked, getSessionAbortController, forkSession, generateSessionTitle, type ConvBlock, type ConvMessage, type SessionMeta } from './sessions.ts';
 import { setBroadcaster } from './session-bus.ts';
 import * as scheduler from './scheduler/index.ts';
 import { initPolls } from './polls.ts';
@@ -1325,7 +1325,6 @@ async function runStream(ws: WebSocket, session: WsSession, sid: string, promptT
     if (blocks.length) writePartial(sid, blocks);
   }, 5_000);
 
-  resetRetryCount(sid);
   setRunStatus(sid, 'running', 'web');
 
   let stopReason = '';

package/src/server/sessions.ts

@@ -270,7 +270,16 @@ export function setRunStatus(sessionId: string, status: 'running' | 'idle', orig
   if (!s) return;
   s.runStatus = status;
   if (origin) s.runOrigin = origin;
-  if (status === 'idle') s.lastStopReason = stopReason;
+  if (status === 'idle') {
+    s.lastStopReason = stopReason;
+    // runRetryCount caps crash-resume loops (interrupt → resume → interrupt). Reaching 'idle' at all
+    // proves this turn was NOT killed by a restart — the guard above drops idle writes during a
+    // drain, and a hard kill never gets here — so the loop is broken and the count starts over.
+    // It used to be reset only on the web path, so Slack and scheduler sessions accumulated it
+    // forever: after two interruptions in their whole life they permanently lost auto-resume and
+    // every later restart ended at "please send a message to continue".
+    s.runRetryCount = 0;
+  }
   s.lastModified = Date.now();
   saveIndex(sessions);
 }

package/src/server/slack/bot.ts

@@ -385,7 +385,10 @@ export async function retrySlackSession(session: SessionMeta, prompt: string): P
           onUserQuestion: makeSlackQuestionHandler({ channel, threadTs, useUserToken }),
         }),
         session.sessionId,
-        { partial: false, artifacts: false },
+        // Partial-capture ON: a recovery turn is the one most likely to be interrupted again (a
+        // restart loop, an upgrade retry), and with it off the second interruption had nothing to
+        // preserve and resumed from the original prompt instead of the cut-off point.
+        { partial: true, artifacts: false },
       ),
     );
     if (replyTs) { console.log(`[slack-bot] recovery reply posted: ${channel} ts=${replyTs}`); invalidateChannelContext(channel); }