fix: handle commandcode install states

Author: yelixir-dev

install.sh

@@ -182,6 +182,90 @@ generate_key() {
   fi
 }
 
+commandcode_bin() {
+  if command -v cmd >/dev/null 2>&1; then
+    command -v cmd
+    return 0
+  fi
+  if command -v command-code >/dev/null 2>&1; then
+    command -v command-code
+    return 0
+  fi
+  return 1
+}
+
+confirm_default_yes() {
+  local prompt="$1"
+  [ "$ASSUME_YES" -eq 0 ] || return 0
+  [ -t 0 ] || return 0
+  printf '%s [Y/n]: ' "$prompt"
+  read -r answer || true
+  case "${answer:-}" in
+    ""|y|Y|yes|YES) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+ensure_commandcode_cli() {
+  if commandcode_bin >/dev/null 2>&1; then
+    log "Command Code CLI found: $(commandcode_bin)"
+    return 0
+  fi
+
+  if confirm_default_yes "Command Code CLI가 없습니다. npm i -g command-code 후 계속 진행할까요?"; then
+    log "Installing Command Code CLI with npm."
+    npm install -g command-code
+  else
+    fail "Command Code CLI가 필요합니다. 'npm i -g command-code' 후 'cmd login'을 완료하고 다시 설치를 실행하세요."
+  fi
+
+  commandcode_bin >/dev/null 2>&1 || fail "Command Code CLI install finished but 'cmd' was not found on PATH. Add npm global bin to PATH and retry."
+}
+
+extract_commandcode_api_key() {
+  local auth_file="$HOME/.commandcode/auth.json"
+  [ -f "$auth_file" ] || return 1
+  node -e '
+const fs = require("fs");
+const file = process.argv[1];
+const data = JSON.parse(fs.readFileSync(file, "utf8"));
+function stringValue(value) {
+  if (typeof value !== "string") return undefined;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function walk(value) {
+  const scalar = stringValue(value);
+  if (scalar) return scalar;
+  if (!value || typeof value !== "object") return undefined;
+  for (const key of ["apiKey", "api_key", "access", "accessToken", "token", "key", "commandcode", "commandCode", "command_code", "auth", "credentials", "oauth", "account"]) {
+    const found = walk(value[key]);
+    if (found) return found;
+  }
+  return undefined;
+}
+const key = walk(data);
+if (!key) process.exit(1);
+process.stdout.write(key);
+' "$auth_file"
+}
+
+DETECTED_COMMANDCODE_API_KEY=""
+ensure_commandcode_auth() {
+  ensure_commandcode_cli
+  DETECTED_COMMANDCODE_API_KEY="$(extract_commandcode_api_key 2>/dev/null || true)"
+  if [ -n "$DETECTED_COMMANDCODE_API_KEY" ]; then
+    if [ -z "$COMMANDCODE_API_KEY" ]; then
+      COMMANDCODE_API_KEY="$DETECTED_COMMANDCODE_API_KEY"
+      log "기존 Command Code 인증 키를 브릿지 key1로 가져왔습니다."
+    else
+      log "Command Code 인증은 확인됐고, 입력한 COMMANDCODE_API_KEY를 우선 사용합니다."
+    fi
+  else
+    log "Command Code CLI는 설치되어 있지만 인증 키가 없습니다. 설치 후 'cmd login'을 실행하고 브릿지를 재시작하세요."
+  fi
+}
+
 require_command() {
   command -v "$1" >/dev/null 2>&1 || fail "required command not found: $1"
 }
@@ -216,6 +300,7 @@ validate_env_value COMMANDCODE_API_KEY "$COMMANDCODE_API_KEY"
 require_command node
 require_command npm
 require_command systemctl
+ensure_commandcode_auth
 
 NODE_MAJOR="$(node -p "Number(process.versions.node.split('.')[0])")"
 if [ "$NODE_MAJOR" -lt 20 ]; then

src/model-catalog.ts

@@ -18,7 +18,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "deepseek",
     aliases: ["deepseek-v4-pro", "commandcode/deepseek-v4-pro"],
     enabledByDefault: true,
-    notes: "Stable baseline model.",
+    notes: "CommandCode OSS credits · exact model rate from CommandCode billing",
   },
   {
     id: "deepseek/deepseek-v4-flash",
@@ -27,7 +27,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "deepseek",
     aliases: ["deepseek-v4-flash", "commandcode/deepseek-v4-flash"],
     enabledByDefault: true,
-    notes: "Cheap load-test model; 8-way parallel smoke was healthy, so 4 per key is recommended.",
+    notes: "CommandCode OSS credits · exact model rate from CommandCode billing",
   },
   {
     id: "MiniMaxAI/MiniMax-M2.7",
@@ -36,6 +36,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "minimax",
     aliases: ["minimax-m2.7", "MiniMax-M2.7"],
     enabledByDefault: true,
+    notes: "CommandCode OSS credits · exact model rate from CommandCode billing",
   },
   {
     id: "Qwen/Qwen3.6-Plus",
@@ -44,6 +45,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "qwen",
     aliases: ["qwen3.6-plus", "Qwen3.6-Plus"],
     enabledByDefault: true,
+    notes: "CommandCode OSS credits · exact model rate from CommandCode billing",
   },
   {
     id: "zai-org/GLM-5.1",
@@ -52,6 +54,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "glm",
     aliases: ["glm-5.1", "GLM-5.1"],
     enabledByDefault: true,
+    notes: "CommandCode OSS credits · exact model rate from CommandCode billing",
   },
   {
     id: "moonshotai/Kimi-K2.6",
@@ -60,6 +63,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "kimi",
     aliases: ["kimi-k2.6", "Kimi-K2.6"],
     enabledByDefault: true,
+    notes: "CommandCode OSS credits · exact model rate from CommandCode billing",
   },
   {
     id: "openai/gpt-5.5",
@@ -68,7 +72,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "gpt",
     aliases: ["gpt-5.5", "GPT-5.5"],
     enabledByDefault: false,
-    notes: "Prepared in the bridge catalog; disabled until explicitly enabled.",
+    notes: "CommandCode: $5/M in · $30/M out",
   },
   {
     id: "anthropic/claude-opus-4.7",
@@ -77,7 +81,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "claude",
     aliases: ["claude-opus-4.7", "opus-4.7"],
     enabledByDefault: false,
-    notes: "Prepared in the bridge catalog; disabled until explicitly enabled.",
+    notes: "CommandCode: $5/M in · $25/M out · cache hit $0.5/M",
   },
   {
     id: "anthropic/claude-sonnet-4.6",
@@ -86,7 +90,7 @@ export const COMMANDCODE_MODEL_DEFINITIONS: CommandCodeModelDefinition[] = [
     family: "claude",
     aliases: ["claude-sonnet-4.6", "sonnet-4.6"],
     enabledByDefault: false,
-    notes: "Prepared in the bridge catalog; disabled until explicitly enabled.",
+    notes: "CommandCode: $3/M in · $15/M out · cache hit $0.3/M",
   },
 ];
 

