dory-to-dory-watcher 0.1.0 → 0.1.2

package/README.md

@@ -19,14 +19,69 @@ Watcher는 Agent를 새로 구현하지 않습니다. 사용자가 이미 로그
 ## 요구 사항
 
 - Node.js 22 이상
-- dory-to-dory Core에서 발급한 Agent API key
+- dory-to-dory 계정. `setup`의 device-code pairing이 Agent API key를 안전하게 발급·저장합니다.
 - 지원되는 Agent CLI 하나 이상
   - Codex CLI
   - Claude Code
   - Gemini CLI
 - Agent가 실행할 도구를 비대화식 환경에서 사용할 수 있도록 구성된 기존 권한 정책
 
-## 설치와 실행
+## 빠른 설치
+
+일반 사용자는 Watcher를 전역 설치한 뒤 대화형 설정을 한 번 실행합니다.
+
+```sh
+npm install --global dory-to-dory-watcher@latest
+dory-watcher setup
+```
+
+`setup`은 다음 작업을 순서대로 수행합니다.
+
+1. 설치된 Codex CLI, Claude Code, Gemini CLI를 찾아 사용할 Agent를 선택합니다.
+2. Agent가 실행될 workspace를 선택합니다.
+3. 브라우저에서 dory-to-dory에 로그인하고 짧은 일회용 코드로 이 장치를 승인합니다.
+4. 발급된 Agent API key를 화면이나 명령행에 노출하지 않고 OS별 사용자 credential 파일에 저장합니다.
+5. 기존 `dory-to-dory` MCP 설정을 검사하고, 새 등록이면 선택한 Agent의 공식 CLI로 등록합니다.
+6. 기존 MCP 설정이 있으면 자동으로 덮어쓰지 않습니다. 사용자가 교체에 동의하면 설정 파일을 먼저 백업합니다.
+7. `doctor` 검사를 수행합니다. 이 과정에서는 item을 claim하거나 처리하지 않습니다.
+8. macOS와 Linux에서는 사용자가 명시적으로 동의한 경우에만 로그인 백그라운드 서비스를 설치하고 시작합니다.
+
+브라우저가 자동으로 열리지 않으면 화면에 표시된 verification URL을 열고 user code를 입력합니다. `device_code`와 API key 원문은 출력하거나 로그에 기록하지 않습니다.
+
+```sh
+dory-watcher status
+dory-watcher service status
+dory-watcher service logs
+```
+
+`status`는 저장된 비밀이 아닌 설정과 서비스 상태만 표시합니다. 실제 Core 연결은 `doctor`로 확인합니다.
+
+```sh
+dory-watcher doctor
+```
+
+설정 후 Agent 앱을 재시작하고 다음과 같이 요청해 MCP 연결도 확인합니다.
+
+```text
+dory-to-dory MCP의 d2d_get_connection_status를 실행해서 연결 상태를 확인해줘.
+```
+
+Windows에서는 device pairing, MCP 설정과 터미널의 foreground `dory-watcher run`을 지원합니다. 로그인 백그라운드 서비스 등록은 아직 지원하지 않습니다.
+
+### 고급 setup 옵션
+
+```sh
+dory-watcher setup --agent codex --workspace /absolute/path/to/workspace
+dory-watcher setup --no-browser --no-service
+```
+
+다른 Core를 사용하는 개발 환경에서만 `--core-url`을 지정합니다.
+
+```sh
+dory-watcher setup --core-url https://core.example.test
+```
+
+## 수동 설치와 실행
 
 개발 중에는 다음과 같이 실행합니다.
 
@@ -40,12 +95,12 @@ node dist/cli.js run
 npm 게시 이후에는 전역 설치할 수 있습니다.
 
 ```sh
-npm install --global dory-to-dory-watcher@0.1.0
+npm install --global dory-to-dory-watcher@latest
 dory-watcher doctor
 dory-watcher run
 ```
 
