@moxt-ai/mobius 0.0.194 → 0.0.196
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp/agent-connection.d.ts.map +1 -1
- package/dist/acp/agent-connection.js +4 -3
- package/dist/acp/agent-connection.js.map +1 -1
- package/dist/acp/codex/app-server-client.d.ts.map +1 -1
- package/dist/acp/codex/app-server-client.js +4 -2
- package/dist/acp/codex/app-server-client.js.map +1 -1
- package/dist/agent-catalog/acp-readiness-probe.d.ts.map +1 -1
- package/dist/agent-catalog/acp-readiness-probe.js +4 -3
- package/dist/agent-catalog/acp-readiness-probe.js.map +1 -1
- package/dist/cli.js +630 -343
- package/dist/cli.js.map +4 -4
- package/dist/daemon-history-commands.d.ts.map +1 -1
- package/dist/daemon-history-commands.js +70 -29
- package/dist/daemon-history-commands.js.map +1 -1
- package/dist/daemon-manager.d.ts.map +1 -1
- package/dist/daemon-manager.js +7 -17
- package/dist/daemon-manager.js.map +1 -1
- package/dist/filesystem/path-error.d.ts +5 -0
- package/dist/filesystem/path-error.d.ts.map +1 -0
- package/dist/filesystem/path-error.js +8 -0
- package/dist/filesystem/path-error.js.map +1 -0
- package/dist/filesystem/private-path.d.ts +3 -0
- package/dist/filesystem/private-path.d.ts.map +1 -0
- package/dist/filesystem/private-path.js +550 -0
- package/dist/filesystem/private-path.js.map +7 -0
- package/dist/index.js +602 -306
- package/dist/index.js.map +4 -4
- package/dist/native-sessions/codex-history.d.ts.map +1 -1
- package/dist/native-sessions/codex-history.js +4 -3
- package/dist/native-sessions/codex-history.js.map +1 -1
- package/dist/platform/contracts.d.ts +21 -0
- package/dist/platform/contracts.d.ts.map +1 -1
- package/dist/platform/index.d.ts.map +1 -1
- package/dist/platform/index.js +5 -3
- package/dist/platform/index.js.map +1 -1
- package/dist/platform/linux.d.ts.map +1 -1
- package/dist/platform/linux.js +2 -1
- package/dist/platform/linux.js.map +1 -1
- package/dist/platform/macos.d.ts.map +1 -1
- package/dist/platform/macos.js +2 -1
- package/dist/platform/macos.js.map +1 -1
- package/dist/platform/posix.d.ts +28 -1
- package/dist/platform/posix.d.ts.map +1 -1
- package/dist/platform/posix.js +91 -1
- package/dist/platform/posix.js.map +1 -1
- package/dist/platform/windows.d.ts +3 -0
- package/dist/platform/windows.d.ts.map +1 -0
- package/dist/platform/windows.js +174 -0
- package/dist/platform/windows.js.map +1 -0
- package/dist/process/executable.d.ts +7 -5
- package/dist/process/executable.d.ts.map +1 -1
- package/dist/process/executable.js +844 -386
- package/dist/process/executable.js.map +7 -1
- package/dist/process/process-error.d.ts +5 -0
- package/dist/process/process-error.d.ts.map +1 -0
- package/dist/process/process-error.js +9 -0
- package/dist/process/process-error.js.map +1 -0
- package/dist/runtime.js +602 -306
- package/dist/runtime.js.map +4 -4
- package/dist/storage/runtime-installation-store.d.ts.map +1 -1
- package/dist/storage/runtime-installation-store.js +3 -0
- package/dist/storage/runtime-installation-store.js.map +1 -1
- package/package.json +72 -70
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-connection.d.ts","sourceRoot":"","sources":["../../src/acp/agent-connection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,gBAAgB,EAA8B,MAAM,0BAA0B,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,EAAE,KAAK,gBAAgB,EAAmB,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EACH,KAAK,sBAAsB,EAE3B,KAAK,oBAAoB,EAC5B,MAAM,8BAA8B,CAAC;AAuDtC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC,CAuCjG;AAMD,sFAAsF;AACtF,qBAAa,eAAe;;IACxB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEtD,YAAY,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"agent-connection.d.ts","sourceRoot":"","sources":["../../src/acp/agent-connection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,gBAAgB,EAA8B,MAAM,0BAA0B,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,EAAE,KAAK,gBAAgB,EAAmB,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EACH,KAAK,sBAAsB,EAE3B,KAAK,oBAAoB,EAC5B,MAAM,8BAA8B,CAAC;AAuDtC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC,CAuCjG;AAMD,sFAAsF;AACtF,qBAAa,eAAe;;IACxB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEtD,YAAY,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EA+C3E;IACD,IAAI,cAAc,IAAI,oBAAoB,GAAG,IAAI,CAEhD;IACD,QAAQ,CAAC,YAAY,QAAa,OAAO,CAAC,IAAI,CAAC,CAW7C;IAEF,QAAQ,CAAC,IAAI,GAAU,CAAC,aAAa,OAAO,CAAC,CAAC,CAAC,eAAe,MAAM,UAAU,WAAW,KAAG,OAAO,CAAC,CAAC,CAAC,CAuCpG;CACL"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { ndJsonStream, RequestError } from "@agentclientprotocol/sdk";
|
|
3
|
-
import { stopProcessTree } from "../process/executable.js";
|
|
3
|
+
import { executableLaunch, platformSpawnOptions, stopProcessTree } from "../process/executable.js";
|
|
4
4
|
import { AcpExecutionError } from "./acp-error.js";
|
|
5
5
|
import { createAcpClient } from "./create-client.js";
|
|
6
6
|
import { acpEndpointTerminationError, } from "./in-process/acp-endpoint.js";
|
|
@@ -114,9 +114,10 @@ export class AgentConnection {
|
|
|
114
114
|
this.connection = createAcpClient(client).connect(inProcess.app());
|
|
115
115
|
return;
|
|
116
116
|
}
|
|
117
|
-
const
|
|
117
|
+
const launch = executableLaunch(agent.adapterPath, agent.arguments);
|
|
118
|
+
const child = spawn(launch.command, [...launch.arguments], {
|
|
118
119
|
cwd,
|
|
119
|
-
|
|
120
|
+
...platformSpawnOptions,
|
|
120
121
|
env: { ...process.env, ...agent.environment },
|
|
121
122
|
shell: false,
|
|
122
123
|
stdio: ["pipe", "pipe", "pipe"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-connection.js","sourceRoot":"","sources":["../../src/acp/agent-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAyB,YAAY,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-connection.js","sourceRoot":"","sources":["../../src/acp/agent-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-server-client.d.ts","sourceRoot":"","sources":["../../../src/acp/codex/app-server-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"app-server-client.d.ts","sourceRoot":"","sources":["../../../src/acp/codex/app-server-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,KAAK,sBAAsB,EAA+B,MAAM,+BAA+B,CAAC;AAMzG,+EAA+E;AAC/E,qBAAa,mBAAoB,SAAQ,iBAAiB;IACtD,YAAY,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,EAGpE;CACJ;AAED,oFAAoF;AACpF,MAAM,WAAW,2BAA2B;IACxC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,QAAQ,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAMD,MAAM,WAAW,qBAAqB;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvD,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;CAC7C;AAED;;;GAGG;AACH,qBAAa,oBAAoB;;IAK7B,QAAQ,CAAC,UAAU,kCAA6B;IAQhD,YAAY,OAAO,EAAE,qBAAqB,EAiDzC;IAED,QAAQ,CAAC,KAAK,QAAO,YAAY,CAAgB;IA6HjD,+FAA+F;IAC/F,QAAQ,CAAC,OAAO,WAAkB,MAAM,UAAU,OAAO,UAAU,WAAW,KAAG,OAAO,CAAC,OAAO,CAAC,CAoB/F;IAEF,QAAQ,CAAC,MAAM,WAAY,MAAM,UAAU,OAAO,KAAG,IAAI,CAEvD;IAEF,QAAQ,CAAC,OAAO,OAAQ,MAAM,GAAG,MAAM,UAAU,OAAO,KAAG,IAAI,CAE7D;IAEF,QAAQ,CAAC,gBAAgB,OAAQ,MAAM,GAAG,MAAM,QAAQ,MAAM,WAAW,MAAM,KAAG,IAAI,CAEpF;IAaF,2DAA2D;IAC3D,QAAQ,CAAC,UAAU,WAAkB,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAU9D;IAEF;;;;OAIG;IACH,QAAQ,CAAC,MAAM,QAAO,IAAI,CAExB;CACL"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import { executableLaunch, platformSpawnOptions } from "../../process/executable.js";
|
|
2
3
|
import { AcpExecutionError } from "../acp-error.js";
|
|
3
4
|
import { acpEndpointTerminationError } from "../in-process/acp-endpoint.js";
|
|
4
5
|
import { decodeAppServerMessage } from "./app-server-protocol.js";
|
|
@@ -29,9 +30,10 @@ export class CodexAppServerClient {
|
|
|
29
30
|
#pendingFragments = [];
|
|
30
31
|
constructor(options) {
|
|
31
32
|
this.#handlers = options.handlers;
|
|
32
|
-
|
|
33
|
+
const launch = executableLaunch(options.command, ["app-server"]);
|
|
34
|
+
this.#child = spawn(launch.command, [...launch.arguments], {
|
|
33
35
|
cwd: options.cwd,
|
|
34
|
-
|
|
36
|
+
...platformSpawnOptions,
|
|
35
37
|
env: { ...process.env, ...options.environment },
|
|
36
38
|
shell: false,
|
|
37
39
|
stdio: ["pipe", "pipe", "pipe"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-server-client.js","sourceRoot":"","sources":["../../../src/acp/codex/app-server-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAA+B,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,+BAA+B,GAAG,MAAM,CAAC;AAC/C,MAAM,0BAA0B,GAAG,EAAE,GAAG,KAAK,GAAG,KAAK,CAAC;AAEtD,+EAA+E;AAC/E,MAAM,OAAO,mBAAoB,SAAQ,iBAAiB;IACtD,YAAY,IAAY,EAAE,OAAe,EAAE,OAAO,GAAiB,EAAE;QACjE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACtC,CAAC;CACJ;AAyBD;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IACpB,MAAM,CAAe;IACrB,SAAS,CAAyB;IAClC,QAAQ,GAAG,IAAI,GAAG,EAAmC,CAAC;IACtD,YAAY,GAAG,OAAO,CAAC,aAAa,EAA0B,CAAC;IAC/D,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;IAChD,UAAU,GAAyG;QAC/G,IAAI,EAAE,MAAM;KACf,CAAC;IACF,cAAc,GAAG,CAAC,CAAC;IACnB,aAAa,GAAG,CAAC,CAAC;IAClB,iBAAiB,GAAa,EAAE,CAAC;IAEjC,YAAY,OAA8B;QACtC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,
|
|
1
|
+
{"version":3,"file":"app-server-client.js","sourceRoot":"","sources":["../../../src/acp/codex/app-server-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acp-readiness-probe.d.ts","sourceRoot":"","sources":["../../src/agent-catalog/acp-readiness-probe.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAOpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAA+B,MAAM,kBAAkB,CAAC;AAKxF,qBAAa,oBAAoB;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAE3C,YAAY,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAGpE;CACJ;AA8ID,wBAAsB,iBAAiB,CACnC,aAAa,EAAE,uBAAuB,EACtC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EACxC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"acp-readiness-probe.d.ts","sourceRoot":"","sources":["../../src/agent-catalog/acp-readiness-probe.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAOpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAA+B,MAAM,kBAAkB,CAAC;AAKxF,qBAAa,oBAAoB;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAE3C,YAAY,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAGpE;CACJ;AA8ID,wBAAsB,iBAAiB,CACnC,aAAa,EAAE,uBAAuB,EACtC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EACxC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,oBAAoB,CAAC,CAgH/B"}
|
|
@@ -3,7 +3,7 @@ import { methods, ndJsonStream, PROTOCOL_VERSION, RequestError, } from "@agentcl
|
|
|
3
3
|
import { createAcpClient } from "../acp/create-client.js";
|
|
4
4
|
import { acpEndpointTerminationError } from "../acp/in-process/acp-endpoint.js";
|
|
5
5
|
import { normalizeAcpCapabilities } from "../acp/session-capabilities.js";
|
|
6
|
-
import { captureProcessTree, stopProcessTree } from "../process/executable.js";
|
|
6
|
+
import { captureProcessTree, executableLaunch, platformSpawnOptions, stopProcessTree } from "../process/executable.js";
|
|
7
7
|
import { AgentProbeError } from "./agent-probe-error.js";
|
|
8
8
|
import { normalizeVersionOutput } from "./version-output.js";
|
|
9
9
|
const ACP_OUTPUT_LIMIT_BYTES = 1024 * 1024;
|
|
@@ -158,9 +158,10 @@ export async function probeAcpReadiness(specification, agent, environment, defau
|
|
|
158
158
|
signal.removeEventListener("abort", abort);
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
|
-
const
|
|
161
|
+
const launch = executableLaunch(agent.adapterPath, agent.arguments);
|
|
162
|
+
const child = spawn(launch.command, [...launch.arguments], {
|
|
162
163
|
cwd: defaultWorkspace,
|
|
163
|
-
|
|
164
|
+
...platformSpawnOptions,
|
|
164
165
|
env: { ...environment, ...agent.environment },
|
|
165
166
|
shell: false,
|
|
166
167
|
stdio: ["pipe", "pipe", "pipe"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acp-readiness-probe.js","sourceRoot":"","sources":["../../src/agent-catalog/acp-readiness-probe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAKH,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,YAAY,GAIf,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAyB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"acp-readiness-probe.js","sourceRoot":"","sources":["../../src/agent-catalog/acp-readiness-probe.ts"],"names":[],"mappings":"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"}
|