@code-yeongyu/senpi 2026.8.1 → 2026.8.3

package/dist/core/extensions/builtin/claude-sdk-oauth/session-observability.js

@@ -0,0 +1,174 @@
+import { getAgentDir } from "../../../../config.js";
+import { createSessionLogger } from "../../../session-log.js";
+const SANITIZED_REASONS = new Set([
+    "prefix_matched",
+    "registry_miss",
+    "idle_ttl",
+    "capacity",
+    "model_selected",
+    "thinking_level_selected",
+    "bound_account_token_expiring",
+    "account_changed",
+    "model_changed",
+    "toolset_changed",
+    "system_prompt_changed",
+    "assistant_stream_diverged",
+    "options_changed",
+    "history_rolled_back",
+    "assistant_rewritten",
+    "transcript_missing",
+    "cross_root_unsupported",
+    "sent_stream_diverged",
+    "branch_diverged",
+    "branch_boundary_unavailable",
+    "branch_resume",
+    "tainted_compaction",
+    "tainted_fork",
+    "tainted_abort",
+    "tainted_assistant_provenance_unverified",
+    "resume_initialization_failed",
+    "resume_initialization_aborted",
+    "resume_mode_off",
+    "query_failed",
+    "turn_attribution_failed",
+    "abort_timeout",
+    "extensions_removed",
+    "session_shutdown",
+    "other",
+]);
+let cachedLogger;
+function sessionLogger() {
+    cachedLogger ??= createSessionLogger(getAgentDir());
+    return cachedLogger;
+}
+const defaultBoundary = {
+    emit: () => { },
+    log: (event, data) => sessionLogger().info(event, data),
+};
+let activeBoundary = defaultBoundary;
+export function overrideContinuityObservabilityBoundary(override) {
+    activeBoundary = { ...defaultBoundary, ...override };
+}
+export function resetContinuityObservabilityBoundary() {
+    activeBoundary = defaultBoundary;
+}
+/** Maps a fixed vocabulary member through, and anything else to a bucketed cause. */
+export function sanitizeReason(value) {
+    const text = typeof value === "string" ? value : value instanceof Error ? value.message : "";
+    if (SANITIZED_REASONS.has(text))
+        return text;
+    const tainted = /^tainted:(.+)$/.exec(text);
+    if (tainted) {
+        const mapped = `tainted_${tainted[1]}`;
+        if (SANITIZED_REASONS.has(mapped))
+            return mapped;
+    }
+    return sanitizeCloseCause(value);
+}
+/** Buckets arbitrary close/pump failures into the fixed close-cause vocabulary. */
+export function sanitizeCloseCause(value) {
+    const text = typeof value === "string" ? value : value instanceof Error ? value.message : "";
+    if (SANITIZED_REASONS.has(text))
+        return text;
+    if (/did not terminate|interrupt failed/i.test(text))
+        return "abort_timeout";
+    if (/user_message_uuid did not match|result arrived before replay claim|pre-replay buffer overflow/i.test(text)) {
+        return "turn_attribution_failed";
+    }
+    if (/query ended before|Claude SDK OAuth query|Claude Code/i.test(text))
+        return "query_failed";
+    return "other";
+}
+/**
+ * Classifies the failure that ended a turn after every auth attempt failed.
+ * Anything reaching here came out of the SDK query path, so an Error is a query
+ * failure unless it matches a more specific bucket; the raw text never escapes.
+ */
+export function sanitizeTerminalFailure(value) {
+    const cause = sanitizeCloseCause(value);
+    if (cause !== "other")
+        return cause;
+    return value instanceof Error ? "query_failed" : "other";
+}
+/**
+ * One-shot pending close causes keyed by senpi session id. `closeSession`
+ * records the cause here; the next admission consumes it so a first-turn
+ * `registry_miss` is attributed to the real cause instead.
+ */
+const pendingCloseCauses = new Map();
+// Long-running processes can stage many closes: the map is FIFO-bounded so it
+// cannot grow without limit. 256 pending causes per process is far beyond any
+// realistic session count; the oldest entry is evicted first.
+const PENDING_CLOSE_CAUSE_LIMIT = 256;
+export function recordPendingCloseCause(senpiSessionId, reason) {
+    const cause = sanitizeReason(reason);
+    // Delete first so a re-recorded cause moves to the newest position.
+    pendingCloseCauses.delete(senpiSessionId);
+    if (pendingCloseCauses.size >= PENDING_CLOSE_CAUSE_LIMIT) {
+        const oldest = pendingCloseCauses.keys().next().value;
+        if (oldest !== undefined)
+            pendingCloseCauses.delete(oldest);
+    }
+    pendingCloseCauses.set(senpiSessionId, cause);
+    activeBoundary.log("claude_sdk_oauth_session_close", { reason: cause });
+}
+/** Read the pending close cause WITHOUT consuming it (consumed at emit time). */
+export function peekPendingCloseCause(senpiSessionId) {
+    return pendingCloseCauses.get(senpiSessionId);
+}
+export function consumePendingCloseCause(senpiSessionId) {
+    const cause = pendingCloseCauses.get(senpiSessionId);
+    pendingCloseCauses.delete(senpiSessionId);
+    return cause;
+}
+/**
+ * Maps the continuity decision families onto the observation vocabulary:
+ * incremental→delta, resume→fork, cold-seed→flatten.
+ */
+export function observeSessionSyncDecision(input) {
+    if (input.kind === "incremental") {
+        return { kind: "delta", reason: "prefix_matched", deltaMessages: input.deltaMessages };
+    }
+    if (input.kind === "resume") {
+        const retainedCause = input.reason === "registry_miss" ? consumePendingCloseCause(input.senpiSessionId) : undefined;
+        return {
+            kind: "fork",
+            reason: retainedCause ?? (input.reason === undefined ? "branch_resume" : sanitizeReason(input.reason)),
+            deltaMessages: input.deltaMessages,
+        };
+    }
+    // Peek, not consume: the staged observation is emitted only when the
+    // auth-lane RETAINS this attempt. Consuming here would lose the cause when
+    // the attempt is discarded; the emit path consumes it (session-stream.ts).
+    const retained = input.reason === "registry_miss" ? peekPendingCloseCause(input.senpiSessionId) : undefined;
+    const reason = retained ?? sanitizeReason(input.reason);
+    return {
+        kind: input.firstTurn && reason === "registry_miss" ? "bootstrap" : "flatten",
+        reason,
+        deltaMessages: input.deltaMessages,
+    };
+}
+/** Stages an attempt's decision; `emit` fires only when the attempt is retained. */
+export function stageContinuityDecision(observation, onDecision, beforeEmit) {
+    let emitted = false;
+    return {
+        observation,
+        emit: () => {
+            if (emitted)
+                return;
+            emitted = true;
+            beforeEmit?.();
+            emitContinuityObservation(observation, onDecision);
+        },
+    };
+}
+export function emitContinuityObservation(observation, onDecision) {
+    onDecision?.(observation);
+    activeBoundary.emit(observation);
+    activeBoundary.log("claude_sdk_oauth_session_continuity", {
+        kind: observation.kind,
+        reason: observation.reason,
+        ...(observation.deltaMessages === undefined ? {} : { count: observation.deltaMessages }),
+    });
+}
+//# sourceMappingURL=session-observability.js.map

