@companyhelm/cli 0.1.2 → 0.1.5

package/dist/core/ui/TerminalRenderer.js

@@ -2,6 +2,8 @@ import chalk from "chalk";
 import figlet from "figlet";
 export class TerminalRenderer {
     useColor;
+    static OSC = "\u001B]";
+    static BEL = "\u0007";
     constructor(useColor = true) {
         this.useColor = useColor;
     }
@@ -14,6 +16,52 @@ export class TerminalRenderer {
     success(message) {
         return `${this.colorize("[ok]", "green")} ${message}`;
     }
+    progress(message) {
+        return this.colorize(`... ${message}`, "cyan");
+    }
+    successHighlight(message) {
+        if (!this.useColor) {
+            return message;
+        }
+        return chalk.green.bold(message);
+    }
+    clickableUrl(url) {
+        if (!this.useColor) {
+            return url;
+        }
+        const display = this.successHighlight(url);
+        return `${TerminalRenderer.OSC}8;;${url}${TerminalRenderer.BEL}${display}${TerminalRenderer.OSC}8;;${TerminalRenderer.BEL}`;
+    }
+    renderStatus(report) {
+        const lines = ["Status"];
+        lines.push(this.renderServiceLine("Postgres", report.services.postgres));
+        lines.push(this.renderServiceLine("API", report.services.api, report.apiUrl));
+        lines.push(this.renderServiceLine("companyhelm-web", report.services.frontend, report.uiUrl));
+        lines.push(this.renderServiceLine("Runner", report.services.runner));
+        if (report.versions) {
+            lines.push(`CompanyHelm CLI: ${report.versions.cliPackage}`);
+            lines.push(`Runner package: ${report.versions.runnerPackage}`);
+            lines.push(`API image: ${report.versions.images.api}`);
+            lines.push(`companyhelm-web image: ${report.versions.images.frontend}`);
+            lines.push(`Postgres image: ${report.versions.images.postgres}`);
+        }
+        if (report.username) {
+            lines.push(`username: ${report.username}`);
+        }
+        return lines.join("\n");
+    }
+    renderServiceLine(label, status, detail) {
+        const statusLabel = status === "running" ? this.success("running") : this.warn("stopped");
+        return detail && status === "running"
+            ? `${label}: ${statusLabel} (${this.formatDetail(detail)})`
+            : `${label}: ${statusLabel}`;
+    }
+    warn(message) {
+        return `${this.colorize("[!]", "yellow")} ${message}`;
+    }
+    formatDetail(detail) {
+        return detail.startsWith("http://") || detail.startsWith("https://") ? this.clickableUrl(detail) : detail;
+    }
     colorize(text, color) {
         if (!this.useColor) {
             return text;

package/dist/templates/docker-compose.yaml.tpl

@@ -5,40 +5,16 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: companyhelm
+{{POSTGRES_PORTS_BLOCK}}
     volumes:
       - companyhelm_postgres_data:/var/lib/postgresql/data
       - "{{SEED_FILE_PATH}}:/run/companyhelm/seed.sql:ro"
     networks:
       - companyhelm
 
-  api:
-    image: {{API_IMAGE}}
-    depends_on:
-      - postgres
-    environment:
-      COMPANYHELM_CONFIG_PATH: /run/companyhelm/config.yaml
-    ports:
-      - "{{API_HTTP_PORT}}:4000"
-      - "{{RUNNER_GRPC_PORT}}:{{RUNNER_GRPC_PORT}}"
-      - "{{AGENT_CLI_GRPC_PORT}}:{{AGENT_CLI_GRPC_PORT}}"
-    volumes:
-      - "{{API_CONFIG_PATH}}:/run/companyhelm/config.yaml:ro"
-    networks:
-      - companyhelm
+{{API_SERVICE_BLOCK}}
 
-  frontend:
-    image: {{FRONTEND_IMAGE}}
-    depends_on:
-      - api
-    environment:
-      COMPANYHELM_CONFIG_PATH: /run/companyhelm/config.yaml
-      PORT: "{{UI_PORT}}"
-    ports:
-      - "{{UI_PORT}}:{{UI_PORT}}"
-    volumes:
-      - "{{FRONTEND_CONFIG_PATH}}:/run/companyhelm/config.yaml:ro"
-    networks:
-      - companyhelm
+{{FRONTEND_SERVICE_BLOCK}}
 
 networks:
   companyhelm:

package/dist/templates/seed.sql.tpl

@@ -5,8 +5,17 @@ VALUES ('{{COMPANY_ID}}', '{{COMPANY_NAME}}')
 ON CONFLICT (id) DO UPDATE
 SET name = EXCLUDED.name;
 
+UPDATE users
+SET first_name = '{{USER_FIRST_NAME}}',
+    last_name = NULL,
+    email = '{{USER_EMAIL}}',
+    auth_provider = 'companyhelm',
+    updated_at = NOW()
+WHERE id = '{{USER_ID}}'
+   OR email = '{{USER_EMAIL}}';
+
 INSERT INTO users (id, first_name, last_name, email, auth_provider, created_at, updated_at)
-VALUES (
+SELECT
   '{{USER_ID}}',
   '{{USER_FIRST_NAME}}',
   NULL,
@@ -14,14 +23,24 @@ VALUES (
   'companyhelm',
   NOW(),
   NOW()
-)
-ON CONFLICT (email) DO UPDATE
-SET first_name = EXCLUDED.first_name,
-    auth_provider = EXCLUDED.auth_provider,
-    updated_at = NOW();
+WHERE NOT EXISTS (
+  SELECT 1
+  FROM users
+  WHERE id = '{{USER_ID}}'
+     OR email = '{{USER_EMAIL}}'
+);
+
+UPDATE user_auths
+SET user_id = '{{USER_ID}}',
+    email = '{{USER_EMAIL}}',
+    password_salt = '{{PASSWORD_SALT}}',
+    password_hash = '{{PASSWORD_HASH}}',
+    updated_at = NOW()
+WHERE user_id = '{{USER_ID}}'
+   OR email = '{{USER_EMAIL}}';
 
 INSERT INTO user_auths (id, user_id, email, password_salt, password_hash, created_at, updated_at)
-VALUES (
+SELECT
   '{{USER_AUTH_ID}}',
   '{{USER_ID}}',
   '{{USER_EMAIL}}',
@@ -29,12 +48,12 @@ VALUES (
   '{{PASSWORD_HASH}}',
   NOW(),
   NOW()
-)
-ON CONFLICT (user_id) DO UPDATE
-SET email = EXCLUDED.email,
-    password_salt = EXCLUDED.password_salt,
-    password_hash = EXCLUDED.password_hash,
-    updated_at = NOW();
+WHERE NOT EXISTS (
+  SELECT 1
+  FROM user_auths
+  WHERE user_id = '{{USER_ID}}'
+     OR email = '{{USER_EMAIL}}'
+);
 
 INSERT INTO company_members (company_id, user_id)
 VALUES ('{{COMPANY_ID}}', '{{USER_ID}}')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companyhelm/cli",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "Bootstrap and manage a local CompanyHelm deployment.",
   "license": "MIT",
   "private": false,
@@ -21,14 +21,18 @@
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json && node scripts/copy-templates.cjs",
+    "set-image-version": "npm run build && node dist/cli.js set-image-version",
+    "start": "npm run build && node dist/cli.js",
     "test": "npm run build && vitest run"
   },
   "dependencies": {
-    "@companyhelm/runner": "^0.0.13",
+    "@clack/prompts": "^1.1.0",
+    "@companyhelm/runner": "^0.1.1",
     "chalk": "^5.6.2",
     "commander": "^14.0.1",
     "dockerode": "^4.0.9",
-    "figlet": "^1.9.4"
+    "figlet": "^1.9.4",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.44",

package/src/templates/docker-compose.yaml.tpl

@@ -5,40 +5,16 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: companyhelm
+{{POSTGRES_PORTS_BLOCK}}
     volumes:
       - companyhelm_postgres_data:/var/lib/postgresql/data
       - "{{SEED_FILE_PATH}}:/run/companyhelm/seed.sql:ro"
     networks:
       - companyhelm
 
-  api:
-    image: {{API_IMAGE}}
-    depends_on:
-      - postgres
-    environment:
-      COMPANYHELM_CONFIG_PATH: /run/companyhelm/config.yaml
-    ports:
-      - "{{API_HTTP_PORT}}:4000"
-      - "{{RUNNER_GRPC_PORT}}:{{RUNNER_GRPC_PORT}}"
-      - "{{AGENT_CLI_GRPC_PORT}}:{{AGENT_CLI_GRPC_PORT}}"
-    volumes:
-      - "{{API_CONFIG_PATH}}:/run/companyhelm/config.yaml:ro"
-    networks:
-      - companyhelm
+{{API_SERVICE_BLOCK}}
 
-  frontend:
-    image: {{FRONTEND_IMAGE}}
-    depends_on:
-      - api
-    environment:
-      COMPANYHELM_CONFIG_PATH: /run/companyhelm/config.yaml
-      PORT: "{{UI_PORT}}"
-    ports:
-      - "{{UI_PORT}}:{{UI_PORT}}"
-    volumes:
-      - "{{FRONTEND_CONFIG_PATH}}:/run/companyhelm/config.yaml:ro"
-    networks:
-      - companyhelm
+{{FRONTEND_SERVICE_BLOCK}}
 
 networks:
   companyhelm:

package/src/templates/seed.sql.tpl

@@ -5,8 +5,17 @@ VALUES ('{{COMPANY_ID}}', '{{COMPANY_NAME}}')
 ON CONFLICT (id) DO UPDATE
 SET name = EXCLUDED.name;
 
+UPDATE users
+SET first_name = '{{USER_FIRST_NAME}}',
+    last_name = NULL,
+    email = '{{USER_EMAIL}}',
+    auth_provider = 'companyhelm',
+    updated_at = NOW()
+WHERE id = '{{USER_ID}}'
+   OR email = '{{USER_EMAIL}}';
+
 INSERT INTO users (id, first_name, last_name, email, auth_provider, created_at, updated_at)
-VALUES (
+SELECT
   '{{USER_ID}}',
   '{{USER_FIRST_NAME}}',
   NULL,
@@ -14,14 +23,24 @@ VALUES (
   'companyhelm',
   NOW(),
   NOW()
-)
-ON CONFLICT (email) DO UPDATE
-SET first_name = EXCLUDED.first_name,
-    auth_provider = EXCLUDED.auth_provider,
-    updated_at = NOW();
+WHERE NOT EXISTS (
+  SELECT 1
+  FROM users
+  WHERE id = '{{USER_ID}}'
+     OR email = '{{USER_EMAIL}}'
+);
+
+UPDATE user_auths
+SET user_id = '{{USER_ID}}',
+    email = '{{USER_EMAIL}}',
+    password_salt = '{{PASSWORD_SALT}}',
+    password_hash = '{{PASSWORD_HASH}}',
+    updated_at = NOW()
+WHERE user_id = '{{USER_ID}}'
+   OR email = '{{USER_EMAIL}}';
 
 INSERT INTO user_auths (id, user_id, email, password_salt, password_hash, created_at, updated_at)
-VALUES (
+SELECT
   '{{USER_AUTH_ID}}',
   '{{USER_ID}}',
   '{{USER_EMAIL}}',
@@ -29,12 +48,12 @@ VALUES (
   '{{PASSWORD_HASH}}',
   NOW(),
   NOW()
-)
-ON CONFLICT (user_id) DO UPDATE
-SET email = EXCLUDED.email,
-    password_salt = EXCLUDED.password_salt,
-    password_hash = EXCLUDED.password_hash,
-    updated_at = NOW();
+WHERE NOT EXISTS (
+  SELECT 1
+  FROM user_auths
+  WHERE user_id = '{{USER_ID}}'
+     OR email = '{{USER_EMAIL}}'
+);
 
 INSERT INTO company_members (company_id, user_id)
 VALUES ('{{COMPANY_ID}}', '{{USER_ID}}')