@tryglen/cli 0.37.1 → 0.38.1

package/dist/commands/takeover/_utils/native-file.js

@@ -1,104 +1,117 @@
-import { spawnSync } from "node:child_process";
-import { constants } from "node:fs";
-import { copyFile, link, mkdir, mkdtemp, readFile, rm, writeFile, } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
 import { basename, dirname, join } from "node:path";
-import { causeOf, cliErr } from "../../../_utils/cli-error.js";
-import { err, fromPromise, ok } from "../../../_utils/result.js";
+import { cliErr } from "../../../core/errors/cli-error.js";
+import { files } from "../../../core/system/files.js";
+import { err, ok } from "../../../core/errors/result.js";
+import { agentProcess } from "./agent-process.js";
+const readStaged = async (stagedPath) => {
+    const staged = await files.readBytes(stagedPath);
+    return staged.ok
+        ? staged
+        : err(files.toError(staged.error, {
+            code: "takeover.staged_unreadable",
+            what: "could not read the verified staged session",
+            remedy: "retry the takeover command",
+        }));
+};
+const alreadyInstalled = async (targetPath, staged) => {
+    const existing = await files.readBytes(targetPath);
+    if (!existing.ok)
+        return existing.error.errno === "ENOENT"
+            ? ok(false)
+            : err(files.toError(existing.error, {
+                code: "takeover.target_unreadable",
+                what: "could not check the target agent's session store",
+                remedy: "check the folder's permissions, then retry",
+            }));
+    return existing.value.equals(staged)
+        ? ok(true)
+        : err(cliErr("Usage", {
+            code: "takeover.destination_exists",
+            what: "the destination session ID already exists with different content",
+            path: targetPath,
+            remedy: "ask the sender for a new takeover command; nothing was overwritten",
+        }));
+};
+// Hard-link into place: link fails if the target exists, so a concurrent takeover is never overwritten.
+const linkIntoPlace = async (stagedPath, targetPath, staged) => {
+    const temporary = join(dirname(targetPath), `.${basename(targetPath)}.${process.pid}.tmp`);
+    const copied = await files.copyFile(stagedPath, temporary);
+    if (!copied.ok)
+        return err(files.toError(copied.error, {
+            code: "takeover.copy_failed",
+            what: "could not copy the verified session into the target store",
+            remedy: "remove the reported temporary file if present, then retry",
+        }));
+    const linked = await files.hardLink(temporary, targetPath);
+    void (await files.remove(temporary));
+    if (linked.ok)
+        return ok(undefined);
+    const raced = await files.readBytes(targetPath);
+    if (raced.ok && raced.value.equals(staged))
+        return ok(undefined);
+    return err(files.toError(linked.error, {
+        code: "takeover.install_failed",
+        what: "could not atomically install the native session",
+        remedy: "ask the sender for a new takeover command if that destination now exists; nothing was overwritten",
+    }));
+};
 const nativeFile = {
     async stage(prefix, lines) {
-        const directory = await fromPromise(mkdtemp(join(tmpdir(), prefix)));
-        if (!directory.ok)
-            return err(cliErr({
+        const directory = join(tmpdir(), `${prefix}${randomUUID()}`);
+        const made = await files.ensureDir(directory);
+        if (!made.ok)
+            return err(files.toError(made.error, {
+                code: "takeover.staging_dir_failed",
                 what: "could not create a private takeover staging directory",
-                why: causeOf(directory.error),
                 remedy: "check temporary-directory permissions, then retry",
             }));
-        const path = join(directory.value, "session.jsonl");
-        const written = await fromPromise(writeFile(path, `${lines.map((line) => JSON.stringify(line)).join("\n")}\n`, {
-            mode: 0o600,
-            flag: "wx",
-        }));
+        const path = join(directory, "session.jsonl");
+        const written = await files.writeAtomic(path, `${lines.map((line) => JSON.stringify(line)).join("\n")}\n`, { mode: 0o600 });
         if (!written.ok) {
-            await rm(directory.value, { recursive: true, force: true });
-            return err(cliErr({
+            void (await files.remove(directory, { recursive: true }));
+            return err(files.toError(written.error, {
+                code: "takeover.stage_failed",
                 what: "could not stage the native takeover session",
-                why: causeOf(written.error),
-                path,
                 remedy: "check disk space and temporary-directory permissions, then retry",
             }));
         }
         return ok({ path, recoveryCommand: "" });
     },
     async install(stagedPath, targetPath, recoveryCommand) {
-        const staged = await fromPromise(readFile(stagedPath));
+        const staged = await readStaged(stagedPath);
         if (!staged.ok)
-            return err(cliErr({
-                what: "could not read the verified staged session",
-                why: causeOf(staged.error),
-                path: stagedPath,
-                remedy: "retry the takeover command",
-            }));
-        const existing = await fromPromise(readFile(targetPath));
-        if (existing.ok) {
-            if (existing.value.equals(staged.value))
-                return ok({ recoveryCommand });
-            return err(cliErr({
-                what: "the destination session ID already exists with different content",
-                path: targetPath,
-                remedy: "ask the sender for a new takeover command; nothing was overwritten",
-            }));
-        }
-        const made = await fromPromise(mkdir(dirname(targetPath), { recursive: true, mode: 0o700 }));
+            return staged;
+        const existing = await alreadyInstalled(targetPath, staged.value);
+        if (!existing.ok)
+            return existing;
+        if (existing.value)
+            return ok({ recoveryCommand });
+        const made = await files.ensureDir(dirname(targetPath));
         if (!made.ok)
-            return err(cliErr({
+            return err(files.toError(made.error, {
+                code: "takeover.target_dir_failed",
                 what: "could not create the target agent session directory",
-                why: causeOf(made.error),
-                path: dirname(targetPath),
                 remedy: "check directory permissions, then retry",
             }));
-        const temporary = join(dirname(targetPath), `.${basename(targetPath)}.${process.pid}.tmp`);
-        const copied = await fromPromise(copyFile(stagedPath, temporary, constants.COPYFILE_EXCL));
-        if (!copied.ok)
-            return err(cliErr({
-                what: "could not copy the verified session into the target store",
-                why: causeOf(copied.error),
-                path: temporary,
-                remedy: "remove the reported temporary file if present, then retry",
-            }));
-        const linked = await fromPromise(link(temporary, targetPath));
-        await rm(temporary, { force: true });
-        if (!linked.ok) {
-            const raced = await fromPromise(readFile(targetPath));
-            if (raced.ok && raced.value.equals(staged.value))
-                return ok({ recoveryCommand });
-            return err(cliErr({
-                what: "could not atomically install the native session",
-                why: causeOf(linked.error),
-                path: targetPath,
-                remedy: "ask the sender for a new takeover command if that destination now exists; nothing was overwritten",
-            }));
-        }
-        return ok({ recoveryCommand });
+        const linked = await linkIntoPlace(stagedPath, targetPath, staged.value);
+        return linked.ok ? ok({ recoveryCommand }) : linked;
     },
     async cleanup(stagedPath) {
-        await rm(dirname(stagedPath), { recursive: true, force: true });
+        void (await files.remove(dirname(stagedPath), { recursive: true }));
     },
     launch(binary, args, workspace) {
-        const launched = spawnSync(binary, [...args], {
-            cwd: workspace,
-            stdio: "inherit",
-        });
-        if (launched.error || launched.status !== 0)
-            return err(cliErr({
+        const launched = agentProcess.runInteractive(binary, args, workspace);
+        return launched.ok
+            ? launched
+            : err(cliErr("Exec", {
+                code: "takeover.agent_exited",
                 what: "the target agent process exited before continuing the session",
-                why: launched.error
-                    ? causeOf(launched.error)
-                    : `exit status ${launched.status ?? "unknown"}`,
+                why: launched.error,
                 path: binary,
                 remedy: "launch the installed session manually",
             }));
-        return ok(undefined);
     },
 };
 export { nativeFile };

package/dist/commands/takeover/_utils/native-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"native-file.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/native-file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"native-file.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/native-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,UAAU,GAAG,KAAK,EACtB,UAAkB,EACiB,EAAE;IACrC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACjD,OAAO,MAAM,CAAC,EAAE;QACd,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,GAAG,CACD,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE;YAC1B,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,4CAA4C;YAClD,MAAM,EAAE,4BAA4B;SACrC,CAAC,CACH,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAkB,EAClB,MAAc,EACsB,EAAE;IACtC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,EAAE;QACd,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ;YACtC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;YACX,CAAC,CAAC,GAAG,CACD,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE;gBAC5B,IAAI,EAAE,4BAA4B;gBAClC,IAAI,EAAE,kDAAkD;gBACxD,MAAM,EAAE,4CAA4C;aACrD,CAAC,CACH,CAAC;IACR,OAAO,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;QACV,CAAC,CAAC,GAAG,CACD,MAAM,CAAC,OAAO,EAAE;YACd,IAAI,EAAE,6BAA6B;YACnC,IAAI,EAAE,kEAAkE;YACxE,IAAI,EAAE,UAAU;YAChB,MAAM,EACJ,oEAAoE;SACvE,CAAC,CACH,CAAC;AACR,CAAC,CAAC;AAEF,wGAAwG;AACxG,MAAM,aAAa,GAAG,KAAK,EACzB,UAAkB,EAClB,UAAkB,EAClB,MAAc,EACmB,EAAE;IACnC,MAAM,SAAS,GAAG,IAAI,CACpB,OAAO,CAAC,UAAU,CAAC,EACnB,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,MAAM,CAC9C,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,EAAE;QACZ,OAAO,GAAG,CACR,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE;YAC1B,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE,2DAA2D;YACjE,MAAM,EAAE,2DAA2D;SACpE,CAAC,CACH,CAAC;IACJ,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC3D,KAAK,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IACrC,IAAI,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAChD,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACjE,OAAO,GAAG,CACR,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE;QAC1B,IAAI,EAAE,yBAAyB;QAC/B,IAAI,EAAE,iDAAiD;QACvD,MAAM,EACJ,mGAAmG;KACtG,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG;IACjB,KAAK,CAAC,KAAK,CACT,MAAc,EACd,KAAyC;QAEzC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,GAAG,UAAU,EAAE,EAAE,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,EAAE;YACV,OAAO,GAAG,CACR,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;gBACxB,IAAI,EAAE,6BAA6B;gBACnC,IAAI,EAAE,uDAAuD;gBAC7D,MAAM,EAAE,mDAAmD;aAC5D,CAAC,CACH,CAAC;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CACrC,IAAI,EACJ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAC3D,EAAE,IAAI,EAAE,KAAK,EAAE,CAChB,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,KAAK,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC1D,OAAO,GAAG,CACR,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE;gBAC3B,IAAI,EAAE,uBAAuB;gBAC7B,IAAI,EAAE,6CAA6C;gBACnD,MAAM,EACJ,kEAAkE;aACrE,CAAC,CACH,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO,CACX,UAAkB,EAClB,UAAkB,EAClB,eAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,QAAQ,CAAC;QAClC,IAAI,QAAQ,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,EAAE;YACV,OAAO,GAAG,CACR,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;gBACxB,IAAI,EAAE,4BAA4B;gBAClC,IAAI,EAAE,qDAAqD;gBAC3D,MAAM,EAAE,yCAAyC;aAClD,CAAC,CACH,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACzE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,UAAkB;QAC9B,KAAK,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,CACJ,MAAc,EACd,IAAuB,EACvB,SAAiB;QAEjB,MAAM,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACtE,OAAO,QAAQ,CAAC,EAAE;YAChB,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,GAAG,CACD,MAAM,CAAC,MAAM,EAAE;gBACb,IAAI,EAAE,uBAAuB;gBAC7B,IAAI,EAAE,+DAA+D;gBACrE,GAAG,EAAE,QAAQ,CAAC,KAAK;gBACnB,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,uCAAuC;aAChD,CAAC,CACH,CAAC;IACR,CAAC;CACF,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/commands/takeover/_utils/probe-agent.js

@@ -1,17 +1,19 @@
-import { cliErr } from "../../../_utils/cli-error.js";
-import { findBin } from "../../../_utils/find-bin.js";
-import { err, ok } from "../../../_utils/result.js";
-import { runBin } from "../../../_utils/run-bin.js";
+import { cliErr } from "../../../core/errors/cli-error.js";
+import { agentBin } from "../../../clients/agents/agent-bin.js";
+import { err, ok } from "../../../core/errors/result.js";
+import { runProgram } from "../../../core/system/run-program.js";
 const probeAgent = (input) => {
-    const binary = input.binaryOverride ?? findBin(input.binName);
+    const binary = input.binaryOverride ?? agentBin.resolve(input.binName);
     if (!binary)
-        return err(cliErr({
+        return err(cliErr("Usage", {
+            code: "takeover.agent_not_installed",
             what: `${input.displayName} is not installed or discoverable`,
             remedy: `install ${input.displayName}, then run \`glen install --agent ${input.binName}\` and retry`,
         }));
-    const version = runBin(binary, ["--version"], { timeoutMs: 5000 });
+    const version = runProgram(binary, ["--version"], { timeoutMs: 5000 });
     if (!version.ok)
-        return err(cliErr({
+        return err(cliErr("Exec", {
+            code: "takeover.agent_version_failed",
             what: `could not verify the installed ${input.displayName} version`,
             why: version.error.spawnError ?? version.error.stderrTail,
             path: binary,
@@ -19,7 +21,8 @@ const probeAgent = (input) => {
         }));
     const normalized = version.value.stdout.trim();
     if (!input.versionPattern.test(normalized))
-        return err(cliErr({
+        return err(cliErr("Usage", {
+            code: "takeover.agent_version_unsupported",
             what: `this ${input.displayName} version is not supported for transcript takeover`,
             why: normalized || "the version command returned no version",
             remedy: "update Glen and the target agent; no native session was written",

package/dist/commands/takeover/_utils/probe-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"probe-agent.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/probe-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEpD,MAAM,UAAU,GAAG,CAAC,KASnB,EAUC,EAAE;IACF,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM;QACT,OAAO,GAAG,CACR,MAAM,CAAC;YACL,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,mCAAmC;YAC7D,MAAM,EAAE,WAAW,KAAK,CAAC,WAAW,qCAAqC,KAAK,CAAC,OAAO,cAAc;SACrG,CAAC,CACH,CAAC;IACJ,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,IAAI,CAAC,OAAO,CAAC,EAAE;QACb,OAAO,GAAG,CACR,MAAM,CAAC;YACL,IAAI,EAAE,kCAAkC,KAAK,CAAC,WAAW,UAAU;YACnE,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU;YACzD,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,aAAa,KAAK,CAAC,OAAO,gCAAgC;SACnE,CAAC,CACH,CAAC;IACJ,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;QACxC,OAAO,GAAG,CACR,MAAM,CAAC;YACL,IAAI,EAAE,QAAQ,KAAK,CAAC,WAAW,mDAAmD;YAClF,GAAG,EAAE,UAAU,IAAI,yCAAyC;YAC5D,MAAM,EACJ,iEAAiE;SACpE,CAAC,CACH,CAAC;IACJ,OAAO,EAAE,CAAC;QACR,MAAM;QACN,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,UAAU;QACnB,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;QAChD,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;KACnD,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"probe-agent.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/probe-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,MAAM,UAAU,GAAG,CAAC,KASnB,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvE,IAAI,CAAC,MAAM;QACT,OAAO,GAAG,CACR,MAAM,CAAC,OAAO,EAAE;YACd,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,mCAAmC;YAC7D,MAAM,EAAE,WAAW,KAAK,CAAC,WAAW,qCAAqC,KAAK,CAAC,OAAO,cAAc;SACrG,CAAC,CACH,CAAC;IACJ,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,CAAC,OAAO,CAAC,EAAE;QACb,OAAO,GAAG,CACR,MAAM,CAAC,MAAM,EAAE;YACb,IAAI,EAAE,+BAA+B;YACrC,IAAI,EAAE,kCAAkC,KAAK,CAAC,WAAW,UAAU;YACnE,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU;YACzD,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,aAAa,KAAK,CAAC,OAAO,gCAAgC;SACnE,CAAC,CACH,CAAC;IACJ,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;QACxC,OAAO,GAAG,CACR,MAAM,CAAC,OAAO,EAAE;YACd,IAAI,EAAE,oCAAoC;YAC1C,IAAI,EAAE,QAAQ,KAAK,CAAC,WAAW,mDAAmD;YAClF,GAAG,EAAE,UAAU,IAAI,yCAAyC;YAC5D,MAAM,EACJ,iEAAiE;SACpE,CAAC,CACH,CAAC;IACJ,OAAO,EAAE,CAAC;QACR,MAAM;QACN,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,UAAU;QACnB,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;QAChD,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;KACnD,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/commands/takeover/_utils/staged-session.js

@@ -1,5 +1,5 @@
-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";
 import { writeClaudeDesktopSession } from "./write-claude-desktop-session.js";
 import { writeClaudeSession } from "./write-claude-session.js";
 import { writeCodexDesktopSession } from "./write-codex-desktop-session.js";
@@ -7,22 +7,23 @@ import { writeCodexSession } from "./write-codex-session.js";
 import { writeCursorSession } from "./write-cursor-session.js";
 import { writePiSession } from "./write-pi-session.js";
 const stagedSession = {
-    async forTarget(_target, _payload, _workspace) {
-        if (_target === "claude-code" || _target === "claude-code-cli")
-            return ok(writeClaudeSession(_payload, _workspace));
-        if (_target === "claude-code-desktop")
-            return ok(writeClaudeDesktopSession(_payload, _workspace));
-        if (_target === "codex" || _target === "codex-cli")
-            return ok(writeCodexSession(_payload, _workspace));
-        if (_target === "codex-desktop")
-            return ok(writeCodexDesktopSession(_payload, _workspace));
-        if (_target === "cursor")
-            return ok(writeCursorSession(_payload, _workspace));
-        if (_target === "pi")
-            return ok(writePiSession(_payload, _workspace));
-        return err(cliErr({
+    async forTarget(target, payload, workspace) {
+        if (target === "claude-code" || target === "claude-code-cli")
+            return ok(writeClaudeSession(payload, workspace));
+        if (target === "claude-code-desktop")
+            return ok(writeClaudeDesktopSession(payload, workspace));
+        if (target === "codex" || target === "codex-cli")
+            return ok(writeCodexSession(payload, workspace));
+        if (target === "codex-desktop")
+            return ok(writeCodexDesktopSession(payload, workspace));
+        if (target === "cursor")
+            return ok(writeCursorSession(payload, workspace));
+        if (target === "pi")
+            return ok(writePiSession(payload, workspace));
+        return err(cliErr("Usage", {
+            code: "takeover.unsupportedtarget",
             what: "this target agent adapter is not supported for takeover",
-            remedy: "update Glen and Cursor, close Cursor completely, then retry; no session was created",
+            remedy: "update Glen, then retry; no session was created",
         }));
     },
 };

package/dist/commands/takeover/_utils/staged-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"staged-session.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/staged-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AA+CvD,MAAM,aAAa,GAAG;IACpB,KAAK,CAAC,SAAS,CACb,OAQQ,EACR,QAWC,EACD,UAAkB;QAElB,IAAI,OAAO,KAAK,aAAa,IAAI,OAAO,KAAK,iBAAiB;YAC5D,OAAO,EAAE,CAAC,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACtD,IAAI,OAAO,KAAK,qBAAqB;YACnC,OAAO,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7D,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,WAAW;YAChD,OAAO,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACrD,IAAI,OAAO,KAAK,eAAe;YAC7B,OAAO,EAAE,CAAC,wBAAwB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QAC5D,IAAI,OAAO,KAAK,QAAQ;YACtB,OAAO,EAAE,CAAC,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACtD,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACtE,OAAO,GAAG,CACR,MAAM,CAAC;YACL,IAAI,EAAE,yDAAyD;YAC/D,MAAM,EACJ,qFAAqF;SACxF,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"staged-session.js","sourceRoot":"","sources":["../../../../src/commands/takeover/_utils/staged-session.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AA0CvD,MAAM,aAAa,GAAG;IACpB,KAAK,CAAC,SAAS,CACb,MAA+B,EAC/B,OAOC,EACD,SAAiB;QAEjB,IAAI,MAAM,KAAK,aAAa,IAAI,MAAM,KAAK,iBAAiB;YAC1D,OAAO,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QACpD,IAAI,MAAM,KAAK,qBAAqB;YAClC,OAAO,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3D,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,WAAW;YAC9C,OAAO,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QACnD,IAAI,MAAM,KAAK,eAAe;YAC5B,OAAO,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QAC1D,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3E,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QACnE,OAAO,GAAG,CACR,MAAM,CAAC,OAAO,EAAE;YACd,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,yDAAyD;YAC/D,MAAM,EAAE,iDAAiD;SAC1D,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/commands/takeover/_utils/write-claude-session.js

@@ -1,8 +1,8 @@
 import { randomUUID } from "node:crypto";
-import { readFile } from "node:fs/promises";
-import { causeOf, cliErr } from "../../../_utils/cli-error.js";
-import { parseClaudeTranscript } from "../../../_utils/parse-claude-transcript.js";
-import { err, fromPromise, ok } from "../../../_utils/result.js";
+import { cliErr } from "../../../core/errors/cli-error.js";
+import { files } from "../../../core/system/files.js";
+import { parseClaudeTranscript } from "../../../clients/claude/parse-claude-transcript.js";
+import { err, ok } from "../../../core/errors/result.js";
 import { agentPaths } from "./agent-paths.js";
 import { nativeFile } from "./native-file.js";
 import { probeAgent } from "./probe-agent.js";
@@ -12,9 +12,6 @@ const writeClaudeSession = (payload, workspace) => {
     const probe = async () => probeAgent({
         displayName: "Claude Code",
         binName: "claude",
-        ...(process.env.GLEN_CLAUDE_BIN
-            ? { binaryOverride: process.env.GLEN_CLAUDE_BIN }
-            : {}),
         versionPattern: /^2\.1\.\d+/,
         model: "claude-fable-5",
         contextWindowTokens: 200_000,
@@ -97,22 +94,22 @@ const writeClaudeSession = (payload, workspace) => {
             : staged;
     };
     const parse = async (staged) => {
-        const raw = await fromPromise(readFile(staged.path, "utf8"));
+        const raw = await files.readText(staged.path);
         if (!raw.ok)
-            return err(cliErr({
+            return err(files.toError(raw.error, {
+                code: "takeover.staged_unreadable",
                 what: "could not re-read the staged Claude Code session",
-                why: causeOf(raw.error),
-                path: staged.path,
                 remedy: "retry the takeover command",
             }));
         const parsed = parseClaudeTranscript(raw.value.split(/\r?\n/).filter(Boolean), payload.destinationSessionId);
         if (!parsed)
-            return err(cliErr({
+            return err(cliErr("Internal", {
+                code: "takeover.staged_unparseable",
                 what: "Claude Code could not parse the staged transcript",
                 path: staged.path,
                 remedy: "update Glen and Claude Code, then retry",
             }));
-        return ok(parsed.messages.map(({ role, text }) => ({ role, content: text })));
+        return ok(parsed.messages.map(({ role, content }) => ({ role, content })));
     };
     return {
         probe,

package/dist/commands/takeover/_utils/write-claude-session.js.map

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

package/dist/commands/takeover/_utils/write-codex-desktop-session.js

@@ -1,9 +1,10 @@
 import { randomUUID } from "node:crypto";
-import { readFile } from "node:fs/promises";
-import { rm } from "node:fs/promises";
-import { cliErr } from "../../../_utils/cli-error.js";
-import { desktopAppBin, findBin } from "../../../_utils/find-bin.js";
-import { err, fromPromise, ok } from "../../../_utils/result.js";
+import { cliErr } from "../../../core/errors/cli-error.js";
+import { agentBin } from "../../../clients/agents/agent-bin.js";
+import { files } from "../../../core/system/files.js";
+import { field } from "../../../core/json/json-field.js";
+import { jsonlRecords } from "../../../core/json/jsonl-records.js";
+import { err, ok } from "../../../core/errors/result.js";
 import { agentPaths } from "./agent-paths.js";
 import { archiveCodexDesktopThread } from "./archive-codex-desktop-thread.js";
 import { codexDesktopRecovery } from "./codex-desktop-recovery.js";
@@ -16,12 +17,12 @@ const transcriptMessage = (role, content) => ({
     role,
     content,
 });
-const removeCodexDesktopSource = (path) => fromPromise(rm(path, { force: true }));
+const removeCodexDesktopSource = (path) => files.remove(path);
 const writeCodexDesktopSession = (payload, workspace, options = {}) => {
     const recovery = options.recovery ?? codexDesktopRecovery;
     const archiveThread = options.archiveThread ?? archiveCodexDesktopThread;
     const removeSource = options.removeSource ?? removeCodexDesktopSource;
-    const resolveBinary = () => options.binary ?? desktopAppBin("codex") ?? findBin("codex");
+    const resolveBinary = () => options.binary ?? agentBin.codexDesktop() ?? agentBin.resolve("codex");
     const timestamp = new Date().toISOString();
     const records = [
         ...payload.messages.map((message) => ({
@@ -50,39 +51,29 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
         ],
     };
     const parseRecords = async (path) => {
-        const raw = await fromPromise(readFile(path, "utf8"));
+        const raw = await files.readText(path);
         if (!raw.ok)
-            return err(cliErr({
+            return err(files.toError(raw.error, {
+                code: "takeover.staged_unreadable",
                 what: "could not re-read the staged Codex Desktop transcript",
                 remedy: "retry the takeover command",
             }));
-        const parsed = raw.value
-            .split(/\r?\n/)
-            .filter(Boolean)
-            .map((line) => {
-            try {
-                return JSON.parse(line);
-            }
-            catch {
-                return null;
-            }
-        });
-        if (parsed.some((item) => item === null))
-            return err(cliErr({
+        const parsed = jsonlRecords(raw.value.split(/\r?\n/));
+        if (parsed.unreadable > 0)
+            return err(cliErr("Internal", {
+                code: "takeover.staged_unparseable",
                 what: "Codex Desktop could not parse the staged transcript",
                 path,
                 remedy: "update Glen and Codex Desktop, then retry",
             }));
-        return ok(parsed);
+        return ok(parsed.records);
     };
     const messagesFromRecords = (parsed) => parsed.flatMap((record) => {
         if (record.type !== "user" && record.type !== "assistant")
             return [];
-        const message = record.message && typeof record.message === "object"
-            ? record.message
-            : null;
-        return typeof message?.content === "string"
-            ? [transcriptMessage(record.type, message.content)]
+        const content = field(record.message, "content");
+        return typeof content === "string"
+            ? [transcriptMessage(record.type, content)]
             : [];
     });
     const installedFromId = (destinationSessionId) => {
@@ -95,7 +86,8 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
     const archiveAndClear = async (destinationSessionId) => {
         const binary = resolveBinary();
         if (!binary)
-            return err(cliErr({
+            return err(cliErr("Exec", {
+                code: "takeover.codex_archive_unavailable",
                 what: "could not archive the superseded Codex Desktop task",
                 remedy: `open Codex Desktop and archive task ${destinationSessionId}`,
             }));
@@ -104,7 +96,8 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
             threadId: destinationSessionId,
         });
         if (!archived)
-            return err(cliErr({
+            return err(cliErr("Exec", {
+                code: "takeover.codex_archive_failed",
                 what: "the superseded Codex Desktop task could not be archived",
                 remedy: `archive task ${destinationSessionId} in Codex Desktop, then retry the takeover`,
             }));
@@ -140,7 +133,8 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
         install: async (staged) => {
             const binary = resolveBinary();
             if (!binary)
-                return err(cliErr({
+                return err(cliErr("Usage", {
+                    code: "takeover.agent_not_installed",
                     what: "Codex Desktop is not installed or discoverable",
                     remedy: "install or update Codex Desktop, then retry",
                 }));
@@ -168,15 +162,18 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
                         threadId: imported.value,
                     });
                     if (!archived)
-                        return err(cliErr({
+                        return err(cliErr("Exec", {
+                            code: "takeover.codex_cleanup_failed",
                             what: "temporary Codex import cleanup failed and the imported task remains",
                             path: sourcePath,
                             remedy: `archive task ${imported.value} in Codex Desktop, remove the reported temporary session, then retry`,
                         }));
                 }
-                return err(cliErr({
+                return err(cliErr("Fs", {
+                    code: "takeover.codex_source_cleanup_failed",
                     what: "could not remove the temporary Codex import source",
                     path: sourcePath,
+                    cause: sourceRemoved.error.cause,
                     remedy: "remove the reported temporary session, then retry the takeover",
                 }));
             }
@@ -194,9 +191,11 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
                 });
                 return archived
                     ? saved
-                    : err(cliErr({
+                    : err(cliErr("Exec", {
+                        code: "takeover.codex_recovery_unsaved",
                         what: "Codex Desktop imported a task but recovery could not be saved",
                         why: saved.error.why ?? saved.error.what,
+                        cause: saved.error,
                         remedy: `archive task ${imported.value} in Codex Desktop, then retry`,
                     }));
             }
@@ -206,7 +205,8 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
                     threadId: imported.value,
                 });
                 if (!archived)
-                    return err(cliErr({
+                    return err(cliErr("Exec", {
+                        code: "takeover.codex_extra_task",
                         what: "a concurrent Codex Desktop takeover created an extra task",
                         remedy: `archive task ${imported.value} in Codex Desktop, then retry`,
                     }));
@@ -245,7 +245,8 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
         },
         rollback: async (installed) => {
             if (!installed.destinationSessionId)
-                return err(cliErr({
+                return err(cliErr("Exec", {
+                    code: "takeover.codex_archive_unavailable",
                     what: "could not archive the rejected Codex Desktop task",
                     remedy: "open Codex Desktop and archive the task from the failed takeover",
                 }));
@@ -253,7 +254,8 @@ const writeCodexDesktopSession = (payload, workspace, options = {}) => {
         },
         launch: async (installed) => {
             if (!installed.destinationSessionId)
-                return err(cliErr({
+                return err(cliErr("Contract", {
+                    code: "takeover.codex_no_task_id",
                     what: "Codex Desktop returned no task ID",
                     remedy: "update Glen and Codex Desktop, then retry",
                 }));