@tryglen/cli 0.37.1 → 0.38.0

package/dist/commands/takeover/_utils/archive-codex-desktop-thread.js.map

@@ -1 +1 @@
-{"version":3,"file":"archive-codex-desktop-thread.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/archive-codex-desktop-thread.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archive-codex-desktop-thread.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/archive-codex-desktop-thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEjC,MAAM,yBAAyB,GAAG,KAAK,EAAE,KAGxC,EAAoB,EAAE;IACrB,MAAM,GAAG,GAAG,YAAY,CAAC,YAAY,CACnC,KAAK,CAAC,MAAM,EACZ,CAAC,YAAY,CAAC,EACd,kBAAkB,CACnB,CAAC;IACF,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,EAAE,CAAC;QACb,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACnD,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;IACH,GAAG,CAAC,KAAK,EAAE,CAAC;IACZ,OAAO,QAAQ,CAAC,EAAE,CAAC;AACrB,CAAC,CAAC;AAEF,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/commands/takeover/_utils/canonical-digest.js

@@ -1,4 +1,4 @@
-import { createHash } from "node:crypto";
-const canonicalDigest = (messages) => createHash("sha256").update(JSON.stringify(messages)).digest("hex");
+import { sha256Hex } from "../../../core/system/sha256-hex.js";
+const canonicalDigest = (messages) => sha256Hex(JSON.stringify(messages));
 export { canonicalDigest };
 //# sourceMappingURL=canonical-digest.js.map

package/dist/commands/takeover/_utils/canonical-digest.js.map

@@ -1 +1 @@
-{"version":3,"file":"canonical-digest.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/canonical-digest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,eAAe,GAAG,CACtB,QAAsD,EAC9C,EAAE,CACV,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"canonical-digest.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/canonical-digest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,MAAM,eAAe,GAAG,CACtB,QAAsD,EAC9C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/dist/commands/takeover/_utils/codex-desktop-recovery.js

@@ -1,102 +1,84 @@
 import { randomUUID } from "node:crypto";
-import { link, mkdir, readFile, rm, unlink, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { causeOf, cliErr } from "../../../_utils/cli-error.js";
-import { err, fromPromise, ok } from "../../../_utils/result.js";
-import { statePath } from "../../../_utils/state.js";
-const pathFor = (takeoverId) => join(dirname(statePath()), "takeover-recovery", `${encodeURIComponent(takeoverId)}.json`);
-const codexDesktopRecovery = {
-    async load(takeoverId) {
-        const path = pathFor(takeoverId);
-        const raw = await fromPromise(readFile(path, "utf8"));
-        if (!raw.ok) {
-            if (raw.error.code === "ENOENT")
-                return ok(null);
-            return err(cliErr({
-                what: "could not read the saved Codex Desktop takeover",
-                why: causeOf(raw.error),
-                path,
-                remedy: "fix the reported file permissions, then retry",
-            }));
-        }
-        const parsed = await fromPromise(new Promise((resolve) => resolve(JSON.parse(raw.value))));
-        if (!parsed.ok)
-            return err(cliErr({
-                what: "the saved Codex Desktop takeover is invalid",
-                why: causeOf(parsed.error),
-                path,
-                remedy: "remove the reported recovery file, then retry",
-            }));
-        const value = parsed.value;
-        if (!value ||
-            value.takeoverId !== takeoverId ||
-            typeof value.canonicalDigest !== "string" ||
-            typeof value.destinationSessionId !== "string")
-            return err(cliErr({
-                what: "the saved Codex Desktop takeover is invalid",
-                path,
-                remedy: "remove the reported recovery file, then retry",
-            }));
-        return ok({
-            takeoverId,
-            canonicalDigest: value.canonicalDigest,
-            destinationSessionId: value.destinationSessionId,
-        });
-    },
-    async save(record) {
-        const path = pathFor(record.takeoverId);
-        const made = await fromPromise(mkdir(dirname(path), { recursive: true, mode: 0o700 }));
-        if (!made.ok)
-            return err(cliErr({
-                what: "could not create Codex Desktop takeover recovery storage",
-                why: causeOf(made.error),
-                path: dirname(path),
-                remedy: "fix the reported directory permissions, then retry",
-            }));
-        const temporary = `${path}.${process.pid}.${randomUUID()}.tmp`;
-        const written = await fromPromise(writeFile(temporary, JSON.stringify(record), { mode: 0o600 }));
-        if (!written.ok)
-            return err(cliErr({
-                what: "could not save Codex Desktop takeover recovery",
-                why: causeOf(written.error),
-                path: temporary,
-                remedy: "check disk space and permissions, then retry",
-            }));
-        const claimed = await fromPromise(link(temporary, path));
-        await rm(temporary, { force: true });
-        if (claimed.ok)
-            return ok(record);
-        const existing = await codexDesktopRecovery.load(record.takeoverId);
-        if (!existing.ok)
-            return existing;
-        if (existing.value)
-            return ok(existing.value);
-        return err(cliErr({
-            what: "could not claim Codex Desktop takeover recovery",
-            why: causeOf(claimed.error),
-            path,
-            remedy: "fix the reported directory permissions, then retry",
+import { cliErr } from "../../../core/errors/cli-error.js";
+import { files } from "../../../core/system/files.js";
+import { field } from "../../../core/json/json-field.js";
+import { glenHome } from "../../../core/state/glen-home.js";
+import { parseJson } from "../../../core/json/parse-json.js";
+import { err, ok } from "../../../core/errors/result.js";
+const pathFor = (takeoverId) => join(glenHome(), "takeover-recovery", `${encodeURIComponent(takeoverId)}.json`);
+const invalid = (path, cause) => cliErr("Parse", {
+    code: "takeover.recovery_invalid",
+    what: "the saved Codex Desktop takeover is invalid",
+    path,
+    ...(cause === undefined ? {} : { cause }),
+    remedy: "remove the reported recovery file, then retry",
+});
+const load = async (takeoverId) => {
+    const path = pathFor(takeoverId);
+    const raw = await files.readTextIfExists(path);
+    if (!raw.ok)
+        return err(files.toError(raw.error, {
+            code: "takeover.recovery_unreadable",
+            what: "could not read the saved Codex Desktop takeover",
+            remedy: "fix the reported file permissions, then retry",
         }));
-    },
-    async clear(takeoverId, expectedDestinationSessionId) {
-        const path = pathFor(takeoverId);
-        const existing = await codexDesktopRecovery.load(takeoverId);
-        if (!existing.ok)
-            return existing;
-        if (!existing.value ||
-            existing.value.destinationSessionId !== expectedDestinationSessionId)
-            return ok(undefined);
-        const removed = await fromPromise(unlink(path));
-        if (!removed.ok &&
-            removed.error.code !== "ENOENT")
-            return err(cliErr({
-                what: "could not clear Codex Desktop takeover recovery",
-                why: causeOf(removed.error),
-                path,
-                remedy: "remove the reported recovery file manually",
-            }));
+    if (raw.value === null)
+        return ok(null);
+    const parsed = parseJson(raw.value);
+    if (!parsed.ok)
+        return err(invalid(path, parsed.error));
+    const canonicalDigest = field(parsed.value, "canonicalDigest");
+    const destinationSessionId = field(parsed.value, "destinationSessionId");
+    if (field(parsed.value, "takeoverId") !== takeoverId ||
+        typeof canonicalDigest !== "string" ||
+        typeof destinationSessionId !== "string")
+        return err(invalid(path));
+    return ok({ takeoverId, canonicalDigest, destinationSessionId });
+};
+// A hard link fails if another takeover claimed the slot first; then its record wins.
+const save = async (record) => {
+    const path = pathFor(record.takeoverId);
+    const temporary = `${path}.${process.pid}.${randomUUID()}.tmp`;
+    const written = await files.writeAtomic(temporary, JSON.stringify(record), {
+        mode: 0o600,
+    });
+    if (!written.ok)
+        return err(files.toError(written.error, {
+            code: "takeover.recovery_save_failed",
+            what: "could not save Codex Desktop takeover recovery",
+            remedy: "check disk space and permissions, then retry",
+        }));
+    const claimed = await files.hardLink(temporary, path);
+    void (await files.remove(temporary));
+    if (claimed.ok)
+        return ok(record);
+    const existing = await load(record.takeoverId);
+    if (!existing.ok)
+        return existing;
+    if (existing.value)
+        return ok(existing.value);
+    return err(files.toError(claimed.error, {
+        code: "takeover.recovery_claim_failed",
+        what: "could not claim Codex Desktop takeover recovery",
+        remedy: `fix the permissions of ${dirname(path)}, then retry`,
+    }));
+};
+const clear = async (takeoverId, expectedDestinationSessionId) => {
+    const existing = await load(takeoverId);
+    if (!existing.ok)
+        return existing;
+    if (existing.value?.destinationSessionId !== expectedDestinationSessionId)
         return ok(undefined);
-    },
+    const removed = await files.remove(pathFor(takeoverId));
+    return removed.ok
+        ? ok(undefined)
+        : err(files.toError(removed.error, {
+            code: "takeover.recovery_clear_failed",
+            what: "could not clear Codex Desktop takeover recovery",
+            remedy: "remove the reported recovery file manually",
+        }));
 };
+const codexDesktopRecovery = { load, save, clear };
 export { codexDesktopRecovery };
 //# sourceMappingURL=codex-desktop-recovery.js.map

package/dist/commands/takeover/_utils/codex-desktop-recovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-desktop-recovery.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/codex-desktop-recovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-desktop-recovery.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/codex-desktop-recovery.ts"],"names":[],"mappings":"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"}

package/dist/commands/takeover/_utils/context-fit.js

@@ -1,11 +1,13 @@
-import { cliErr } from "../../../_utils/cli-error.js";
-import { err, ok } from "../../../_utils/result.js";
+import { cliErr } from "../../../core/errors/cli-error.js";
+import { err, ok } from "../../../core/errors/result.js";
+// Bytes bound tokens from above, so "fits" is never wrong.
 const contextFit = (input) => {
     if (input.model.trim() === "" ||
         input.version.trim() === "" ||
         !Number.isSafeInteger(input.contextWindowTokens) ||
         input.contextWindowTokens <= 0)
-        return err(cliErr({
+        return err(cliErr("Usage", {
+            code: "takeover.unknown_target_model",
             what: "cannot prove this transcript fits the target session",
             why: "the target agent reported an unknown model, version, or context window",
             remedy: "update the target agent and Glen, then retry; no session was created",
@@ -15,7 +17,8 @@ const contextFit = (input) => {
         input.startupReserveTokens +
         input.responseReserveTokens;
     if (totalRequiredTokens > input.contextWindowTokens)
-        return err(cliErr({
+        return err(cliErr("Usage", {
+            code: "takeover.context_too_large",
             what: "the entire transcript does not fit in the target session",
             why: `required ${totalRequiredTokens} tokens by the conservative UTF-8 bound; available ${input.contextWindowTokens}; startup reserve ${input.startupReserveTokens}; response reserve ${input.responseReserveTokens}`,
             remedy: "use a target model with a larger context window; Glen did not truncate anything and did not create a session",

package/dist/commands/takeover/_utils/context-fit.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-fit.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/context-fit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,UAAU,GAAG,CAAC,KAOnB,EAOC,EAAE;IACF,IACE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;QACzB,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE;QAC3B,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,CAAC;QAChD,KAAK,CAAC,mBAAmB,IAAI,CAAC;QAE9B,OAAO,GAAG,CACR,MAAM,CAAC;YACL,IAAI,EAAE,sDAAsD;YAC5D,GAAG,EAAE,wEAAwE;YAC7E,MAAM,EACJ,sEAAsE;SACzE,CAAC,CACH,CAAC;IAEJ,MAAM,yBAAyB,GAAG,MAAM,CAAC,UAAU,CACjD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAC9B,MAAM,CACP,CAAC;IACF,MAAM,mBAAmB,GACvB,yBAAyB;QACzB,KAAK,CAAC,oBAAoB;QAC1B,KAAK,CAAC,qBAAqB,CAAC;IAC9B,IAAI,mBAAmB,GAAG,KAAK,CAAC,mBAAmB;QACjD,OAAO,GAAG,CACR,MAAM,CAAC;YACL,IAAI,EAAE,0DAA0D;YAChE,GAAG,EAAE,YAAY,mBAAmB,sDAAsD,KAAK,CAAC,mBAAmB,qBAAqB,KAAK,CAAC,oBAAoB,sBAAsB,KAAK,CAAC,qBAAqB,EAAE;YACrN,MAAM,EACJ,8GAA8G;SACjH,CAAC,CACH,CAAC;IAEJ,OAAO,EAAE,CAAC;QACR,yBAAyB;QACzB,mBAAmB;QACnB,eAAe,EAAE,KAAK,CAAC,mBAAmB;KAC3C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"context-fit.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/context-fit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKzD,2DAA2D;AAC3D,MAAM,UAAU,GAAG,CACjB,KAEC,EACD,EAAE;IACF,IACE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;QACzB,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE;QAC3B,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,CAAC;QAChD,KAAK,CAAC,mBAAmB,IAAI,CAAC;QAE9B,OAAO,GAAG,CACR,MAAM,CAAC,OAAO,EAAE;YACd,IAAI,EAAE,+BAA+B;YACrC,IAAI,EAAE,sDAAsD;YAC5D,GAAG,EAAE,wEAAwE;YAC7E,MAAM,EACJ,sEAAsE;SACzE,CAAC,CACH,CAAC;IAEJ,MAAM,yBAAyB,GAAG,MAAM,CAAC,UAAU,CACjD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAC9B,MAAM,CACP,CAAC;IACF,MAAM,mBAAmB,GACvB,yBAAyB;QACzB,KAAK,CAAC,oBAAoB;QAC1B,KAAK,CAAC,qBAAqB,CAAC;IAC9B,IAAI,mBAAmB,GAAG,KAAK,CAAC,mBAAmB;QACjD,OAAO,GAAG,CACR,MAAM,CAAC,OAAO,EAAE;YACd,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,0DAA0D;YAChE,GAAG,EAAE,YAAY,mBAAmB,sDAAsD,KAAK,CAAC,mBAAmB,qBAAqB,KAAK,CAAC,oBAAoB,sBAAsB,KAAK,CAAC,qBAAqB,EAAE;YACrN,MAAM,EACJ,8GAA8G;SACjH,CAAC,CACH,CAAC;IAEJ,OAAO,EAAE,CAAC;QACR,yBAAyB;QACzB,mBAAmB;QACnB,eAAe,EAAE,KAAK,CAAC,mBAAmB;KAC3C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}