@tryglen/cli 0.38.1 → 0.38.5
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/clients/glen-api/from-wire.js +36 -0
- package/dist/clients/glen-api/from-wire.js.map +1 -0
- package/dist/clients/glen-api/glen-api.js +1 -2
- package/dist/clients/glen-api/glen-api.js.map +1 -1
- package/dist/commands/takeover/_utils/agent-paths.js +2 -1
- package/dist/commands/takeover/_utils/agent-paths.js.map +1 -1
- package/dist/commands/takeover/_utils/codex-thread-messages.js +23 -0
- package/dist/commands/takeover/_utils/codex-thread-messages.js.map +1 -0
- package/dist/commands/takeover/_utils/import-codex-desktop-thread.js +2 -19
- package/dist/commands/takeover/_utils/import-codex-desktop-thread.js.map +1 -1
- package/dist/commands/takeover/_utils/verify-codex-session.js +50 -0
- package/dist/commands/takeover/_utils/verify-codex-session.js.map +1 -0
- package/dist/commands/takeover/_utils/write-codex-session.js +22 -3
- package/dist/commands/takeover/_utils/write-codex-session.js.map +1 -1
- package/dist/core/system/env.js +0 -1
- package/dist/core/system/env.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { field } from "../../core/json/json-field.js";
|
|
2
|
+
import { isRecord } from "../../core/json/is-record.js";
|
|
3
|
+
// superjson keys: dot-separated, with literal dots escaped as "\.".
|
|
4
|
+
const pathOf = (key) => key.split(/(?<!\\)\./).map((part) => part.replace(/\\\./g, "."));
|
|
5
|
+
const dropAt = (value, path) => {
|
|
6
|
+
const [head, ...rest] = path;
|
|
7
|
+
if (head === undefined)
|
|
8
|
+
return value;
|
|
9
|
+
if (Array.isArray(value))
|
|
10
|
+
return value.map((item, i) => String(i) !== head
|
|
11
|
+
? item
|
|
12
|
+
: rest.length === 0
|
|
13
|
+
? undefined
|
|
14
|
+
: dropAt(item, rest));
|
|
15
|
+
if (!isRecord(value) || !(head in value))
|
|
16
|
+
return value;
|
|
17
|
+
if (rest.length === 0)
|
|
18
|
+
return Object.fromEntries(Object.entries(value).filter(([k]) => k !== head));
|
|
19
|
+
return { ...value, [head]: dropAt(value[head], rest) };
|
|
20
|
+
};
|
|
21
|
+
const markedUndefined = (type) => type === "undefined" || (Array.isArray(type) && type[0] === "undefined");
|
|
22
|
+
// superjson sends `undefined` as null and marks it in meta; restore it, or optional fields would read null.
|
|
23
|
+
// Dates need nothing: they already arrive as ISO strings, which is what the contract expects.
|
|
24
|
+
const fromWire = (value) => {
|
|
25
|
+
const json = field(value, "json");
|
|
26
|
+
if (json === undefined)
|
|
27
|
+
return value;
|
|
28
|
+
const values = field(field(value, "meta"), "values");
|
|
29
|
+
if (!isRecord(values))
|
|
30
|
+
return json;
|
|
31
|
+
return Object.entries(values)
|
|
32
|
+
.filter(([, type]) => markedUndefined(type))
|
|
33
|
+
.reduce((acc, [key]) => dropAt(acc, pathOf(key)), json);
|
|
34
|
+
};
|
|
35
|
+
export { fromWire };
|
|
36
|
+
//# sourceMappingURL=from-wire.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"from-wire.js","sourceRoot":"","sources":["../../../src/clients/glen-api/from-wire.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,oEAAoE;AACpE,MAAM,MAAM,GAAG,CAAC,GAAW,EAAY,EAAE,CACvC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;AAEnE,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,IAAc,EAAW,EAAE;IACzD,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7B,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACtB,OAAQ,KAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAC1C,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI;YAChB,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;gBACjB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CACzB,CAAC;IACJ,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QACnB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAClD,CAAC;IACJ,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAa,EAAW,EAAE,CACjD,IAAI,KAAK,WAAW,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC;AAE3E,4GAA4G;AAC5G,8FAA8F;AAC9F,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAW,EAAE;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;SAC3C,MAAM,CAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { httpJson, networkRemedy } from "../../core/system/http.js";
|
|
|
7
7
|
import { field } from "../../core/json/json-field.js";
|
|
8
8
|
import { err, ok } from "../../core/errors/result.js";
|
|
9
9
|
import { glenState } from "../../core/state/state.js";
|
|
10
|
+
import { fromWire } from "./from-wire.js";
|
|
10
11
|
import { installId } from "../../core/telemetry/install-id.js";
|
|
11
12
|
import { selfUpdate } from "../npm/update.js";
|
|
12
13
|
import { cliVersion } from "../../core/system/version.js";
|
|
@@ -22,8 +23,6 @@ const NETWORK_CODES = {
|
|
|
22
23
|
const DEFAULT_TIMEOUT_MS = 15_000;
|
|
23
24
|
const STATUS_PAGE = "https://tryglen.com/status";
|
|
24
25
|
const RETRY = `try again in a minute. If it persists, check ${STATUS_PAGE}`;
|
|
25
|
-
// superjson: `json` already has dates as ISO strings; `meta` only says what to revive as Date.
|
|
26
|
-
const fromWire = (value) => field(value, "json") ?? value;
|
|
27
26
|
const isTrpcError = (e) => typeof field(field(field(e, "error"), "data"), "code") === "string";
|
|
28
27
|
const fromTrpcError = (what, e, status) => {
|
|
29
28
|
const { appError, code } = e.error.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glen-api.js","sourceRoot":"","sources":["../../../src/clients/glen-api/glen-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAEzE,OAAO,EAAiB,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAgB1D,MAAM,aAAa,GAAG;IACpB,GAAG,EAAE,iBAAiB;IACtB,OAAO,EAAE,qBAAqB;IAC9B,OAAO,EAAE,qBAAqB;IAC9B,GAAG,EAAE,iBAAiB;IACtB,OAAO,EAAE,mBAAmB;IAC5B,QAAQ,EAAE,sBAAsB;CACxB,CAAC;AAEX,2EAA2E;AAC3E,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,MAAM,WAAW,GAAG,4BAA4B,CAAC;AACjD,MAAM,KAAK,GAAG,gDAAgD,WAAW,EAAE,CAAC;AAE5E
|
|
1
|
+
{"version":3,"file":"glen-api.js","sourceRoot":"","sources":["../../../src/clients/glen-api/glen-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { homedir } from "node:os";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
+
import { codexPaths } from "../../../clients/codex/codex-paths.js";
|
|
3
4
|
import { env } from "../../../core/system/env.js";
|
|
4
5
|
const projectKey = (workspace) => workspace.replaceAll("/", "-").replace(/[^A-Za-z0-9._-]/g, "-");
|
|
5
6
|
// pi's own encoding (getDefaultSessionDirPath): no leading separator, `/ \ :` → "-", wrapped in "--".
|
|
@@ -10,7 +11,7 @@ const agentPaths = {
|
|
|
10
11
|
return join(root, "projects", projectKey(workspace), `${sessionId}.jsonl`);
|
|
11
12
|
},
|
|
12
13
|
codex(sessionId, date = new Date()) {
|
|
13
|
-
const root =
|
|
14
|
+
const root = codexPaths.home();
|
|
14
15
|
// Codex parses the session id from this name: local time, seconds, no Z, or `codex resume` breaks.
|
|
15
16
|
const pad = (value) => String(value).padStart(2, "0");
|
|
16
17
|
const year = String(date.getFullYear());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-paths.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/agent-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAElD,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAU,EAAE,CAC/C,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AAElE,sGAAsG;AACtG,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAU,EAAE,CACjD,KAAK,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC;AAEnE,MAAM,UAAU,GAAG;IACjB,MAAM,CAAC,SAAiB,EAAE,SAAiB;QACzC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,QAAQ,CAAC,CAAC;IAC7E,CAAC;IACD,KAAK,CAAC,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxC,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"agent-paths.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/agent-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAElD,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAU,EAAE,CAC/C,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AAElE,sGAAsG;AACtG,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAU,EAAE,CACjD,KAAK,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC;AAEnE,MAAM,UAAU,GAAG;IACjB,MAAM,CAAC,SAAiB,EAAE,SAAiB;QACzC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,QAAQ,CAAC,CAAC;IAC7E,CAAC;IACD,KAAK,CAAC,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QAC/B,mGAAmG;QACnG,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;QACxH,OAAO,IAAI,CACT,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,KAAK,EACL,GAAG,EACH,WAAW,SAAS,IAAI,SAAS,QAAQ,CAC1C,CAAC;IACJ,CAAC;IACD,EAAE,CAAC,SAAiB,EAAE,SAAiB,EAAE,IAAI,GAAG,IAAI,IAAI,EAAE;QACxD,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,2BAA2B,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,GAAG,SAAS,IAAI,SAAS,QAAQ,CAAC;QAC/C,kFAAkF;QAClF,OAAO,WAAW;YAChB,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC;YACzB,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { field } from "../../../core/json/json-field.js";
|
|
2
|
+
const IMPORT_MARKER = "<EXTERNAL SESSION IMPORTED>";
|
|
3
|
+
const arrayOf = (v) => (Array.isArray(v) ? v : []);
|
|
4
|
+
// The user and assistant turns a `thread/read` result shows, in order.
|
|
5
|
+
const codexThreadMessages = (result) => arrayOf(field(field(result, "thread"), "turns")).flatMap((turn) => arrayOf(field(turn, "items")).flatMap((item) => {
|
|
6
|
+
const type = field(item, "type");
|
|
7
|
+
const text = field(item, "text");
|
|
8
|
+
if (type === "agentMessage")
|
|
9
|
+
return typeof text === "string" && text !== IMPORT_MARKER
|
|
10
|
+
? [{ role: "assistant", content: text }]
|
|
11
|
+
: [];
|
|
12
|
+
const content = field(item, "content");
|
|
13
|
+
if (type !== "userMessage" || !Array.isArray(content))
|
|
14
|
+
return [];
|
|
15
|
+
const joined = content
|
|
16
|
+
.filter((part) => field(part, "type") === "text")
|
|
17
|
+
.map((part) => field(part, "text"))
|
|
18
|
+
.filter((t) => typeof t === "string")
|
|
19
|
+
.join("");
|
|
20
|
+
return [{ role: "user", content: joined }];
|
|
21
|
+
}));
|
|
22
|
+
export { codexThreadMessages };
|
|
23
|
+
//# sourceMappingURL=codex-thread-messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-thread-messages.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/codex-thread-messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAEzD,MAAM,aAAa,GAAG,6BAA6B,CAAC;AAEpD,MAAM,OAAO,GAAG,CAAC,CAAU,EAAa,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAEvE,uEAAuE;AACvE,MAAM,mBAAmB,GAAG,CAAC,MAAe,EAAE,EAAE,CAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAChE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CACnC,CAAC,IAAI,EAAqD,EAAE;IAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,IAAI,KAAK,cAAc;QACzB,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,aAAa;YACvD,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAoB,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACjD,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,aAAa,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IACjE,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,IAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC;SACzD,GAAG,CAAC,CAAC,IAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;SACjD,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;AACtD,CAAC,CACF,CACF,CAAC;AAEJ,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
|
|
@@ -4,8 +4,8 @@ import { err, ok } from "../../../core/errors/result.js";
|
|
|
4
4
|
import { cliVersion } from "../../../core/system/version.js";
|
|
5
5
|
import { agentProcess } from "./agent-process.js";
|
|
6
6
|
import { archiveCodexDesktopThread } from "./archive-codex-desktop-thread.js";
|
|
7
|
+
import { codexThreadMessages } from "./codex-thread-messages.js";
|
|
7
8
|
const TIMEOUT_MS = 15_000;
|
|
8
|
-
const IMPORT_MARKER = "<EXTERNAL SESSION IMPORTED>";
|
|
9
9
|
const TRANSPORT_WHY = {
|
|
10
10
|
start_failed: "could not start codex app-server",
|
|
11
11
|
exited: "codex app-server exited before import completed",
|
|
@@ -20,23 +20,6 @@ const failure = (why) => cliErr("Exec", {
|
|
|
20
20
|
});
|
|
21
21
|
const whyOf = (f) => f.kind === "rpc" ? f.message : TRANSPORT_WHY[f.reason];
|
|
22
22
|
const arrayOf = (v) => (Array.isArray(v) ? v : []);
|
|
23
|
-
const visibleMessages = (result) => arrayOf(field(field(result, "thread"), "turns")).flatMap((turn) => arrayOf(field(turn, "items")).flatMap((item) => {
|
|
24
|
-
const type = field(item, "type");
|
|
25
|
-
const text = field(item, "text");
|
|
26
|
-
if (type === "agentMessage")
|
|
27
|
-
return typeof text === "string" && text !== IMPORT_MARKER
|
|
28
|
-
? [{ role: "assistant", content: text }]
|
|
29
|
-
: [];
|
|
30
|
-
const content = field(item, "content");
|
|
31
|
-
if (type !== "userMessage" || !Array.isArray(content))
|
|
32
|
-
return [];
|
|
33
|
-
const joined = content
|
|
34
|
-
.filter((part) => field(part, "type") === "text")
|
|
35
|
-
.map((part) => field(part, "text"))
|
|
36
|
-
.filter((t) => typeof t === "string")
|
|
37
|
-
.join("");
|
|
38
|
-
return [{ role: "user", content: joined }];
|
|
39
|
-
}));
|
|
40
23
|
const archiveSeparately = async (rpc, input, error, threadIds) => {
|
|
41
24
|
rpc.close();
|
|
42
25
|
const archived = await Promise.all(threadIds.map((threadId) => archiveCodexDesktopThread({ binary: input.binary, threadId })));
|
|
@@ -122,7 +105,7 @@ const runImport = async (rpc, input) => {
|
|
|
122
105
|
});
|
|
123
106
|
if (!read.ok)
|
|
124
107
|
return afterThreadFailure(rpc, input, read.error, threadId);
|
|
125
|
-
if (JSON.stringify(
|
|
108
|
+
if (JSON.stringify(codexThreadMessages(read.value)) !==
|
|
126
109
|
JSON.stringify(input.messages))
|
|
127
110
|
return rejectThreads(rpc, input, failure("imported task did not expose the canonical visible turns"), [threadId]);
|
|
128
111
|
const steps = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-codex-desktop-thread.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/import-codex-desktop-thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"import-codex-desktop-thread.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/import-codex-desktop-thread.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { cliErr } from "../../../core/errors/cli-error.js";
|
|
2
|
+
import { err, ok } from "../../../core/errors/result.js";
|
|
3
|
+
import { cliVersion } from "../../../core/system/version.js";
|
|
4
|
+
import { agentProcess } from "./agent-process.js";
|
|
5
|
+
import { codexThreadMessages } from "./codex-thread-messages.js";
|
|
6
|
+
const TIMEOUT_MS = 15_000;
|
|
7
|
+
const TRANSPORT_WHY = {
|
|
8
|
+
start_failed: "could not start codex app-server",
|
|
9
|
+
exited: "codex app-server exited before reading the session",
|
|
10
|
+
input_closed: "codex app-server input closed unexpectedly",
|
|
11
|
+
timed_out: "codex app-server timed out",
|
|
12
|
+
};
|
|
13
|
+
const failure = (why) => cliErr("Exec", {
|
|
14
|
+
code: "takeover.codex_verify_failed",
|
|
15
|
+
what: "Codex could not read back the installed session",
|
|
16
|
+
why,
|
|
17
|
+
remedy: "update Glen and Codex, then retry; the session was removed and nothing was taken over",
|
|
18
|
+
});
|
|
19
|
+
const whyOf = (f) => f.kind === "rpc" ? f.message : TRANSPORT_WHY[f.reason];
|
|
20
|
+
const readThread = async (rpc, sessionId) => {
|
|
21
|
+
const init = await rpc.request("initialize", {
|
|
22
|
+
clientInfo: { name: "glen", title: "Glen CLI", version: cliVersion },
|
|
23
|
+
capabilities: { experimentalApi: true },
|
|
24
|
+
});
|
|
25
|
+
if (!init.ok)
|
|
26
|
+
return init;
|
|
27
|
+
rpc.notify("initialized", {});
|
|
28
|
+
return rpc.request("thread/read", {
|
|
29
|
+
threadId: sessionId,
|
|
30
|
+
includeTurns: true,
|
|
31
|
+
});
|
|
32
|
+
};
|
|
33
|
+
// Codex is the judge of its own format: it must show exactly the turns we wrote.
|
|
34
|
+
const verifyCodexSession = async (input) => {
|
|
35
|
+
const rpc = agentProcess.startJsonRpc(input.binary, ["app-server"], TIMEOUT_MS);
|
|
36
|
+
const read = await readThread(rpc, input.sessionId);
|
|
37
|
+
rpc.close();
|
|
38
|
+
if (!read.ok)
|
|
39
|
+
return err(failure(whyOf(read.error)));
|
|
40
|
+
const expected = input.messages.map(({ role, content }) => ({
|
|
41
|
+
role,
|
|
42
|
+
content,
|
|
43
|
+
}));
|
|
44
|
+
return JSON.stringify(codexThreadMessages(read.value)) ===
|
|
45
|
+
JSON.stringify(expected)
|
|
46
|
+
? ok(undefined)
|
|
47
|
+
: err(failure("Codex showed different turns than the transcript"));
|
|
48
|
+
};
|
|
49
|
+
export { verifyCodexSession };
|
|
50
|
+
//# sourceMappingURL=verify-codex-session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verify-codex-session.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/verify-codex-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,MAAM,UAAU,GAAG,MAAM,CAAC;AAQ1B,MAAM,aAAa,GAAG;IACpB,YAAY,EAAE,kCAAkC;IAChD,MAAM,EAAE,oDAAoD;IAC5D,YAAY,EAAE,4CAA4C;IAC1D,SAAS,EAAE,4BAA4B;CAC/B,CAAC;AAEX,MAAM,OAAO,GAAG,CAAC,GAAW,EAAY,EAAE,CACxC,MAAM,CAAC,MAAM,EAAE;IACb,IAAI,EAAE,8BAA8B;IACpC,IAAI,EAAE,iDAAiD;IACvD,GAAG;IACH,MAAM,EACJ,uFAAuF;CAC1F,CAAC,CAAC;AAEL,MAAM,KAAK,GAAG,CAAC,CAAa,EAAU,EAAE,CACtC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzD,MAAM,UAAU,GAAG,KAAK,EACtB,GAAQ,EACR,SAAiB,EACqB,EAAE;IACxC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE;QAC3C,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE;QACpE,YAAY,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;KACxC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IAC1B,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;QAChC,QAAQ,EAAE,SAAS;QACnB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,iFAAiF;AACjF,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAOjC,EAAmC,EAAE;IACpC,MAAM,GAAG,GAAG,YAAY,CAAC,YAAY,CACnC,KAAK,CAAC,MAAM,EACZ,CAAC,YAAY,CAAC,EACd,UAAU,CACX,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACpD,GAAG,CAAC,KAAK,EAAE,CAAC;IACZ,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1D,IAAI;QACJ,OAAO;KACR,CAAC,CAAC,CAAC;IACJ,OAAO,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QACxB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC;QACf,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,kDAAkD,CAAC,CAAC,CAAC;AACvE,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -7,13 +7,16 @@ import { agentPaths } from "./agent-paths.js";
|
|
|
7
7
|
import { nativeFile } from "./native-file.js";
|
|
8
8
|
import { probeAgent } from "./probe-agent.js";
|
|
9
9
|
import { provenanceContext } from "./provenance-context.js";
|
|
10
|
-
|
|
10
|
+
import { verifyCodexSession } from "./verify-codex-session.js";
|
|
11
|
+
const writeCodexSession = (payload, workspace, options = {}) => {
|
|
12
|
+
const verify = options.verify ?? verifyCodexSession;
|
|
11
13
|
const createdAt = new Date();
|
|
12
14
|
const targetPath = agentPaths.codex(payload.destinationSessionId, createdAt);
|
|
13
15
|
const probe = async () => probeAgent({
|
|
14
16
|
displayName: "Codex CLI",
|
|
15
17
|
binName: "codex",
|
|
16
|
-
|
|
18
|
+
// No upper bound: each install is read back by Codex itself (see install below).
|
|
19
|
+
versionPattern: /^codex-cli (?:0\.(?:119|1[2-9]\d|[2-9]\d{2}|\d{4,})|[1-9]\d*\.\d+)\./,
|
|
17
20
|
model: "gpt-5.4",
|
|
18
21
|
// Below the reported 258,400-token window on purpose, so other configured models can't overfit.
|
|
19
22
|
contextWindowTokens: 128_000,
|
|
@@ -111,7 +114,23 @@ const writeCodexSession = (payload, workspace) => {
|
|
|
111
114
|
probe,
|
|
112
115
|
stage,
|
|
113
116
|
parse,
|
|
114
|
-
install: (staged) =>
|
|
117
|
+
install: async (staged) => {
|
|
118
|
+
const installed = await nativeFile.install(staged.path, targetPath, staged.recoveryCommand);
|
|
119
|
+
if (!installed.ok)
|
|
120
|
+
return installed;
|
|
121
|
+
const checked = await probe();
|
|
122
|
+
if (!checked.ok)
|
|
123
|
+
return checked;
|
|
124
|
+
const verified = await verify({
|
|
125
|
+
binary: checked.value.binary,
|
|
126
|
+
sessionId: payload.destinationSessionId,
|
|
127
|
+
messages: payload.messages,
|
|
128
|
+
});
|
|
129
|
+
if (verified.ok)
|
|
130
|
+
return installed;
|
|
131
|
+
void (await files.remove(targetPath));
|
|
132
|
+
return verified;
|
|
133
|
+
},
|
|
115
134
|
launch: async () => {
|
|
116
135
|
const checked = await probe();
|
|
117
136
|
if (!checked.ok)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-codex-session.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/write-codex-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"write-codex-session.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/write-codex-session.ts"],"names":[],"mappings":"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"}
|
package/dist/core/system/env.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/core/system/env.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;IACd,MAAM;IACN,OAAO;IACP,SAAS;IACT,SAAS;IACT,IAAI;IACJ,UAAU;IACV,aAAa;IACb,MAAM;IACN,YAAY;IACZ,YAAY;IACZ,qBAAqB;IACrB,6BAA6B;IAC7B,eAAe;IACf,+BAA+B;IAC/B,qBAAqB;IACrB,iBAAiB;IACjB,uBAAuB;IACvB,sBAAsB;IACtB,uBAAuB;IACvB,2BAA2B;IAC3B,iBAAiB;IACjB,kBAAkB;IAClB,oBAAoB;IACpB,wBAAwB;IACxB,oBAAoB;IACpB,4BAA4B;IAC5B,4BAA4B;IAC5B,yBAAyB;IACzB,uBAAuB;IACvB,kBAAkB;IAClB,2BAA2B;IAC3B,iBAAiB;IACjB,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/core/system/env.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;IACd,MAAM;IACN,OAAO;IACP,SAAS;IACT,SAAS;IACT,IAAI;IACJ,UAAU;IACV,aAAa;IACb,MAAM;IACN,YAAY;IACZ,YAAY;IACZ,qBAAqB;IACrB,6BAA6B;IAC7B,eAAe;IACf,+BAA+B;IAC/B,qBAAqB;IACrB,iBAAiB;IACjB,uBAAuB;IACvB,sBAAsB;IACtB,uBAAuB;IACvB,2BAA2B;IAC3B,iBAAiB;IACjB,kBAAkB;IAClB,oBAAoB;IACpB,wBAAwB;IACxB,oBAAoB;IACpB,4BAA4B;IAC5B,4BAA4B;IAC5B,yBAAyB;IACzB,uBAAuB;IACvB,kBAAkB;IAClB,2BAA2B;IAC3B,iBAAiB;IACjB,gBAAgB;IAChB,wBAAwB;IACxB,iBAAiB;IACjB,gBAAgB;IAChB,uBAAuB;IACvB,uBAAuB;IACvB,0BAA0B;IAC1B,cAAc;IACd,aAAa;IACb,uBAAuB;IACvB,kBAAkB;IAClB,qBAAqB;IACrB,4BAA4B;IAC5B,oBAAoB;IACpB,uBAAuB;IACvB,kBAAkB;IAClB,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,gCAAgC;CACxB,CAAC;AAEX,MAAM,KAAK,GAAG;IACZ,cAAc;IACd,YAAY;IACZ,iBAAiB;IACjB,qBAAqB;IACrB,aAAa;IACb,yBAAyB;IACzB,sBAAsB;IACtB,yBAAyB;CACjB,CAAC;AAMX,MAAM,GAAG,GAAG,GAAQ,EAAE,CACpB,MAAM,CAAC,WAAW,CAAC;IACjB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;IACvD,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM;KACpD,CAAC;CACH,CAAQ,CAAC;AAEZ,OAAO,EAAE,GAAG,EAAE,CAAC"}
|