@gkorepanov/ccodex 0.3.0 → 0.3.4

package/dist/state/stateCommand.d.ts

@@ -0,0 +1,21 @@
+import type { ApprovalsReviewer } from "../codex/generated/v2/ApprovalsReviewer.js";
+import type { AskForApproval } from "../codex/generated/v2/AskForApproval.js";
+import type { SandboxPolicy } from "../codex/generated/v2/SandboxPolicy.js";
+import type { Thread } from "../codex/generated/v2/Thread.js";
+import type { ThreadTokenUsage } from "../codex/generated/v2/ThreadTokenUsage.js";
+import type { UserInput } from "../codex/generated/v2/UserInput.js";
+export interface ThreadStateSnapshot {
+    readonly provider: "claude" | "codex";
+    readonly model: string;
+    readonly effort: string | null;
+    readonly serviceTier: string | null;
+    readonly approvalPolicy: AskForApproval | null;
+    readonly approvalsReviewer: ApprovalsReviewer | null;
+    readonly sandboxPolicy: SandboxPolicy | null;
+    readonly thread: Thread;
+    readonly tokenUsage: ThreadTokenUsage | null;
+    readonly providerCostUsd: number | null;
+}
+export declare function isCCodexStateCommand(input: UserInput[]): boolean;
+export declare function stateModelName(provider: "claude" | "codex", value: string): string;
+export declare function formatCCodexState(snapshot: ThreadStateSnapshot, nowMs?: number): string;

package/dist/state/stateCommand.js

