@qduc/term2 0.24.1 → 0.26.0

package/dist/services/mcp/test-fixtures/fake-authorization-server.js

@@ -0,0 +1,147 @@
+import crypto from 'node:crypto';
+import { createServer } from 'node:http';
+function listen(server) {
+    return new Promise((resolve, reject) => {
+        server.once('error', reject);
+        server.listen(0, '127.0.0.1', () => {
+            server.off('error', reject);
+            resolve(server.address().port);
+        });
+    });
+}
+async function readBody(req) {
+    const chunks = [];
+    for await (const chunk of req)
+        chunks.push(Buffer.from(chunk));
+    return Buffer.concat(chunks).toString('utf8');
+}
+function sendJson(res, status, body) {
+    const payload = JSON.stringify(body);
+    res.writeHead(status, { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(payload) });
+    res.end(payload);
+}
+function sendError(res, status, error, description) {
+    sendJson(res, status, { error, error_description: description });
+}
+const s256 = (verifier) => crypto.createHash('sha256').update(verifier).digest('base64url');
+export async function startFakeAuthorizationServer() {
+    const codes = new Map();
+    const knownRefreshTokens = new Set();
+    const state = {
+        issuer: '',
+        issuedAccessTokens: [],
+        refreshGrants: [],
+        registeredClientIds: [],
+        refusedTokenRequests: 0,
+        stop: () => new Promise((resolve) => server.close(() => resolve())),
+    };
+    const issueTokens = () => {
+        const accessToken = `at-${crypto.randomUUID()}`;
+        const refreshToken = `rt-${crypto.randomUUID()}`;
+        state.issuedAccessTokens.push(accessToken);
+        knownRefreshTokens.add(refreshToken);
+        return { access_token: accessToken, refresh_token: refreshToken, token_type: 'Bearer', expires_in: 3600 };
+    };
+    const handleAuthorize = (url, res) => {
+        const redirectUri = url.searchParams.get('redirect_uri');
+        const codeChallenge = url.searchParams.get('code_challenge');
+        const clientId = url.searchParams.get('client_id');
+        if (url.searchParams.get('response_type') !== 'code') {
+            return sendError(res, 400, 'unsupported_response_type', 'only the code response type is supported');
+        }
+        if (url.searchParams.get('code_challenge_method') !== 'S256') {
+            return sendError(res, 400, 'invalid_request', 'code_challenge_method must be S256');
+        }
+        if (!codeChallenge || !redirectUri || !clientId) {
+            return sendError(res, 400, 'invalid_request', 'client_id, redirect_uri and code_challenge are required');
+        }
+        const code = `code-${crypto.randomUUID()}`;
+        codes.set(code, { clientId, redirectUri, codeChallenge });
+        const location = new URL(redirectUri);
+        location.searchParams.set('code', code);
+        const clientState = url.searchParams.get('state');
+        if (clientState)
+            location.searchParams.set('state', clientState);
+        // The user is never asked to consent: this server approves every request.
+        res.writeHead(302, { Location: location.href });
+        res.end();
+    };
+    const handleToken = async (req, res) => {
+        const params = new URLSearchParams(await readBody(req));
+        const grantType = params.get('grant_type');
+        if (grantType === 'authorization_code') {
+            const code = params.get('code') ?? '';
+            const pending = codes.get(code);
+            // Single use: a replayed code must not mint a second token set.
+            codes.delete(code);
+            const verifier = params.get('code_verifier') ?? '';
+            if (!pending)
+                return refuse(res, 'unknown or already-used authorization code');
+            if (pending.redirectUri !== params.get('redirect_uri'))
+                return refuse(res, 'redirect_uri does not match');
+            if (pending.clientId !== params.get('client_id'))
+                return refuse(res, 'client_id does not match');
+            if (pending.codeChallenge !== s256(verifier)) {
+                return refuse(res, 'code_verifier does not match the S256 challenge');
+            }
+            return sendJson(res, 200, issueTokens());
+        }
+        if (grantType === 'refresh_token') {
+            const presented = params.get('refresh_token') ?? '';
+            if (!knownRefreshTokens.has(presented))
+                return refuse(res, 'unknown refresh token');
+            state.refreshGrants.push(presented);
+            // Rotation: the presented refresh token is spent by this grant.
+            knownRefreshTokens.delete(presented);
+            return sendJson(res, 200, issueTokens());
+        }
+        return sendError(res, 400, 'unsupported_grant_type', `unsupported grant_type: ${grantType ?? '(missing)'}`);
+    };
+    const refuse = (res, reason) => {
+        state.refusedTokenRequests += 1;
+        sendError(res, 400, 'invalid_grant', reason);
+    };
+    const server = createServer(async (req, res) => {
+        const url = new URL(req.url ?? '/', state.issuer || 'http://127.0.0.1');
+        try {
+            if (req.method === 'GET' && url.pathname === '/.well-known/oauth-authorization-server') {
+                return sendJson(res, 200, {
+                    issuer: state.issuer,
+                    authorization_endpoint: `${state.issuer}/authorize`,
+                    token_endpoint: `${state.issuer}/token`,
+                    registration_endpoint: `${state.issuer}/register`,
+                    response_types_supported: ['code'],
+                    grant_types_supported: ['authorization_code', 'refresh_token'],
+                    code_challenge_methods_supported: ['S256'],
+                    token_endpoint_auth_methods_supported: ['none'],
+                    scopes_supported: ['mcp'],
+                });
+            }
+            if (req.method === 'GET' && url.pathname === '/authorize')
+                return handleAuthorize(url, res);
+            if (req.method === 'POST' && url.pathname === '/token')
+                return await handleToken(req, res);
+            if (req.method === 'POST' && url.pathname === '/register') {
+                // RFC 7591: the response carries the client id plus the metadata that
+                // was registered, which the client validates against its own request.
+                const metadata = JSON.parse((await readBody(req)) || '{}');
+                const clientId = `dcr-${state.registeredClientIds.length + 1}`;
+                state.registeredClientIds.push(clientId);
+                return sendJson(res, 201, {
+                    ...metadata,
+                    client_id: clientId,
+                    token_endpoint_auth_method: 'none',
+                    client_id_issued_at: Math.floor(Date.now() / 1000),
+                });
+            }
+            sendJson(res, 404, { error: 'not_found', path: url.pathname });
+        }
+        catch (error) {
+            sendJson(res, 500, { error: 'server_error', error_description: String(error) });
+        }
+    });
+    const port = await listen(server);
+    state.issuer = `http://127.0.0.1:${port}`;
+    return state;
+}
+//# sourceMappingURL=fake-authorization-server.js.map

