shraga 0.1.15 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shraga",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "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, 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, 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 { setBroadcaster } from './session-bus.ts';
 import * as scheduler from './scheduler/index.ts';
 import { initPolls } from './polls.ts';
@@ -1808,16 +1808,19 @@ async function gracefulShutdown(signal: string, opts: { exit?: boolean } = {}) {
   // Agent turns routinely run for minutes; give in-flight streams time to finish before we force-kill
   // their Claude Code child processes (which would otherwise surface as `exited with code 143`).
   // Keep this under the service manager's stop timeout (e.g. systemd TimeoutStopSec) so the drain wins, not SIGKILL.
+  // Drain on the LIVE lock count, not the persisted index: setRunStatus freezes `running` in the
+  // index at shutdown (the crash-recovery marker), so index entries can never go idle mid-drain —
+  // polling the index made every restart with an active session (or a stale marker from a prior
+  // crash) sit out the full 90s.
   const deadline = Date.now() + 90_000;
   while (Date.now() < deadline) {
-    const running = getRunningSessions();
-    if (running.length === 0) break;
-    console.log(`[server] waiting for ${running.length} active stream(s)…`);
+    const running = getActiveLockCount();
+    if (running === 0) break;
+    console.log(`[server] waiting for ${running} active stream(s)…`);
     await new Promise((r) => setTimeout(r, 2000));
   }
 
-  const remaining = getRunningSessions();
-  console.log(`[server] drain complete — ${remaining.length} stream(s) still active, closing`);
+  console.log(`[server] drain complete — ${getActiveLockCount()} stream(s) still active, closing`);
 
   for (const [ws, session] of activeConnections) {
     for (const ac of session.abortControllers.values()) ac.abort();

package/src/server/scheduler/runner.ts

@@ -140,6 +140,10 @@ export async function runSchedule(
     if (eventCtx) base = `${base}\n\n---\n${formatEventBlock(eventCtx)}`;
     prompt = base;
   }
+  // task.model rides the same [model] prompt-directive channel users type by hand — parseDirectives
+  // strips it and resolves aliases. Prepending (vs new plumbing) also persists the choice into the
+  // saved prompt, so the session UI shows which model the schedule actually requested.
+  if (!resume && task.model) prompt = `[${task.model}] ${prompt}`;
 
   // Save the synthesized user prompt to the conversation (skip on resume — task prompt already persisted).
   if (!resume) {

package/src/server/sessions.ts

@@ -326,6 +326,14 @@ export function isSessionLocked(sessionId: string): boolean {
   return globalSessionLocks.has(sessionId);
 }
 
+/** Count of queries streaming in THIS process right now. The drain loop must use this, not the
+ *  persisted index: setRunStatus freezes `running` at shutdown as the crash-recovery marker, so
+ *  index entries can't go idle mid-drain (and stale entries from a prior crash would stall the
+ *  drain for sessions that aren't streaming at all). */
+export function getActiveLockCount(): number {
+  return globalSessionLocks.size;
+}
+
 export function replaceSessionLock(sessionId: string, origin: SessionLock['origin'], abortController: AbortController): void {
   globalSessionLocks.set(sessionId, { origin, abortController, startedAt: Date.now() });
 }