package/dist/core/extensions/builtin/claude-sdk-oauth/session-observability.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-observability.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-observability.ts"],"names":[],"mappings":"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","sourcesContent":["import { getAgentDir } from \"../../../../config.ts\";\nimport { createSessionLogger, type SessionLogger } from \"../../../session-log.ts\";\n\n/**\n * Per-turn continuity observability for the claude-sdk-oauth lane.\n *\n * Emission semantics: a decision is STAGED per attempt at its final outcome\n * point and EMITTED only when the auth-lane retain/discard wrapper retains that\n * attempt (auth-attempt.ts). A discarded attempt emits nothing, so every\n * completed turn yields exactly one observation; a turn where every attempt\n * fails yields one terminal error observation instead.\n */\nexport type ContinuityKind = \"bootstrap\" | \"delta\" | \"reattach\" | \"fork\" | \"flatten\" | \"disabled\";\n\n/** Fixed vocabulary — arbitrary error text never reaches an observation. */\nexport type ContinuityReason =\n\t| \"prefix_matched\"\n\t| \"registry_miss\"\n\t| \"idle_ttl\"\n\t| \"capacity\"\n\t| \"model_selected\"\n\t| \"thinking_level_selected\"\n\t| \"bound_account_token_expiring\"\n\t| \"account_changed\"\n\t| \"model_changed\"\n\t| \"toolset_changed\"\n\t| \"system_prompt_changed\"\n\t| \"assistant_stream_diverged\"\n\t| \"sent_stream_diverged\"\n\t| \"options_changed\"\n\t| \"history_rolled_back\"\n\t| \"assistant_rewritten\"\n\t| \"transcript_missing\"\n\t| \"cross_root_unsupported\"\n\t| \"branch_diverged\"\n\t| \"branch_boundary_unavailable\"\n\t| \"branch_resume\"\n\t| \"tainted_compaction\"\n\t| \"tainted_fork\"\n\t| \"tainted_abort\"\n\t| \"tainted_assistant_provenance_unverified\"\n\t| \"resume_initialization_failed\"\n\t| \"resume_initialization_aborted\"\n\t| \"resume_mode_off\"\n\t| \"query_failed\"\n\t| \"turn_attribution_failed\"\n\t| \"abort_timeout\"\n\t| \"extensions_removed\"\n\t| \"session_shutdown\"\n\t| \"other\";\n\nexport type ContinuityObservation = {\n\tkind: ContinuityKind;\n\treason: ContinuityReason;\n\tdeltaMessages?: number;\n};\n\nexport type ContinuityObservabilityBoundary = {\n\temit: (observation: ContinuityObservation) => void;\n\tlog: (event: string, data: Record<string, unknown>) => void;\n};\n\nconst SANITIZED_REASONS = new Set<string>([\n\t\"prefix_matched\",\n\t\"registry_miss\",\n\t\"idle_ttl\",\n\t\"capacity\",\n\t\"model_selected\",\n\t\"thinking_level_selected\",\n\t\"bound_account_token_expiring\",\n\t\"account_changed\",\n\t\"model_changed\",\n\t\"toolset_changed\",\n\t\"system_prompt_changed\",\n\t\"assistant_stream_diverged\",\n\t\"options_changed\",\n\t\"history_rolled_back\",\n\t\"assistant_rewritten\",\n\t\"transcript_missing\",\n\t\"cross_root_unsupported\",\n\t\"sent_stream_diverged\",\n\t\"branch_diverged\",\n\t\"branch_boundary_unavailable\",\n\t\"branch_resume\",\n\t\"tainted_compaction\",\n\t\"tainted_fork\",\n\t\"tainted_abort\",\n\t\"tainted_assistant_provenance_unverified\",\n\t\"resume_initialization_failed\",\n\t\"resume_initialization_aborted\",\n\t\"resume_mode_off\",\n\t\"query_failed\",\n\t\"turn_attribution_failed\",\n\t\"abort_timeout\",\n\t\"extensions_removed\",\n\t\"session_shutdown\",\n\t\"other\",\n]);\n\nlet cachedLogger: SessionLogger | undefined;\n\nfunction sessionLogger(): SessionLogger {\n\tcachedLogger ??= createSessionLogger(getAgentDir());\n\treturn cachedLogger;\n}\n\nconst defaultBoundary: ContinuityObservabilityBoundary = {\n\temit: () => {},\n\tlog: (event, data) => sessionLogger().info(event, data),\n};\nlet activeBoundary = defaultBoundary;\n\nexport function overrideContinuityObservabilityBoundary(override: Partial<ContinuityObservabilityBoundary>): void {\n\tactiveBoundary = { ...defaultBoundary, ...override };\n}\n\nexport function resetContinuityObservabilityBoundary(): void {\n\tactiveBoundary = defaultBoundary;\n}\n\n/** Maps a fixed vocabulary member through, and anything else to a bucketed cause. */\nexport function sanitizeReason(value: unknown): ContinuityReason {\n\tconst text = typeof value === \"string\" ? value : value instanceof Error ? value.message : \"\";\n\tif (SANITIZED_REASONS.has(text)) return text as ContinuityReason;\n\tconst tainted = /^tainted:(.+)$/.exec(text);\n\tif (tainted) {\n\t\tconst mapped = `tainted_${tainted[1]}`;\n\t\tif (SANITIZED_REASONS.has(mapped)) return mapped as ContinuityReason;\n\t}\n\treturn sanitizeCloseCause(value);\n}\n\n/** Buckets arbitrary close/pump failures into the fixed close-cause vocabulary. */\nexport function sanitizeCloseCause(value: unknown): ContinuityReason {\n\tconst text = typeof value === \"string\" ? value : value instanceof Error ? value.message : \"\";\n\tif (SANITIZED_REASONS.has(text)) return text as ContinuityReason;\n\tif (/did not terminate|interrupt failed/i.test(text)) return \"abort_timeout\";\n\tif (/user_message_uuid did not match|result arrived before replay claim|pre-replay buffer overflow/i.test(text)) {\n\t\treturn \"turn_attribution_failed\";\n\t}\n\tif (/query ended before|Claude SDK OAuth query|Claude Code/i.test(text)) return \"query_failed\";\n\treturn \"other\";\n}\n\n/**\n * Classifies the failure that ended a turn after every auth attempt failed.\n * Anything reaching here came out of the SDK query path, so an Error is a query\n * failure unless it matches a more specific bucket; the raw text never escapes.\n */\nexport function sanitizeTerminalFailure(value: unknown): ContinuityReason {\n\tconst cause = sanitizeCloseCause(value);\n\tif (cause !== \"other\") return cause;\n\treturn value instanceof Error ? \"query_failed\" : \"other\";\n}\n\n/**\n * One-shot pending close causes keyed by senpi session id. `closeSession`\n * records the cause here; the next admission consumes it so a first-turn\n * `registry_miss` is attributed to the real cause instead.\n */\nconst pendingCloseCauses = new Map<string, ContinuityReason>();\n// Long-running processes can stage many closes: the map is FIFO-bounded so it\n// cannot grow without limit. 256 pending causes per process is far beyond any\n// realistic session count; the oldest entry is evicted first.\nconst PENDING_CLOSE_CAUSE_LIMIT = 256;\n\nexport function recordPendingCloseCause(senpiSessionId: string, reason: unknown): void {\n\tconst cause = sanitizeReason(reason);\n\t// Delete first so a re-recorded cause moves to the newest position.\n\tpendingCloseCauses.delete(senpiSessionId);\n\tif (pendingCloseCauses.size >= PENDING_CLOSE_CAUSE_LIMIT) {\n\t\tconst oldest = pendingCloseCauses.keys().next().value;\n\t\tif (oldest !== undefined) pendingCloseCauses.delete(oldest);\n\t}\n\tpendingCloseCauses.set(senpiSessionId, cause);\n\tactiveBoundary.log(\"claude_sdk_oauth_session_close\", { reason: cause });\n}\n\n/** Read the pending close cause WITHOUT consuming it (consumed at emit time). */\nexport function peekPendingCloseCause(senpiSessionId: string): ContinuityReason | undefined {\n\treturn pendingCloseCauses.get(senpiSessionId);\n}\n\nexport function consumePendingCloseCause(senpiSessionId: string): ContinuityReason | undefined {\n\tconst cause = pendingCloseCauses.get(senpiSessionId);\n\tpendingCloseCauses.delete(senpiSessionId);\n\treturn cause;\n}\n\n/**\n * Maps the continuity decision families onto the observation vocabulary:\n * incremental→delta, resume→fork, cold-seed→flatten.\n */\nexport function observeSessionSyncDecision(input: {\n\tkind: \"incremental\" | \"resume\" | \"cold-seed\";\n\treason?: string;\n\tdeltaMessages: number;\n\tfirstTurn: boolean;\n\tsenpiSessionId: string;\n}): ContinuityObservation {\n\tif (input.kind === \"incremental\") {\n\t\treturn { kind: \"delta\", reason: \"prefix_matched\", deltaMessages: input.deltaMessages };\n\t}\n\tif (input.kind === \"resume\") {\n\t\tconst retainedCause =\n\t\t\tinput.reason === \"registry_miss\" ? consumePendingCloseCause(input.senpiSessionId) : undefined;\n\t\treturn {\n\t\t\tkind: \"fork\",\n\t\t\treason: retainedCause ?? (input.reason === undefined ? \"branch_resume\" : sanitizeReason(input.reason)),\n\t\t\tdeltaMessages: input.deltaMessages,\n\t\t};\n\t}\n\t// Peek, not consume: the staged observation is emitted only when the\n\t// auth-lane RETAINS this attempt. Consuming here would lose the cause when\n\t// the attempt is discarded; the emit path consumes it (session-stream.ts).\n\tconst retained = input.reason === \"registry_miss\" ? peekPendingCloseCause(input.senpiSessionId) : undefined;\n\tconst reason = retained ?? sanitizeReason(input.reason);\n\treturn {\n\t\tkind: input.firstTurn && reason === \"registry_miss\" ? \"bootstrap\" : \"flatten\",\n\t\treason,\n\t\tdeltaMessages: input.deltaMessages,\n\t};\n}\n\nexport type StagedContinuityDecision = {\n\tobservation: ContinuityObservation;\n\temit: () => void;\n};\n\n/** Stages an attempt's decision; `emit` fires only when the attempt is retained. */\nexport function stageContinuityDecision(\n\tobservation: ContinuityObservation,\n\tonDecision?: (observation: ContinuityObservation) => void,\n\tbeforeEmit?: () => void,\n): StagedContinuityDecision {\n\tlet emitted = false;\n\treturn {\n\t\tobservation,\n\t\temit: () => {\n\t\t\tif (emitted) return;\n\t\t\temitted = true;\n\t\t\tbeforeEmit?.();\n\t\t\temitContinuityObservation(observation, onDecision);\n\t\t},\n\t};\n}\n\nexport function emitContinuityObservation(\n\tobservation: ContinuityObservation,\n\tonDecision?: (observation: ContinuityObservation) => void,\n): void {\n\tonDecision?.(observation);\n\tactiveBoundary.emit(observation);\n\tactiveBoundary.log(\"claude_sdk_oauth_session_continuity\", {\n\t\tkind: observation.kind,\n\t\treason: observation.reason,\n\t\t...(observation.deltaMessages === undefined ? {} : { count: observation.deltaMessages }),\n\t});\n}\n"]}

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reaper.d.ts