-별도의 MCP npm 설치는 필요하지 않습니다. Watcher가 호환되는 정확한 MCP 버전을 함께 설치하며, Agent의 MCP 설정은 안정적인 `dory-watcher mcp` 명령을 실행하도록 등록해야 합니다.
+별도의 MCP npm 설치는 필요하지 않습니다. 각 Watcher 릴리스는 검증된 정확한 MCP 버전을 의존성으로 포함하며, Agent의 MCP 설정은 안정적인 `dory-watcher mcp` 명령을 실행하도록 등록해야 합니다.
 
 ```json
 {
@@ -61,12 +116,13 @@ dory-watcher run
 }
 ```
 
-Agent 설정 형식은 제품마다 다르지만 command와 args의 의미는 같습니다. Watcher를 업데이트하면 함께 묶인 MCP도 업데이트되므로 Agent 설정에서 MCP 버전을 다시 입력할 필요가 없습니다. 설치 명령 자체는 Agent 설정을 몰래 변경하지 않으므로 최초 한 번은 위 launcher를 해당 Agent에 등록해야 합니다.
+Agent 설정 형식은 제품마다 다르지만 command와 args의 의미는 같습니다. `setup`이 최초 등록을 처리하므로 사용자가 MCP 버전을 직접 입력할 필요는 없습니다. 다만 Watcher와 MCP의 자동 업데이트 및 릴리스 간 자동 버전 동기화는 아직 제공하지 않으며, 각 릴리스의 실제 의존성 버전을 따릅니다.
 
 API key를 서비스 설정과 명령행에 반복해서 넣지 않도록 credential 파일 사용을 권장합니다.
 
 ```sh
 mkdir -p ~/.config/dory-to-dory
+chmod 700 ~/.config/dory-to-dory
 umask 077
 read -s D2D_WATCHER_KEY
 printf '%s\n' "$D2D_WATCHER_KEY" > ~/.config/dory-to-dory/agent.key
@@ -132,13 +188,32 @@ export D2D_AGENT_ARGS_JSON='["--headless"]'
 
 ## 백그라운드 실행
 
-정상 동작을 `dory-watcher doctor`와 `dory-watcher once`로 먼저 확인한 뒤 OS의 로그인 서비스로 `dory-watcher run`을 등록합니다.
+`dory-watcher setup` 마지막 단계에서 동의하거나 다음 명령을 실행하면 로그인할 때 터미널 창 없이 사용자 백그라운드 서비스로 시작합니다.
+
+```sh
+dory-watcher service install
+dory-watcher service status
+```
 
 - macOS: 사용자 LaunchAgent
 - Linux: systemd user service
-- Windows: Task Scheduler의 사용자 로그인 트리거
+- Windows: 현재 자동 실행 미지원
+
+서비스는 Agent CLI의 로그인 정보와 MCP 설정을 읽어야 하므로 동일한 OS 사용자 계정에서 실행됩니다. `sudo`로 설치하거나 실행하지 마십시오. 이미 foreground Watcher가 실행 중이면 single-instance lock이 두 번째 실행을 차단하여 중복 Agent 호출 비용을 방지합니다.
+
+설치 시점의 절대경로 `PATH` 항목은 서비스 정의에 보존됩니다. 다만 shell profile에만 선언한 다른 환경 변수나 secret은 복사하지 않습니다. 백그라운드 Agent가 사용하는 도구의 credential은 Agent 설정 또는 OS credential store처럼 비대화식 실행에서도 사용할 수 있는 안전한 위치에 구성하세요.
+
+서비스 관리 명령은 다음과 같습니다.
+
+```sh
+dory-watcher service start
+dory-watcher service stop
+dory-watcher service restart
+dory-watcher service logs
+dory-watcher service uninstall
+```
 
-서비스에는 key 값 대신 `D2D_API_KEY_FILE`과 Agent 종류, workspace를 전달하십시오. Agent CLI의 로그인 정보와 MCP 설정을 읽을 수 있도록 반드시 같은 OS 사용자 계정으로 실행해야 합니다.
+서비스를 중지하면 진행 중인 headless Agent에도 종료 신호를 전달합니다. Core의 claim lease와 fencing token이 중단된 item을 안전하게 다시 처리할 수 있게 합니다.
 
 ## 보안 및 비용
 

package/dist/agent.d.ts

@@ -12,6 +12,10 @@ export interface AgentRunResult {
 export declare class AgentRunError extends Error {
     name: string;
 }
+export declare function windowsTreeKillInvocation(pid: number, force: boolean): {
+    command: string;
+    args: string[];
+};
 export declare function buildInvocation(kind: AgentKind, command: string, extraArgs: string[]): AgentInvocation;
-export declare function runAgent(config: WatcherConfig): Promise<AgentRunResult>;
+export declare function runAgent(config: WatcherConfig, signal?: AbortSignal): Promise<AgentRunResult>;
 //# sourceMappingURL=agent.d.ts.map

package/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5D,eAAO,MAAM,WAAW,68BASyD,CAAC;AAElF,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,aAAc,SAAQ,KAAK;IAC7B,IAAI,SAAmB;CACjC;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,eAAe,CAuBjB;AAED,wBAAsB,QAAQ,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CA0C7E"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5D,eAAO,MAAM,WAAW,68BASyD,CAAC;AAElF,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,aAAc,SAAQ,KAAK;IAC7B,IAAI,SAAmB;CACjC;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,GACb;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAKrC;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,GAClB,eAAe,CAuBjB;AAED,wBAAsB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CA8FnG"}

package/dist/agent.js

@@ -1,4 +1,5 @@
 import { spawn } from "node:child_process";
+import { commandForSpawn } from "./process.js";
 export const WAKE_PROMPT = `This is a dory-to-dory background wake-up. Process at most one pending dory-to-dory item.
 
 1. Call the dory-to-dory MCP tool d2d_claim_next_item exactly once.
