shraga 0.1.15 → 0.1.17

package/defaults/modules/routine/module.json

@@ -1,6 +1,6 @@
 {
   "name": "routine",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Daily operating contract — cadence (dispatcher ticks + work blocks), OKR-anchored priorities, autonomy tiers, comms policy, and an agenda seed.",
   "configSchema": {
     "workingDays":   { "type": "string",  "default": "Sun–Thu",              "description": "Working days, prose (shown in the skill)" },
@@ -21,7 +21,7 @@
       "def": "tick",
       "name": "routine-tick",
       "trigger": { "kind": "cron", "expr": "{{tickCron}}", "tz": "{{tz}}" },
-      "task": { "kind": "prompt", "prompt": "Dispatcher tick: load the routine skill (Dispatcher tick rules) and workspace/agenda.md, then follow the tick logic. Most ticks should end in a skip.", "model": "{{tickModel}}" }
+      "task": { "kind": "prompt", "prompt": "Dispatcher tick (pager only — no cognitive work): load the routine skill (Dispatcher tick rules) and workspace/agenda.md, then decide wake/skip per the tick logic. If work is due, book an immediate self-wake-* once-schedule with the intention (NO model override) and end — never do the work in this session. Most ticks should end in a skip.", "model": "{{tickModel}}" }
     },
     {
       "def": "work-block",

package/defaults/modules/routine/routine.md.tmpl

@@ -24,10 +24,16 @@ When choosing what to pick up, rank by:
 ## Cadence
 
 - **Pre-daily** (start of day): absorbs the morning sweep — review inboxes/boards, refresh `workspace/agenda.md` (Today/Focus/Queue), pick the day's focus.
-- **Dispatcher tick** (hourly during work hours) — the tick decides, it does not grind:
+- **Dispatcher tick** (hourly during work hours) — the tick is a PAGER, not a worker. It runs on a
+  cheap model and must do NO cognitive work beyond the wake/skip decision. Never execute a task,
+  never read beyond the agenda + schedule list, never write anything but the agenda's wake note:
   - **Skip** if a session is already actively working — most ticks should end in a skip.
   - **Defer to self-wake**: if a `self-wake-*` schedule is already booked for the current thread, skip — the wake owns the continuation.
-  - **Wake with intention**: only start work when the agenda names a concrete next step; wake into that step, not into "look around".
+  - **Dispatch, don't do**: when the agenda names a concrete, green-lit next step and nothing is on
+    it, book an IMMEDIATE one-shot schedule (`once` trigger, now) named `self-wake-<slug>` whose
+    prompt states the intention ("Work session: <the step>, per the agenda/board — load the routine
+    skill first"). Do NOT set a model on it — the work session must run on the full default model.
+    Note the dispatch in the agenda, then end the tick. The tick session itself NEVER does the work.
   - **Escalate when stuck**: the same item blocked across 3 consecutive ticks → escalate per the comms policy instead of ticking on it again.
 - **Post-daily** (end of day): absorbs the EOD digest — summarize what moved, update the agenda's Parked/Blocked, leave breadcrumbs.
 - **Weekly self-audit**: once a week, review the log against `{{okrSource}}` — is the priority function actually being followed?
@@ -39,7 +45,9 @@ The `routine-work-block` schedule is a superseded fallback (ships disabled); the
 I MAY book my own continuations as one-shot schedules (`once` trigger) named `self-wake-<slug>`. Bounds:
 - tier-a work only — never self-wake into tier b/c actions;
 - working hours only;
-- max {{maxSelfWakesPerDay}} self-wakes per day;
+- max {{maxSelfWakesPerDay}} FUTURE-scheduled self-wakes per day (continuations I book ahead of
+  time). Immediate dispatch wakes booked by the tick don't count — they ARE the routine working,
+  not extra sessions;
 - each booking notes "why then" in `workspace/agenda.md` (what the wake will do and why that time).
 
 ## Breadcrumb contract

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shraga",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "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() });
 }