@qduc/term2 0.24.1 → 0.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent.d.ts +3 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +2 -1
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts +10 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +33 -6
- package/dist/app.js.map +1 -1
- package/dist/cli.js +43 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/mcp-login-command.d.ts +24 -0
- package/dist/commands/mcp-login-command.d.ts.map +1 -0
- package/dist/commands/mcp-login-command.js +65 -0
- package/dist/commands/mcp-login-command.js.map +1 -0
- package/dist/commands/mcp-status-command.d.ts +19 -0
- package/dist/commands/mcp-status-command.d.ts.map +1 -0
- package/dist/commands/mcp-status-command.js +19 -0
- package/dist/commands/mcp-status-command.js.map +1 -0
- package/dist/components/input/ApplicationInputSurface.d.ts +4 -0
- package/dist/components/input/ApplicationInputSurface.d.ts.map +1 -1
- package/dist/components/input/ApplicationInputSurface.js +2 -0
- package/dist/components/input/ApplicationInputSurface.js.map +1 -1
- package/dist/components/input/McpMenuSession.d.ts +9 -0
- package/dist/components/input/McpMenuSession.d.ts.map +1 -0
- package/dist/components/input/McpMenuSession.js +370 -0
- package/dist/components/input/McpMenuSession.js.map +1 -0
- package/dist/components/input/mcp-intent-host.d.ts +10 -0
- package/dist/components/input/mcp-intent-host.d.ts.map +1 -0
- package/dist/components/input/mcp-intent-host.js +31 -0
- package/dist/components/input/mcp-intent-host.js.map +1 -0
- package/dist/components/input/menu-controller.d.ts.map +1 -1
- package/dist/components/input/menu-controller.js +8 -5
- package/dist/components/input/menu-controller.js.map +1 -1
- package/dist/components/input/menu-registry.d.ts.map +1 -1
- package/dist/components/input/menu-registry.js +2 -0
- package/dist/components/input/menu-registry.js.map +1 -1
- package/dist/components/input/menu-types.d.ts +22 -1
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/layout/BottomArea.d.ts +6 -1
- package/dist/components/layout/BottomArea.d.ts.map +1 -1
- package/dist/components/layout/BottomArea.js +9 -6
- package/dist/components/layout/BottomArea.js.map +1 -1
- package/dist/components/menu/McpSelectionMenu.d.ts +15 -0
- package/dist/components/menu/McpSelectionMenu.d.ts.map +1 -0
- package/dist/components/menu/McpSelectionMenu.js +19 -0
- package/dist/components/menu/McpSelectionMenu.js.map +1 -0
- package/dist/components/message/command-message-helpers.d.ts +2 -2
- package/dist/components/message/command-message-helpers.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.js +3 -0
- package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
- package/dist/contracts/conversation.d.ts +2 -0
- package/dist/contracts/conversation.d.ts.map +1 -1
- package/dist/contracts/conversation.js.map +1 -1
- package/dist/hooks/conversation-ui-reducer.d.ts +1 -1
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/settings-completion-config.d.ts.map +1 -1
- package/dist/hooks/settings-completion-config.js +1 -0
- package/dist/hooks/settings-completion-config.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +9 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +14 -1
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +1 -1
- package/dist/hooks/use-mcp-notices.d.ts +10 -0
- package/dist/hooks/use-mcp-notices.d.ts.map +1 -0
- package/dist/hooks/use-mcp-notices.js +47 -0
- package/dist/hooks/use-mcp-notices.js.map +1 -0
- package/dist/hooks/use-settings-value-completion.d.ts +3 -2
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +21 -3
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/hooks/use-shell-mode.d.ts +1 -0
- package/dist/hooks/use-shell-mode.d.ts.map +1 -1
- package/dist/hooks/use-shell-mode.js +1 -0
- package/dist/hooks/use-shell-mode.js.map +1 -1
- package/dist/lib/agent-client.d.ts +1 -0
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +2 -0
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +4 -0
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +8 -0
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +2 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +1 -0
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/oauth-loopback.d.ts +79 -0
- package/dist/lib/oauth-loopback.d.ts.map +1 -0
- package/dist/lib/oauth-loopback.js +221 -0
- package/dist/lib/oauth-loopback.js.map +1 -0
- package/dist/non-interactive.d.ts +2 -0
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +19 -0
- package/dist/non-interactive.js.map +1 -1
- package/dist/providers/oauth-pkce.d.ts +5 -1
- package/dist/providers/oauth-pkce.d.ts.map +1 -1
- package/dist/providers/oauth-pkce.js +28 -208
- package/dist/providers/oauth-pkce.js.map +1 -1
- package/dist/providers/openrouter-decisions.d.ts +15 -0
- package/dist/providers/openrouter-decisions.d.ts.map +1 -0
- package/dist/providers/openrouter-decisions.js +25 -0
- package/dist/providers/openrouter-decisions.js.map +1 -0
- package/dist/services/approval/decision-shadow.d.ts +15 -0
- package/dist/services/approval/decision-shadow.d.ts.map +1 -0
- package/dist/services/approval/decision-shadow.js +77 -0
- package/dist/services/approval/decision-shadow.js.map +1 -0
- package/dist/services/approval/non-interactive-approval-policy.d.ts +5 -0
- package/dist/services/approval/non-interactive-approval-policy.d.ts.map +1 -1
- package/dist/services/approval/non-interactive-approval-policy.js +14 -0
- package/dist/services/approval/non-interactive-approval-policy.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.d.ts +5 -1
- package/dist/services/approval/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.js +80 -4
- package/dist/services/approval/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +16 -2
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
- package/dist/services/mcp/mcp-config-controller.d.ts +32 -0
- package/dist/services/mcp/mcp-config-controller.d.ts.map +1 -0
- package/dist/services/mcp/mcp-config-controller.js +89 -0
- package/dist/services/mcp/mcp-config-controller.js.map +1 -0
- package/dist/services/mcp/mcp-config.d.ts +61 -0
- package/dist/services/mcp/mcp-config.d.ts.map +1 -0
- package/dist/services/mcp/mcp-config.js +232 -0
- package/dist/services/mcp/mcp-config.js.map +1 -0
- package/dist/services/mcp/mcp-connection-manager.d.ts +126 -0
- package/dist/services/mcp/mcp-connection-manager.d.ts.map +1 -0
- package/dist/services/mcp/mcp-connection-manager.js +488 -0
- package/dist/services/mcp/mcp-connection-manager.js.map +1 -0
- package/dist/services/mcp/mcp-oauth-login.d.ts +79 -0
- package/dist/services/mcp/mcp-oauth-login.d.ts.map +1 -0
- package/dist/services/mcp/mcp-oauth-login.js +126 -0
- package/dist/services/mcp/mcp-oauth-login.js.map +1 -0
- package/dist/services/mcp/mcp-oauth-provider.d.ts +77 -0
- package/dist/services/mcp/mcp-oauth-provider.d.ts.map +1 -0
- package/dist/services/mcp/mcp-oauth-provider.js +121 -0
- package/dist/services/mcp/mcp-oauth-provider.js.map +1 -0
- package/dist/services/mcp/mcp-oauth-store.d.ts +106 -0
- package/dist/services/mcp/mcp-oauth-store.d.ts.map +1 -0
- package/dist/services/mcp/mcp-oauth-store.js +278 -0
- package/dist/services/mcp/mcp-oauth-store.js.map +1 -0
- package/dist/services/mcp/mcp-status.d.ts +41 -0
- package/dist/services/mcp/mcp-status.d.ts.map +1 -0
- package/dist/services/mcp/mcp-status.js +69 -0
- package/dist/services/mcp/mcp-status.js.map +1 -0
- package/dist/services/mcp/mcp-stdio-launcher.d.ts +26 -0
- package/dist/services/mcp/mcp-stdio-launcher.d.ts.map +1 -0
- package/dist/services/mcp/mcp-stdio-launcher.js +8 -0
- package/dist/services/mcp/mcp-stdio-launcher.js.map +1 -0
- package/dist/services/mcp/mcp-tool-source.d.ts +77 -0
- package/dist/services/mcp/mcp-tool-source.d.ts.map +1 -0
- package/dist/services/mcp/mcp-tool-source.js +10 -0
- package/dist/services/mcp/mcp-tool-source.js.map +1 -0
- package/dist/services/mcp/test-fixtures/fake-authorization-server.d.ts +25 -0
- package/dist/services/mcp/test-fixtures/fake-authorization-server.d.ts.map +1 -0
- package/dist/services/mcp/test-fixtures/fake-authorization-server.js +147 -0
- package/dist/services/mcp/test-fixtures/fake-authorization-server.js.map +1 -0
- package/dist/services/mcp/test-fixtures/protected-mcp-server.d.ts +29 -0
- package/dist/services/mcp/test-fixtures/protected-mcp-server.d.ts.map +1 -0
- package/dist/services/mcp/test-fixtures/protected-mcp-server.js +87 -0
- package/dist/services/mcp/test-fixtures/protected-mcp-server.js.map +1 -0
- package/dist/services/mcp/turn-stable-mcp-tool-source.d.ts +19 -0
- package/dist/services/mcp/turn-stable-mcp-tool-source.d.ts.map +1 -0
- package/dist/services/mcp/turn-stable-mcp-tool-source.js +37 -0
- package/dist/services/mcp/turn-stable-mcp-tool-source.js.map +1 -0
- package/dist/services/models/decision-model-listing.d.ts +26 -0
- package/dist/services/models/decision-model-listing.d.ts.map +1 -0
- package/dist/services/models/decision-model-listing.js +61 -0
- package/dist/services/models/decision-model-listing.js.map +1 -0
- package/dist/services/profiles/registry.d.ts +1 -1
- package/dist/services/profiles/registry.d.ts.map +1 -1
- package/dist/services/profiles/registry.js +2 -1
- package/dist/services/profiles/registry.js.map +1 -1
- package/dist/services/settings/settings-schema.d.ts +4 -0
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +8 -0
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts +2 -0
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +2 -0
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js +1 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js.map +1 -1
- package/dist/services/shell/shell-interaction-session.d.ts +2 -0
- package/dist/services/shell/shell-interaction-session.d.ts.map +1 -1
- package/dist/services/shell/shell-interaction-session.js +11 -2
- package/dist/services/shell/shell-interaction-session.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/tools/system/run-code/mcp-script-surface.d.ts +28 -0
- package/dist/tools/system/run-code/mcp-script-surface.d.ts.map +1 -0
- package/dist/tools/system/run-code/mcp-script-surface.js +165 -0
- package/dist/tools/system/run-code/mcp-script-surface.js.map +1 -0
- package/dist/tools/system/run-code/run-code-runtime.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code-runtime.js +13 -1
- package/dist/tools/system/run-code/run-code-runtime.js.map +1 -1
- package/dist/tools/system/run-code/run-code.d.ts +3 -0
- package/dist/tools/system/run-code/run-code.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code.js +32 -4
- package/dist/tools/system/run-code/run-code.js.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation/conversation-utils.d.ts +1 -5
- package/dist/utils/conversation/conversation-utils.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-utils.js +4 -1
- package/dist/utils/conversation/conversation-utils.js.map +1 -1
- package/dist/utils/value-suggestions.d.ts +14 -0
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +31 -0
- package/dist/utils/value-suggestions.js.map +1 -1
- package/package.json +3 -1
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
import http from 'node:http';
|
|
2
|
+
import readline from 'node:readline';
|
|
3
|
+
import { spawn } from 'node:child_process';
|
|
4
|
+
export function openInBrowser(url) {
|
|
5
|
+
const command = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'cmd' : 'xdg-open';
|
|
6
|
+
const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url];
|
|
7
|
+
try {
|
|
8
|
+
const child = spawn(command, args, { stdio: 'ignore', detached: true });
|
|
9
|
+
child.on('error', () => {
|
|
10
|
+
// Ignored: opening a browser in a headless/server/minimal environment or when
|
|
11
|
+
// the browser launcher is missing (e.g. xdg-open ENOENT) is non-fatal.
|
|
12
|
+
// The caller always prints the URL, so the user can complete login manually.
|
|
13
|
+
});
|
|
14
|
+
child.unref();
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
// The caller always prints the URL, so a failed launcher is not fatal.
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Binds the first free loopback port from the preference list.
|
|
22
|
+
*
|
|
23
|
+
* Always the literal `127.0.0.1`, never `localhost`: the hostname can resolve to
|
|
24
|
+
* IPv6 or, on a misconfigured host, to something that is not loopback at all.
|
|
25
|
+
*/
|
|
26
|
+
export function bindLoopbackRedirect(options) {
|
|
27
|
+
const ports = options.ports?.length ? options.ports : [0];
|
|
28
|
+
return new Promise((resolve, reject) => {
|
|
29
|
+
const attempt = (index) => {
|
|
30
|
+
const port = ports[index];
|
|
31
|
+
const server = http.createServer();
|
|
32
|
+
const onError = (err) => {
|
|
33
|
+
server.close();
|
|
34
|
+
if (err.code !== 'EADDRINUSE') {
|
|
35
|
+
reject(err);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
if (index + 1 < ports.length) {
|
|
39
|
+
attempt(index + 1);
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const description = ports.length === 1 && ports[0] === 0
|
|
43
|
+
? 'an ephemeral loopback port'
|
|
44
|
+
: `any of its registered redirect ports (${ports.join(', ')})`;
|
|
45
|
+
reject(new Error(`${options.label} login could not bind ${description}. The authorization server only accepts those exact redirects, so close whatever holds them${options.portConflictHint ? ` (${options.portConflictHint})` : ''} and retry.`));
|
|
46
|
+
};
|
|
47
|
+
server.once('error', onError);
|
|
48
|
+
server.listen(port, '127.0.0.1', () => {
|
|
49
|
+
server.off('error', onError);
|
|
50
|
+
// Port 0 asks the OS for an ephemeral port; the redirect must name the real one.
|
|
51
|
+
resolve({ server, port: server.address().port });
|
|
52
|
+
});
|
|
53
|
+
};
|
|
54
|
+
attempt(0);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Frees the callback port immediately: a keep-alive browser socket would
|
|
59
|
+
* otherwise hold it and make the next login attempt fail.
|
|
60
|
+
*/
|
|
61
|
+
export function closeLoopbackServer(server) {
|
|
62
|
+
server.close();
|
|
63
|
+
server.closeAllConnections?.();
|
|
64
|
+
}
|
|
65
|
+
function stripWrappingQuotes(value) {
|
|
66
|
+
const trimmed = value.trim();
|
|
67
|
+
if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
|
|
68
|
+
return trimmed.slice(1, -1).trim();
|
|
69
|
+
}
|
|
70
|
+
return trimmed;
|
|
71
|
+
}
|
|
72
|
+
function isLoopbackHostname(hostname) {
|
|
73
|
+
const host = hostname.replace(/^\[|\]$/g, '').toLowerCase();
|
|
74
|
+
return host === 'localhost' || host === '127.0.0.1' || host === '::1';
|
|
75
|
+
}
|
|
76
|
+
export function interpretCallbackParams(config, expectedState, error, code, state) {
|
|
77
|
+
if (error)
|
|
78
|
+
return new Error(`${config.label} login was rejected: ${error}`);
|
|
79
|
+
if (state !== expectedState) {
|
|
80
|
+
// A mismatched state means this callback did not come from the
|
|
81
|
+
// authorization request we started; the code may be an attacker's.
|
|
82
|
+
return new Error(`${config.label} login failed: OAuth state mismatch`);
|
|
83
|
+
}
|
|
84
|
+
if (!code)
|
|
85
|
+
return new Error(`${config.label} login failed: no authorization code in callback`);
|
|
86
|
+
return code;
|
|
87
|
+
}
|
|
88
|
+
/** Characters an authorization code may contain, raw or percent-encoded. */
|
|
89
|
+
const BARE_CODE_PATTERN = /^[A-Za-z0-9._~+/=%-]+$/;
|
|
90
|
+
/**
|
|
91
|
+
* Accepts the callback's query string (`code=...&state=...`) or the bare code.
|
|
92
|
+
*
|
|
93
|
+
* A bare code carries no state to check. That is acceptable here because the
|
|
94
|
+
* user copied it from their own browser into this terminal; the state check
|
|
95
|
+
* guards the loopback listener against codes injected by other pages.
|
|
96
|
+
*/
|
|
97
|
+
function interpretPastedCodeOrQuery(raw, config, expectedState) {
|
|
98
|
+
const notUsable = {
|
|
99
|
+
kind: 'ignore',
|
|
100
|
+
message: `Paste the authorization code or the redirected localhost URL (${config.exampleCallbackUrl}).`,
|
|
101
|
+
};
|
|
102
|
+
if (/(^|[?&])(code|error)=/.test(raw)) {
|
|
103
|
+
const params = new URLSearchParams(raw.replace(/^[?#]/, ''));
|
|
104
|
+
const result = interpretCallbackParams(config, expectedState, params.get('error'), params.get('code'), params.get('state'));
|
|
105
|
+
return result instanceof Error ? { kind: 'fail', error: result } : { kind: 'code', code: result };
|
|
106
|
+
}
|
|
107
|
+
if (!BARE_CODE_PATTERN.test(raw))
|
|
108
|
+
return notUsable;
|
|
109
|
+
try {
|
|
110
|
+
return { kind: 'code', code: decodeURIComponent(raw) };
|
|
111
|
+
}
|
|
112
|
+
catch {
|
|
113
|
+
return notUsable;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
function interpretPastedOAuthRedirect(line, config, expectedState) {
|
|
117
|
+
const raw = stripWrappingQuotes(line);
|
|
118
|
+
if (!raw)
|
|
119
|
+
return { kind: 'ignore', message: '' };
|
|
120
|
+
let url;
|
|
121
|
+
try {
|
|
122
|
+
url = new URL(raw);
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
return interpretPastedCodeOrQuery(raw, config, expectedState);
|
|
126
|
+
}
|
|
127
|
+
if (!isLoopbackHostname(url.hostname) || url.pathname !== config.callbackPath) {
|
|
128
|
+
return {
|
|
129
|
+
kind: 'ignore',
|
|
130
|
+
message: `Paste the redirected localhost URL from the address bar (${config.exampleCallbackUrl}).`,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
const result = interpretCallbackParams(config, expectedState, url.searchParams.get('error'), url.searchParams.get('code'), url.searchParams.get('state'));
|
|
134
|
+
return result instanceof Error ? { kind: 'fail', error: result } : { kind: 'code', code: result };
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Waits for the authorization callback on `server` and resolves with the
|
|
138
|
+
* authorization code.
|
|
139
|
+
*
|
|
140
|
+
* Resolves from either the browser's loopback request or a pasted redirect, so a
|
|
141
|
+
* remote host — where the browser cannot reach this process's loopback port —
|
|
142
|
+
* can still complete the login.
|
|
143
|
+
*/
|
|
144
|
+
export function awaitLoopbackCallback(server, config, expectedState, options = {}) {
|
|
145
|
+
return new Promise((resolve, reject) => {
|
|
146
|
+
let settled = false;
|
|
147
|
+
let paste;
|
|
148
|
+
const cleanup = () => {
|
|
149
|
+
options.signal?.removeEventListener('abort', onAbort);
|
|
150
|
+
server.off('error', onError);
|
|
151
|
+
paste?.close();
|
|
152
|
+
};
|
|
153
|
+
const doResolve = (value) => {
|
|
154
|
+
cleanup();
|
|
155
|
+
resolve(value);
|
|
156
|
+
};
|
|
157
|
+
const doReject = (err) => {
|
|
158
|
+
cleanup();
|
|
159
|
+
reject(err);
|
|
160
|
+
};
|
|
161
|
+
if (options.signal?.aborted) {
|
|
162
|
+
doReject(new Error(`${config.label} login cancelled`));
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
const onAbort = () => {
|
|
166
|
+
settled = true;
|
|
167
|
+
closeLoopbackServer(server);
|
|
168
|
+
doReject(new Error(`${config.label} login cancelled`));
|
|
169
|
+
};
|
|
170
|
+
options.signal?.addEventListener('abort', onAbort, { once: true });
|
|
171
|
+
// The callback is single-use. A retried or duplicated request after the
|
|
172
|
+
// socket has been torn down must not run the handler a second time.
|
|
173
|
+
server.on('request', (req, res) => {
|
|
174
|
+
if (settled) {
|
|
175
|
+
res.destroy();
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
const requestUrl = new URL(req.url || '/', config.redirectUri);
|
|
179
|
+
if (requestUrl.pathname !== config.callbackPath) {
|
|
180
|
+
res.writeHead(404).end();
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
settled = true;
|
|
184
|
+
const result = interpretCallbackParams(config, expectedState, requestUrl.searchParams.get('error'), requestUrl.searchParams.get('code'), requestUrl.searchParams.get('state'));
|
|
185
|
+
const failure = result instanceof Error ? result : null;
|
|
186
|
+
res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8', Connection: 'close' });
|
|
187
|
+
res.end(failure ? `${failure.message}\nYou can close this tab.` : 'Login complete. You can close this tab.');
|
|
188
|
+
// Free the callback port immediately: a keep-alive browser socket would
|
|
189
|
+
// otherwise hold it and make the next login attempt fail.
|
|
190
|
+
closeLoopbackServer(server);
|
|
191
|
+
if (failure)
|
|
192
|
+
doReject(failure);
|
|
193
|
+
else
|
|
194
|
+
doResolve(result);
|
|
195
|
+
});
|
|
196
|
+
if (options.pasteInput) {
|
|
197
|
+
paste = readline.createInterface({ input: options.pasteInput, crlfDelay: Infinity });
|
|
198
|
+
paste.on('line', (line) => {
|
|
199
|
+
if (settled)
|
|
200
|
+
return;
|
|
201
|
+
const interpreted = interpretPastedOAuthRedirect(line, config, expectedState);
|
|
202
|
+
if (interpreted.kind === 'ignore') {
|
|
203
|
+
if (interpreted.message)
|
|
204
|
+
options.onPasteRejected?.(interpreted.message);
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
settled = true;
|
|
208
|
+
closeLoopbackServer(server);
|
|
209
|
+
if (interpreted.kind === 'fail')
|
|
210
|
+
doReject(interpreted.error);
|
|
211
|
+
else
|
|
212
|
+
doResolve(interpreted.code);
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
const onError = (err) => {
|
|
216
|
+
doReject(err);
|
|
217
|
+
};
|
|
218
|
+
server.on('error', onError);
|
|
219
|
+
});
|
|
220
|
+
}
|
|
221
|
+
//# sourceMappingURL=oauth-loopback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-loopback.js","sourceRoot":"","sources":["../../source/lib/oauth-loopback.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,8 @@ export interface NonInteractiveConfig {
|
|
|
51
51
|
backgroundWaitTimeoutMs?: number;
|
|
52
52
|
/** Abort the active foreground turn when the process receives a signal. */
|
|
53
53
|
abort?: () => void;
|
|
54
|
+
mcpAllowlist?: readonly string[];
|
|
55
|
+
mcpToolSource?: import('./services/mcp/mcp-tool-source.js').McpToolSource;
|
|
54
56
|
}
|
|
55
57
|
export { NON_INTERACTIVE_REJECTION_REASON } from './services/approval/non-interactive-approval-policy.js';
|
|
56
58
|
export declare const createNonInteractiveSessionId: () => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"non-interactive.d.ts","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAGlH,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EACV,kBAAkB,EAClB,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAI/E,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"non-interactive.d.ts","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"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"}
|
package/dist/non-interactive.js
CHANGED
|
@@ -6,6 +6,7 @@ import { NonInteractiveApprovalPolicy } from './services/approval/non-interactiv
|
|
|
6
6
|
import { pruneStaleTempArtifacts } from './utils/shell/temp-sweep.js';
|
|
7
7
|
import { primeActiveProfileNoticeIfActive } from './services/mode-notices.js';
|
|
8
8
|
import { formatBackgroundSubagentNotifications } from './services/conversation/conversation-orchestrator.js';
|
|
9
|
+
import { mcpMemberName } from './tools/system/run-code/mcp-script-surface.js';
|
|
9
10
|
export const DEFAULT_NON_INTERACTIVE_BACKGROUND_WAIT_MS = 5 * 60 * 1000;
|
|
10
11
|
const MAX_NON_INTERACTIVE_BACKGROUND_WAIT_MS = 24 * 60 * 60 * 1000;
|
|
11
12
|
export { NON_INTERACTIVE_REJECTION_REASON } from './services/approval/non-interactive-approval-policy.js';
|
|
@@ -105,6 +106,24 @@ export async function runWithSession(session, config) {
|
|
|
105
106
|
agentClient: config.agentClient,
|
|
106
107
|
logger: config.logger,
|
|
107
108
|
sessionContextService,
|
|
109
|
+
mcpAllowlist: config.mcpAllowlist,
|
|
110
|
+
isMcpTool: config.mcpToolSource
|
|
111
|
+
? (name) => config
|
|
112
|
+
.mcpToolSource.snapshot()
|
|
113
|
+
.some((server) => server.tools.some((tool) => `${server.name}__${tool.name}` === name))
|
|
114
|
+
: undefined,
|
|
115
|
+
isMcpAllowed: config.mcpToolSource
|
|
116
|
+
? (name, allowlist) => allowlist.some((entry) => {
|
|
117
|
+
const parts = entry.split('/');
|
|
118
|
+
if (parts.length !== 2 || !parts[0] || !parts[1])
|
|
119
|
+
return false;
|
|
120
|
+
return config
|
|
121
|
+
.mcpToolSource.snapshot()
|
|
122
|
+
.some((server) => server.tools.some((tool) => mcpMemberName(server.name, tool.name) === name &&
|
|
123
|
+
server.name === parts[0] &&
|
|
124
|
+
(parts[1] === '*' || tool.name === parts[1])));
|
|
125
|
+
})
|
|
126
|
+
: undefined,
|
|
108
127
|
});
|
|
109
128
|
let streamedTextLength = 0;
|
|
110
129
|
const onEvent = (event) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"non-interactive.js","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"non-interactive.js","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Readable } from 'node:stream';
|
|
2
|
+
import { openInBrowser } from '../lib/oauth-loopback.js';
|
|
2
3
|
/**
|
|
3
4
|
* The browser half of an OAuth 2.0 + PKCE login for a public native client.
|
|
4
5
|
*
|
|
@@ -8,7 +9,11 @@ import type { Readable } from 'node:stream';
|
|
|
8
9
|
* thing that differs between them is endpoints, scopes, and how the token
|
|
9
10
|
* endpoint wants its request body encoded, so all of that is configuration and
|
|
10
11
|
* the flow itself lives here once.
|
|
12
|
+
*
|
|
13
|
+
* The loopback listener and callback handling live in `source/lib/oauth-loopback.ts`
|
|
14
|
+
* so MCP OAuth (whose redirect port is chosen at runtime) can reuse them.
|
|
11
15
|
*/
|
|
16
|
+
export { openInBrowser };
|
|
12
17
|
export type PkceLoginConfig = {
|
|
13
18
|
/** Human-facing provider name, used in prompts and error messages. */
|
|
14
19
|
label: string;
|
|
@@ -49,7 +54,6 @@ export type PkceLoginOptions = {
|
|
|
49
54
|
/** Called when a pasted line is not a usable callback, so the user can retry. */
|
|
50
55
|
onPasteRejected?: (message: string) => void;
|
|
51
56
|
};
|
|
52
|
-
export declare function openInBrowser(url: string): void;
|
|
53
57
|
/**
|
|
54
58
|
* Runs the full browser login and returns the token endpoint's raw response
|
|
55
59
|
* body. Mapping that body into a provider's stored credential shape, and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-pkce.d.ts","sourceRoot":"","sources":["../../source/providers/oauth-pkce.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauth-pkce.d.ts","sourceRoot":"","sources":["../../source/providers/oauth-pkce.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAIL,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAElC;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,MAAM,eAAe,GAAG;IAC5B,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,4EAA4E;IAC5E,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,2EAA2E;IAC3E,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,8DAA8D;IAC9D,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvC,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,iFAAiF;IACjF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,CAAC;AA0BF;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,CAoFhH"}
|