@@ -0,0 +1,24 @@
+export interface SessionRegistryReapHandle {
+    cancel(): void;
+    unref(): void;
+}
+export type ReapCandidate = {
+    generation: number;
+    lastUsedAt: number;
+};
+export type SessionReapDeps = {
+    now: () => number;
+    scheduleTimer: (callback: () => void, delayMs: number) => SessionRegistryReapHandle;
+    idleTtlMs: number;
+    candidate: (senpiSessionId: string, generation: number) => ReapCandidate | undefined;
+    expire: (senpiSessionId: string) => void;
+};
+export declare class SessionReapScheduler {
+    private readonly scheduled;
+    private readonly deps;
+    constructor(deps: SessionReapDeps);
+    arm(senpiSessionId: string, generation: number, delayMs?: number): void;
+    cancel(senpiSessionId: string, generation: number): void;
+    private fire;
+}
+//# sourceMappingURL=session-reaper.d.ts.map

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reaper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-reaper.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-reaper.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACzC,MAAM,IAAI,IAAI,CAAC;IACf,KAAK,IAAI,IAAI,CAAC;CACd;AAED,MAAM,MAAM,aAAa,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,MAAM,MAAM,eAAe,GAAG;IAC7B,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,KAAK,yBAAyB,CAAC;IACpF,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,CAAC;IACrF,MAAM,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC,CAAC;AAIF,qBAAa,oBAAoB;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAE9D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IAEvC,YAAY,IAAI,EAAE,eAAe,EAEhC;IAED,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,SAAsB,GAAG,IAAI,CAKnF;IAED,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAKvD;IAED,OAAO,CAAC,IAAI;CAUZ"}

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reaper.js

