zam-core 0.10.11 → 0.11.0

package/dist/cli/app.js

@@ -810,6 +810,14 @@ import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as rea
 import { createRequire } from "module";
 import { homedir as homedir2 } from "os";
 import { dirname as dirname2, join as join2 } from "path";
+function require2(id) {
+  if (!nodeRequire) {
+    nodeRequire = createRequire(
+      typeof __filename === "string" ? __filename : import.meta.url
+    );
+  }
+  return nodeRequire(id);
+}
 function isRemoteDatabasePath(dbPath) {
   return /^(libsql|https?|wss?):\/\//i.test(dbPath);
 }
@@ -1133,7 +1141,7 @@ async function runMigrations(db) {
     );
   }
 }
-var DEFAULT_DB_DIR, DEFAULT_DB_PATH, require2, TRANSIENT_REMOTE_ERROR_PATTERNS;
+var DEFAULT_DB_DIR, DEFAULT_DB_PATH, nodeRequire, TRANSIENT_REMOTE_ERROR_PATTERNS;
 var init_connection = __esm({
   "src/kernel/db/connection.ts"() {
     "use strict";
@@ -1143,7 +1151,6 @@ var init_connection = __esm({
     init_sync_adapter();
     DEFAULT_DB_DIR = join2(homedir2(), ".zam");
     DEFAULT_DB_PATH = join2(DEFAULT_DB_DIR, "zam.db");
-    require2 = createRequire(import.meta.url);
     TRANSIENT_REMOTE_ERROR_PATTERNS = [
       /status=5\d\d/i,
       /websocket/i,
@@ -5976,7 +5983,14 @@ var init_i18n = __esm({
 });
 
 // src/kernel/system/install-config.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync7, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
+import {
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync7,
+  readFileSync as readFileSync8,
+  renameSync,
+  unlinkSync,
+  writeFileSync as writeFileSync5
+} from "fs";
 import { homedir as homedir6 } from "os";
 import { dirname as dirname4, join as join9 } from "path";
 import { ulid as ulid9 } from "ulid";
@@ -6004,8 +6018,19 @@ function loadInstallConfig(path = defaultConfigPath()) {
 function saveInstallConfig(config, path = defaultConfigPath()) {
   const dir = dirname4(path);
   if (!existsSync8(dir)) mkdirSync7(dir, { recursive: true });
-  writeFileSync5(path, `${JSON.stringify(config, null, 2)}
+  const tempPath = join9(dir, `.config-${process.pid}-${Date.now()}.tmp`);
+  writeFileSync5(tempPath, `${JSON.stringify(config, null, 2)}
 `, "utf-8");
+  try {
+    renameSync(tempPath, path);
+  } catch (error) {
+    try {
+      unlinkSync(path);
+      renameSync(tempPath, path);
+    } catch {
+      throw error;
+    }
+  }
 }
 function getInstallMode(path = defaultConfigPath()) {
   return loadInstallConfig(path).mode ?? "developer";
@@ -6143,6 +6168,105 @@ function setAgentConnectAutoDone(done, path = defaultConfigPath()) {
   }
   saveInstallConfig(config, path);
 }
+function getMachineCompanionConfig(path = defaultConfigPath()) {
+  const raw = loadInstallConfig(path).companion;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
+  const result = {};
+  if (typeof raw.selectedUserId === "string") {
+    result.selectedUserId = raw.selectedUserId;
+  }
+  if (typeof raw.selectedEvaluatorId === "string") {
+    result.selectedEvaluatorId = raw.selectedEvaluatorId;
+  }
+  if (typeof raw.selectedVscodeModelId === "string") {
+    result.selectedVscodeModelId = raw.selectedVscodeModelId;
+  }
+  if (raw.collapsed && typeof raw.collapsed === "object" && !Array.isArray(raw.collapsed)) {
+    const collapsed = {};
+    for (const [surface, value] of Object.entries(raw.collapsed)) {
+      if (typeof value === "boolean") collapsed[surface] = value;
+    }
+    result.collapsed = collapsed;
+  }
+  return result;
+}
+function saveMachineCompanionConfig(companion, path = defaultConfigPath()) {
+  const config = loadInstallConfig(path);
+  config.companion = companion;
+  saveInstallConfig(config, path);
+}
+function updateMachineCompanionConfig(update, path = defaultConfigPath()) {
+  const companion = getMachineCompanionConfig(path);
+  if ("selectedUserId" in update) {
+    if (update.selectedUserId) {
+      companion.selectedUserId = update.selectedUserId;
+    } else {
+      delete companion.selectedUserId;
+    }
+  }
+  if ("selectedEvaluatorId" in update) {
+    if (update.selectedEvaluatorId) {
+      companion.selectedEvaluatorId = update.selectedEvaluatorId;
+    } else {
+      delete companion.selectedEvaluatorId;
+    }
+  }
+  if (update.collapsed) {
+    companion.collapsed = {
+      ...companion.collapsed ?? {},
+      [update.collapsed.surface]: update.collapsed.value
+    };
+  }
+  saveMachineCompanionConfig(companion, path);
+  return companion;
+}
+function getCompanionSelectedUserId(path = defaultConfigPath()) {
+  return getMachineCompanionConfig(path).selectedUserId;
+}
+function setCompanionSelectedUserId(userId, path = defaultConfigPath()) {
+  const companion = getMachineCompanionConfig(path);
+  if (userId) {
+    companion.selectedUserId = userId;
+  } else {
+    delete companion.selectedUserId;
+  }
+  saveMachineCompanionConfig(companion, path);
+}
+function getCompanionSelectedEvaluatorId(path = defaultConfigPath()) {
+  return getMachineCompanionConfig(path).selectedEvaluatorId;
+}
+function setCompanionSelectedEvaluatorId(evaluatorId, path = defaultConfigPath()) {
+  const companion = getMachineCompanionConfig(path);
+  if (evaluatorId) {
+    companion.selectedEvaluatorId = evaluatorId;
+  } else {
+    delete companion.selectedEvaluatorId;
+  }
+  saveMachineCompanionConfig(companion, path);
+}
+function getCompanionSelectedVscodeModelId(path = defaultConfigPath()) {
+  return getMachineCompanionConfig(path).selectedVscodeModelId;
+}
+function setCompanionSelectedVscodeModelId(modelId, path = defaultConfigPath()) {
+  const companion = getMachineCompanionConfig(path);
+  if (modelId) {
+    companion.selectedVscodeModelId = modelId;
+  } else {
+    delete companion.selectedVscodeModelId;
+  }
+  saveMachineCompanionConfig(companion, path);
+}
+function getCompanionCollapsed(path = defaultConfigPath()) {
+  return getMachineCompanionConfig(path).collapsed ?? {};
+}
+function setCompanionCollapsed(surface, collapsed, path = defaultConfigPath()) {
+  const companion = getMachineCompanionConfig(path);
+  companion.collapsed = {
+    ...companion.collapsed ?? {},
+    [surface]: collapsed
+  };
+  saveMachineCompanionConfig(companion, path);
+}
 function getLastRepairedVersion(path = defaultConfigPath()) {
   return loadInstallConfig(path).lastRepairedVersion;
 }
@@ -6859,6 +6983,10 @@ __export(kernel_exports, {
   getCard: () => getCard,
   getCardById: () => getCardById,
   getCardDeletionImpact: () => getCardDeletionImpact,
+  getCompanionCollapsed: () => getCompanionCollapsed,
+  getCompanionSelectedEvaluatorId: () => getCompanionSelectedEvaluatorId,
+  getCompanionSelectedUserId: () => getCompanionSelectedUserId,
+  getCompanionSelectedVscodeModelId: () => getCompanionSelectedVscodeModelId,
   getConfiguredWorkspaces: () => getConfiguredWorkspaces,
   getDatabaseTargetInfo: () => getDatabaseTargetInfo,
   getDefaultDbPath: () => getDefaultDbPath,
@@ -6876,6 +7004,7 @@ __export(kernel_exports, {
   getLastRepairedVersion: () => getLastRepairedVersion,
   getMachineAiConfig: () => getMachineAiConfig,
   getMachineAiModels: () => getMachineAiModels,
+  getMachineCompanionConfig: () => getMachineCompanionConfig,
   getMonitorDir: () => getMonitorDir,
   getMonitorLogStats: () => getMonitorLogStats,
   getMonitorPath: () => getMonitorPath,
@@ -6961,12 +7090,17 @@ __export(kernel_exports, {
   saveInstallConfig: () => saveInstallConfig,
   saveMachineAiConfig: () => saveMachineAiConfig,
   saveMachineAiModels: () => saveMachineAiModels,
+  saveMachineCompanionConfig: () => saveMachineCompanionConfig,
   searchTokensHybrid: () => searchTokensHybrid,
   serializeGoal: () => serializeGoal,
   setADOCredentials: () => setADOCredentials,
   setActiveWorkspaceContext: () => setActiveWorkspaceContext,
   setActiveWorkspaceId: () => setActiveWorkspaceId,
   setAgentConnectAutoDone: () => setAgentConnectAutoDone,
+  setCompanionCollapsed: () => setCompanionCollapsed,
+  setCompanionSelectedEvaluatorId: () => setCompanionSelectedEvaluatorId,
+  setCompanionSelectedUserId: () => setCompanionSelectedUserId,
+  setCompanionSelectedVscodeModelId: () => setCompanionSelectedVscodeModelId,
   setInstallChannel: () => setInstallChannel,
   setInstallMode: () => setInstallMode,
   setLastRepairedVersion: () => setLastRepairedVersion,
@@ -6987,6 +7121,7 @@ __export(kernel_exports, {
   updateCard: () => updateCard,
   updateGoalStatus: () => updateGoalStatus,
   updateKnowledgeContext: () => updateKnowledgeContext,
+  updateMachineCompanionConfig: () => updateMachineCompanionConfig,
   updateToken: () => updateToken,
   upsertConfiguredWorkspace: () => upsertConfiguredWorkspace,
   upsertTokenEmbedding: () => upsertTokenEmbedding,
@@ -7075,7 +7210,7 @@ import {
   accessSync,
   constants,
   existsSync as existsSync11,
-  unlinkSync,
+  unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync6
 } from "fs";
 import { tmpdir } from "os";
@@ -7222,7 +7357,7 @@ Run this manually in a new terminal:
     }
   } finally {
     try {
-      unlinkSync(tmpFile);
+      unlinkSync2(tmpFile);
     } catch {
     }
   }
@@ -7920,6 +8055,24 @@ function planVscodeExtensionInstall(options) {
     launch: { command: options.zamPath, args: ["mcp"] }
   };
 }
+function compareVersions2(a, b) {
+  const parse = (value) => value.split(".").map((part) => Number.parseInt(part, 10) || 0);
+  const [aParts, bParts] = [parse(a), parse(b)];
+  for (let i = 0; i < Math.max(aParts.length, bParts.length); i += 1) {
+    const diff = (aParts[i] ?? 0) - (bParts[i] ?? 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
+function installedCompanionVersion(codePath, query) {
+  try {
+    const output = query(codePath, ["--list-extensions", "--show-versions"]);
+    const match = output.match(/^zam-os\.zam-companion@(\S+)$/im);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
 function installVscodeExtension(options) {
   const plan = planVscodeExtensionInstall(options);
   if (options.dryRun) return { ...plan, action: "planned" };
@@ -7943,6 +8096,18 @@ function installVscodeExtension(options) {
       shell: invocation.shell
     });
   });
+  const query = options.query ?? ((command, args) => {
+    const invocation = buildVscodeCliInvocation(command, args);
+    return execFileSync3(invocation.command, invocation.args, {
+      stdio: "pipe",
+      shell: invocation.shell,
+      encoding: "utf8"
+    });
+  });
+  const installed = installedCompanionVersion(plan.codePath, query);
+  if (installed && compareVersions2(plan.version, installed) < 0) {
+    return { ...plan, action: "kept-newer" };
+  }
   run(plan.codePath, ["--install-extension", plan.vsixPath, "--force"]);
   if (changed) {
     mkdirSync9(dirname6(plan.launchConfigPath), { recursive: true });
@@ -8115,12 +8280,16 @@ function performAgentConnect(opts = {}, deps = {}) {
     skills
   };
 }
+var INSPECTED_HARNESSES = [
+  ...USER_SCOPED_CONNECT_HARNESSES,
+  "claude-code"
+];
 function inspectConnectHarnesses(deps = {}) {
   const d = resolveDeps(deps);
   const foundZam = d.findZam();
   const zamPath = foundZam ?? "zam";
   const installed = new Set(d.detect());
-  const harnesses = USER_SCOPED_CONNECT_HARNESSES.map((harness) => {
+  const harnesses = INSPECTED_HARNESSES.map((harness) => {
     const status = {
       harness,
       label: CONNECT_HARNESS_LABELS[harness],