@code-yeongyu/senpi 2026.7.30 → 2026.7.31-2

package/dist/core/extensions/builtin/{claude-agent-sdk → claude-sdk-oauth}/options.js

@@ -1,7 +1,10 @@
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, relative, resolve } from "node:path";
 import { CONFIG_DIR_NAME, getAgentDir } from "../../../../config.js";
-import { loadClaudeAgentSdkProviderSettingsFromDisk, } from "./settings.js";
+import { PROJECT_RULES_END_MARKER, PROJECT_RULES_HEADING, PROJECT_RULES_REGION_END_MARKER, PROJECT_RULES_REGION_START_MARKER, PROJECT_RULES_START_MARKER, } from "../rules/rules/constants.js";
+import { presetAppendDeprecationGuidance } from "./guidance.js";
+import { loadClaudeSdkOauthProviderSettingsFromDisk, resolveSystemPromptMode, } from "./settings.js";
+import { loadOverrideSystemPrompt, resolveCustomSystemPrompt } from "./system-prompt.js";
 import { BUILTIN_SDK_TOOLS, canUseTool, HOST_TOOL_DENIAL_HOOKS } from "./tools.js";
 const ADAPTIVE_THINKING_MODEL_MARKERS = [
     "opus-4-6",
@@ -131,19 +134,76 @@ function extractSkillsAppend(systemPrompt, cwd) {
         return undefined;
     return rewriteSkillsLocations(systemPrompt.slice(start, end + "</available_skills>".length).trim(), cwd);
 }
-function resolveSettingSources(providerSettings, appendSystemPrompt, authLane) {
-    if (authLane !== "ambient")
+/**
+ * This lane rebuilds the prompt from the `claude_code` preset plus `append`, so any
+ * region of senpi's composed prompt without an extractor here never reaches the model.
+ *
+ * Located by the rules builtin's opaque region sentinels rather than the model-facing
+ * `<project_rules>` tags, which surrounding prompt content may legitimately contain.
+ * The sentinels are a reserved wire literal but nothing neutralizes them outside the block, so
+ * each candidate is structurally validated and rejected candidates are skipped - otherwise a
+ * context file carrying one would shadow the real block or cross-match its end sentinel.
+ * Fail-closed on a missing end sentinel: never read to end-of-string, or the sections
+ * extensions append after this one get relabelled as project rules.
+ */
+function extractProjectRulesAppend(systemPrompt) {
+    if (!systemPrompt)
+        return undefined;
+    let searchFrom = 0;
+    while (searchFrom <= systemPrompt.length) {
+        const sentinelStart = systemPrompt.indexOf(PROJECT_RULES_REGION_START_MARKER, searchFrom);
+        if (sentinelStart === -1)
+            return undefined;
+        const regionStart = sentinelStart + PROJECT_RULES_REGION_START_MARKER.length;
+        const regionEnd = systemPrompt.indexOf(PROJECT_RULES_REGION_END_MARKER, regionStart);
+        if (regionEnd === -1)
+            return undefined;
+        const region = systemPrompt.slice(regionStart, regionEnd).trim();
+        if (isProjectRulesEnvelope(region))
+            return region;
+        searchFrom = regionStart;
+    }
+    return undefined;
+}
+function isProjectRulesEnvelope(region) {
+    return (region.startsWith(`${PROJECT_RULES_START_MARKER}\n${PROJECT_RULES_HEADING}\n`) &&
+        region.endsWith(`\n${PROJECT_RULES_END_MARKER}`));
+}
+function resolveSettingSources(providerSettings, mode, authLane) {
+    if (providerSettings.settingSources !== undefined)
+        return [...providerSettings.settingSources];
+    if (mode !== "preset-append" || authLane !== "ambient")
         return [];
-    return providerSettings.settingSources ?? (appendSystemPrompt ? [] : ["user", "project"]);
+    return ["user", "project"];
 }
-export function buildClaudeAgentSdkQueryOptions(input) {
+export function buildClaudeSdkOauthQueryOptions(input) {
     const cwd = input.cwd ?? process.cwd();
-    const providerSettings = input.providerSettings ?? loadClaudeAgentSdkProviderSettingsFromDisk(cwd);
+    const providerSettings = input.providerSettings ?? loadClaudeSdkOauthProviderSettingsFromDisk(cwd);
     const appendSystemPrompt = providerSettings.appendSystemPrompt !== false;
+    const resolvedMode = resolveSystemPromptMode(providerSettings);
+    const mode = resolvedMode.mode;
+    if (input.sessionId !== undefined && input.onGuidance !== undefined) {
+        const deprecation = presetAppendDeprecationGuidance({
+            mode,
+            conflict: resolvedMode.conflict,
+            sessionId: input.sessionId,
+        });
+        if (deprecation !== undefined)
+            input.onGuidance(deprecation);
+    }
     const authLane = input.authLane ?? providerSettings.tokenInjection ?? "oauth-slots";
-    const append = appendSystemPrompt
-        ? [extractAgentsAppend(cwd), extractSkillsAppend(input.context.systemPrompt, cwd)].filter((part) => part !== undefined)
+    const append = mode === "preset-append"
+        ? [
+            extractAgentsAppend(cwd),
+            extractSkillsAppend(input.context.systemPrompt, cwd),
+            extractProjectRulesAppend(input.context.systemPrompt),
+        ].filter((part) => part !== undefined)
         : [];
+    const systemPrompt = mode === "preset-append"
+        ? { type: "preset", preset: "claude_code", append: append.join("\n\n") || undefined }
+        : mode === "override"
+            ? loadOverrideSystemPrompt(providerSettings.systemPromptFile)
+            : resolveCustomSystemPrompt(input.context.systemPrompt);
     const strictMcpConfig = providerSettings.strictMcpConfig ?? !appendSystemPrompt;
     const queryOptions = {
         cwd,
@@ -153,8 +213,8 @@ export function buildClaudeAgentSdkQueryOptions(input) {
         includePartialMessages: true,
         canUseTool,
         hooks: HOST_TOOL_DENIAL_HOOKS,
-        systemPrompt: { type: "preset", preset: "claude_code", append: append.join("\n\n") || undefined },
-        settingSources: resolveSettingSources(providerSettings, appendSystemPrompt, authLane),
+        systemPrompt,
+        settingSources: resolveSettingSources(providerSettings, mode, authLane),
     };
     if (input.pathToClaudeCodeExecutable)
         queryOptions.pathToClaudeCodeExecutable = input.pathToClaudeCodeExecutable;

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

@@ -0,0 +1 @@
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/options.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { dirname, join, relative, resolve } from \"node:path\";\nimport type { Api, Context, Model, SimpleStreamOptions, ThinkingBudgets, ThinkingLevel } from \"@earendil-works/pi-ai\";\nimport { CONFIG_DIR_NAME, getAgentDir } from \"../../../../config.ts\";\nimport {\n\tPROJECT_RULES_END_MARKER,\n\tPROJECT_RULES_HEADING,\n\tPROJECT_RULES_REGION_END_MARKER,\n\tPROJECT_RULES_REGION_START_MARKER,\n\tPROJECT_RULES_START_MARKER,\n} from \"../rules/rules/constants.ts\";\nimport { presetAppendDeprecationGuidance } from \"./guidance.ts\";\nimport type { EffortLevel, Options, SettingSource, ThinkingConfig } from \"./sdk-boundary.ts\";\nimport {\n\ttype ClaudeSdkOauthProviderSettings,\n\ttype ClaudeSdkOauthSystemPromptMode,\n\ttype ClaudeSdkOauthTokenInjection,\n\tloadClaudeSdkOauthProviderSettingsFromDisk,\n\tresolveSystemPromptMode,\n} from \"./settings.ts\";\nimport { loadOverrideSystemPrompt, resolveCustomSystemPrompt } from \"./system-prompt.ts\";\nimport { BUILTIN_SDK_TOOLS, canUseTool, HOST_TOOL_DENIAL_HOOKS } from \"./tools.ts\";\n\nexport type ClaudeSdkOauthAuthLane = ClaudeSdkOauthTokenInjection;\n\nexport interface ClaudeSdkOauthQueryOptionsInput {\n\treadonly model: Model<Api>;\n\treadonly context: Context;\n\treadonly streamOptions?: SimpleStreamOptions;\n\treadonly cwd?: string;\n\treadonly providerSettings?: ClaudeSdkOauthProviderSettings;\n\treadonly authLane?: ClaudeSdkOauthAuthLane;\n\treadonly tools?: readonly string[];\n\treadonly pathToClaudeCodeExecutable?: string;\n\treadonly sessionId?: string;\n\treadonly onGuidance?: (text: string) => void;\n}\n\nconst ADAPTIVE_THINKING_MODEL_MARKERS = [\n\t\"opus-4-6\",\n\t\"opus-4.6\",\n\t\"opus-4-7\",\n\t\"opus-4.7\",\n\t\"opus-4-8\",\n\t\"opus-4.8\",\n\t\"opus-5\",\n\t\"sonnet-4-6\",\n\t\"sonnet-4.6\",\n\t\"sonnet-5\",\n\t\"fable-5\",\n\t\"mythos-5\",\n] as const;\n\nconst NATIVE_XHIGH_EFFORT_MODEL_MARKERS = [\n\t\"opus-4-7\",\n\t\"opus-4-8\",\n\t\"opus-5\",\n\t\"sonnet-5\",\n\t\"fable-5\",\n\t\"mythos-5\",\n] as const;\n\nconst DEFAULT_THINKING_BUDGETS: Required<ThinkingBudgets> = {\n\tminimal: 2048,\n\tlow: 8192,\n\tmedium: 16384,\n\thigh: 31999,\n\tmax: 63999,\n};\n\nfunction includesModelMarker(model: Model<Api>, markers: readonly string[]): boolean {\n\tconst id = model.id.toLowerCase();\n\treturn markers.some((marker) => id.includes(marker));\n}\n\nfunction forcedAdaptiveThinking(model: Model<Api>): boolean | undefined {\n\tconst compat = model.compat;\n\tif (!compat || !(\"forceAdaptiveThinking\" in compat)) return undefined;\n\treturn typeof compat.forceAdaptiveThinking === \"boolean\" ? compat.forceAdaptiveThinking : undefined;\n}\n\nfunction supportsAdaptiveThinking(model: Model<Api>): boolean {\n\treturn forcedAdaptiveThinking(model) ?? includesModelMarker(model, ADAPTIVE_THINKING_MODEL_MARKERS);\n}\n\nfunction supportsNativeXhighEffort(model: Model<Api>): boolean {\n\treturn includesModelMarker(model, NATIVE_XHIGH_EFFORT_MODEL_MARKERS);\n}\n\nfunction isEffortLevel(value: string): value is EffortLevel {\n\treturn value === \"low\" || value === \"medium\" || value === \"high\" || value === \"xhigh\" || value === \"max\";\n}\n\nfunction mapThinkingLevelToEffort(model: Model<Api>, level: ThinkingLevel): EffortLevel {\n\tconst mapped = model.thinkingLevelMap?.[level];\n\tif (typeof mapped === \"string\" && isEffortLevel(mapped)) return mapped;\n\tswitch (level) {\n\t\tcase \"minimal\":\n\t\tcase \"low\":\n\t\t\treturn \"low\";\n\t\tcase \"medium\":\n\t\t\treturn \"medium\";\n\t\tcase \"high\":\n\t\t\treturn \"high\";\n\t\tcase \"xhigh\":\n\t\t\treturn supportsNativeXhighEffort(model) ? \"xhigh\" : \"max\";\n\t\tcase \"max\":\n\t\t\treturn \"max\";\n\t}\n}\n\nfunction mapThinkingTokens(reasoning: ThinkingLevel, thinkingBudgets: ThinkingBudgets | undefined): number {\n\tconst budgetLevel = reasoning === \"xhigh\" ? \"high\" : reasoning;\n\tconst customBudget = thinkingBudgets?.[budgetLevel];\n\treturn typeof customBudget === \"number\" && Number.isFinite(customBudget) && customBudget > 0\n\t\t? customBudget\n\t\t: DEFAULT_THINKING_BUDGETS[budgetLevel];\n}\n\nfunction findAgentsMdInParents(cwd: string): string | undefined {\n\tlet current = resolve(cwd);\n\twhile (true) {\n\t\tconst candidate = join(current, \"AGENTS.md\");\n\t\tif (existsSync(candidate)) return candidate;\n\t\tconst parent = dirname(current);\n\t\tif (parent === current) return undefined;\n\t\tcurrent = parent;\n\t}\n}\n\nfunction sanitizeAgentsContent(content: string): string {\n\tconst configDirectory = CONFIG_DIR_NAME.replace(/^\\./, \"\");\n\tconst escapedConfigDirectory = configDirectory.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n\treturn content\n\t\t.replace(new RegExp(`~/${escapedConfigDirectory}\\\\b`, \"gi\"), \"~/.claude\")\n\t\t.replace(new RegExp(`(^|[\\\\s'\"\\`])\\\\.${escapedConfigDirectory}/`, \"g\"), \"$1.claude/\")\n\t\t.replace(new RegExp(`\\\\b${escapedConfigDirectory}\\\\b`, \"gi\"), \"environment\");\n}\n\nfunction extractAgentsAppend(cwd: string): string | undefined {\n\tconst agentsPath = findAgentsMdInParents(cwd) ?? join(getAgentDir(), \"AGENTS.md\");\n\tif (!existsSync(agentsPath)) return undefined;\n\ttry {\n\t\tconst content = sanitizeAgentsContent(readFileSync(agentsPath, \"utf-8\").trim());\n\t\treturn content.length > 0 ? `# CLAUDE.md\\n\\n${content}` : undefined;\n\t} catch {\n\t\treturn undefined;\n\t}\n}\n\nfunction rewriteSkillsLocations(skillsBlock: string, cwd: string): string {\n\tconst globalSkillsRoot = join(getAgentDir(), \"skills\");\n\tconst projectSkillsRoot = join(cwd, CONFIG_DIR_NAME, \"skills\");\n\treturn skillsBlock.replace(/<location>([^<]+)<\\/location>/g, (_match, location: string) => {\n\t\tif (location.startsWith(globalSkillsRoot)) {\n\t\t\treturn `<location>~/.claude/skills/${relative(globalSkillsRoot, location).replace(/^\\.+/, \"\")}</location>`;\n\t\t}\n\t\tif (location.startsWith(projectSkillsRoot)) {\n\t\t\treturn `<location>.claude/skills/${relative(projectSkillsRoot, location).replace(/^\\.+/, \"\")}</location>`;\n\t\t}\n\t\treturn `<location>${location}</location>`;\n\t});\n}\n\nfunction extractSkillsAppend(systemPrompt: string | undefined, cwd: string): string | undefined {\n\tif (!systemPrompt) return undefined;\n\tconst marker = \"The following skills provide specialized instructions for specific tasks.\";\n\tconst start = systemPrompt.indexOf(marker);\n\tconst end = start === -1 ? -1 : systemPrompt.indexOf(\"</available_skills>\", start);\n\tif (end === -1) return undefined;\n\treturn rewriteSkillsLocations(systemPrompt.slice(start, end + \"</available_skills>\".length).trim(), cwd);\n}\n\n/**\n * This lane rebuilds the prompt from the `claude_code` preset plus `append`, so any\n * region of senpi's composed prompt without an extractor here never reaches the model.\n *\n * Located by the rules builtin's opaque region sentinels rather than the model-facing\n * `<project_rules>` tags, which surrounding prompt content may legitimately contain.\n * The sentinels are a reserved wire literal but nothing neutralizes them outside the block, so\n * each candidate is structurally validated and rejected candidates are skipped - otherwise a\n * context file carrying one would shadow the real block or cross-match its end sentinel.\n * Fail-closed on a missing end sentinel: never read to end-of-string, or the sections\n * extensions append after this one get relabelled as project rules.\n */\nfunction extractProjectRulesAppend(systemPrompt: string | undefined): string | undefined {\n\tif (!systemPrompt) return undefined;\n\tlet searchFrom = 0;\n\twhile (searchFrom <= systemPrompt.length) {\n\t\tconst sentinelStart = systemPrompt.indexOf(PROJECT_RULES_REGION_START_MARKER, searchFrom);\n\t\tif (sentinelStart === -1) return undefined;\n\t\tconst regionStart = sentinelStart + PROJECT_RULES_REGION_START_MARKER.length;\n\t\tconst regionEnd = systemPrompt.indexOf(PROJECT_RULES_REGION_END_MARKER, regionStart);\n\t\tif (regionEnd === -1) return undefined;\n\t\tconst region = systemPrompt.slice(regionStart, regionEnd).trim();\n\t\tif (isProjectRulesEnvelope(region)) return region;\n\t\tsearchFrom = regionStart;\n\t}\n\treturn undefined;\n}\n\nfunction isProjectRulesEnvelope(region: string): boolean {\n\treturn (\n\t\tregion.startsWith(`${PROJECT_RULES_START_MARKER}\\n${PROJECT_RULES_HEADING}\\n`) &&\n\t\tregion.endsWith(`\\n${PROJECT_RULES_END_MARKER}`)\n\t);\n}\n\nfunction resolveSettingSources(\n\tproviderSettings: ClaudeSdkOauthProviderSettings,\n\tmode: ClaudeSdkOauthSystemPromptMode,\n\tauthLane: ClaudeSdkOauthAuthLane,\n): SettingSource[] {\n\tif (providerSettings.settingSources !== undefined) return [...providerSettings.settingSources];\n\tif (mode !== \"preset-append\" || authLane !== \"ambient\") return [];\n\treturn [\"user\", \"project\"];\n}\n\nexport function buildClaudeSdkOauthQueryOptions(input: ClaudeSdkOauthQueryOptionsInput): Options {\n\tconst cwd = input.cwd ?? process.cwd();\n\tconst providerSettings = input.providerSettings ?? loadClaudeSdkOauthProviderSettingsFromDisk(cwd);\n\tconst appendSystemPrompt = providerSettings.appendSystemPrompt !== false;\n\tconst resolvedMode = resolveSystemPromptMode(providerSettings);\n\tconst mode = resolvedMode.mode;\n\tif (input.sessionId !== undefined && input.onGuidance !== undefined) {\n\t\tconst deprecation = presetAppendDeprecationGuidance({\n\t\t\tmode,\n\t\t\tconflict: resolvedMode.conflict,\n\t\t\tsessionId: input.sessionId,\n\t\t});\n\t\tif (deprecation !== undefined) input.onGuidance(deprecation);\n\t}\n\tconst authLane = input.authLane ?? providerSettings.tokenInjection ?? \"oauth-slots\";\n\tconst append =\n\t\tmode === \"preset-append\"\n\t\t\t? [\n\t\t\t\t\textractAgentsAppend(cwd),\n\t\t\t\t\textractSkillsAppend(input.context.systemPrompt, cwd),\n\t\t\t\t\textractProjectRulesAppend(input.context.systemPrompt),\n\t\t\t\t].filter((part): part is string => part !== undefined)\n\t\t\t: [];\n\tconst systemPrompt =\n\t\tmode === \"preset-append\"\n\t\t\t? { type: \"preset\" as const, preset: \"claude_code\" as const, append: append.join(\"\\n\\n\") || undefined }\n\t\t\t: mode === \"override\"\n\t\t\t\t? loadOverrideSystemPrompt(providerSettings.systemPromptFile)\n\t\t\t\t: resolveCustomSystemPrompt(input.context.systemPrompt);\n\tconst strictMcpConfig = providerSettings.strictMcpConfig ?? !appendSystemPrompt;\n\tconst queryOptions: Options = {\n\t\tcwd,\n\t\tmodel: input.model.id,\n\t\ttools: input.tools ? [...input.tools] : [...BUILTIN_SDK_TOOLS],\n\t\tpermissionMode: \"dontAsk\",\n\t\tincludePartialMessages: true,\n\t\tcanUseTool,\n\t\thooks: HOST_TOOL_DENIAL_HOOKS,\n\t\tsystemPrompt,\n\t\tsettingSources: resolveSettingSources(providerSettings, mode, authLane),\n\t};\n\tif (input.pathToClaudeCodeExecutable) queryOptions.pathToClaudeCodeExecutable = input.pathToClaudeCodeExecutable;\n\tif (strictMcpConfig) queryOptions.extraArgs = { \"strict-mcp-config\": null };\n\n\tconst reasoning = input.streamOptions?.reasoning;\n\tif (reasoning && supportsAdaptiveThinking(input.model)) {\n\t\tqueryOptions.thinking = { type: \"adaptive\", display: \"summarized\" } satisfies ThinkingConfig;\n\t\tqueryOptions.effort = mapThinkingLevelToEffort(input.model, reasoning);\n\t} else if (reasoning) {\n\t\tqueryOptions.maxThinkingTokens = mapThinkingTokens(reasoning, input.streamOptions?.thinkingBudgets);\n\t}\n\treturn queryOptions;\n}\n"]}

package/dist/core/extensions/builtin/{claude-agent-sdk → claude-sdk-oauth}/prompt-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-bridge.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-agent-sdk/prompt-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAA6B,MAAM,uBAAuB,CAAC;AAClG,OAAO,KAAK,EAAqB,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIhD,wBAAgB,aAAa,CAC5B,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/C,MAAM,CAWR;AA2BD,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,OAAO,EAChB,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACjD,aAAa,CAAC,EAAE,MAAM,GACpB,iBAAiB,EAAE,CAgCrB;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC,cAAc,CAAC,CASlG"}
+{"version":3,"file":"prompt-bridge.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/prompt-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAA6B,MAAM,uBAAuB,CAAC;AAClG,OAAO,KAAK,EAAqB,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIhD,wBAAgB,aAAa,CAC5B,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/C,MAAM,CAWR;AA2BD,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,OAAO,EAChB,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACjD,aAAa,CAAC,EAAE,MAAM,GACpB,iBAAiB,EAAE,CA+CrB;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC,cAAc,CAAC,CASlG"}

package/dist/core/extensions/builtin/{claude-agent-sdk → claude-sdk-oauth}/prompt-bridge.js

@@ -44,32 +44,45 @@ export function buildPromptBlocks(context, customToolNameToSdk, toolWatchNote) {
     const pushText = (text) => {
         blocks.push({ type: "text", text });
     };
-    const pushPrefix = (label) => {
-        pushText(`${blocks.length ? "\n\n" : ""}${label}\n`);
-    };
-    for (const message of context.messages) {
-        if (message.role === "user") {
-            pushPrefix("USER:");
+    const finalMessage = context.messages.at(-1);
+    const finalUserMessage = finalMessage?.role === "user" ? finalMessage : undefined;
+    const history = finalUserMessage ? context.messages.slice(0, -1) : context.messages;
+    if (history.length > 0) {
+        pushText("<conversation_history>\n");
+        let hasPreviousTurn = false;
+        const pushPrefix = (label) => {
+            pushText(`${hasPreviousTurn ? "\n\n" : ""}${label}\n`);
+            hasPreviousTurn = true;
+        };
+        for (const message of history) {
+            if (message.role === "user") {
+                pushPrefix("USER:");
+                if (!appendContentBlocks(blocks, message.content))
+                    pushText("(see attached image)");
+                continue;
+            }
+            if (message.role === "assistant") {
+                pushPrefix("ASSISTANT:");
+                const text = contentToText(message.content, customToolNameToSdk);
+                if (text.length > 0)
+                    pushText(text);
+                continue;
+            }
+            pushPrefix(`TOOL RESULT (historical ${mapPiToolNameToSdk(message.toolName, customToolNameToSdk)}, id=${message.toolCallId}):`);
             if (!appendContentBlocks(blocks, message.content))
                 pushText("(see attached image)");
-            continue;
-        }
-        if (message.role === "assistant") {
-            pushPrefix("ASSISTANT:");
-            const text = contentToText(message.content, customToolNameToSdk);
-            if (text.length > 0)
-                pushText(text);
-            continue;
         }
-        pushPrefix(`TOOL RESULT (historical ${mapPiToolNameToSdk(message.toolName, customToolNameToSdk)}, id=${message.toolCallId}):`);
-        if (!appendContentBlocks(blocks, message.content))
-            pushText("(see attached image)");
+        pushText("\n</conversation_history>");
     }
     if (toolWatchNote?.trim()) {
-        pushPrefix("RECOVERED TOOL RESULTS:");
+        pushText("<recovered_tool_results>\n");
         pushText(toolWatchNote.trim());
+        pushText("\n</recovered_tool_results>");
     }
-    return blocks.length > 0 ? blocks : [{ type: "text", text: "" }];
+    pushText('The above is the conversation history so far, provided as context. Respond as the assistant to the user message below only. Never emit "USER:" or "ASSISTANT:" labels or continue the transcript.');
+    if (finalUserMessage && !appendContentBlocks(blocks, finalUserMessage.content))
+        pushText("(see attached image)");
+    return blocks;
 }
 export function buildPromptStream(promptBlocks) {
     return (async function* () {

package/dist/core/extensions/builtin/claude-sdk-oauth/prompt-bridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-bridge.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/prompt-bridge.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AssistantMessage, Context, ImageContent, TextContent } from \"@earendil-works/pi-ai\";\nimport type { Base64ImageSource, ContentBlockParam, SDKUserMessage } from \"./sdk-boundary.ts\";\nimport { mapPiToolNameToSdk } from \"./tools.ts\";\n\nexport { mapPiToolNameToSdk } from \"./tools.ts\";\n\ntype PromptContent = string | readonly (TextContent | ImageContent)[];\n\nexport function contentToText(\n\tcontent: AssistantMessage[\"content\"],\n\tcustomToolNameToSdk?: ReadonlyMap<string, string>,\n): string {\n\treturn content\n\t\t.map((block) => {\n\t\t\tif (block.type === \"text\") return block.text;\n\t\t\tif (block.type === \"thinking\") return block.thinking;\n\t\t\tif (block.type === \"toolCall\") {\n\t\t\t\treturn `Historical tool call (non-executable): ${mapPiToolNameToSdk(block.name, customToolNameToSdk)} args=${JSON.stringify(block.arguments)}`;\n\t\t\t}\n\t\t\treturn `[${block.type}]`;\n\t\t})\n\t\t.join(\"\\n\");\n}\n\nfunction appendContentBlocks(blocks: ContentBlockParam[], content: PromptContent): boolean {\n\tif (typeof content === \"string\") {\n\t\tif (content.length > 0) blocks.push({ type: \"text\", text: content });\n\t\treturn content.trim().length > 0;\n\t}\n\n\tlet hasText = false;\n\tfor (const block of content) {\n\t\tif (block.type === \"text\") {\n\t\t\tblocks.push({ type: \"text\", text: block.text });\n\t\t\thasText ||= block.text.trim().length > 0;\n\t\t} else {\n\t\t\tblocks.push({\n\t\t\t\ttype: \"image\",\n\t\t\t\tsource: {\n\t\t\t\t\ttype: \"base64\",\n\t\t\t\t\tmedia_type: block.mimeType as Base64ImageSource[\"media_type\"],\n\t\t\t\t\tdata: block.data,\n\t\t\t\t},\n\t\t\t});\n\t\t}\n\t}\n\treturn hasText;\n}\n\nexport function buildPromptBlocks(\n\tcontext: Context,\n\tcustomToolNameToSdk?: ReadonlyMap<string, string>,\n\ttoolWatchNote?: string,\n): ContentBlockParam[] {\n\tconst blocks: ContentBlockParam[] = [];\n\tconst pushText = (text: string): void => {\n\t\tblocks.push({ type: \"text\", text });\n\t};\n\tconst finalMessage = context.messages.at(-1);\n\tconst finalUserMessage = finalMessage?.role === \"user\" ? finalMessage : undefined;\n\tconst history = finalUserMessage ? context.messages.slice(0, -1) : context.messages;\n\n\tif (history.length > 0) {\n\t\tpushText(\"<conversation_history>\\n\");\n\t\tlet hasPreviousTurn = false;\n\t\tconst pushPrefix = (label: string): void => {\n\t\t\tpushText(`${hasPreviousTurn ? \"\\n\\n\" : \"\"}${label}\\n`);\n\t\t\thasPreviousTurn = true;\n\t\t};\n\n\t\tfor (const message of history) {\n\t\t\tif (message.role === \"user\") {\n\t\t\t\tpushPrefix(\"USER:\");\n\t\t\t\tif (!appendContentBlocks(blocks, message.content)) pushText(\"(see attached image)\");\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (message.role === \"assistant\") {\n\t\t\t\tpushPrefix(\"ASSISTANT:\");\n\t\t\t\tconst text = contentToText(message.content, customToolNameToSdk);\n\t\t\t\tif (text.length > 0) pushText(text);\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tpushPrefix(\n\t\t\t\t`TOOL RESULT (historical ${mapPiToolNameToSdk(message.toolName, customToolNameToSdk)}, id=${message.toolCallId}):`,\n\t\t\t);\n\t\t\tif (!appendContentBlocks(blocks, message.content)) pushText(\"(see attached image)\");\n\t\t}\n\t\tpushText(\"\\n</conversation_history>\");\n\t}\n\n\tif (toolWatchNote?.trim()) {\n\t\tpushText(\"<recovered_tool_results>\\n\");\n\t\tpushText(toolWatchNote.trim());\n\t\tpushText(\"\\n</recovered_tool_results>\");\n\t}\n\tpushText(\n\t\t'The above is the conversation history so far, provided as context. Respond as the assistant to the user message below only. Never emit \"USER:\" or \"ASSISTANT:\" labels or continue the transcript.',\n\t);\n\tif (finalUserMessage && !appendContentBlocks(blocks, finalUserMessage.content)) pushText(\"(see attached image)\");\n\treturn blocks;\n}\n\nexport function buildPromptStream(promptBlocks: ContentBlockParam[]): AsyncIterable<SDKUserMessage> {\n\treturn (async function* () {\n\t\tyield {\n\t\t\ttype: \"user\",\n\t\t\tmessage: { role: \"user\", content: promptBlocks } as SDKUserMessage[\"message\"],\n\t\t\tparent_tool_use_id: null,\n\t\t\tsession_id: \"prompt\",\n\t\t};\n\t})();\n}\n"]}

package/dist/core/extensions/builtin/{claude-agent-sdk → claude-sdk-oauth}/sdk-boundary.d.ts

@@ -6,6 +6,7 @@ export type SdkQueryInput = Parameters<typeof query>[0];
 export type SdkQueryHandle = AsyncIterable<SDKMessage> & {
     interrupt(): Promise<unknown>;
     close(): void;
+    initializationResult?: () => Promise<unknown>;
 };
 export type SdkQuery = (input: SdkQueryInput) => SdkQueryHandle;
 export type SdkBoundary = {

package/dist/core/extensions/builtin/{claude-agent-sdk → claude-sdk-oauth}/sdk-boundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-boundary.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-agent-sdk/sdk-boundary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,WAAW,EACX,OAAO,EACP,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAExF,YAAY,EACX,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,OAAO,EACP,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,GACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG;IACxD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,KAAK,IAAI,IAAI,CAAC;CACd,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,cAAc,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACzB,KAAK,EAAE,QAAQ,CAAC;IAChB,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;CAC9C,CAAC;AAEF,QAAA,MAAM,kBAAkB,EAAE,WAA2C,CAAC;AAGtE,wBAAgB,cAAc,IAAI,WAAW,CAE5C;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAExE;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;eAEc,kBAAkB"}
+{"version":3,"file":"sdk-boundary.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/sdk-boundary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,WAAW,EACX,OAAO,EACP,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAExF,YAAY,EACX,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,OAAO,EACP,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,GACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG;IACxD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,KAAK,IAAI,IAAI,CAAC;IACd,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,cAAc,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACzB,KAAK,EAAE,QAAQ,CAAC;IAChB,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;CAC9C,CAAC;AAEF,QAAA,MAAM,kBAAkB,EAAE,WAA2C,CAAC;AAGtE,wBAAgB,cAAc,IAAI,WAAW,CAE5C;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAExE;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;eAEc,kBAAkB"}

package/dist/core/extensions/builtin/{claude-agent-sdk → claude-sdk-oauth}/sdk-boundary.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-boundary.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-agent-sdk/sdk-boundary.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AA0B3E,MAAM,kBAAkB,GAAgB,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;AACtE,IAAI,iBAAiB,GAAG,kBAAkB,CAAC;AAE3C,MAAM,UAAU,cAAc;IAC7B,OAAO,iBAAiB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAA8B;IACjE,iBAAiB,GAAG,EAAE,GAAG,kBAAkB,EAAE,GAAG,QAAQ,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC/B,iBAAiB,GAAG,kBAAkB,CAAC;AACxC,CAAC;AAED,eAAe,kBAAkB,CAAC","sourcesContent":["import type {\n\tEffortLevel,\n\tOptions,\n\tSDKMessage,\n\tSDKUserMessage,\n\tSettingSource,\n\tThinkingConfig,\n} from \"@anthropic-ai/claude-agent-sdk\";\nimport { createSdkMcpServer, query } from \"@anthropic-ai/claude-agent-sdk\";\nimport type { Base64ImageSource, ContentBlockParam } from \"@anthropic-ai/sdk/resources\";\n\nexport type {\n\tBase64ImageSource,\n\tContentBlockParam,\n\tEffortLevel,\n\tOptions,\n\tSDKMessage,\n\tSDKUserMessage,\n\tSettingSource,\n\tThinkingConfig,\n};\n\nexport type SdkQueryInput = Parameters<typeof query>[0];\nexport type SdkQueryHandle = AsyncIterable<SDKMessage> & {\n\tinterrupt(): Promise<unknown>;\n\tclose(): void;\n};\nexport type SdkQuery = (input: SdkQueryInput) => SdkQueryHandle;\n\nexport type SdkBoundary = {\n\tquery: SdkQuery;\n\tcreateSdkMcpServer: typeof createSdkMcpServer;\n};\n\nconst defaultSdkBoundary: SdkBoundary = { query, createSdkMcpServer };\nlet activeSdkBoundary = defaultSdkBoundary;\n\nexport function getSdkBoundary(): SdkBoundary {\n\treturn activeSdkBoundary;\n}\n\nexport function overrideSdkBoundary(override: Partial<SdkBoundary>): void {\n\tactiveSdkBoundary = { ...defaultSdkBoundary, ...override };\n}\n\nexport function resetSdkBoundary(): void {\n\tactiveSdkBoundary = defaultSdkBoundary;\n}\n\nexport default defaultSdkBoundary;\n"]}
+{"version":3,"file":"sdk-boundary.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/sdk-boundary.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,MAAM,kBAAkB,GAAgB,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;AACtE,IAAI,iBAAiB,GAAG,kBAAkB,CAAC;AAE3C,MAAM,UAAU,cAAc;IAC7B,OAAO,iBAAiB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAA8B;IACjE,iBAAiB,GAAG,EAAE,GAAG,kBAAkB,EAAE,GAAG,QAAQ,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC/B,iBAAiB,GAAG,kBAAkB,CAAC;AACxC,CAAC;AAED,eAAe,kBAAkB,CAAC","sourcesContent":["import type {\n\tEffortLevel,\n\tOptions,\n\tSDKMessage,\n\tSDKUserMessage,\n\tSettingSource,\n\tThinkingConfig,\n} from \"@anthropic-ai/claude-agent-sdk\";\nimport { createSdkMcpServer, query } from \"@anthropic-ai/claude-agent-sdk\";\nimport type { Base64ImageSource, ContentBlockParam } from \"@anthropic-ai/sdk/resources\";\n\nexport type {\n\tBase64ImageSource,\n\tContentBlockParam,\n\tEffortLevel,\n\tOptions,\n\tSDKMessage,\n\tSDKUserMessage,\n\tSettingSource,\n\tThinkingConfig,\n};\n\nexport type SdkQueryInput = Parameters<typeof query>[0];\nexport type SdkQueryHandle = AsyncIterable<SDKMessage> & {\n\tinterrupt(): Promise<unknown>;\n\tclose(): void;\n\tinitializationResult?: () => Promise<unknown>;\n};\nexport type SdkQuery = (input: SdkQueryInput) => SdkQueryHandle;\n\nexport type SdkBoundary = {\n\tquery: SdkQuery;\n\tcreateSdkMcpServer: typeof createSdkMcpServer;\n};\n\nconst defaultSdkBoundary: SdkBoundary = { query, createSdkMcpServer };\nlet activeSdkBoundary = defaultSdkBoundary;\n\nexport function getSdkBoundary(): SdkBoundary {\n\treturn activeSdkBoundary;\n}\n\nexport function overrideSdkBoundary(override: Partial<SdkBoundary>): void {\n\tactiveSdkBoundary = { ...defaultSdkBoundary, ...override };\n}\n\nexport function resetSdkBoundary(): void {\n\tactiveSdkBoundary = defaultSdkBoundary;\n}\n\nexport default defaultSdkBoundary;\n"]}

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

@@ -0,0 +1,30 @@
+import type { SDKMessage, SDKUserMessage } from "./sdk-boundary.ts";
+import { type ClaudeSdkOauthSessionEntry, type ClaudeSdkOauthSessionRegistry } from "./session-registry.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;
+export interface SessionTurnRequest {
+    message: SDKUserMessage["message"];
+    signal?: AbortSignal;
+    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

@@ -0,0 +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"}

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

@@ -0,0 +1,197 @@
+import { Buffer } from "node:buffer";
+import { createSessionUuid, } from "./session-registry.js";
+import { transitionToIdleSynced, transitionToTurnClaimed, transitionToTurnResultSeen, transitionToTurnSent, transitionToTurnStreaming, transitionToTurnWaiting, } from "./session-registry-state.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;
+export class ConcurrentSessionTurnAdmissionError extends Error {
+    constructor(sessionId) {
+        super(`Concurrent Claude SDK OAuth turn admission for session ${sessionId}`);
+        this.code = "claude_sdk_oauth_concurrent_turn_admission";
+        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();
+    return () => clearTimeout(timer);
+}
+function removeAbortListener(turn) {
+    turn.signal?.removeEventListener("abort", turn.onAbort);
+    turn.cancelAbort?.();
+    turn.cancelAbort = undefined;
+}
+function failTurn(registry, entry, error) {
+    const turn = currentTurn(entry);
+    if (turn) {
+        removeAbortListener(turn);
+        entry.activeTurn = null;
+        turn.reject(error);
+    }
+    if (registry.isCurrentGeneration(entry.senpiSessionId, entry.generation)) {
+        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;
+}
+function finishTurn(registry, entry, turn, message) {
+    if (!resultMatchesTurn(message, turn)) {
+        throw new SessionTurnAttributionError("Claude SDK OAuth result user_message_uuid did not match the active turn");
+    }
+    if (entry.state === "TURN_CLAIMED")
+        transitionToTurnStreaming(entry);
+    if (!turn.aborted)
+        deliver(entry, turn, message);
+    transitionToTurnResultSeen(entry);
+    removeAbortListener(turn);
+    entry.activeTurn = null;
+    if (turn.aborted)
+        registry.markTainted(entry.senpiSessionId, "abort");
+    else
+        transitionToIdleSynced(entry);
+    turn.resolve({ uuid: turn.uuid, messages: turn.messages, aborted: turn.aborted });
+}
+function handleMessage(registry, entry, message) {
+    const turn = currentTurn(entry);
+    if (!turn || !registry.isCurrentGeneration(entry.senpiSessionId, turn.generation))
+        return;
+    if (!turn.claimed) {
+        if (isReplayFor(message, turn.uuid))
+            claimTurn(entry, turn);
+        else if (message.type === "stream_event")
+            bufferBeforeReplay(registry, entry, turn, message);
+        else if (message.type === "result") {
+            throw new SessionTurnAttributionError("Claude SDK OAuth result arrived before replay claim");
+        }
+        return;
+    }
+    if (message.type === "user" && "isReplay" in message && message.isReplay === true)
+        return;
+    if (message.type === "result")
+        finishTurn(registry, entry, turn, message);
+    else
+        deliver(entry, turn, message);
+}
+async function runPump(registry, entry) {
+    const iterator = entry.query[Symbol.asyncIterator]();
+    try {
+        while (true) {
+            const { value, done } = await iterator.next();
+            if (done) {
+                failTurn(registry, entry, new Error("Claude SDK OAuth query ended before the active turn completed"));
+                return;
+            }
+            handleMessage(registry, entry, value);
+        }
+    }
+    catch (error) {
+        failTurn(registry, entry, error instanceof Error ? error : new Error(String(error)));
+    }
+}
+export function submitSessionTurn(registry, entry, request, limits = {
+    maxMessages: DEFAULT_PRE_REPLAY_MAX_MESSAGES,
+    maxBytes: DEFAULT_PRE_REPLAY_MAX_BYTES,
+}) {
+    if (currentTurn(entry))
+        throw new ConcurrentSessionTurnAdmissionError(entry.senpiSessionId);
+    if (entry.state === "STARTING")
+        transitionToIdleSynced(entry);
+    transitionToTurnWaiting(entry);
+    const uuid = createSessionUuid();
+    let turn;
+    const promise = new Promise((resolve, reject) => {
+        const onAbort = () => {
+            if (turn.aborted)
+                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) => {
+                const detail = error instanceof Error ? error.message : String(error);
+                abortTurn(registry, entry, turn, new Error(`Claude SDK OAuth query interrupt failed: ${detail}`));
+            });
+        };
+        turn = {
+            uuid,
+            generation: entry.generation,
+            messages: [],
+            preReplay: [],
+            preReplayBytes: 0,
+            claimed: false,
+            aborted: false,
+            onMessage: request.onMessage,
+            signal: request.signal,
+            onAbort,
+            resolve,
+            reject,
+            limits,
+        };
+    });
+    entry.activeTurn = turn;
+    if (!entry.pumpTask)
+        entry.pumpTask = runPump(registry, entry);
+    entry.inputController.push({
+        type: "user",
+        message: request.message,
+        parent_tool_use_id: null,
+        uuid,
+        session_id: entry.sdkSessionId,
+    });
+    transitionToTurnSent(entry);
+    if (request.signal?.aborted)
+        turn.onAbort();
+    else
+        request.signal?.addEventListener("abort", turn.onAbort, { once: true });
+    return promise;
+}
+//# sourceMappingURL=session-registry-pump.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session-registry-pump.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-registry-pump.ts"],"names":[],"mappings":"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","sourcesContent":["import { Buffer } from \"node:buffer\";\nimport type { SDKMessage, SDKUserMessage } from \"./sdk-boundary.ts\";\nimport {\n\ttype ClaudeSdkOauthSessionEntry,\n\ttype ClaudeSdkOauthSessionRegistry,\n\tcreateSessionUuid,\n} from \"./session-registry.ts\";\nimport {\n\ttransitionToIdleSynced,\n\ttransitionToTurnClaimed,\n\ttransitionToTurnResultSeen,\n\ttransitionToTurnSent,\n\ttransitionToTurnStreaming,\n\ttransitionToTurnWaiting,\n} from \"./session-registry-state.ts\";\n\nexport const DEFAULT_PRE_REPLAY_MAX_MESSAGES = 64;\nexport const DEFAULT_PRE_REPLAY_MAX_BYTES = 256 * 1024;\nexport const SESSION_TURN_ABORT_GRACE_MS = 1_000;\n\nexport interface SessionTurnRequest {\n\tmessage: SDKUserMessage[\"message\"];\n\tsignal?: AbortSignal;\n\tonMessage?: (message: SDKMessage) => void;\n\tscheduleAbort?: (callback: () => void, delayMs: number) => () => void;\n}\n\nexport interface SessionTurnResult {\n\tuuid: string;\n\tmessages: SDKMessage[];\n\taborted: boolean;\n}\n\nexport interface PreReplayBufferLimits {\n\tmaxMessages: number;\n\tmaxBytes: number;\n}\n\ninterface ActiveTurn {\n\tuuid: string;\n\tgeneration: number;\n\tmessages: SDKMessage[];\n\tpreReplay: SDKMessage[];\n\tpreReplayBytes: number;\n\tclaimed: boolean;\n\taborted: boolean;\n\tonMessage?: (message: SDKMessage) => void;\n\tsignal?: AbortSignal;\n\tonAbort: () => void;\n\tcancelAbort?: () => void;\n\tresolve: (result: SessionTurnResult) => void;\n\treject: (error: Error) => void;\n\tlimits: PreReplayBufferLimits;\n}\n\nexport class ConcurrentSessionTurnAdmissionError extends Error {\n\treadonly code = \"claude_sdk_oauth_concurrent_turn_admission\";\n\n\tconstructor(sessionId: string) {\n\t\tsuper(`Concurrent Claude SDK OAuth turn admission for session ${sessionId}`);\n\t\tthis.name = \"ConcurrentSessionTurnAdmissionError\";\n\t}\n}\n\nexport class SessionTurnAttributionError extends Error {\n\treadonly code = \"claude_sdk_oauth_turn_attribution\";\n\n\tconstructor(message: string) {\n\t\tsuper(message);\n\t\tthis.name = \"SessionTurnAttributionError\";\n\t}\n}\n\nfunction currentTurn(entry: ClaudeSdkOauthSessionEntry): ActiveTurn | null {\n\treturn entry.activeTurn as ActiveTurn | null;\n}\n\nfunction isReplayFor(message: SDKMessage, uuid: string): boolean {\n\treturn message.type === \"user\" && \"isReplay\" in message && message.isReplay === true && message.uuid === uuid;\n}\n\nfunction isAutonomousResult(message: Extract<SDKMessage, { type: \"result\" }>): boolean {\n\tif (message.origin && message.origin.kind !== \"human\") return true;\n\tconst wire = message as SDKMessage & {\n\t\tparent_tool_use_id?: unknown;\n\t\tsubagent_type?: unknown;\n\t\tisSynthetic?: unknown;\n\t};\n\treturn wire.parent_tool_use_id != null || wire.subagent_type != null || wire.isSynthetic === true;\n}\n\nfunction resultMatchesTurn(message: Extract<SDKMessage, { type: \"result\" }>, turn: ActiveTurn): boolean {\n\tif (\"user_message_uuid\" in message && message.user_message_uuid !== undefined) {\n\t\treturn message.user_message_uuid === turn.uuid;\n\t}\n\treturn turn.claimed && !isAutonomousResult(message);\n}\n\nfunction deliver(entry: ClaudeSdkOauthSessionEntry, turn: ActiveTurn, message: SDKMessage): void {\n\tif (entry.state === \"TURN_CLAIMED\") transitionToTurnStreaming(entry);\n\tturn.messages.push(message);\n\tturn.onMessage?.(message);\n}\n\nfunction scheduleAbort(callback: () => void, delayMs: number): () => void {\n\tconst timer = setTimeout(callback, delayMs);\n\ttimer.unref();\n\treturn () => clearTimeout(timer);\n}\n\nfunction removeAbortListener(turn: ActiveTurn): void {\n\tturn.signal?.removeEventListener(\"abort\", turn.onAbort);\n\tturn.cancelAbort?.();\n\tturn.cancelAbort = undefined;\n}\n\nfunction failTurn(registry: ClaudeSdkOauthSessionRegistry, entry: ClaudeSdkOauthSessionEntry, error: Error): void {\n\tconst turn = currentTurn(entry);\n\tif (turn) {\n\t\tremoveAbortListener(turn);\n\t\tentry.activeTurn = null;\n\t\tturn.reject(error);\n\t}\n\tif (registry.isCurrentGeneration(entry.senpiSessionId, entry.generation)) {\n\t\tregistry.closeSession(entry.senpiSessionId, error.message);\n\t}\n}\n\nfunction abortTurn(\n\tregistry: ClaudeSdkOauthSessionRegistry,\n\tentry: ClaudeSdkOauthSessionEntry,\n\tturn: ActiveTurn,\n\terror: Error,\n): void {\n\tif (currentTurn(entry) === turn && registry.isCurrentGeneration(entry.senpiSessionId, turn.generation)) {\n\t\tfailTurn(registry, entry, error);\n\t}\n}\n\nfunction bufferBeforeReplay(\n\tregistry: ClaudeSdkOauthSessionRegistry,\n\tentry: ClaudeSdkOauthSessionEntry,\n\tturn: ActiveTurn,\n\tmessage: SDKMessage,\n): void {\n\tturn.preReplay.push(message);\n\tturn.preReplayBytes += Buffer.byteLength(JSON.stringify(message));\n\tif (turn.preReplay.length > turn.limits.maxMessages || turn.preReplayBytes > turn.limits.maxBytes) {\n\t\tthrow new SessionTurnAttributionError(\"Claude SDK OAuth pre-replay buffer overflow\");\n\t}\n\tif (!registry.isCurrentGeneration(entry.senpiSessionId, turn.generation)) turn.preReplay.length = 0;\n}\n\nfunction claimTurn(entry: ClaudeSdkOauthSessionEntry, turn: ActiveTurn): void {\n\tturn.claimed = true;\n\ttransitionToTurnClaimed(entry);\n\tfor (const buffered of turn.preReplay) deliver(entry, turn, buffered);\n\tturn.preReplay.length = 0;\n\tturn.preReplayBytes = 0;\n}\n\nfunction finishTurn(\n\tregistry: ClaudeSdkOauthSessionRegistry,\n\tentry: ClaudeSdkOauthSessionEntry,\n\tturn: ActiveTurn,\n\tmessage: Extract<SDKMessage, { type: \"result\" }>,\n): void {\n\tif (!resultMatchesTurn(message, turn)) {\n\t\tthrow new SessionTurnAttributionError(\"Claude SDK OAuth result user_message_uuid did not match the active turn\");\n\t}\n\tif (entry.state === \"TURN_CLAIMED\") transitionToTurnStreaming(entry);\n\tif (!turn.aborted) deliver(entry, turn, message);\n\ttransitionToTurnResultSeen(entry);\n\tremoveAbortListener(turn);\n\tentry.activeTurn = null;\n\tif (turn.aborted) registry.markTainted(entry.senpiSessionId, \"abort\");\n\telse transitionToIdleSynced(entry);\n\tturn.resolve({ uuid: turn.uuid, messages: turn.messages, aborted: turn.aborted });\n}\n\nfunction handleMessage(\n\tregistry: ClaudeSdkOauthSessionRegistry,\n\tentry: ClaudeSdkOauthSessionEntry,\n\tmessage: SDKMessage,\n): void {\n\tconst turn = currentTurn(entry);\n\tif (!turn || !registry.isCurrentGeneration(entry.senpiSessionId, turn.generation)) return;\n\tif (!turn.claimed) {\n\t\tif (isReplayFor(message, turn.uuid)) claimTurn(entry, turn);\n\t\telse if (message.type === \"stream_event\") bufferBeforeReplay(registry, entry, turn, message);\n\t\telse if (message.type === \"result\") {\n\t\t\tthrow new SessionTurnAttributionError(\"Claude SDK OAuth result arrived before replay claim\");\n\t\t}\n\t\treturn;\n\t}\n\tif (message.type === \"user\" && \"isReplay\" in message && message.isReplay === true) return;\n\tif (message.type === \"result\") finishTurn(registry, entry, turn, message);\n\telse deliver(entry, turn, message);\n}\n\nasync function runPump(registry: ClaudeSdkOauthSessionRegistry, entry: ClaudeSdkOauthSessionEntry): Promise<void> {\n\tconst iterator = entry.query[Symbol.asyncIterator]();\n\ttry {\n\t\twhile (true) {\n\t\t\tconst { value, done } = await iterator.next();\n\t\t\tif (done) {\n\t\t\t\tfailTurn(registry, entry, new Error(\"Claude SDK OAuth query ended before the active turn completed\"));\n\t\t\t\treturn;\n\t\t\t}\n\t\t\thandleMessage(registry, entry, value);\n\t\t}\n\t} catch (error) {\n\t\tfailTurn(registry, entry, error instanceof Error ? error : new Error(String(error)));\n\t}\n}\n\nexport function submitSessionTurn(\n\tregistry: ClaudeSdkOauthSessionRegistry,\n\tentry: ClaudeSdkOauthSessionEntry,\n\trequest: SessionTurnRequest,\n\tlimits: PreReplayBufferLimits = {\n\t\tmaxMessages: DEFAULT_PRE_REPLAY_MAX_MESSAGES,\n\t\tmaxBytes: DEFAULT_PRE_REPLAY_MAX_BYTES,\n\t},\n): Promise<SessionTurnResult> {\n\tif (currentTurn(entry)) throw new ConcurrentSessionTurnAdmissionError(entry.senpiSessionId);\n\tif (entry.state === \"STARTING\") transitionToIdleSynced(entry);\n\ttransitionToTurnWaiting(entry);\n\tconst uuid = createSessionUuid();\n\tlet turn!: ActiveTurn;\n\tconst promise = new Promise<SessionTurnResult>((resolve, reject) => {\n\t\tconst onAbort = (): void => {\n\t\t\tif (turn.aborted) return;\n\t\t\tturn.aborted = true;\n\t\t\tturn.cancelAbort = (request.scheduleAbort ?? scheduleAbort)(\n\t\t\t\t() => abortTurn(registry, entry, turn, new Error(\"Claude SDK OAuth interrupted turn did not terminate\")),\n\t\t\t\tSESSION_TURN_ABORT_GRACE_MS,\n\t\t\t);\n\t\t\tvoid entry.query.interrupt().catch((error: unknown) => {\n\t\t\t\tconst detail = error instanceof Error ? error.message : String(error);\n\t\t\t\tabortTurn(registry, entry, turn, new Error(`Claude SDK OAuth query interrupt failed: ${detail}`));\n\t\t\t});\n\t\t};\n\t\tturn = {\n\t\t\tuuid,\n\t\t\tgeneration: entry.generation,\n\t\t\tmessages: [],\n\t\t\tpreReplay: [],\n\t\t\tpreReplayBytes: 0,\n\t\t\tclaimed: false,\n\t\t\taborted: false,\n\t\t\tonMessage: request.onMessage,\n\t\t\tsignal: request.signal,\n\t\t\tonAbort,\n\t\t\tresolve,\n\t\t\treject,\n\t\t\tlimits,\n\t\t};\n\t});\n\tentry.activeTurn = turn;\n\tif (!entry.pumpTask) entry.pumpTask = runPump(registry, entry);\n\tentry.inputController.push({\n\t\ttype: \"user\",\n\t\tmessage: request.message,\n\t\tparent_tool_use_id: null,\n\t\tuuid,\n\t\tsession_id: entry.sdkSessionId,\n\t});\n\ttransitionToTurnSent(entry);\n\tif (request.signal?.aborted) turn.onAbort();\n\telse request.signal?.addEventListener(\"abort\", turn.onAbort, { once: true });\n\treturn promise;\n}\n"]}

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

@@ -0,0 +1,18 @@
+export type ClaudeSdkOauthSessionState = "ABSENT" | "STARTING" | "IDLE_SYNCED" | "TURN_WAITING" | "TURN_SENT" | "TURN_CLAIMED" | "TURN_STREAMING" | "TURN_RESULT_SEEN" | "TAINTED" | "CLOSING" | "CLOSED" | "BROKEN";
+type StatefulSession = {
+    state: ClaudeSdkOauthSessionState;
+};
+export declare function transitionSessionState<T extends StatefulSession>(entry: T, next: ClaudeSdkOauthSessionState): T;
+export declare const transitionToStarting: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToIdleSynced: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToTurnWaiting: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToTurnSent: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToTurnClaimed: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToTurnStreaming: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToTurnResultSeen: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToTainted: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToClosing: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToClosed: <T extends StatefulSession>(entry: T) => T;
+export declare const transitionToBroken: <T extends StatefulSession>(entry: T) => T;
+export {};
+//# sourceMappingURL=session-registry-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session-registry-state.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/claude-sdk-oauth/session-registry-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GACnC,QAAQ,GACR,UAAU,GACV,aAAa,GACb,cAAc,GACd,WAAW,GACX,cAAc,GACd,gBAAgB,GAChB,kBAAkB,GAClB,SAAS,GACT,SAAS,GACT,QAAQ,GACR,QAAQ,CAAC;AAEZ,KAAK,eAAe,GAAG;IAAE,KAAK,EAAE,0BAA0B,CAAA;CAAE,CAAC;AAiB7D,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,0BAA0B,GAAG,CAAC,CAM/G;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CACjC,CAAC;AAC3C,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAChC,CAAC;AAC9C,eAAO,MAAM,uBAAuB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAChC,CAAC;AAC/C,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAChC,CAAC;AAC5C,eAAO,MAAM,uBAAuB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAChC,CAAC;AAC/C,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAChC,CAAC;AACjD,eAAO,MAAM,0BAA0B,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAC/B,CAAC;AACnD,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAA6C,CAAC;AACxH,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAA6C,CAAC;AACxH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAA4C,CAAC;AACtH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,eAAe,SAAS,CAAC,KAAG,CAA4C,CAAC"}

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

@@ -0,0 +1,33 @@
+const allowedTransitions = {
+    ABSENT: ["STARTING"],
+    STARTING: ["IDLE_SYNCED", "TAINTED", "CLOSING", "BROKEN"],
+    IDLE_SYNCED: ["TURN_WAITING", "TAINTED", "CLOSING", "BROKEN"],
+    TURN_WAITING: ["TURN_SENT", "TAINTED", "CLOSING", "BROKEN"],
+    TURN_SENT: ["TURN_CLAIMED", "TAINTED", "CLOSING", "BROKEN"],
+    TURN_CLAIMED: ["TURN_STREAMING", "TAINTED", "CLOSING", "BROKEN"],
+    TURN_STREAMING: ["TURN_RESULT_SEEN", "TAINTED", "CLOSING", "BROKEN"],
+    TURN_RESULT_SEEN: ["IDLE_SYNCED", "TAINTED", "CLOSING", "BROKEN"],
+    TAINTED: ["CLOSING", "BROKEN"],
+    CLOSING: ["CLOSED", "BROKEN"],
+    CLOSED: [],
+    BROKEN: ["CLOSING", "CLOSED"],
+};
+export function transitionSessionState(entry, next) {
+    if (!allowedTransitions[entry.state].includes(next)) {
+        throw new Error(`Illegal session state transition: ${entry.state} -> ${next}`);
+    }
+    entry.state = next;
+    return entry;
+}
+export const transitionToStarting = (entry) => transitionSessionState(entry, "STARTING");
+export const transitionToIdleSynced = (entry) => transitionSessionState(entry, "IDLE_SYNCED");
+export const transitionToTurnWaiting = (entry) => transitionSessionState(entry, "TURN_WAITING");
+export const transitionToTurnSent = (entry) => transitionSessionState(entry, "TURN_SENT");
+export const transitionToTurnClaimed = (entry) => transitionSessionState(entry, "TURN_CLAIMED");
+export const transitionToTurnStreaming = (entry) => transitionSessionState(entry, "TURN_STREAMING");
+export const transitionToTurnResultSeen = (entry) => transitionSessionState(entry, "TURN_RESULT_SEEN");
+export const transitionToTainted = (entry) => transitionSessionState(entry, "TAINTED");
+export const transitionToClosing = (entry) => transitionSessionState(entry, "CLOSING");
+export const transitionToClosed = (entry) => transitionSessionState(entry, "CLOSED");
+export const transitionToBroken = (entry) => transitionSessionState(entry, "BROKEN");
+//# sourceMappingURL=session-registry-state.js.map