@moxt-ai/mobius 0.0.340 → 0.0.342
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/adapter/claude/agent-connection.js +1 -1
- package/dist/acp/adapter/claude/agent-connection.js.map +1 -1
- package/dist/acp/adapter/codex/agent-connection.js +1 -1
- package/dist/acp/adapter/codex/agent-connection.js.map +1 -1
- package/dist/acp/adapter/codex/tool-event.js +2 -2
- package/dist/acp/adapter/codex/tool-event.js.map +1 -1
- package/dist/acp/adapter/pi/agent-connection.js +1 -1
- package/dist/acp/adapter/pi/agent-connection.js.map +1 -1
- package/dist/acp/adapter/session-events.d.ts +2 -1
- package/dist/acp/adapter/session-events.d.ts.map +1 -1
- package/dist/acp/adapter/session-events.js +66 -89
- package/dist/acp/adapter/session-events.js.map +1 -1
- package/dist/acp/agent/in-process-endpoint.d.ts +3 -1
- package/dist/acp/agent/in-process-endpoint.d.ts.map +1 -1
- package/dist/acp/connection/agent-connection.d.ts +2 -2
- package/dist/acp/connection/agent-connection.d.ts.map +1 -1
- package/dist/acp/content/content-externalizer.d.ts.map +1 -1
- package/dist/acp/content/content-externalizer.js +26 -0
- package/dist/acp/content/content-externalizer.js.map +1 -1
- package/dist/acp/harness/claude/endpoint.js +1 -1
- package/dist/acp/harness/claude/endpoint.js.map +1 -1
- package/dist/acp/harness/codex/agent.js +3 -3
- package/dist/acp/harness/codex/agent.js.map +1 -1
- package/dist/acp/harness/codex/owned-agent.d.ts +2 -2
- package/dist/acp/harness/codex/owned-agent.d.ts.map +1 -1
- package/dist/acp/harness/codex/owned-agent.js +3 -3
- package/dist/acp/harness/codex/owned-agent.js.map +1 -1
- package/dist/acp/native-history/preview-contract.d.ts +3 -4
- package/dist/acp/native-history/preview-contract.d.ts.map +1 -1
- package/dist/cli.js +277 -637
- package/dist/cli.js.map +4 -4
- package/dist/daemon/upgrades/data.js +5 -5
- package/dist/daemon/upgrades/data.js.map +1 -1
- package/dist/daemon/upgrades/package.js +5 -5
- package/dist/daemon/upgrades/package.js.map +1 -1
- package/dist/daemon/upgrades/upgrade.js +4 -7
- package/dist/daemon/upgrades/upgrade.js.map +1 -1
- package/dist/runtime.js +245 -142
- package/dist/runtime.js.map +4 -4
- package/dist/session/api/session-api.d.ts +3 -2
- package/dist/session/api/session-api.d.ts.map +1 -1
- package/dist/session/api/session-api.js +1 -1
- package/dist/session/api/session-api.js.map +1 -1
- package/dist/session/api/session-layer.d.ts +3 -2
- package/dist/session/api/session-layer.d.ts.map +1 -1
- package/dist/session/api/session-layer.js +4 -4
- package/dist/session/api/session-layer.js.map +1 -1
- package/dist/session/history/session-event-history-projection.d.ts.map +1 -1
- package/dist/session/history/session-event-history-projection.js +7 -0
- package/dist/session/history/session-event-history-projection.js.map +1 -1
- package/dist/session/live/agent-session.js +1 -1
- package/dist/session/live/agent-session.js.map +1 -1
- package/dist/session/turn/runtime-turn-activity.d.ts +5 -2
- package/dist/session/turn/runtime-turn-activity.d.ts.map +1 -1
- package/dist/session/turn/runtime-turn-activity.js +15 -10
- package/dist/session/turn/runtime-turn-activity.js.map +1 -1
- package/dist/storage/daemon/version-data.js +2 -2
- package/dist/storage/daemon/version-data.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { decodeRuntimeUpgradeVersion } from "@moxt-ai/mobius-sdk/protocol";
|
|
2
2
|
import { copyVersionData, discardVersionData, readCurrentDataVersion, versionDataExists, writeCurrentDataVersion, } from "../../storage/daemon/version-data.js";
|
|
3
3
|
import { readStateDirectory } from "../../storage/state-directory.js";
|
|
4
4
|
import { readSwitchStatus } from "../control/switch-status.js";
|
|
@@ -7,7 +7,7 @@ import { readSwitchStatus } from "../control/switch-status.js";
|
|
|
7
7
|
export async function prepareVersionData(version, signal, environment = process.env, fallbackVersion = null) {
|
|
8
8
|
signal.throwIfAborted();
|
|
9
9
|
const root = readStateDirectory(environment);
|
|
10
|
-
const targetVersion =
|
|
10
|
+
const targetVersion = decodeRuntimeUpgradeVersion(version);
|
|
11
11
|
const current = await readCurrentDataVersion(root, signal);
|
|
12
12
|
let previous;
|
|
13
13
|
if (current !== null) {
|
|
@@ -25,7 +25,7 @@ export async function prepareVersionData(version, signal, environment = process.
|
|
|
25
25
|
}
|
|
26
26
|
previous = fallbackVersion;
|
|
27
27
|
}
|
|
28
|
-
const leftBehind = await copyVersionData(root,
|
|
28
|
+
const leftBehind = await copyVersionData(root, decodeRuntimeUpgradeVersion(previous), targetVersion, signal);
|
|
29
29
|
for (const entry of leftBehind) {
|
|
30
30
|
process.stderr.write(`Mobius did not carry ${entry} into version ${targetVersion}: an earlier Mobius ran with that installation as its state root.\n`);
|
|
31
31
|
}
|
|
@@ -33,10 +33,10 @@ export async function prepareVersionData(version, signal, environment = process.
|
|
|
33
33
|
// A version whose switch rolled back never had the current data; once the previous version runs again, its copy is
|
|
34
34
|
// stale, and its next attempt must inherit the current data rather than reuse that copy.
|
|
35
35
|
export async function discardRolledBackData(version, signal) {
|
|
36
|
-
await discardVersionData(readStateDirectory(),
|
|
36
|
+
await discardVersionData(readStateDirectory(), decodeRuntimeUpgradeVersion(version), signal);
|
|
37
37
|
}
|
|
38
38
|
export async function recordCurrentData(version, signal) {
|
|
39
|
-
await writeCurrentDataVersion(readStateDirectory(),
|
|
39
|
+
await writeCurrentDataVersion(readStateDirectory(), decodeRuntimeUpgradeVersion(version), signal);
|
|
40
40
|
}
|
|
41
41
|
export async function prepareUpgradeData(controlDirectory, version, signal) {
|
|
42
42
|
const transition = await readSwitchStatus(controlDirectory, signal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACH,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,GAC1B,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,oHAAoH;AACpH,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,OAAe,EACf,MAAmB,EACnB,WAAW,GAAgC,OAAO,CAAC,GAAG,EACtD,eAAe,GAAkB,IAAI;IAErC,MAAM,CAAC,cAAc,EAAE,CAAC;IACxB,MAAM,IAAI,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,2BAA2B,CAAC,
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACH,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,GAC1B,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,oHAAoH;AACpH,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,OAAe,EACf,MAAmB,EACnB,WAAW,GAAgC,OAAO,CAAC,GAAG,EACtD,eAAe,GAAkB,IAAI;IAErC,MAAM,CAAC,cAAc,EAAE,CAAC;IACxB,MAAM,IAAI,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3D,IAAI,QAAgB,CAAC;IACrB,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;QACD,6GAA6G;QAC7G,yFAAyF;QACzF,MAAM,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,QAAQ,GAAG,OAAO,CAAC;IACvB,CAAC;SAAM,CAAC;QACJ,IAAI,eAAe,KAAK,IAAI,IAAI,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YACrF,OAAO;QACX,CAAC;QACD,QAAQ,GAAG,eAAe,CAAC;IAC/B,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAC7G,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,wBAAwB,KAAK,iBAAiB,aAAa,qEAAqE,CACnI,CAAC;IACN,CAAC;AACL,CAAC;AAED,mHAAmH;AACnH,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAe,EAAE,MAAmB;IAC5E,MAAM,kBAAkB,CAAC,kBAAkB,EAAE,EAAE,2BAA2B,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;AACjG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAe,EAAE,MAAmB;IACxE,MAAM,uBAAuB,CAAC,kBAAkB,EAAE,EAAE,2BAA2B,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;AACtG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,gBAAuC,EACvC,OAAe,EACf,MAAmB;IAEnB,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,QAAQ,GACV,UAAU,EAAE,IAAI,KAAK,WAAW,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACjH,MAAM,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isAbsolute, join, relative } from "node:path";
|
|
2
|
-
import {
|
|
2
|
+
import { decodeRuntimeUpgradeVersion } from "@moxt-ai/mobius-sdk/protocol";
|
|
3
3
|
import { gt, satisfies, validRange } from "semver";
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { readInstalledRelease, releasePrefix } from "../../storage/daemon/release-files.js";
|
|
@@ -16,7 +16,7 @@ export class DaemonReleaseUpgradeError extends Error {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
export async function prepareDaemonReleaseVersion(version, signal) {
|
|
19
|
-
|
|
19
|
+
decodeRuntimeUpgradeVersion(version);
|
|
20
20
|
signal.throwIfAborted();
|
|
21
21
|
const prefix = releasePrefix(version);
|
|
22
22
|
let installed;
|
|
@@ -44,7 +44,7 @@ export async function prepareDaemonReleaseVersion(version, signal) {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
export async function installDaemonReleaseVersion(version, signal) {
|
|
47
|
-
|
|
47
|
+
decodeRuntimeUpgradeVersion(version);
|
|
48
48
|
const npm = await findExecutableOnPath("npm", process.env);
|
|
49
49
|
if (npm === null) {
|
|
50
50
|
throw new DaemonReleaseUpgradeError("npm_unavailable", "npm is required to download the new daemon");
|
|
@@ -127,7 +127,7 @@ async function verifyInstalledDaemonRelease(installed, prefix, version, signal)
|
|
|
127
127
|
// a one-element array from npm 12. Accept exactly those shapes; anything else is
|
|
128
128
|
// not a version npm reported.
|
|
129
129
|
const npmViewVersionSchema = z
|
|
130
|
-
.union([
|
|
130
|
+
.union([z.string(), z.tuple([z.string()])])
|
|
131
131
|
.transform((value) => (typeof value === "string" ? value : value[0]));
|
|
132
132
|
export async function findNewDaemonReleaseVersion(currentVersion, signal) {
|
|
133
133
|
const npm = await findExecutableOnPath("npm", process.env);
|
|
@@ -144,7 +144,7 @@ export async function findNewDaemonReleaseVersion(currentVersion, signal) {
|
|
|
144
144
|
timeoutMilliseconds: 30_000,
|
|
145
145
|
outputLimitBytes: 4096,
|
|
146
146
|
});
|
|
147
|
-
const version = npmViewVersionSchema.parse(JSON.parse(result.stdout));
|
|
147
|
+
const version = decodeRuntimeUpgradeVersion(npmViewVersionSchema.parse(JSON.parse(result.stdout)));
|
|
148
148
|
return gt(version, currentVersion) ? version : null;
|
|
149
149
|
}
|
|
150
150
|
catch (cause) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAyB,oBAAoB,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACnH,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAE3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IACvC,IAAI,CAAS;IACtB,YAAY,IAAY,EAAE,OAAe,EAAE,OAAsB;QAC7D,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAAe,EAAE,MAAmB;IAClF,2BAA2B,CAAC,
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -211,14 +211,11 @@ async function checkDaemonReleaseUpgrade(signal, activity) {
|
|
|
211
211
|
const launch = await installDaemonReleaseVersion(version, signal);
|
|
212
212
|
let reservation = activity.reserveIfQuiet(UPGRADE_QUIET_MILLISECONDS);
|
|
213
213
|
if (reservation === null) {
|
|
214
|
-
new RuntimeDiagnosticLog(control.stateDirectory)
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
version,
|
|
218
|
-
activeWork: activity.count(),
|
|
219
|
-
...activity.describe(),
|
|
220
|
-
})}`);
|
|
214
|
+
const diagnostics = new RuntimeDiagnosticLog(control.stateDirectory);
|
|
215
|
+
const record = (event, details = {}) => diagnostics.record(`Mobius daemon diagnostic ${JSON.stringify({ timestamp: new Date().toISOString(), event, version, ...details })}`);
|
|
216
|
+
record("daemon_upgrade_deferred", { activeWork: activity.count(), ...activity.describe() });
|
|
221
217
|
reservation = await reserveWhenQuiet(activity, signal);
|
|
218
|
+
record("daemon_upgrade_released");
|
|
222
219
|
}
|
|
223
220
|
const _reservation = __addDisposableResource(env_1, reservation, false);
|
|
224
221
|
signal.throwIfAborted();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/upgrade.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/upgrade.ts"],"names":[],"mappings":"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"}
|