mixdog 1.0.4 → 1.0.6

package/src/runtime/shared/wait-until.test-support.mjs

@@ -0,0 +1,33 @@
+// Deterministic test waits: poll a predicate on the real clock until a
+// deadline instead of draining a fixed number of event-loop turns.
+import { setTimeout as sleep } from 'node:timers/promises';
+
+// Resolves with the first truthy `read()` value; throws if the deadline passes.
+export async function waitUntil(read, { timeoutMs = 5_000, intervalMs = 1, message = 'condition' } = {}) {
+  const deadline = performance.now() + timeoutMs;
+  for (;;) {
+    const value = await read();
+    if (value) return value;
+    if (performance.now() >= deadline) throw new Error(`waitUntil timed out after ${timeoutMs}ms: ${message}`);
+    await sleep(intervalMs);
+  }
+}
+
+// Waits for work whose completion has no observable signal to settle. `quietMs`
+// of real-clock quiet (no change in `read()`) after at least one poll is the
+// settle point; bounded by `timeoutMs`.
+export async function waitForQuiet(read, { quietMs = 25, timeoutMs = 5_000 } = {}) {
+  const deadline = performance.now() + timeoutMs;
+  let last = await read();
+  let since = performance.now();
+  while (performance.now() - since < quietMs) {
+    if (performance.now() >= deadline) throw new Error(`waitForQuiet timed out after ${timeoutMs}ms`);
+    await sleep(1);
+    const next = await read();
+    if (next !== last) {
+      last = next;
+      since = performance.now();
+    }
+  }
+  return last;
+}

package/src/session-runtime/boot/apis.mjs

@@ -66,7 +66,7 @@ export function wireApis(boot) {
     // though the boot-time autostart window has already passed.
     ensureAutomationRuntime: () => boot.scheduleChannelStart(0),
   });