package/dist/services/mcp/test-fixtures/fake-authorization-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fake-authorization-server.js","sourceRoot":"","sources":["../../../../source/services/mcp/test-fixtures/fake-authorization-server.ts"],"names":[],"mappings":"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"}

package/dist/services/mcp/test-fixtures/protected-mcp-server.d.ts

@@ -0,0 +1,29 @@
+/**
+ * An MCP server that requires a bearer token and publishes RFC 9728 protected
+ * resource metadata pointing at its authorization server — the shape a client
+ * hits when it connects to an OAuth-protected remote server.
+ *
+ * Serving goes through the real v2 SDK handler, so a test that reaches a tool
+ * here has done the actual MCP handshake over Streamable HTTP.
+ */
+export type ProtectedMcpServerOptions = {
+    /** The authorization server's issuer identifier. */
+    authorizationServerUrl: string;
+    /** Returns the auth info for a token, or null when the token is not valid. */
+    verifyToken: (token: string) => Promise<{
+        clientId: string;
+        scopes: string[];
+        expiresAt: number;
+    } | null>;
+};
+export type ProtectedMcpServer = {
+    /** Base URL of the MCP endpoint. */
+    url: string;
+    /** RFC 9728 metadata URL advertised in the 401 challenge. */
+    resourceMetadataUrl: string;
+    /** Every HTTP request the fixture has seen, including refused ones. */
+    requestCount: () => number;
+    stop: () => Promise<void>;
+};
+export declare function startProtectedMcpServer(options: ProtectedMcpServerOptions): Promise<ProtectedMcpServer>;
+//# sourceMappingURL=protected-mcp-server.d.ts.map