@@ -0,0 +1,34 @@
+export class SessionReapScheduler {
+    constructor(deps) {
+        this.scheduled = new Map();
+        this.deps = deps;
+    }
+    arm(senpiSessionId, generation, delayMs = this.deps.idleTtlMs) {
+        const token = Symbol("session-reap");
+        const handle = this.deps.scheduleTimer(() => this.fire(senpiSessionId, generation, token), delayMs);
+        this.scheduled.set(senpiSessionId, { generation, token, handle });
+        handle.unref();
+    }
+    cancel(senpiSessionId, generation) {
+        const scheduled = this.scheduled.get(senpiSessionId);
+        if (!scheduled || scheduled.generation !== generation)
+            return;
+        scheduled.handle.cancel();
+        this.scheduled.delete(senpiSessionId);
+    }
+    fire(senpiSessionId, generation, token) {
+        const scheduled = this.scheduled.get(senpiSessionId);
+        if (!scheduled || scheduled.generation !== generation || scheduled.token !== token)
+            return;
+        this.scheduled.delete(senpiSessionId);
+        const candidate = this.deps.candidate(senpiSessionId, generation);
+        if (!candidate)
+            return;
+        const remaining = candidate.lastUsedAt + this.deps.idleTtlMs - this.deps.now();
+        if (remaining <= 0)
+            this.deps.expire(senpiSessionId);
+        else
+            this.arm(senpiSessionId, generation, remaining);
+    }
+}
+//# sourceMappingURL=session-reaper.js.map

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reaper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-reaper.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-reaper.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAO,oBAAoB;IAKhC,YAAY,IAAqB;QAJhB,cAAS,GAAG,IAAI,GAAG,EAAyB,CAAC;QAK7D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,cAAsB,EAAE,UAAkB,EAAE,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS;QAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QACpG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,cAAsB,EAAE,UAAkB;QAChD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,UAAU,KAAK,UAAU;YAAE,OAAO;QAC9D,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACvC,CAAC;IAEO,IAAI,CAAC,cAAsB,EAAE,UAAkB,EAAE,KAAa;QACrE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,UAAU,KAAK,UAAU,IAAI,SAAS,CAAC,KAAK,KAAK,KAAK;YAAE,OAAO;QAC3F,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/E,IAAI,SAAS,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;;YAChD,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;CACD","sourcesContent":["export interface SessionRegistryReapHandle {\n\tcancel(): void;\n\tunref(): void;\n}\n\nexport type ReapCandidate = { generation: number; lastUsedAt: number };\n\nexport type SessionReapDeps = {\n\tnow: () => number;\n\tscheduleTimer: (callback: () => void, delayMs: number) => SessionRegistryReapHandle;\n\tidleTtlMs: number;\n\tcandidate: (senpiSessionId: string, generation: number) => ReapCandidate | undefined;\n\texpire: (senpiSessionId: string) => void;\n};\n\ntype ScheduledReap = { generation: number; token: symbol; handle: SessionRegistryReapHandle };\n\nexport class SessionReapScheduler {\n\tprivate readonly scheduled = new Map<string, ScheduledReap>();\n\n\tprivate readonly deps: SessionReapDeps;\n\n\tconstructor(deps: SessionReapDeps) {\n\t\tthis.deps = deps;\n\t}\n\n\tarm(senpiSessionId: string, generation: number, delayMs = this.deps.idleTtlMs): void {\n\t\tconst token = Symbol(\"session-reap\");\n\t\tconst handle = this.deps.scheduleTimer(() => this.fire(senpiSessionId, generation, token), delayMs);\n\t\tthis.scheduled.set(senpiSessionId, { generation, token, handle });\n\t\thandle.unref();\n\t}\n\n\tcancel(senpiSessionId: string, generation: number): void {\n\t\tconst scheduled = this.scheduled.get(senpiSessionId);\n\t\tif (!scheduled || scheduled.generation !== generation) return;\n\t\tscheduled.handle.cancel();\n\t\tthis.scheduled.delete(senpiSessionId);\n\t}\n\n\tprivate fire(senpiSessionId: string, generation: number, token: symbol): void {\n\t\tconst scheduled = this.scheduled.get(senpiSessionId);\n\t\tif (!scheduled || scheduled.generation !== generation || scheduled.token !== token) return;\n\t\tthis.scheduled.delete(senpiSessionId);\n\t\tconst candidate = this.deps.candidate(senpiSessionId, generation);\n\t\tif (!candidate) return;\n\t\tconst remaining = candidate.lastUsedAt + this.deps.idleTtlMs - this.deps.now();\n\t\tif (remaining <= 0) this.deps.expire(senpiSessionId);\n\t\telse this.arm(senpiSessionId, generation, remaining);\n\t}\n}\n"]}

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reattach.d.ts

@@ -0,0 +1,34 @@
+import type { Options } from "./sdk-boundary.ts";
+import { type ClaudeSdkOauthSessionEntry } from "./session-registry.ts";
+export type ContinuityBinding = {
+    senpiSessionId: string;
+    sdkSessionId: string;
+    sentCount: number;
+    sentHashes: readonly string[];
+    lastAssistantUuid: string | null;
+    accountName: string;
+    modelId: string;
+    systemPromptHash: string;
+    toolsetHash: string;
+    /** Assistant boundaries kept as entries so a later fork still has a resume point. */
+    assistantUuidByIndex?: readonly (readonly [number, string])[];
+};
+export type ReattachInput = {
+    binding: ContinuityBinding;
+    options: Options;
+    atUuid?: string;
+    signal?: AbortSignal;
+};
+export type AbortOutcome = "keep" | "reattach";
+export declare function evaluateAbortOutcome(receipt: unknown): AbortOutcome;
+export declare function rememberBinding(binding: ContinuityBinding): void;
+export declare function getBinding(senpiSessionId: string): ContinuityBinding | undefined;
+export declare function forgetBinding(senpiSessionId: string): void;
+export declare function bindingFromEntry(entry: Pick<ClaudeSdkOauthSessionEntry, "senpiSessionId" | "sdkSessionId" | "sentCount" | "accountName" | "modelId" | "systemPromptHash" | "toolsetHash" | "assistantUuidByIndex">, sentHashes: readonly string[]): ContinuityBinding;
+/**
+ * A new query is not a new session: `resume` re-attaches to the existing lineage.
+ * `sessionId` must stay absent unless forking, because the SDK rejects the pair
+ * (sdk.d.ts:1805-1808) and would otherwise silently start an unrelated session.
+ */
+export declare function reattachSession(input: ReattachInput): Promise<ClaudeSdkOauthSessionEntry>;
+//# sourceMappingURL=session-reattach.d.ts.map

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reattach.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-reattach.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-reattach.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,KAAK,0BAA0B,EAAoC,MAAM,uBAAuB,CAAC;AAG1G,MAAM,MAAM,iBAAiB,GAAG;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB,CAAC;AAIF,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,UAAU,CAAC;AAE/C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAInE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAEhE;AAED,wBAAgB,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAEhF;AAED,wBAAgB,aAAa,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAE1D;AAED,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,IAAI,CACV,0BAA0B,EACxB,gBAAgB,GAChB,cAAc,GACd,WAAW,GACX,aAAa,GACb,SAAS,GACT,kBAAkB,GAClB,aAAa,GACb,sBAAsB,CACxB,EACD,UAAU,EAAE,SAAS,MAAM,EAAE,GAC3B,iBAAiB,CAanB;AAoBD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAyB/F"}

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reattach.js

@@ -0,0 +1,85 @@
+import { closeSession, getOrCreateSession } from "./session-registry.js";
+import { recordSyncedStream } from "./session-sync.js";
+const bindings = new Map();
+export function evaluateAbortOutcome(receipt) {
+    if (!receipt || typeof receipt !== "object")
+        return "reattach";
+    const queued = receipt.still_queued;
+    return Array.isArray(queued) && queued.length === 0 ? "keep" : "reattach";
+}
+export function rememberBinding(binding) {
+    bindings.set(binding.senpiSessionId, { ...binding, sentHashes: [...binding.sentHashes] });
+}
+export function getBinding(senpiSessionId) {
+    return bindings.get(senpiSessionId);
+}
+export function forgetBinding(senpiSessionId) {
+    bindings.delete(senpiSessionId);
+}
+export function bindingFromEntry(entry, sentHashes) {
+    return {
+        senpiSessionId: entry.senpiSessionId,
+        sdkSessionId: entry.sdkSessionId,
+        sentCount: entry.sentCount,
+        sentHashes: [...sentHashes],
+        lastAssistantUuid: entry.assistantUuidByIndex.get(entry.sentCount) ?? null,
+        assistantUuidByIndex: [...entry.assistantUuidByIndex.entries()],
+        accountName: entry.accountName,
+        modelId: entry.modelId,
+        systemPromptHash: entry.systemPromptHash,
+        toolsetHash: entry.toolsetHash,
+    };
+}
+async function awaitInitialization(entry, signal) {
+    const initialize = entry.query.initializationResult;
+    if (!initialize)
+        return;
+    if (!signal) {
+        await initialize.call(entry.query);
+        return;
+    }
+    const aborted = new Promise((_resolve, reject) => {
+        const onAbort = () => {
+            closeSession(entry.senpiSessionId, "resume_initialization_aborted");
+            reject(new Error("Claude SDK OAuth reattach aborted"));
+        };
+        if (signal.aborted)
+            onAbort();
+        else
+            signal.addEventListener("abort", onAbort, { once: true });
+    });
+    await Promise.race([initialize.call(entry.query), aborted]);
+}
+/**
+ * A new query is not a new session: `resume` re-attaches to the existing lineage.
+ * `sessionId` must stay absent unless forking, because the SDK rejects the pair
+ * (sdk.d.ts:1805-1808) and would otherwise silently start an unrelated session.
+ */
+export async function reattachSession(input) {
+    const { binding, atUuid } = input;
+    closeSession(binding.senpiSessionId, "reattach");
+    const entry = getOrCreateSession({
+        senpiSessionId: binding.senpiSessionId,
+        accountName: binding.accountName,
+        modelId: binding.modelId,
+        systemPromptHash: binding.systemPromptHash,
+        toolsetHash: binding.toolsetHash,
+        options: input.options,
+        resume: atUuid ? { sdkSessionId: binding.sdkSessionId, atUuid } : { sdkSessionId: binding.sdkSessionId },
+    });
+    try {
+        await awaitInitialization(entry, input.signal);
+    }
+    catch (error) {
+        closeSession(binding.senpiSessionId, "resume_initialization_failed");
+        throw error;
+    }
+    recordSyncedStream(entry, binding.sentHashes);
+    for (const [index, uuid] of binding.assistantUuidByIndex ?? [])
+        entry.assistantUuidByIndex.set(index, uuid);
+    if (binding.lastAssistantUuid)
+        entry.assistantUuidByIndex.set(binding.sentCount, binding.lastAssistantUuid);
+    rememberBinding({ ...binding, sdkSessionId: entry.sdkSessionId });
+    return entry;
+}
+//# sourceMappingURL=session-reattach.js.map

package/dist/core/extensions/builtin/claude-sdk-oauth/session-reattach.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-reattach.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-reattach.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Options } from \"./sdk-boundary.ts\";\nimport { type ClaudeSdkOauthSessionEntry, closeSession, getOrCreateSession } from \"./session-registry.ts\";\nimport { recordSyncedStream } from \"./session-sync.ts\";\n\nexport type ContinuityBinding = {\n\tsenpiSessionId: string;\n\tsdkSessionId: string;\n\tsentCount: number;\n\tsentHashes: readonly string[];\n\tlastAssistantUuid: string | null;\n\taccountName: string;\n\tmodelId: string;\n\tsystemPromptHash: string;\n\ttoolsetHash: string;\n\t/** Assistant boundaries kept as entries so a later fork still has a resume point. */\n\tassistantUuidByIndex?: readonly (readonly [number, string])[];\n};\n\nexport type ReattachInput = {\n\tbinding: ContinuityBinding;\n\toptions: Options;\n\tatUuid?: string;\n\tsignal?: AbortSignal;\n};\n\nconst bindings = new Map<string, ContinuityBinding>();\n\nexport type AbortOutcome = \"keep\" | \"reattach\";\n\nexport function evaluateAbortOutcome(receipt: unknown): AbortOutcome {\n\tif (!receipt || typeof receipt !== \"object\") return \"reattach\";\n\tconst queued = (receipt as { still_queued?: unknown }).still_queued;\n\treturn Array.isArray(queued) && queued.length === 0 ? \"keep\" : \"reattach\";\n}\n\nexport function rememberBinding(binding: ContinuityBinding): void {\n\tbindings.set(binding.senpiSessionId, { ...binding, sentHashes: [...binding.sentHashes] });\n}\n\nexport function getBinding(senpiSessionId: string): ContinuityBinding | undefined {\n\treturn bindings.get(senpiSessionId);\n}\n\nexport function forgetBinding(senpiSessionId: string): void {\n\tbindings.delete(senpiSessionId);\n}\n\nexport function bindingFromEntry(\n\tentry: Pick<\n\t\tClaudeSdkOauthSessionEntry,\n\t\t| \"senpiSessionId\"\n\t\t| \"sdkSessionId\"\n\t\t| \"sentCount\"\n\t\t| \"accountName\"\n\t\t| \"modelId\"\n\t\t| \"systemPromptHash\"\n\t\t| \"toolsetHash\"\n\t\t| \"assistantUuidByIndex\"\n\t>,\n\tsentHashes: readonly string[],\n): ContinuityBinding {\n\treturn {\n\t\tsenpiSessionId: entry.senpiSessionId,\n\t\tsdkSessionId: entry.sdkSessionId,\n\t\tsentCount: entry.sentCount,\n\t\tsentHashes: [...sentHashes],\n\t\tlastAssistantUuid: entry.assistantUuidByIndex.get(entry.sentCount) ?? null,\n\t\tassistantUuidByIndex: [...entry.assistantUuidByIndex.entries()],\n\t\taccountName: entry.accountName,\n\t\tmodelId: entry.modelId,\n\t\tsystemPromptHash: entry.systemPromptHash,\n\t\ttoolsetHash: entry.toolsetHash,\n\t};\n}\n\nasync function awaitInitialization(entry: ClaudeSdkOauthSessionEntry, signal?: AbortSignal): Promise<void> {\n\tconst initialize = entry.query.initializationResult;\n\tif (!initialize) return;\n\tif (!signal) {\n\t\tawait initialize.call(entry.query);\n\t\treturn;\n\t}\n\tconst aborted = new Promise<never>((_resolve, reject) => {\n\t\tconst onAbort = (): void => {\n\t\t\tcloseSession(entry.senpiSessionId, \"resume_initialization_aborted\");\n\t\t\treject(new Error(\"Claude SDK OAuth reattach aborted\"));\n\t\t};\n\t\tif (signal.aborted) onAbort();\n\t\telse signal.addEventListener(\"abort\", onAbort, { once: true });\n\t});\n\tawait Promise.race([initialize.call(entry.query), aborted]);\n}\n\n/**\n * A new query is not a new session: `resume` re-attaches to the existing lineage.\n * `sessionId` must stay absent unless forking, because the SDK rejects the pair\n * (sdk.d.ts:1805-1808) and would otherwise silently start an unrelated session.\n */\nexport async function reattachSession(input: ReattachInput): Promise<ClaudeSdkOauthSessionEntry> {\n\tconst { binding, atUuid } = input;\n\tcloseSession(binding.senpiSessionId, \"reattach\");\n\tconst entry = getOrCreateSession({\n\t\tsenpiSessionId: binding.senpiSessionId,\n\t\taccountName: binding.accountName,\n\t\tmodelId: binding.modelId,\n\t\tsystemPromptHash: binding.systemPromptHash,\n\t\ttoolsetHash: binding.toolsetHash,\n\t\toptions: input.options,\n\t\tresume: atUuid ? { sdkSessionId: binding.sdkSessionId, atUuid } : { sdkSessionId: binding.sdkSessionId },\n\t});\n\n\ttry {\n\t\tawait awaitInitialization(entry, input.signal);\n\t} catch (error) {\n\t\tcloseSession(binding.senpiSessionId, \"resume_initialization_failed\");\n\t\tthrow error;\n\t}\n\n\trecordSyncedStream(entry, binding.sentHashes);\n\tfor (const [index, uuid] of binding.assistantUuidByIndex ?? []) entry.assistantUuidByIndex.set(index, uuid);\n\tif (binding.lastAssistantUuid) entry.assistantUuidByIndex.set(binding.sentCount, binding.lastAssistantUuid);\n\trememberBinding({ ...binding, sdkSessionId: entry.sdkSessionId });\n\treturn entry;\n}\n"]}