@@ -0,0 +1,198 @@
+export function isCCodexStateCommand(input) {
+    return input.length === 1
+        && input[0]?.type === "text"
+        && input[0].text.trim().toLowerCase() === "/ccstate";
+}
+export function stateModelName(provider, value) {
+    const withoutProvider = value
+        .replace(/^claude:/, "")
+        .replace(/^claude-/, "")
+        .replace(/^gpt-/, "");
+    const words = withoutProvider.split("-").filter(Boolean);
+    const version = words.length >= 2
+        && /^\d+$/.test(words.at(-1))
+        && /^\d+$/.test(words.at(-2))
+        ? `${words.splice(-2).join(".")}`
+        : undefined;
+    const name = words.map((word) => word.length <= 3 && /^\d+$/.test(word)
+        ? word
+        : `${word.charAt(0).toUpperCase()}${word.slice(1)}`).join(" ");
+    return `${provider === "claude" ? "Claude" : "Codex"} ${name}${version ? ` ${version}` : ""}`.trim();
+}
+function compactNumber(value) {
+    if (value < 1_000)
+        return String(Math.round(value));
+    const units = [
+        { size: 1_000_000_000, suffix: "b" },
+        { size: 1_000_000, suffix: "m" },
+        { size: 1_000, suffix: "k" },
+    ];
+    const unit = units.find((candidate) => value >= candidate.size);
+    const scaled = value / unit.size;
+    const precision = scaled >= 100 || Number.isInteger(scaled) ? 0 : 1;
+    return `${scaled.toFixed(precision).replace(/\.0$/, "")}${unit.suffix}`;
+}
+function elapsed(valueMs) {
+    const seconds = Math.max(0, Math.floor(valueMs / 1_000));
+    const days = Math.floor(seconds / 86_400);
+    const hours = Math.floor(seconds % 86_400 / 3_600);
+    const minutes = Math.floor(seconds % 3_600 / 60);
+    const remainder = seconds % 60;
+    if (days > 0)
+        return `${days}d ${hours}h`;
+    if (hours > 0)
+        return `${hours}h ${minutes}m`;
+    if (minutes > 0)
+        return `${minutes}m ${remainder}s`;
+    return `${remainder}s`;
+}
+function relative(valueSeconds, nowMs) {
+    const delta = Math.max(0, nowMs - valueSeconds * 1_000);
+    if (delta < 60_000)
+        return `${Math.floor(delta / 1_000)}s ago`;
+    if (delta < 3_600_000)
+        return `${Math.floor(delta / 60_000)}m ago`;
+    if (delta < 86_400_000)
+        return `${Math.floor(delta / 3_600_000)}h ago`;
+    return `${Math.floor(delta / 86_400_000)}d ago`;
+}
+function syntheticTurn(items) {
+    const user = items.find((item) => item.type === "userMessage");
+    if (user?.type !== "userMessage")
+        return false;
+    return isCCodexStateCommand(user.content)
+        || (user.content.length === 1 && user.content[0]?.type === "text"
+            && ["/ccstatus", "ccodex status", "/ccodex-status"]
+                .includes(user.content[0].text.trim().toLowerCase()));
+}
+function toolKind(item) {
+    if (item.type === "fileChange")
+        return "edit";
+    if (item.type === "collabAgentToolCall")
+        return "agent";
+    if (item.type === "mcpToolCall")
+        return "mcp";
+    if (item.type === "dynamicToolCall")
+        return item.tool.toLowerCase();
+    if (item.type === "webSearch")
+        return "web";
+    if (item.type === "imageView")
+        return "read";
+    if (item.type === "imageGeneration")
+        return "image";
+    if (item.type === "sleep")
+        return "sleep";
+    if (item.type !== "commandExecution")
+        return undefined;
+    const actions = item.commandActions.map((action) => action.type);
+    if (actions.some((type) => type === "read"))
+        return "read";
+    if (actions.some((type) => type === "search" || type === "listFiles"))
+        return "search";
+    return "bash";
+}
+function mode(snapshot) {
+    if (snapshot.approvalsReviewer === "auto_review")
+        return "ᗢ approve for me";
+    if (snapshot.approvalPolicy === "on-request" || snapshot.approvalPolicy === "untrusted"
+        || snapshot.approvalPolicy !== null && typeof snapshot.approvalPolicy === "object") {
+        return "◇ ask for approval";
+    }
+    if (snapshot.sandboxPolicy?.type === "dangerFullAccess")
+        return "◆ full access";
+    if (snapshot.sandboxPolicy?.type === "readOnly")
+        return "◈ read only";
+    if (!snapshot.approvalPolicy || !snapshot.sandboxPolicy)
+        return "unavailable";
+    return "◇ no approvals";
+}
+function header(snapshot) {
+    const avatar = snapshot.provider === "claude" ? "❋" : "֎";
+    const speed = snapshot.serviceTier === "fast" || snapshot.serviceTier === "priority"
+        ? "⚡ fast"
+        : "standard";
+    return [
+        `${avatar} **${snapshot.model}**`,
+        snapshot.effort,
+        speed,
+    ].filter(Boolean).join(" · ");
+}
+function tree(lines) {
+    return lines.map((line, index) => `  ${index === lines.length - 1 ? "└" : "├"} ${line}`);
+}
+export function formatCCodexState(snapshot, nowMs = Date.now()) {
+    const turns = snapshot.thread.turns.filter((turn) => !syntheticTurn(turn.items));
+    let userMessages = 0;
+    let assistantMessages = 0;
+    const tools = new Map();
+    for (const item of turns.flatMap((turn) => turn.items)) {
+        if (item.type === "userMessage")
+            userMessages += 1;
+        else if (item.type === "agentMessage")
+            assistantMessages += 1;
+        const kind = toolKind(item);
+        if (kind)
+            tools.set(kind, (tools.get(kind) ?? 0) + 1);
+    }
+    const compacts = turns.filter((turn) => turn.items.some((item) => item.type === "contextCompaction"));
+    const lastCompact = compacts.map((turn) => turn.completedAt ?? turn.startedAt).filter((value) => value !== null).at(-1);
+    const runTimeMs = turns.reduce((total, turn) => total + (turn.durationMs
+        ?? (turn.startedAt === null ? 0 : Math.max(0, nowMs - turn.startedAt * 1_000))), 0);
+    const usage = snapshot.tokenUsage;
+    const context = usage?.last.totalTokens;
+    const window = usage?.modelContextWindow;
+    const contextPercent = context !== undefined && window
+        ? Math.min(100, Math.max(0, Math.round(context / window * 100)))
+        : null;
+    const filled = contextPercent === null || contextPercent === 0
+        ? 0
+        : contextPercent === 100 ? 10 : Math.max(1, Math.floor(contextPercent / 10));
+    const contextBar = contextPercent === null
+        ? "unavailable"
+        : `${"▰".repeat(filled)}${"▱".repeat(10 - filled)} ${contextPercent}% · ${compactNumber(context)}/${compactNumber(window)}`;
+    const total = usage?.total;
+    const cacheRate = total && total.inputTokens > 0
+        ? `${Math.round(total.cachedInputTokens / total.inputTokens * 100)}% hit rate`
+        : "unavailable";
+    const toolEntries = [...tools.entries()].sort((left, right) => right[1] - left[1] || left[0].localeCompare(right[0]));
+    const toolTotal = toolEntries.reduce((sum, [, count]) => sum + count, 0);
+    const visibleTools = toolEntries.slice(0, 5);
+    const hiddenTools = toolEntries.slice(5).reduce((sum, [, count]) => sum + count, 0);
+    const toolDetails = visibleTools.length > 0
+        ? ` (${[
+            ...visibleTools.map(([name, count]) => `${name} ${count}`),
+            ...(hiddenTools ? [`other ${hiddenTools}`] : []),
+        ].join(" · ")})`
+        : "";
+    const cost = snapshot.providerCostUsd === null
+        ? "unavailable for subscription"
+        : `$${snapshot.providerCostUsd.toFixed(2)} provider estimate`;
+    return [
+        "◆ **CCodex** │ /ccstate",
+        "",
+        header(snapshot),
+        ...tree([
+            `context   ▸ ${contextBar}`,
+            `tokens    ▸ ${total
+                ? `${compactNumber(total.totalTokens)} processed (${compactNumber(total.inputTokens)} in / ${compactNumber(total.outputTokens)} out)`
+                : "unavailable"}`,
+            `cache     ▸ ${cacheRate}`,
+        ]),
+        "",
+        "💬 **Chat**",
+        ...tree([
+            `messages  ▸ ${userMessages} user / ${assistantMessages} assistant / ${userMessages + assistantMessages} total`,
+            `compacts  ▸ ${compacts.length}${lastCompact ? ` (last: ${relative(lastCompact, nowMs)})` : ""}`,
+            `session   ▸ started ${elapsed(nowMs - snapshot.thread.createdAt * 1_000)} ago`,
+        ]),
+        "",
+        "⚙️ **Session**",
+        ...tree([
+            `mode      ▸ ${mode(snapshot)}`,
+            `agent     ▸ ${elapsed(runTimeMs)} cumulative turn time`,
+            `tools     ▸ ${toolTotal} calls${toolDetails}`,
+            `cost      ▸ ${cost}`,
+        ]),
+    ].join("\n");
+}
+//# sourceMappingURL=stateCommand.js.map

