@sumicom/quicksave 0.6.3 → 0.7.0

package/dist/ai/provider.d.ts

@@ -1,6 +1,6 @@
-import type { AgentId, CardEvent, CardStreamEnd } from '@sumicom/quicksave-shared';
+import type { AgentId, CardEvent, CardStreamEnd, ContextUsageBreakdown } from '@sumicom/quicksave-shared';
 import type { StreamCardBuilder } from './cardBuilder.js';
-export type PermissionLevel = 'bypassPermissions' | 'acceptEdits' | 'default' | 'plan';
+export type PermissionLevel = 'bypassPermissions' | 'acceptEdits' | 'default' | 'plan' | 'auto';
 export type ProviderHistoryMode = 'claude-jsonl' | 'memory';
 /** Represents a running provider session. */
 export interface ProviderSession {
@@ -8,6 +8,10 @@ export interface ProviderSession {
     interrupt(): void;
     kill(): void;
     readonly alive: boolean;
+    /** Optional — ask the provider for a breakdown of current context window
+     * usage. Only supported by the Claude Code CLI (via `get_context_usage`
+     * control_request). Returns null on providers that don't support it. */
+    getContextUsage?(): Promise<ContextUsageBreakdown | null>;
 }
 /** Callbacks the provider uses to communicate back to SessionManager. */
 export interface ProviderCallbacks {
@@ -23,6 +27,12 @@ export interface ProviderCallbacks {
         updatedInput?: Record<string, unknown>;
     }>;
     onModelDetected(model: string): void;
+    /** Fired when the underlying provider process has fully exited. SessionManager
+     * uses this to remove the session from its in-memory map and emit
+     * `session-updated { isActive: false }` so the PWA's badge reflects reality.
+     * The `providerSession` reference lets the manager ignore stale callbacks
+     * from a provider that has already been replaced by cold resume. */
+    onSessionExited?(sessionId: string, providerSession: ProviderSession): void;
 }
 export interface StartSessionOpts {
     prompt: string;
@@ -38,6 +48,7 @@ export interface ResumeSessionOpts {
     prompt: string;
     cwd: string;
     streamId: string;
+    model?: string;
     permissionLevel: PermissionLevel;
     sandboxed: boolean;
     systemPrompt?: string;

package/dist/ai/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/ai/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG,aAAa,GAAG,SAAS,GAAG,MAAM,CAAC;AACvF,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,QAAQ,CAAC;AAE5D,6CAA6C;AAC7C,MAAM,WAAW,eAAe;IAC9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,SAAS,IAAI,IAAI,CAAC;IAClB,IAAI,IAAI,IAAI,CAAC;IACb,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,yEAAyE;AACzE,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3C,uBAAuB,CACrB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAC/E,OAAO,CAAC;QACT,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACxC,CAAC,CAAC;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC;IAE1C,YAAY,CACV,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAE5D,aAAa,CACX,IAAI,EAAE,iBAAiB,EACvB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;CAC7D"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/ai/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC1G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAChG,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,QAAQ,CAAC;AAE5D,6CAA6C;AAC7C,MAAM,WAAW,eAAe;IAC9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,SAAS,IAAI,IAAI,CAAC;IAClB,IAAI,IAAI,IAAI,CAAC;IACb,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB;;4EAEwE;IACxE,eAAe,CAAC,IAAI,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC;CAC3D;AAED,yEAAyE;AACzE,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3C,uBAAuB,CACrB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAC/E,OAAO,CAAC;QACT,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACxC,CAAC,CAAC;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC;;;;wEAIoE;IACpE,eAAe,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CAC7E;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC;IAE1C,YAAY,CACV,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAE5D,aAAa,CACX,IAAI,EAAE,iBAAiB,EACvB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;CAC7D"}

package/dist/ai/sessionManager.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import type { AgentId, ClaudeSessionSummary, ClaudeUserInputRequestPayload, ClaudeUserInputResponsePayload, ClaudePreferences, ConfigValue, CardHistoryResponse } from '@sumicom/quicksave-shared';
+import type { AgentId, ClaudeSessionSummary, ClaudeUserInputRequestPayload, ClaudeUserInputResponsePayload, ClaudePreferences, ConfigValue, CardHistoryResponse, SessionUpdatePayload } from '@sumicom/quicksave-shared';
 import { StreamCardBuilder } from './cardBuilder.js';
 import type { PermissionLevel, ProviderSession, ProviderCallbacks, CodingAgentProvider } from './provider.js';
 export interface ManagedSession {
@@ -11,6 +11,8 @@ export interface ManagedSession {
     permissionLevel: PermissionLevel;
     sandboxed: boolean;
     cardBuilder: StreamCardBuilder | null;
+    /** Model the current provider process was spawned with. Used to force cold resume when model changes. */
+    spawnedModel?: string;
 }
 export declare class SessionManager extends EventEmitter {
     private sessions;
@@ -33,7 +35,10 @@ export declare class SessionManager extends EventEmitter {
     getPreferences(): ClaudePreferences;
     setPreferences(prefs: Partial<ClaudePreferences>): ClaudePreferences;
     getSessionConfig(sessionId: string): Record<string, ConfigValue>;
-    setSessionConfig(sessionId: string, key: string, value: ConfigValue): Record<string, ConfigValue>;
+    /** Snapshot of every tracked session's config. Used by the bus
+     *  `/sessions/config` subscription snapshot. */
+    getAllSessionConfigs(): Record<string, Record<string, ConfigValue>>;
+    setSessionConfig(sessionId: string, key: string, value: ConfigValue): Promise<Record<string, ConfigValue>>;
     startSession(opts: {
         prompt: string;
         cwd: string;
@@ -53,8 +58,10 @@ export declare class SessionManager extends EventEmitter {
         agent?: AgentId;
     }): Promise<string>;
     cancelSession(sessionId: string): Promise<boolean>;
+    /** Send a raw control_request to the active provider session (CLI only). */
+    sendControlRequest(sessionId: string, subtype: string, params?: Record<string, unknown>): Promise<unknown>;
     closeSession(sessionId: string): boolean;
-    setPermissionLevel(sessionId: string, level: PermissionLevel): boolean;
+    setPermissionLevel(sessionId: string, level: PermissionLevel): Promise<boolean>;
     getPermissionLevel(sessionId: string): PermissionLevel;
     resolveUserInput(response: ClaudeUserInputResponsePayload): boolean;
     getActiveSessions(): {
@@ -68,12 +75,20 @@ export declare class SessionManager extends EventEmitter {
     isStreaming(sessionId: string): boolean;
     isOpen(sessionId: string): boolean;
     getSessionCwd(sessionId: string): string | undefined;
+    /** Fetch a live context-window breakdown from the provider. Returns null if
+     * the session has no live provider process or the provider doesn't support
+     * `get_context_usage` (only the claude-code CLI does). */
+    getSessionContextUsage(sessionId: string): Promise<import('@sumicom/quicksave-shared').ContextUsageBreakdown | null>;
     getSessionAgent(sessionId: string, cwd?: string): AgentId;
     getActiveSessionCount(): number;
     getCardBuilder(sessionId: string): StreamCardBuilder | null;
     listAvailableSessions(cwd: string): Promise<ClaudeSessionSummary[]>;
     getCards(sessionId: string, cwd: string, offset?: number, limit?: number): Promise<CardHistoryResponse>;
     getPendingInputRequests(): ClaudeUserInputRequestPayload[];
+    /** True when a user-input-request is outstanding for this session. Used by
+     *  the daemon to avoid firing a redundant "session idle" push when the
+     *  card-stream-end is actually a permission-prompt pause. */
+    hasPendingInputForSession(sessionId: string): boolean;
     getDebugState(): {
         pendingInputs: {
             requestId: string;
@@ -97,7 +112,21 @@ export declare class SessionManager extends EventEmitter {
     private shouldAutoApprove;
     /** Update session title (triggered by SetTitle MCP tool). */
     private updateSessionTitle;
+    /** Move per-session state from oldId to newId after the CLI forks on
+     * --resume. `sessionAgents[newId]` is already set by the caller; this
+     * helper moves the remaining side maps and clears the old key. */
+    private migrateSessionIdState;
     private emitSessionUpdate;
+    /**
+     * Build the payload normally shipped via the `session-updated` event without
+     * emitting. Used by daemon-level code that wants to push a fresh snapshot to
+     * a specific peer (e.g. PWA reconnect) instead of triggering a broadcast.
+     */
+    buildSessionUpdatePayload(sessionId: string): SessionUpdatePayload;
+    /** Snapshot of every active (in-memory) session's state. Delivered via the
+     *  bus `/sessions/active` snap frame on subscribe; subsequent incremental
+     *  updates are published per session via the same path. */
+    snapshotActiveSessions(): SessionUpdatePayload[];
     private persistRegistryField;
     private persistAllowPattern;
     private waitForUserInput;

package/dist/ai/sessionManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionManager.d.ts","sourceRoot":"","sources":["../../src/ai/sessionManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionManager.d.ts","sourceRoot":"","sources":["../../src/ai/sessionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EACV,OAAO,EACP,oBAAoB,EACpB,6BAA6B,EAC7B,8BAA8B,EAC9B,iBAAiB,EACjB,WAAW,EAEX,mBAAmB,EAEnB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAMnC,OAAO,EAAE,iBAAiB,EAA6C,MAAM,kBAAkB,CAAC;AAIhG,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAgDvB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtC,yGAAyG;IACzG,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,QAAQ,CAA0C;IAC1D,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,kBAAkB,CAA2C;IACrE,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,cAAc,CAAuD;IAC7E,OAAO,CAAC,oBAAoB,CAA4C;IACxE,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,WAAW,CAA+C;IAClE,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,cAAc,CAAU;IAEhC,kGAAkG;IAClG,OAAO,CAAC,kBAAkB,CAAuD;gBAErE,SAAS,EAAE,mBAAmB,EAAE,EAAE,cAAc,GAAE,OAAuB;IAQrF,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,cAAc;IAsChB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC,cAAc,IAAI,iBAAiB;IAInC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAwBpE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAIhE;oDACgD;IAChD,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAQ7D,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IA8C1G,YAAY,CAAC,IAAI,EAAE;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuEb,aAAa,CAAC,IAAI,EAAE;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,GAAG,OAAO,CAAC,MAAM,CAAC;IAsJb,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQxD,4EAA4E;IACtE,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAYhH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAclC,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBrF,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe;IAItD,gBAAgB,CAAC,QAAQ,EAAE,8BAA8B,GAAG,OAAO;IA2BnE,iBAAiB,IAAI;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE;IAetJ,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIvC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIlC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD;;8DAE0D;IACpD,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,2BAA2B,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAO1H,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO;IAIzD,qBAAqB,IAAI,MAAM;IAI/B,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAIrD,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IA2CnE,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAyEpG,uBAAuB,IAAI,6BAA6B,EAAE;IAI1D;;iEAE6D;IAC7D,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAOrD,aAAa;;;;;;;;;uBAnLqB,MAAM;iBAAO,MAAM;yBAAe,OAAO;6BAAmB,OAAO;4BAAkB,MAAM;wBAAc,OAAO;;;IA8LlJ,OAAO,IAAI,IAAI;IAiBf,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB;YA0CpC,uBAAuB;IAiFrC,OAAO,CAAC,iBAAiB;IAkCzB,6DAA6D;IAC7D,OAAO,CAAC,kBAAkB;IAgB1B;;sEAEkE;IAClE,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,iBAAiB;IAIzB;;;;OAIG;IACH,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,oBAAoB;IAiClE;;+DAE2D;IAC3D,sBAAsB,IAAI,oBAAoB,EAAE;IAIhD,OAAO,CAAC,oBAAoB;YAiBd,mBAAmB;IAsBjC,OAAO,CAAC,gBAAgB;CAQzB"}

package/dist/ai/sessionManager.js

@@ -5,6 +5,7 @@ import { DEFAULT_AGENT, DEFAULT_MODEL, matchAllowPattern, } from '@sumicom/quick
 import { StreamCardBuilder, buildCardsFromHistory, loadPersistedCards } from './cardBuilder.js';
 import { SANDBOX_BASH_TOOL, SET_TITLE_TOOL } from './sandboxMcp.js';
 import { getSessionRegistry } from './sessionRegistry.js';
+import { getEventStore } from '../storage/eventStore.js';
 /**
  * Events emitted:
  *   'card-event'             (event: CardEvent)
@@ -28,6 +29,7 @@ const AUTO_APPROVE = {
     acceptEdits: new Set(['Edit', 'Write', 'NotebookEdit', 'TodoWrite', 'Agent', 'EnterWorktree', 'ExitWorktree', 'EnterPlanMode']),
     default: new Set(['TodoWrite', 'EnterWorktree', 'ExitWorktree', 'Agent', 'EnterPlanMode']),
     plan: new Set(['EnterPlanMode']),
+    auto: new Set(['TodoWrite', 'EnterWorktree', 'ExitWorktree', 'Agent', 'EnterPlanMode']),
 };
 const DEFAULT_SYSTEM_PROMPT = [
     'For non-destructive shell commands (ls, cat, find, git log, git status, git diff, etc.), prefer SandboxBash over Bash. SandboxBash runs in a sandboxed environment. Use Bash only for commands that modify state.',
@@ -130,7 +132,16 @@ export class SessionManager extends EventEmitter {
     getSessionConfig(sessionId) {
         return { ...this.sessionConfigs.get(sessionId) };
     }
-    setSessionConfig(sessionId, key, value) {
+    /** Snapshot of every tracked session's config. Used by the bus
+     *  `/sessions/config` subscription snapshot. */
+    getAllSessionConfigs() {
+        const out = {};
+        for (const [id, cfg] of this.sessionConfigs.entries()) {
+            out[id] = { ...cfg };
+        }
+        return out;
+    }
+    async setSessionConfig(sessionId, key, value) {
         const prev = this.sessionConfigs.get(sessionId) ?? {};
         const next = { ...prev, [key]: value };
         this.sessionConfigs.set(sessionId, next);
@@ -141,7 +152,16 @@ export class SessionManager extends EventEmitter {
             this.setPreferences({ reasoningEffort: value });
         }
         else if (key === 'permissionMode' && typeof value === 'string') {
-            this.setPermissionLevel(sessionId, value);
+            try {
+                await this.setPermissionLevel(sessionId, value);
+            }
+            catch (err) {
+                // CLI rejected the mode (e.g. auto mode not supported for this model/plan).
+                // Roll back the optimistic config change and rethrow.
+                this.sessionConfigs.set(sessionId, prev);
+                this.emit('session-config-updated', { sessionId, config: prev });
+                throw err;
+            }
             this.persistRegistryField(sessionId, 'permissionMode', value);
         }
         else if (key === 'sandboxed' && typeof value === 'boolean') {
@@ -170,7 +190,7 @@ export class SessionManager extends EventEmitter {
     }
     // ── Session Lifecycle ──
     async startSession(opts) {
-        const validModes = ['default', 'acceptEdits', 'bypassPermissions', 'plan'];
+        const validModes = ['default', 'acceptEdits', 'bypassPermissions', 'plan', 'auto'];
         const level = validModes.includes(opts.permissionMode)
             ? opts.permissionMode : 'acceptEdits';
         const sandboxed = !!opts.sandboxed;
@@ -220,6 +240,7 @@ export class SessionManager extends EventEmitter {
             permissionLevel: level,
             sandboxed,
             cardBuilder,
+            spawnedModel: opts.model,
         };
         this.sessions.set(sessionId, managed);
         this.emitSessionUpdate(sessionId);
@@ -228,14 +249,28 @@ export class SessionManager extends EventEmitter {
     async resumeSession(opts) {
         const existing = this.sessions.get(opts.sessionId);
         const agentId = this.resolveAgentId(opts.sessionId, opts.cwd, opts.agent);
-        // Hot resume: session is streaming and provider session is alive
+        // Force cold resume if the user changed model since the session was spawned.
+        // The active provider process was started with `--model X`, so changing model
+        // requires killing it and respawning with the new flag.
+        const desiredModel = this.sessionConfigs.get(opts.sessionId)?.model
+            ?? this.preferences.model;
+        const modelChanged = existing?.providerSession?.alive
+            && existing.spawnedModel !== undefined
+            && desiredModel !== undefined
+            && existing.spawnedModel !== desiredModel;
+        if (modelChanged) {
+            console.log(`[session-manager] model changed (${existing.spawnedModel} → ${desiredModel}) — killing provider for cold resume session=${opts.sessionId.slice(0, 8)}`);
+            existing.providerSession.kill();
+            existing.streaming = false;
+            existing.providerSession = null;
+        }
+        // Hot resume (active turn): provider is mid-turn. Queue the streamId so
+        // consumeStream picks it up after the current turn's result event.
         if (existing?.streaming && existing.providerSession?.alive) {
-            console.log(`[session-manager] hot resume session=${opts.sessionId.slice(0, 8)} streaming=true`);
-            // Add user prompt to cardBuilder for getCards on reconnect
+            console.log(`[session-manager] hot resume (active) session=${opts.sessionId.slice(0, 8)}`);
             if (existing.cardBuilder) {
                 existing.cardBuilder.userMessage(opts.prompt);
             }
-            // Queue the streamId so consumeStream picks it up after the current turn's result
             const ps = existing.providerSession;
             if (ps.pendingStreamIds) {
                 ps.pendingStreamIds.push(opts.streamId);
@@ -243,6 +278,25 @@ export class SessionManager extends EventEmitter {
             existing.providerSession.sendUserMessage(opts.prompt);
             return opts.sessionId;
         }
+        // Hot resume (idle): CLI alive but between turns — reuse the same process
+        // instead of cold-resuming. Saves a kill+spawn per follow-up prompt and
+        // avoids the brief isActive=false window that caused the "ghost inactive"
+        // badge flicker between turns.
+        if (existing?.providerSession?.alive && !modelChanged) {
+            console.log(`[session-manager] hot resume (idle) session=${opts.sessionId.slice(0, 8)}`);
+            const ps = existing.providerSession;
+            if (existing.cardBuilder) {
+                existing.cardBuilder.cancelDeferredClear?.();
+                existing.cardBuilder.userMessage(opts.prompt);
+                existing.cardBuilder.startNewTurn(opts.streamId);
+            }
+            ps.currentStreamId = opts.streamId;
+            ps.resultEmitted = false;
+            existing.streaming = true;
+            existing.providerSession.sendUserMessage(opts.prompt);
+            this.emitSessionUpdate(opts.sessionId);
+            return opts.sessionId;
+        }
         // Cold resume already in flight — queue the prompt instead of spawning again
         const inFlight = this.coldResumeInFlight.get(opts.sessionId);
         if (inFlight) {
@@ -258,7 +312,7 @@ export class SessionManager extends EventEmitter {
             // Restore session settings from in-memory maps, falling back to persisted
             // registry (survives daemon restarts).
             const registryEntry = getSessionRegistry().getEntry(opts.cwd, opts.sessionId);
-            const validModes = ['default', 'acceptEdits', 'bypassPermissions', 'plan'];
+            const validModes = ['default', 'acceptEdits', 'bypassPermissions', 'plan', 'auto'];
             const restoredLevel = this.sessionPermissions.get(opts.sessionId)
                 ?? (validModes.includes(registryEntry?.permissionMode) ? registryEntry.permissionMode : undefined);
             const level = restoredLevel ?? 'acceptEdits';
@@ -267,11 +321,14 @@ export class SessionManager extends EventEmitter {
             const cardBuilder = existing?.cardBuilder ?? new StreamCardBuilder(opts.sessionId, opts.streamId, opts.cwd);
             await cardBuilder.snapshotCutoff();
             const callbacks = this.makeCallbacks(provider.id);
+            const sessionConfig = this.sessionConfigs.get(opts.sessionId);
+            const resumeModel = sessionConfig?.model ?? this.preferences.model;
             const { sessionId, session: providerSession } = await provider.resumeSession({
                 sessionId: opts.sessionId,
                 prompt: opts.prompt,
                 cwd: opts.cwd,
                 streamId: opts.streamId,
+                model: resumeModel,
                 permissionLevel: level,
                 sandboxed,
                 systemPrompt: buildSystemPrompt(),
@@ -280,8 +337,21 @@ export class SessionManager extends EventEmitter {
             this.sessionAgents.set(sessionId, provider.id);
             if (existing) {
                 existing.agentId = provider.id;
+                existing.sessionId = sessionId;
                 existing.providerSession = providerSession;
                 existing.streaming = true;
+                existing.spawnedModel = resumeModel;
+                // Cold resume can fork a new CLI session_id. Rekey the map + side
+                // maps to the new ID so emitSessionUpdate finds the entry and the
+                // PWA sees isActive=true (the ghost-inactive bug otherwise).
+                if (sessionId !== opts.sessionId) {
+                    this.sessions.delete(opts.sessionId);
+                    this.sessions.set(sessionId, existing);
+                    this.migrateSessionIdState(opts.sessionId, sessionId);
+                    // Tell PWA the old id is defunct so its store doesn't keep a
+                    // stale active entry for the previous session_id.
+                    this.emitSessionUpdate(opts.sessionId);
+                }
             }
             else {
                 const managed = {
@@ -293,6 +363,7 @@ export class SessionManager extends EventEmitter {
                     permissionLevel: level,
                     sandboxed,
                     cardBuilder,
+                    spawnedModel: resumeModel,
                 };
                 this.sessions.set(sessionId, managed);
             }
@@ -316,6 +387,18 @@ export class SessionManager extends EventEmitter {
         ps.providerSession.interrupt();
         return true;
     }
+    /** Send a raw control_request to the active provider session (CLI only). */
+    async sendControlRequest(sessionId, subtype, params) {
+        const ps = this.sessions.get(sessionId);
+        if (!ps?.providerSession?.alive) {
+            throw new Error('Session is not active');
+        }
+        const session = ps.providerSession;
+        if (typeof session.sendControlRequest !== 'function') {
+            throw new Error('Provider does not support raw control_request');
+        }
+        return session.sendControlRequest(subtype, params);
+    }
     closeSession(sessionId) {
         const ps = this.sessions.get(sessionId);
         if (!ps)
@@ -329,18 +412,27 @@ export class SessionManager extends EventEmitter {
         return true;
     }
     // ── Permission ──
-    setPermissionLevel(sessionId, level) {
+    async setPermissionLevel(sessionId, level) {
         const ps = this.sessions.get(sessionId);
+        const prevLevel = ps?.permissionLevel ?? this.sessionPermissions.get(sessionId) ?? 'acceptEdits';
         if (ps)
             ps.permissionLevel = level;
         this.sessionPermissions.set(sessionId, level);
-        this.emit('session-updated', {
-            sessionId,
-            isActive: !!ps,
-            isStreaming: ps?.streaming ?? false,
-            hasPendingInput: ps ? Array.from(this.pendingInputRequests.values()).some(p => p.request.sessionId === sessionId) : false,
-            permissionMode: level,
-        });
+        const session = ps?.providerSession;
+        if (session?.alive && typeof session.sendControlRequest === 'function') {
+            try {
+                await session.sendControlRequest('set_permission_mode', { mode: level });
+            }
+            catch (err) {
+                // CLI rejected — roll back in-memory state so config stays consistent with the CLI.
+                if (ps)
+                    ps.permissionLevel = prevLevel;
+                this.sessionPermissions.set(sessionId, prevLevel);
+                this.emitSessionUpdate(sessionId);
+                throw err;
+            }
+        }
+        this.emitSessionUpdate(sessionId);
         return true;
     }
     getPermissionLevel(sessionId) {
@@ -391,6 +483,17 @@ export class SessionManager extends EventEmitter {
     getSessionCwd(sessionId) {
         return this.sessions.get(sessionId)?.cwd;
     }
+    /** Fetch a live context-window breakdown from the provider. Returns null if
+     * the session has no live provider process or the provider doesn't support
+     * `get_context_usage` (only the claude-code CLI does). */
+    async getSessionContextUsage(sessionId) {
+        const ps = this.sessions.get(sessionId);
+        if (!ps?.providerSession?.alive)
+            return null;
+        if (typeof ps.providerSession.getContextUsage !== 'function')
+            return null;
+        return ps.providerSession.getContextUsage();
+    }
     getSessionAgent(sessionId, cwd) {
         return this.resolveAgentId(sessionId, cwd);
     }
@@ -405,24 +508,38 @@ export class SessionManager extends EventEmitter {
         const registryEntries = registry.getEntriesForProject(cwd)
             .filter(entry => !entry.archived);
         const pendingSessionIds = new Set(Array.from(this.pendingInputRequests.values()).map(p => p.request.sessionId));
-        return registryEntries.map(entry => ({
-            sessionId: entry.sessionId,
-            summary: entry.title ?? entry.firstPrompt ?? entry.sessionId.slice(0, 8),
-            lastModified: entry.lastAccessedAt,
-            createdAt: entry.createdAt,
-            cwd: entry.cwd,
-            agent: this.sessions.get(entry.sessionId)?.agentId
-                ?? this.sessionAgents.get(entry.sessionId)
-                ?? entry.agent
-                ?? (entry.provider === 'codex-mcp' ? 'codex' : entry.provider ? 'claude-code' : undefined),
-            gitBranch: entry.gitBranch,
-            messageCount: entry.messageCount,
-            isActive: this.sessions.has(entry.sessionId),
-            isStreaming: this.sessions.get(entry.sessionId)?.streaming ?? false,
-            hasPendingInput: pendingSessionIds.has(entry.sessionId),
-            permissionMode: this.sessions.get(entry.sessionId)?.permissionLevel
-                ?? this.sessionPermissions.get(entry.sessionId),
-        }));
+        const eventStore = getEventStore();
+        return registryEntries.map(entry => {
+            const stats = eventStore.getSessionStats(entry.sessionId);
+            const lastTurn = eventStore.getLastTurn(entry.sessionId);
+            return {
+                sessionId: entry.sessionId,
+                summary: entry.title ?? entry.firstPrompt ?? entry.sessionId.slice(0, 8),
+                lastModified: entry.lastAccessedAt,
+                createdAt: entry.createdAt,
+                cwd: entry.cwd,
+                agent: this.sessions.get(entry.sessionId)?.agentId
+                    ?? this.sessionAgents.get(entry.sessionId)
+                    ?? entry.agent
+                    ?? (entry.provider === 'codex-mcp' ? 'codex' : entry.provider ? 'claude-code' : undefined),
+                gitBranch: entry.gitBranch,
+                messageCount: entry.messageCount,
+                isActive: this.sessions.has(entry.sessionId),
+                isStreaming: this.sessions.get(entry.sessionId)?.streaming ?? false,
+                hasPendingInput: pendingSessionIds.has(entry.sessionId),
+                permissionMode: this.sessions.get(entry.sessionId)?.permissionLevel
+                    ?? this.sessionPermissions.get(entry.sessionId),
+                lastPromptAt: stats.lastPromptAt ?? undefined,
+                turnCount: stats.turnCount,
+                totalInputTokens: stats.totalInputTokens,
+                totalOutputTokens: stats.totalOutputTokens,
+                totalCostUsd: stats.totalCostUsd,
+                lastTurnInputTokens: lastTurn?.inputTokens,
+                lastTurnCacheCreationTokens: lastTurn?.cacheCreationTokens,
+                lastTurnCacheReadTokens: lastTurn?.cacheReadTokens,
+                lastTurnContextUsage: lastTurn?.contextUsage,
+            };
+        });
     }
     async getCards(sessionId, cwd, offset = 0, limit = 50) {
         const ps = this.sessions.get(sessionId);
@@ -496,6 +613,16 @@ export class SessionManager extends EventEmitter {
     getPendingInputRequests() {
         return Array.from(this.pendingInputRequests.values()).map(p => p.request);
     }
+    /** True when a user-input-request is outstanding for this session. Used by
+     *  the daemon to avoid firing a redundant "session idle" push when the
+     *  card-stream-end is actually a permission-prompt pause. */
+    hasPendingInputForSession(sessionId) {
+        for (const p of this.pendingInputRequests.values()) {
+            if (p.request.sessionId === sessionId)
+                return true;
+        }
+        return false;
+    }
     getDebugState() {
         const pendingInputs = Array.from(this.pendingInputRequests.values()).map(p => ({
             requestId: p.request.requestId,
@@ -541,10 +668,23 @@ export class SessionManager extends EventEmitter {
                 return this.handlePermissionRequest(sessionId, req);
             },
             onModelDetected: (model) => {
+                console.log(`[session-manager] model detected: ${model} (agent=${agentId})`);
                 if (agentId === 'claude-code') {
                     this.preferences.model = model;
                 }
             },
+            onSessionExited: (sessionId, providerSession) => {
+                const ps = this.sessions.get(sessionId);
+                // Stale callback — a newer provider has already taken this slot
+                // (e.g. cold resume killed this one and spawned a fresh CLI).
+                if (!ps || ps.providerSession !== providerSession)
+                    return;
+                console.log(`[session-manager] provider exited session=${sessionId.slice(0, 8)} — marking inactive`);
+                ps.providerSession = null;
+                ps.streaming = false;
+                this.sessions.delete(sessionId);
+                this.emitSessionUpdate(sessionId);
+            },
         };
     }
     // ── Private: Permission Handling ──
@@ -658,19 +798,72 @@ export class SessionManager extends EventEmitter {
             }
         }
     }
+    /** Move per-session state from oldId to newId after the CLI forks on
+     * --resume. `sessionAgents[newId]` is already set by the caller; this
+     * helper moves the remaining side maps and clears the old key. */
+    migrateSessionIdState(oldId, newId) {
+        const permission = this.sessionPermissions.get(oldId);
+        if (permission !== undefined) {
+            this.sessionPermissions.set(newId, permission);
+            this.sessionPermissions.delete(oldId);
+        }
+        const sandboxed = this.sessionSandboxed.get(oldId);
+        if (sandboxed !== undefined) {
+            this.sessionSandboxed.set(newId, sandboxed);
+            this.sessionSandboxed.delete(oldId);
+        }
+        const config = this.sessionConfigs.get(oldId);
+        if (config !== undefined) {
+            this.sessionConfigs.set(newId, config);
+            this.sessionConfigs.delete(oldId);
+        }
+        this.sessionAgents.delete(oldId);
+    }
     emitSessionUpdate(sessionId) {
+        this.emit('session-updated', this.buildSessionUpdatePayload(sessionId));
+    }
+    /**
+     * Build the payload normally shipped via the `session-updated` event without
+     * emitting. Used by daemon-level code that wants to push a fresh snapshot to
+     * a specific peer (e.g. PWA reconnect) instead of triggering a broadcast.
+     */
+    buildSessionUpdatePayload(sessionId) {
         const ps = this.sessions.get(sessionId);
         const hasPendingInput = Array.from(this.pendingInputRequests.values())
             .some(p => p.request.sessionId === sessionId);
-        this.emit('session-updated', {
+        const eventStore = getEventStore();
+        const stats = eventStore.getSessionStats(sessionId);
+        const lastTurn = eventStore.getLastTurn(sessionId);
+        return {
             sessionId,
             isActive: !!ps,
+            // `archived` = session has been removed from the in-memory map
+            // (cold-resume rekey, onSessionExited, or closeSession). PWA uses this
+            // as a signal to navigate away from the now-defunct session page.
+            // Note: isActive=false alone is ambiguous (can also mean "emitted for
+            // an unknown id during reconcile"); archived=true is the strong signal.
+            archived: !ps,
             agent: ps?.agentId ?? this.sessionAgents.get(sessionId),
             isStreaming: ps?.streaming ?? false,
             hasPendingInput,
             permissionMode: ps?.permissionLevel ?? this.sessionPermissions.get(sessionId),
             sandboxed: ps?.sandboxed ?? this.sessionSandboxed.get(sessionId) ?? false,
-        });
+            lastPromptAt: stats.lastPromptAt ?? undefined,
+            turnCount: stats.turnCount,
+            totalInputTokens: stats.totalInputTokens,
+            totalOutputTokens: stats.totalOutputTokens,
+            totalCostUsd: stats.totalCostUsd,
+            lastTurnInputTokens: lastTurn?.inputTokens,
+            lastTurnCacheCreationTokens: lastTurn?.cacheCreationTokens,
+            lastTurnCacheReadTokens: lastTurn?.cacheReadTokens,
+            lastTurnContextUsage: lastTurn?.contextUsage,
+        };
+    }
+    /** Snapshot of every active (in-memory) session's state. Delivered via the
+     *  bus `/sessions/active` snap frame on subscribe; subsequent incremental
+     *  updates are published per session via the same path. */
+    snapshotActiveSessions() {
+        return Array.from(this.sessions.keys()).map((id) => this.buildSessionUpdatePayload(id));
     }
     persistRegistryField(sessionId, key, value) {
         const registry = getSessionRegistry();