@companyhelm/cli 0.0.5 → 0.0.7

package/dist/commands/register-commands.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCommands = registerCommands;
-const root_js_1 = require("./root.js");
+const register_runner_commands_js_1 = require("./runner/register-runner-commands.js");
 const shell_js_1 = require("./shell.js");
 const register_sdk_commands_js_1 = require("./sdk/register-sdk-commands.js");
 const status_js_1 = require("./status.js");
 const register_thread_commands_js_1 = require("./thread/register-thread-commands.js");
 function registerCommands(program) {
-    (0, root_js_1.registerRootCommand)(program);
+    (0, register_runner_commands_js_1.registerRunnerCommands)(program);
     (0, status_js_1.registerStatusCommand)(program);
     (0, register_thread_commands_js_1.registerThreadCommands)(program);
     (0, shell_js_1.registerShellCommand)(program);

package/dist/commands/root.js

@@ -33,16 +33,21 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toErrorMessage = toErrorMessage;
 exports.isRetryableApiConnectionError = isRetryableApiConnectionError;
+exports.formatApiConnectionFailureMessage = formatApiConnectionFailureMessage;
+exports.formatApiConnectionFailureDiagnostics = formatApiConnectionFailureDiagnostics;
 exports.shouldUseTurnSteer = shouldUseTurnSteer;
 exports.isNoActiveTurnSteerError = isNoActiveTurnSteerError;
 exports.isNoRunningTurnInterruptError = isNoRunningTurnInterruptError;
 exports.normalizeThreadAgentApiUrlForRuntime = normalizeThreadAgentApiUrlForRuntime;
 exports.extractThreadNameUpdateFromNotification = extractThreadNameUpdateFromNotification;
 exports.extractServerMessageRequestId = extractServerMessageRequestId;
+exports.isInternalDaemonChildProcess = isInternalDaemonChildProcess;
+exports.runDetachedDaemonProcess = runDetachedDaemonProcess;
+exports.sendDaemonParentMessage = sendDaemonParentMessage;
 exports.runRootCommand = runRootCommand;
 exports.buildRootConfig = buildRootConfig;
-exports.registerRootCommand = registerRootCommand;
 const protobuf_1 = require("@bufbuild/protobuf");
 const protos_1 = require("@companyhelm/protos");
 const drizzle_orm_1 = require("drizzle-orm");
@@ -206,19 +211,74 @@ function getGrpcStatusCode(error) {
     const { code } = error;
     return typeof code === "number" ? code : undefined;
 }
+function getGrpcStatusName(error) {
+    const code = getGrpcStatusCode(error);
+    if (code === undefined) {
+        return undefined;
+    }
+    const statusName = grpc.status[code];
+    return typeof statusName === "string" ? statusName : undefined;
+}
 function isRetryableApiConnectionError(error) {
     return getGrpcStatusCode(error) !== grpc.status.UNAUTHENTICATED;
 }
-function toApiConnectionFailureMessage(error, secret) {
-    const message = toErrorMessage(error);
-    if (getGrpcStatusCode(error) !== grpc.status.UNAUTHENTICATED) {
-        return message;
+function formatGrpcMetadataForLog(metadata) {
+    if (!metadata) {
+        return undefined;
     }
-    if (!secret || secret.trim().length === 0) {
-        return `${message} Provide --secret <secret> to authenticate.`;
+    const rawEntries = metadata.getMap();
+    const entries = Object.entries(rawEntries);
+    if (entries.length === 0) {
+        return undefined;
+    }
+    const normalizedEntries = Object.fromEntries(entries.map(([key, value]) => [
+        key,
+        Buffer.isBuffer(value) ? value.toString("base64") : String(value),
+    ]));
+    return JSON.stringify(normalizedEntries);
+}
+function formatApiConnectionFailureMessage(error, apiUrl, secret) {
+    const statusCode = getGrpcStatusCode(error);
+    const statusName = getGrpcStatusName(error);
+    const serviceError = isGrpcServiceError(error) ? error : undefined;
+    const baseMessage = serviceError && typeof serviceError.details === "string" && serviceError.details.trim().length > 0
+        ? serviceError.details.trim()
+        : toErrorMessage(error);
+    let message = baseMessage;
+    if (statusCode !== undefined) {
+        message = `gRPC ${statusName ?? "UNKNOWN"} (${statusCode}): ${baseMessage}`;
+    }
+    message += ` [endpoint=${apiUrl}]`;
+    if (statusCode === grpc.status.UNAUTHENTICATED && (!secret || secret.trim().length === 0)) {
+        message += " Provide --secret <secret> to authenticate.";
     }
     return message;
 }
+function formatApiConnectionFailureDiagnostics(error) {
+    if (!isGrpcServiceError(error)) {
+        return error instanceof Error && typeof error.stack === "string" ? error.stack : undefined;
+    }
+    const diagnostics = [];
+    const statusCode = getGrpcStatusCode(error);
+    const statusName = getGrpcStatusName(error);
+    if (statusCode !== undefined) {
+        diagnostics.push(`code=${statusCode}`);
+    }
+    if (statusName) {
+        diagnostics.push(`status=${statusName}`);
+    }
+    if (typeof error.details === "string" && error.details.trim().length > 0) {
+        diagnostics.push(`details=${JSON.stringify(error.details.trim())}`);
+    }
+    const metadata = formatGrpcMetadataForLog(error.metadata);
+    if (metadata) {
+        diagnostics.push(`metadata=${metadata}`);
+    }
+    if (typeof error.stack === "string" && error.stack.trim().length > 0) {
+        diagnostics.push(`stack=${JSON.stringify(error.stack)}`);
+    }
+    return diagnostics.length > 0 ? diagnostics.join(" ") : undefined;
+}
 function shouldUseTurnSteer(allowSteer, startedFromIdle) {
     return allowSteer && !startedFromIdle;
 }
@@ -2252,7 +2312,11 @@ async function runRootCommand(options, runtimeOptions) {
                 logger.warn("CompanyHelm API command channel closed. Reconnecting...");
             }
             catch (error) {
-                const failureMessage = toApiConnectionFailureMessage(error, options.secret);
+                const failureMessage = formatApiConnectionFailureMessage(error, cfg.companyhelm_api_url, options.secret);
+                const diagnostics = formatApiConnectionFailureDiagnostics(error);
+                if (diagnostics) {
+                    logger.debug(`CompanyHelm API failure diagnostics: ${diagnostics}`);
+                }
                 if (!isRetryableApiConnectionError(error)) {
                     throw new Error(failureMessage);
                 }
@@ -2300,38 +2364,3 @@ function buildRootConfig(options) {
         thread_git_skills_directory: options.threadGitSkillsDirectory,
     });
 }
-function registerRootCommand(program) {
-    program
-        .option("--config-path <path>", "Config directory override (defaults to ~/.config/companyhelm).")
-        .option("--server-url <url>", "CompanyHelm gRPC API URL override.")
-        .option("--agent-api-url <url>", "Agent gRPC API URL for companyhelm-agent in runtime containers (localhost is rewritten to http://host.docker.internal).")
-        .option("--secret <secret>", "Bearer secret used as gRPC Authorization header.")
-        .option("--state-db-path <path>", "State database path override (defaults to ~/.local/share/companyhelm/state.db).")
-        .option("--use-host-docker-runtime", "Mount host Docker socket into runtime containers instead of creating DinD sidecars.")
-        .option("--host-docker-path <path>", "Host Docker endpoint when --use-host-docker-runtime is enabled (unix:///<socket-path> or tcp://localhost:<port>).")
-        .option("--thread-git-skills-directory <path>", "Container path where thread git skill repositories are cloned before linking into ~/.codex/skills.")
-        .option("-d, --daemon", "Run in daemon mode and fail fast when no SDK is configured.")
-        .option("--log-level <level>", "Log level (DEBUG, INFO, WARN, ERROR).", "INFO")
-        .action(async () => {
-        const options = program.opts();
-        if (options.daemon && !isInternalDaemonChildProcess()) {
-            await runDetachedDaemonProcess(options);
-            return;
-        }
-        try {
-            await runRootCommand(options, isInternalDaemonChildProcess()
-                ? {
-                    onDaemonReady: () => {
-                        sendDaemonParentMessage({ type: "daemon-ready" });
-                    },
-                }
-                : undefined);
-        }
-        catch (error) {
-            if (isInternalDaemonChildProcess()) {
-                sendDaemonParentMessage({ type: "daemon-error", message: toErrorMessage(error) });
-            }
-            throw error;
-        }
-    });
-}

package/dist/commands/runner/common.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addRunnerStartOptions = addRunnerStartOptions;
+function addRunnerStartOptions(command) {
+    return command
+        .option("--config-path <path>", "Config directory override (defaults to ~/.config/companyhelm).")
+        .option("--server-url <url>", "CompanyHelm gRPC API URL override.")
+        .option("--agent-api-url <url>", "Agent gRPC API URL for companyhelm-agent in runtime containers (localhost is rewritten to http://host.docker.internal).")
+        .option("--secret <secret>", "Bearer secret used as gRPC Authorization header.")
+        .option("--state-db-path <path>", "State database path override (defaults to ~/.local/share/companyhelm/state.db).")
+        .option("--use-host-docker-runtime", "Mount host Docker socket into runtime containers instead of creating DinD sidecars.")
+        .option("--host-docker-path <path>", "Host Docker endpoint when --use-host-docker-runtime is enabled (unix:///<socket-path> or tcp://localhost:<port>).")
+        .option("--thread-git-skills-directory <path>", "Container path where thread git skill repositories are cloned before linking into ~/.codex/skills.")
+        .option("-d, --daemon", "Run in daemon mode and fail fast when no SDK is configured.")
+        .option("--log-level <level>", "Log level (DEBUG, INFO, WARN, ERROR).", "INFO");
+}

package/dist/commands/runner/register-runner-commands.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerRunnerCommands = registerRunnerCommands;
+const start_js_1 = require("./start.js");
+const stop_js_1 = require("./stop.js");
+function registerRunnerCommands(program) {
+    const runnerCommand = program
+        .command("runner")
+        .description("Manage the local CompanyHelm runner daemon.");
+    (0, start_js_1.registerRunnerStartCommand)(runnerCommand);
+    (0, stop_js_1.registerRunnerStopCommand)(runnerCommand);
+}

package/dist/commands/runner/start.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerRunnerStartCommand = registerRunnerStartCommand;
+const root_js_1 = require("../root.js");
+const common_js_1 = require("./common.js");
+function registerRunnerStartCommand(runnerCommand) {
+    (0, common_js_1.addRunnerStartOptions)(runnerCommand
+        .command("start")
+        .description("Start the local CompanyHelm runner daemon.")).action(async (options) => {
+        if (options.daemon && !(0, root_js_1.isInternalDaemonChildProcess)()) {
+            await (0, root_js_1.runDetachedDaemonProcess)(options);
+            return;
+        }
+        try {
+            await (0, root_js_1.runRootCommand)(options, (0, root_js_1.isInternalDaemonChildProcess)()
+                ? {
+                    onDaemonReady: () => {
+                        (0, root_js_1.sendDaemonParentMessage)({ type: "daemon-ready" });
+                    },
+                }
+                : undefined);
+        }
+        catch (error) {
+            if ((0, root_js_1.isInternalDaemonChildProcess)()) {
+                (0, root_js_1.sendDaemonParentMessage)({ type: "daemon-error", message: (0, root_js_1.toErrorMessage)(error) });
+            }
+            throw error;
+        }
+    });
+}

package/dist/commands/runner/stop.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runRunnerStopCommand = runRunnerStopCommand;
+exports.registerRunnerStopCommand = registerRunnerStopCommand;
+const config_js_1 = require("../../config.js");
+const daemon_state_js_1 = require("../../state/daemon_state.js");
+const process_js_1 = require("../../utils/process.js");
+const root_js_1 = require("../root.js");
+const RUNNER_STOP_TIMEOUT_MS = 15000;
+async function waitForProcessExit(pid, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (!(0, process_js_1.isProcessRunning)(pid)) {
+            return true;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    return !(0, process_js_1.isProcessRunning)(pid);
+}
+async function runRunnerStopCommand(options) {
+    const cfg = config_js_1.config.parse({
+        state_db_path: options.stateDbPath,
+    });
+    const state = await (0, daemon_state_js_1.readCurrentDaemonState)(cfg.state_db_path);
+    if (!state?.pid) {
+        console.log("CompanyHelm runner is not running.");
+        return;
+    }
+    if (!(0, process_js_1.isProcessRunning)(state.pid)) {
+        await (0, daemon_state_js_1.clearCurrentDaemonState)(cfg.state_db_path, state.pid);
+        console.log(`CompanyHelm runner was not running. Cleared stale pid ${state.pid}.`);
+        return;
+    }
+    try {
+        process.kill(state.pid, "SIGTERM");
+    }
+    catch (error) {
+        throw new Error(`Failed to stop CompanyHelm runner pid ${state.pid}: ${(0, root_js_1.toErrorMessage)(error)}`);
+    }
+    const stopped = await waitForProcessExit(state.pid, RUNNER_STOP_TIMEOUT_MS);
+    if (!stopped) {
+        throw new Error(`Timed out waiting for CompanyHelm runner pid ${state.pid} to stop.`);
+    }
+    await (0, daemon_state_js_1.clearCurrentDaemonState)(cfg.state_db_path, state.pid);
+    console.log(`CompanyHelm runner stopped (pid ${state.pid}).`);
+}
+function registerRunnerStopCommand(runnerCommand) {
+    runnerCommand
+        .command("stop")
+        .description("Stop the local CompanyHelm runner daemon.")
+        .option("--state-db-path <path>", "State database path override (defaults to ~/.local/share/companyhelm/state.db).")
+        .action(async (options) => {
+        await runRunnerStopCommand(options);
+    });
+}

package/dist/commands/shell.js

@@ -7,6 +7,7 @@ exports.registerShellCommand = registerShellCommand;
 const config_js_1 = require("../config.js");
 const db_js_1 = require("../state/db.js");
 const schema_js_1 = require("../state/schema.js");
+const common_js_1 = require("./runner/common.js");
 const NON_OVERRIDABLE_DAEMON_OPTION_NAMES = new Set(["daemon", "serverUrl", "secret", "help"]);
 function resolveDaemonOptionValue(option, values) {
     const explicit = values[option.name];
@@ -22,7 +23,8 @@ function resolveDaemonOptionValue(option, values) {
     return undefined;
 }
 function getShellConfigurableDaemonOptions(program) {
-    return program.options
+    const runnerStartCommand = (0, common_js_1.addRunnerStartOptions)(program.createCommand("start"));
+    return runnerStartCommand.options
         .filter((option) => {
         if (!option.long || option.hidden) {
             return false;

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@companyhelm/cli",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Run coding agents in fully isolated Docker sandboxes, locally.",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/CompanyHelm/companyhelm-cli"
-  },  "engines": {
+  },
+  "engines": {
     "node": ">=24"
   },
   "bin": {
-    "companyhelm-runner": "dist/cli.js"
+    "companyhelm": "dist/cli.js"
   },
   "files": [
     "dist",