package/dist/core/extensions/builtin/claude-sdk-oauth/session-registry-pump.d.ts

@@ -1,5 +1,7 @@
 import type { SDKMessage, SDKUserMessage } from "./sdk-boundary.ts";
 import { type ClaudeSdkOauthSessionEntry, type ClaudeSdkOauthSessionRegistry } from "./session-registry.ts";
+import type { PreReplayBufferLimits, SessionTurnResult } from "./session-turn-types.ts";
+export type { SessionTurnResult } from "./session-turn-types.ts";
 export declare const DEFAULT_PRE_REPLAY_MAX_MESSAGES = 64;
 export declare const DEFAULT_PRE_REPLAY_MAX_BYTES: number;
 export declare const SESSION_TURN_ABORT_GRACE_MS = 1000;
@@ -9,22 +11,9 @@ export interface SessionTurnRequest {
     onMessage?: (message: SDKMessage) => void;
     scheduleAbort?: (callback: () => void, delayMs: number) => () => void;
 }
-export interface SessionTurnResult {
-    uuid: string;
-    messages: SDKMessage[];
-    aborted: boolean;
-}
-export interface PreReplayBufferLimits {
-    maxMessages: number;
-    maxBytes: number;
-}
 export declare class ConcurrentSessionTurnAdmissionError extends Error {
     readonly code = "claude_sdk_oauth_concurrent_turn_admission";
     constructor(sessionId: string);
 }
