@claudexor/cli 3.6.0 → 3.8.1

package/dist/setup-attach-command.d.ts

@@ -0,0 +1,30 @@
+import { type SpawnOptions } from "node:child_process";
+import { type ParsedArgs } from "./args.js";
+export declare function claimSetupAttachment(directory: string): void;
+export interface SetupAttachRunnerInvocation {
+    command: string;
+    args: string[];
+    options: SpawnOptions;
+}
+/**
+ * Windows must keep the login worker in the terminal that attached the job:
+ * entering `--worker` directly avoids the detached bootstrap hop that daemon-
+ * hosted jobs require. POSIX retains the existing bootstrap invocation.
+ */
+export declare function setupAttachRunnerInvocation(input: {
+    platform: NodeJS.Platform;
+    nodePath: string;
+    runnerPath: string;
+    manifestPath: string;
+    cwd: string;
+    env: NodeJS.ProcessEnv;
+}): SetupAttachRunnerInvocation;
+/**
+ * One owner for the interactive setup attachment role. The full CLI and the
+ * packaged daemon bundle both enter here; neither re-authors daemon lookup,
+ * the one-use claim, adjacent runner resolution, nor the Windows worker shape.
+ */
+export declare function setupAttachCommand(argv: readonly string[], json: boolean): Promise<number>;
+/** Full-CLI adapter over the shared raw-argv role owner. */
+export declare function setupCommand(args: Pick<ParsedArgs, "_">, json: boolean): Promise<number>;
+//# sourceMappingURL=setup-attach-command.d.ts.map

package/dist/setup-attach-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-attach-command.d.ts","sourceRoot":"","sources":["../src/setup-attach-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAK9D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAqB5C,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAa5D;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,YAAY,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;CACxB,GAAG,2BAA2B,CAkB9B;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAuDhG;AAED,4DAA4D;AAC5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAExF"}

package/dist/setup-attach-command.js

@@ -0,0 +1,118 @@
+import { spawn } from "node:child_process";
+import { closeSync, constants, existsSync, openSync } from "node:fs";
+import { platform } from "node:os";
+import { join } from "node:path";
+import { daemonDir } from "@claudexor/daemon";
+import { printUsageError } from "./cli-io.js";
+import { connectDaemonIfRunning } from "./daemon-run.js";
+import { controlApiFetch } from "./live.js";
+import { resolveSetupLoginRunnerPath } from "./setup-job-support.js";
+import { runnerBootstrapEnv } from "./setup-login-runner-support.js";
+function waitForChild(child) {
+    return new Promise((resolve, reject) => {
+        child.once("error", reject);
+        child.once("close", (code, signal) => {
+            if (signal) {
+                process.stderr.write(`claudexor setup attach: runner exited on ${signal}\n`);
+                resolve(1);
+            }
+            else {
+                resolve(code ?? 1);
+            }
+        });
+    });
+}
+export function claimSetupAttachment(directory) {
+    const path = join(directory, "client-pty-attached");
+    let descriptor;
+    try {
+        descriptor = openSync(path, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, 0o600);
+    }
+    catch {
+        throw new Error("setup job already has a client_pty attachment");
+    }
+    closeSync(descriptor);
+}
+/**
+ * Windows must keep the login worker in the terminal that attached the job:
+ * entering `--worker` directly avoids the detached bootstrap hop that daemon-
+ * hosted jobs require. POSIX retains the existing bootstrap invocation.
+ */
+export function setupAttachRunnerInvocation(input) {
+    if (input.platform === "win32") {
+        return {
+            command: input.nodePath,
+            args: [input.runnerPath, "--worker", input.manifestPath],
+            options: {
+                cwd: input.cwd,
+                stdio: "inherit",
+                env: runnerBootstrapEnv(input.env),
+                detached: false,
+            },
+        };
+    }
+    return {
+        command: input.nodePath,
+        args: [input.runnerPath, input.manifestPath],
+        options: { cwd: input.cwd, stdio: "inherit", env: input.env },
+    };
+}
+/**
+ * One owner for the interactive setup attachment role. The full CLI and the
+ * packaged daemon bundle both enter here; neither re-authors daemon lookup,
+ * the one-use claim, adjacent runner resolution, nor the Windows worker shape.
+ */
+export async function setupAttachCommand(argv, json) {
+    const sub = argv[1];
+    const jobId = argv[2];
+    if (argv[0] !== "setup" ||
+        sub !== "attach" ||
+        typeof jobId !== "string" ||
+        !/^setup-[A-Za-z0-9-]+$/.test(jobId) ||
+        argv.length !== 3) {
+        return printUsageError(json, "usage: claudexor setup attach <jobId>");
+    }
+    if (json) {
+        return printUsageError(true, "claudexor setup attach owns an interactive PTY and cannot use --json");
+    }
+    const daemon = await connectDaemonIfRunning();
+    if (!daemon)
+        throw new Error("setup daemon is not running");
+    const response = await controlApiFetch(daemon.addr, `/setup/jobs/${encodeURIComponent(jobId)}`);
+    const body = (await response.json());
+    if (!response.ok)
+        throw new Error(`setup job lookup failed (HTTP ${response.status})`);
+    if (body.transport !== "client_pty") {
+        throw new Error("setup job is not authorized for client_pty attachment");
+    }
+    if (!["queued", "running", "waiting_for_input"].includes(body.state ?? "") ||
+        !["launching", "awaiting_user"].includes(body.phase ?? "")) {
+        throw new Error(`setup job is not attachable (${body.state ?? "unknown"})`);
+    }
+    const artifactDirectory = join(daemonDir(), "setup-artifacts", jobId);
+    const manifest = join(artifactDirectory, "runner-manifest.json");
+    if (!existsSync(manifest))
+        throw new Error("sealed setup manifest is unavailable");
+    const runner = resolveSetupLoginRunnerPath();
+    if (!existsSync(runner))
+        throw new Error("setup login runner is unavailable");
+    // A sealed login job authorizes exactly one terminal runner. O_EXCL is the
+    // cross-process fence; the marker intentionally survives a crashed client so
+    // users cancel/recreate instead of accidentally launching the vendor login
+    // twice against one daemon-owned job.
+    claimSetupAttachment(artifactDirectory);
+    const invocation = setupAttachRunnerInvocation({
+        platform: platform(),
+        nodePath: process.execPath,
+        runnerPath: runner,
+        manifestPath: manifest,
+        cwd: artifactDirectory,
+        env: process.env,
+    });
+    return waitForChild(spawn(invocation.command, invocation.args, invocation.options));
+}
+/** Full-CLI adapter over the shared raw-argv role owner. */
+export function setupCommand(args, json) {
+    return setupAttachCommand(args._, json);
+}
+//# sourceMappingURL=setup-attach-command.js.map

package/dist/setup-attach-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-attach-command.js","sourceRoot":"","sources":["../src/setup-attach-command.ts"],"names":[],"mappings":"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"}