chatroom-cli 1.0.66 → 1.0.68

package/dist/index.js

@@ -9915,6 +9915,290 @@ var init_auth_logout = __esm(() => {
   init_storage();
 });
 
+// src/infrastructure/machine/types.ts
+var AGENT_HARNESSES, AGENT_HARNESS_COMMANDS, MACHINE_CONFIG_VERSION = "1";
+var init_types = __esm(() => {
+  AGENT_HARNESSES = ["opencode"];
+  AGENT_HARNESS_COMMANDS = {
+    opencode: "opencode"
+  };
+});
+
+// src/infrastructure/machine/detection.ts
+import { execSync } from "node:child_process";
+function commandExists(command) {
+  try {
+    const checkCommand = process.platform === "win32" ? `where ${command}` : `which ${command}`;
+    execSync(checkCommand, { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function parseVersion(versionStr) {
+  const match = versionStr.match(/v?(\d+)\.(\d+)\.(\d+)/);
+  if (!match)
+    return null;
+  const major = parseInt(match[1], 10);
+  const version2 = `${match[1]}.${match[2]}.${match[3]}`;
+  return { version: version2, major };
+}
+function detectHarnessVersion(harness) {
+  const versionCommand = HARNESS_VERSION_COMMANDS[harness];
+  if (!versionCommand)
+    return null;
+  try {
+    const output = execSync(versionCommand, {
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 5000
+    }).toString().trim();
+    return parseVersion(output);
+  } catch {
+    return null;
+  }
+}
+function detectHarnessVersions(harnesses) {
+  const versions = {};
+  for (const harness of harnesses) {
+    const version2 = detectHarnessVersion(harness);
+    if (version2) {
+      versions[harness] = version2;
+    }
+  }
+  return versions;
+}
+function detectAvailableHarnesses() {
+  const available = [];
+  for (const harness of AGENT_HARNESSES) {
+    const command = AGENT_HARNESS_COMMANDS[harness];
+    if (commandExists(command)) {
+      available.push(harness);
+    }
+  }
+  return available;
+}
+var HARNESS_VERSION_COMMANDS;
+var init_detection = __esm(() => {
+  init_types();
+  HARNESS_VERSION_COMMANDS = {
+    opencode: "opencode --version"
+  };
+});
+
+// src/infrastructure/machine/storage.ts
+import { randomUUID } from "node:crypto";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2, renameSync } from "node:fs";
+import { homedir as homedir2, hostname as hostname2 } from "node:os";
+import { join as join3 } from "node:path";
+function ensureConfigDir2() {
+  if (!existsSync2(CHATROOM_DIR2)) {
+    mkdirSync2(CHATROOM_DIR2, { recursive: true, mode: 448 });
+  }
+}
+function getMachineConfigPath() {
+  return join3(CHATROOM_DIR2, MACHINE_FILE);
+}
+function loadConfigFile() {
+  const configPath = getMachineConfigPath();
+  if (!existsSync2(configPath)) {
+    return null;
+  }
+  try {
+    const content = readFileSync3(configPath, "utf-8");
+    return JSON.parse(content);
+  } catch (error) {
+    console.warn(`⚠️  Failed to read machine config at ${configPath}: ${error.message}`);
+    console.warn(`   The machine will re-register with a new identity on next startup.`);
+    console.warn(`   If this is unexpected, check the file for corruption.`);
+    return null;
+  }
+}
+function saveConfigFile(configFile) {
+  ensureConfigDir2();
+  const configPath = getMachineConfigPath();
+  const tempPath = `${configPath}.tmp`;
+  const content = JSON.stringify(configFile, null, 2);
+  writeFileSync2(tempPath, content, { encoding: "utf-8", mode: 384 });
+  renameSync(tempPath, configPath);
+}
+function loadMachineConfig() {
+  const configFile = loadConfigFile();
+  if (!configFile)
+    return null;
+  const convexUrl = getConvexUrl();
+  return configFile.machines[convexUrl] ?? null;
+}
+function saveMachineConfig(config) {
+  const configFile = loadConfigFile() ?? {
+    version: MACHINE_CONFIG_VERSION,
+    machines: {}
+  };
+  const convexUrl = getConvexUrl();
+  configFile.machines[convexUrl] = config;
+  saveConfigFile(configFile);
+}
+function createNewEndpointConfig() {
+  const now = new Date().toISOString();
+  const availableHarnesses = detectAvailableHarnesses();
+  return {
+    machineId: randomUUID(),
+    hostname: hostname2(),
+    os: process.platform,
+    registeredAt: now,
+    lastSyncedAt: now,
+    availableHarnesses,
+    harnessVersions: detectHarnessVersions(availableHarnesses),
+    chatroomAgents: {}
+  };
+}
+function ensureMachineRegistered() {
+  let config = loadMachineConfig();
+  if (!config) {
+    config = createNewEndpointConfig();
+    saveMachineConfig(config);
+  } else {
+    const now = new Date().toISOString();
+    config.availableHarnesses = detectAvailableHarnesses();
+    config.harnessVersions = detectHarnessVersions(config.availableHarnesses);
+    config.lastSyncedAt = now;
+    config.hostname = hostname2();
+    saveMachineConfig(config);
+  }
+  return {
+    machineId: config.machineId,
+    hostname: config.hostname,
+    os: config.os,
+    availableHarnesses: config.availableHarnesses,
+    harnessVersions: config.harnessVersions
+  };
+}
+function getMachineId() {
+  const config = loadMachineConfig();
+  return config?.machineId ?? null;
+}
+function updateAgentContext(chatroomId, role, agentType, workingDir) {
+  const config = loadMachineConfig();
+  if (!config) {
+    throw new Error("Machine not registered. Run ensureMachineRegistered() first.");
+  }
+  const now = new Date().toISOString();
+  if (!config.chatroomAgents[chatroomId]) {
+    config.chatroomAgents[chatroomId] = {};
+  }
+  config.chatroomAgents[chatroomId][role] = {
+    agentType,
+    workingDir,
+    lastStartedAt: now
+  };
+  saveMachineConfig(config);
+}
+function getAgentContext(chatroomId, role) {
+  const config = loadMachineConfig();
+  if (!config) {
+    return null;
+  }
+  return config.chatroomAgents[chatroomId]?.[role] ?? null;
+}
+var CHATROOM_DIR2, MACHINE_FILE = "machine.json";
+var init_storage2 = __esm(() => {
+  init_detection();
+  init_types();
+  init_client2();
+  CHATROOM_DIR2 = join3(homedir2(), ".chatroom");
+});
+
+// src/infrastructure/machine/daemon-state.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3, renameSync as renameSync2 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { join as join4 } from "node:path";
+function agentKey(chatroomId, role) {
+  return `${chatroomId}/${role}`;
+}
+function ensureStateDir() {
+  if (!existsSync3(STATE_DIR)) {
+    mkdirSync3(STATE_DIR, { recursive: true, mode: 448 });
+  }
+}
+function stateFilePath(machineId) {
+  return join4(STATE_DIR, `${machineId}.json`);
+}
+function loadDaemonState(machineId) {
+  const filePath = stateFilePath(machineId);
+  if (!existsSync3(filePath)) {
+    return null;
+  }
+  try {
+    const content = readFileSync4(filePath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+function saveDaemonState(state) {
+  ensureStateDir();
+  const filePath = stateFilePath(state.machineId);
+  const tempPath = `${filePath}.tmp`;
+  const content = JSON.stringify(state, null, 2);
+  writeFileSync3(tempPath, content, { encoding: "utf-8", mode: 384 });
+  renameSync2(tempPath, filePath);
+}
+function loadOrCreate(machineId) {
+  return loadDaemonState(machineId) ?? {
+    version: STATE_VERSION,
+    machineId,
+    updatedAt: new Date().toISOString(),
+    agents: {}
+  };
+}
+function persistAgentPid(machineId, chatroomId, role, pid, harness) {
+  const state = loadOrCreate(machineId);
+  state.agents[agentKey(chatroomId, role)] = {
+    pid,
+    harness,
+    startedAt: new Date().toISOString()
+  };
+  state.updatedAt = new Date().toISOString();
+  saveDaemonState(state);
+}
+function clearAgentPid(machineId, chatroomId, role) {
+  const state = loadDaemonState(machineId);
+  if (!state)
+    return;
+  const key = agentKey(chatroomId, role);
+  if (!(key in state.agents))
+    return;
+  delete state.agents[key];
+  state.updatedAt = new Date().toISOString();
+  saveDaemonState(state);
+}
+function listAgentEntries(machineId) {
+  const state = loadDaemonState(machineId);
+  if (!state)
+    return [];
+  const results = [];
+  for (const [key, entry] of Object.entries(state.agents)) {
+    const separatorIndex = key.lastIndexOf("/");
+    if (separatorIndex === -1)
+      continue;
+    const chatroomId = key.substring(0, separatorIndex);
+    const role = key.substring(separatorIndex + 1);
+    results.push({ chatroomId, role, entry });
+  }
+  return results;
+}
+var CHATROOM_DIR3, STATE_DIR, STATE_VERSION = "1";
+var init_daemon_state = __esm(() => {
+  CHATROOM_DIR3 = join4(homedir3(), ".chatroom");
+  STATE_DIR = join4(CHATROOM_DIR3, "machines", "state");
+});
+
+// src/infrastructure/machine/index.ts
+var init_machine = __esm(() => {
+  init_types();
+  init_storage2();
+  init_daemon_state();
+});
+
 // src/commands/auth-status.ts
 var exports_auth_status = {};
 __export(exports_auth_status, {
@@ -9939,9 +10223,7 @@ ${"═".repeat(50)}`);
   if (authData.deviceName) {
     console.log(`\uD83D\uDCBB Device: ${authData.deviceName}`);
   }
-  if (authData.cliVersion) {
-    console.log(`\uD83D\uDCE6 CLI Version: ${authData.cliVersion}`);
-  }
+  console.log(`\uD83D\uDCE6 CLI Version: ${getVersion()}`);
   console.log(`
 ⏳ Validating session...`);
   try {
@@ -9955,6 +10237,28 @@ ${"═".repeat(50)}`);
       if (validation.userName) {
         console.log(`\uD83D\uDC64 User: ${validation.userName}`);
       }
+      try {
+        const machineInfo = ensureMachineRegistered();
+        await client2.mutation(api.machines.register, {
+          sessionId: authData.sessionId,
+          machineId: machineInfo.machineId,
+          hostname: machineInfo.hostname,
+          os: machineInfo.os,
+          availableHarnesses: machineInfo.availableHarnesses,
+          harnessVersions: machineInfo.harnessVersions,
+          availableModels: []
+        });
+        console.log(`
+\uD83D\uDDA5️  Machine registered: ${machineInfo.hostname}`);
+        console.log(`   ID: ${machineInfo.machineId}`);
+        if (machineInfo.availableHarnesses.length > 0) {
+          console.log(`   Harnesses: ${machineInfo.availableHarnesses.join(", ")}`);
+        }
+      } catch (machineError) {
+        const err = machineError;
+        console.log(`
+⚠️  Machine registration skipped: ${err.message}`);
+      }
     } else {
       console.log(`
 ❌ Session is invalid: ${validation.reason}`);
@@ -9972,6 +10276,8 @@ var init_auth_status = __esm(() => {
   init_api3();
   init_storage();
   init_client2();
+  init_machine();
+  init_version();
 });
 
 // src/commands/update.ts
@@ -10273,19 +10579,10 @@ class ProcessDriver {
     return [];
   }
 }
-var init_process_driver = () => {};
-
-// src/infrastructure/machine/types.ts
-var AGENT_HARNESSES, AGENT_HARNESS_COMMANDS, MACHINE_CONFIG_VERSION = "1";
-var init_types = __esm(() => {
-  AGENT_HARNESSES = ["opencode"];
-  AGENT_HARNESS_COMMANDS = {
-    opencode: "opencode"
-  };
-});
+var init_process_driver = () => {};
 
 // src/infrastructure/agent-drivers/opencode-process-driver.ts
-import { execSync } from "node:child_process";
+import { execSync as execSync2 } from "node:child_process";
 var OpenCodeProcessDriver;
 var init_opencode_process_driver = __esm(() => {
   init_process_driver();
@@ -10318,7 +10615,7 @@ var init_opencode_process_driver = __esm(() => {
     }
     async listModels() {
       try {
-        const output = execSync("opencode models", {
+        const output = execSync2("opencode models", {
           stdio: ["pipe", "pipe", "pipe"],
           timeout: 1e4
         }).toString().trim();
@@ -10375,281 +10672,6 @@ var init_agent_drivers = __esm(() => {
   init_opencode_process_driver();
 });
 
-// src/infrastructure/machine/detection.ts
-import { execSync as execSync2 } from "node:child_process";
-function commandExists(command) {
-  try {
-    const checkCommand = process.platform === "win32" ? `where ${command}` : `which ${command}`;
-    execSync2(checkCommand, { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function parseVersion(versionStr) {
-  const match = versionStr.match(/v?(\d+)\.(\d+)\.(\d+)/);
-  if (!match)
-    return null;
-  const major = parseInt(match[1], 10);
-  const version2 = `${match[1]}.${match[2]}.${match[3]}`;
-  return { version: version2, major };
-}
-function detectHarnessVersion(harness) {
-  const versionCommand = HARNESS_VERSION_COMMANDS[harness];
-  if (!versionCommand)
-    return null;
-  try {
-    const output = execSync2(versionCommand, {
-      stdio: ["pipe", "pipe", "pipe"],
-      timeout: 5000
-    }).toString().trim();
-    return parseVersion(output);
-  } catch {
-    return null;
-  }
-}
-function detectHarnessVersions(harnesses) {
-  const versions = {};
-  for (const harness of harnesses) {
-    const version2 = detectHarnessVersion(harness);
-    if (version2) {
-      versions[harness] = version2;
-    }
-  }
-  return versions;
-}
-function detectAvailableHarnesses() {
-  const available = [];
-  for (const harness of AGENT_HARNESSES) {
-    const command = AGENT_HARNESS_COMMANDS[harness];
-    if (commandExists(command)) {
-      available.push(harness);
-    }
-  }
-  return available;
-}
-var HARNESS_VERSION_COMMANDS;
-var init_detection = __esm(() => {
-  init_types();
-  HARNESS_VERSION_COMMANDS = {
-    opencode: "opencode --version"
-  };
-});
-
-// src/infrastructure/machine/storage.ts
-import { randomUUID } from "node:crypto";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2, renameSync } from "node:fs";
-import { homedir as homedir2, hostname as hostname2 } from "node:os";
-import { join as join3 } from "node:path";
-function ensureConfigDir2() {
-  if (!existsSync2(CHATROOM_DIR2)) {
-    mkdirSync2(CHATROOM_DIR2, { recursive: true, mode: 448 });
-  }
-}
-function getMachineConfigPath() {
-  return join3(CHATROOM_DIR2, MACHINE_FILE);
-}
-function loadConfigFile() {
-  const configPath = getMachineConfigPath();
-  if (!existsSync2(configPath)) {
-    return null;
-  }
-  try {
-    const content = readFileSync3(configPath, "utf-8");
-    return JSON.parse(content);
-  } catch (error) {
-    console.warn(`⚠️  Failed to read machine config at ${configPath}: ${error.message}`);
-    console.warn(`   The machine will re-register with a new identity on next startup.`);
-    console.warn(`   If this is unexpected, check the file for corruption.`);
-    return null;
-  }
-}
-function saveConfigFile(configFile) {
-  ensureConfigDir2();
-  const configPath = getMachineConfigPath();
-  const tempPath = `${configPath}.tmp`;
-  const content = JSON.stringify(configFile, null, 2);
-  writeFileSync2(tempPath, content, { encoding: "utf-8", mode: 384 });
-  renameSync(tempPath, configPath);
-}
-function loadMachineConfig() {
-  const configFile = loadConfigFile();
-  if (!configFile)
-    return null;
-  const convexUrl = getConvexUrl();
-  return configFile.machines[convexUrl] ?? null;
-}
-function saveMachineConfig(config3) {
-  const configFile = loadConfigFile() ?? {
-    version: MACHINE_CONFIG_VERSION,
-    machines: {}
-  };
-  const convexUrl = getConvexUrl();
-  configFile.machines[convexUrl] = config3;
-  saveConfigFile(configFile);
-}
-function createNewEndpointConfig() {
-  const now = new Date().toISOString();
-  const availableHarnesses = detectAvailableHarnesses();
-  return {
-    machineId: randomUUID(),
-    hostname: hostname2(),
-    os: process.platform,
-    registeredAt: now,
-    lastSyncedAt: now,
-    availableHarnesses,
-    harnessVersions: detectHarnessVersions(availableHarnesses),
-    chatroomAgents: {}
-  };
-}
-function ensureMachineRegistered() {
-  let config3 = loadMachineConfig();
-  if (!config3) {
-    config3 = createNewEndpointConfig();
-    saveMachineConfig(config3);
-  } else {
-    const now = new Date().toISOString();
-    config3.availableHarnesses = detectAvailableHarnesses();
-    config3.harnessVersions = detectHarnessVersions(config3.availableHarnesses);
-    config3.lastSyncedAt = now;
-    config3.hostname = hostname2();
-    saveMachineConfig(config3);
-  }
-  return {
-    machineId: config3.machineId,
-    hostname: config3.hostname,
-    os: config3.os,
-    availableHarnesses: config3.availableHarnesses,
-    harnessVersions: config3.harnessVersions
-  };
-}
-function getMachineId() {
-  const config3 = loadMachineConfig();
-  return config3?.machineId ?? null;
-}
-function updateAgentContext(chatroomId, role, agentType, workingDir) {
-  const config3 = loadMachineConfig();
-  if (!config3) {
-    throw new Error("Machine not registered. Run ensureMachineRegistered() first.");
-  }
-  const now = new Date().toISOString();
-  if (!config3.chatroomAgents[chatroomId]) {
-    config3.chatroomAgents[chatroomId] = {};
-  }
-  config3.chatroomAgents[chatroomId][role] = {
-    agentType,
-    workingDir,
-    lastStartedAt: now
-  };
-  saveMachineConfig(config3);
-}
-function getAgentContext(chatroomId, role) {
-  const config3 = loadMachineConfig();
-  if (!config3) {
-    return null;
-  }
-  return config3.chatroomAgents[chatroomId]?.[role] ?? null;
-}
-var CHATROOM_DIR2, MACHINE_FILE = "machine.json";
-var init_storage2 = __esm(() => {
-  init_detection();
-  init_types();
-  init_client2();
-  CHATROOM_DIR2 = join3(homedir2(), ".chatroom");
-});
-
-// src/infrastructure/machine/daemon-state.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3, renameSync as renameSync2 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
-import { join as join4 } from "node:path";
-function agentKey(chatroomId, role) {
-  return `${chatroomId}/${role}`;
-}
-function ensureStateDir() {
-  if (!existsSync3(STATE_DIR)) {
-    mkdirSync3(STATE_DIR, { recursive: true, mode: 448 });
-  }
-}
-function stateFilePath(machineId) {
-  return join4(STATE_DIR, `${machineId}.json`);
-}
-function loadDaemonState(machineId) {
-  const filePath = stateFilePath(machineId);
-  if (!existsSync3(filePath)) {
-    return null;
-  }
-  try {
-    const content = readFileSync4(filePath, "utf-8");
-    return JSON.parse(content);
-  } catch {
-    return null;
-  }
-}
-function saveDaemonState(state) {
-  ensureStateDir();
-  const filePath = stateFilePath(state.machineId);
-  const tempPath = `${filePath}.tmp`;
-  const content = JSON.stringify(state, null, 2);
-  writeFileSync3(tempPath, content, { encoding: "utf-8", mode: 384 });
-  renameSync2(tempPath, filePath);
-}
-function loadOrCreate(machineId) {
-  return loadDaemonState(machineId) ?? {
-    version: STATE_VERSION,
-    machineId,
-    updatedAt: new Date().toISOString(),
-    agents: {}
-  };
-}
-function persistAgentPid(machineId, chatroomId, role, pid, harness) {
-  const state = loadOrCreate(machineId);
-  state.agents[agentKey(chatroomId, role)] = {
-    pid,
-    harness,
-    startedAt: new Date().toISOString()
-  };
-  state.updatedAt = new Date().toISOString();
-  saveDaemonState(state);
-}
-function clearAgentPid(machineId, chatroomId, role) {
-  const state = loadDaemonState(machineId);
-  if (!state)
-    return;
-  const key = agentKey(chatroomId, role);
-  if (!(key in state.agents))
-    return;
-  delete state.agents[key];
-  state.updatedAt = new Date().toISOString();
-  saveDaemonState(state);
-}
-function listAgentEntries(machineId) {
-  const state = loadDaemonState(machineId);
-  if (!state)
-    return [];
-  const results = [];
-  for (const [key, entry] of Object.entries(state.agents)) {
-    const separatorIndex = key.lastIndexOf("/");
-    if (separatorIndex === -1)
-      continue;
-    const chatroomId = key.substring(0, separatorIndex);
-    const role = key.substring(separatorIndex + 1);
-    results.push({ chatroomId, role, entry });
-  }
-  return results;
-}
-var CHATROOM_DIR3, STATE_DIR, STATE_VERSION = "1";
-var init_daemon_state = __esm(() => {
-  CHATROOM_DIR3 = join4(homedir3(), ".chatroom");
-  STATE_DIR = join4(CHATROOM_DIR3, "machines", "state");
-});
-
-// src/infrastructure/machine/index.ts
-var init_machine = __esm(() => {
-  init_types();
-  init_storage2();
-  init_daemon_state();
-});
-
 // src/commands/wait-for-task.ts
 var exports_wait_for_task = {};
 __export(exports_wait_for_task, {
@@ -12548,16 +12570,24 @@ var init_artifact = __esm(() => {
 });
 
 // src/commands/machine/pid.ts
+import { createHash } from "node:crypto";
 import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, mkdirSync as mkdirSync4 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { join as join5 } from "node:path";
+function getUrlHash() {
+  const url = getConvexUrl();
+  return createHash("sha256").update(url).digest("hex").substring(0, 8);
+}
+function getPidFileName() {
+  return `daemon-${getUrlHash()}.pid`;
+}
 function ensureChatroomDir() {
   if (!existsSync4(CHATROOM_DIR4)) {
     mkdirSync4(CHATROOM_DIR4, { recursive: true, mode: 448 });
   }
 }
 function getPidFilePath() {
-  return join5(CHATROOM_DIR4, PID_FILE);
+  return join5(CHATROOM_DIR4, getPidFileName());
 }
 function isProcessRunning(pid) {
   try {
@@ -12610,7 +12640,7 @@ function isDaemonRunning() {
 function acquireLock() {
   const { running, pid } = isDaemonRunning();
   if (running) {
-    console.error(`❌ Daemon already running (PID: ${pid})`);
+    console.error(`❌ Daemon already running for ${getConvexUrl()} (PID: ${pid})`);
     return false;
   }
   writePid();
@@ -12619,8 +12649,9 @@ function acquireLock() {
 function releaseLock() {
   removePid();
 }
-var CHATROOM_DIR4, PID_FILE = "daemon.pid";
+var CHATROOM_DIR4;
 var init_pid = __esm(() => {
+  init_client2();
   CHATROOM_DIR4 = join5(homedir4(), ".chatroom");
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatroom-cli",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "CLI for multi-agent chatroom collaboration",
   "type": "module",
   "bin": {