-export declare class SessionTurnAttributionError extends Error {
-    readonly code = "claude_sdk_oauth_turn_attribution";
-    constructor(message: string);
-}
 export declare function submitSessionTurn(registry: ClaudeSdkOauthSessionRegistry, entry: ClaudeSdkOauthSessionEntry, request: SessionTurnRequest, limits?: PreReplayBufferLimits): Promise<SessionTurnResult>;
 //# sourceMappingURL=session-registry-pump.d.ts.map

package/dist/core/extensions/builtin/claude-sdk-oauth/session-registry-pump.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-registry-pump.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-registry-pump.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EACN,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAElC,MAAM,uBAAuB,CAAC;AAU/B,eAAO,MAAM,+BAA+B,KAAK,CAAC;AAClD,eAAO,MAAM,4BAA4B,QAAa,CAAC;AACvD,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD,MAAM,WAAW,kBAAkB;IAClC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;IAC1C,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,IAAI,CAAC;CACtE;AAED,MAAM,WAAW,iBAAiB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAmBD,qBAAa,mCAAoC,SAAQ,KAAK;IAC7D,QAAQ,CAAC,IAAI,gDAAgD;IAE7D,YAAY,SAAS,EAAE,MAAM,EAG5B;CACD;AAED,qBAAa,2BAA4B,SAAQ,KAAK;IACrD,QAAQ,CAAC,IAAI,uCAAuC;IAEpD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACD;AAiJD,wBAAgB,iBAAiB,CAChC,QAAQ,EAAE,6BAA6B,EACvC,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,kBAAkB,EAC3B,MAAM,GAAE,qBAGP,GACC,OAAO,CAAC,iBAAiB,CAAC,CAgD5B"}
+{"version":3,"file":"session-registry-pump.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-registry-pump.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EACN,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAElC,MAAM,uBAAuB,CAAC;AAS/B,OAAO,KAAK,EAAc,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEpG,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,eAAO,MAAM,+BAA+B,KAAK,CAAC;AAClD,eAAO,MAAM,4BAA4B,QAAa,CAAC;AACvD,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD,MAAM,WAAW,kBAAkB;IAClC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;IAC1C,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,IAAI,CAAC;CACtE;AAED,qBAAa,mCAAoC,SAAQ,KAAK;IAC7D,QAAQ,CAAC,IAAI,gDAAgD;IAE7D,YAAY,SAAS,EAAE,MAAM,EAG5B;CACD;AA+GD,wBAAgB,iBAAiB,CAChC,QAAQ,EAAE,6BAA6B,EACvC,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,kBAAkB,EAC3B,MAAM,GAAE,qBAGP,GACC,OAAO,CAAC,iBAAiB,CAAC,CAqD5B"}