-  boot.usageStatsApi = createUsageStatsApi();
+  boot.usageStatsApi = createUsageStatsApi({ getSessionId: () => boot.rt.session?.id || null });
   boot.providerAuthApi = providerAuthApiFor(boot);
   boot.mediaApi = createMediaApi();
   boot.sessionTitles = createSessionTitleController({

package/src/session-runtime/services/channel-admin.mjs

@@ -210,7 +210,7 @@ export async function listSchedules() {
 // Register or update a schedule in the PG store. Recurring input maps `time`
 // (+ optional `days`) to a cron; one-shot input maps an `at` datetime; the two
 // are mutually exclusive (also enforced by the store's when_at/when_cron XOR).
-// `channel` selects a channel target (model required); otherwise session.
+// `channel` selects a channel target; otherwise session. Both require a model.
 export async function saveSchedule({
   name,
   description = '',
@@ -231,7 +231,8 @@ export async function saveSchedule({
   const id = assertScheduleName(name);
   const body = String(instructions || '').trim();
   if (!body) throw new Error('schedule instructions are required');
-  if (channel && !model) throw new Error('model is required when channel is set');
+  const scheduleModel = String(model || '').trim();
+  if (!scheduleModel) throw new Error('schedule model is required — choose a model before saving');
   // 'app' → session-only; 'channel'/'both' → the run result relays to the
   // main channel (target 'channel', channelId resolved at fire time).
   const requestedMode = String(delivery || '').trim();
@@ -255,7 +256,7 @@ export async function saveSchedule({
     timezone: scheduleTimezone,
     target: mode === 'app' ? 'session' : 'channel',
     channelId: channel ? String(channel).trim() : null,
-    model: model ? String(model).trim() : null,
+    model: scheduleModel,
     cwd: cwd ? String(cwd).trim() : null,
     workflow: workflow ? String(workflow).trim() : null,
     attachments: normalizeAutomationAttachments(attachments),

package/src/session-runtime/services/usage-stats-model.mjs

@@ -425,6 +425,28 @@ function tokensOf(bucket) {
   return bucket.input + bucket.output + bucket.cacheRead + bucket.cacheWrite;
 }
 
+/** One session's lifetime totals (the /context footer), in a statistics route's terms. */
+export function sessionUsageSnapshot(bucket) {
+  return {
+    turns: bucket.turns,
+    input: bucket.input,
+    output: bucket.output,
+    cacheRead: bucket.cacheRead,
+    cacheWrite: bucket.cacheWrite,
+    tokens: tokensOf(bucket),
+    unmeasuredTurns: bucket.unmeasuredTurns,
+    costUsd: round(bucket.costUsd, 6),
+    costKnownTurns: bucket.costKnownTurns,
+    costUnpricedTurns: Math.max(0, bucket.turns - bucket.costKnownTurns),
+    cacheHitRate: measuredRatio(
+      bucket.unmeasuredTurns,
+      bucket.cacheRead,
+      bucket.input + bucket.cacheRead + bucket.cacheWrite,
+      4
+    ),
+  };
+}
+
 function exportRoute(bucket, totalTokens) {
   const tokens = tokensOf(bucket);
   const fresh = bucket.input + bucket.output;

package/src/session-runtime/setup-tool/settings-contract.mjs

@@ -129,7 +129,11 @@ export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
       days: { ...text, description: 'Schedule day selector, e.g. weekdays or mon,wed,fri.' },
       parser: { type: 'string', enum: ['github', 'generic', 'stripe', 'sentry'] },
       channel: text,
-      model: text,
+      model: {
+        ...text,
+        description:
+          'Required for new schedules; no default-model fallback. Use provider/model[@effort][+fast][?parameter=value] or an existing preset name. On overwrite, omission preserves the saved model, which must be non-empty.',
+      },
       cwd: text,
       workflow: text,
       attachments: {
@@ -163,6 +167,7 @@ export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
   desktop: object({
     keepAwake: boolean,
     runInBackground: boolean,
+    turnNotifications: boolean,
     usagePinned: boolean,
     computerObserveOnly: boolean,
   }),

package/src/session-runtime/turn/session-ops.mjs

@@ -60,16 +60,22 @@ export function createSessionOps(deps) {
     if (getActiveTurnCount() > 0) {
       return { changed: false, reason: 'compact skipped: turn in progress' };
     }
-    // Manual compact bypasses loop.mjs, so its PreCompact/PostCompact never
-    // fire here — dispatch them explicitly via the session-property hooks.
+    // Dispatch PreCompact only after the manager's savings gate. A skipped
+    // auto-clear must not run hooks, invalidate context or schedule reminders.
+    const trigger = options.requireReduction === true ? 'auto_clear' : 'manual';
+    const result = await mgr.compactSessionMessages(session.id, {
+      requireReduction: options.requireReduction === true,
+      onStageChange: async () => {
+        try {
+          await session.preCompactHook?.({ trigger });
+        } catch {
+          /* best-effort: PreCompact hook must never break compact */
+        }
+      },
+    });
+    if (result?.skipped) return result;
     try {
-      await session.preCompactHook?.({ trigger: 'manual' });
-    } catch {
-      /* best-effort: PreCompact hook must never break manual compact */
-    }
-    const result = await mgr.compactSessionMessages(session.id);
-    try {
-      await session.postCompactHook?.({ trigger: 'manual' });
+      await session.postCompactHook?.({ trigger });
     } catch {
       /* best-effort: PostCompact hook must never break manual compact */
     }

package/src/session-runtime/usage-stats-api.mjs

@@ -4,10 +4,14 @@ import { getUsageLedger } from '../runtime/shared/llm/usage-ledger.mjs';
 import { importUsageHistory } from '../runtime/shared/llm/usage-ledger-import.mjs';
 import { refreshUnpricedUsageAsync } from '../runtime/shared/llm/usage-pricing-refresh.mjs';
 import { resolvePluginData } from '../runtime/shared/plugin-paths.mjs';
-import { usageStatsSnapshot } from './services/usage-stats-model.mjs';
+import { sessionUsageSnapshot, usageStatsSnapshot } from './services/usage-stats-model.mjs';
 import { resolveUsageStatsPeriod } from './services/usage-stats-period.mjs';
 import { usageRollupDayKey } from '../runtime/shared/llm/usage-rollup.mjs';
-import { ACCOUNT_PROVIDERS, readProviderAccountPool } from '../runtime/shared/provider-accounts.mjs';
+import {
+  ACCOUNT_PROVIDERS,
+  accountScopedSessionId,
+  readProviderAccountPool,
+} from '../runtime/shared/provider-accounts.mjs';
 
 const MAX_MODEL_LIMIT = 50;
 
@@ -53,6 +57,22 @@ function accountsInUse(accountPool) {
   return inUse;
 }
 
+// Every id a session's spend was recorded under: its own, and the per-account
+// provider session each subscription account sent it under before account
+// sends recorded the visible session.
+function sessionUsageIds(sessionId, accountPool) {
+  const ids = [sessionId];
+  for (const provider of ACCOUNT_PROVIDERS) {
+    try {
+      for (const account of accountPool(provider).accounts)
+        ids.push(accountScopedSessionId(provider, account.id, sessionId));
+    } catch {
+      /* an unreadable pool leaves that provider's older records out */
+    }
+  }
+  return ids;
+}
+
 /** `null` = all time. `0` = today. Anything else is a trailing day count. */
 function normalizeDays(value) {
   if (value === null || value === undefined || value === 'all') return null;
@@ -102,6 +122,7 @@ export function createUsageStatsApi({
   ledger = getUsageLedger,
   importHistory = importUsageHistory,
   accountPool = readProviderAccountPool,
+  getSessionId = () => null,
 } = {}) {
   let importing = null;
   let imported = false;
@@ -152,6 +173,17 @@ export function createUsageStatsApi({
       return snapshot;
     },
 
+    /** This runtime's session from its first request, compactions included; null before it has one. */
+    async getSessionUsage() {
+      const sessionId = getSessionId();
+      if (!sessionId) return null;
+      const store = ledger();
+      if (!store) throw new Error('Usage ledger is unavailable');
+      await store.settleWrites();
+      const usage = await store.sessionUsageAsync(sessionUsageIds(sessionId, accountPool));
+      return { sessionId, ...sessionUsageSnapshot(usage) };
+    },
+
     /**
      * How a subscription's own quota meter moved: one limit window since its
      * last reset (`view: 'window'`, the default, paged by `anchor`), or any

package/src/standalone/agent-dispatch-broker.mjs

@@ -1,7 +1,7 @@
 import { createFairCallScheduler } from './fair-call-scheduler.mjs';
 import { hashStructuredValue } from '../runtime/shared/json-metrics.mjs';
 
-const MEMORY_AGENTS = Object.freeze(['cycle1-agent', 'cycle2-agent']);
+const MEMORY_AGENTS = Object.freeze(['cycle1-agent']);
 const MEMORY_AGENT_SET = new Set(MEMORY_AGENTS);
 
 function abortError(signal) {