package/dist/services/mcp/test-fixtures/protected-mcp-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"protected-mcp-server.d.ts","sourceRoot":"","sources":["../../../../source/services/mcp/test-fixtures/protected-mcp-server.ts"],"names":[],"mappings":"AAYA;;;;;;;GAOG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,oDAAoD;IACpD,sBAAsB,EAAE,MAAM,CAAC;IAC/B,8EAA8E;IAC9E,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CAC3G,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oCAAoC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,6DAA6D;IAC7D,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uEAAuE;IACvE,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AA+BF,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6D7G"}

package/dist/services/mcp/test-fixtures/protected-mcp-server.js

@@ -0,0 +1,87 @@
+import { createServer } from 'node:http';
+import { McpServer, OAuthError, OAuthErrorCode, createMcpHandler, getOAuthProtectedResourceMetadataUrl, oauthMetadataResponse, requireBearerAuth, } from '@modelcontextprotocol/server';
+function listen(server) {
+    return new Promise((resolve, reject) => {
+        server.once('error', reject);
+        server.listen(0, '127.0.0.1', () => {
+            server.off('error', reject);
+            resolve(server.address().port);
+        });
+    });
+}
+async function toResponse(res, response) {
+    res.writeHead(response.status, Object.fromEntries(response.headers));
+    if (response.body) {
+        for await (const chunk of response.body)
+            res.write(chunk);
+    }
+    res.end();
+}
+/** Builds one `Request` and lets each gate read from it. */
+async function asRequest(req, url) {
+    const chunks = [];
+    for await (const chunk of req)
+        chunks.push(Buffer.from(chunk));
+    return new Request(url, {
+        method: req.method,
+        headers: req.headers,
+        ...(chunks.length ? { body: Buffer.concat(chunks) } : {}),
+    });
+}
+export async function startProtectedMcpServer(options) {
+    let origin = '';
+    let requests = 0;
+    const resourceUrl = () => `${origin}/mcp`;
+    const resourceMetadataUrl = () => getOAuthProtectedResourceMetadataUrl(new URL(resourceUrl()));
+    const mcp = new McpServer({ name: 'protected-fixture', version: '1.0.0' });
+    mcp.registerTool('echo', { description: 'reports that the server is reachable' }, async () => ({
+        content: [{ type: 'text', text: 'echo' }],
+    }));
+    const handler = createMcpHandler(() => mcp);
+    const verifier = {
+        verifyAccessToken: async (token) => {
+            const verified = await options.verifyToken(token);
+            if (!verified)
+                throw new OAuthError(OAuthErrorCode.InvalidToken, 'Unknown access token');
+            return { token, clientId: verified.clientId, scopes: verified.scopes, expiresAt: verified.expiresAt };
+        },
+    };
+    // Rebuilt per request because the challenge must advertise the metadata URL of
+    // the port the server actually bound, which is only known after `listen`.
+    const gate = (request) => requireBearerAuth({ verifier, resourceMetadataUrl: resourceMetadataUrl() })(request);
+    const server = createServer(async (req, res) => {
+        requests += 1;
+        const request = await asRequest(req, `http://${req.headers.host}${req.url}`);
+        // The protected-resource document is what an unauthenticated client reads to
+        // find the authorization server; it must not require a token itself.
+        const metadata = oauthMetadataResponse(request, {
+            oauthMetadata: {
+                issuer: options.authorizationServerUrl,
+                authorization_endpoint: `${options.authorizationServerUrl}/authorize`,
+                token_endpoint: `${options.authorizationServerUrl}/token`,
+                registration_endpoint: `${options.authorizationServerUrl}/register`,
+                response_types_supported: ['code'],
+                grant_types_supported: ['authorization_code', 'refresh_token'],
+                code_challenge_methods_supported: ['S256'],
+            },
+            resourceServerUrl: new URL(resourceUrl()),
+            resourceName: 'protected-fixture',
+            scopesSupported: ['mcp'],
+        });
+        if (metadata)
+            return toResponse(res, metadata);
+        const auth = await gate(request);
+        if (auth instanceof Response)
+            return toResponse(res, auth);
+        return toResponse(res, await handler.fetch(request, { authInfo: auth }));
+    });
+    const port = await listen(server);
+    origin = `http://127.0.0.1:${port}`;
+    return {
+        url: resourceUrl(),
+        resourceMetadataUrl: resourceMetadataUrl(),
+        requestCount: () => requests,
+        stop: () => new Promise((resolve) => server.close(() => resolve())),
+    };
+}
+//# sourceMappingURL=protected-mcp-server.js.map