package/dist/core/extensions/builtin/claude-sdk-oauth/session-registry-pump.js

@@ -1,6 +1,8 @@
-import { Buffer } from "node:buffer";
+import { evaluateAbortOutcome } from "./session-reattach.js";
 import { createSessionUuid, } from "./session-registry.js";
-import { transitionToIdleSynced, transitionToTurnClaimed, transitionToTurnResultSeen, transitionToTurnSent, transitionToTurnStreaming, transitionToTurnWaiting, } from "./session-registry-state.js";
+import { transitionToIdleSynced, transitionToTurnResultSeen, transitionToTurnSent, transitionToTurnStreaming, transitionToTurnWaiting, } from "./session-registry-state.js";
+import { bufferBeforeReplay, claimTurn, deliver, isReplayFor, resultMatchesTurn } from "./session-turn-claim.js";
+import { SessionTurnAttributionError } from "./session-turn-types.js";
 export const DEFAULT_PRE_REPLAY_MAX_MESSAGES = 64;
 export const DEFAULT_PRE_REPLAY_MAX_BYTES = 256 * 1024;
 export const SESSION_TURN_ABORT_GRACE_MS = 1_000;
@@ -11,37 +13,9 @@ export class ConcurrentSessionTurnAdmissionError extends Error {
         this.name = "ConcurrentSessionTurnAdmissionError";
     }
 }