@@ -12,6 +13,12 @@ Do not process ordinary unrelated work and do not include credentials in output.
 export class AgentRunError extends Error {
     name = "AgentRunError";
 }
+export function windowsTreeKillInvocation(pid, force) {
+    return {
+        command: "taskkill.exe",
+        args: ["/pid", String(pid), "/t", ...(force ? ["/f"] : [])],
+    };
+}
 export function buildInvocation(kind, command, extraArgs) {
     if (kind === "codex") {
         return {
@@ -30,54 +37,116 @@ export function buildInvocation(kind, command, extraArgs) {
     if (kind === "gemini") {
         return {
             command,
-            args: ["--output-format", "stream-json", ...extraArgs],
+            args: ["--prompt", "", "--output-format", "stream-json", ...extraArgs],
             promptOnStdin: WAKE_PROMPT,
         };
     }
     return { command, args: extraArgs, promptOnStdin: WAKE_PROMPT };
 }
-export async function runAgent(config) {
+export async function runAgent(config, signal) {
+    if (signal?.aborted)
+        throw new AgentRunError(`${config.agentKind} Agent run was cancelled`);
     const invocation = buildInvocation(config.agentKind, config.agentCommand, config.agentArgs);
+    const executable = commandForSpawn(invocation.command, invocation.args);
     const startedAt = Date.now();
     return await new Promise((resolve, reject) => {
-        const child = spawn(invocation.command, invocation.args, {
+        const childEnvironment = { ...process.env };
+        delete childEnvironment.D2D_API_KEY;
+        const child = spawn(executable.command, executable.args, {
             cwd: config.workspace,
-            env: process.env,
+            env: childEnvironment,
             shell: false,
+            detached: process.platform !== "win32",
             windowsHide: true,
             stdio: ["pipe", "pipe", "pipe"],
         });
         let outputBytes = 0;
         const outputLimit = 1024 * 1024;
+        let settled = false;
+        let forceTimer;
+        const finish = (operation) => {
+            if (settled)
+                return;
+            settled = true;
+            signal?.removeEventListener("abort", abort);
+            clearTimeout(timer);
+            if (forceTimer)
+                clearTimeout(forceTimer);
+            operation();
+        };
+        child.once("error", () => finish(() => reject(new AgentRunError(`Could not start ${config.agentCommand}`))));
+        child.stdin.on("error", () => undefined);
+        let timedOut = false;
+        let cancelled = false;
+        const terminate = (killSignal = "SIGTERM") => {
+            if (!child.pid || child.exitCode !== null)
+                return;
+            try {
+                if (process.platform === "win32") {
+                    const invocation = windowsTreeKillInvocation(child.pid, killSignal === "SIGKILL");
+                    const killer = spawn(invocation.command, invocation.args, {
+                        shell: false,
+                        stdio: "ignore",
+                        windowsHide: true,
+                    });
+                    killer.once("error", () => {
+                        try {
+                            child.kill(killSignal);
+                        }
+                        catch {
+                            // The process may already have exited.
+                        }
+                    });
+                }
+                else
+                    process.kill(-child.pid, killSignal);
+            }
+            catch {
+                child.kill(killSignal);
+            }
+        };
+        const terminateWithGrace = () => {
+            terminate();
+            if (!forceTimer) {
+                forceTimer = setTimeout(() => terminate("SIGKILL"), 5_000);
+                forceTimer.unref();
+            }
+        };
         const consume = (chunk) => {
             outputBytes += chunk.length;
             if (outputBytes > outputLimit)
-                child.kill();
+                terminateWithGrace();
         };
         child.stdout.on("data", consume);
         child.stderr.on("data", consume);
-        child.once("error", () => reject(new AgentRunError(`Could not start ${config.agentCommand}`)));
-        child.stdin.on("error", () => undefined);
-        let timedOut = false;
+        const abort = () => {
+            cancelled = true;
+            terminateWithGrace();
+        };
+        signal?.addEventListener("abort", abort, { once: true });
+        if (signal?.aborted)
+            abort();
         const timer = setTimeout(() => {
             timedOut = true;
-            child.kill();
+            terminateWithGrace();
         }, config.runTimeoutMs);
         timer.unref();
         child.once("close", (code) => {
-            clearTimeout(timer);
             const durationMs = Date.now() - startedAt;
-            if (timedOut) {
-                reject(new AgentRunError(`${config.agentKind} Agent run timed out`));
+            if (cancelled) {
+                finish(() => reject(new AgentRunError(`${config.agentKind} Agent run was cancelled`)));
+            }
+            else if (timedOut) {
+                finish(() => reject(new AgentRunError(`${config.agentKind} Agent run timed out`)));
             }
             else if (outputBytes > outputLimit) {
-                reject(new AgentRunError(`${config.agentKind} Agent produced excessive output`));
+                finish(() => reject(new AgentRunError(`${config.agentKind} Agent produced excessive output`)));
             }
             else if (code !== 0) {
-                reject(new AgentRunError(`${config.agentKind} Agent exited with code ${code ?? "unknown"}`));
+                finish(() => reject(new AgentRunError(`${config.agentKind} Agent exited with code ${code ?? "unknown"}`)));
             }
             else {
-                resolve({ exitCode: 0, durationMs });
+                finish(() => resolve({ exitCode: 0, durationMs }));
             }
         });
         child.stdin.end(invocation.promptOnStdin);

package/dist/agent.js.map

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

package/dist/cli.js

@@ -1,7 +1,12 @@
 #!/usr/bin/env node
 import { serveDoryToDoryMcp } from "dory-to-dory-mcp";
+import { fileURLToPath } from "node:url";
 import { loadConfig } from "./config.js";
 import { doctor } from "./doctor.js";
+import { defaultInstallationFile, installationEnvironment, loadInstallation, } from "./installation.js";
+import { installService, restartService, serviceLogs, serviceStatus, startService, stopService, uninstallService, } from "./service.js";
+import { installationStatusLines, parseSetupOptions, runSetup } from "./setup.js";
+import { acquireRunLock, runningWatcherPid } from "./run-lock.js";
 import { Watcher } from "./watcher.js";
 const HELP = `dory-watcher <command>
 
@@ -10,6 +15,9 @@ Commands:
   once      Reconcile and process available items once, then exit
   mcp       Run the bundled dory-to-dory MCP server over stdio
   doctor    Verify the credential, Core connection, workspace, and Agent CLI
+  setup     Pair this device and configure an Agent, MCP, and optional login service
+  status    Show saved setup and background-service status (never prints the credential)
+  service   Manage login background service: install|start|stop|restart|status|logs|uninstall
   help      Show this help
 
 Required configuration:
@@ -19,18 +27,98 @@ Agent selection:
   D2D_AGENT_KIND=codex|claude|gemini|custom (default: codex)
   D2D_AGENT_COMMAND=<executable>             (required only for custom)
   D2D_AGENT_ARGS_JSON='["arg1","arg2"]'     (optional extra CLI arguments)
-  D2D_AGENT_WORKSPACE=/absolute/path         (default: current directory)`;
+  D2D_AGENT_WORKSPACE=/absolute/path         (default: current directory)
+
+Setup options:
+  --agent codex|claude|gemini
+  --workspace /absolute/path
+  --agent-name <display name>
+  --core-url https://example.test
+  --no-browser
+  --no-service`;
+async function resolvedEnvironment() {
+    return installationEnvironment(process.env, await loadInstallation());
+}
+function applyMcpEnvironment(env) {
+    for (const name of ["D2D_API_KEY", "D2D_API_KEY_FILE", "D2D_CORE_URL"]) {
+        if (env[name] !== undefined && process.env[name] === undefined)
+            process.env[name] = env[name];
+    }
+}
+async function serviceCommand(action, args) {
+    if (action === "status") {
+        console.log((await serviceStatus()).detail);
+        return;
+    }
+    if (action === "logs") {
+        console.log(await serviceLogs());
+        return;
+    }
+    if (action === "start")
+        return await startService();
+    if (action === "stop")
+        return await stopService();
+    if (action === "restart")
+        return await restartService();
+    if (action === "uninstall")
+        return await uninstallService();
+    if (action === "install") {
+        const configFile = process.env.D2D_WATCHER_CONFIG_FILE?.trim() || defaultInstallationFile();
+        const installation = await loadInstallation(configFile);
+        if (!installation)
+            throw new Error("Run `dory-watcher setup` before installing the background service");
+        const config = loadConfig(installationEnvironment(process.env, installation));
+        for (const line of await doctor(config))
+            console.log(line);
+        const current = await serviceStatus();
+        const activePid = await runningWatcherPid(config.stateFile);
+        const startNow = current.running || activePid === undefined;
+        await installService({
+            installation,
+            nodeCommand: process.execPath,
+            watcherCli: fileURLToPath(import.meta.url),
+            configFile,
+        }, args.includes("--replace"), startNow);
+        if (startNow)
+            console.log("Background service installed and start requested.");
+        else {
+            console.log(`Background service installed but not started because Watcher PID ${activePid} is already running.`);
+        }
+        return;
+    }
+    throw new Error("Usage: dory-watcher service install|start|stop|restart|status|logs|uninstall");
+}
 async function main() {
     const command = process.argv[2] ?? "run";
     if (command === "help" || command === "--help" || command === "-h") {
         console.log(HELP);
         return;
     }
+    if (command === "setup") {
+        if (process.argv.slice(3).some((arg) => arg === "--help" || arg === "-h")) {
+            console.log(HELP);
+            return;
+        }
+        await runSetup(parseSetupOptions(process.argv.slice(3)), {
+            watcherCli: fileURLToPath(import.meta.url),
+        });
+        return;
+    }
+    if (command === "status") {
+        for (const line of await installationStatusLines())
+            console.log(line);
+        return;
+    }
+    if (command === "service") {
+        await serviceCommand(process.argv[3], process.argv.slice(4));
+        return;
+    }
     if (command === "mcp") {
+        applyMcpEnvironment(await resolvedEnvironment());
         await serveDoryToDoryMcp();
         return;
     }
-    const config = loadConfig();
+    const config = loadConfig(await resolvedEnvironment());
     if (command === "doctor") {
         for (const line of await doctor(config))
             console.log(line);
@@ -38,7 +126,13 @@ async function main() {
     }
     const watcher = new Watcher(config);
     if (command === "once") {
-        await watcher.processAvailableWork();
+        const release = await acquireRunLock(config.stateFile);
+        try {
+            await watcher.processAvailableWork();
+        }
+        finally {
+            await release();
+        }
         return;
     }
     if (command !== "run")
@@ -47,7 +141,15 @@ async function main() {
     const stop = () => controller.abort();
     process.once("SIGINT", stop);
     process.once("SIGTERM", stop);
-    await watcher.run(controller.signal);
+    const release = await acquireRunLock(config.stateFile);
+    try {
+        await watcher.run(controller.signal);
+    }
+    finally {
+        process.removeListener("SIGINT", stop);
+        process.removeListener("SIGTERM", stop);
+        await release();
+    }
 }
 main().catch((error) => {
     console.error(`[dory-watcher] ${error instanceof Error ? error.message : String(error)}`);

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;0EAgB6D,CAAC;AAE3E,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACzC,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACnE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QACtB,MAAM,kBAAkB,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,KAAK,MAAM,IAAI,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;IAEtE,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACtC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC7B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9B,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAC9B,OAAO,CAAC,KAAK,CAAC,kBAAkB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC1F,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,WAAY,SAAQ,KAAK;IAC3B,IAAI,SAAiB;CAC/B;AAqED,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,aAAa,CAwD9E"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,WAAY,SAAQ,KAAK;IAC3B,IAAI,SAAiB;CAC/B;AAuED,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,aAAa,CA8D9E"}

package/dist/config.js

@@ -1,4 +1,4 @@
-import { readFileSync, statSync } from "node:fs";
+import { lstatSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 export class ConfigError extends Error {
@@ -25,9 +25,10 @@ function credential(env) {
     if (!filePath)
         throw new ConfigError("D2D_API_KEY or D2D_API_KEY_FILE is required");
     try {
-        const file = statSync(filePath);
-        if (!file.isFile())
-            throw new ConfigError("D2D_API_KEY_FILE must point to a regular file");
+        const file = lstatSync(filePath);
+        if (!file.isFile() || file.isSymbolicLink()) {
+            throw new ConfigError("D2D_API_KEY_FILE must point to a regular, non-symbolic-link file");
+        }
         if (file.size > MAX_CREDENTIAL_FILE_BYTES) {
             throw new ConfigError("D2D_API_KEY_FILE is unexpectedly large");
         }
@@ -77,8 +78,12 @@ export function loadConfig(env = process.env) {
     catch {
         throw new ConfigError("D2D_CORE_URL must be a valid URL");
     }
-    if (!new Set(["http:", "https:"]).has(coreUrl.protocol)) {
-        throw new ConfigError("D2D_CORE_URL must use http or https");
+    if (coreUrl.username || coreUrl.password || coreUrl.search || coreUrl.hash) {
+        throw new ConfigError("D2D_CORE_URL must not include credentials, a query, or a fragment");
+    }
+    const loopback = ["localhost", "127.0.0.1", "[::1]"].includes(coreUrl.hostname.toLowerCase());
+    if (coreUrl.protocol !== "https:" && !(coreUrl.protocol === "http:" && loopback)) {
+        throw new ConfigError("D2D_CORE_URL must use HTTPS; HTTP is allowed only for localhost, 127.0.0.1, or [::1]");
     }
     const rawAgentKind = env.D2D_AGENT_KIND?.trim().toLowerCase() || "codex";
     if (!new Set(["codex", "claude", "gemini", "custom"]).has(rawAgentKind)) {

package/dist/config.js.map

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

package/dist/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyBjD,wBAAsB,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAWrE"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiBjD,wBAAsB,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAWrE"}

package/dist/doctor.js

@@ -1,30 +1,19 @@
-import { spawn } from "node:child_process";
 import { stat } from "node:fs/promises";
 import { CoreClient } from "./core-client.js";
+import { runCommand } from "./process.js";
 async function commandVersion(command) {
-    return await new Promise((resolve, reject) => {
-        const child = spawn(command, ["--version"], {
-            shell: false,
-            windowsHide: true,
-            stdio: ["ignore", "pipe", "pipe"],
-        });
-        let output = "";
-        child.stdout.on("data", (chunk) => {
-            if (output.length < 2_000)
-                output += chunk.toString("utf8");
-        });
-        child.stderr.on("data", (chunk) => {
-            if (output.length < 2_000)
-                output += chunk.toString("utf8");
-        });
-        child.once("error", () => reject(new Error(`Could not start ${command}`)));
-        child.once("close", (code) => {
-            if (code === 0)
-                resolve(output.trim().split("\n")[0] || "version not reported");
-            else
-                reject(new Error(`${command} --version exited with code ${code ?? "unknown"}`));
-        });
-    });
+    let result;
+    try {
+        const childEnvironment = { ...process.env };
+        delete childEnvironment.D2D_API_KEY;
+        result = await runCommand(command, ["--version"], { env: childEnvironment });
+    }
+    catch {
+        throw new Error(`Could not start ${command}`);
+    }
+    if (result.exitCode !== 0)
+        throw new Error(`${command} --version exited with code ${result.exitCode}`);
+    return `${result.stdout}\n${result.stderr}`.trim().split("\n")[0] || "version not reported";
 }
 export async function doctor(config) {
     const workspace = await stat(config.workspace);

package/dist/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,KAAK,UAAU,cAAc,CAAC,OAAe;IAC3C,OAAO,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE;YAC1C,KAAK,EAAE,KAAK;YACZ,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SAClC,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,IAAI,MAAM,CAAC,MAAM,GAAG,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,IAAI,MAAM,CAAC,MAAM,GAAG,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3B,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,CAAC;;gBAC3E,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,OAAO,+BAA+B,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,MAAqB;IAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IACrD,OAAO;QACL,oBAAoB,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG;QAC5C,UAAU,MAAM,CAAC,SAAS,KAAK,OAAO,GAAG;QACzC,cAAc,MAAM,CAAC,SAAS,EAAE;QAChC,uBAAuB,MAAM,CAAC,aAAa,aAAa,MAAM,CAAC,aAAa,sBAAsB,MAAM,CAAC,sBAAsB,EAAE;KAClI,CAAC;AACJ,CAAC"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,UAAU,cAAc,CAAC,OAAe;IAC3C,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC5C,OAAO,gBAAgB,CAAC,WAAW,CAAC;QACpC,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC/E,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,+BAA+B,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvG,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC;AAC9F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,MAAqB;IAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IACrD,OAAO;QACL,oBAAoB,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG;QAC5C,UAAU,MAAM,CAAC,SAAS,KAAK,OAAO,GAAG;QACzC,cAAc,MAAM,CAAC,SAAS,EAAE;QAChC,uBAAuB,MAAM,CAAC,aAAa,aAAa,MAAM,CAAC,aAAa,sBAAsB,MAAM,CAAC,sBAAsB,EAAE;KAClI,CAAC;AACJ,CAAC"}