@bastani/atomic 0.9.11-alpha.7 → 0.9.11-alpha.9

package/dist/modes/rpc/rpc-provider-auth.js

@@ -1,4 +1,4 @@
-import { getOAuthProviderMetadata, isOAuthLoginCancelled, loginOAuthProvider, normalizeOAuthLoginError, } from "../../core/oauth-provider-bridge.js";
+import { createAuthInteraction, isOAuthLoginCancelled } from "../../core/oauth-login.js";
 import { createRpcOAuthCallbacks } from "./rpc-oauth-interaction.js";
 export class RpcProviderAuth {
     constructor(inputForm, oauthTransport) {
@@ -7,40 +7,46 @@ export class RpcProviderAuth {
         this.oauthTransport = oauthTransport;
     }
     async login(session, provider, loginId = provider) {
-        const customAuth = session.modelRegistry.getCustomApiKeyAuth(provider);
-        if (!customAuth)
-            throw new Error(`Provider does not support custom API-key login: ${provider}`);
+        if (!session.modelRuntime.getProvider(provider)?.auth.apiKey)
+            throw new Error(`Provider does not support API-key login: ${provider}`);
         if (!this.inputForm)
             throw new Error("Provider login requires an interactive input host");
         const controller = this.begin(provider, loginId);
         try {
-            const credential = await customAuth.login({
+            const credential = await session.modelRuntime.login(provider, "api_key", {
                 signal: controller.signal,
                 prompt: async (prompt) => {
                     const values = await this.inputForm.open({
                         title: prompt.message,
                         heading: "PROVIDER LOGIN",
                         submitLabel: "[ Submit ]",
-                        fields: [{
-                                name: "value", type: "string", required: false, initialValue: "",
-                                placeholder: prompt.placeholder,
-                            }],
+                        fields: [
+                            {
+                                name: "value",
+                                type: "string",
+                                required: false,
+                                initialValue: "",
+                                placeholder: "placeholder" in prompt ? prompt.placeholder : undefined,
+                            },
+                        ],
                     }, controller.signal);
                     if (!values || controller.signal.aborted)
                         throw new Error("Login cancelled");
                     return values.value ?? "";
                 },
+                notify: () => { },
             });
             if (controller.signal.aborted)
                 return { provider, cancelled: true };
-            session.modelRegistry.authStorage.set(provider, credential);
-            await session.modelRegistry.refresh();
-            return { provider, cancelled: false, credential, ...this.catalog(session) };
+            if (credential.type !== "api_key")
+                throw new Error(`Provider returned an unexpected ${credential.type} credential`);
+            // The key came from the host's own input form; it is confirmed by type
+            // and never sent back down the stdout pipe.
+            return { provider, cancelled: false, type: "api_key", ...this.catalog(session) };
         }
         catch (error) {
-            if (controller.signal.aborted || (error instanceof Error && error.message === "Login cancelled")) {
+            if (controller.signal.aborted || (error instanceof Error && error.message === "Login cancelled"))
                 return { provider, cancelled: true };
-            }
             throw error;
         }
         finally {
@@ -48,17 +54,15 @@ export class RpcProviderAuth {
         }
     }
     async loginOAuth(session, provider, loginId = provider) {
-        if (!getOAuthProviderMetadata().some(({ id }) => id === provider)) {
+        if (!session.modelRuntime.getProvider(provider)?.auth.oauth)
             throw new Error(`Unknown OAuth provider: ${provider}`);
-        }
         if (!this.oauthTransport)
             throw new Error("OAuth login requires an interactive host");
         const controller = this.begin(provider, loginId);
         try {
             const callbacks = createRpcOAuthCallbacks(provider, loginId, controller.signal, this.oauthTransport);
-            let credential;
             try {
-                credential = await loginOAuthProvider(provider, callbacks);
+                await session.modelRuntime.login(provider, "oauth", createAuthInteraction(callbacks));
             }
             catch (error) {
                 if (isOAuthLoginCancelled(error, controller.signal))
@@ -67,7 +71,7 @@ export class RpcProviderAuth {
             }
             if (controller.signal.aborted)
                 return { provider, cancelled: true };
-            await this.persistOAuthAndRefresh(session, provider, credential, controller.signal);
+            session.refreshCurrentModelFromRegistry();
             return { provider, cancelled: false, ...this.catalog(session) };
         }
         finally {
@@ -75,8 +79,7 @@ export class RpcProviderAuth {
         }
     }
     async save(session, provider, credential) {
-        await session.modelRegistry.authStorage.asCredentialStore().modify(provider, async () => credential);
-        await session.modelRegistry.refresh();
+        await session.modelRuntime.saveCredential(provider, credential);
         session.refreshCurrentModelFromRegistry();
         return this.catalog(session);
     }
@@ -87,15 +90,13 @@ export class RpcProviderAuth {
                 active.controller.abort();
             return;
         }
-        for (const active of this.controllers.values()) {
+        for (const active of this.controllers.values())
             if (active.provider === provider)
                 active.controller.abort();
-        }
     }
     begin(provider, loginId) {
-        if ([...this.controllers.values()].some((active) => active.provider === provider)) {
+        if ([...this.controllers.values()].some((active) => active.provider === provider))
             throw new Error(`Login already in progress: ${provider}`);
-        }
         const controller = new AbortController();
         this.controllers.set(loginId, { provider, controller });
         return controller;
@@ -104,41 +105,12 @@ export class RpcProviderAuth {
         if (this.controllers.get(loginId)?.controller === controller)
             this.controllers.delete(loginId);
     }
-    async persistOAuthAndRefresh(session, provider, credential, signal) {
-        const storage = session.modelRegistry.authStorage;
-        const previous = storage.get(provider);
-        const credentialStore = storage.asCredentialStore();
-        if (signal.aborted)
-            throw normalizeOAuthLoginError(signal.reason, signal);
-        await credentialStore.modify(provider, async () => credential);
-        try {
-            if (signal.aborted)
-                throw normalizeOAuthLoginError(signal.reason, signal);
-            const result = await session.modelRegistry.refresh();
-            const failures = [...result.errors.entries()];
-            if (failures.length > 0) {
-                throw new Error(failures.map(([id, error]) => `${id}: ${error.message}`).join("; "));
-            }
-            if (signal.aborted)
-                throw normalizeOAuthLoginError(signal.reason, signal);
-            if (result.aborted)
-                throw new Error("Model refresh aborted after OAuth login");
-            session.refreshCurrentModelFromRegistry();
-        }
-        catch (error) {
-            if (previous === undefined)
-                await credentialStore.delete(provider);
-            else
-                await credentialStore.modify(provider, async () => previous);
-            throw error;
-        }
-    }
     catalog(session) {
         return {
-            models: session.modelRegistry.getAvailable(),
+            models: [...session.modelRuntime.getAvailableSnapshot()],
             scopedModels: [...session.scopedModels],
-            customAuthProviders: session.modelRegistry.getCustomApiKeyAuthProviders(),
-            oauthProviders: getOAuthProviderMetadata(),
+            customAuthProviders: [],
+            oauthProviders: session.modelRuntime.getOAuthProviderMetadata(),
         };
     }
 }

package/dist/modes/rpc/rpc-provider-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-provider-auth.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-provider-auth.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentSession } from \"../../core/agent-session.ts\";\nimport type { AuthCredential } from \"../../core/auth-storage.ts\";\nimport type { HostInputFormRequest } from \"../../core/extensions/ui-types.ts\";\nimport {\n\tgetOAuthProviderMetadata,\n\tisOAuthLoginCancelled,\n\tloginOAuthProvider,\n\tnormalizeOAuthLoginError,\n} from \"../../core/oauth-provider-bridge.ts\";\nimport { createRpcOAuthCallbacks, type OAuthInteractionTransport } from \"./rpc-oauth-interaction.ts\";\nimport type { RpcLoginProviderResult, RpcModelCatalog, RpcOAuthLoginProviderResult } from \"./rpc-types.ts\";\n\nexport interface ProviderLoginInput {\n\topen(request: HostInputFormRequest, signal?: AbortSignal): Promise<Record<string, string> | undefined>;\n}\n\ninterface ActiveLogin {\n\tprovider: string;\n\tcontroller: AbortController;\n}\n\nexport class RpcProviderAuth {\n\tprivate readonly controllers = new Map<string, ActiveLogin>();\n\tprivate readonly inputForm?: ProviderLoginInput;\n\tprivate readonly oauthTransport?: OAuthInteractionTransport;\n\n\tconstructor(inputForm?: ProviderLoginInput, oauthTransport?: OAuthInteractionTransport) {\n\t\tthis.inputForm = inputForm;\n\t\tthis.oauthTransport = oauthTransport;\n\t}\n\n\tasync login(session: AgentSession, provider: string, loginId = provider): Promise<RpcLoginProviderResult> {\n\t\tconst customAuth = session.modelRegistry.getCustomApiKeyAuth(provider);\n\t\tif (!customAuth) throw new Error(`Provider does not support custom API-key login: ${provider}`);\n\t\tif (!this.inputForm) throw new Error(\"Provider login requires an interactive input host\");\n\t\tconst controller = this.begin(provider, loginId);\n\t\ttry {\n\t\t\tconst credential = await customAuth.login({\n\t\t\t\tsignal: controller.signal,\n\t\t\t\tprompt: async (prompt) => {\n\t\t\t\t\tconst values = await this.inputForm!.open({\n\t\t\t\t\t\ttitle: prompt.message,\n\t\t\t\t\t\theading: \"PROVIDER LOGIN\",\n\t\t\t\t\t\tsubmitLabel: \"[ Submit ]\",\n\t\t\t\t\t\tfields: [{\n\t\t\t\t\t\t\tname: \"value\", type: \"string\", required: false, initialValue: \"\",\n\t\t\t\t\t\t\tplaceholder: prompt.placeholder,\n\t\t\t\t\t\t}],\n\t\t\t\t\t}, controller.signal);\n\t\t\t\t\tif (!values || controller.signal.aborted) throw new Error(\"Login cancelled\");\n\t\t\t\t\treturn values.value ?? \"\";\n\t\t\t\t},\n\t\t\t});\n\t\t\tif (controller.signal.aborted) return { provider, cancelled: true };\n\t\t\tsession.modelRegistry.authStorage.set(provider, credential);\n\t\t\tawait session.modelRegistry.refresh();\n\t\t\treturn { provider, cancelled: false, credential, ...this.catalog(session) };\n\t\t} catch (error) {\n\t\t\tif (controller.signal.aborted || (error instanceof Error && error.message === \"Login cancelled\")) {\n\t\t\t\treturn { provider, cancelled: true };\n\t\t\t}\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tthis.finish(loginId, controller);\n\t\t}\n\t}\n\n\tasync loginOAuth(session: AgentSession, provider: string, loginId = provider): Promise<RpcOAuthLoginProviderResult> {\n\t\tif (!getOAuthProviderMetadata().some(({ id }) => id === provider)) {\n\t\t\tthrow new Error(`Unknown OAuth provider: ${provider}`);\n\t\t}\n\t\tif (!this.oauthTransport) throw new Error(\"OAuth login requires an interactive host\");\n\t\tconst controller = this.begin(provider, loginId);\n\t\ttry {\n\t\t\tconst callbacks = createRpcOAuthCallbacks(provider, loginId, controller.signal, this.oauthTransport);\n\t\t\tlet credential: AuthCredential;\n\t\t\ttry {\n\t\t\t\tcredential = await loginOAuthProvider(provider, callbacks);\n\t\t\t} catch (error) {\n\t\t\t\tif (isOAuthLoginCancelled(error, controller.signal)) return { provider, cancelled: true };\n\t\t\t\tthrow error;\n\t\t\t}\n\t\t\tif (controller.signal.aborted) return { provider, cancelled: true };\n\t\t\tawait this.persistOAuthAndRefresh(session, provider, credential, controller.signal);\n\t\t\treturn { provider, cancelled: false, ...this.catalog(session) };\n\t\t} finally {\n\t\t\tthis.finish(loginId, controller);\n\t\t}\n\t}\n\n\tasync save(session: AgentSession, provider: string, credential: AuthCredential): Promise<RpcModelCatalog> {\n\t\tawait session.modelRegistry.authStorage.asCredentialStore().modify(provider, async () => credential);\n\t\tawait session.modelRegistry.refresh();\n\t\tsession.refreshCurrentModelFromRegistry();\n\t\treturn this.catalog(session);\n\t}\n\n\tcancel(provider: string, loginId?: string): void {\n\t\tif (loginId !== undefined) {\n\t\t\tconst active = this.controllers.get(loginId);\n\t\t\tif (active?.provider === provider) active.controller.abort();\n\t\t\treturn;\n\t\t}\n\t\tfor (const active of this.controllers.values()) {\n\t\t\tif (active.provider === provider) active.controller.abort();\n\t\t}\n\t}\n\n\tprivate begin(provider: string, loginId: string): AbortController {\n\t\tif ([...this.controllers.values()].some((active) => active.provider === provider)) {\n\t\t\tthrow new Error(`Login already in progress: ${provider}`);\n\t\t}\n\t\tconst controller = new AbortController();\n\t\tthis.controllers.set(loginId, { provider, controller });\n\t\treturn controller;\n\t}\n\n\tprivate finish(loginId: string, controller: AbortController): void {\n\t\tif (this.controllers.get(loginId)?.controller === controller) this.controllers.delete(loginId);\n\t}\n\n\tprivate async persistOAuthAndRefresh(\n\t\tsession: AgentSession,\n\t\tprovider: string,\n\t\tcredential: AuthCredential,\n\t\tsignal: AbortSignal,\n\t): Promise<void> {\n\t\tconst storage = session.modelRegistry.authStorage;\n\t\tconst previous = storage.get(provider);\n\t\tconst credentialStore = storage.asCredentialStore();\n\t\tif (signal.aborted) throw normalizeOAuthLoginError(signal.reason, signal);\n\t\tawait credentialStore.modify(provider, async () => credential);\n\t\ttry {\n\t\t\tif (signal.aborted) throw normalizeOAuthLoginError(signal.reason, signal);\n\t\t\tconst result = await session.modelRegistry.refresh();\n\t\t\tconst failures = [...result.errors.entries()];\n\t\t\tif (failures.length > 0) {\n\t\t\t\tthrow new Error(failures.map(([id, error]) => `${id}: ${error.message}`).join(\"; \"));\n\t\t\t}\n\t\t\tif (signal.aborted) throw normalizeOAuthLoginError(signal.reason, signal);\n\t\t\tif (result.aborted) throw new Error(\"Model refresh aborted after OAuth login\");\n\t\t\tsession.refreshCurrentModelFromRegistry();\n\t\t} catch (error) {\n\t\t\tif (previous === undefined) await credentialStore.delete(provider);\n\t\t\telse await credentialStore.modify(provider, async () => previous);\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\tprivate catalog(session: AgentSession): RpcModelCatalog {\n\t\treturn {\n\t\t\tmodels: session.modelRegistry.getAvailable(),\n\t\t\tscopedModels: [...session.scopedModels],\n\t\t\tcustomAuthProviders: session.modelRegistry.getCustomApiKeyAuthProviders(),\n\t\t\toauthProviders: getOAuthProviderMetadata(),\n\t\t};\n\t}\n}\n"]}
+{"version":3,"file":"rpc-provider-auth.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-provider-auth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAkC,MAAM,4BAA4B,CAAC;AAWrG,MAAM,OAAO,eAAe;IAI3B,YAAY,SAA8B,EAAE,cAA0C;QAHrE,gBAAW,GAAG,IAAI,GAAG,EAAuB,CAAC;QAI7D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAqB,EAAE,QAAgB,EAAE,OAAO,GAAG,QAAQ;QACtE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM;YAC3D,MAAM,IAAI,KAAK,CAAC,4CAA4C,QAAQ,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE;gBACxE,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;oBACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAU,CAAC,IAAI,CACxC;wBACC,KAAK,EAAE,MAAM,CAAC,OAAO;wBACrB,OAAO,EAAE,gBAAgB;wBACzB,WAAW,EAAE,YAAY;wBACzB,MAAM,EAAE;4BACP;gCACC,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,QAAQ;gCACd,QAAQ,EAAE,KAAK;gCACf,YAAY,EAAE,EAAE;gCAChB,WAAW,EAAE,aAAa,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;6BACrE;yBACD;qBACD,EACD,UAAU,CAAC,MAAM,CACjB,CAAC;oBACF,IAAI,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;wBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;oBAC7E,OAAO,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC3B,CAAC;gBACD,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC;aAChB,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACpE,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS;gBAChC,MAAM,IAAI,KAAK,CAAC,mCAAmC,UAAU,CAAC,IAAI,aAAa,CAAC,CAAC;YAClF,uEAAuE;YACvE,4CAA4C;YAC5C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,iBAAiB,CAAC;gBAC/F,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACtC,MAAM,KAAK,CAAC;QACb,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAqB,EAAE,QAAgB,EAAE,OAAO,GAAG,QAAQ;QAC3E,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK;YAC1D,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC;YACJ,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACrG,IAAI,CAAC;gBACJ,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;YACvF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,qBAAqB,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC;oBAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;gBAC1F,MAAM,KAAK,CAAC;YACb,CAAC;YACD,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACpE,OAAO,CAAC,+BAA+B,EAAE,CAAC;YAC1C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACjE,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAqB,EAAE,QAAgB,EAAE,UAAsB;QACzE,MAAM,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChE,OAAO,CAAC,+BAA+B,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,QAAgB,EAAE,OAAgB;QACxC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,MAAM,EAAE,QAAQ,KAAK,QAAQ;gBAAE,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC7D,OAAO;QACR,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YAAE,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ;gBAAE,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC7G,CAAC;IACO,KAAK,CAAC,QAAgB,EAAE,OAAe;QAC9C,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC;YAChF,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QACxD,OAAO,UAAU,CAAC;IACnB,CAAC;IACO,MAAM,CAAC,OAAe,EAAE,UAA2B;QAC1D,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,KAAK,UAAU;YAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChG,CAAC;IACO,OAAO,CAAC,OAAqB;QACpC,OAAO;YACN,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;YACxD,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;YACvC,mBAAmB,EAAE,EAAE;YACvB,cAAc,EAAE,OAAO,CAAC,YAAY,CAAC,wBAAwB,EAAE;SAC/D,CAAC;IACH,CAAC;CACD","sourcesContent":["import type { Credential } from \"@earendil-works/pi-ai\";\nimport type { AgentSession } from \"../../core/agent-session.ts\";\nimport type { HostInputFormRequest } from \"../../core/extensions/ui-types.ts\";\nimport { createAuthInteraction, isOAuthLoginCancelled } from \"../../core/oauth-login.ts\";\nimport { createRpcOAuthCallbacks, type OAuthInteractionTransport } from \"./rpc-oauth-interaction.ts\";\nimport type { RpcLoginProviderResult, RpcModelCatalog, RpcOAuthLoginProviderResult } from \"./rpc-types.ts\";\n\nexport interface ProviderLoginInput {\n\topen(request: HostInputFormRequest, signal?: AbortSignal): Promise<Record<string, string> | undefined>;\n}\ninterface ActiveLogin {\n\tprovider: string;\n\tcontroller: AbortController;\n}\n\nexport class RpcProviderAuth {\n\tprivate readonly controllers = new Map<string, ActiveLogin>();\n\tprivate readonly inputForm: ProviderLoginInput | undefined;\n\tprivate readonly oauthTransport: OAuthInteractionTransport | undefined;\n\tconstructor(inputForm?: ProviderLoginInput, oauthTransport?: OAuthInteractionTransport) {\n\t\tthis.inputForm = inputForm;\n\t\tthis.oauthTransport = oauthTransport;\n\t}\n\n\tasync login(session: AgentSession, provider: string, loginId = provider): Promise<RpcLoginProviderResult> {\n\t\tif (!session.modelRuntime.getProvider(provider)?.auth.apiKey)\n\t\t\tthrow new Error(`Provider does not support API-key login: ${provider}`);\n\t\tif (!this.inputForm) throw new Error(\"Provider login requires an interactive input host\");\n\t\tconst controller = this.begin(provider, loginId);\n\t\ttry {\n\t\t\tconst credential = await session.modelRuntime.login(provider, \"api_key\", {\n\t\t\t\tsignal: controller.signal,\n\t\t\t\tprompt: async (prompt) => {\n\t\t\t\t\tconst values = await this.inputForm!.open(\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttitle: prompt.message,\n\t\t\t\t\t\t\theading: \"PROVIDER LOGIN\",\n\t\t\t\t\t\t\tsubmitLabel: \"[ Submit ]\",\n\t\t\t\t\t\t\tfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tname: \"value\",\n\t\t\t\t\t\t\t\t\ttype: \"string\",\n\t\t\t\t\t\t\t\t\trequired: false,\n\t\t\t\t\t\t\t\t\tinitialValue: \"\",\n\t\t\t\t\t\t\t\t\tplaceholder: \"placeholder\" in prompt ? prompt.placeholder : undefined,\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t],\n\t\t\t\t\t\t},\n\t\t\t\t\t\tcontroller.signal,\n\t\t\t\t\t);\n\t\t\t\t\tif (!values || controller.signal.aborted) throw new Error(\"Login cancelled\");\n\t\t\t\t\treturn values.value ?? \"\";\n\t\t\t\t},\n\t\t\t\tnotify: () => {},\n\t\t\t});\n\t\t\tif (controller.signal.aborted) return { provider, cancelled: true };\n\t\t\tif (credential.type !== \"api_key\")\n\t\t\t\tthrow new Error(`Provider returned an unexpected ${credential.type} credential`);\n\t\t\t// The key came from the host's own input form; it is confirmed by type\n\t\t\t// and never sent back down the stdout pipe.\n\t\t\treturn { provider, cancelled: false, type: \"api_key\", ...this.catalog(session) };\n\t\t} catch (error) {\n\t\t\tif (controller.signal.aborted || (error instanceof Error && error.message === \"Login cancelled\"))\n\t\t\t\treturn { provider, cancelled: true };\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tthis.finish(loginId, controller);\n\t\t}\n\t}\n\n\tasync loginOAuth(session: AgentSession, provider: string, loginId = provider): Promise<RpcOAuthLoginProviderResult> {\n\t\tif (!session.modelRuntime.getProvider(provider)?.auth.oauth)\n\t\t\tthrow new Error(`Unknown OAuth provider: ${provider}`);\n\t\tif (!this.oauthTransport) throw new Error(\"OAuth login requires an interactive host\");\n\t\tconst controller = this.begin(provider, loginId);\n\t\ttry {\n\t\t\tconst callbacks = createRpcOAuthCallbacks(provider, loginId, controller.signal, this.oauthTransport);\n\t\t\ttry {\n\t\t\t\tawait session.modelRuntime.login(provider, \"oauth\", createAuthInteraction(callbacks));\n\t\t\t} catch (error) {\n\t\t\t\tif (isOAuthLoginCancelled(error, controller.signal)) return { provider, cancelled: true };\n\t\t\t\tthrow error;\n\t\t\t}\n\t\t\tif (controller.signal.aborted) return { provider, cancelled: true };\n\t\t\tsession.refreshCurrentModelFromRegistry();\n\t\t\treturn { provider, cancelled: false, ...this.catalog(session) };\n\t\t} finally {\n\t\t\tthis.finish(loginId, controller);\n\t\t}\n\t}\n\n\tasync save(session: AgentSession, provider: string, credential: Credential): Promise<RpcModelCatalog> {\n\t\tawait session.modelRuntime.saveCredential(provider, credential);\n\t\tsession.refreshCurrentModelFromRegistry();\n\t\treturn this.catalog(session);\n\t}\n\tcancel(provider: string, loginId?: string): void {\n\t\tif (loginId !== undefined) {\n\t\t\tconst active = this.controllers.get(loginId);\n\t\t\tif (active?.provider === provider) active.controller.abort();\n\t\t\treturn;\n\t\t}\n\t\tfor (const active of this.controllers.values()) if (active.provider === provider) active.controller.abort();\n\t}\n\tprivate begin(provider: string, loginId: string): AbortController {\n\t\tif ([...this.controllers.values()].some((active) => active.provider === provider))\n\t\t\tthrow new Error(`Login already in progress: ${provider}`);\n\t\tconst controller = new AbortController();\n\t\tthis.controllers.set(loginId, { provider, controller });\n\t\treturn controller;\n\t}\n\tprivate finish(loginId: string, controller: AbortController): void {\n\t\tif (this.controllers.get(loginId)?.controller === controller) this.controllers.delete(loginId);\n\t}\n\tprivate catalog(session: AgentSession): RpcModelCatalog {\n\t\treturn {\n\t\t\tmodels: [...session.modelRuntime.getAvailableSnapshot()],\n\t\t\tscopedModels: [...session.scopedModels],\n\t\t\tcustomAuthProviders: [],\n\t\t\toauthProviders: session.modelRuntime.getOAuthProviderMetadata(),\n\t\t};\n\t}\n}\n"]}

package/dist/modes/rpc/rpc-responses.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-responses.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-responses.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,wBAAwB,CACvC,EAAsB,EACtB,OAAU,EACV,IAAoB;IAEpB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAiB,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAiB,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EAAsB,EAAE,OAAe,EAAE,OAAe;IAC9F,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IACnD,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC","sourcesContent":["import type { RpcCommand, RpcExtensionUIRequest, RpcResponse } from \"./rpc-types.ts\";\n\nexport type RpcOutputRecord = RpcResponse | RpcExtensionUIRequest | object;\nexport type RpcOutput = (obj: RpcOutputRecord) => void;\n\nexport function createRpcSuccessResponse<T extends RpcCommand[\"type\"]>(\n\tid: string | undefined,\n\tcommand: T,\n\tdata?: object | null,\n): RpcResponse {\n\tif (data === undefined) {\n\t\treturn { id, type: \"response\", command, success: true } as RpcResponse;\n\t}\n\treturn { id, type: \"response\", command, success: true, data } as RpcResponse;\n}\n\nexport function createRpcErrorResponse(id: string | undefined, command: string, message: string): RpcResponse {\n\treturn { id, type: \"response\", command, success: false, error: message };\n}\n\nexport function formatRpcErrorMessage(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error);\n}\n\n"]}
+{"version":3,"file":"rpc-responses.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-responses.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,wBAAwB,CACvC,EAAsB,EACtB,OAAU,EACV,IAAoB;IAEpB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAiB,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAiB,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EAAsB,EAAE,OAAe,EAAE,OAAe;IAC9F,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IACnD,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC","sourcesContent":["import type { RpcCommand, RpcExtensionUIRequest, RpcResponse } from \"./rpc-types.ts\";\n\nexport type RpcOutputRecord = RpcResponse | RpcExtensionUIRequest | object;\nexport type RpcOutput = (obj: RpcOutputRecord) => void;\n\nexport function createRpcSuccessResponse<T extends RpcCommand[\"type\"]>(\n\tid: string | undefined,\n\tcommand: T,\n\tdata?: object | null,\n): RpcResponse {\n\tif (data === undefined) {\n\t\treturn { id, type: \"response\", command, success: true } as RpcResponse;\n\t}\n\treturn { id, type: \"response\", command, success: true, data } as RpcResponse;\n}\n\nexport function createRpcErrorResponse(id: string | undefined, command: string, message: string): RpcResponse {\n\treturn { id, type: \"response\", command, success: false, error: message };\n}\n\nexport function formatRpcErrorMessage(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error);\n}\n"]}

package/dist/modes/rpc/rpc-session-binding.d.ts

@@ -32,7 +32,7 @@ export declare class RpcSessionBinding {
     private readonly requestShutdown;
     private readonly reloadCoordinator;
     private footerDataProvider;
-    constructor({ runtimeHost, output, pendingExtensionRequests, requestShutdown, customUi, renderService, sessionPicker, inputForm, reloadCoordinator }: RpcSessionBindingOptions);
+    constructor({ runtimeHost, output, pendingExtensionRequests, requestShutdown, customUi, renderService, sessionPicker, inputForm, reloadCoordinator, }: RpcSessionBindingOptions);
     get currentSession(): AgentSession;
     rebindSession(): Promise<void>;
     disposeSubscriptions(): void;

package/dist/modes/rpc/rpc-session-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-session-binding.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-session-binding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAG/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AACjG,OAAO,EAA+B,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACtG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,UAAU,wBAAwB;IACjC,WAAW,EAAE,mBAAmB,CAAC;IACjC,MAAM,EAAE,SAAS,CAAC;IAClB,wBAAwB,EAAE,2BAA2B,CAAC;IACtD,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,SAAS,CAAC,EAAE,sBAAsB,CAAC;IACnC,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,4BAA4B,CAAC,YAAY,CAAC,CAAC;CAC/D;AAED,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA8B;IACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyC;IACvE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqC;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAa;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyD;IAE3F,OAAO,CAAC,kBAAkB,CAAiC;IAC3D,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,wBAAwB,EAAE,eAAe,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,iBAAiB,EAAE,EAAE,wBAAwB,EAW7K;IAED,IAAI,cAAc,IAAI,YAAY,CAEjC;IAEK,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA2EnC;IAED,oBAAoB,IAAI,IAAI,CAO3B;CACD"}
+{"version":3,"file":"rpc-session-binding.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-session-binding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAG/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AACjG,OAAO,EAA+B,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACtG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,UAAU,wBAAwB;IACjC,WAAW,EAAE,mBAAmB,CAAC;IACjC,MAAM,EAAE,SAAS,CAAC;IAClB,wBAAwB,EAAE,2BAA2B,CAAC;IACtD,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,SAAS,CAAC,EAAE,sBAAsB,CAAC;IACnC,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,4BAA4B,CAAC,YAAY,CAAC,CAAC;CAC/D;AAED,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA8B;IACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyC;IACvE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqC;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAa;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyD;IAE3F,OAAO,CAAC,kBAAkB,CAAiC;IAC3D,YAAY,EACX,WAAW,EACX,MAAM,EACN,wBAAwB,EACxB,eAAe,EACf,QAAQ,EACR,aAAa,EACb,aAAa,EACb,SAAS,EACT,iBAAiB,GACjB,EAAE,wBAAwB,EAW1B;IAED,IAAI,cAAc,IAAI,YAAY,CAEjC;IAEK,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAiFnC;IAED,oBAAoB,IAAI,IAAI,CAO3B;CACD"}

package/dist/modes/rpc/rpc-session-binding.js

@@ -2,7 +2,7 @@ import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { waitForRawStdoutBackpressure } from "../../core/output-guard.js";
 import { createRpcExtensionUIContext } from "./rpc-extension-ui.js";
 export class RpcSessionBinding {
-    constructor({ runtimeHost, output, pendingExtensionRequests, requestShutdown, customUi, renderService, sessionPicker, inputForm, reloadCoordinator }) {
+    constructor({ runtimeHost, output, pendingExtensionRequests, requestShutdown, customUi, renderService, sessionPicker, inputForm, reloadCoordinator, }) {
         this.runtimeHost = runtimeHost;
         this.output = output;
         this.pendingExtensionRequests = pendingExtensionRequests;
@@ -29,7 +29,7 @@ export class RpcSessionBinding {
         // sessions instead of defaulting to 0.
         const models = session.scopedModels.length > 0
             ? session.scopedModels.map((scoped) => scoped.model)
-            : session.modelRegistry.getAvailable();
+            : session.modelRuntime.getAvailableSnapshot();
         this.footerDataProvider.setAvailableProviderCount(new Set(models.map((model) => model.provider)).size);
         try {
             await session.bindExtensions({
@@ -74,7 +74,12 @@ export class RpcSessionBinding {
                 },
                 shutdownHandler: this.requestShutdown,
                 onError: (err) => {
-                    this.output({ type: "extension_error", extensionPath: err.extensionPath, event: err.event, error: err.error });
+                    this.output({
+                        type: "extension_error",
+                        extensionPath: err.extensionPath,
+                        event: err.event,
+                        error: err.error,
+                    });
                 },
             });
             this.footerDataProvider.startGitWatcher();

package/dist/modes/rpc/rpc-session-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-session-binding.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-session-binding.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentSession } from \"../../core/agent-session.ts\";\nimport type { AgentSessionRuntime } from \"../../core/agent-session-runtime.ts\";\nimport { FooterDataProvider } from \"../../core/footer-data-provider.ts\";\nimport { waitForRawStdoutBackpressure } from \"../../core/output-guard.ts\";\nimport type { EngineCustomUiService } from \"../interactive-engine/engine-custom-ui.ts\";\nimport type { EngineInputFormService } from \"../interactive-engine/engine-input-form.ts\";\nimport type { EngineRenderService } from \"../interactive-engine/engine-render-service.ts\";\nimport type { EngineSessionPickerService } from \"../interactive-engine/engine-session-picker.ts\";\nimport { createRpcExtensionUIContext, type RpcPendingExtensionRequests } from \"./rpc-extension-ui.ts\";\nimport type { KeybindingsReloadCoordinator } from \"./rpc-keybindings-reload.ts\";\nimport type { RpcOutput } from \"./rpc-responses.ts\";\n\ninterface RpcSessionBindingOptions {\n\truntimeHost: AgentSessionRuntime;\n\toutput: RpcOutput;\n\tpendingExtensionRequests: RpcPendingExtensionRequests;\n\tcustomUi?: EngineCustomUiService;\n\trenderService?: EngineRenderService;\n\tsessionPicker?: EngineSessionPickerService;\n\tinputForm?: EngineInputFormService;\n\trequestShutdown: () => void;\n\treloadCoordinator?: KeybindingsReloadCoordinator<AgentSession>;\n}\n\nexport class RpcSessionBinding {\n\tprivate session: AgentSession;\n\tprivate unsubscribe?: () => void;\n\tprivate unsubscribeBackpressure?: () => void;\n\tprivate readonly runtimeHost: AgentSessionRuntime;\n\tprivate readonly output: RpcOutput;\n\tprivate readonly pendingExtensionRequests: RpcPendingExtensionRequests;\n\tprivate readonly customUi: EngineCustomUiService | undefined;\n\tprivate readonly renderService: EngineRenderService | undefined;\n\tprivate readonly sessionPicker: EngineSessionPickerService | undefined;\n\tprivate readonly inputForm: EngineInputFormService | undefined;\n\tprivate readonly requestShutdown: () => void;\n\tprivate readonly reloadCoordinator: KeybindingsReloadCoordinator<AgentSession> | undefined;\n\n\tprivate footerDataProvider: FooterDataProvider | undefined;\n\tconstructor({ runtimeHost, output, pendingExtensionRequests, requestShutdown, customUi, renderService, sessionPicker, inputForm, reloadCoordinator }: RpcSessionBindingOptions) {\n\t\tthis.runtimeHost = runtimeHost;\n\t\tthis.output = output;\n\t\tthis.pendingExtensionRequests = pendingExtensionRequests;\n\t\tthis.requestShutdown = requestShutdown;\n\t\tthis.customUi = customUi;\n\t\tthis.renderService = renderService;\n\t\tthis.sessionPicker = sessionPicker;\n\t\tthis.inputForm = inputForm;\n\t\tthis.reloadCoordinator = reloadCoordinator;\n\t\tthis.session = runtimeHost.session;\n\t}\n\n\tget currentSession(): AgentSession {\n\t\treturn this.session;\n\t}\n\n\tasync rebindSession(): Promise<void> {\n\t\tthis.session = this.runtimeHost.session;\n\t\tthis.disposeSubscriptions();\n\t\tconst session = this.session;\n\t\tthis.renderService?.bindSession(session);\n\t\tthis.footerDataProvider = new FooterDataProvider(session.sessionManager.getCwd());\n\t\t// Seed the provider count from the current catalog snapshot, mirroring\n\t\t// updateProviderCountFromSnapshot() in interactive startup, so the\n\t\t// embedded footer shows the (provider) model prefix in multi-provider\n\t\t// sessions instead of defaulting to 0.\n\t\tconst models = session.scopedModels.length > 0\n\t\t\t? session.scopedModels.map((scoped) => scoped.model)\n\t\t\t: session.modelRegistry.getAvailable();\n\t\tthis.footerDataProvider.setAvailableProviderCount(new Set(models.map((model) => model.provider)).size);\n\n\t\ttry {\n\t\t\tawait session.bindExtensions({\n\t\t\t\tuiContext: createRpcExtensionUIContext({\n\t\t\t\t\toutput: this.output,\n\t\t\t\t\tpendingExtensionRequests: this.pendingExtensionRequests,\n\t\t\t\t\tcustomUi: this.customUi,\n\t\t\t\t\tsessionPicker: this.sessionPicker,\n\t\t\t\t\tinputForm: this.inputForm,\n\t\t\t\t\tfooterDataProvider: this.footerDataProvider,\n\t\t\t\t}),\n\t\t\t\tmode: this.customUi ? \"tui\" : \"rpc\",\n\t\t\t\tcommandContextActions: {\n\t\t\t\t\twaitForIdle: () => this.session.agent.waitForIdle(),\n\t\t\t\t\tnewSession: async (options) => this.runtimeHost.newSession(options),\n\t\t\t\t\tfork: async (entryId, forkOptions) => {\n\t\t\t\t\t\tconst result = await this.runtimeHost.fork(entryId, forkOptions);\n\t\t\t\t\t\treturn { cancelled: result.cancelled };\n\t\t\t\t\t},\n\t\t\t\t\tnavigateTree: async (targetId, options) => {\n\t\t\t\t\t\tconst result = await this.session.navigateTree(targetId, {\n\t\t\t\t\t\t\tsummarize: options?.summarize,\n\t\t\t\t\t\t\tcustomInstructions: options?.customInstructions,\n\t\t\t\t\t\t\treplaceInstructions: options?.replaceInstructions,\n\t\t\t\t\t\t\tlabel: options?.label,\n\t\t\t\t\t\t});\n\t\t\t\t\t\treturn { cancelled: result.cancelled };\n\t\t\t\t\t},\n\t\t\t\t\tswitchSession: async (sessionPath, options) => {\n\t\t\t\t\t\treturn this.runtimeHost.switchSession(sessionPath, options);\n\t\t\t\t\t},\n\t\t\t\t\treload: async () => {\n\t\t\t\t\t\tconst steeringMode = this.session.steeringMode;\n\t\t\t\t\t\tconst followUpMode = this.session.followUpMode;\n\t\t\t\t\t\tif (this.reloadCoordinator) await this.reloadCoordinator.reload(this.session);\n\t\t\t\t\t\telse await this.session.reload();\n\t\t\t\t\t\tthis.session.setSteeringMode(steeringMode);\n\t\t\t\t\t\tthis.session.setFollowUpMode(followUpMode);\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t\tshutdownHandler: this.requestShutdown,\n\t\t\t\tonError: (err) => {\n\t\t\t\t\tthis.output({ type: \"extension_error\", extensionPath: err.extensionPath, event: err.event, error: err.error });\n\t\t\t\t},\n\t\t\t});\n\t\t\tthis.footerDataProvider.startGitWatcher();\n\t\t} catch (error) {\n\t\t\t// Leave no partially-initialized footer state behind if extension\n\t\t\t// binding fails; dispose the provider and rethrow.\n\t\t\tthis.footerDataProvider.dispose();\n\t\t\tthis.footerDataProvider = undefined;\n\t\t\tthrow error;\n\t\t}\n\n\t\tthis.unsubscribe = session.subscribe((event) => {\n\t\t\tthis.output(event);\n\t\t});\n\t\tthis.unsubscribeBackpressure = session.agent.subscribe(async () => {\n\t\t\tawait waitForRawStdoutBackpressure();\n\t\t});\n\t\tthis.reloadCoordinator?.publishCurrentState(session);\n\t}\n\n\tdisposeSubscriptions(): void {\n\t\tthis.unsubscribe?.();\n\t\tthis.unsubscribeBackpressure?.();\n\t\tthis.footerDataProvider?.dispose();\n\t\tthis.unsubscribe = undefined;\n\t\tthis.unsubscribeBackpressure = undefined;\n\t\tthis.footerDataProvider = undefined;\n\t}\n}\n"]}
+{"version":3,"file":"rpc-session-binding.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-session-binding.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentSession } from \"../../core/agent-session.ts\";\nimport type { AgentSessionRuntime } from \"../../core/agent-session-runtime.ts\";\nimport { FooterDataProvider } from \"../../core/footer-data-provider.ts\";\nimport { waitForRawStdoutBackpressure } from \"../../core/output-guard.ts\";\nimport type { EngineCustomUiService } from \"../interactive-engine/engine-custom-ui.ts\";\nimport type { EngineInputFormService } from \"../interactive-engine/engine-input-form.ts\";\nimport type { EngineRenderService } from \"../interactive-engine/engine-render-service.ts\";\nimport type { EngineSessionPickerService } from \"../interactive-engine/engine-session-picker.ts\";\nimport { createRpcExtensionUIContext, type RpcPendingExtensionRequests } from \"./rpc-extension-ui.ts\";\nimport type { KeybindingsReloadCoordinator } from \"./rpc-keybindings-reload.ts\";\nimport type { RpcOutput } from \"./rpc-responses.ts\";\n\ninterface RpcSessionBindingOptions {\n\truntimeHost: AgentSessionRuntime;\n\toutput: RpcOutput;\n\tpendingExtensionRequests: RpcPendingExtensionRequests;\n\tcustomUi?: EngineCustomUiService;\n\trenderService?: EngineRenderService;\n\tsessionPicker?: EngineSessionPickerService;\n\tinputForm?: EngineInputFormService;\n\trequestShutdown: () => void;\n\treloadCoordinator?: KeybindingsReloadCoordinator<AgentSession>;\n}\n\nexport class RpcSessionBinding {\n\tprivate session: AgentSession;\n\tprivate unsubscribe?: () => void;\n\tprivate unsubscribeBackpressure?: () => void;\n\tprivate readonly runtimeHost: AgentSessionRuntime;\n\tprivate readonly output: RpcOutput;\n\tprivate readonly pendingExtensionRequests: RpcPendingExtensionRequests;\n\tprivate readonly customUi: EngineCustomUiService | undefined;\n\tprivate readonly renderService: EngineRenderService | undefined;\n\tprivate readonly sessionPicker: EngineSessionPickerService | undefined;\n\tprivate readonly inputForm: EngineInputFormService | undefined;\n\tprivate readonly requestShutdown: () => void;\n\tprivate readonly reloadCoordinator: KeybindingsReloadCoordinator<AgentSession> | undefined;\n\n\tprivate footerDataProvider: FooterDataProvider | undefined;\n\tconstructor({\n\t\truntimeHost,\n\t\toutput,\n\t\tpendingExtensionRequests,\n\t\trequestShutdown,\n\t\tcustomUi,\n\t\trenderService,\n\t\tsessionPicker,\n\t\tinputForm,\n\t\treloadCoordinator,\n\t}: RpcSessionBindingOptions) {\n\t\tthis.runtimeHost = runtimeHost;\n\t\tthis.output = output;\n\t\tthis.pendingExtensionRequests = pendingExtensionRequests;\n\t\tthis.requestShutdown = requestShutdown;\n\t\tthis.customUi = customUi;\n\t\tthis.renderService = renderService;\n\t\tthis.sessionPicker = sessionPicker;\n\t\tthis.inputForm = inputForm;\n\t\tthis.reloadCoordinator = reloadCoordinator;\n\t\tthis.session = runtimeHost.session;\n\t}\n\n\tget currentSession(): AgentSession {\n\t\treturn this.session;\n\t}\n\n\tasync rebindSession(): Promise<void> {\n\t\tthis.session = this.runtimeHost.session;\n\t\tthis.disposeSubscriptions();\n\t\tconst session = this.session;\n\t\tthis.renderService?.bindSession(session);\n\t\tthis.footerDataProvider = new FooterDataProvider(session.sessionManager.getCwd());\n\t\t// Seed the provider count from the current catalog snapshot, mirroring\n\t\t// updateProviderCountFromSnapshot() in interactive startup, so the\n\t\t// embedded footer shows the (provider) model prefix in multi-provider\n\t\t// sessions instead of defaulting to 0.\n\t\tconst models =\n\t\t\tsession.scopedModels.length > 0\n\t\t\t\t? session.scopedModels.map((scoped) => scoped.model)\n\t\t\t\t: session.modelRuntime.getAvailableSnapshot();\n\t\tthis.footerDataProvider.setAvailableProviderCount(new Set(models.map((model) => model.provider)).size);\n\n\t\ttry {\n\t\t\tawait session.bindExtensions({\n\t\t\t\tuiContext: createRpcExtensionUIContext({\n\t\t\t\t\toutput: this.output,\n\t\t\t\t\tpendingExtensionRequests: this.pendingExtensionRequests,\n\t\t\t\t\tcustomUi: this.customUi,\n\t\t\t\t\tsessionPicker: this.sessionPicker,\n\t\t\t\t\tinputForm: this.inputForm,\n\t\t\t\t\tfooterDataProvider: this.footerDataProvider,\n\t\t\t\t}),\n\t\t\t\tmode: this.customUi ? \"tui\" : \"rpc\",\n\t\t\t\tcommandContextActions: {\n\t\t\t\t\twaitForIdle: () => this.session.agent.waitForIdle(),\n\t\t\t\t\tnewSession: async (options) => this.runtimeHost.newSession(options),\n\t\t\t\t\tfork: async (entryId, forkOptions) => {\n\t\t\t\t\t\tconst result = await this.runtimeHost.fork(entryId, forkOptions);\n\t\t\t\t\t\treturn { cancelled: result.cancelled };\n\t\t\t\t\t},\n\t\t\t\t\tnavigateTree: async (targetId, options) => {\n\t\t\t\t\t\tconst result = await this.session.navigateTree(targetId, {\n\t\t\t\t\t\t\tsummarize: options?.summarize,\n\t\t\t\t\t\t\tcustomInstructions: options?.customInstructions,\n\t\t\t\t\t\t\treplaceInstructions: options?.replaceInstructions,\n\t\t\t\t\t\t\tlabel: options?.label,\n\t\t\t\t\t\t});\n\t\t\t\t\t\treturn { cancelled: result.cancelled };\n\t\t\t\t\t},\n\t\t\t\t\tswitchSession: async (sessionPath, options) => {\n\t\t\t\t\t\treturn this.runtimeHost.switchSession(sessionPath, options);\n\t\t\t\t\t},\n\t\t\t\t\treload: async () => {\n\t\t\t\t\t\tconst steeringMode = this.session.steeringMode;\n\t\t\t\t\t\tconst followUpMode = this.session.followUpMode;\n\t\t\t\t\t\tif (this.reloadCoordinator) await this.reloadCoordinator.reload(this.session);\n\t\t\t\t\t\telse await this.session.reload();\n\t\t\t\t\t\tthis.session.setSteeringMode(steeringMode);\n\t\t\t\t\t\tthis.session.setFollowUpMode(followUpMode);\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t\tshutdownHandler: this.requestShutdown,\n\t\t\t\tonError: (err) => {\n\t\t\t\t\tthis.output({\n\t\t\t\t\t\ttype: \"extension_error\",\n\t\t\t\t\t\textensionPath: err.extensionPath,\n\t\t\t\t\t\tevent: err.event,\n\t\t\t\t\t\terror: err.error,\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t});\n\t\t\tthis.footerDataProvider.startGitWatcher();\n\t\t} catch (error) {\n\t\t\t// Leave no partially-initialized footer state behind if extension\n\t\t\t// binding fails; dispose the provider and rethrow.\n\t\t\tthis.footerDataProvider.dispose();\n\t\t\tthis.footerDataProvider = undefined;\n\t\t\tthrow error;\n\t\t}\n\n\t\tthis.unsubscribe = session.subscribe((event) => {\n\t\t\tthis.output(event);\n\t\t});\n\t\tthis.unsubscribeBackpressure = session.agent.subscribe(async () => {\n\t\t\tawait waitForRawStdoutBackpressure();\n\t\t});\n\t\tthis.reloadCoordinator?.publishCurrentState(session);\n\t}\n\n\tdisposeSubscriptions(): void {\n\t\tthis.unsubscribe?.();\n\t\tthis.unsubscribeBackpressure?.();\n\t\tthis.footerDataProvider?.dispose();\n\t\tthis.unsubscribe = undefined;\n\t\tthis.unsubscribeBackpressure = undefined;\n\t\tthis.footerDataProvider = undefined;\n\t}\n}\n"]}

package/dist/modes/rpc/rpc-terminal-drain.d.ts

@@ -0,0 +1,52 @@
+/**
+ * The bounded window between an engine generation dying and its requests being
+ * classified.
+ *
+ * Death is published to the host immediately — the TUI must not wait on a pipe
+ * — but the dead child's stdout is parsed asynchronously and may still hold the
+ * frame that says "I took this request and started running it". Failing the
+ * requests before that frame is read would report already-running work as never
+ * sent, and the host would offer the user's text back for a second run.
+ *
+ * So the generation stays in this phase until its stdout drains: its reader
+ * stays attached, its request state stays addressable, and the replacement is
+ * not started yet. The first terminal cause owns the phase, so a recovery stop
+ * cannot overwrite an exit error with `Agent process stopped`, and settlement
+ * happens exactly once. The timeout is the escape hatch for a descendant that
+ * inherited stdout and never closes it.
+ */
+export declare class RpcTerminalDrain {
+    private generation;
+    private settlement;
+    private claimed;
+    /**
+     * Record the cause that owns this generation's terminal phase, without
+     * starting the wait. An explicit stop claims before it terminates the child,
+     * so the exit it provokes does not relabel the teardown it asked for.
+     */
+    claim(generation: number, error: Error): Error;
+    /**
+     * Enter the phase for `generation`, or join the one already running.
+     *
+     * `settle` receives the claimed error — whichever cause got here first — and
+     * runs exactly once for that generation.
+     */
+    begin(generation: number, drained: Promise<void>, error: Error, settle: (error: Error) => void): Promise<void>;
+    /**
+     * Consume a frame from a generation that is in its terminal phase.
+     *
+     * Only ownership survives death: request ids never repeat, so a late
+     * admission can only ever address its own request. Every other engine frame
+     * from the dead generation is swallowed here rather than reaching host state,
+     * which would revive a PID, a heartbeat, an activity, or a mount.
+     */
+    observe(generation: number, line: string, markAccepted: (requestId: string) => void): boolean;
+    /** True while `generation` is dead but its ownership frames may still arrive. */
+    isDraining(generation: number): boolean;
+    /**
+     * Wait for `generation` to finish settling. Resolves immediately for a
+     * generation that never entered the phase, so callers need no branch.
+     */
+    settled(generation: number): Promise<void>;
+}
+//# sourceMappingURL=rpc-terminal-drain.d.ts.map

package/dist/modes/rpc/rpc-terminal-drain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-terminal-drain.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-terminal-drain.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,OAAO,CAAmD;IAElE;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAG7C;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAe7G;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAM5F;IAED,iFAAiF;IACjF,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEtC;IAED;;;OAGG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzC;CACD"}

package/dist/modes/rpc/rpc-terminal-drain.js

@@ -0,0 +1,85 @@
+import { parseInteractiveEngineMessage } from "../interactive-engine/protocol.js";
+import { EXIT_DRAIN_TIMEOUT_MS } from "./rpc-command-timeouts.js";
+/**
+ * The bounded window between an engine generation dying and its requests being
+ * classified.
+ *
+ * Death is published to the host immediately — the TUI must not wait on a pipe
+ * — but the dead child's stdout is parsed asynchronously and may still hold the
+ * frame that says "I took this request and started running it". Failing the
+ * requests before that frame is read would report already-running work as never
+ * sent, and the host would offer the user's text back for a second run.
+ *
+ * So the generation stays in this phase until its stdout drains: its reader
+ * stays attached, its request state stays addressable, and the replacement is
+ * not started yet. The first terminal cause owns the phase, so a recovery stop
+ * cannot overwrite an exit error with `Agent process stopped`, and settlement
+ * happens exactly once. The timeout is the escape hatch for a descendant that
+ * inherited stdout and never closes it.
+ */
+export class RpcTerminalDrain {
+    /**
+     * Record the cause that owns this generation's terminal phase, without
+     * starting the wait. An explicit stop claims before it terminates the child,
+     * so the exit it provokes does not relabel the teardown it asked for.
+     */
+    claim(generation, error) {
+        if (this.claimed?.generation !== generation)
+            this.claimed = { generation, error };
+        return this.claimed.error;
+    }
+    /**
+     * Enter the phase for `generation`, or join the one already running.
+     *
+     * `settle` receives the claimed error — whichever cause got here first — and
+     * runs exactly once for that generation.
+     */
+    begin(generation, drained, error, settle) {
+        const cause = this.claim(generation, error);
+        if (this.generation === generation && this.settlement)
+            return this.settlement;
+        this.generation = generation;
+        let done = false;
+        const finish = () => {
+            if (done)
+                return;
+            done = true;
+            clearTimeout(timer);
+            settle(cause);
+        };
+        const timer = setTimeout(finish, EXIT_DRAIN_TIMEOUT_MS);
+        timer.unref?.();
+        this.settlement = drained.then(finish, finish);
+        return this.settlement;
+    }
+    /**
+     * Consume a frame from a generation that is in its terminal phase.
+     *
+     * Only ownership survives death: request ids never repeat, so a late
+     * admission can only ever address its own request. Every other engine frame
+     * from the dead generation is swallowed here rather than reaching host state,
+     * which would revive a PID, a heartbeat, an activity, or a mount.
+     */
+    observe(generation, line, markAccepted) {
+        if (!this.isDraining(generation))
+            return false;
+        const message = parseInteractiveEngineMessage(line);
+        if (!message)
+            return false;
+        if (message.type === "engine_request_accepted")
+            markAccepted(message.requestId);
+        return true;
+    }
+    /** True while `generation` is dead but its ownership frames may still arrive. */
+    isDraining(generation) {
+        return this.generation === generation && this.settlement !== undefined;
+    }
+    /**
+     * Wait for `generation` to finish settling. Resolves immediately for a
+     * generation that never entered the phase, so callers need no branch.
+     */
+    settled(generation) {
+        return this.generation === generation && this.settlement ? this.settlement : Promise.resolve();
+    }
+}
+//# sourceMappingURL=rpc-terminal-drain.js.map

package/dist/modes/rpc/rpc-terminal-drain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-terminal-drain.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-terminal-drain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,gBAAgB;IAK5B;;;;OAIG;IACH,KAAK,CAAC,UAAkB,EAAE,KAAY;QACrC,IAAI,IAAI,CAAC,OAAO,EAAE,UAAU,KAAK,UAAU;YAAE,IAAI,CAAC,OAAO,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAClF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAkB,EAAE,OAAsB,EAAE,KAAY,EAAE,MAA8B;QAC7F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC,UAAU,CAAC;QAC9E,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,MAAM,MAAM,GAAG,GAAS,EAAE;YACzB,IAAI,IAAI;gBAAE,OAAO;YACjB,IAAI,GAAG,IAAI,CAAC;YACZ,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,CAAC;QACf,CAAC,CAAC;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;QACxD,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,UAAkB,EAAE,IAAY,EAAE,YAAyC;QAClF,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO,KAAK,CAAC;QAC/C,MAAM,OAAO,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3B,IAAI,OAAO,CAAC,IAAI,KAAK,yBAAyB;YAAE,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iFAAiF;IACjF,UAAU,CAAC,UAAkB;QAC5B,OAAO,IAAI,CAAC,UAAU,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC;IACxE,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,UAAkB;QACzB,OAAO,IAAI,CAAC,UAAU,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAChG,CAAC;CACD","sourcesContent":["import { parseInteractiveEngineMessage } from \"../interactive-engine/protocol.ts\";\nimport { EXIT_DRAIN_TIMEOUT_MS } from \"./rpc-command-timeouts.ts\";\n\n/**\n * The bounded window between an engine generation dying and its requests being\n * classified.\n *\n * Death is published to the host immediately — the TUI must not wait on a pipe\n * — but the dead child's stdout is parsed asynchronously and may still hold the\n * frame that says \"I took this request and started running it\". Failing the\n * requests before that frame is read would report already-running work as never\n * sent, and the host would offer the user's text back for a second run.\n *\n * So the generation stays in this phase until its stdout drains: its reader\n * stays attached, its request state stays addressable, and the replacement is\n * not started yet. The first terminal cause owns the phase, so a recovery stop\n * cannot overwrite an exit error with `Agent process stopped`, and settlement\n * happens exactly once. The timeout is the escape hatch for a descendant that\n * inherited stdout and never closes it.\n */\nexport class RpcTerminalDrain {\n\tprivate generation: number | undefined;\n\tprivate settlement: Promise<void> | undefined;\n\tprivate claimed: { generation: number; error: Error } | undefined;\n\n\t/**\n\t * Record the cause that owns this generation's terminal phase, without\n\t * starting the wait. An explicit stop claims before it terminates the child,\n\t * so the exit it provokes does not relabel the teardown it asked for.\n\t */\n\tclaim(generation: number, error: Error): Error {\n\t\tif (this.claimed?.generation !== generation) this.claimed = { generation, error };\n\t\treturn this.claimed.error;\n\t}\n\n\t/**\n\t * Enter the phase for `generation`, or join the one already running.\n\t *\n\t * `settle` receives the claimed error — whichever cause got here first — and\n\t * runs exactly once for that generation.\n\t */\n\tbegin(generation: number, drained: Promise<void>, error: Error, settle: (error: Error) => void): Promise<void> {\n\t\tconst cause = this.claim(generation, error);\n\t\tif (this.generation === generation && this.settlement) return this.settlement;\n\t\tthis.generation = generation;\n\t\tlet done = false;\n\t\tconst finish = (): void => {\n\t\t\tif (done) return;\n\t\t\tdone = true;\n\t\t\tclearTimeout(timer);\n\t\t\tsettle(cause);\n\t\t};\n\t\tconst timer = setTimeout(finish, EXIT_DRAIN_TIMEOUT_MS);\n\t\ttimer.unref?.();\n\t\tthis.settlement = drained.then(finish, finish);\n\t\treturn this.settlement;\n\t}\n\n\t/**\n\t * Consume a frame from a generation that is in its terminal phase.\n\t *\n\t * Only ownership survives death: request ids never repeat, so a late\n\t * admission can only ever address its own request. Every other engine frame\n\t * from the dead generation is swallowed here rather than reaching host state,\n\t * which would revive a PID, a heartbeat, an activity, or a mount.\n\t */\n\tobserve(generation: number, line: string, markAccepted: (requestId: string) => void): boolean {\n\t\tif (!this.isDraining(generation)) return false;\n\t\tconst message = parseInteractiveEngineMessage(line);\n\t\tif (!message) return false;\n\t\tif (message.type === \"engine_request_accepted\") markAccepted(message.requestId);\n\t\treturn true;\n\t}\n\n\t/** True while `generation` is dead but its ownership frames may still arrive. */\n\tisDraining(generation: number): boolean {\n\t\treturn this.generation === generation && this.settlement !== undefined;\n\t}\n\n\t/**\n\t * Wait for `generation` to finish settling. Resolves immediately for a\n\t * generation that never entered the phase, so callers need no branch.\n\t */\n\tsettled(generation: number): Promise<void> {\n\t\treturn this.generation === generation && this.settlement ? this.settlement : Promise.resolve();\n\t}\n}\n"]}

package/dist/modes/rpc/rpc-transport-error.d.ts

@@ -0,0 +1,49 @@
+/**
+ * Stable marker for "the transport never accepted this frame".
+ *
+ * A submission that failed on the wire is still the user's text, so the host
+ * puts it back in the editor. Deciding that from error messages cannot work:
+ * the writer forwards whatever the stream callback produced — `write EPIPE`,
+ * `Cannot call write after a stream was destroyed`, `ERR_STREAM_WRITE_AFTER_END`
+ * — and Node documents `error.message` as free to change in any release. The
+ * transport boundary already knows the answer, so it says so here.
+ *
+ * The marker is additive on purpose. Native errors keep their identity, their
+ * `instanceof`, and their `code`/`errno`/`syscall` fields, because `RpcClient`
+ * rejections are public and callers already inspect them.
+ */
+export interface RpcTransportFailure extends Error {
+    readonly rpcFailureKind: "transport";
+}
+export declare function isRpcTransportFailure(error: unknown): error is RpcTransportFailure;
+/**
+ * Mark a failure as a transport failure, preserving the original error.
+ *
+ * Idempotent, so every boundary on the way out can call it. A value that is not
+ * an extensible `Error` — a frozen error, a thrown string — is wrapped, with the
+ * original kept as `cause` and a string `code` copied across so callers that
+ * branch on `code` still work.
+ */
+export declare function markRpcTransportFailure(error: unknown): RpcTransportFailure;
+/** Build an already-classified transport failure. */
+export declare function rpcTransportError(message: string): RpcTransportFailure;
+/**
+ * A transport failure for a request the child had already taken ownership of.
+ *
+ * The frame reached the engine and its handler started, so side effects may
+ * already have happened: the submission is no longer the user's to retype, and
+ * restoring it would invite a duplicate run.
+ */
+export interface RpcAcceptedRequestFailure extends RpcTransportFailure {
+    readonly rpcRequestAccepted: true;
+}
+export declare function isRpcRequestAcceptedFailure(error: unknown): error is RpcAcceptedRequestFailure;
+/**
+ * Per-request copy of a transport failure, marked as accepted.
+ *
+ * A copy rather than a mutation: one engine exit rejects every pending request
+ * at once and only some of them were accepted. Native `code`, `errno`, and
+ * `syscall` are carried over and the original is kept as `cause`.
+ */
+export declare function asAcceptedRequestFailure(error: Error): RpcAcceptedRequestFailure;
+//# sourceMappingURL=rpc-transport-error.d.ts.map

package/dist/modes/rpc/rpc-transport-error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-transport-error.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-transport-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,MAAM,WAAW,mBAAoB,SAAQ,KAAK;IACjD,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC;CACrC;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAgB3E;AAED,qDAAqD;AACrD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAEtE;AAID;;;;;;GAMG;AACH,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACrE,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAC;CAClC;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,yBAAyB,CAE9F;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,KAAK,GAAG,yBAAyB,CAchF"}

package/dist/modes/rpc/rpc-transport-error.js

@@ -0,0 +1,78 @@
+/**
+ * Stable marker for "the transport never accepted this frame".
+ *
+ * A submission that failed on the wire is still the user's text, so the host
+ * puts it back in the editor. Deciding that from error messages cannot work:
+ * the writer forwards whatever the stream callback produced — `write EPIPE`,
+ * `Cannot call write after a stream was destroyed`, `ERR_STREAM_WRITE_AFTER_END`
+ * — and Node documents `error.message` as free to change in any release. The
+ * transport boundary already knows the answer, so it says so here.
+ *
+ * The marker is additive on purpose. Native errors keep their identity, their
+ * `instanceof`, and their `code`/`errno`/`syscall` fields, because `RpcClient`
+ * rejections are public and callers already inspect them.
+ */
+const RPC_TRANSPORT_FAILURE = "rpcFailureKind";
+export function isRpcTransportFailure(error) {
+    return error instanceof Error && error.rpcFailureKind === "transport";
+}
+/**
+ * Mark a failure as a transport failure, preserving the original error.
+ *
+ * Idempotent, so every boundary on the way out can call it. A value that is not
+ * an extensible `Error` — a frozen error, a thrown string — is wrapped, with the
+ * original kept as `cause` and a string `code` copied across so callers that
+ * branch on `code` still work.
+ */
+export function markRpcTransportFailure(error) {
+    if (isRpcTransportFailure(error))
+        return error;
+    if (error instanceof Error && Object.isExtensible(error)) {
+        Object.defineProperty(error, RPC_TRANSPORT_FAILURE, {
+            value: "transport",
+            enumerable: false,
+            configurable: true,
+            writable: false,
+        });
+        return error;
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    const wrapper = new Error(message, { cause: error });
+    const code = error?.code;
+    if (typeof code === "string")
+        Object.assign(wrapper, { code });
+    return markRpcTransportFailure(wrapper);
+}
+/** Build an already-classified transport failure. */
+export function rpcTransportError(message) {
+    return markRpcTransportFailure(new Error(message));
+}
+const RPC_REQUEST_ACCEPTED = "rpcRequestAccepted";
+export function isRpcRequestAcceptedFailure(error) {
+    return isRpcTransportFailure(error) && error.rpcRequestAccepted === true;
+}
+/**
+ * Per-request copy of a transport failure, marked as accepted.
+ *
+ * A copy rather than a mutation: one engine exit rejects every pending request
+ * at once and only some of them were accepted. Native `code`, `errno`, and
+ * `syscall` are carried over and the original is kept as `cause`.
+ */
+export function asAcceptedRequestFailure(error) {
+    if (isRpcRequestAcceptedFailure(error))
+        return error;
+    const copy = markRpcTransportFailure(new Error(error.message, { cause: error }));
+    for (const field of ["code", "errno", "syscall"]) {
+        const value = error[field];
+        if (value !== undefined)
+            Object.assign(copy, { [field]: value });
+    }
+    Object.defineProperty(copy, RPC_REQUEST_ACCEPTED, {
+        value: true,
+        enumerable: false,
+        configurable: true,
+        writable: false,
+    });
+    return copy;
+}
+//# sourceMappingURL=rpc-transport-error.js.map