package/dist/services/mcp/test-fixtures/protected-mcp-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"protected-mcp-server.js","sourceRoot":"","sources":["../../../../source/services/mcp/test-fixtures/protected-mcp-server.ts"],"names":[],"mappings":"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"}

package/dist/services/mcp/turn-stable-mcp-tool-source.d.ts

@@ -0,0 +1,19 @@
+import type { McpCallOptions, McpCallResult, McpServerSnapshot, McpToolSource } from './mcp-tool-source.js';
+/**
+ * Keeps the catalog used to describe an agent stable until the caller starts
+ * the next turn. Calls deliberately remain live so a server can recover while
+ * a prompt is in flight.
+ */
+export declare class TurnStableMcpToolSource implements McpToolSource {
+    private readonly live;
+    private catalog;
+    private pending;
+    private readonly unsubscribe;
+    constructor(live: McpToolSource);
+    beginTurn(): void;
+    snapshot(): readonly McpServerSnapshot[];
+    callTool(server: string, tool: string, args: Record<string, unknown>, options: McpCallOptions): Promise<McpCallResult>;
+    onCatalogChanged(listener: () => void): () => void;
+    dispose(): void;
+}
+//# sourceMappingURL=turn-stable-mcp-tool-source.d.ts.map

package/dist/services/mcp/turn-stable-mcp-tool-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-stable-mcp-tool-source.d.ts","sourceRoot":"","sources":["../../../source/services/mcp/turn-stable-mcp-tool-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE5G;;;;GAIG;AACH,qBAAa,uBAAwB,YAAW,aAAa;IAK/C,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJjC,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IAEzC,YAA6B,IAAI,EAAE,aAAa,EAK/C;IAED,SAAS,IAAI,IAAI,CAKhB;IAED,QAAQ,IAAI,SAAS,iBAAiB,EAAE,CAEvC;IAED,QAAQ,CACN,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAExB;IAED,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAEjD;IAED,OAAO,IAAI,IAAI,CAEd;CACF"}

package/dist/services/mcp/turn-stable-mcp-tool-source.js

@@ -0,0 +1,37 @@
+/**
+ * Keeps the catalog used to describe an agent stable until the caller starts
+ * the next turn. Calls deliberately remain live so a server can recover while
+ * a prompt is in flight.
+ */
+export class TurnStableMcpToolSource {
+    live;
+    catalog;
+    pending = false;
+    unsubscribe;
+    constructor(live) {
+        this.live = live;
+        this.catalog = live.snapshot();
+        this.unsubscribe = live.onCatalogChanged(() => {
+            this.pending = true;
+        });
+    }
+    beginTurn() {
+        if (this.pending) {
+            this.catalog = this.live.snapshot();
+            this.pending = false;
+        }
+    }
+    snapshot() {
+        return this.catalog;
+    }
+    callTool(server, tool, args, options) {
+        return this.live.callTool(server, tool, args, options);
+    }
+    onCatalogChanged(listener) {
+        return this.live.onCatalogChanged(listener);
+    }
+    dispose() {
+        this.unsubscribe();
+    }
+}
+//# sourceMappingURL=turn-stable-mcp-tool-source.js.map

