strands-darwin 0.0.44 → 0.0.45
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/README.md +4 -1
- package/README.zh-CN.md +4 -1
- package/dist/patches/ink+7.1.1.patch +15 -0
- package/dist/src/agent/context-breakdown.d.ts +26 -3
- package/dist/src/agent/context-breakdown.js +27 -1
- package/dist/src/agent/context-breakdown.js.map +1 -1
- package/dist/src/agent/goal-check.d.ts +35 -0
- package/dist/src/agent/goal-check.js +132 -0
- package/dist/src/agent/goal-check.js.map +1 -0
- package/dist/src/agent/model-retry.d.ts +6 -1
- package/dist/src/agent/model-retry.js +45 -9
- package/dist/src/agent/model-retry.js.map +1 -1
- package/dist/src/agent/permission-rules.d.ts +31 -13
- package/dist/src/agent/permission-rules.js +180 -20
- package/dist/src/agent/permission-rules.js.map +1 -1
- package/dist/src/agent/permission.d.ts +0 -6
- package/dist/src/agent/permission.js +4 -3
- package/dist/src/agent/permission.js.map +1 -1
- package/dist/src/agent/runtime.d.ts +9 -0
- package/dist/src/agent/runtime.js +39 -3
- package/dist/src/agent/runtime.js.map +1 -1
- package/dist/src/agent/safety-classifier.d.ts +3 -1
- package/dist/src/agent/safety-classifier.js +0 -0
- package/dist/src/agent/safety-classifier.js.map +1 -1
- package/dist/src/agent/working-context.d.ts +16 -0
- package/dist/src/agent/working-context.js +20 -0
- package/dist/src/agent/working-context.js.map +1 -1
- package/dist/src/cli-main.js +3 -1
- package/dist/src/cli-main.js.map +1 -1
- package/dist/src/cli-mcp.d.ts +12 -0
- package/dist/src/cli-mcp.js +111 -0
- package/dist/src/cli-mcp.js.map +1 -0
- package/dist/src/cli-usage.d.ts +1 -1
- package/dist/src/cli-usage.js +2 -0
- package/dist/src/cli-usage.js.map +1 -1
- package/dist/src/cli.js +4 -0
- package/dist/src/cli.js.map +1 -1
- package/dist/src/collaboration/command.js +1 -1
- package/dist/src/collaboration/command.js.map +1 -1
- package/dist/src/collaboration/local.d.ts +137 -6
- package/dist/src/collaboration/local.js +76 -19
- package/dist/src/collaboration/local.js.map +1 -1
- package/dist/src/collaboration/tools.js +1 -1
- package/dist/src/collaboration/tools.js.map +1 -1
- package/dist/src/commands/custom-commands.d.ts +1 -1
- package/dist/src/commands/custom-commands.js +3 -1
- package/dist/src/commands/custom-commands.js.map +1 -1
- package/dist/src/commands/goal-command.d.ts +26 -0
- package/dist/src/commands/goal-command.js +32 -0
- package/dist/src/commands/goal-command.js.map +1 -0
- package/dist/src/config.d.ts +3 -5
- package/dist/src/config.js.map +1 -1
- package/dist/src/mcp/oauth-login.d.ts +37 -0
- package/dist/src/mcp/oauth-login.js +263 -0
- package/dist/src/mcp/oauth-login.js.map +1 -0
- package/dist/src/mcp/oauth-net.d.ts +50 -0
- package/dist/src/mcp/oauth-net.js +321 -0
- package/dist/src/mcp/oauth-net.js.map +1 -0
- package/dist/src/mcp/oauth-provider.d.ts +89 -0
- package/dist/src/mcp/oauth-provider.js +398 -0
- package/dist/src/mcp/oauth-provider.js.map +1 -0
- package/dist/src/mcp/oauth-store.d.ts +49 -0
- package/dist/src/mcp/oauth-store.js +176 -0
- package/dist/src/mcp/oauth-store.js.map +1 -0
- package/dist/src/mcp/registry.d.ts +6 -0
- package/dist/src/mcp/registry.js +83 -4
- package/dist/src/mcp/registry.js.map +1 -1
- package/dist/src/tools/shell-env.d.ts +27 -1
- package/dist/src/tools/shell-env.js +34 -5
- package/dist/src/tools/shell-env.js.map +1 -1
- package/dist/src/tui/App.d.ts +4 -1
- package/dist/src/tui/App.js +209 -10
- package/dist/src/tui/App.js.map +1 -1
- package/dist/src/tui/InputBox.d.ts +1 -1
- package/dist/src/tui/InputBox.js +1 -1
- package/dist/src/tui/context-format.d.ts +7 -3
- package/dist/src/tui/context-format.js +28 -3
- package/dist/src/tui/context-format.js.map +1 -1
- package/dist/src/tui/goal.d.ts +123 -0
- package/dist/src/tui/goal.js +187 -0
- package/dist/src/tui/goal.js.map +1 -0
- package/dist/src/tui/help-format.d.ts +1 -1
- package/dist/src/tui/help-format.js +1 -1
- package/dist/src/tui/mcp-format.js +5 -1
- package/dist/src/tui/mcp-format.js.map +1 -1
- package/dist/src/tui/prompt-editor.d.ts +4 -3
- package/dist/src/tui/prompt-editor.js +8 -3
- package/dist/src/tui/prompt-editor.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-store.js","sourceRoot":"","sources":["../../../src/mcp/oauth-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAG3G,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAC9C,kEAAkE;AAClE,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,GAAG,IAAI,CAAC;AAiChD,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,mBAAmB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC;IAC7E,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC;QAAE,OAAO,8BAA8B,CAAC;IACtF,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IACrC,IACE,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ;QAC7E,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,QAAQ;QAC5E,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;QAChE,OAAO,SAAS,CAAC,wBAAwB,CAAC,KAAK,QAAQ,IAAI,OAAO,SAAS,CAAC,mBAAmB,CAAC,KAAK,SAAS,EAC9G,CAAC;QACD,OAAO,gDAAgD,CAAC;IAC1D,CAAC;IACD,IAAI,MAA+B,CAAC;IACpC,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,6BAA6B,CAAC;QAC1D,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IACD,IAAI,iBAA0D,CAAC;IAC/D,IAAI,KAAK,CAAC,mBAAmB,CAAC,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,4BAA4B,CAAC,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,wCAAwC,CAAC;QACrE,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC;IAClC,CAAC;IACD,OAAO;QACL,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC;QACvB,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC;QAC7B,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;QACzB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;QACzB,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC;QACjC,GAAG,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC;QACjE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3C,SAAS,EAAE,SAA4C;KACxD,CAAC;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,IAAI,CAAC,CAAC;AAE7C;;;;GAIG;AACH,KAAK,UAAU,eAAe,CAAC,GAAW;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,2EAA2E,CAAC;IAC5H,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,GAAI,KAA2C,EAAE,IAAI,CAAC;QAChE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,4BAA4B,IAAI,IAAI,OAAO,GAAG,CAAC;IAC9F,CAAC;AACH,CAAC;AAED,8FAA8F;AAC9F,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,SAAiB;IACrE,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC;IAC1D,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAChF,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,wBAAwB,EAAE,CAAC;QAC3F,IAAI,IAAI,CAAC,IAAI,GAAG,sBAAsB;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,mBAAmB,sBAAsB,QAAQ,EAAE,CAAC;QACxI,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA2C,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACjG,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,uBAAwB,KAA2C,EAAE,IAAI,IAAI,OAAO,GAAG,EAAE,CAAC;IACxI,CAAC;IACD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACrE,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,KAAK,MAAM,EAAE,EAAE,CAAC;IAC5F,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC9F,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,iGAAiG;AACjG,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAmB;IACxD,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;IAC3C,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,sBAAsB;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,sBAAsB,QAAQ,CAAC,CAAC;IAC9H,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,UAAU,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,8FAA8F;IAC9F,4DAA4D;IAC5D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,QAAQ,GAAG,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC;IAC7F,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,0BAA0B,CAAC,CAAC;QAC/F,MAAM,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;YAAS,CAAC;QACT,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;IAC5E,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACzD,MAAM,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAc;IACpD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC;IAC1D,IAAI,UAAU,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1D,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA2C,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAClF,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -37,6 +37,12 @@ export interface McpServerStatus {
|
|
|
37
37
|
* for a server that failed to connect or exposed nothing.
|
|
38
38
|
*/
|
|
39
39
|
toolNames: readonly string[] | undefined;
|
|
40
|
+
/**
|
|
41
|
+
* Only for servers with an `oauth` entry: whether a usable login is held. `login-required`
|
|
42
|
+
* means a session request needed `darwin mcp login <name>` (or none was ever done). Never a
|
|
43
|
+
* token, expiry or any other credential detail.
|
|
44
|
+
*/
|
|
45
|
+
auth?: 'logged-in' | 'login-required' | 'not-logged-in';
|
|
40
46
|
}
|
|
41
47
|
/**
|
|
42
48
|
* A read-only projection of the live clients for the `/mcp` report.
|
package/dist/src/mcp/registry.js
CHANGED
|
@@ -24,6 +24,7 @@ import { McpClient } from '@strands-agents/sdk';
|
|
|
24
24
|
import { ConfigError } from '../config.js';
|
|
25
25
|
import { darwinDir, userDarwinDir } from '../paths.js';
|
|
26
26
|
import { withDarwinMarker } from '../tools/shell-env.js';
|
|
27
|
+
import { createRuntimeOAuthProvider, resolveOAuthSettings } from './oauth-provider.js';
|
|
27
28
|
/** Preferred location, alongside the rest of darwin's project state. */
|
|
28
29
|
export const MCP_CONFIG_FILENAME = 'mcp.json';
|
|
29
30
|
/**
|
|
@@ -48,7 +49,13 @@ export function mcpServerStatuses(clients) {
|
|
|
48
49
|
const toolNames = registered instanceof Set && [...registered].every((name) => typeof name === 'string')
|
|
49
50
|
? [...registered].sort((a, b) => a.localeCompare(b))
|
|
50
51
|
: undefined;
|
|
51
|
-
|
|
52
|
+
const provider = oauthProviders.get(client);
|
|
53
|
+
return {
|
|
54
|
+
name: client.clientName,
|
|
55
|
+
state: client.connectionState,
|
|
56
|
+
toolNames,
|
|
57
|
+
...(provider === undefined ? {} : { auth: provider.authStatus() }),
|
|
58
|
+
};
|
|
52
59
|
});
|
|
53
60
|
}
|
|
54
61
|
/**
|
|
@@ -91,11 +98,83 @@ export async function loadMcpClients(projectRoot, options = {}) {
|
|
|
91
98
|
if (servers === undefined)
|
|
92
99
|
return { clients: [], ...sources };
|
|
93
100
|
const prefixed = withStdioDarwinMarker(withDefaultPrefixes(servers));
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
|
|
101
|
+
const { plain, oauth } = splitOAuthServers(prefixed);
|
|
102
|
+
const plainClients = options.quietStdioStderr === true
|
|
103
|
+
? await loadServersQuietly(plain)
|
|
104
|
+
: await McpClient.loadServers(plain, { continueOnError: true });
|
|
105
|
+
if (Object.keys(oauth).length === 0)
|
|
106
|
+
return { clients: plainClients, ...sources };
|
|
107
|
+
// Only entries `readMcpServerConfigs` returned reach here, so a held project layer never gets
|
|
108
|
+
// a provider, a token-store read or a network request.
|
|
109
|
+
const oauthClients = await buildOAuthClients(oauth);
|
|
110
|
+
const order = Object.keys(prefixed);
|
|
111
|
+
const clients = [...plainClients, ...oauthClients].sort((a, b) => order.indexOf(a.clientName) - order.indexOf(b.clientName));
|
|
97
112
|
return { clients, ...sources };
|
|
98
113
|
}
|
|
114
|
+
/** Servers that opted into interactive OAuth (`oauth` key, enabled) versus everything else. */
|
|
115
|
+
function splitOAuthServers(servers) {
|
|
116
|
+
const oauth = Object.entries(servers).filter(([, entry]) => typeof entry === 'object' && entry !== null && entry.disabled !== true && entry['oauth'] !== undefined && entry['oauth'] !== false);
|
|
117
|
+
if (oauth.length === 0)
|
|
118
|
+
return { plain: servers, oauth: {} };
|
|
119
|
+
const names = new Set(oauth.map(([name]) => name));
|
|
120
|
+
return {
|
|
121
|
+
plain: Object.fromEntries(Object.entries(servers).filter(([name]) => !names.has(name))),
|
|
122
|
+
oauth: Object.fromEntries(oauth),
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
/** Session-side OAuth provider of each client built by {@link buildOAuthClients}, for `/mcp`. */
|
|
126
|
+
const oauthProviders = new WeakMap();
|
|
127
|
+
function interpolate(value) {
|
|
128
|
+
return value.replace(/\$\{(?:env:)?([A-Za-z_][A-Za-z0-9_]*)\}/g, (_, key) => {
|
|
129
|
+
const resolved = process.env[key];
|
|
130
|
+
if (resolved === undefined)
|
|
131
|
+
throw new ConfigError(`MCP config: environment variable "${key}" is not set`);
|
|
132
|
+
return resolved;
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
function compileFilters(name, patterns) {
|
|
136
|
+
return patterns?.map((pattern) => {
|
|
137
|
+
try {
|
|
138
|
+
return new RegExp(interpolate(pattern));
|
|
139
|
+
}
|
|
140
|
+
catch (error) {
|
|
141
|
+
throw new ConfigError(`MCP server "${name}": invalid regex in toolFilters: ${error instanceof Error ? error.message : String(error)}`);
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Builds the OAuth-opted servers through the public `McpClient` constructor with the SDK's own
|
|
147
|
+
* `authProvider` slot (the declarative loader has no way to pass one). The translation is the
|
|
148
|
+
* loader's, restricted to what a streamable-http entry can carry; the provider is non-interactive.
|
|
149
|
+
*/
|
|
150
|
+
async function buildOAuthClients(servers) {
|
|
151
|
+
const clients = [];
|
|
152
|
+
for (const [name, entry] of Object.entries(servers)) {
|
|
153
|
+
const settings = resolveOAuthSettings(name, entry);
|
|
154
|
+
if (settings === undefined)
|
|
155
|
+
continue;
|
|
156
|
+
const provider = await createRuntimeOAuthProvider(settings);
|
|
157
|
+
const allowed = compileFilters(name, entry.toolFilters?.allowed);
|
|
158
|
+
const rejected = compileFilters(name, entry.toolFilters?.rejected);
|
|
159
|
+
const client = new McpClient({
|
|
160
|
+
applicationName: name,
|
|
161
|
+
url: settings.serverUrl,
|
|
162
|
+
authProvider: provider,
|
|
163
|
+
continueOnError: entry.continueOnError ?? true,
|
|
164
|
+
...(entry.headers === undefined
|
|
165
|
+
? {}
|
|
166
|
+
: { headers: Object.fromEntries(Object.entries(entry.headers).map(([key, value]) => [key, interpolate(value)])) }),
|
|
167
|
+
...(entry.prefix === undefined ? {} : { prefix: interpolate(entry.prefix) }),
|
|
168
|
+
...(entry.tasksConfig === undefined ? {} : { tasksConfig: entry.tasksConfig }),
|
|
169
|
+
...(allowed === undefined && rejected === undefined
|
|
170
|
+
? {}
|
|
171
|
+
: { toolFilters: { ...(allowed === undefined ? {} : { allowed }), ...(rejected === undefined ? {} : { rejected }) } }),
|
|
172
|
+
});
|
|
173
|
+
oauthProviders.set(client, provider);
|
|
174
|
+
clients.push(client);
|
|
175
|
+
}
|
|
176
|
+
return clients;
|
|
177
|
+
}
|
|
99
178
|
/**
|
|
100
179
|
* Reads and merges the MCP config files without constructing a single client:
|
|
101
180
|
* nothing is spawned and nothing connects. `darwin doctor` reports from this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/mcp/registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/mcp/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,9 @@
|
|
|
26
26
|
*
|
|
27
27
|
* The rule is fixed: one case-insensitive pattern on the variable *name*
|
|
28
28
|
* ({@link CREDENTIAL_NAME_PATTERN}); values are never inspected. There is no off
|
|
29
|
-
* switch — the
|
|
29
|
+
* switch — beside the fixed always-survive set (which includes git's paired
|
|
30
|
+
* `GIT_CONFIG_KEY_<n>` names, SER-110) the only knob is `shellEnv.passthrough`
|
|
31
|
+
* in config, which restores named
|
|
30
32
|
* variables (exact names or `PREFIX_*`). The result reports the withheld *names*,
|
|
31
33
|
* sorted, so `/status` and the startup notice can say what happened without ever
|
|
32
34
|
* printing a value. A login shell's own profile (`~/.bashrc`, `~/.profile`) may
|
|
@@ -49,6 +51,22 @@ export declare const CREDENTIAL_NAME_PATTERN: RegExp;
|
|
|
49
51
|
export declare const ALWAYS_SURVIVE_NAMES: readonly string[];
|
|
50
52
|
/** Prefixes whose every variable always survives (`LC_ALL`, `LC_CTYPE`, …). */
|
|
51
53
|
export declare const ALWAYS_SURVIVE_PREFIXES: readonly string[];
|
|
54
|
+
/**
|
|
55
|
+
* Patterns whose matching names always survive (SER-110), anchored and
|
|
56
|
+
* case-sensitive. `GIT_CONFIG_KEY_<n>` carries a git config *name*
|
|
57
|
+
* (`credential.interactive`), and git refuses to run at all when
|
|
58
|
+
* `GIT_CONFIG_COUNT` is set but a pair's KEY is missing ("Any missing key or
|
|
59
|
+
* value is treated as an error"). The pattern matched `KEY` here, while the paired
|
|
60
|
+
* `GIT_CONFIG_VALUE_<n>` and `GIT_CONFIG_COUNT` never matched, so an IDE-injected
|
|
61
|
+
* COUNT made every model-shell `git` call exit 128. Keeping the KEY names exposes
|
|
62
|
+
* no value the shell did not already get: the values travel in the VALUE names.
|
|
63
|
+
* The suffix must be the canonical decimal index git itself formats
|
|
64
|
+
* (`GIT_CONFIG_KEY_%d`: `0`, `12`, never `01`), so `GIT_CONFIG_KEY_TOKEN` or
|
|
65
|
+
* `GIT_CONFIG_KEY_` stays withheld. The rule is unconditional, not tied to
|
|
66
|
+
* `GIT_CONFIG_COUNT` being present: without a COUNT git ignores the KEYs anyway,
|
|
67
|
+
* and a per-name rule keeps the scrub a function of each name alone.
|
|
68
|
+
*/
|
|
69
|
+
export declare const ALWAYS_SURVIVE_PATTERNS: readonly RegExp[];
|
|
52
70
|
export interface ScrubbedShellEnv {
|
|
53
71
|
/** The environment to hand to `spawn` — defined values only, as before the scrub. */
|
|
54
72
|
readonly env: Record<string, string>;
|
|
@@ -92,6 +110,14 @@ export declare const DARWIN_MARKER_VALUE = "1";
|
|
|
92
110
|
export declare function withDarwinMarker(env: NodeJS.ProcessEnv): Record<string, string>;
|
|
93
111
|
/** Representative withheld names in the startup notice before `…` takes over. */
|
|
94
112
|
export declare const MAX_NOTICE_NAMES = 3;
|
|
113
|
+
/**
|
|
114
|
+
* The one bounding rule for naming withheld variables, shared by the user's
|
|
115
|
+
* startup notice and the model's `<working-context>` line (SER-111): the first
|
|
116
|
+
* {@link MAX_NOTICE_NAMES} names, comma-separated, then `, …` when there are
|
|
117
|
+
* more. Names only — the input is the scrub's `withheld` list, which never
|
|
118
|
+
* carries a value.
|
|
119
|
+
*/
|
|
120
|
+
export declare function formatWithheldNames(withheld: readonly string[]): string;
|
|
95
121
|
/**
|
|
96
122
|
* The one sentence every driver's startup notice carries when something was
|
|
97
123
|
* withheld: a count plus a few names, never a value. Callers add their own
|
|
@@ -26,7 +26,9 @@
|
|
|
26
26
|
*
|
|
27
27
|
* The rule is fixed: one case-insensitive pattern on the variable *name*
|
|
28
28
|
* ({@link CREDENTIAL_NAME_PATTERN}); values are never inspected. There is no off
|
|
29
|
-
* switch — the
|
|
29
|
+
* switch — beside the fixed always-survive set (which includes git's paired
|
|
30
|
+
* `GIT_CONFIG_KEY_<n>` names, SER-110) the only knob is `shellEnv.passthrough`
|
|
31
|
+
* in config, which restores named
|
|
30
32
|
* variables (exact names or `PREFIX_*`). The result reports the withheld *names*,
|
|
31
33
|
* sorted, so `/status` and the startup notice can say what happened without ever
|
|
32
34
|
* printing a value. A login shell's own profile (`~/.bashrc`, `~/.profile`) may
|
|
@@ -65,6 +67,22 @@ export const ALWAYS_SURVIVE_NAMES = [
|
|
|
65
67
|
];
|
|
66
68
|
/** Prefixes whose every variable always survives (`LC_ALL`, `LC_CTYPE`, …). */
|
|
67
69
|
export const ALWAYS_SURVIVE_PREFIXES = ['LC_'];
|
|
70
|
+
/**
|
|
71
|
+
* Patterns whose matching names always survive (SER-110), anchored and
|
|
72
|
+
* case-sensitive. `GIT_CONFIG_KEY_<n>` carries a git config *name*
|
|
73
|
+
* (`credential.interactive`), and git refuses to run at all when
|
|
74
|
+
* `GIT_CONFIG_COUNT` is set but a pair's KEY is missing ("Any missing key or
|
|
75
|
+
* value is treated as an error"). The pattern matched `KEY` here, while the paired
|
|
76
|
+
* `GIT_CONFIG_VALUE_<n>` and `GIT_CONFIG_COUNT` never matched, so an IDE-injected
|
|
77
|
+
* COUNT made every model-shell `git` call exit 128. Keeping the KEY names exposes
|
|
78
|
+
* no value the shell did not already get: the values travel in the VALUE names.
|
|
79
|
+
* The suffix must be the canonical decimal index git itself formats
|
|
80
|
+
* (`GIT_CONFIG_KEY_%d`: `0`, `12`, never `01`), so `GIT_CONFIG_KEY_TOKEN` or
|
|
81
|
+
* `GIT_CONFIG_KEY_` stays withheld. The rule is unconditional, not tied to
|
|
82
|
+
* `GIT_CONFIG_COUNT` being present: without a COUNT git ignores the KEYs anyway,
|
|
83
|
+
* and a per-name rule keeps the scrub a function of each name alone.
|
|
84
|
+
*/
|
|
85
|
+
export const ALWAYS_SURVIVE_PATTERNS = [/^GIT_CONFIG_KEY_(?:0|[1-9][0-9]*)$/];
|
|
68
86
|
/**
|
|
69
87
|
* Why a `shellEnv.passthrough` entry is unusable, or undefined when it is valid.
|
|
70
88
|
* An entry is an exact variable name, or a prefix followed by exactly one
|
|
@@ -99,7 +117,9 @@ function passesThrough(name, passthrough) {
|
|
|
99
117
|
return false;
|
|
100
118
|
}
|
|
101
119
|
function alwaysSurvives(name) {
|
|
102
|
-
return ALWAYS_SURVIVE_NAMES.includes(name) ||
|
|
120
|
+
return ALWAYS_SURVIVE_NAMES.includes(name) ||
|
|
121
|
+
ALWAYS_SURVIVE_PREFIXES.some((prefix) => name.startsWith(prefix)) ||
|
|
122
|
+
ALWAYS_SURVIVE_PATTERNS.some((pattern) => pattern.test(name));
|
|
103
123
|
}
|
|
104
124
|
/**
|
|
105
125
|
* Split `env` into what a model-spawned shell may inherit and the names withheld.
|
|
@@ -156,6 +176,17 @@ export function withDarwinMarker(env) {
|
|
|
156
176
|
}
|
|
157
177
|
/** Representative withheld names in the startup notice before `…` takes over. */
|
|
158
178
|
export const MAX_NOTICE_NAMES = 3;
|
|
179
|
+
/**
|
|
180
|
+
* The one bounding rule for naming withheld variables, shared by the user's
|
|
181
|
+
* startup notice and the model's `<working-context>` line (SER-111): the first
|
|
182
|
+
* {@link MAX_NOTICE_NAMES} names, comma-separated, then `, …` when there are
|
|
183
|
+
* more. Names only — the input is the scrub's `withheld` list, which never
|
|
184
|
+
* carries a value.
|
|
185
|
+
*/
|
|
186
|
+
export function formatWithheldNames(withheld) {
|
|
187
|
+
const shown = withheld.slice(0, MAX_NOTICE_NAMES);
|
|
188
|
+
return withheld.length > shown.length ? `${shown.join(', ')}, …` : shown.join(', ');
|
|
189
|
+
}
|
|
159
190
|
/**
|
|
160
191
|
* The one sentence every driver's startup notice carries when something was
|
|
161
192
|
* withheld: a count plus a few names, never a value. Callers add their own
|
|
@@ -165,9 +196,7 @@ export const MAX_NOTICE_NAMES = 3;
|
|
|
165
196
|
export function formatShellEnvNotice(withheld) {
|
|
166
197
|
if (withheld.length === 0)
|
|
167
198
|
return undefined;
|
|
168
|
-
const shown = withheld.slice(0, MAX_NOTICE_NAMES);
|
|
169
|
-
const names = withheld.length > shown.length ? `${shown.join(', ')}, …` : shown.join(', ');
|
|
170
199
|
const noun = withheld.length === 1 ? 'variable' : 'variables';
|
|
171
|
-
return `${withheld.length} credential-shaped ${noun} withheld from model shells (${
|
|
200
|
+
return `${withheld.length} credential-shaped ${noun} withheld from model shells (${formatWithheldNames(withheld)})`;
|
|
172
201
|
}
|
|
173
202
|
//# sourceMappingURL=shell-env.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-env.js","sourceRoot":"","sources":["../../../src/tools/shell-env.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"shell-env.js","sourceRoot":"","sources":["../../../src/tools/shell-env.ts"],"names":[],"mappings":"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"}
|
package/dist/src/tui/App.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ import type { AppConfig, ModelChoice } from '../config.js';
|
|
|
9
9
|
import type { TrajectoryStatus } from '../trajectory/writer.js';
|
|
10
10
|
import type { PermissionQueue } from './permission-queue.js';
|
|
11
11
|
import { type TangentState } from './tangent.js';
|
|
12
|
+
import { type GoalState } from './goal.js';
|
|
12
13
|
import { type HistoryItem, type TurnAction } from './turn-state.js';
|
|
13
14
|
type Status = 'idle' | 'streaming' | 'shell' | 'compacting' | 'awaiting-permission';
|
|
14
15
|
export declare function App({ runtime: initialRuntime, permissions, initialHistory, startNewSession, startRewind, }: {
|
|
@@ -25,13 +26,15 @@ export declare function App({ runtime: initialRuntime, permissions, initialHisto
|
|
|
25
26
|
/** Fresh source-preserving conversation branch; the selected prompt is not sent. */
|
|
26
27
|
readonly startRewind?: (checkpoint: import('../agent/rewind.js').RewindCheckpoint) => Promise<AgentRuntime>;
|
|
27
28
|
}): React.JSX.Element;
|
|
28
|
-
export declare function Header({ runtime, status, frame, tangent, runningTaskCount, draftStashed, }: {
|
|
29
|
+
export declare function Header({ runtime, status, frame, tangent, goal, runningTaskCount, draftStashed, }: {
|
|
29
30
|
readonly runtime: AgentRuntime;
|
|
30
31
|
readonly status?: Status;
|
|
31
32
|
/** Existing App spinner tick; the header never owns a timer. */
|
|
32
33
|
readonly frame?: number;
|
|
33
34
|
/** Live `/tangent` state (SER-083); a suffix on the state word, never a row. */
|
|
34
35
|
readonly tangent?: TangentState | undefined;
|
|
36
|
+
/** Live `/goal` state (SER-108); a suffix on the same state word as the tangent, never a row. */
|
|
37
|
+
readonly goal?: GoalState | undefined;
|
|
35
38
|
/** Only running bash jobs; history stays in /tasks, never in this count. */
|
|
36
39
|
readonly runningTaskCount?: number;
|
|
37
40
|
/** Idle has no InputBox hint: use the existing header hint, never add a row. */
|