@companyhelm/cli 0.0.6 → 0.0.8

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,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toErrorMessage = toErrorMessage;
 exports.isRetryableApiConnectionError = isRetryableApiConnectionError;
 exports.formatApiConnectionFailureMessage = formatApiConnectionFailureMessage;
 exports.formatApiConnectionFailureDiagnostics = formatApiConnectionFailureDiagnostics;
@@ -42,9 +43,11 @@ 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");
@@ -1464,10 +1467,11 @@ async function hasConfiguredSdks(cfg) {
         client.close();
     }
 }
-async function clearSdkModels(cfg, sdkName) {
+async function countSdkModels(cfg, sdkName) {
     const { db, client } = await (0, db_js_1.initDb)(cfg.state_db_path);
     try {
-        await db.delete(schema_js_1.llmModels).where((0, drizzle_orm_1.eq)(schema_js_1.llmModels.sdkName, sdkName));
+        const models = await db.select({ name: schema_js_1.llmModels.name }).from(schema_js_1.llmModels).where((0, drizzle_orm_1.eq)(schema_js_1.llmModels.sdkName, sdkName)).all();
+        return models.length;
     }
     finally {
         client.close();
@@ -1480,9 +1484,12 @@ async function refreshCodexModelsForRegistration(cfg, logger) {
         logger.info(`Refreshed Codex models from container app-server (${modelCount} models).`);
     }
     catch (error) {
-        logger.warn(`Failed to refresh Codex models from container app-server: ${toErrorMessage(error)}. ` +
-            "Registering runner with an empty Codex model list.");
-        await clearSdkModels(cfg, "codex");
+        const cachedModelCount = await countSdkModels(cfg, "codex");
+        const failureMessage = (0, refresh_models_js_1.formatSdkModelRefreshFailure)("codex", error);
+        if (cachedModelCount === 0) {
+            throw new Error(`${failureMessage} Runner startup aborted because no cached Codex models are available; refusing to register zero models.`);
+        }
+        logger.warn(`${failureMessage} Using ${cachedModelCount} cached Codex model(s) from local state instead of registering zero models.`);
     }
 }
 async function resolveThreadAuthMode(cfg) {
@@ -2361,38 +2368,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/sdk/refresh-models.js

@@ -4,7 +4,14 @@ exports.runSdkRefreshModelsCommand = runSdkRefreshModelsCommand;
 exports.registerSdkRefreshModelsCommand = registerSdkRefreshModelsCommand;
 const refresh_models_js_1 = require("../../service/sdk/refresh_models.js");
 async function runSdkRefreshModelsCommand(options) {
-    const results = await (0, refresh_models_js_1.refreshSdkModels)({ sdk: options.sdk });
+    let results;
+    try {
+        results = await (0, refresh_models_js_1.refreshSdkModels)({ sdk: options.sdk });
+    }
+    catch (error) {
+        const sdkName = options.sdk ?? "configured";
+        throw new Error((0, refresh_models_js_1.formatSdkModelRefreshFailure)(sdkName, error));
+    }
     for (const result of results) {
         console.log(`Refreshed ${result.modelCount} models for SDK '${result.sdk}'.`);
     }

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/dist/service/docker/app_server_container.js

@@ -56,12 +56,46 @@ class AppServerContainerService {
         this.child = null;
         this.containerName = null;
         this.running = false;
+        this.recentStderrLines = [];
+        this.lastExitCode = null;
+        this.lastExitSignal = null;
         this.docker = options?.docker ?? new dockerode_1.default();
         this.imageStatusReporter = options?.imageStatusReporter;
     }
     reportImageStatus(message) {
         this.imageStatusReporter?.(message);
     }
+    recordStderr(chunk) {
+        const lines = chunk
+            .split(/\r?\n/)
+            .map((line) => line.trim())
+            .filter((line) => line.length > 0);
+        if (lines.length === 0) {
+            return;
+        }
+        this.recentStderrLines.push(...lines);
+        if (this.recentStderrLines.length > 8) {
+            this.recentStderrLines.splice(0, this.recentStderrLines.length - 8);
+        }
+    }
+    buildContainerStoppedErrorMessage() {
+        const details = [];
+        if (this.containerName) {
+            details.push(`container ${this.containerName}`);
+        }
+        if (this.lastExitCode !== null) {
+            details.push(`exit code ${this.lastExitCode}`);
+        }
+        else if (this.lastExitSignal) {
+            details.push(`signal ${this.lastExitSignal}`);
+        }
+        if (this.recentStderrLines.length > 0) {
+            details.push(`stderr: ${this.recentStderrLines.join(" | ")}`);
+        }
+        return details.length > 0
+            ? `App server container is not running (${details.join(", ")})`
+            : "App server container is not running";
+    }
     static isImageNotFound(error) {
         if (typeof error !== "object" || error === null) {
             return false;
@@ -159,6 +193,9 @@ class AppServerContainerService {
         if (this.running) {
             throw new Error("App server container is already running");
         }
+        this.recentStderrLines = [];
+        this.lastExitCode = null;
+        this.lastExitSignal = null;
         const cfg = config_js_1.config.parse({});
         await this.ensureImageAvailable(cfg.runtime_image);
         const { db, client } = await (0, db_js_1.initDb)(cfg.state_db_path);
@@ -218,15 +255,27 @@ class AppServerContainerService {
             this.messageQueue.push({ type: "stdout", payload: chunk });
         });
         child.stderr.on("data", (chunk) => {
-            this.messageQueue.push({ type: "stderr", payload: chunk.toString("utf8") });
+            const payload = chunk.toString("utf8");
+            this.recordStderr(payload);
+            this.messageQueue.push({ type: "stderr", payload });
         });
         child.on("error", (err) => {
+            this.recordStderr(err.message);
             this.messageQueue.push({ type: "error", reason: `docker process error: ${err.message}` });
             this.running = false;
             this.messageQueue.close();
         });
-        child.on("exit", () => {
+        child.on("exit", (code, signal) => {
+            const wasRunning = this.running;
+            this.lastExitCode = code;
+            this.lastExitSignal = signal;
             this.running = false;
+            if (wasRunning) {
+                this.messageQueue.push({
+                    type: "error",
+                    reason: this.buildContainerStoppedErrorMessage(),
+                });
+            }
             this.messageQueue.close();
         });
         this.child = child;
@@ -253,7 +302,7 @@ class AppServerContainerService {
     }
     async sendRaw(payload) {
         if (!this.running || !this.child || !this.child.stdin) {
-            throw new Error("App server container is not running");
+            throw new Error(this.buildContainerStoppedErrorMessage());
         }
         this.child.stdin.write(payload);
     }

package/dist/service/sdk/refresh_models.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatSdkModelRefreshFailure = formatSdkModelRefreshFailure;
 exports.refreshSdkModels = refreshSdkModels;
 const drizzle_orm_1 = require("drizzle-orm");
 const config_js_1 = require("../../config.js");
@@ -7,6 +8,13 @@ const db_js_1 = require("../../state/db.js");
 const schema_js_1 = require("../../state/schema.js");
 const app_server_js_1 = require("../app_server.js");
 const app_server_container_js_1 = require("../docker/app_server_container.js");
+function toErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function formatSdkModelRefreshFailure(sdk, error) {
+    return (`Failed to refresh ${sdk} models from the local Codex app-server: ${toErrorMessage(error)}. ` +
+        "Verify the runner image can start Codex app-server with valid auth, then retry.");
+}
 async function fetchCodexModelsFromAppServer(clientName, logger, imageStatusReporter) {
     const transport = new app_server_container_js_1.AppServerContainerService({ imageStatusReporter });
     const appServer = new app_server_js_1.AppServerService(transport, clientName, logger);

package/dist/templates/app_server_bootstrap.sh.j2

@@ -6,6 +6,12 @@ AGENT_UID={{ agent_uid }}
 AGENT_GID={{ agent_gid }}
 CODEX_AUTH_PATH={{ codex_auth_path }}
 APP_SERVER_COMMAND={{ app_server_command }}
+EXISTING_UID_USER=""
+
+if getent passwd "$AGENT_UID" >/dev/null 2>&1; then
+  EXISTING_UID_USER="$(getent passwd "$AGENT_UID" | cut -d: -f1)"
+  AGENT_USER="$EXISTING_UID_USER"
+fi
 
 AGENT_GROUP="$AGENT_USER"
 if getent group "$AGENT_GID" >/dev/null 2>&1; then
@@ -19,7 +25,7 @@ else
 fi
 
 if id -u "$AGENT_USER" >/dev/null 2>&1; then
-  usermod -u "$AGENT_UID" -g "$AGENT_GROUP" -d "$AGENT_HOME" "$AGENT_USER" || true
+  usermod -u "$AGENT_UID" -g "$AGENT_GROUP" -d "$AGENT_HOME" -s /bin/bash "$AGENT_USER" || true
 else
   useradd -m -d "$AGENT_HOME" -u "$AGENT_UID" -g "$AGENT_GROUP" -s /bin/bash "$AGENT_USER"
 fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companyhelm/cli",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Run coding agents in fully isolated Docker sandboxes, locally.",
   "license": "Apache-2.0",
   "repository": {