package/dist/services/mcp/turn-stable-mcp-tool-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-stable-mcp-tool-source.js","sourceRoot":"","sources":["../../../source/services/mcp/turn-stable-mcp-tool-source.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,OAAO,uBAAuB;IAKL,IAAI;IAJzB,OAAO,CAA+B;IACtC,OAAO,GAAG,KAAK,CAAC;IACP,WAAW,CAAa;IAEzC,YAA6B,IAAmB;oBAAnB,IAAI;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE;YAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,QAAQ,CACN,MAAc,EACd,IAAY,EACZ,IAA6B,EAC7B,OAAuB;QAEvB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO;QACL,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;CACF"}

package/dist/services/mode-notices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mode-notices.d.ts","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAIhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAwB3D,qEAAqE;AACrE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;AAC5E,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAkCrE,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;AAC3E,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AA+BpE,eAAO,MAAM,sBAAsB,QAAsD,CAAC;AAC1F,eAAO,MAAM,qBAAqB,QAAqD,CAAC;AACxF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAC9F,eAAO,MAAM,uBAAuB,QAAuD,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAA8D,CAAC;AAC1G,eAAO,MAAM,6BAA6B,QAA6D,CAAC;AAExG,iFAAiF;AACjF,wBAAgB,gCAAgC,CAC9C,eAAe,EAAE,gBAAgB,EACjC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC5B,IAAI,CASN"}
+{"version":3,"file":"mode-notices.d.ts","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAIhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAwB3D,qEAAqE;AACrE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;AAC5E,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAsCrE,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;AAC3E,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAiCpE,eAAO,MAAM,sBAAsB,QAAsD,CAAC;AAC1F,eAAO,MAAM,qBAAqB,QAAqD,CAAC;AACxF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAC9F,eAAO,MAAM,uBAAuB,QAAuD,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAA8D,CAAC;AAC1G,eAAO,MAAM,6BAA6B,QAA6D,CAAC;AAExG,iFAAiF;AACjF,wBAAgB,gCAAgC,CAC9C,eAAe,EAAE,gBAAgB,EACjC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC5B,IAAI,CASN"}

package/dist/services/mode-notices.js

@@ -10,7 +10,7 @@ import { ProfileResolutionError } from './profiles/types.js';
  * The workflow body lives here, not in the instruction prefix, so a toggle
  * cannot change developer instructions on chained Responses-Lite HTTP turns.
  */
