@sortedyuan/maybecode 0.3.2 → 0.5.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/README.md +166 -55
- package/README.zh-CN.md +267 -0
- package/dist/application.d.ts +40 -34
- package/dist/application.d.ts.map +1 -1
- package/dist/application.js +290 -170
- package/dist/application.js.map +1 -1
- package/dist/args.d.ts +2 -2
- package/dist/args.d.ts.map +1 -1
- package/dist/args.js +50 -27
- package/dist/args.js.map +1 -1
- package/dist/bin.js +82 -71
- package/dist/bin.js.map +4 -4
- package/dist/cli/chunk-3IORPKBL.js +3572 -0
- package/dist/cli/chunk-3IORPKBL.js.map +7 -0
- package/dist/cli/{chunk-LVTRXPDS.js → chunk-4B2Z6KW7.js} +1547 -1536
- package/dist/cli/chunk-4B2Z6KW7.js.map +7 -0
- package/dist/cli/{chunk-JT6VBKOM.js → chunk-4WG6JIJJ.js} +127 -33
- package/dist/cli/{chunk-JT6VBKOM.js.map → chunk-4WG6JIJJ.js.map} +3 -3
- package/dist/cli/{chunk-K5JWPNSY.js → chunk-5SLWALZK.js} +3521 -16164
- package/dist/cli/chunk-5SLWALZK.js.map +7 -0
- package/dist/cli/chunk-MNBYXL5Y.js +132 -0
- package/dist/cli/chunk-MNBYXL5Y.js.map +7 -0
- package/dist/cli/{chunk-F4XRPLUM.js → chunk-SLWLUEHQ.js} +226 -86
- package/dist/cli/chunk-SLWLUEHQ.js.map +7 -0
- package/dist/cli/chunk-UQDZ55LQ.js +199 -0
- package/dist/cli/chunk-UQDZ55LQ.js.map +7 -0
- package/dist/cli/{chunk-7ISOHFS7.js → chunk-WMSG5ZTR.js} +717 -388
- package/dist/cli/chunk-WMSG5ZTR.js.map +7 -0
- package/dist/cli/chunk-WVIRS76R.js +4057 -0
- package/dist/cli/chunk-WVIRS76R.js.map +7 -0
- package/dist/cli/{chunk-HOU5ITUK.js → chunk-XTEMRAQW.js} +1 -1
- package/dist/cli/chunk-XTEMRAQW.js.map +7 -0
- package/dist/cli/chunk-Z3BOPBVU.js +91 -0
- package/dist/cli/chunk-Z3BOPBVU.js.map +7 -0
- package/dist/cli/{configured-WHY3GGAJ.js → configured-ACNM6TRQ.js} +10 -9
- package/dist/cli/{file-type-R2T7TBHI.js → file-type-HLHPV7WC.js} +817 -13
- package/dist/cli/file-type-HLHPV7WC.js.map +7 -0
- package/dist/cli/mcp-auth-XD5U7WCV.js +74 -0
- package/dist/cli/mcp-auth-XD5U7WCV.js.map +7 -0
- package/dist/cli/onboarding-WQWCPYEO.js +530 -0
- package/dist/cli/onboarding-WQWCPYEO.js.map +7 -0
- package/dist/cli/onboarding-check-HRRI5OJ7.js +32 -0
- package/dist/cli/onboarding-check-HRRI5OJ7.js.map +7 -0
- package/dist/cli/{retained-tui-VJ3VX4R3.js → retained-tui-QF5VMYLC.js} +788 -332
- package/dist/cli/retained-tui-QF5VMYLC.js.map +7 -0
- package/dist/cli/{sixel-LWTCM76G.js → sixel-ISZ4FZ3U.js} +37 -37
- package/dist/cli/{sixel-LWTCM76G.js.map → sixel-ISZ4FZ3U.js.map} +1 -1
- package/dist/cli/{team-T7G7PPNN.js → team-O2I5BXHM.js} +7 -6
- package/dist/cli/{team-v2-JGBBQ7FR.js → team-v2-YYO2G7DJ.js} +816 -390
- package/dist/cli/team-v2-YYO2G7DJ.js.map +7 -0
- package/dist/cli/{web-server-FOMNPY7Q.js → web-server-SXMH6FGA.js} +55 -19
- package/dist/cli/web-server-SXMH6FGA.js.map +7 -0
- package/dist/cli/{web-ui-COB6PKC5.js → web-ui-UWQUFE4W.js} +7 -6
- package/dist/config-schema.json +337 -0
- package/dist/configured.d.ts +18 -11
- package/dist/configured.d.ts.map +1 -1
- package/dist/configured.js +213 -390
- package/dist/configured.js.map +1 -1
- package/dist/controller.d.ts +19 -18
- package/dist/controller.d.ts.map +1 -1
- package/dist/delegation-commands.d.ts +1 -1
- package/dist/delegation-commands.d.ts.map +1 -1
- package/dist/delegation-commands.js +8 -8
- package/dist/delegation-commands.js.map +1 -1
- package/dist/errors.d.ts +2 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +2 -1
- package/dist/errors.js.map +1 -1
- package/dist/events.d.ts +8 -6
- package/dist/events.d.ts.map +1 -1
- package/dist/fork-picker.d.ts.map +1 -1
- package/dist/fork-picker.js +19 -5
- package/dist/fork-picker.js.map +1 -1
- package/dist/git-request.d.ts +6 -6
- package/dist/git-request.d.ts.map +1 -1
- package/dist/git-request.js +28 -15
- package/dist/git-request.js.map +1 -1
- package/dist/goal-commands.d.ts +1 -1
- package/dist/goal-commands.d.ts.map +1 -1
- package/dist/goal-commands.js +12 -5
- package/dist/goal-commands.js.map +1 -1
- package/dist/index.d.ts +5 -37
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -36
- package/dist/index.js.map +1 -1
- package/dist/instructions.d.ts +2 -7
- package/dist/instructions.d.ts.map +1 -1
- package/dist/instructions.js +7 -15
- package/dist/instructions.js.map +1 -1
- package/dist/keymap.d.ts +2 -2
- package/dist/keymap.d.ts.map +1 -1
- package/dist/keymap.js +2 -2
- package/dist/keymap.js.map +1 -1
- package/dist/maybecode-config.schema.json +1765 -0
- package/dist/mcp-auth.d.ts +1 -1
- package/dist/mcp-auth.d.ts.map +1 -1
- package/dist/mcp-auth.js +11 -8
- package/dist/mcp-auth.js.map +1 -1
- package/dist/mcp-commands.d.ts.map +1 -1
- package/dist/mcp-commands.js +18 -4
- package/dist/mcp-commands.js.map +1 -1
- package/dist/mcp-interaction-ui.d.ts.map +1 -1
- package/dist/mcp-interaction-ui.js +11 -4
- package/dist/mcp-interaction-ui.js.map +1 -1
- package/dist/media-history.d.ts +1 -1
- package/dist/media-history.d.ts.map +1 -1
- package/dist/media-history.js +8 -2
- package/dist/media-history.js.map +1 -1
- package/dist/model-picker.d.ts.map +1 -1
- package/dist/model-picker.js +10 -11
- package/dist/model-picker.js.map +1 -1
- package/dist/model-transition.d.ts +11 -0
- package/dist/model-transition.d.ts.map +1 -0
- package/dist/model-transition.js +48 -0
- package/dist/model-transition.js.map +1 -0
- package/dist/model.d.ts +2 -2
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +8 -4
- package/dist/model.js.map +1 -1
- package/dist/onboarding-check.d.ts +3 -0
- package/dist/onboarding-check.d.ts.map +1 -0
- package/dist/onboarding-check.js +22 -0
- package/dist/onboarding-check.js.map +1 -0
- package/dist/onboarding.d.ts +6 -0
- package/dist/onboarding.d.ts.map +1 -0
- package/dist/onboarding.js +463 -0
- package/dist/onboarding.js.map +1 -0
- package/dist/plugins/application.d.ts +6 -4
- package/dist/plugins/application.d.ts.map +1 -1
- package/dist/plugins/application.js +106 -52
- package/dist/plugins/application.js.map +1 -1
- package/dist/plugins/instructions.d.ts +1 -1
- package/dist/plugins/instructions.d.ts.map +1 -1
- package/dist/plugins/instructions.js +24 -11
- package/dist/plugins/instructions.js.map +1 -1
- package/dist/plugins/resources.d.ts +2 -2
- package/dist/plugins/resources.d.ts.map +1 -1
- package/dist/plugins/resources.js +22 -12
- package/dist/plugins/resources.js.map +1 -1
- package/dist/policy.d.ts +1 -1
- package/dist/policy.d.ts.map +1 -1
- package/dist/policy.js +59 -11
- package/dist/policy.js.map +1 -1
- package/dist/run.d.ts +2 -0
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +38 -33
- package/dist/run.js.map +1 -1
- package/dist/runtime-instructions.d.ts +1 -1
- package/dist/runtime-instructions.d.ts.map +1 -1
- package/dist/runtime-instructions.js +15 -7
- package/dist/runtime-instructions.js.map +1 -1
- package/dist/session-navigation.d.ts +6 -0
- package/dist/session-navigation.d.ts.map +1 -0
- package/dist/session-navigation.js +64 -0
- package/dist/session-navigation.js.map +1 -0
- package/dist/session-picker.d.ts +1 -1
- package/dist/session-picker.d.ts.map +1 -1
- package/dist/session-picker.js +23 -32
- package/dist/session-picker.js.map +1 -1
- package/dist/settings.d.ts +718 -0
- package/dist/settings.d.ts.map +1 -0
- package/dist/settings.js +14 -0
- package/dist/settings.js.map +1 -0
- package/dist/skills.d.ts +1 -1
- package/dist/skills.d.ts.map +1 -1
- package/dist/skills.js +10 -12
- package/dist/skills.js.map +1 -1
- package/dist/slash-commands.d.ts +2 -2
- package/dist/slash-commands.d.ts.map +1 -1
- package/dist/slash-commands.js +149 -67
- package/dist/slash-commands.js.map +1 -1
- package/dist/team-execution.d.ts +10 -0
- package/dist/team-execution.d.ts.map +1 -0
- package/dist/team-execution.js +29 -0
- package/dist/team-execution.js.map +1 -0
- package/dist/team-patches.d.ts.map +1 -1
- package/dist/team-patches.js +149 -52
- package/dist/team-patches.js.map +1 -1
- package/dist/team-plan.d.ts +2 -2
- package/dist/team-plan.d.ts.map +1 -1
- package/dist/team-plan.js +115 -34
- package/dist/team-plan.js.map +1 -1
- package/dist/team-recovery.d.ts +1 -1
- package/dist/team-recovery.d.ts.map +1 -1
- package/dist/team-recovery.js +40 -10
- package/dist/team-recovery.js.map +1 -1
- package/dist/team-v2.d.ts.map +1 -1
- package/dist/team-v2.js +335 -104
- package/dist/team-v2.js.map +1 -1
- package/dist/team-verification.d.ts +4 -2
- package/dist/team-verification.d.ts.map +1 -1
- package/dist/team-verification.js +300 -97
- package/dist/team-verification.js.map +1 -1
- package/dist/team.d.ts +2 -2
- package/dist/team.d.ts.map +1 -1
- package/dist/team.js +172 -62
- package/dist/team.js.map +1 -1
- package/dist/terminal-web.d.ts +1 -0
- package/dist/terminal-web.d.ts.map +1 -1
- package/dist/terminal-web.js +28 -10
- package/dist/terminal-web.js.map +1 -1
- package/dist/ui/actions.d.ts.map +1 -1
- package/dist/ui/actions.js.map +1 -1
- package/dist/ui/retained-tui.d.ts.map +1 -1
- package/dist/ui/retained-tui.js +231 -173
- package/dist/ui/retained-tui.js.map +1 -1
- package/dist/ui/{prototype-view.d.ts → terminal-view.d.ts} +7 -7
- package/dist/ui/terminal-view.d.ts.map +1 -0
- package/dist/ui/{prototype-view.js → terminal-view.js} +185 -98
- package/dist/ui/terminal-view.js.map +1 -0
- package/dist/web-commands.d.ts.map +1 -1
- package/dist/web-commands.js +160 -57
- package/dist/web-commands.js.map +1 -1
- package/dist/web-extension.d.ts.map +1 -1
- package/dist/web-extension.js +14 -4
- package/dist/web-extension.js.map +1 -1
- package/dist/web-server.d.ts.map +1 -1
- package/dist/web-server.js +2 -1
- package/dist/web-server.js.map +1 -1
- package/dist/web-ui.d.ts.map +1 -1
- package/dist/web-ui.js +167 -40
- package/dist/web-ui.js.map +1 -1
- package/dist/workspace-configuration.d.ts +7 -0
- package/dist/workspace-configuration.d.ts.map +1 -0
- package/dist/workspace-configuration.js +134 -0
- package/dist/workspace-configuration.js.map +1 -0
- package/dist/workspace-state.d.ts +20 -0
- package/dist/workspace-state.d.ts.map +1 -0
- package/dist/workspace-state.js +2 -0
- package/dist/workspace-state.js.map +1 -0
- package/dist/workspace.d.ts +26 -43
- package/dist/workspace.d.ts.map +1 -1
- package/dist/workspace.js +261 -323
- package/dist/workspace.js.map +1 -1
- package/package.json +21 -31
- package/dist/cli/chunk-7ISOHFS7.js.map +0 -7
- package/dist/cli/chunk-F4XRPLUM.js.map +0 -7
- package/dist/cli/chunk-H7SNBFO4.js +0 -5522
- package/dist/cli/chunk-H7SNBFO4.js.map +0 -7
- package/dist/cli/chunk-HOU5ITUK.js.map +0 -7
- package/dist/cli/chunk-K5JWPNSY.js.map +0 -7
- package/dist/cli/chunk-LVTRXPDS.js.map +0 -7
- package/dist/cli/chunk-VAZMCNBB.js +0 -686
- package/dist/cli/chunk-VAZMCNBB.js.map +0 -7
- package/dist/cli/chunk-WOFEI42C.js +0 -7820
- package/dist/cli/chunk-WOFEI42C.js.map +0 -7
- package/dist/cli/file-type-R2T7TBHI.js.map +0 -7
- package/dist/cli/mcp-auth-UNRHSIKJ.js +0 -63
- package/dist/cli/mcp-auth-UNRHSIKJ.js.map +0 -7
- package/dist/cli/retained-tui-VJ3VX4R3.js.map +0 -7
- package/dist/cli/team-v2-JGBBQ7FR.js.map +0 -7
- package/dist/cli/tui-SA74DKMA.js +0 -1705
- package/dist/cli/tui-SA74DKMA.js.map +0 -7
- package/dist/cli/web-server-FOMNPY7Q.js.map +0 -7
- package/dist/delegation.d.ts +0 -2
- package/dist/delegation.d.ts.map +0 -1
- package/dist/delegation.js +0 -2
- package/dist/delegation.js.map +0 -1
- package/dist/history-memory.d.ts +0 -2
- package/dist/history-memory.d.ts.map +0 -1
- package/dist/history-memory.js +0 -2
- package/dist/history-memory.js.map +0 -1
- package/dist/subagent-budget.d.ts +0 -2
- package/dist/subagent-budget.d.ts.map +0 -1
- package/dist/subagent-budget.js +0 -2
- package/dist/subagent-budget.js.map +0 -1
- package/dist/subagent-files.d.ts +0 -2
- package/dist/subagent-files.d.ts.map +0 -1
- package/dist/subagent-files.js +0 -2
- package/dist/subagent-files.js.map +0 -1
- package/dist/subagent-host.d.ts +0 -2
- package/dist/subagent-host.d.ts.map +0 -1
- package/dist/subagent-host.js +0 -2
- package/dist/subagent-host.js.map +0 -1
- package/dist/subagent-instructions.d.ts +0 -2
- package/dist/subagent-instructions.d.ts.map +0 -1
- package/dist/subagent-instructions.js +0 -2
- package/dist/subagent-instructions.js.map +0 -1
- package/dist/subagents.d.ts +0 -2
- package/dist/subagents.d.ts.map +0 -1
- package/dist/subagents.js +0 -2
- package/dist/subagents.js.map +0 -1
- package/dist/summarizer.d.ts +0 -2
- package/dist/summarizer.d.ts.map +0 -1
- package/dist/summarizer.js +0 -2
- package/dist/summarizer.js.map +0 -1
- package/dist/tui.d.ts +0 -7
- package/dist/tui.d.ts.map +0 -1
- package/dist/tui.js +0 -1109
- package/dist/tui.js.map +0 -1
- package/dist/ui/prototype-view.d.ts.map +0 -1
- package/dist/ui/prototype-view.js.map +0 -1
- /package/dist/cli/{configured-WHY3GGAJ.js.map → configured-ACNM6TRQ.js.map} +0 -0
- /package/dist/cli/{team-T7G7PPNN.js.map → team-O2I5BXHM.js.map} +0 -0
- /package/dist/cli/{web-ui-COB6PKC5.js.map → web-ui-UWQUFE4W.js.map} +0 -0
package/dist/mcp-auth.d.ts
CHANGED
package/dist/mcp-auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-auth.d.ts","sourceRoot":"","sources":["../src/mcp-auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"mcp-auth.d.ts","sourceRoot":"","sources":["../src/mcp-auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEvE,OAAO,EAA6B,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAIrD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AAED,2FAA2F;AAC3F,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,mBAAmB,EAC5B,YAAY,EAAE,4BAA4B,GACzC,OAAO,CAAC,IAAI,CAAC,CA6Cf"}
|
package/dist/mcp-auth.js
CHANGED
|
@@ -1,28 +1,31 @@
|
|
|
1
1
|
import { resolve, join } from "node:path";
|
|
2
|
-
import { loadMayConfig } from "@sortedyuan/config";
|
|
2
|
+
import { loadMayConfig } from "@sortedyuan/may/config";
|
|
3
|
+
import { omitUndefined } from "@sortedyuan/may/core";
|
|
3
4
|
import { KeyringMcpCredentialStore, McpOAuthManager } from "@sortedyuan/mcp";
|
|
4
5
|
import { getDefaultMaybeCodeDataDirectory, resolveMaybeCodeMcp } from "./configured.js";
|
|
5
6
|
import { MaybeCodeConfigError } from "./errors.js";
|
|
6
7
|
/** Authentication is available before agent/model startup, even for required endpoints. */
|
|
7
8
|
export async function runMaybeCodeMcpCommand(command, dependencies) {
|
|
8
9
|
const config = await (dependencies.loadConfig?.(command.configPath) ??
|
|
9
|
-
loadMayConfig(
|
|
10
|
+
loadMayConfig(omitUndefined({ path: command.configPath })));
|
|
10
11
|
const mcp = resolveMaybeCodeMcp(config, resolve(command.workspace ?? process.cwd()));
|
|
11
12
|
const server = mcp === false ? undefined : mcp.servers.find((entry) => entry.id === command.serverId);
|
|
12
13
|
if (server?.transport !== "streamable-http" || server.auth === undefined) {
|
|
13
14
|
throw new MaybeCodeConfigError(`MCP server "${command.serverId}" is missing, disabled, or not configured for OAuth`);
|
|
14
15
|
}
|
|
15
|
-
const oauth = dependencies.oauth ??
|
|
16
|
+
const oauth = dependencies.oauth ??
|
|
17
|
+
new McpOAuthManager(new KeyringMcpCredentialStore(join(getDefaultMaybeCodeDataDirectory(), "mcp-credentials")));
|
|
16
18
|
switch (command.action) {
|
|
17
19
|
case "login":
|
|
18
20
|
await oauth.login({
|
|
19
21
|
...server,
|
|
20
|
-
auth: { ...server.auth, scopes: [...server.auth.scopes ?? [], ...command.scopes ?? []] },
|
|
22
|
+
auth: { ...server.auth, scopes: [...(server.auth.scopes ?? []), ...(command.scopes ?? [])] },
|
|
21
23
|
}, {
|
|
22
|
-
onAuthorizationUrl: dependencies.onAuthorizationUrl ??
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
onAuthorizationUrl: dependencies.onAuthorizationUrl ??
|
|
25
|
+
((url) => {
|
|
26
|
+
dependencies.write(`Open this URL in your browser to authorize MCP server ${server.id}:\n${url.href}\nWaiting for authorization (Ctrl+C to cancel)...\n`);
|
|
27
|
+
}),
|
|
28
|
+
...omitUndefined({ signal: dependencies.signal }),
|
|
26
29
|
});
|
|
27
30
|
dependencies.write(`MCP server ${server.id}: login complete. Restart an already-running workspace to reconnect.\n`);
|
|
28
31
|
return;
|
package/dist/mcp-auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-auth.js","sourceRoot":"","sources":["../src/mcp-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAkB,MAAM,
|
|
1
|
+
{"version":3,"file":"mcp-auth.js","sourceRoot":"","sources":["../src/mcp-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-commands.d.ts","sourceRoot":"","sources":["../src/mcp-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAEvE,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"mcp-commands.d.ts","sourceRoot":"","sources":["../src/mcp-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAEvE,eAAO,MAAM,iBAAiB,kfACmd,CAAC;AAElf,uFAAuF;AACvF,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAAC,2BAA2B,CAAC,CAsHtC"}
|
package/dist/mcp-commands.js
CHANGED
|
@@ -12,15 +12,26 @@ export async function executeMcpCommand(input, controller) {
|
|
|
12
12
|
return { type: "mcp.status", servers: await controller.getMcpStatus() };
|
|
13
13
|
if (action === "tasks" && tail === undefined && controller.listMcpTasks !== undefined) {
|
|
14
14
|
const records = (await controller.listMcpTasks()).filter((record) => serverId === undefined || record.binding.serverId === serverId);
|
|
15
|
-
return display(JSON.stringify(records.map(({ id, binding, status, cancellation }) => ({
|
|
15
|
+
return display(JSON.stringify(records.map(({ id, binding, status, cancellation }) => ({
|
|
16
|
+
id,
|
|
17
|
+
server: binding.serverId,
|
|
18
|
+
tool: binding.toolName,
|
|
19
|
+
status,
|
|
20
|
+
cancellation,
|
|
21
|
+
})), null, 2));
|
|
16
22
|
}
|
|
17
23
|
if (action === "catalog" && tail === undefined && controller.getMcpCatalog !== undefined) {
|
|
18
|
-
const catalogs = controller
|
|
24
|
+
const catalogs = controller
|
|
25
|
+
.getMcpCatalog()
|
|
26
|
+
.filter((catalog) => serverId === undefined || catalog.serverId === serverId);
|
|
19
27
|
return display(JSON.stringify(catalogs, null, 2));
|
|
20
28
|
}
|
|
21
29
|
if (action === "refresh" && tail === undefined && controller.refreshMcp !== undefined)
|
|
22
30
|
await controller.refreshMcp(serverId);
|
|
23
|
-
else if (action === "reconnect" &&
|
|
31
|
+
else if (action === "reconnect" &&
|
|
32
|
+
serverId !== undefined &&
|
|
33
|
+
tail === undefined &&
|
|
34
|
+
controller.reconnectMcp !== undefined)
|
|
24
35
|
await controller.reconnectMcp(serverId);
|
|
25
36
|
else {
|
|
26
37
|
if (serverId === undefined || tail === undefined)
|
|
@@ -64,7 +75,10 @@ export async function executeMcpCommand(input, controller) {
|
|
|
64
75
|
return display(previewMcpMessage(mcpPromptToUserMessage(await controller.getMcpPrompt(serverId, name, rest === undefined ? {} : JSON.parse(rest)))));
|
|
65
76
|
}
|
|
66
77
|
if (action === "use-prompt" && controller.submitMcpPrompt !== undefined) {
|
|
67
|
-
return {
|
|
78
|
+
return {
|
|
79
|
+
type: "mcp.run-started",
|
|
80
|
+
run: await controller.submitMcpPrompt(serverId, name, rest === undefined ? {} : JSON.parse(rest)),
|
|
81
|
+
};
|
|
68
82
|
}
|
|
69
83
|
if (action === "watch" && rest === undefined && controller.watchMcpResource !== undefined) {
|
|
70
84
|
await controller.watchMcpResource(serverId, name);
|
package/dist/mcp-commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-commands.js","sourceRoot":"","sources":["../src/mcp-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAItG,MAAM,CAAC,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"mcp-commands.js","sourceRoot":"","sources":["../src/mcp-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-interaction-ui.d.ts","sourceRoot":"","sources":["../src/mcp-interaction-ui.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,4FAA4F;AAC5F,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EACzE,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"mcp-interaction-ui.d.ts","sourceRoot":"","sources":["../src/mcp-interaction-ui.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,4FAA4F;AAC5F,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EACzE,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CAoHf"}
|
|
@@ -18,7 +18,9 @@ export async function presentMcpInteraction(request, app, ask, signal) {
|
|
|
18
18
|
let edited = false;
|
|
19
19
|
for (;;) {
|
|
20
20
|
const choice = (await question(`${header}\nHost review: ${request.params.kind}\n${JSON.stringify(data, null, 2)}\n${error}` +
|
|
21
|
-
`Type allow to approve${request.params.editable ? ", edit to change the JSON" : ""}, decline, or cancel: `))
|
|
21
|
+
`Type allow to approve${request.params.editable ? ", edit to change the JSON" : ""}, decline, or cancel: `))
|
|
22
|
+
?.trim()
|
|
23
|
+
.toLowerCase();
|
|
22
24
|
if (choice === "edit" && request.params.editable) {
|
|
23
25
|
try {
|
|
24
26
|
const input = await question(`${header}\nEnter the replacement JSON document (reviewed again before sending), or cancel: `);
|
|
@@ -37,7 +39,8 @@ export async function presentMcpInteraction(request, app, ask, signal) {
|
|
|
37
39
|
}
|
|
38
40
|
continue;
|
|
39
41
|
}
|
|
40
|
-
app.respondMcpInteraction(request.id, {
|
|
42
|
+
app.respondMcpInteraction(request.id, {
|
|
43
|
+
action: choice === "allow" ? "accept" : choice === "decline" ? "decline" : "cancel",
|
|
41
44
|
...(choice !== "allow" || !edited ? {} : { content: { json: JSON.stringify(data) } }),
|
|
42
45
|
});
|
|
43
46
|
return;
|
|
@@ -58,7 +61,9 @@ export async function presentMcpInteraction(request, app, ask, signal) {
|
|
|
58
61
|
"This is an untrusted external website, not MCP client login. Nothing opens automatically.\n" +
|
|
59
62
|
"Type accept to consent, decline to refuse, or cancel to dismiss: ");
|
|
60
63
|
if (consent?.trim().toLowerCase() !== "accept") {
|
|
61
|
-
app.respondMcpInteraction(request.id, {
|
|
64
|
+
app.respondMcpInteraction(request.id, {
|
|
65
|
+
action: consent?.trim().toLowerCase() === "decline" ? "decline" : "cancel",
|
|
66
|
+
});
|
|
62
67
|
return;
|
|
63
68
|
}
|
|
64
69
|
const resume = await question(`${header}\nOpen the displayed URL yourself if you wish.\n` +
|
|
@@ -70,7 +75,9 @@ export async function presentMcpInteraction(request, app, ask, signal) {
|
|
|
70
75
|
`Requested form (untrusted):\n${JSON.stringify(request.params.requestedSchema, null, 2)}\n${error}` +
|
|
71
76
|
"Enter a JSON object, decline, or cancel: ");
|
|
72
77
|
if (answer === undefined || ["decline", "cancel"].includes(answer.trim().toLowerCase())) {
|
|
73
|
-
app.respondMcpInteraction(request.id, {
|
|
78
|
+
app.respondMcpInteraction(request.id, {
|
|
79
|
+
action: answer?.trim().toLowerCase() === "decline" ? "decline" : "cancel",
|
|
80
|
+
});
|
|
74
81
|
return;
|
|
75
82
|
}
|
|
76
83
|
let content;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-interaction-ui.js","sourceRoot":"","sources":["../src/mcp-interaction-ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAIvD,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAA8B,EAC9B,GAAwB,EACxB,GAAyE,EACzE,MAAmB;IAEnB,IAAI,GAAG,CAAC,qBAAqB,KAAK,SAAS;QAAE,OAAO;IACpD,MAAM,MAAM,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"mcp-interaction-ui.js","sourceRoot":"","sources":["../src/mcp-interaction-ui.ts"],"names":[],"mappings":"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"}
|
package/dist/media-history.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-history.d.ts","sourceRoot":"","sources":["../src/media-history.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"media-history.d.ts","sourceRoot":"","sources":["../src/media-history.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,wBAAgB,YAAY,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE,CAc5E"}
|
package/dist/media-history.js
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { openAIResponseContent } from "@sortedyuan/providers";
|
|
2
2
|
export function mediaHistory(events) {
|
|
3
|
-
return events.map(event => event.type === "assistant.completed"
|
|
3
|
+
return events.map((event) => event.type === "assistant.completed"
|
|
4
4
|
? { ...event, message: { ...event.message, content: [...openAIResponseContent(event.message)] } }
|
|
5
5
|
: event.type === "run.completed"
|
|
6
|
-
? {
|
|
6
|
+
? {
|
|
7
|
+
...event,
|
|
8
|
+
result: {
|
|
9
|
+
...event.result,
|
|
10
|
+
message: { ...event.result.message, content: [...openAIResponseContent(event.result.message)] },
|
|
11
|
+
},
|
|
12
|
+
}
|
|
7
13
|
: event);
|
|
8
14
|
}
|
|
9
15
|
//# sourceMappingURL=media-history.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-history.js","sourceRoot":"","sources":["../src/media-history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,MAAM,UAAU,YAAY,CAAC,MAA+B;IAC1D,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"media-history.js","sourceRoot":"","sources":["../src/media-history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,MAAM,UAAU,YAAY,CAAC,MAA+B;IAC1D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,KAAK,CAAC,IAAI,KAAK,qBAAqB;QAClC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE;QACjG,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe;YAC9B,CAAC,CAAC;gBACE,GAAG,KAAK;gBACR,MAAM,EAAE;oBACN,GAAG,KAAK,CAAC,MAAM;oBACf,OAAO,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE;iBAChG;aACF;YACH,CAAC,CAAC,KAAK,CACZ,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-picker.d.ts","sourceRoot":"","sources":["../src/model-picker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model-picker.d.ts","sourceRoot":"","sources":["../src/model-picker.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,iBAAiB,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GAC9B;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAClD,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACxD;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA6C5F"}
|
package/dist/model-picker.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { sanitizeTerminalText } from "@sortedyuan/tui";
|
|
2
|
-
import { ListSelectionModel, resolveListInput
|
|
2
|
+
import { ListSelectionModel, resolveListInput } from "@sortedyuan/tui/list-selection";
|
|
3
3
|
import { createMaybeCodeKeymap } from "./keymap.js";
|
|
4
4
|
export async function runModelPicker(options) {
|
|
5
5
|
if (options.models.length === 0)
|
|
@@ -12,12 +12,12 @@ export async function runModelPicker(options) {
|
|
|
12
12
|
}
|
|
13
13
|
const keymap = createMaybeCodeKeymap();
|
|
14
14
|
const selection = new ListSelectionModel(options.models, {
|
|
15
|
-
initialIndex: Math.max(0, options.models.findIndex((model) => model.name === options.controller.modelInfo?.profile)),
|
|
15
|
+
initialIndex: Math.max(0, options.models.findIndex((model) => model.name === options.controller.application.modelInfo?.profile)),
|
|
16
16
|
pageSize: 10,
|
|
17
17
|
});
|
|
18
18
|
try {
|
|
19
19
|
while (true) {
|
|
20
|
-
options.terminal.renderView(sanitizeTerminalText(renderModelPicker(options.models, selection.selectedIndex, options.controller.modelInfo?.profile)));
|
|
20
|
+
options.terminal.renderView(sanitizeTerminalText(renderModelPicker(options.models, selection.selectedIndex, options.controller.application.modelInfo?.profile)));
|
|
21
21
|
const action = resolvePickerAction(keymap, await options.terminal.readKey());
|
|
22
22
|
if (action === "app.interrupt" || action === "list.cancel") {
|
|
23
23
|
return { type: "cancelled" };
|
|
@@ -41,7 +41,7 @@ export async function runModelPicker(options) {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
async function runLineModelPicker(options) {
|
|
44
|
-
options.terminal.write(sanitizeTerminalText(`\n${renderLineModelList(options.models, options.controller.modelInfo?.profile)}`));
|
|
44
|
+
options.terminal.write(sanitizeTerminalText(`\n${renderLineModelList(options.models, options.controller.application.modelInfo?.profile)}`));
|
|
45
45
|
const answer = (await options.question("Select a model number/name, or d <selection> to set default (Enter to cancel): ")).trim();
|
|
46
46
|
if (answer === "")
|
|
47
47
|
return { type: "cancelled" };
|
|
@@ -58,9 +58,7 @@ async function runLineModelPicker(options) {
|
|
|
58
58
|
}
|
|
59
59
|
function resolvePickerAction(keymap, stroke) {
|
|
60
60
|
const result = keymap.resolve(stroke, ["global", "modelPicker", "select"]);
|
|
61
|
-
return result.type === "action"
|
|
62
|
-
? result.action
|
|
63
|
-
: undefined;
|
|
61
|
+
return result.type === "action" ? result.action : undefined;
|
|
64
62
|
}
|
|
65
63
|
function navigationAction(action) {
|
|
66
64
|
switch (action) {
|
|
@@ -89,8 +87,9 @@ function renderModelPicker(models, selectedIndex, currentProfile) {
|
|
|
89
87
|
const selected = index === selectedIndex ? ">" : " ";
|
|
90
88
|
const current = model.name === currentProfile ? " [current]" : "";
|
|
91
89
|
const defaultModel = model.isDefault ? " [default]" : "";
|
|
92
|
-
output +=
|
|
93
|
-
|
|
90
|
+
output +=
|
|
91
|
+
`${selected} ${model.name}${current}${defaultModel}\n` +
|
|
92
|
+
` ${model.provider}/${model.model} · ${model.adapter}\n`;
|
|
94
93
|
}
|
|
95
94
|
return output + "\n↑↓ move · Enter select · D set default · Esc close\n";
|
|
96
95
|
}
|
|
@@ -98,8 +97,8 @@ function renderLineModelList(models, currentProfile) {
|
|
|
98
97
|
const lines = models.map((model, index) => {
|
|
99
98
|
const current = model.name === currentProfile ? " [current]" : "";
|
|
100
99
|
const defaultModel = model.isDefault ? " [default]" : "";
|
|
101
|
-
return ` ${index + 1}. ${model.name}${current}${defaultModel}\n` +
|
|
102
|
-
` ${model.provider}/${model.model} · ${model.adapter}
|
|
100
|
+
return (` ${index + 1}. ${model.name}${current}${defaultModel}\n` +
|
|
101
|
+
` ${model.provider}/${model.model} · ${model.adapter}`);
|
|
103
102
|
});
|
|
104
103
|
return `Models:\n${lines.join("\n")}\n`;
|
|
105
104
|
}
|
package/dist/model-picker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-picker.js","sourceRoot":"","sources":["../src/model-picker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"model-picker.js","sourceRoot":"","sources":["../src/model-picker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { MaybeCodeModelInfo, MaybeCodeReasoningEffortState } from "./controller.js";
|
|
2
|
+
import type { MaybeCodeModelConfiguration } from "./workspace.js";
|
|
3
|
+
import type { ActiveWorkspaceOptions } from "./workspace-state.js";
|
|
4
|
+
export declare function unknownReasoningEffort(): MaybeCodeReasoningEffortState;
|
|
5
|
+
export declare function withModelConfiguration(options: ActiveWorkspaceOptions, configuration: MaybeCodeModelConfiguration, runtimeOptions?: Readonly<Record<string, unknown>>): ActiveWorkspaceOptions;
|
|
6
|
+
export declare function configuredModelOptions(options: ActiveWorkspaceOptions, profile: string | undefined): Readonly<Record<string, unknown>>;
|
|
7
|
+
export declare function readHistoricalModel(value: unknown): MaybeCodeModelInfo & {
|
|
8
|
+
readonly runtimeOptions: Readonly<Record<string, unknown>>;
|
|
9
|
+
};
|
|
10
|
+
export declare function assertHistoricalModel(saved: MaybeCodeModelInfo, current: MaybeCodeModelInfo | undefined): void;
|
|
11
|
+
//# sourceMappingURL=model-transition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-transition.d.ts","sourceRoot":"","sources":["../src/model-transition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEzF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,wBAAgB,sBAAsB,IAAI,6BAA6B,CAOtE;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,sBAAsB,EAC/B,aAAa,EAAE,2BAA2B,EAC1C,cAAc,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACjD,sBAAsB,CASxB;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAInC;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,OAAO,GACb,kBAAkB,GAAG;IAAE,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAAE,CAarF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,kBAAkB,GAAG,SAAS,GAAG,IAAI,CAW9G"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { omitUndefined } from "@sortedyuan/may/core";
|
|
2
|
+
import { MaybeCodeUsageError } from "./errors.js";
|
|
3
|
+
export function unknownReasoningEffort() {
|
|
4
|
+
return {
|
|
5
|
+
status: "unknown",
|
|
6
|
+
source: "unknown",
|
|
7
|
+
efforts: [],
|
|
8
|
+
overridden: false,
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
export function withModelConfiguration(options, configuration, runtimeOptions) {
|
|
12
|
+
const { model: _model, modelInfo: _modelInfo, contextBudget: _contextBudget, ...unchanged } = options;
|
|
13
|
+
return {
|
|
14
|
+
...unchanged,
|
|
15
|
+
model: configuration.model,
|
|
16
|
+
modelInfo: configuration.modelInfo,
|
|
17
|
+
modelRuntimeOptions: runtimeOptions ?? configuredModelOptions(options, configuration.modelInfo.profile),
|
|
18
|
+
...(configuration.contextBudget === undefined ? {} : { contextBudget: configuration.contextBudget }),
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export function configuredModelOptions(options, profile) {
|
|
22
|
+
return omitUndefined({
|
|
23
|
+
reasoningEffort: options.modelProfiles?.find((item) => item.name === profile)?.reasoningEffort,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
export function readHistoricalModel(value) {
|
|
27
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
28
|
+
throw new MaybeCodeUsageError("Historical model identity is invalid");
|
|
29
|
+
const saved = value;
|
|
30
|
+
for (const key of ["provider", "model"])
|
|
31
|
+
if (typeof saved[key] !== "string" || !saved[key])
|
|
32
|
+
throw new MaybeCodeUsageError(`Historical model ${key} is invalid`);
|
|
33
|
+
for (const key of ["profile", "adapter"])
|
|
34
|
+
if (saved[key] !== undefined && typeof saved[key] !== "string")
|
|
35
|
+
throw new MaybeCodeUsageError(`Historical model ${key} is invalid`);
|
|
36
|
+
if (!saved.runtimeOptions || typeof saved.runtimeOptions !== "object" || Array.isArray(saved.runtimeOptions))
|
|
37
|
+
throw new MaybeCodeUsageError("Historical model options are invalid");
|
|
38
|
+
return saved;
|
|
39
|
+
}
|
|
40
|
+
export function assertHistoricalModel(saved, current) {
|
|
41
|
+
if (!current ||
|
|
42
|
+
saved.provider !== current.provider ||
|
|
43
|
+
saved.model !== current.model ||
|
|
44
|
+
saved.adapter !== current.adapter) {
|
|
45
|
+
throw new MaybeCodeUsageError("The selected history position requires its original provider, model and adapter configuration");
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=model-transition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-transition.js","sourceRoot":"","sources":["../src/model-transition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIlD,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,EAAE;QACX,UAAU,EAAE,KAAK;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAA+B,EAC/B,aAA0C,EAC1C,cAAkD;IAElD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IACtG,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,mBAAmB,EAAE,cAAc,IAAI,sBAAsB,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC;QACvG,GAAG,CAAC,aAAa,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC;KACrG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAA+B,EAC/B,OAA2B;IAE3B,OAAO,aAAa,CAAC;QACnB,eAAe,EAAE,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,eAAe;KAC/F,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAc;IAEd,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC7D,MAAM,IAAI,mBAAmB,CAAC,sCAAsC,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,KAAgC,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;QACrC,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAC/C,MAAM,IAAI,mBAAmB,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC;IACxE,KAAK,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QACtC,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ;YAC5D,MAAM,IAAI,mBAAmB,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC;IACxE,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC;QAC1G,MAAM,IAAI,mBAAmB,CAAC,sCAAsC,CAAC,CAAC;IACxE,OAAO,KAAuG,CAAC;AACjH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAyB,EAAE,OAAuC;IACtG,IACE,CAAC,OAAO;QACR,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ;QACnC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;QAC7B,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EACjC,CAAC;QACD,MAAM,IAAI,mBAAmB,CAC3B,+FAA+F,CAChG,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/model.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { MayConfig } from "@sortedyuan/config";
|
|
2
|
-
import type { Model } from "@sortedyuan/core";
|
|
1
|
+
import type { MayConfig } from "@sortedyuan/may/config";
|
|
2
|
+
import type { Model } from "@sortedyuan/may/core";
|
|
3
3
|
import { type ProviderAdapterRegistry, type ProviderModelSelection, type ModelProfileSelector } from "@sortedyuan/providers";
|
|
4
4
|
export type MaybeCodeModelSelector = ModelProfileSelector;
|
|
5
5
|
export type SelectedMaybeCodeModel = ProviderModelSelection;
|
package/dist/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAGL,KAAK,uBAAuB,EAI5B,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAI/B,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC1D,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAE5D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAE,sBAA2B,GAAG,sBAAsB,CAerH;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,sBAAsB,EAAE,QAAQ,CAAC,EAAE,uBAAuB,GAAG,KAAK,CASjH;AAED,wBAAgB,8BAA8B,IAAI,uBAAuB,CAExE"}
|
package/dist/model.js
CHANGED
|
@@ -2,7 +2,13 @@ import { createBuiltinProviderAdapterRegistry, createBuiltinProviderModel, Provi
|
|
|
2
2
|
import { MaybeCodeConfigError } from "./errors.js";
|
|
3
3
|
export function selectMaybeCodeModel(config, selector = {}) {
|
|
4
4
|
try {
|
|
5
|
-
|
|
5
|
+
const selection = selectProviderModel(config, selector);
|
|
6
|
+
return selection.adapter === "anthropic-messages"
|
|
7
|
+
? {
|
|
8
|
+
...selection,
|
|
9
|
+
options: { promptCaching: { ttl: "5m", cacheInstructions: true }, ...selection.options },
|
|
10
|
+
}
|
|
11
|
+
: selection;
|
|
6
12
|
}
|
|
7
13
|
catch (error) {
|
|
8
14
|
if (error instanceof ProviderConfigurationError) {
|
|
@@ -13,9 +19,7 @@ export function selectMaybeCodeModel(config, selector = {}) {
|
|
|
13
19
|
}
|
|
14
20
|
export function createMaybeCodeModel(selection, registry) {
|
|
15
21
|
try {
|
|
16
|
-
return registry === undefined
|
|
17
|
-
? createBuiltinProviderModel(selection)
|
|
18
|
-
: registry.create(selection);
|
|
22
|
+
return registry === undefined ? createBuiltinProviderModel(selection) : registry.create(selection);
|
|
19
23
|
}
|
|
20
24
|
catch (error) {
|
|
21
25
|
if (error instanceof ProviderAdapterRegistryError) {
|
package/dist/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oCAAoC,EACpC,0BAA0B,EAE1B,0BAA0B,EAC1B,4BAA4B,EAC5B,mBAAmB,GAGpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAKnD,MAAM,UAAU,oBAAoB,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oCAAoC,EACpC,0BAA0B,EAE1B,0BAA0B,EAC1B,4BAA4B,EAC5B,mBAAmB,GAGpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAKnD,MAAM,UAAU,oBAAoB,CAAC,MAAiB,EAAE,QAAQ,GAA2B,EAAE;IAC3F,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxD,OAAO,SAAS,CAAC,OAAO,KAAK,oBAAoB;YAC/C,CAAC,CAAC;gBACE,GAAG,SAAS;gBACZ,OAAO,EAAE,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE;aACzF;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,0BAA0B,EAAE,CAAC;YAChD,MAAM,IAAI,oBAAoB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAiC,EAAE,QAAkC;IACxG,IAAI,CAAC;QACH,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACrG,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,4BAA4B,EAAE,CAAC;YAClD,MAAM,IAAI,oBAAoB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,8BAA8B;IAC5C,OAAO,oCAAoC,EAAE,CAAC;AAChD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"onboarding-check.d.ts","sourceRoot":"","sources":["../src/onboarding-check.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiBxG"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { lstat } from "node:fs/promises";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { join, resolve } from "node:path";
|
|
4
|
+
export async function missingMaybeCodeConfig(command) {
|
|
5
|
+
const path = command.configPath === undefined ? join(homedir(), ".may", "config.json") : resolve(command.configPath);
|
|
6
|
+
try {
|
|
7
|
+
await lstat(path);
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
catch (error) {
|
|
11
|
+
if (!(error instanceof Error && "code" in error && error.code === "ENOENT"))
|
|
12
|
+
throw error;
|
|
13
|
+
}
|
|
14
|
+
if (command.ui === "web" && !/^[\x21-\x7e]{32,256}$/u.test(process.env.MAYBECODE_CONTROL_TOKEN ?? "")) {
|
|
15
|
+
throw new Error("Set MAYBECODE_CONTROL_TOKEN (32..256 printable ASCII characters) before starting --ui web.");
|
|
16
|
+
}
|
|
17
|
+
if (!process.stdin.isTTY || !process.stdout.isTTY) {
|
|
18
|
+
throw new Error(`May config is missing at ${path}. Run maybecode in an interactive terminal to create it, or supply an existing file with --config <path>.`);
|
|
19
|
+
}
|
|
20
|
+
return path;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=onboarding-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"onboarding-check.js","sourceRoot":"","sources":["../src/onboarding-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAG1C,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAA8B;IACzE,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACrH,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;YAAE,MAAM,KAAK,CAAC;IAC3F,CAAC;IACD,IAAI,OAAO,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,EAAE,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,KAAK,CAAC,4FAA4F,CAAC,CAAC;IAChH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CACb,4BAA4B,IAAI,2GAA2G,CAC5I,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type MayConfig } from "@sortedyuan/may/config";
|
|
2
|
+
import type { MaybeCodeStartCommand } from "./args.js";
|
|
3
|
+
/** 通过实际 Adapter 检查独立请求,完成响应后才确认成功。 */
|
|
4
|
+
export declare function checkOnboardingConnection(config: MayConfig, signal: AbortSignal, timeoutMs?: number): Promise<void>;
|
|
5
|
+
export declare function runMaybeCodeOnboarding(path: string, command: MaybeCodeStartCommand): Promise<boolean>;
|
|
6
|
+
//# sourceMappingURL=onboarding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"onboarding.d.ts","sourceRoot":"","sources":["../src/onboarding.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmC,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEzF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAgHvD,sCAAsC;AACtC,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,WAAW,EACnB,SAAS,SAAS,GACjB,OAAO,CAAC,IAAI,CAAC,CAmBf;AAmBD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CA+V3G"}
|