tests/config.test.ts

@@ -8,6 +8,16 @@ describe("configuration and model aliases", () => {
     expect(config.defaultModel).toBe("deepseek/deepseek-v4-pro");
   });
 
+  it("shows CommandCode pricing instead of descriptive model notes", () => {
+    const config = loadBridgeConfig({ env: {} });
+    expect(config.modelCatalog?.find((model) => model.id === "openai/gpt-5.5")?.notes).toBe(
+      "CommandCode: $5/M in · $30/M out",
+    );
+    expect(
+      config.modelCatalog?.find((model) => model.id === "deepseek/deepseek-v4-pro")?.notes,
+    ).toContain("CommandCode OSS credits");
+  });
+
   it("keeps balance alerts off by default while failing closed on empty length responses", () => {
     const config = loadBridgeConfig({ env: {} });
     expect(config.balanceAlerts.enabled).toBe(false);

tests/install-scripts.test.ts

@@ -39,6 +39,9 @@ describe("installer scripts", () => {
     expect(script).toContain("sk-cmdbridge-");
     expect(script).toContain("randomBytes(3)");
     expect(script).toContain("read -rs key_input");
+    expect(script).toContain("ensure_commandcode_cli");
+    expect(script).toContain("extract_commandcode_api_key");
+    expect(script).toContain('COMMANDCODE_API_KEY="$DETECTED_COMMANDCODE_API_KEY"');
     expect(script).toContain("refusing unexpected INSTALL_DIR");
   });