-const NOTICE_PROFILE_IDS = new Set(['builtin:plan', 'builtin:mentor', 'builtin:orchestrator']);
+const NOTICE_PROFILE_IDS = new Set(['builtin:plan', 'builtin:pair', 'builtin:mentor', 'builtin:orchestrator']);
 const resolveNoticeProfile = (profile) => {
     if (typeof profile !== 'string')
         return profile;
@@ -37,6 +37,8 @@ export function profileEnterNotice(profile) {
             'Mode to execute it.\n\n' +
             workflow +
             '\n</system-notice>');
+    if (resolved.identity.id === 'builtin:pair')
+        return ('<system-notice>\nPair Mode is ON. Follow the human-led workflow below.\n\n' + workflow + '\n</system-notice>');
     if (resolved.identity.id === 'builtin:mentor')
         return ('<system-notice>\n' +
             'Mentor Mode is ON. Work collaboratively with the configured mentor model and follow the mentor workflow below.\n\n' +
@@ -53,6 +55,8 @@ export function profileExitNotice(profile) {
     const resolved = resolveNoticeProfile(profile);
     if (!resolved)
         return null;
+    if (resolved.identity.id === 'builtin:pair')
+        return '<system-notice>\nPair Mode is now OFF. Return to the normal workflow; the Pair-specific approval and one-unit-per-turn instructions are no longer active.\n</system-notice>';
     if (resolved.identity.id === 'builtin:plan')
         return ('<system-notice>\n' +
             'Plan Mode is now ' +

package/dist/services/mode-notices.js.map

@@ -1 +1 @@
-{"version":3,"file":"mode-notices.js","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAG7D;;;;;;;;GAQG;AACH,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,CAAC,CAAC;AAE/F,MAAM,oBAAoB,GAAG,CAAC,OAAiC,EAA0B,EAAE;IACzF,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC;IAChD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,OAAwB,EAAiB,EAAE;IAC/D,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC;IAC/C,OAAO,QAAQ,EAAE,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACjE,CAAC,CAAC;AAMF,MAAM,UAAU,kBAAkB,CAAC,OAAiC;IAClE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,cAAc;QACzC,OAAO,CACL,mBAAmB;YACnB,kFAAkF;YAClF,wFAAwF;YACxF,wFAAwF;YACxF,yBAAyB;YACzB,QAAQ;YACR,oBAAoB,CACrB,CAAC;IACJ,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,gBAAgB;QAC3C,OAAO,CACL,mBAAmB;YACnB,oHAAoH;YACpH,QAAQ;YACR,oBAAoB,CACrB,CAAC;IACJ,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,sBAAsB;QACjD,OAAO,CACL,mBAAmB;YACnB,+HAA+H;YAC/H,QAAQ;YACR,oBAAoB,CACrB,CAAC;IACJ,OAAO,IAAI,CAAC;AACd,CAAC;AAMD,MAAM,UAAU,iBAAiB,CAAC,OAAiC;IACjE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,cAAc;QACzC,OAAO,CACL,mBAAmB;YACnB,mBAAmB;YACnB,qEAAqE;YACrE,0FAA0F;YAC1F,aAAa;YACb,kBAAkB,CACnB,CAAC;IACJ,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,gBAAgB;QAC3C,OAAO,CACL,mBAAmB;YACnB,kHAAkH;YAClH,kBAAkB,CACnB,CAAC;IACJ,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,sBAAsB;QACjD,OAAO,CACL,mBAAmB;YACnB,iKAAiK;YACjK,kBAAkB,CACnB,CAAC;IACJ,OAAO,IAAI,CAAC;AACd,CAAC;AAED,0EAA0E;AAC1E,6EAA6E;AAC7E,oCAAoC;AACpC,MAAM,CAAC,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAE,CAAC;AAC1F,MAAM,CAAC,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAE,CAAC;AACxF,MAAM,CAAC,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAE,CAAC;AAC9F,MAAM,CAAC,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAE,CAAC;AAC5F,MAAM,CAAC,MAAM,8BAA8B,GAAG,kBAAkB,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAE,CAAC;AAC1G,MAAM,CAAC,MAAM,6BAA6B,GAAG,iBAAiB,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAE,CAAC;AAExG,iFAAiF;AACjF,MAAM,UAAU,gCAAgC,CAC9C,eAAiC,EACjC,KAA6B;IAE7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;QACzE,IAAI,MAAM;YAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,0EAA0E;QAC1E,qEAAqE;QACrE,IAAI,CAAC,CAAC,KAAK,YAAY,sBAAsB,CAAC;YAAE,MAAM,KAAK,CAAC;IAC9D,CAAC;AACH,CAAC"}
+{"version":3,"file":"mode-notices.js","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"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"}

package/dist/services/models/decision-model-listing.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Listing of OpenRouter models served by the alpha Decisions endpoint
+ * (`output_modalities` contains `decisions`). Chat models on
+ * `/api/v1/chat/completions` are NOT valid here: the Decisions endpoint only
+ * answers typed questions about a state, so the catalog filter — not the
+ * chat-model catalog — defines what the decision model setting
+ * may be set to. The endpoint is public and needs no API key.
+ */
+export type DecisionModelInfo = {
+    id: string;
+    name?: string;
+};
+export declare function clearDecisionModelListCache(): void;
+/**
+ * Fetch the decisions-capable model list. Returns the cached list within the
+ * TTL; returns null on fetch, HTTP, or payload failure without caching the
+ * failure, so a later open of the picker retries.
+ */
+export declare function fetchDecisionModels(opts?: {
+    fetchImpl?: typeof fetch;
+    ttlMs?: number;
+    now?: () => number;
+}): Promise<DecisionModelInfo[] | null>;
+/** Whether a setting's picker is populated from the Decisions catalog. */
+export declare function isDecisionModelKey(key: string): boolean;
+//# sourceMappingURL=decision-model-listing.d.ts.map

package/dist/services/models/decision-model-listing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"decision-model-listing.d.ts","sourceRoot":"","sources":["../../../source/services/models/decision-model-listing.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAOF,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAgBD;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,CAAC,EAAE;IAC/C,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,CA2BtC;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEvD"}

package/dist/services/models/decision-model-listing.js

@@ -0,0 +1,61 @@
+import { SETTING_KEYS } from '../settings/settings-schema.js';
+const DECISION_MODELS_URL = 'https://openrouter.ai/api/v1/models?output_modalities=decisions';
+const DEFAULT_TTL_MS = 60 * 60 * 1000;
+let cache;
+export function clearDecisionModelListCache() {
+    cache = undefined;
+}
+function parseDecisionModels(payload) {
+    if (typeof payload !== 'object' || payload === null)
+        return null;
+    const data = payload.data;
+    if (!Array.isArray(data))
+        return null;
+    const models = [];
+    for (const entry of data) {
+        if (typeof entry !== 'object' || entry === null)
+            continue;
+        const { id, name } = entry;
+        if (typeof id !== 'string' || id.length === 0)
+            continue;
+        models.push({ id, ...(typeof name === 'string' && name.length > 0 ? { name } : {}) });
+    }
+    return models;
+}
+/**
+ * Fetch the decisions-capable model list. Returns the cached list within the
+ * TTL; returns null on fetch, HTTP, or payload failure without caching the
+ * failure, so a later open of the picker retries.
+ */
+export async function fetchDecisionModels(opts) {
+    const fetchImpl = opts?.fetchImpl ?? fetch;
+    const ttlMs = opts?.ttlMs ?? DEFAULT_TTL_MS;
+    const now = opts?.now ?? Date.now;
+    if (cache) {
+        const age = now() - cache.timestamp;
+        if (age >= 0 && age < ttlMs) {
+            return cache.models;
+        }
+        cache = undefined;
+    }
+    let payload;
+    try {
+        const response = await fetchImpl(DECISION_MODELS_URL);
+        if (!response.ok)
+            return null;
+        payload = await response.json();
+    }
+    catch {
+        return null;
+    }
+    const models = parseDecisionModels(payload);
+    if (models === null)
+        return null;
+    cache = { models, timestamp: now() };
+    return models;
+}
+/** Whether a setting's picker is populated from the Decisions catalog. */
+export function isDecisionModelKey(key) {
+    return key === SETTING_KEYS.AGENT_DECISION_MODEL;
+}
+//# sourceMappingURL=decision-model-listing.js.map

package/dist/services/models/decision-model-listing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decision-model-listing.js","sourceRoot":"","sources":["../../../source/services/models/decision-model-listing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAgB9D,MAAM,mBAAmB,GAAG,iEAAiE,CAAC;AAC9F,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEtC,IAAI,KAAqE,CAAC;AAE1E,MAAM,UAAU,2BAA2B;IACzC,KAAK,GAAG,SAAS,CAAC;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB;IAC3C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACjE,MAAM,IAAI,GAAI,OAA8B,CAAC,IAAI,CAAC;IAClD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;YAAE,SAAS;QAC1D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAyC,CAAC;QAC/D,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACxD,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAIzC;IACC,MAAM,SAAS,GAAG,IAAI,EAAE,SAAS,IAAI,KAAK,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,cAAc,CAAC;IAC5C,MAAM,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IAElC,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,GAAG,GAAG,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;QACpC,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;QACD,KAAK,GAAG,SAAS,CAAC;IACpB,CAAC;IAED,IAAI,OAAgB,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC9B,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAEjC,KAAK,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC;IACrC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC5C,OAAO,GAAG,KAAK,YAAY,CAAC,oBAAoB,CAAC;AACnD,CAAC"}

package/dist/services/models/model-nicknames.d.ts

@@ -1,3 +1,4 @@
+import type { ModelInfo } from '../model-service.js';
 import type { ISettingsService } from '../service-interfaces.js';
 import { type ModelSettingsReasoningEffort } from './reasoning-effort.js';
 /**
@@ -55,6 +56,13 @@ export declare function getNicknameEntries(settingsService: ISettingsService): N
  * for rendering existing nicknames on picker rows.
  */
 export declare function getNicknameLabels(settingsService: ISettingsService): Map<string, string>;
+/**
+ * Nickname targets as model rows (id + home provider only), one per model,
+ * in settings order. Two names for the same model collapse to the first.
+ * Reads settings only: no catalog fetch. The Nicknames tab uses these rows
+ * the same way the Favorites tab uses `getFavoriteModelInfos`.
+ */
+export declare function getNicknameModelInfos(settingsService: ISettingsService): ModelInfo[];
 export type NicknameValidation = {
     ok: true;
     nickname: string;
@@ -82,22 +90,50 @@ export declare function validateNicknameName(rawNickname: string, options?: {
     providerIds?: readonly string[];
     existingNicknames?: readonly string[];
 }): NicknameValidation;
+/** The model that currently owns a nickname the user asked to reuse. */
+export type NicknameConflict = {
+    nickname: string;
+    provider: string;
+    modelId: string;
+};
 export type SetNicknameResult = {
     ok: true;
 } | {
     ok: false;
     error: string;
+    conflict?: NicknameConflict;
 };
 /**
  * Validates and persists one nickname -> target mapping. Rejected input
  * returns the reason and writes nothing, so an editor can keep the user in
  * place. Renaming (the target already mapped under another name) removes the
- * old key; re-pointing a name at a new target just overwrites it. Committing
- * an unchanged mapping writes nothing.
+ * old key. A name already used by a different model is not moved unless
+ * `replace` is set — the first attempt returns that model as `conflict` so
+ * the editor can ask. Committing an unchanged mapping writes nothing.
  */
 export declare function setNicknameTarget(settingsService: ISettingsService, rawNickname: string, target: ParsedNicknameTarget, options?: {
     providerIds?: readonly string[];
+    replace?: boolean;
 }): SetNicknameResult;
+/** Removes all nickname aliases attached to one model. */
+export declare function removeNicknameTarget(settingsService: ISettingsService, target: Pick<ParsedNicknameTarget, 'provider' | 'modelId'>): boolean;
+/**
+ * Applies one Enter in the nickname editor. A pending replacement commits
+ * only while the text still matches that name; otherwise this is an ordinary
+ * save, and a collision comes back as a new pending replacement.
+ */
+export declare function commitNicknameEdit(settingsService: ISettingsService, draft: {
+    text: string;
+    provider: string;
+    modelId: string;
+    pendingReplace?: NicknameConflict | null;
+}, providerIds?: readonly string[]): {
+    saved: true;
+} | {
+    saved: false;
+    error: string;
+    pendingReplace: NicknameConflict | null;
+};
 /**
  * Exact, case-insensitive nickname lookup for the --model fast path.
  * `providerScope` (an explicit --provider or a provider prefix parsed from

package/dist/services/models/model-nicknames.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-nicknames.d.ts","sourceRoot":"","sources":["../../../source/services/models/model-nicknames.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,EAA8B,KAAK,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAEtG;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,4BAA4B,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,oBAAoB,CAAC;AAExE;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,gBAAgB,QAAgC,CAAC;AAE9D,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAKjF;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAG5E;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,GAAG,aAAa,EAAE,CAgBrF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAMxF;AAED,MAAM,MAAM,kBAAkB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/F;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GACvF,kBAAkB,CAwBpB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,gBAAgB,EACjC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,oBAAoB,EAC5B,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GAChD,iBAAiB,CAoCnB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,gBAAgB,EACjC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GACvE,aAAa,GAAG,SAAS,CAY3B"}
+{"version":3,"file":"model-nicknames.d.ts","sourceRoot":"","sources":["../../../source/services/models/model-nicknames.ts"],"names":[],"mappings":"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"}