-export class SessionTurnAttributionError extends Error {
-    constructor(message) {
-        super(message);
-        this.code = "claude_sdk_oauth_turn_attribution";
-        this.name = "SessionTurnAttributionError";
-    }
-}
 function currentTurn(entry) {
     return entry.activeTurn;
 }
-function isReplayFor(message, uuid) {
-    return message.type === "user" && "isReplay" in message && message.isReplay === true && message.uuid === uuid;
-}
-function isAutonomousResult(message) {
-    if (message.origin && message.origin.kind !== "human")
-        return true;
-    const wire = message;
-    return wire.parent_tool_use_id != null || wire.subagent_type != null || wire.isSynthetic === true;
-}
-function resultMatchesTurn(message, turn) {
-    if ("user_message_uuid" in message && message.user_message_uuid !== undefined) {
-        return message.user_message_uuid === turn.uuid;
-    }
-    return turn.claimed && !isAutonomousResult(message);
-}
-function deliver(entry, turn, message) {
-    if (entry.state === "TURN_CLAIMED")
-        transitionToTurnStreaming(entry);
-    turn.messages.push(message);
-    turn.onMessage?.(message);
-}
 function scheduleAbort(callback, delayMs) {
     const timer = setTimeout(callback, delayMs);
     timer.unref();
@@ -63,27 +37,19 @@ function failTurn(registry, entry, error) {
         registry.closeSession(entry.senpiSessionId, error.message);
     }
 }
-function abortTurn(registry, entry, turn, error) {
-    if (currentTurn(entry) === turn && registry.isCurrentGeneration(entry.senpiSessionId, turn.generation)) {
-        failTurn(registry, entry, error);
-    }
-}
-function bufferBeforeReplay(registry, entry, turn, message) {
-    turn.preReplay.push(message);
-    turn.preReplayBytes += Buffer.byteLength(JSON.stringify(message));
-    if (turn.preReplay.length > turn.limits.maxMessages || turn.preReplayBytes > turn.limits.maxBytes) {
-        throw new SessionTurnAttributionError("Claude SDK OAuth pre-replay buffer overflow");
-    }
-    if (!registry.isCurrentGeneration(entry.senpiSessionId, turn.generation))
-        turn.preReplay.length = 0;
-}
-function claimTurn(entry, turn) {
-    turn.claimed = true;
-    transitionToTurnClaimed(entry);
-    for (const buffered of turn.preReplay)
-        deliver(entry, turn, buffered);
-    turn.preReplay.length = 0;
-    turn.preReplayBytes = 0;
+/**
+ * An interrupt that never produces a terminal result still ends the user's turn:
+ * settle it as aborted and close only the query, so the binding survives and the
+ * next turn reattaches. Rejecting here would drop the turn's continuity
+ * observation and hand the following turn two.
+ */
+function abortTurn(registry, entry, turn, _error) {
+    if (currentTurn(entry) !== turn || !registry.isCurrentGeneration(entry.senpiSessionId, turn.generation))
+        return;
+    removeAbortListener(turn);
+    entry.activeTurn = null;
+    registry.closeSession(entry.senpiSessionId, "abort_uncertain");
+    turn.resolve({ uuid: turn.uuid, messages: turn.messages, aborted: true });
 }
 function finishTurn(registry, entry, turn, message) {
     if (!resultMatchesTurn(message, turn)) {
@@ -96,13 +62,21 @@ function finishTurn(registry, entry, turn, message) {
     transitionToTurnResultSeen(entry);
     removeAbortListener(turn);
     entry.activeTurn = null;
-    if (turn.aborted)
-        registry.markTainted(entry.senpiSessionId, "abort");
-    else
+    if (!turn.aborted || evaluateAbortOutcome(turn.interruptReceipt) === "keep")
         transitionToIdleSynced(entry);
+    else
+        registry.closeSession(entry.senpiSessionId, "abort_uncertain");
     turn.resolve({ uuid: turn.uuid, messages: turn.messages, aborted: turn.aborted });
 }
 function handleMessage(registry, entry, message) {
+    // A forked query mints a NEW session id (forkSession: true + resume): the
+    // init message carries it, and it must be persisted BEFORE any turn-state
+    // guard — otherwise subsequent reattach targets the original session and
+    // the fork's content is lost.
+    if (message.type === "system" && message.subtype === "init" && typeof message.session_id === "string") {
+        if (message.session_id !== entry.sdkSessionId)
+            entry.sdkSessionId = message.session_id;
+    }
     const turn = currentTurn(entry);
     if (!turn || !registry.isCurrentGeneration(entry.senpiSessionId, turn.generation))
         return;
@@ -156,7 +130,12 @@ export function submitSessionTurn(registry, entry, request, limits = {
                 return;
             turn.aborted = true;
             turn.cancelAbort = (request.scheduleAbort ?? scheduleAbort)(() => abortTurn(registry, entry, turn, new Error("Claude SDK OAuth interrupted turn did not terminate")), SESSION_TURN_ABORT_GRACE_MS);
-            void entry.query.interrupt().catch((error) => {
+            void entry.query
+                .interrupt()
+                .then((receipt) => {
+                turn.interruptReceipt = receipt;
+            })
+                .catch((error) => {
                 const detail = error instanceof Error ? error.message : String(error);
                 abortTurn(registry, entry, turn, new Error(`Claude SDK OAuth query interrupt failed: ${detail}`));
             });