package/dist/state/stateCommand.js.map

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

package/dist/state/stockStateTracker.d.ts

@@ -0,0 +1,14 @@
+import type { Thread } from "../codex/generated/v2/Thread.js";
+import { type RpcMessage } from "../protocol/envelopes.js";
+import { type ThreadStateSnapshot } from "./stateCommand.js";
+export declare class StockStateTracker {
+    private readonly pending;
+    private readonly settings;
+    private readonly usage;
+    observeRequest(connectionId: string, message: RpcMessage): void;
+    observeResponse(connectionId: string, message: RpcMessage): void;
+    observeNotification(message: RpcMessage): void;
+    snapshot(thread: Thread): ThreadStateSnapshot;
+    detach(connectionId: string): void;
+    private merge;
+}

package/dist/state/stockStateTracker.js

@@ -0,0 +1,120 @@
+import { isRequest, isResponse, } from "../protocol/envelopes.js";
+import { stateModelName } from "./stateCommand.js";
+function key(connectionId, id) {
+    return `${connectionId}:${typeof id}:${id}`;
+}
+function settingsFrom(value) {
+    const collaboration = value.collaborationMode && typeof value.collaborationMode === "object"
+        ? value.collaborationMode.settings
+        : undefined;
+    const model = typeof value.model === "string"
+        ? value.model
+        : typeof collaboration?.model === "string" ? collaboration.model : undefined;
+    const effort = typeof value.effort === "string"
+        ? value.effort
+        : typeof value.reasoningEffort === "string"
+            ? value.reasoningEffort
+            : typeof collaboration?.reasoning_effort === "string" ? collaboration.reasoning_effort : undefined;
+    return {
+        ...(model ? { model } : {}),
+        ...("serviceTier" in value && (typeof value.serviceTier === "string" || value.serviceTier === null)
+            ? { serviceTier: value.serviceTier } : {}),
+        ...(effort ? { effort: effort } : {}),
+        ...(value.approvalPolicy ? { approvalPolicy: value.approvalPolicy } : {}),
+        ...(value.approvalsReviewer
+            ? { approvalsReviewer: value.approvalsReviewer } : {}),
+        ...(value.sandboxPolicy
+            ? { sandboxPolicy: value.sandboxPolicy }
+            : value.sandbox ? { sandboxPolicy: value.sandbox } : {}),
+    };
+}
+export class StockStateTracker {
+    pending = new Map();
+    settings = new Map();
+    usage = new Map();
+    observeRequest(connectionId, message) {
+        if (!isRequest(message))
+            return;
+        const params = message.params && typeof message.params === "object"
+            ? message.params
+            : {};
+        if (["thread/start", "thread/resume", "thread/fork", "thread/settings/update", "turn/start"]
+            .includes(message.method)) {
+            this.pending.set(key(connectionId, message.id), { method: message.method, params });
+        }
+    }
+    observeResponse(connectionId, message) {
+        if (!isResponse(message))
+            return;
+        const pending = this.pending.get(key(connectionId, message.id));
+        if (!pending)
+            return;
+        this.pending.delete(key(connectionId, message.id));
+        if ("error" in message)
+            return;
+        const result = message.result && typeof message.result === "object"
+            ? message.result
+            : {};
+        const thread = result.thread && typeof result.thread === "object"
+            ? result.thread
+            : undefined;
+        const threadId = thread?.id
+            ?? (typeof pending.params.threadId === "string" ? pending.params.threadId : undefined);
+        if (!threadId)
+            return;
+        if (["thread/start", "thread/resume", "thread/fork"].includes(pending.method)) {
+            this.merge(threadId, settingsFrom(result));
+        }
+        else if (pending.method === "thread/settings/update") {
+            this.merge(threadId, settingsFrom(pending.params));
+        }
+        else if (pending.method === "turn/start") {
+            this.merge(threadId, settingsFrom(pending.params));
+        }
+    }
+    observeNotification(message) {
+        if (!("method" in message) || "id" in message)
+            return;
+        const params = message.params && typeof message.params === "object"
+            ? message.params
+            : {};
+        const threadId = typeof params.threadId === "string" ? params.threadId : undefined;
+        if (message.method === "thread/settings/updated" && threadId
+            && params.threadSettings && typeof params.threadSettings === "object") {
+            this.merge(threadId, settingsFrom(params.threadSettings));
+        }
+        else if (message.method === "thread/tokenUsage/updated" && threadId
+            && params.tokenUsage && typeof params.tokenUsage === "object") {
+            this.usage.set(threadId, params.tokenUsage);
+        }
+        else if (message.method === "thread/deleted" && threadId) {
+            this.settings.delete(threadId);
+            this.usage.delete(threadId);
+        }
+    }
+    snapshot(thread) {
+        const settings = this.settings.get(thread.id);
+        return {
+            provider: "codex",
+            model: stateModelName("codex", settings?.model ?? "unknown"),
+            effort: settings?.effort ?? null,
+            serviceTier: settings?.serviceTier ?? null,
+            approvalPolicy: settings?.approvalPolicy ?? null,
+            approvalsReviewer: settings?.approvalsReviewer ?? null,
+            sandboxPolicy: settings?.sandboxPolicy ?? null,
+            thread,
+            tokenUsage: this.usage.get(thread.id) ?? null,
+            providerCostUsd: null,
+        };
+    }
+    detach(connectionId) {
+        for (const pendingKey of this.pending.keys()) {
+            if (pendingKey.startsWith(`${connectionId}:`))
+                this.pending.delete(pendingKey);
+        }
+    }
+    merge(threadId, update) {
+        this.settings.set(threadId, { ...this.settings.get(threadId), ...update });
+    }
+}
+//# sourceMappingURL=stockStateTracker.js.map

