@amalgm/shell 0.1.164-preview.35150047652 → 0.1.164-preview.35182619329
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/PURPOSE.md +32 -7
- package/README.md +7 -0
- package/dist/agent-execution.d.ts +70 -0
- package/dist/agent-execution.js +86 -0
- package/dist/agent-execution.js.map +1 -0
- package/dist/automations-host.d.ts +2 -0
- package/dist/automations-host.js.map +1 -1
- package/dist/boot.js +20 -27
- package/dist/boot.js.map +1 -1
- package/dist/bundle-automations.d.ts +2 -20
- package/dist/bundle-automations.js +17 -62
- package/dist/bundle-automations.js.map +1 -1
- package/dist/bundle-port.d.ts +2 -6
- package/dist/bundle-port.js +13 -15
- package/dist/bundle-port.js.map +1 -1
- package/dist/channel-session.d.ts +50 -0
- package/dist/channel-session.js +32 -0
- package/dist/channel-session.js.map +1 -0
- package/dist/chat-composition.js +8 -121
- package/dist/chat-composition.js.map +1 -1
- package/dist/chat-toolbox.js +7 -4
- package/dist/chat-toolbox.js.map +1 -1
- package/dist/cli.js +51 -22
- package/dist/cli.js.map +1 -1
- package/dist/construct-apply-host.d.ts +61 -0
- package/dist/construct-apply-host.js +103 -0
- package/dist/construct-apply-host.js.map +1 -0
- package/dist/construct-door.d.ts +37 -0
- package/dist/construct-door.js +51 -0
- package/dist/construct-door.js.map +1 -0
- package/dist/construct-ledger.d.ts +26 -0
- package/dist/construct-ledger.js +86 -0
- package/dist/construct-ledger.js.map +1 -0
- package/dist/construct-products.d.ts +22 -0
- package/dist/construct-products.js +30 -0
- package/dist/construct-products.js.map +1 -0
- package/dist/entity-access-wire.d.ts +32 -0
- package/dist/entity-access-wire.js +153 -0
- package/dist/entity-access-wire.js.map +1 -0
- package/dist/entity-apply-host.d.ts +9 -1
- package/dist/entity-apply-host.js +20 -2
- package/dist/entity-apply-host.js.map +1 -1
- package/dist/entity-channel-holdings.d.ts +26 -0
- package/dist/entity-channel-holdings.js +52 -0
- package/dist/entity-channel-holdings.js.map +1 -0
- package/dist/entity-record-observability.js +21 -0
- package/dist/entity-record-observability.js.map +1 -1
- package/dist/entity-record-store.d.ts +8 -3
- package/dist/entity-record-store.js +28 -1
- package/dist/entity-record-store.js.map +1 -1
- package/dist/installation/environment.d.ts +0 -2
- package/dist/installation/environment.js +0 -4
- package/dist/installation/environment.js.map +1 -1
- package/dist/machine-host.d.ts +4 -5
- package/dist/machine-host.js +70 -87
- package/dist/machine-host.js.map +1 -1
- package/dist/official-mcp-host.js +7 -1
- package/dist/official-mcp-host.js.map +1 -1
- package/dist/platform-product-host.d.ts +2 -0
- package/dist/platform-product-host.js +4 -1
- package/dist/platform-product-host.js.map +1 -1
- package/dist/runtime-command-host.d.ts +3 -1
- package/dist/runtime-command-host.js +2 -1
- package/dist/runtime-command-host.js.map +1 -1
- package/dist/sharing-host.d.ts +19 -0
- package/dist/sharing-host.js +19 -0
- package/dist/sharing-host.js.map +1 -0
- package/dist/sharing-mcp-host.d.ts +23 -0
- package/dist/{descriptor-mcp-host.js → sharing-mcp-host.js} +23 -9
- package/dist/sharing-mcp-host.js.map +1 -0
- package/dist/tool-mcp-client.js +19 -1
- package/dist/tool-mcp-client.js.map +1 -1
- package/dist/toolbox-host.d.ts +4 -0
- package/dist/toolbox-host.js +10 -0
- package/dist/toolbox-host.js.map +1 -0
- package/dist/user-ground-host.d.ts +29 -3
- package/dist/user-ground-host.js +90 -5
- package/dist/user-ground-host.js.map +1 -1
- package/dist/wire-client.d.ts +2 -9
- package/dist/wire-client.js +87 -17
- package/dist/wire-client.js.map +1 -1
- package/examinations/fixtures/machine-control-plane.js +0 -13
- package/examinations/fixtures/private-wire-authority.js +170 -9
- package/npm-shrinkwrap.json +31 -28
- package/package.json +8 -8
- package/dist/descriptor-mcp-host.d.ts +0 -26
- package/dist/descriptor-mcp-host.js.map +0 -1
- package/dist/installed-automations.d.ts +0 -70
- package/dist/installed-automations.js +0 -135
- package/dist/installed-automations.js.map +0 -1
- package/dist/runtime-mcp-cli-host.d.ts +0 -29
- package/dist/runtime-mcp-cli-host.js +0 -84
- package/dist/runtime-mcp-cli-host.js.map +0 -1
- package/dist/share-host.d.ts +0 -24
- package/dist/share-host.js +0 -34
- package/dist/share-host.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-automations.js","sourceRoot":"","sources":["../src/bundle-automations.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle-automations.js","sourceRoot":"","sources":["../src/bundle-automations.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,sBAAsB,EAAuB,MAAM,qBAAqB,CAAC;AAIlF,SAAS,OAAO,CAAC,KAAc,EAAE,QAAQ,IAAI,GAAG,EAAU;IACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;SACnE,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,SAAS,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBACzF,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1B,CAAC;YACD,IAAI,CAAC,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,WAAW,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7E,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACzC,IAAI,SAAS,GAAG,CAAC;oBAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAAoB,EAAE,YAAoB;IAIrF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,YAAY,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,YAAY,EAAE,CAAC,CAAC;IACvG,MAAM,IAAI,GAAG,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO;QACL,KAAK,EAAE;YACL,kBAAkB,EAAE,UAAU,CAAC,EAAE;YACjC,UAAU,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,IAAI,EAAE,EAAE;YAChG,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO;gBAC3C,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE;aACrE,CAAC,CAAC,CAAC;gBACF,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK;aACtF,CAAC;YACF,SAAS,EAAE,CAAC;oBACV,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM;oBAC/E,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,EAAE;iBACnF,CAAC;YACF,OAAO,EAAE,IAAI;SACd;QACD,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAoB,EAAE,KAAc;IAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,IAAI,qBAAqB,CAAC,CAAC,IAAI,EAAE,IAAI,qBAAqB,CAAC;IACpF,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK;SACtE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;QAAE,OAAO,GAAG,IAAI,aAAa,CAAC;IAChF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,GAAG,IAAI,cAAc,KAAK,GAAG,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAAE,OAAO,SAAS,CAAC;IAC5D,CAAC;IACD,OAAO,GAAG,IAAI,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,IAAoB,EACpB,OAAe,EACf,QAAgB;IAEhB,MAAM,SAAS,GAAW,EAAE,CAAC;IAC7B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,OAAO,QAAQ,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/E,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,IAAI,GAAG,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC/C,QAAQ;YACR,IAAI,EAAE,MAAM,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC;YACpD,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,WAAW,IAAI,EAAE;YAChD,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAChE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE;oBACjD,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI;oBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,OAAO,CAAC,QAAQ,IAAI,KAAK;oBAC3D,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE;oBAChD,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,GAAG;oBAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG;oBAC3B,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAC9C,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE;YACxC,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,UAAU;YACjC,MAAM,EAAE,QAAQ,CAAC,YAAY;YAC7B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC1C,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE;YACnC,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,EAAE;SAC9B,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
package/dist/bundle-port.d.ts
CHANGED
|
@@ -2,16 +2,12 @@ import type { AgentBundlePort } from "@amalgm/agents";
|
|
|
2
2
|
import type { Apps } from "@amalgm/apps";
|
|
3
3
|
import type { AutomationCrud } from "@amalgm/automations";
|
|
4
4
|
import type { Toolbox } from "@amalgm/tools";
|
|
5
|
-
import type { InstalledAutomations } from "./installed-automations.js";
|
|
6
5
|
export interface ShellBundlePortOptions {
|
|
7
|
-
|
|
8
|
-
apps: () => Apps;
|
|
6
|
+
apps: Apps;
|
|
9
7
|
toolbox: Toolbox;
|
|
10
8
|
automations?: {
|
|
11
9
|
crud: AutomationCrud;
|
|
12
|
-
|
|
13
|
-
targetId: string;
|
|
14
|
-
installed: InstalledAutomations;
|
|
10
|
+
targetId?: string;
|
|
15
11
|
};
|
|
16
12
|
}
|
|
17
13
|
/** Host composition for Engine's agent-bundles export/install resource ports. */
|
package/dist/bundle-port.js
CHANGED
|
@@ -20,8 +20,10 @@ function toolDefinition(record, actions, installedAppId) {
|
|
|
20
20
|
source: record.source,
|
|
21
21
|
display: record.display,
|
|
22
22
|
policy: record.policy,
|
|
23
|
-
metadata:
|
|
24
|
-
|
|
23
|
+
metadata: {
|
|
24
|
+
...(record.metadata || {}),
|
|
25
|
+
...(installedAppId ? { appId: installedAppId } : {}),
|
|
26
|
+
},
|
|
25
27
|
actions: actions.map((action) => ({
|
|
26
28
|
id: action.id,
|
|
27
29
|
name: action.name,
|
|
@@ -50,14 +52,11 @@ export function createShellBundlePort(options) {
|
|
|
50
52
|
automationEntries.push(exported.entry);
|
|
51
53
|
toolRefs.push(...exported.toolIds);
|
|
52
54
|
requirements.bindings.push(`automation:${id}:targetId`);
|
|
53
|
-
for (const field of exported.bindings)
|
|
54
|
-
requirements.bindings.push(`automation:${id}:${field}`);
|
|
55
55
|
}
|
|
56
56
|
const catalog = options.toolbox.catalog();
|
|
57
57
|
const toolById = new Map(catalog.tools.map((tool) => [tool.id, tool]));
|
|
58
58
|
const actionById = new Map(catalog.actions.map((action) => [action.id, action]));
|
|
59
|
-
const
|
|
60
|
-
const appById = new Map(apps.list().map((app) => [app.id, app]));
|
|
59
|
+
const appById = new Map(options.apps.list().map((app) => [app.id, app]));
|
|
61
60
|
const toolIds = [];
|
|
62
61
|
const appIds = [...input.appIds];
|
|
63
62
|
const appExports = new Map();
|
|
@@ -75,8 +74,8 @@ export function createShellBundlePort(options) {
|
|
|
75
74
|
else {
|
|
76
75
|
if (!toolIds.includes(tool.id))
|
|
77
76
|
toolIds.push(tool.id);
|
|
78
|
-
const
|
|
79
|
-
|
|
77
|
+
const metadataAppId = typeof tool.metadata?.appId === "string" ? tool.metadata.appId : "";
|
|
78
|
+
const owner = metadataAppId || [...appById.values()].find((app) => app.toolIds.includes(tool.id))?.id;
|
|
80
79
|
if (owner && !appIds.includes(owner))
|
|
81
80
|
appIds.push(owner);
|
|
82
81
|
}
|
|
@@ -85,7 +84,7 @@ export function createShellBundlePort(options) {
|
|
|
85
84
|
const id = appIds[appCursor++];
|
|
86
85
|
if (!appById.has(id))
|
|
87
86
|
throw new Error(`App not found: ${id}`);
|
|
88
|
-
const exported = exportBundleApp(apps, id);
|
|
87
|
+
const exported = exportBundleApp(options.apps, id);
|
|
89
88
|
appExports.set(id, exported);
|
|
90
89
|
for (const toolId of exported.entry.toolIds) {
|
|
91
90
|
if (!toolRefs.includes(toolId))
|
|
@@ -129,7 +128,7 @@ export function createShellBundlePort(options) {
|
|
|
129
128
|
};
|
|
130
129
|
},
|
|
131
130
|
async installResources(bundle) {
|
|
132
|
-
const appResult = await installBundleApps(options.apps
|
|
131
|
+
const appResult = await installBundleApps(options.apps, bundle.apps);
|
|
133
132
|
const warnings = [];
|
|
134
133
|
const installedTools = [];
|
|
135
134
|
const actionsByTool = new Map();
|
|
@@ -150,11 +149,10 @@ export function createShellBundlePort(options) {
|
|
|
150
149
|
if (bundle.automations.length) {
|
|
151
150
|
if (!options.automations)
|
|
152
151
|
throw new Error("Automations bundle install requires an Automations host");
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
});
|
|
152
|
+
if (!options.automations.targetId) {
|
|
153
|
+
throw new Error("Automations bundle install requires an owner-selected targetId");
|
|
154
|
+
}
|
|
155
|
+
installedAutomations = await installBundleAutomations(options.automations.crud, bundle.automations, options.automations.targetId);
|
|
158
156
|
}
|
|
159
157
|
return {
|
|
160
158
|
installedApps: appResult.installed,
|
package/dist/bundle-port.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-port.js","sourceRoot":"","sources":["../src/bundle-port.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle-port.js","sourceRoot":"","sources":["../src/bundle-port.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { type AgentExecutionContext } from './agent-execution.js';
|
|
2
|
+
/** Only a new email-origin session consumes the thread's snapshotted defaults. */
|
|
3
|
+
export declare function resolveChannelSession(options: AgentExecutionContext, input: unknown): {
|
|
4
|
+
execution: {
|
|
5
|
+
cwd: {
|
|
6
|
+
path: string;
|
|
7
|
+
workspaceId: null;
|
|
8
|
+
materializationRevision: null;
|
|
9
|
+
};
|
|
10
|
+
model: {
|
|
11
|
+
settings: ({
|
|
12
|
+
configId: string;
|
|
13
|
+
type: "boolean";
|
|
14
|
+
value: boolean;
|
|
15
|
+
} | {
|
|
16
|
+
configId: string;
|
|
17
|
+
value: string;
|
|
18
|
+
type?: undefined;
|
|
19
|
+
})[];
|
|
20
|
+
providerId: string;
|
|
21
|
+
modelId: string;
|
|
22
|
+
};
|
|
23
|
+
agent: {
|
|
24
|
+
adapterId: string;
|
|
25
|
+
installationId: string;
|
|
26
|
+
revisionId: string;
|
|
27
|
+
};
|
|
28
|
+
auth: {
|
|
29
|
+
mode: "byok";
|
|
30
|
+
bindingId: string;
|
|
31
|
+
} | {
|
|
32
|
+
mode: "subscription";
|
|
33
|
+
bindingId: string;
|
|
34
|
+
} | {
|
|
35
|
+
mode: "platform";
|
|
36
|
+
bindingId: string;
|
|
37
|
+
};
|
|
38
|
+
tools: {
|
|
39
|
+
exposure?: Record<string, "direct" | "search" | "hidden"> | undefined;
|
|
40
|
+
revisionId: string | null;
|
|
41
|
+
toolIds: string[];
|
|
42
|
+
};
|
|
43
|
+
permissionMode: "ask" | "full_access";
|
|
44
|
+
computerId: string;
|
|
45
|
+
};
|
|
46
|
+
instructions: string;
|
|
47
|
+
metadata: {
|
|
48
|
+
agentInstallationId: string;
|
|
49
|
+
};
|
|
50
|
+
};
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { normalizeChannelConfiguration } from '@amalgm/channels';
|
|
2
|
+
import { resolveAgentRun, modelSettings } from './agent-execution.js';
|
|
3
|
+
/** Only a new email-origin session consumes the thread's snapshotted defaults. */
|
|
4
|
+
export function resolveChannelSession(options, input) {
|
|
5
|
+
if (!input)
|
|
6
|
+
throw Object.assign(new Error('Configure an Email channel agent and workspace first'), {
|
|
7
|
+
code: 'CHANNEL_DEFAULTS_REQUIRED',
|
|
8
|
+
});
|
|
9
|
+
const defaults = normalizeChannelConfiguration(input);
|
|
10
|
+
if (!defaults.enabled || !defaults.agentId || defaults.computerId !== options.computerId) {
|
|
11
|
+
throw Object.assign(new Error('Email defaults do not target this computer'), { code: 'CHANNEL_COMPUTER_MISMATCH' });
|
|
12
|
+
}
|
|
13
|
+
const resolved = resolveAgentRun(options, defaults.agentId, defaults);
|
|
14
|
+
if (!resolved.execution.tools.toolIds.some(id => id === 'channels' || id === 'channels.amalgm_channels_send')) {
|
|
15
|
+
throw Object.assign(new Error('The selected agent needs Channels send access to answer email'), {
|
|
16
|
+
code: 'CHANNEL_REPLY_ACCESS_REQUIRED',
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
return {
|
|
20
|
+
execution: {
|
|
21
|
+
...resolved.execution,
|
|
22
|
+
cwd: { ...resolved.execution.cwd, path: defaults.cwd },
|
|
23
|
+
model: {
|
|
24
|
+
...resolved.execution.model,
|
|
25
|
+
settings: defaults.modelSettings ? modelSettings(defaults.modelSettings) : resolved.execution.model.settings,
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
instructions: defaults.instructions,
|
|
29
|
+
metadata: { agentInstallationId: defaults.agentId },
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=channel-session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-session.js","sourceRoot":"","sources":["../src/channel-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,aAAa,EAA8B,MAAM,sBAAsB,CAAC;AAElG,kFAAkF;AAClF,MAAM,UAAU,qBAAqB,CAAC,OAA8B,EAAE,KAAc;IAClF,IAAI,CAAC,KAAK;QAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sDAAsD,CAAC,EAAE;YACjG,IAAI,EAAE,2BAA2B;SAClC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;QACzF,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,4CAA4C,CAAC,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE,CAAC,CAAC;IACtH,CAAC;IACD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,UAAU,IAAI,EAAE,KAAK,+BAA+B,CAAC,EAAE,CAAC;QAC9G,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+DAA+D,CAAC,EAAE;YAC9F,IAAI,EAAE,+BAA+B;SACtC,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,SAAS,EAAE;YACT,GAAG,QAAQ,CAAC,SAAS;YACrB,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE;YACtD,KAAK,EAAE;gBACL,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK;gBAC3B,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ;aAC7G;SACF;QACD,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,QAAQ,EAAE,EAAE,mBAAmB,EAAE,QAAQ,CAAC,OAAO,EAAE;KACpD,CAAC;AACJ,CAAC"}
|
package/dist/chat-composition.js
CHANGED
|
@@ -4,6 +4,8 @@ import { createExternalMessageRunner } from "@amalgm/chat";
|
|
|
4
4
|
import { createChatHost } from "@amalgm/chat/host";
|
|
5
5
|
import { createChatAgentRunner } from "@amalgm/chat/mcp";
|
|
6
6
|
import { ChatHost } from "./chat-host.js";
|
|
7
|
+
import { resolveAgentRun } from "./agent-execution.js";
|
|
8
|
+
import { resolveChannelSession } from "./channel-session.js";
|
|
7
9
|
import { ChatToolbox } from "./chat-toolbox.js";
|
|
8
10
|
import { agentToolSelection, resolveToolboxServers } from "./chat-tools.js";
|
|
9
11
|
/** The one Chat composition used by every Shell host. */
|
|
@@ -32,8 +34,12 @@ export async function createShellChatComposition(options) {
|
|
|
32
34
|
digest: (value) => createHash("sha256").update(value).digest("hex"),
|
|
33
35
|
});
|
|
34
36
|
const externalMessages = createExternalMessageRunner(composed.chat, {
|
|
35
|
-
resolveNew:
|
|
36
|
-
resolveExisting: (
|
|
37
|
+
resolveNew: (input) => resolveChannelSession(options, input.context?.defaults),
|
|
38
|
+
resolveExisting: () => {
|
|
39
|
+
throw Object.assign(new Error('The channel session has no durable execution to resume'), {
|
|
40
|
+
code: 'CHANNEL_SESSION_EXECUTION_REQUIRED',
|
|
41
|
+
});
|
|
42
|
+
},
|
|
37
43
|
});
|
|
38
44
|
return new ChatHost({
|
|
39
45
|
chat: composed.chat,
|
|
@@ -44,125 +50,6 @@ export async function createShellChatComposition(options) {
|
|
|
44
50
|
close: async () => { await composed.close(); toolExecutions.close(); },
|
|
45
51
|
});
|
|
46
52
|
}
|
|
47
|
-
async function lastUsedExecution(options, chat) {
|
|
48
|
-
// Empty conversations have no execution choice to inherit. Read the durable
|
|
49
|
-
// turn through Chat's public capability, never reconstruct it from an agent id.
|
|
50
|
-
const limit = 64;
|
|
51
|
-
for (let offset = 0;; offset += limit) {
|
|
52
|
-
const records = await chat.listConversations({ limit, offset });
|
|
53
|
-
for (const record of records) {
|
|
54
|
-
const turn = await chat.latestTurn(record.id);
|
|
55
|
-
if (turn)
|
|
56
|
-
return { execution: turn.execution };
|
|
57
|
-
}
|
|
58
|
-
if (records.length < limit)
|
|
59
|
-
break;
|
|
60
|
-
}
|
|
61
|
-
const available = options.agents.listAgents().find((agent) => Boolean(agent.definition.model?.id));
|
|
62
|
-
if (!available)
|
|
63
|
-
throw Object.assign(new Error('No configured agent is available for inbound email'), {
|
|
64
|
-
code: 'CHANNEL_AGENT_REQUIRED',
|
|
65
|
-
});
|
|
66
|
-
return resolveAgentRun(options, available.id);
|
|
67
|
-
}
|
|
68
|
-
function channelExecution(options, resolved) {
|
|
69
|
-
const catalog = requiredToolbox(options).catalog();
|
|
70
|
-
return Object.freeze({
|
|
71
|
-
title: resolved.title,
|
|
72
|
-
metadata: { agentInstallationId: resolved.execution.agent.installationId, replyTool: 'channels' },
|
|
73
|
-
execution: {
|
|
74
|
-
...resolved.execution,
|
|
75
|
-
tools: {
|
|
76
|
-
revisionId: catalog.revisionId,
|
|
77
|
-
toolIds: [...new Set([...resolved.execution.tools.toolIds, 'channels'])],
|
|
78
|
-
},
|
|
79
|
-
},
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
|
-
function resolveAgentRun(options, installationId) {
|
|
83
|
-
const record = options.agents.getAgent(installationId);
|
|
84
|
-
if (!record)
|
|
85
|
-
throw Object.assign(new Error(`Installed agent was not found: ${installationId}`), {
|
|
86
|
-
code: "AGENT_NOT_FOUND",
|
|
87
|
-
});
|
|
88
|
-
const revision = options.agents.getAgentRevision(installationId, record.currentRevisionId);
|
|
89
|
-
const definition = revision.definition;
|
|
90
|
-
if (!definition.model?.id) {
|
|
91
|
-
throw Object.assign(new Error(`Installed agent has no model: ${installationId}`), {
|
|
92
|
-
code: "AGENT_MODEL_REQUIRED",
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
const model = modelSelection(definition.model.id, definition.driver.id);
|
|
96
|
-
const tools = [...new Set([
|
|
97
|
-
...definition.toolbox.toolIds,
|
|
98
|
-
...definition.toolbox.actionIds,
|
|
99
|
-
...strings(definition.metadata["mcpAppIds"]),
|
|
100
|
-
])];
|
|
101
|
-
return Object.freeze({
|
|
102
|
-
title: definition.name,
|
|
103
|
-
execution: {
|
|
104
|
-
agent: {
|
|
105
|
-
adapterId: definition.driver.id,
|
|
106
|
-
installationId,
|
|
107
|
-
revisionId: revision.id,
|
|
108
|
-
},
|
|
109
|
-
model: { ...model, settings: modelSettings(definition.model.settings) },
|
|
110
|
-
auth: authSelection(installationId, definition.authRef),
|
|
111
|
-
tools: {
|
|
112
|
-
revisionId: tools.length > 0 ? requiredToolbox(options).catalog().revisionId : null,
|
|
113
|
-
toolIds: tools,
|
|
114
|
-
...(definition.toolbox.exposure ? { exposure: definition.toolbox.exposure } : {}),
|
|
115
|
-
},
|
|
116
|
-
cwd: {
|
|
117
|
-
path: definition.workspace.cwd || options.amalgmDir || options.stateDir,
|
|
118
|
-
workspaceId: null,
|
|
119
|
-
materializationRevision: null,
|
|
120
|
-
},
|
|
121
|
-
permissionMode: definition.metadata["permissionMode"] === "ask" ? "ask" : "full_access",
|
|
122
|
-
computerId: options.computerId,
|
|
123
|
-
},
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
function requiredToolbox(options) {
|
|
127
|
-
if (!options.toolbox)
|
|
128
|
-
throw new Error("Agent tools require the Shell Toolbox capability");
|
|
129
|
-
return options.toolbox;
|
|
130
|
-
}
|
|
131
|
-
function modelSelection(id, adapterId) {
|
|
132
|
-
const slash = id.indexOf("/");
|
|
133
|
-
if (slash > 0)
|
|
134
|
-
return { providerId: id.slice(0, slash), modelId: id.slice(slash + 1) };
|
|
135
|
-
return {
|
|
136
|
-
providerId: adapterId === "claude_code" ? "anthropic" : adapterId === "codex" ? "openai" : adapterId,
|
|
137
|
-
modelId: id,
|
|
138
|
-
};
|
|
139
|
-
}
|
|
140
|
-
function modelSettings(settings) {
|
|
141
|
-
return Object.entries(settings).map(([rawId, value]) => {
|
|
142
|
-
const configId = rawId === "effort" ? "reasoning_effort" : rawId === "fastMode" ? "fast" : rawId;
|
|
143
|
-
if (typeof value === "boolean")
|
|
144
|
-
return { configId, type: "boolean", value };
|
|
145
|
-
if (typeof value === "string" || typeof value === "number")
|
|
146
|
-
return { configId, value: String(value) };
|
|
147
|
-
throw Object.assign(new Error(`Agent model setting must be scalar: ${rawId}`), {
|
|
148
|
-
code: "AGENT_MODEL_SETTING_INVALID",
|
|
149
|
-
});
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
function authSelection(installationId, authRef) {
|
|
153
|
-
const selected = authRef || "amalgm";
|
|
154
|
-
if (selected === "byok")
|
|
155
|
-
return { mode: "byok", bindingId: "default" };
|
|
156
|
-
if (selected === "provider_auth" || selected === "subscription") {
|
|
157
|
-
return { mode: "subscription", bindingId: `${installationId}:provider_auth` };
|
|
158
|
-
}
|
|
159
|
-
return { mode: "platform", bindingId: `${installationId}:${selected}` };
|
|
160
|
-
}
|
|
161
|
-
function strings(value) {
|
|
162
|
-
return Array.isArray(value)
|
|
163
|
-
? value.filter((item) => typeof item === "string" && Boolean(item.trim()))
|
|
164
|
-
: [];
|
|
165
|
-
}
|
|
166
53
|
function nativeAgent(revision) {
|
|
167
54
|
const definition = revision.definition;
|
|
168
55
|
const config = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-composition.js","sourceRoot":"","sources":["../src/chat-composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,2BAA2B,
|
|
1
|
+
{"version":3,"file":"chat-composition.js","sourceRoot":"","sources":["../src/chat-composition.ts"],"names":[],"mappings":"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"}
|
package/dist/chat-toolbox.js
CHANGED
|
@@ -9,7 +9,7 @@ export class ChatToolbox {
|
|
|
9
9
|
catalog.revisionId, permissionMode, catalog.actions.map((action) => [action.id, toolbox.exposure(action)]).sort(),
|
|
10
10
|
])).digest('hex');
|
|
11
11
|
if (!this.#prepared.has(key)) {
|
|
12
|
-
this.#prepared.set(key, createMcpServer({ toolbox, mcp: { includeManagement: false
|
|
12
|
+
this.#prepared.set(key, { server: createMcpServer({ toolbox, mcp: { includeManagement: false } }), permissionMode });
|
|
13
13
|
}
|
|
14
14
|
const descriptions = actionTools(toolbox, { includeManagement: false }).map(({ handler, ...tool }) => tool);
|
|
15
15
|
return {
|
|
@@ -25,10 +25,13 @@ export class ChatToolbox {
|
|
|
25
25
|
return {
|
|
26
26
|
prefix: '/chat/toolbox', protocol: 'mcp-json-rpc',
|
|
27
27
|
handle: async (request, context) => {
|
|
28
|
-
const
|
|
29
|
-
if (!
|
|
28
|
+
const prepared = this.#prepared.get(context.headers['x-amalgm-tool-selection'] || '');
|
|
29
|
+
if (!prepared)
|
|
30
30
|
throw new Error('Unknown prepared Toolbox selection');
|
|
31
|
-
return server.handle(request
|
|
31
|
+
return prepared.server.handle(request, {
|
|
32
|
+
permissionMode: prepared.permissionMode,
|
|
33
|
+
sessionId: context.headers['x-amalgm-session-id']?.trim(),
|
|
34
|
+
});
|
|
32
35
|
},
|
|
33
36
|
};
|
|
34
37
|
}
|
package/dist/chat-toolbox.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-toolbox.js","sourceRoot":"","sources":["../src/chat-toolbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAwB,MAAM,eAAe,CAAC;AAInF,kEAAkE;AAClE,MAAM,OAAO,WAAW;IACb,SAAS,GAAG,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"chat-toolbox.js","sourceRoot":"","sources":["../src/chat-toolbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAwB,MAAM,eAAe,CAAC;AAInF,kEAAkE;AAClE,MAAM,OAAO,WAAW;IACb,SAAS,GAAG,IAAI,GAAG,EAGxB,CAAC;IAEL,QAAQ,CAAC,OAAwB,EAAE,OAAe,EAAE,YAAoB,EAAE,iBAAwC,KAAK;QACrH,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YACrD,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;SAClH,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;QACvH,CAAC;QACD,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5G,OAAO;YACL,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,IAAI;YAC1E,OAAO,EAAE;gBACP,EAAE,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,YAAY,EAAE;gBACvD,EAAE,IAAI,EAAE,yBAAyB,EAAE,KAAK,EAAE,GAAG,EAAE;aAChD;YACD,KAAK,EAAE,EAAE,kBAAkB,EAAE,YAAY,EAAE;SAC5C,CAAC;IACJ,CAAC;IAED,KAAK;QACH,OAAO;YACL,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc;YACjD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;gBACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtF,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBACrE,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAuD,EAAE;oBACrF,cAAc,EAAE,QAAQ,CAAC,cAAc;oBACvC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE;iBAC1D,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;IAED,KAAK,KAAW,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;CAC1C"}
|
package/dist/cli.js
CHANGED
|
@@ -2,6 +2,7 @@ import { spawn } from "node:child_process";
|
|
|
2
2
|
import { readFileSync } from "node:fs";
|
|
3
3
|
import { performance } from "node:perf_hooks";
|
|
4
4
|
import { MachineSetupError } from "@amalgm/core/identity";
|
|
5
|
+
import { CLI_HELP, commandDefinitions } from "@amalgm/live/sharing";
|
|
5
6
|
import { MachineHost, defaultMachineName } from "./machine-host.js";
|
|
6
7
|
import { renderStageLedger } from "./files-trace.js";
|
|
7
8
|
import { parseArguments, option } from "./cli-arguments.js";
|
|
@@ -29,17 +30,21 @@ async function runSelectedCli(argv, shutdown, profile) {
|
|
|
29
30
|
if (shutdown.aborted)
|
|
30
31
|
return 130;
|
|
31
32
|
const invocation = selectRuntimeInvocation(argv.slice(2));
|
|
32
|
-
|
|
33
|
+
// A Sharing verb's syntax is Live's, not the Shell's: its argv is split
|
|
34
|
+
// rather than parsed, so a list flag given more than once survives.
|
|
35
|
+
const sharing = SHARING_COMMANDS.has(invocation.args[0] ?? "")
|
|
36
|
+
? splitSharingArgv(invocation.args)
|
|
37
|
+
: null;
|
|
38
|
+
if (sharing && (sharing.forwarded.includes("--help") || sharing.forwarded.includes("-h"))) {
|
|
39
|
+
process.stdout.write(`${CLI_HELP}\n`);
|
|
40
|
+
return 0;
|
|
41
|
+
}
|
|
42
|
+
const parsed = parseArguments(sharing ? [sharing.forwarded[0], ...sharing.host] : invocation.args);
|
|
33
43
|
if (parsed.command === "automations" && automationHelp(parsed)) {
|
|
34
44
|
return (await import("./automations-cli-host.js")).runShellAutomationsCli(automationArguments(parsed), async () => {
|
|
35
45
|
throw new Error("Automations help does not open the user runtime");
|
|
36
46
|
});
|
|
37
47
|
}
|
|
38
|
-
if (RUNTIME_CLI_COMMANDS.has(parsed.command) && automationHelp(parsed)) {
|
|
39
|
-
return runRuntimeCli(parsed, async () => {
|
|
40
|
-
throw new Error(`${parsed.command} help does not open the user runtime`);
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
48
|
if (parsed.command === "channels"
|
|
44
49
|
&& (parsed.options.help || [undefined, "help", "--help", "-h"].includes(parsed.positionals[0]))) {
|
|
45
50
|
process.stdout.write((await import("@amalgm/channels/cli")).channelsCliHelp);
|
|
@@ -59,7 +64,8 @@ async function runSelectedCli(argv, shutdown, profile) {
|
|
|
59
64
|
}
|
|
60
65
|
const filesCommand = parsed.command === "files" ? parsed.positionals[0] : undefined;
|
|
61
66
|
const authCommand = parsed.command === "auth" ? parsed.positionals[0] : undefined;
|
|
62
|
-
if (!
|
|
67
|
+
if (!(sharing
|
|
68
|
+
|| ["setup", "login", "run", "status", "files", "auth", "automations", "channels"].includes(parsed.command))
|
|
63
69
|
|| (parsed.command === "files" && !["register", "add"].includes(String(filesCommand)))) {
|
|
64
70
|
process.stderr.write(`Unknown command: ${parsed.command}\n\n${helpText()}`);
|
|
65
71
|
return 2;
|
|
@@ -157,9 +163,6 @@ async function runSelectedCli(argv, shutdown, profile) {
|
|
|
157
163
|
if (parsed.command === "automations") {
|
|
158
164
|
return await (await import("./automations-cli-host.js")).runShellAutomationsCli(automationArguments(parsed), () => host.automationRuntimeConnection());
|
|
159
165
|
}
|
|
160
|
-
if (RUNTIME_CLI_COMMANDS.has(parsed.command)) {
|
|
161
|
-
return await runRuntimeCli(parsed, () => host.automationRuntimeConnection());
|
|
162
|
-
}
|
|
163
166
|
if (parsed.command === "status") {
|
|
164
167
|
process.stdout.write(`${JSON.stringify({ ...await host.status(), ...(available ? { capabilities: available.capabilities } : {}) }, null, 2)}\n`);
|
|
165
168
|
return 0;
|
|
@@ -167,6 +170,14 @@ async function runSelectedCli(argv, shutdown, profile) {
|
|
|
167
170
|
if (parsed.command === "channels") {
|
|
168
171
|
return (await import("@amalgm/channels/cli")).runChannelsCli(channelsArguments(parsed), host.channelsCommands());
|
|
169
172
|
}
|
|
173
|
+
if (sharing) {
|
|
174
|
+
// The verb runs inside the one runtime that holds the rail and the
|
|
175
|
+
// access tables; the CLI only carries argv in and the streams out.
|
|
176
|
+
const result = await host.callFilesRuntime("/sharing/cli", { argv: sharing.forwarded });
|
|
177
|
+
process.stdout.write(String(result.stdout ?? ""));
|
|
178
|
+
process.stderr.write(String(result.stderr ?? ""));
|
|
179
|
+
return result.exitCode === 0 ? 0 : 1;
|
|
180
|
+
}
|
|
170
181
|
if (parsed.command === "files") {
|
|
171
182
|
if (parsed.positionals.length !== 2) {
|
|
172
183
|
throw new Error(`Usage: amalgm files ${filesCommand} <${filesCommand === "register" ? "path" : "workspace-id"}>`);
|
|
@@ -276,17 +287,6 @@ function numericOption(parsed, key) {
|
|
|
276
287
|
const value = Number(option(parsed, key));
|
|
277
288
|
return Number.isInteger(value) && value > 0 && value <= 65_535 ? value : undefined;
|
|
278
289
|
}
|
|
279
|
-
/** Commands that are thin adapters over the running runtime's loopback MCP routes. */
|
|
280
|
-
const RUNTIME_CLI_COMMANDS = new Set(["share", "apps", "tools"]);
|
|
281
|
-
async function runRuntimeCli(parsed, open) {
|
|
282
|
-
const adapters = await import("./runtime-mcp-cli-host.js");
|
|
283
|
-
const argv = automationArguments(parsed);
|
|
284
|
-
if (parsed.command === "share")
|
|
285
|
-
return adapters.runShellShareCli(argv, open);
|
|
286
|
-
if (parsed.command === "apps")
|
|
287
|
-
return adapters.runShellAppsCli(argv, open);
|
|
288
|
-
return adapters.runShellToolsCli(argv, open);
|
|
289
|
-
}
|
|
290
290
|
const SHELL_AUTOMATION_OPTIONS = new Set([
|
|
291
291
|
"app-url", "amalgm-root", "home", "user", "runtime-label", "branch", "local-session", "proxy-url", "wire-url", "port", "profile",
|
|
292
292
|
]);
|
|
@@ -329,7 +329,36 @@ function openBrowser(url) {
|
|
|
329
329
|
// The URL and setup code are always printed; browser launch is optional.
|
|
330
330
|
}
|
|
331
331
|
}
|
|
332
|
+
/** The eight Sharing verbs, named once by Live's own command list. */
|
|
333
|
+
const SHARING_COMMANDS = new Set(commandDefinitions.map((definition) => definition.name));
|
|
334
|
+
/** The flags the Shell itself reads to find the one running runtime for this
|
|
335
|
+
* user and environment. Everything else belongs to the verb. */
|
|
336
|
+
const SHARING_HOST_FLAGS = new Set([
|
|
337
|
+
"user", "home", "amalgm-root", "app-url", "branch", "local-session",
|
|
338
|
+
]);
|
|
339
|
+
function splitSharingArgv(args) {
|
|
340
|
+
const host = [];
|
|
341
|
+
const forwarded = [];
|
|
342
|
+
for (let index = 0; index < args.length; index += 1) {
|
|
343
|
+
const argument = args[index];
|
|
344
|
+
const joined = argument.indexOf("=");
|
|
345
|
+
const name = argument.startsWith("--")
|
|
346
|
+
? argument.slice(2, joined === -1 ? undefined : joined)
|
|
347
|
+
: "";
|
|
348
|
+
if (!SHARING_HOST_FLAGS.has(name)) {
|
|
349
|
+
forwarded.push(argument);
|
|
350
|
+
continue;
|
|
351
|
+
}
|
|
352
|
+
host.push(argument);
|
|
353
|
+
const next = args[index + 1];
|
|
354
|
+
if (joined === -1 && next !== undefined && !next.startsWith("--")) {
|
|
355
|
+
host.push(next);
|
|
356
|
+
index += 1;
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
return { host, forwarded };
|
|
360
|
+
}
|
|
332
361
|
function helpText() {
|
|
333
|
-
return `amalgm ${VERSION}\n\nUsage:\n amalgm setup [--setup-code CODE] (finite setup and OS service)\n amalgm login [--setup-code CODE] [--no-open]\n amalgm start --user EMAIL\n amalgm stop --user EMAIL\n amalgm run --user EMAIL (foreground)\n amalgm status --user EMAIL\n amalgm auth recover [--setup-code CODE] --user EMAIL\n amalgm files register <path> --user EMAIL\n amalgm files add <workspace-id> --user EMAIL\n amalgm automations <command> [--input JSON | --file PATH | --stdin]\n amalgm channels send --input JSON --user EMAIL\n amalgm share
|
|
362
|
+
return `amalgm ${VERSION}\n\nUsage:\n amalgm setup [--setup-code CODE] (finite setup and OS service)\n amalgm login [--setup-code CODE] [--no-open]\n amalgm start --user EMAIL\n amalgm stop --user EMAIL\n amalgm run --user EMAIL (foreground)\n amalgm status --user EMAIL\n amalgm auth recover [--setup-code CODE] --user EMAIL\n amalgm files register <path> --user EMAIL\n amalgm files add <workspace-id> --user EMAIL\n amalgm automations <command> [--input JSON | --file PATH | --stdin]\n amalgm channels send --input JSON --user EMAIL\n amalgm <share|link|access|unshare|publish|unpublish|download|request> [...] --user EMAIL\n\nEnvironments:\n amalgm ... Production: ~/amalgm\n amalgm preview ... Preview: ~/amalgm-preview\n amalgm dev ... --branch BRANCH --local-session SESSION --app-url URL\n Local: ~/amalgm-dev/SESSION\n\nAuthorization:\n recover Replace a missing, corrupt, or rejected device key after browser approval\n\nFiles:\n register Register, watch, upload, and commit one external workspace\n add Materialize one owned cloud workspace through the running Watch host\n\nAutomations:\n create, list, get, update, delete, run-now\n Use the same JSON objects and results as Automations MCP\n\nChannels:\n send Send one deliberate message through the running authenticated Shell\n\nSharing:\n share, link, access, unshare, publish, unpublish, download, request\n Who may open an agent, automation, app, or tool. Identical to the\n Sharing MCP tools; \`amalgm share --help\` lists every field\n\nOptions:\n --app-url URL Amalgm control plane (default: https://amalgm.ai)\n --amalgm-root PATH Visible installation root (default: ~/amalgm)\n --home PATH OS home override\n --user EMAIL Select one of multiple local users\n --name NAME Computer display name\n --exit-after-ready Examination-only: prove readiness, then stop\n`;
|
|
334
363
|
}
|
|
335
364
|
//# sourceMappingURL=cli.js.map
|