yepanywhere 0.5.2 → 0.6.0

package/dist/services/ModelInfoService.d.ts

@@ -5,32 +5,81 @@
  * but that data was previously stranded in getAvailableModels() calls. This service
  * caches it so readers and routes can look up context windows without re-fetching.
  *
- * Sync getContextWindow() checks cache first, falls back to the shared heuristic.
+ * Two layers, in resolution order:
+ *  1. observed (durable) — real windows captured from an SDK `result` message's
+ *     modelUsage (the only place the true, account-resolved window exists). Keyed
+ *     by "<provider>:<model>" with the concrete model id, persisted to
+ *     {dataDir}/model-context-windows.json so it survives server restarts. This is
+ *     what fixes the "120% after restart" non-determinism (see
+ *     topics/claude-1m-context.md).
+ *  2. ingested (ephemeral) — provider-list/heuristic values from getAvailableModels()
+ *     (warmProvider/ingestModels), keyed by alias (e.g. "opus", "opus[1m]"). NOT
+ *     persisted: these are static guesses and would pollute the durable file.
+ *
+ * Sync getContextWindow() checks observed → ingested → shared heuristic. The
+ * live-process value (Process.contextWindow) still overrides this at request time.
  */
 import { type ModelInfo, type ProviderName } from "@yep-anywhere/shared";
+/** A real window observation captured from an SDK result message. */
+export interface ObservedModelInfo {
+    /** Context window size in tokens, as reported by the SDK. */
+    contextWindow: number;
+    /** ISO timestamp of when this window was last observed/confirmed. */
+    observedAt: string;
+}
+export interface ModelInfoServiceOptions {
+    /** Directory to persist observed model info (omit to run memory-only). */
+    dataDir?: string;
+}
 export declare class ModelInfoService {
-    /** (provider:modelId) → contextWindow */
-    private contextWindows;
+    /** Durable, real observations (persisted). */
+    private observed;
+    /** Ephemeral provider-list/heuristic values (not persisted). */
+    private ingested;
+    private filePath;
+    private savePromise;
+    private pendingSave;
+    constructor(options?: ModelInfoServiceOptions);
+    /**
+     * Load persisted observations from disk. Best-effort; missing/invalid files
+     * start empty. No-op when constructed without a dataDir.
+     */
+    initialize(): Promise<void>;
     /**
      * Get context window for a model (sync).
-     * Checks cache first, falls back to shared heuristic.
+     * Precedence: durable observation → ephemeral ingested → shared heuristic.
      */
     getContextWindow(model: string | undefined, provider?: ProviderName): number;
     /**
-     * Populate cache from a provider's getAvailableModels().
+     * Populate the ephemeral cache from a provider's getAvailableModels().
      * Call at startup and when sessions are created. Failures are logged, not thrown.
      */
     warmProvider(providerName: ProviderName): Promise<void>;
     /**
-     * Ingest model list into the cache.
+     * Ingest a model list into the ephemeral cache.
      * Called by warmProvider() and also by the providers route when it already
-     * has fresh model data (avoids redundant fetches).
+     * has fresh model data (avoids redundant fetches). These are provider-list
+     * (often heuristic) values and are intentionally not persisted.
      */
     ingestModels(providerName: ProviderName, models: ModelInfo[]): void;
     /**
-     * Record a context window discovered at runtime
-     * (e.g. from model_context_window in Codex SDK messages).
+     * Record a context window discovered at runtime from a real SDK observation
+     * (the contextWindow in a `result` message's modelUsage, or Codex
+     * model_context_window). This is the durable layer: stored with a timestamp
+     * and persisted so the window survives a server restart. Refreshes observedAt
+     * on every observation, even when the value is unchanged.
      */
     recordContextWindow(model: string, contextWindow: number, provider?: ProviderName): void;
+    /**
+     * Await any in-flight/pending debounced write. Mainly for tests and graceful
+     * shutdown; normal callers fire-and-forget via recordContextWindow.
+     */
+    flush(): Promise<void>;
+    /**
+     * Save observed state to disk with debouncing to prevent excessive writes.
+     * No-op when constructed without a dataDir.
+     */
+    private save;
+    private doSave;
 }
 //# sourceMappingURL=ModelInfoService.d.ts.map

