@sumicom/quicksave 0.8.2 → 0.8.3

package/dist/handlers/messageHandler.d.ts

@@ -1,4 +1,4 @@
-import { Message, License, Repository, SessionRegistryEntry, CodexModelInfo } from '@sumicom/quicksave-shared';
+import { Message, License, Repository, SessionRegistryEntry, AgentId, CodexModelInfo } from '@sumicom/quicksave-shared';
 import type { PushClient } from '../service/pushClient.js';
 import { CommitSummaryStateStore } from '../ai/commitSummaryStore.js';
 import { SessionManager } from '../ai/sessionManager.js';
@@ -23,15 +23,23 @@ export declare class MessageHandler {
     private codexModelsCache;
     private codexModelsCheckInFlight;
     private codexModelsUpdateHandler;
-    private codexModelsWatcher;
-    private codexModelsWatchDebounce;
-    /** Override for tests; defaults to `~/.codex`. */
+    /** Override for tests; defaults to `~/.codex`. Still consulted by
+     *  `getCodexLoginStatus` to read `auth.json`; no longer used for model
+     *  discovery (that flows through `model/list` against a short-lived
+     *  app-server instance). */
     private readonly codexCacheDir;
     private codexLoginManager;
     onHistoryUpdated?: (cwd: string, entry: SessionRegistryEntry, action: 'upsert' | 'delete') => void;
     private productionBuild;
     constructor(repos: Repository[], _license?: License, codingPaths?: string[], productionBuild?: boolean, options?: {
         codexCacheDir?: string;
+        /**
+         * Override the default `[ClaudeCodeProvider, CodexAppServerProvider]` lineup.
+         * Used by the e2e harness to inject a `StubProvider` that doesn't
+         * spawn real CLIs. When provided, the lineup is wrapped in a fresh
+         * `SessionManager` exactly the same way the daemon does in `run.ts`.
+         */
+        sessionManager?: SessionManager;
     });
     /**
      * Check npm registry for latest version. Deduped: returns cached value
@@ -39,23 +47,40 @@ export declare class MessageHandler {
      */
     private checkLatestVersion;
     /**
-     * Resolve the Codex model list for the current user.
+     * Resolve the Codex model list for the current authenticated account.
      *
-     * Priority:
-     *   1. `~/.codex/models_cache.json` — the Codex CLI's own cache of
-     *      models the signed-in account can actually use. This is the
-     *      authoritative list for ChatGPT-OAuth logins (the common case)
-     *      and is kept fresh by the CLI itself. Reads are essentially free,
-     *      so we use a short 5min in-memory TTL — and `startCodexModelsWatcher`
-     *      invalidates the cache the moment the file is rewritten.
-     *   2. `OPENAI_API_KEY` env var + OpenAI `/v1/models` — fallback for
-     *      API-key users, who are rare but still supported. Held to a 1h
-     *      sub-TTL so we don't hammer OpenAI when the local cache is absent.
+     * Source: `model/list` against a short-lived `codex app-server` instance.
+     * The app-server already enforces account-scoped filtering — what we get
+     * back is exactly the list this user can actually invoke (e.g. ChatGPT
+     * users won't see `claude-*` models, API-key users see the API-tier list).
+     * That's what makes this source authoritative: previously we fell through
+     * three sources (`codex debug models` / on-disk cache file / OpenAI
+     * `/v1/models`) none of which knew the caller's plan, so the picker
+     * surfaced models that would later 400 with `BadRequest`.
      *
-     * Returns `null` when neither source is available (not logged in and no
-     * API key set). Concurrent calls are deduped.
+     * Returns `null` if the spawn fails or no models come back. Concurrent
+     * calls dedup via `codexModelsCheckInFlight`. Cache TTL is single-tier
+     * (30 min) — force-refresh bypasses it.
      */
     private fetchCodexModels;
+    /**
+     * Spawn a short-lived `codex app-server`, run `initialize` + `model/list`,
+     * shut down. Filters out `hidden: true` models (e.g. `codex-auto-review`)
+     * so they don't leak into the picker. Returns `null` on any failure —
+     * caller treats null as "no source available, picker falls back to
+     * hard-coded defaults".
+     */
+    private fetchCodexModelsFromAppServer;
+    /**
+     * Resolve a user-provided model into one the current account actually
+     * supports. If the cache is empty (model/list never succeeded) the
+     * requested value passes through — we'd rather try and let codex 400 than
+     * silently swallow a model the user explicitly chose. If the cache exists
+     * but the requested model isn't in it, we fall back to whichever model
+     * `model/list` flagged as `isDefault` (e.g. ChatGPT account picks `gpt-5.5`).
+     * Non-codex agents are pass-through; their model space is independent.
+     */
+    validateCodexModel(requested: string | undefined, agentId: AgentId): string | undefined;
     /** Snapshot accessor for the bus `/codex/models` subscription. */
     getCachedCodexModels(): CodexModelInfo[];
     /**
@@ -64,30 +89,17 @@ export declare class MessageHandler {
      */
     setCodexModelsUpdateHandler(handler: (models: CodexModelInfo[]) => void): void;
     /**
-     * Watch the Codex CLI cache directory and refresh the in-memory model list
-     * the moment the CLI rewrites it (typically after a `codex` startup or
-     * upgrade). Tolerant of a missing `~/.codex` directory — falls back to TTL
-     * alone if the watch can't be set up. Idempotent.
+     * Prime the in-memory cache at daemon boot. No-op if already cached.
+     * Replaces the previous file-watcher path: there's no on-disk file we
+     * watch any more, so the only refresh trigger is TTL expiry (30 min)
+     * or an explicit `force=true` call. The eager prime keeps the first
+     * `/codex/models` subscriber from getting an empty snapshot.
      */
-    startCodexModelsWatcher(): void;
-    /** Tear down the fs.watch handle (test cleanup). */
-    stopCodexModelsWatcher(): void;
-    private scheduleCodexModelsRefresh;
-    private refreshCodexModelsAndPublish;
-    /**
-     * Read models from the Codex CLI's local cache. File shape (as of codex
-     * CLI v0.125): `{ models: [{ slug, display_name, visibility, supported_in_api, ... }] }`.
-     * We surface only entries that are listable and API-supported, so hidden
-     * internal models (e.g. `codex-auto-review`) don't leak into the picker.
-     */
-    private readCodexModelsCacheFile;
-    /** Fallback for API-key users (no ChatGPT OAuth). */
-    private fetchCodexModelsFromOpenAI;
+    primeCodexModelsCache(): void;
     /**
      * Best-effort check for whether the local Codex CLI has valid auth.
-     * Matches how `fetchCodexModels` resolves credentials, so the PWA can
-     * prompt for login when this returns false. Does not validate the
-     * token — just checks that a credential source exists.
+     * The PWA uses this to prompt for login when it returns false. Does not
+     * validate the token — just checks that a credential source exists.
      */
     private getCodexLoginStatus;
     addRepo(repo: Repository): void;
@@ -175,6 +187,18 @@ export declare class MessageHandler {
     private handleClaudeResume;
     private handleClaudeCancel;
     private handleClaudeClose;
+    /**
+     * End Task: archive the session's registry entry, then terminate the live
+     * CLI process. Order matters — closeSession emits a session-updated whose
+     * `archived` flag is derived from "no in-memory entry AND no active
+     * registry entry". Archiving first ensures that emit carries archived=true,
+     * which the PWA reads as the "navigate away" signal.
+     *
+     * cwd lookup: prefer the live in-memory entry; fall back to the registry
+     * so users can still archive a stale active entry whose CLI has already
+     * exited (cold-closed sessions still appear in the drawer).
+     */
+    private handleClaudeEndTask;
     private handleClaudeUserInputResponse;
     private handleClaudeGetCards;
     private handleSetPreferences;

package/dist/handlers/messageHandler.d.ts.map

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