package/dist/state/stockStateTracker.js.map

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

package/dist/store/HybridStore.d.ts

@@ -4,6 +4,23 @@ import type { Turn } from "../codex/generated/v2/Turn.js";
 import type { ThreadGoal } from "../codex/generated/v2/ThreadGoal.js";
 import type { TokenUsageBreakdown } from "../codex/generated/v2/TokenUsageBreakdown.js";
 import type { ApprovalsReviewer } from "../codex/generated/v2/ApprovalsReviewer.js";
+export interface InternalGoal extends ThreadGoal {
+    readonly goalId: string;
+}
+export interface GoalPatch {
+    readonly objective?: string;
+    readonly status?: ThreadGoal["status"];
+    readonly tokenBudget?: number | null;
+    readonly replace?: boolean;
+    readonly now?: number;
+}
+export interface GoalUsageInput {
+    readonly threadId: string;
+    readonly expectedGoalId: string;
+    readonly tokenDelta: number;
+    readonly timeDeltaSeconds: number;
+    readonly checkpointKey?: string;
+}
 export interface ClaudeThreadRecord {
     readonly thread: Thread;
     readonly claudeSessionId: string;
@@ -25,7 +42,13 @@ export interface ClaudeThreadRecord {
     readonly collaborationMode: unknown | null;
     readonly outputSchema: unknown | null;
     readonly tokenUsageTotal: TokenUsageBreakdown;
+    readonly tokenUsageLast: TokenUsageBreakdown | null;
+    readonly modelContextWindow: number | null;
+    readonly providerCostUsdTotal?: number;
+    readonly settingsGeneration?: number;
 }
+export declare function settingsGeneration(record: ClaudeThreadRecord): number;
+export declare function withSettingsFrom(base: ClaudeThreadRecord, settings: ClaudeThreadRecord): ClaudeThreadRecord;
 export interface PendingRequestRecord {
     readonly requestId: string;
     readonly threadId: string;
@@ -44,6 +67,76 @@ export interface EventPersistence {
     readonly providerEventId?: string | null;
     readonly dedupKey?: string | null;
 }
+export interface StateEvent {
+    readonly turnId: string | null;
+    readonly method: string;
+    readonly params: unknown;
+    readonly providerEventType?: string | null;
+    readonly providerEventId?: string | null;
+}
+export interface ThreadStateCommit {
+    readonly record: ClaudeThreadRecord;
+    readonly turn?: Turn;
+    readonly insertTurn?: boolean;
+    readonly providerBoundary?: ProviderBoundaryCommit;
+    readonly events: readonly StateEvent[];
+}
+export interface TurnProviderBoundary {
+    readonly turnId: string;
+    readonly messageUuid: string;
+}
+export interface ProviderBoundaryCommit extends TurnProviderBoundary {
+    readonly ownerThreadId: string;
+    readonly itemIds?: readonly string[];
+}
+export interface PendingThreadRemoval {
+    readonly rootThreadId: string;
+    readonly claudeSessionId: string;
+    readonly cwd: string;
+    readonly kind: "delete" | "release" | "discard";
+}
+export interface StoredEvent {
+    readonly sequence: number;
+    readonly threadId: string;
+    readonly turnId: string | null;
+    readonly method: string;
+    readonly params: unknown;
+    readonly createdAt: number;
+}
+export type ProviderEventDisposition = "pending" | "projected" | "stateOnly" | "retainedOnly" | "abandoned" | "unsupportedVisible" | "failed";
+export interface ProviderEventRecord {
+    readonly sequence: number;
+    readonly threadId: string;
+    readonly processEpoch: string;
+    readonly providerSequence: number;
+    readonly providerEventType: string;
+    readonly providerEventId: string | null;
+    readonly payload: unknown;
+    readonly disposition: ProviderEventDisposition;
+    readonly error: string | null;
+    readonly createdAt: number;
+    readonly projectedAt: number | null;
+}
+export interface ProviderItemCorrelation {
+    readonly providerMessageId: string;
+    readonly ownerThreadId: string;
+    readonly turnId: string;
+    readonly itemId: string;
+}
+export interface ProviderRetractionMutation {
+    readonly ownerThreadId: string;
+    readonly turn: Turn;
+    readonly clearBoundary: boolean;
+}
+export interface AppendProviderEvent {
+    readonly threadId: string;
+    readonly processEpoch: string;
+    readonly providerSequence: number;
+    readonly providerEventType: string;
+    readonly providerEventId: string | null;
+    readonly payload: unknown;
+    readonly createdAt: number;
+}
 export interface HybridStore {
     createThread(record: ClaudeThreadRecord): void;
     hasThread(threadId: string): boolean;
@@ -51,7 +144,13 @@ export interface HybridStore {
     allThreadRecords(): ClaudeThreadRecord[];
     listThreads(params: ThreadListParams): Thread[];
     updateThread(record: ClaudeThreadRecord): void;
+    isThreadArchived(threadId: string): boolean;
     setThreadArchived(threadId: string, archived: boolean): void;
+    commitThreadsArchived(threadIds: readonly string[], archived: boolean): void;
+    beginThreadRemoval(removal: PendingThreadRemoval): void;
+    cancelThreadRemoval(rootThreadId: string): void;
+    listPendingThreadRemovals(): PendingThreadRemoval[];
+    commitThreadRemoval(rootThreadId: string, threadIds: readonly string[]): void;
     deleteThread(threadId: string): void;
     createTurn(threadId: string, turn: Turn): void;
     updateTurn(threadId: string, turn: Turn): void;
@@ -60,16 +159,33 @@ export interface HybridStore {
     setTurnClaudeMessageUuid(threadId: string, turnId: string, messageUuid: string): void;
     getTurnClaudeMessageUuid(threadId: string, turnId: string): string | undefined;
     truncateTurns(threadId: string, keepCount: number): void;
+    commitForkedThread(record: ClaudeThreadRecord, turns: readonly Turn[], boundaries: readonly TurnProviderBoundary[]): void;
+    commitThreadRollback(record: ClaudeThreadRecord, keepCount: number, boundaries: readonly TurnProviderBoundary[], removedThreadIds?: readonly string[]): void;
+    commitThreadState(commit: ThreadStateCommit): number[];
     appendEvent(threadId: string, turnId: string | null, method: string, params: unknown, persistence?: EventPersistence): number;
+    eventHighWatermark(threadId: string): number;
+    listEventsAfter(threadId: string, sequence: number): StoredEvent[];
     hasProcessedProviderEvent(threadId: string, providerEventId: string): boolean;
     markProviderEventProcessed(threadId: string, providerEventType: string, providerEventId: string): void;
+    appendProviderEvent(event: AppendProviderEvent): {
+        record: ProviderEventRecord;
+        inserted: boolean;
+    };
+    completeProviderEvent(threadId: string, sequence: number, disposition: Exclude<ProviderEventDisposition, "pending">, error?: string | null): void;
+    listProviderEvents(threadId: string, disposition?: ProviderEventDisposition): ProviderEventRecord[];
+    pruneProviderEvents(threadId: string, maxEvents: number, maxBytes: number): number;
+    linkProviderItems(threadId: string, providerMessageId: string, ownerThreadId: string, turnId: string, itemIds: readonly string[]): void;
+    listProviderItemCorrelations(threadId: string, providerMessageIds: readonly string[]): ProviderItemCorrelation[];
+    deleteProviderItemCorrelations(threadId: string, providerMessageIds: readonly string[]): void;
+    commitProviderRetraction(record: ClaudeThreadRecord, providerMessageIds: readonly string[], mutations: readonly ProviderRetractionMutation[], removedThreadIds?: readonly string[]): void;
     createPendingRequest(request: PendingRequestRecord): void;
     getPendingRequest(requestId: string): PendingRequestRecord | undefined;
     findPendingRequestByClaudeId(threadId: string, claudeRequestId: string): PendingRequestRecord | undefined;
     listPendingRequests(threadId: string): PendingRequestRecord[];
     resolvePendingRequest(requestId: string, status: "resolved" | "cancelled", response: unknown): void;
-    getGoal(threadId: string): ThreadGoal | undefined;
-    setGoal(goal: ThreadGoal): void;
+    getGoal(threadId: string): InternalGoal | undefined;
+    setGoal(threadId: string, patch: GoalPatch): InternalGoal;
     clearGoal(threadId: string): boolean;
+    accountGoalUsage(input: GoalUsageInput): InternalGoal | undefined;
     close(): void;
 }

package/dist/store/HybridStore.js

@@ -1,2 +1,24 @@
-export {};
+export function settingsGeneration(record) {
+    return record.settingsGeneration ?? 0;
+}
+export function withSettingsFrom(base, settings) {
+    return {
+        ...base,
+        thread: { ...base.thread, cwd: settings.thread.cwd },
+        modelPickerId: settings.modelPickerId,
+        claudeModelValue: settings.claudeModelValue,
+        serviceTier: settings.serviceTier,
+        approvalPolicy: settings.approvalPolicy,
+        approvalsReviewer: settings.approvalsReviewer,
+        sandboxPolicy: settings.sandboxPolicy,
+        baseInstructions: settings.baseInstructions,
+        developerInstructions: settings.developerInstructions,
+        personality: settings.personality,
+        reasoningEffort: settings.reasoningEffort,
+        reasoningSummary: settings.reasoningSummary,
+        collaborationMode: settings.collaborationMode,
+        outputSchema: settings.outputSchema,
+        settingsGeneration: settingsGeneration(settings),
+    };
+}
 //# sourceMappingURL=HybridStore.js.map

package/dist/store/HybridStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"HybridStore.js","sourceRoot":"","sources":["../../src/store/HybridStore.ts"],"names":[],"mappings":""}
+{"version":3,"file":"HybridStore.js","sourceRoot":"","sources":["../../src/store/HybridStore.ts"],"names":[],"mappings":"AAsDA,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IAC3D,OAAO,MAAM,CAAC,kBAAkB,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAwB,EACxB,QAA4B;IAE5B,OAAO;QACL,GAAG,IAAI;QACP,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE;QACpD,aAAa,EAAE,QAAQ,CAAC,aAAa;QACrC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,aAAa,EAAE,QAAQ,CAAC,aAAa;QACrC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;QACrD,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,CAAC;KACjD,CAAC;AACJ,CAAC"}