package/dist/services/ModelInfoService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelInfoService.d.ts","sourceRoot":"","sources":["../../src/services/ModelInfoService.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAG9B,qBAAa,gBAAgB;IAC3B,yCAAyC;IACzC,OAAO,CAAC,cAAc,CAA6B;IAEnD;;;OAGG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM;IAQ5E;;;OAGG;IACG,YAAY,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D;;;;OAIG;IACH,YAAY,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;IAQnE;;;OAGG;IACH,mBAAmB,CACjB,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,YAAY,GACtB,IAAI;CAIR"}
+{"version":3,"file":"ModelInfoService.d.ts","sourceRoot":"","sources":["../../src/services/ModelInfoService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAG9B,qEAAqE;AACrE,MAAM,WAAW,iBAAiB;IAChC,6DAA6D;IAC7D,aAAa,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,UAAU,EAAE,MAAM,CAAC;CACpB;AAWD,MAAM,WAAW,uBAAuB;IACtC,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAgB;IAC3B,8CAA8C;IAC9C,OAAO,CAAC,QAAQ,CAAwC;IACxD,gEAAgE;IAChE,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,GAAE,uBAA4B;IAMjD;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BjC;;;OAGG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM;IAa5E;;;OAGG;IACG,YAAY,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D;;;;;OAKG;IACH,YAAY,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;IAQnE;;;;;;OAMG;IACH,mBAAmB,CACjB,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,YAAY,GACtB,IAAI;IAYP;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B;;;OAGG;YACW,IAAI;YAeJ,MAAM;CAiBrB"}

package/dist/services/ModelInfoService.js

@@ -5,27 +5,86 @@
  * but that data was previously stranded in getAvailableModels() calls. This service
  * caches it so readers and routes can look up context windows without re-fetching.
  *
- * Sync getContextWindow() checks cache first, falls back to the shared heuristic.
+ * Two layers, in resolution order:
+ *  1. observed (durable) — real windows captured from an SDK `result` message's
+ *     modelUsage (the only place the true, account-resolved window exists). Keyed
+ *     by "<provider>:<model>" with the concrete model id, persisted to
+ *     {dataDir}/model-context-windows.json so it survives server restarts. This is
+ *     what fixes the "120% after restart" non-determinism (see
+ *     topics/claude-1m-context.md).
+ *  2. ingested (ephemeral) — provider-list/heuristic values from getAvailableModels()
+ *     (warmProvider/ingestModels), keyed by alias (e.g. "opus", "opus[1m]"). NOT
+ *     persisted: these are static guesses and would pollute the durable file.
+ *
+ * Sync getContextWindow() checks observed → ingested → shared heuristic. The
+ * live-process value (Process.contextWindow) still overrides this at request time.
  */
+import fs from "node:fs/promises";
+import path from "node:path";
 import { getModelContextWindow, } from "../../bundled/@yep-anywhere/shared/dist/index.js";
 import { getProvider } from "../sdk/providers/index.js";
+const CURRENT_VERSION = 1;
 export class ModelInfoService {
-    /** (provider:modelId) → contextWindow */
-    contextWindows = new Map();
+    /** Durable, real observations (persisted). */
+    observed = new Map();
+    /** Ephemeral provider-list/heuristic values (not persisted). */
+    ingested = new Map();
+    filePath;
+    savePromise = null;
+    pendingSave = false;
+    constructor(options = {}) {
+        this.filePath = options.dataDir
+            ? path.join(options.dataDir, "model-context-windows.json")
+            : undefined;
+    }
+    /**
+     * Load persisted observations from disk. Best-effort; missing/invalid files
+     * start empty. No-op when constructed without a dataDir.
+     */
+    async initialize() {
+        if (!this.filePath)
+            return;
+        try {
+            const content = await fs.readFile(this.filePath, "utf-8");
+            const parsed = JSON.parse(content);
+            if (parsed && typeof parsed === "object" && parsed.models) {
+                for (const [key, info] of Object.entries(parsed.models)) {
+                    if (info && typeof info.contextWindow === "number") {
+                        this.observed.set(key, {
+                            contextWindow: info.contextWindow,
+                            observedAt: info.observedAt ?? new Date().toISOString(),
+                        });
+                    }
+                }
+                console.log(`[ModelInfoService] Loaded ${this.observed.size} observed model windows from disk`);
+            }
+        }
+        catch (error) {
+            if (error.code !== "ENOENT") {
+                console.warn("[ModelInfoService] Failed to load state, starting fresh:", error);
+            }
+        }
+    }
     /**
      * Get context window for a model (sync).
-     * Checks cache first, falls back to shared heuristic.
+     * Precedence: durable observation → ephemeral ingested → shared heuristic.
      */
     getContextWindow(model, provider) {
         if (model && provider) {
-            const cached = this.contextWindows.get(`${provider}:${model}`);
-            if (cached !== undefined)
-                return cached;
+            // An actual observed window beats any heuristic; check the durable then
+            // ephemeral caches before falling back to getModelContextWindow.
+            const key = `${provider}:${model}`;
+            const obs = this.observed.get(key);
+            if (obs !== undefined)
+                return obs.contextWindow;
+            const ingested = this.ingested.get(key);
+            if (ingested !== undefined)
+                return ingested;
         }
         return getModelContextWindow(model, provider);
     }
     /**
-     * Populate cache from a provider's getAvailableModels().
+     * Populate the ephemeral cache from a provider's getAvailableModels().
      * Call at startup and when sessions are created. Failures are logged, not thrown.
      */
     async warmProvider(providerName) {
@@ -41,24 +100,78 @@ export class ModelInfoService {
         }
     }
     /**
-     * Ingest model list into the cache.
+     * Ingest a model list into the ephemeral cache.
      * Called by warmProvider() and also by the providers route when it already
-     * has fresh model data (avoids redundant fetches).
+     * has fresh model data (avoids redundant fetches). These are provider-list
+     * (often heuristic) values and are intentionally not persisted.
      */
     ingestModels(providerName, models) {
         for (const m of models) {
             if (m.contextWindow) {
-                this.contextWindows.set(`${providerName}:${m.id}`, m.contextWindow);
+                this.ingested.set(`${providerName}:${m.id}`, m.contextWindow);
             }
         }
     }
     /**
-     * Record a context window discovered at runtime
-     * (e.g. from model_context_window in Codex SDK messages).
+     * Record a context window discovered at runtime from a real SDK observation
+     * (the contextWindow in a `result` message's modelUsage, or Codex
+     * model_context_window). This is the durable layer: stored with a timestamp
+     * and persisted so the window survives a server restart. Refreshes observedAt
+     * on every observation, even when the value is unchanged.
      */
     recordContextWindow(model, contextWindow, provider) {
         const key = provider ? `${provider}:${model}` : model;
-        this.contextWindows.set(key, contextWindow);
+        this.observed.set(key, {
+            contextWindow,
+            observedAt: new Date().toISOString(),
+        });
+        // Flush on every observation so observedAt means "last confirmed". Callers
+        // record at turn-completion cadence (not per request), and the debounced
+        // writer coalesces any bursts, so this is cheap.
+        void this.save();
+    }
+    /**
+     * Await any in-flight/pending debounced write. Mainly for tests and graceful
+     * shutdown; normal callers fire-and-forget via recordContextWindow.
+     */
+    async flush() {
+        while (this.savePromise) {
+            await this.savePromise.catch(() => { });
+        }
+    }
+    /**
+     * Save observed state to disk with debouncing to prevent excessive writes.
+     * No-op when constructed without a dataDir.
+     */
+    async save() {
+        if (!this.filePath)
+            return;
+        if (this.savePromise) {
+            this.pendingSave = true;
+            return;
+        }
+        this.savePromise = this.doSave();
+        await this.savePromise;
+        this.savePromise = null;
+        if (this.pendingSave) {
+            this.pendingSave = false;
+            await this.save();
+        }
+    }
+    async doSave() {
+        if (!this.filePath)
+            return;
+        try {
+            await fs.mkdir(path.dirname(this.filePath), { recursive: true });
+            const state = {
+                version: CURRENT_VERSION,
+                models: Object.fromEntries(this.observed),
+            };
+            await fs.writeFile(this.filePath, JSON.stringify(state, null, 2), "utf-8");
+        }
+        catch (error) {
+            console.error("[ModelInfoService] Failed to save state:", error);
+        }
     }
 }
 //# sourceMappingURL=ModelInfoService.js.map

package/dist/services/ModelInfoService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelInfoService.js","sourceRoot":"","sources":["../../src/services/ModelInfoService.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAGL,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,OAAO,gBAAgB;IAC3B,yCAAyC;IACjC,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEnD;;;OAGG;IACH,gBAAgB,CAAC,KAAyB,EAAE,QAAuB;QACjE,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;YAC/D,IAAI,MAAM,KAAK,SAAS;gBAAE,OAAO,MAAM,CAAC;QAC1C,CAAC;QACD,OAAO,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY,CAAC,YAA0B;QAC3C,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACP,sCAAsC;QACxC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,YAA0B,EAAE,MAAmB;QAC1D,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;gBACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,YAAY,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,mBAAmB,CACjB,KAAa,EACb,aAAqB,EACrB,QAAuB;QAEvB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;CACF"}
+{"version":3,"file":"ModelInfoService.js","sourceRoot":"","sources":["../../src/services/ModelInfoService.ts"],"names":[],"mappings":"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"}

package/dist/services/ProjectQueueScheduler.d.ts

@@ -0,0 +1,91 @@
+import { type PermissionMode, type ProjectQueueItem, type ProjectQueueProjectStatus, type ProjectQueuePromoteNowResult, type ProviderName, type UrlProjectId } from "@yep-anywhere/shared";
+import type { UserMessage } from "../sdk/types.js";
+import type { EventBus } from "../watcher/EventBus.js";
+import type { ModelSettings } from "../supervisor/Supervisor.js";
+import type { AttachmentStagingService } from "../uploads/AttachmentStagingService.js";
+import type { ProjectQueueService } from "./ProjectQueueService.js";
+import type { SessionQueuePersistenceService } from "./SessionQueuePersistenceService.js";
+import { type ProjectWorkExternalTracker, type ProjectWorkIdleStatus, type ProjectWorkProcessSnapshot, type ProjectWorkSupervisor } from "./projectWorkIdle.js";
+export interface ProjectQueueProcessSnapshot extends ProjectWorkProcessSnapshot {
+    id: string;
+    sessionId: string;
+    projectId: UrlProjectId;
+    projectPath: string;
+    provider: ProviderName;
+    promptSuggestionMode?: ModelSettings["promptSuggestionMode"];
+    recapAfterSeconds?: number;
+}
+export type ProjectQueueDispatchResult = ProjectQueueProcessSnapshot | {
+    queued: true;
+    queueId: string;
+    position: number;
+} | {
+    error: "queue_full";
+    maxQueueSize: number;
+};
+export interface ProjectQueueSupervisor extends ProjectWorkSupervisor {
+    getAllProcesses(): ProjectQueueProcessSnapshot[];
+    startSession(projectPath: string, message: UserMessage, permissionMode?: PermissionMode, modelSettings?: ModelSettings): Promise<ProjectQueueDispatchResult>;
+    createSession(projectPath: string, permissionMode?: PermissionMode, modelSettings?: ModelSettings): Promise<ProjectQueueDispatchResult>;
+    resumeSession(sessionId: string, projectPath: string, message: UserMessage, permissionMode?: PermissionMode, modelSettings?: ModelSettings): Promise<ProjectQueueDispatchResult>;
+}
+export type ProjectQueueExternalTracker = ProjectWorkExternalTracker;
+export type ProjectIdleStatus = ProjectWorkIdleStatus;
+interface PromoteNowOptions {
+    itemId?: string;
+    force?: boolean;
+}
+export interface ProjectQueueSchedulerOptions {
+    projectQueueService: ProjectQueueService;
+    supervisor: ProjectQueueSupervisor;
+    eventBus: EventBus;
+    attachmentStagingService?: AttachmentStagingService;
+    sessionQueuePersistenceService?: SessionQueuePersistenceService;
+    externalTracker?: ProjectQueueExternalTracker;
+    idleGraceMs?: number;
+    blockedRetryMs?: number;
+    getIdleGraceMs?: () => number;
+    getGlobalInstructions?: () => string | undefined;
+    onSessionStarted?: (args: {
+        item: ProjectQueueItem;
+        process: ProjectQueueProcessSnapshot;
+    }) => void | Promise<void>;
+}
+export declare class ProjectQueueScheduler {
+    private readonly options;
+    private readonly projectQueueService;
+    private readonly supervisor;
+    private readonly eventBus;
+    private readonly externalTracker?;
+    private readonly fixedIdleGraceMs?;
+    private readonly getConfiguredIdleGraceMs?;
+    private readonly timers;
+    private readonly inFlight;
+    private readonly inFlightRuns;
+    private readonly unsubscribe;
+    private disposed;
+    constructor(options: ProjectQueueSchedulerOptions);
+    dispose(): Promise<void>;
+    getProjectIdleStatus(projectId: UrlProjectId): Promise<ProjectIdleStatus>;
+    getProjectStatus(projectId: UrlProjectId): Promise<ProjectQueueProjectStatus>;
+    promoteNow(projectId: UrlProjectId, options?: PromoteNowOptions): Promise<ProjectQueuePromoteNowResult>;
+    private readonly handleEvent;
+    private getRecoveredPatientQueueCount;
+    private getIdleGraceMs;
+    private scheduleAllDispatchableProjects;
+    private scheduleProjectIfDispatchable;
+    private scheduleProject;
+    private clearProjectTimer;
+    private scheduleBlockedProjectRetry;
+    private hasRunnableQueuedItem;
+    private runProject;
+    private runProjectNow;
+    private dispatchItem;
+    private dispatchExistingSessionItem;
+    private dispatchNewSessionItem;
+    private materializeStagedAttachments;
+    private toUserMessage;
+    private toModelSettings;
+}
+export {};
+//# sourceMappingURL=ProjectQueueScheduler.d.ts.map

package/dist/services/ProjectQueueScheduler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectQueueScheduler.d.ts","sourceRoot":"","sources":["../../src/services/ProjectQueueScheduler.ts"],"names":[],"mappings":"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"}