@adhdev/daemon-core 0.9.82-rc.445 → 0.9.82-rc.447

package/dist/index.mjs

@@ -404,10 +404,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "92b0714a88a4e1e253a40fa5a8c49602d087a5b3" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "92b0714a" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.445" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-01T12:57:54.212Z" : void 0);
+  const commit = readInjected(true ? "fb4b6fd9ffb70781692aceb7eea162dd92606fad" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "fb4b6fd9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.447" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-01T16:13:26.252Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -1497,6 +1497,255 @@ var init_git_diff = __esm({
   }
 });
 
+// src/config/config.ts
+var config_exports = {};
+__export(config_exports, {
+  generateMachineId: () => generateMachineId,
+  getConfigDir: () => getConfigDir,
+  getDaemonDataDir: () => getDaemonDataDir,
+  isSetupComplete: () => isSetupComplete,
+  isStableMachineId: () => isStableMachineId,
+  loadConfig: () => loadConfig,
+  markSetupComplete: () => markSetupComplete,
+  resetConfig: () => resetConfig,
+  resolveProviderSourceMode: () => resolveProviderSourceMode,
+  saveConfig: () => saveConfig,
+  updateConfig: () => updateConfig
+});
+import { homedir } from "os";
+import { join as join2 } from "path";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync, chmodSync } from "fs";
+import { randomUUID } from "crypto";
+function resolveProviderSourceMode(providerSourceMode, legacyDisableUpstream) {
+  if (providerSourceMode === "normal" || providerSourceMode === "no-upstream") {
+    return providerSourceMode;
+  }
+  return legacyDisableUpstream === true ? "no-upstream" : "normal";
+}
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function asStringArray(value) {
+  if (!Array.isArray(value)) return [];
+  return value.filter((item) => typeof item === "string");
+}
+function asNullableString(value) {
+  return typeof value === "string" ? value : null;
+}
+function asOptionalString(value) {
+  return typeof value === "string" && value.trim() ? value : void 0;
+}
+function asBoolean(value, fallback) {
+  return typeof value === "boolean" ? value : fallback;
+}
+function normalizeMachineProviders(value) {
+  if (!isPlainObject(value)) return {};
+  const result = {};
+  for (const [providerType, raw] of Object.entries(value)) {
+    if (!isPlainObject(raw)) continue;
+    const entry = {};
+    if (raw.enabled === true) entry.enabled = true;
+    if (typeof raw.executable === "string" && raw.executable.trim()) {
+      entry.executable = raw.executable.trim();
+    }
+    if (Array.isArray(raw.args)) {
+      entry.args = raw.args.filter((arg) => typeof arg === "string");
+    }
+    if (isPlainObject(raw.lastDetection)) {
+      entry.lastDetection = raw.lastDetection;
+    }
+    if (isPlainObject(raw.lastVerification)) {
+      entry.lastVerification = raw.lastVerification;
+    }
+    result[providerType] = entry;
+  }
+  return result;
+}
+function normalizeConfig(raw) {
+  const parsed = isPlainObject(raw) ? raw : {};
+  return {
+    serverUrl: typeof parsed.serverUrl === "string" && parsed.serverUrl.trim() ? parsed.serverUrl : DEFAULT_CONFIG.serverUrl,
+    allowServerApiProxy: asBoolean(parsed.allowServerApiProxy, DEFAULT_CONFIG.allowServerApiProxy ?? false),
+    selectedIde: asNullableString(parsed.selectedIde),
+    configuredIdes: asStringArray(parsed.configuredIdes),
+    installedExtensions: asStringArray(parsed.installedExtensions),
+    userEmail: asNullableString(parsed.userEmail),
+    userName: asNullableString(parsed.userName),
+    setupCompleted: asBoolean(parsed.setupCompleted, DEFAULT_CONFIG.setupCompleted),
+    setupDate: asNullableString(parsed.setupDate),
+    enabledIdes: asStringArray(parsed.enabledIdes),
+    workspaces: Array.isArray(parsed.workspaces) ? parsed.workspaces : [],
+    defaultWorkspaceId: asNullableString(parsed.defaultWorkspaceId) ?? asNullableString(parsed.activeWorkspaceId),
+    machineNickname: asNullableString(parsed.machineNickname),
+    machineId: asOptionalString(parsed.machineId),
+    machineSecret: parsed.machineSecret === null ? null : asOptionalString(parsed.machineSecret),
+    registeredMachineId: asOptionalString(parsed.registeredMachineId),
+    providerSettings: isPlainObject(parsed.providerSettings) ? parsed.providerSettings : {},
+    machineProviders: normalizeMachineProviders(parsed.machineProviders),
+    ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
+    providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
+    providerDir: asOptionalString(parsed.providerDir),
+    updateChannel: parsed.updateChannel === "preview" ? "preview" : "stable",
+    terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
+  };
+}
+function generateMachineId() {
+  return `${MACHINE_ID_PREFIX}${randomUUID().replace(/-/g, "")}`;
+}
+function isStableMachineId(machineId) {
+  return typeof machineId === "string" && machineId.startsWith(MACHINE_ID_PREFIX);
+}
+function ensureMachineId(config) {
+  if (isStableMachineId(config.machineId)) {
+    return { config, changed: false };
+  }
+  return {
+    config: {
+      ...config,
+      machineId: generateMachineId()
+    },
+    changed: true
+  };
+}
+function getConfigDir() {
+  const override = process.env.ADHDEV_CONFIG_DIR;
+  const dir = override && override.trim() ? override.trim() : join2(homedir(), ".adhdev");
+  if (!existsSync2(dir)) {
+    mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+}
+function getDaemonDataDir() {
+  const dir = join2(getConfigDir(), "daemon");
+  if (!existsSync2(dir)) {
+    mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+}
+function getConfigPath() {
+  return join2(getConfigDir(), "config.json");
+}
+function migrateStateToStateFile(raw) {
+  const statePath = join2(getConfigDir(), "state.json");
+  if (existsSync2(statePath)) return;
+  const recentActivity = Array.isArray(raw.recentActivity) ? raw.recentActivity : [];
+  const savedProviderSessions = Array.isArray(raw.savedProviderSessions) ? raw.savedProviderSessions : [];
+  const legacySessionReads = isPlainObject(raw.recentSessionReads) ? raw.recentSessionReads : {};
+  const sessionReads = isPlainObject(raw.sessionReads) ? raw.sessionReads : {};
+  const sessionReadMarkers = isPlainObject(raw.sessionReadMarkers) ? raw.sessionReadMarkers : {};
+  const hasData = recentActivity.length > 0 || savedProviderSessions.length > 0 || Object.keys(sessionReads).length > 0 || Object.keys(legacySessionReads).length > 0 || Object.keys(sessionReadMarkers).length > 0;
+  if (!hasData) return;
+  const mergedReads = Object.fromEntries(
+    Object.entries({ ...legacySessionReads, ...sessionReads }).filter(([, v]) => typeof v === "number" && Number.isFinite(v))
+  );
+  const cleanedMarkers = Object.fromEntries(
+    Object.entries(sessionReadMarkers).filter(([, v]) => typeof v === "string")
+  );
+  const state = {
+    recentActivity,
+    savedProviderSessions,
+    sessionReads: mergedReads,
+    sessionReadMarkers: cleanedMarkers
+  };
+  writeFileSync(statePath, JSON.stringify(state, null, 2), { encoding: "utf-8", mode: 384 });
+}
+function loadConfig() {
+  const configPath = getConfigPath();
+  if (!existsSync2(configPath)) {
+    const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
+    try {
+      saveConfig(initialized.config);
+    } catch {
+    }
+    return initialized.config;
+  }
+  try {
+    const raw = readFileSync2(configPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    migrateStateToStateFile(parsed);
+    const normalizedInput = normalizeConfig(parsed);
+    const ensured = ensureMachineId(normalizedInput);
+    const normalized = ensured.config;
+    if (ensured.changed || JSON.stringify(parsed) !== JSON.stringify(normalized)) {
+      try {
+        saveConfig(normalized);
+      } catch {
+      }
+    }
+    return normalized;
+  } catch {
+    const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
+    return initialized.config;
+  }
+}
+function saveConfig(config) {
+  const configPath = getConfigPath();
+  const dir = getConfigDir();
+  const normalized = normalizeConfig(config);
+  if (!existsSync2(dir)) {
+    mkdirSync(dir, { recursive: true, mode: 448 });
+  }
+  writeFileSync(configPath, JSON.stringify(normalized, null, 2), { encoding: "utf-8", mode: 384 });
+  try {
+    chmodSync(configPath, 384);
+  } catch {
+  }
+}
+function updateConfig(updates) {
+  const config = loadConfig();
+  const updated = { ...config, ...updates };
+  saveConfig(updated);
+  return updated;
+}
+function markSetupComplete(ideId, extensions) {
+  const ideIds = Array.isArray(ideId) ? ideId : [ideId];
+  return updateConfig({
+    selectedIde: ideIds[0],
+    configuredIdes: ideIds,
+    installedExtensions: extensions,
+    setupCompleted: true,
+    setupDate: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+function isSetupComplete() {
+  const config = loadConfig();
+  return config.setupCompleted;
+}
+function resetConfig() {
+  saveConfig({ ...DEFAULT_CONFIG });
+}
+var DEFAULT_CONFIG, MACHINE_ID_PREFIX;
+var init_config = __esm({
+  "src/config/config.ts"() {
+    "use strict";
+    DEFAULT_CONFIG = {
+      serverUrl: "https://api.adhf.dev",
+      allowServerApiProxy: false,
+      selectedIde: null,
+      configuredIdes: [],
+      installedExtensions: [],
+      userEmail: null,
+      userName: null,
+      setupCompleted: false,
+      setupDate: null,
+      enabledIdes: [],
+      workspaces: [],
+      defaultWorkspaceId: null,
+      machineNickname: null,
+      machineId: void 0,
+      machineSecret: null,
+      registeredMachineId: void 0,
+      providerSettings: {},
+      machineProviders: {},
+      ideSettings: {},
+      providerSourceMode: "normal",
+      updateChannel: "stable",
+      terminalSizingMode: "measured"
+    };
+    MACHINE_ID_PREFIX = "mach_";
+  }
+});
+
 // src/git/git-worktree.ts
 var git_worktree_exports = {};
 __export(git_worktree_exports, {
@@ -1509,7 +1758,7 @@ __export(git_worktree_exports, {
 });
 import * as path4 from "path";
 import { mkdir } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
 function resolveWorktreePath(repoRoot, meshName, branch) {
@@ -1602,7 +1851,7 @@ async function createWorktree(opts) {
   const { repoRoot, branch, baseBranch, meshName } = opts;
   const remote = (opts.remote || "origin").trim() || "origin";
   const targetDir = opts.targetDir || resolveWorktreePath(repoRoot, meshName, branch);
-  if (existsSync2(targetDir)) {
+  if (existsSync3(targetDir)) {
     throw new Error(`Worktree target directory already exists: ${targetDir}`);
   }
   await mkdir(path4.dirname(targetDir), { recursive: true });
@@ -1627,7 +1876,7 @@ async function createWorktree(opts) {
   } catch (error) {
     const stderr = typeof error.stderr === "string" ? error.stderr : "";
     if (/already exists/i.test(stderr)) {
-      if (existsSync2(targetDir)) {
+      if (existsSync3(targetDir)) {
         throw new Error(`Worktree target directory was created concurrently: ${targetDir}`);
       }
       throw new Error(`Branch '${branch}' already exists or is checked out in another worktree`);
@@ -1642,7 +1891,7 @@ async function createWorktree(opts) {
   };
 }
 async function removeWorktree(repoRoot, worktreePath, opts = {}) {
-  if (!existsSync2(worktreePath)) {
+  if (!existsSync3(worktreePath)) {
     await pruneWorktrees(repoRoot);
     return { success: true, removedPath: worktreePath };
   }
@@ -1807,255 +2056,6 @@ var init_git_worktree = __esm({
   }
 });
 
-// src/config/config.ts
-var config_exports = {};
-__export(config_exports, {
-  generateMachineId: () => generateMachineId,
-  getConfigDir: () => getConfigDir,
-  getDaemonDataDir: () => getDaemonDataDir,
-  isSetupComplete: () => isSetupComplete,
-  isStableMachineId: () => isStableMachineId,
-  loadConfig: () => loadConfig,
-  markSetupComplete: () => markSetupComplete,
-  resetConfig: () => resetConfig,
-  resolveProviderSourceMode: () => resolveProviderSourceMode,
-  saveConfig: () => saveConfig,
-  updateConfig: () => updateConfig
-});
-import { homedir } from "os";
-import { join as join3 } from "path";
-import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync2, writeFileSync, chmodSync } from "fs";
-import { randomUUID } from "crypto";
-function resolveProviderSourceMode(providerSourceMode, legacyDisableUpstream) {
-  if (providerSourceMode === "normal" || providerSourceMode === "no-upstream") {
-    return providerSourceMode;
-  }
-  return legacyDisableUpstream === true ? "no-upstream" : "normal";
-}
-function isPlainObject(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function asStringArray(value) {
-  if (!Array.isArray(value)) return [];
-  return value.filter((item) => typeof item === "string");
-}
-function asNullableString(value) {
-  return typeof value === "string" ? value : null;
-}
-function asOptionalString(value) {
-  return typeof value === "string" && value.trim() ? value : void 0;
-}
-function asBoolean(value, fallback) {
-  return typeof value === "boolean" ? value : fallback;
-}
-function normalizeMachineProviders(value) {
-  if (!isPlainObject(value)) return {};
-  const result = {};
-  for (const [providerType, raw] of Object.entries(value)) {
-    if (!isPlainObject(raw)) continue;
-    const entry = {};
-    if (raw.enabled === true) entry.enabled = true;
-    if (typeof raw.executable === "string" && raw.executable.trim()) {
-      entry.executable = raw.executable.trim();
-    }
-    if (Array.isArray(raw.args)) {
-      entry.args = raw.args.filter((arg) => typeof arg === "string");
-    }
-    if (isPlainObject(raw.lastDetection)) {
-      entry.lastDetection = raw.lastDetection;
-    }
-    if (isPlainObject(raw.lastVerification)) {
-      entry.lastVerification = raw.lastVerification;
-    }
-    result[providerType] = entry;
-  }
-  return result;
-}
-function normalizeConfig(raw) {
-  const parsed = isPlainObject(raw) ? raw : {};
-  return {
-    serverUrl: typeof parsed.serverUrl === "string" && parsed.serverUrl.trim() ? parsed.serverUrl : DEFAULT_CONFIG.serverUrl,
-    allowServerApiProxy: asBoolean(parsed.allowServerApiProxy, DEFAULT_CONFIG.allowServerApiProxy ?? false),
-    selectedIde: asNullableString(parsed.selectedIde),
-    configuredIdes: asStringArray(parsed.configuredIdes),
-    installedExtensions: asStringArray(parsed.installedExtensions),
-    userEmail: asNullableString(parsed.userEmail),
-    userName: asNullableString(parsed.userName),
-    setupCompleted: asBoolean(parsed.setupCompleted, DEFAULT_CONFIG.setupCompleted),
-    setupDate: asNullableString(parsed.setupDate),
-    enabledIdes: asStringArray(parsed.enabledIdes),
-    workspaces: Array.isArray(parsed.workspaces) ? parsed.workspaces : [],
-    defaultWorkspaceId: asNullableString(parsed.defaultWorkspaceId) ?? asNullableString(parsed.activeWorkspaceId),
-    machineNickname: asNullableString(parsed.machineNickname),
-    machineId: asOptionalString(parsed.machineId),
-    machineSecret: parsed.machineSecret === null ? null : asOptionalString(parsed.machineSecret),
-    registeredMachineId: asOptionalString(parsed.registeredMachineId),
-    providerSettings: isPlainObject(parsed.providerSettings) ? parsed.providerSettings : {},
-    machineProviders: normalizeMachineProviders(parsed.machineProviders),
-    ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
-    providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
-    providerDir: asOptionalString(parsed.providerDir),
-    updateChannel: parsed.updateChannel === "preview" ? "preview" : "stable",
-    terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
-  };
-}
-function generateMachineId() {
-  return `${MACHINE_ID_PREFIX}${randomUUID().replace(/-/g, "")}`;
-}
-function isStableMachineId(machineId) {
-  return typeof machineId === "string" && machineId.startsWith(MACHINE_ID_PREFIX);
-}
-function ensureMachineId(config) {
-  if (isStableMachineId(config.machineId)) {
-    return { config, changed: false };
-  }
-  return {
-    config: {
-      ...config,
-      machineId: generateMachineId()
-    },
-    changed: true
-  };
-}
-function getConfigDir() {
-  const override = process.env.ADHDEV_CONFIG_DIR;
-  const dir = override && override.trim() ? override.trim() : join3(homedir(), ".adhdev");
-  if (!existsSync3(dir)) {
-    mkdirSync(dir, { recursive: true });
-  }
-  return dir;
-}
-function getDaemonDataDir() {
-  const dir = join3(getConfigDir(), "daemon");
-  if (!existsSync3(dir)) {
-    mkdirSync(dir, { recursive: true });
-  }
-  return dir;
-}
-function getConfigPath() {
-  return join3(getConfigDir(), "config.json");
-}
-function migrateStateToStateFile(raw) {
-  const statePath = join3(getConfigDir(), "state.json");
-  if (existsSync3(statePath)) return;
-  const recentActivity = Array.isArray(raw.recentActivity) ? raw.recentActivity : [];
-  const savedProviderSessions = Array.isArray(raw.savedProviderSessions) ? raw.savedProviderSessions : [];
-  const legacySessionReads = isPlainObject(raw.recentSessionReads) ? raw.recentSessionReads : {};
-  const sessionReads = isPlainObject(raw.sessionReads) ? raw.sessionReads : {};
-  const sessionReadMarkers = isPlainObject(raw.sessionReadMarkers) ? raw.sessionReadMarkers : {};
-  const hasData = recentActivity.length > 0 || savedProviderSessions.length > 0 || Object.keys(sessionReads).length > 0 || Object.keys(legacySessionReads).length > 0 || Object.keys(sessionReadMarkers).length > 0;
-  if (!hasData) return;
-  const mergedReads = Object.fromEntries(
-    Object.entries({ ...legacySessionReads, ...sessionReads }).filter(([, v]) => typeof v === "number" && Number.isFinite(v))
-  );
-  const cleanedMarkers = Object.fromEntries(
-    Object.entries(sessionReadMarkers).filter(([, v]) => typeof v === "string")
-  );
-  const state = {
-    recentActivity,
-    savedProviderSessions,
-    sessionReads: mergedReads,
-    sessionReadMarkers: cleanedMarkers
-  };
-  writeFileSync(statePath, JSON.stringify(state, null, 2), { encoding: "utf-8", mode: 384 });
-}
-function loadConfig() {
-  const configPath = getConfigPath();
-  if (!existsSync3(configPath)) {
-    const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
-    try {
-      saveConfig(initialized.config);
-    } catch {
-    }
-    return initialized.config;
-  }
-  try {
-    const raw = readFileSync2(configPath, "utf-8");
-    const parsed = JSON.parse(raw);
-    migrateStateToStateFile(parsed);
-    const normalizedInput = normalizeConfig(parsed);
-    const ensured = ensureMachineId(normalizedInput);
-    const normalized = ensured.config;
-    if (ensured.changed || JSON.stringify(parsed) !== JSON.stringify(normalized)) {
-      try {
-        saveConfig(normalized);
-      } catch {
-      }
-    }
-    return normalized;
-  } catch {
-    const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
-    return initialized.config;
-  }
-}
-function saveConfig(config) {
-  const configPath = getConfigPath();
-  const dir = getConfigDir();
-  const normalized = normalizeConfig(config);
-  if (!existsSync3(dir)) {
-    mkdirSync(dir, { recursive: true, mode: 448 });
-  }
-  writeFileSync(configPath, JSON.stringify(normalized, null, 2), { encoding: "utf-8", mode: 384 });
-  try {
-    chmodSync(configPath, 384);
-  } catch {
-  }
-}
-function updateConfig(updates) {
-  const config = loadConfig();
-  const updated = { ...config, ...updates };
-  saveConfig(updated);
-  return updated;
-}
-function markSetupComplete(ideId, extensions) {
-  const ideIds = Array.isArray(ideId) ? ideId : [ideId];
-  return updateConfig({
-    selectedIde: ideIds[0],
-    configuredIdes: ideIds,
-    installedExtensions: extensions,
-    setupCompleted: true,
-    setupDate: (/* @__PURE__ */ new Date()).toISOString()
-  });
-}
-function isSetupComplete() {
-  const config = loadConfig();
-  return config.setupCompleted;
-}
-function resetConfig() {
-  saveConfig({ ...DEFAULT_CONFIG });
-}
-var DEFAULT_CONFIG, MACHINE_ID_PREFIX;
-var init_config = __esm({
-  "src/config/config.ts"() {
-    "use strict";
-    DEFAULT_CONFIG = {
-      serverUrl: "https://api.adhf.dev",
-      allowServerApiProxy: false,
-      selectedIde: null,
-      configuredIdes: [],
-      installedExtensions: [],
-      userEmail: null,
-      userName: null,
-      setupCompleted: false,
-      setupDate: null,
-      enabledIdes: [],
-      workspaces: [],
-      defaultWorkspaceId: null,
-      machineNickname: null,
-      machineId: void 0,
-      machineSecret: null,
-      registeredMachineId: void 0,
-      providerSettings: {},
-      machineProviders: {},
-      ideSettings: {},
-      providerSourceMode: "normal",
-      updateChannel: "stable",
-      terminalSizingMode: "measured"
-    };
-    MACHINE_ID_PREFIX = "mach_";
-  }
-});
-
 // src/config/workspaces.ts
 import * as fs from "fs";
 import * as os from "os";
@@ -3198,12 +3198,23 @@ function addNode(meshId, opts) {
   if (mesh.nodes.some((n) => n.workspace === opts.workspace)) {
     throw new Error("This workspace is already in the mesh");
   }
+  const machineNickname = (() => {
+    const explicit = typeof opts.machineNickname === "string" ? opts.machineNickname.trim() : "";
+    if (explicit) return explicit;
+    try {
+      const local = loadConfig().machineNickname;
+      return typeof local === "string" && local.trim() ? local.trim() : void 0;
+    } catch {
+      return void 0;
+    }
+  })();
   const node = {
     id: `node_${randomUUID3().replace(/-/g, "")}`,
     workspace: opts.workspace.trim(),
     repoRoot: opts.repoRoot,
     daemonId: opts.daemonId,
     machineId: opts.machineId,
+    ...machineNickname ? { machineNickname } : {},
     capabilities: normalizeCapabilityTags(opts.capabilities),
     userOverrides: opts.userOverrides || {},
     policy: opts.policy || {},
@@ -3238,6 +3249,7 @@ function updateNode(meshId, nodeId, opts) {
   if (opts.userOverrides) node.userOverrides = { ...node.userOverrides, ...opts.userOverrides };
   if (opts.reportedPlatform && opts.reportedPlatform.trim()) node.reportedPlatform = opts.reportedPlatform.trim();
   if (opts.reportedArch && opts.reportedArch.trim()) node.reportedArch = opts.reportedArch.trim();
+  if (opts.reportedMachineNickname && opts.reportedMachineNickname.trim()) node.machineNickname = opts.reportedMachineNickname.trim();
   if (opts.policy) node.policy = { ...node.policy, ...opts.policy };
   if (opts.worktreeBootstrap) node.worktreeBootstrap = opts.worktreeBootstrap;
   if (Object.prototype.hasOwnProperty.call(opts, "systemPrompt")) {
@@ -24534,6 +24546,7 @@ init_git_diff();
 init_git_executor();
 import * as path3 from "path";
 init_git_status();
+init_config();
 var GIT_COMMAND_NAMES = /* @__PURE__ */ new Set([
   "git_status",
   "git_diff_summary",
@@ -24673,7 +24686,21 @@ async function handleGitCommand(command, args, services = defaultGitCommandServi
       if (submoduleIgnorePaths && submoduleIgnorePaths.length > 0) statusParams.submoduleIgnorePaths = submoduleIgnorePaths;
       const status = await runService(() => services.getStatus(statusParams));
       if ("success" in status) return status;
-      return { success: true, status, reporterPlatform: process.platform, reporterArch: process.arch };
+      const reporterMachineNickname = (() => {
+        try {
+          const nick = loadConfig().machineNickname;
+          return typeof nick === "string" && nick.trim() ? nick.trim() : void 0;
+        } catch {
+          return void 0;
+        }
+      })();
+      return {
+        success: true,
+        status,
+        reporterPlatform: process.platform,
+        reporterArch: process.arch,
+        ...reporterMachineNickname ? { reporterMachineNickname } : {}
+      };
     }
     case "git_diff_summary": {
       if (!services.getDiffSummary) return serviceNotImplemented(command);
@@ -42202,19 +42229,41 @@ var CliProviderInstance = class _CliProviderInstance {
           if (shortFinalSummary) {
             this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now - shortDurationMs });
           }
+          const shortEngineTurnStart = typeof this.adapter?.currentTurnStartedAt === "number" && Number.isFinite(this.adapter.currentTurnStartedAt) ? this.adapter.currentTurnStartedAt : 0;
+          const shortTurnStartedAt = shortEngineTurnStart || this.generatingStartedAt || 0;
+          const shortTaskId = this.completingTurnTaskId();
           this.generatingDebouncePending = null;
           this.generatingStartedAt = 0;
-          const missingEvidence = (this.provider.requiresFinalAssistantBeforeIdle === true || shortEvidenceSource === "external-native") && !shortFinalSummary;
+          const missingEvidence = (this.provider.requiresFinalAssistantBeforeIdle === true || shortEvidenceSource === "external-native" || shortEvidenceSource === "unavailable") && !shortFinalSummary;
           if (missingEvidence) {
             LOG.warn("CLI", `[${this.type}] short completion missing final assistant evidence (source=${shortEvidenceSource})`);
           }
-          const hasMeshContext = !!(this.settings.meshNodeFor || this.settings.meshActiveTaskId || this.settings.launchedByCoordinator);
-          if (missingEvidence && !hasMeshContext) {
-            LOG.info("CLI", `[${this.type}] short completion suppressed: missing final assistant evidence, no mesh context (source=${shortEvidenceSource})`);
-          } else {
+          if (this.isAutonomousMeshSession()) {
+            this.completedDebouncePending = {
+              chatTitle,
+              duration: Math.round(shortDurationMs / 1e3),
+              timestamp: now,
+              firstObservedAt: now,
+              // Short-gen enters from generating→idle (or waiting_approval→idle); the
+              // completedDebounce finalization gate treats previousStatus for its
+              // approval-resolution / inter-approval-valley handling. lastStatus is the
+              // status we transitioned FROM here.
+              previousStatus: this.lastStatus,
+              ...shortTaskId ? { taskId: shortTaskId } : {},
+              ...shortTurnStartedAt ? { turnStartedAt: shortTurnStartedAt } : {},
+              // FALSE-IDLE continuity: same arm-time snapshots as the normal branch so the
+              // flush guard can prove continuous idle across the settle window.
+              busyEpochAtArm: this.busyEpoch,
+              ...typeof adapterStatus?.lastOutputAt === "number" && Number.isFinite(adapterStatus.lastOutputAt) ? { lastOutputAtArm: adapterStatus.lastOutputAt } : {}
+            };
+            LOG.info("CLI", `[${this.type}] short-generating routed through settle window (${shortDurationMs}ms, source=${shortEvidenceSource}, missingEvidence=${missingEvidence}) \u2014 arming completedDebouncePending instead of inline fire`);
             if (this.isMeshWorkerSession()) {
-              traceMeshEventStage("fired", this.meshTraceCtx(), `short-generating idle (source=${shortEvidenceSource})`);
+              traceMeshEventStage("arm", this.meshTraceCtx(), `short-generating settle-arm (source=${shortEvidenceSource}, missingEvidence=${missingEvidence})`);
             }
+            this.scheduleCompletedDebounceFlush(NATIVE_HISTORY_MESH_IDLE_SETTLE_MS);
+          } else if (missingEvidence) {
+            LOG.info("CLI", `[${this.type}] short completion suppressed: missing final assistant evidence, non-mesh session (source=${shortEvidenceSource})`);
+          } else {
             this.pushEvent({
               event: "agent:generating_completed",
               chatTitle,
@@ -42224,8 +42273,7 @@ var CliProviderInstance = class _CliProviderInstance {
               completionDiagnostic: {
                 reason: "short_generating_suppressed",
                 shortDurationMs,
-                finalAssistantEvidenceSource: shortEvidenceSource,
-                ...missingEvidence ? { blockReason: "missing_final_assistant" } : {}
+                finalAssistantEvidenceSource: shortEvidenceSource
               }
             });
           }
@@ -46578,38 +46626,75 @@ function extractUserPrompt(payload) {
   if (!text) return "";
   return extractUserRequestContent(text);
 }
+function isSqliteBusyError(err) {
+  if (!err) return false;
+  const code = err.code;
+  if (typeof code === "string" && code.includes("SQLITE_BUSY")) return true;
+  const msg = err instanceof Error ? err.message : String(err);
+  return /SQLITE_BUSY|database is locked|database table is locked/i.test(msg);
+}
+var AGY_DB_BUSY_TIMEOUT_MS = 3e3;
+var AGY_DB_MAX_ATTEMPTS = 4;
+var AGY_DB_RETRY_BACKOFF_MS = [50, 100, 150];
+function sleepBusy(ms) {
+  const end = Date.now() + ms;
+  while (Date.now() < end) {
+  }
+}
 function parseConversationDb(filePath, sessionId, workspace) {
-  let db;
+  let Database;
   try {
-    const Database = loadBetterSqlite3();
-    db = new Database(filePath, { readonly: true, fileMustExist: true });
+    Database = loadBetterSqlite3();
   } catch (err) {
     LOG.warn(
       "NativeHistory",
-      `antigravity .db reader could not open ${path31.basename(filePath)}: ${err instanceof Error ? err.message : String(err)} (better-sqlite3 load/open failed \u2014 assistant answers in this .db will not surface)`
+      `antigravity .db reader could not load better-sqlite3 for ${path31.basename(filePath)}: ${err instanceof Error ? err.message : String(err)} (native binding unavailable \u2014 assistant answers in this .db will not surface)`
     );
     return null;
   }
-  let rows;
-  try {
-    rows = db.prepare(
-      `SELECT idx, step_type, step_payload
-           FROM steps
-          WHERE step_type IN (${AGY_STEP_TYPE_USER}, ${AGY_STEP_TYPE_MODEL})
-          ORDER BY idx ASC`
-    ).all();
-  } catch (err) {
-    LOG.debug(
-      "NativeHistory",
-      `antigravity .db ${path31.basename(filePath)} has no readable steps table: ${err instanceof Error ? err.message : String(err)}`
-    );
-    return null;
-  } finally {
+  let rows = null;
+  let lastBusyErr;
+  for (let attempt = 1; attempt <= AGY_DB_MAX_ATTEMPTS; attempt++) {
+    let db;
     try {
-      db.close();
-    } catch {
+      db = new Database(filePath, { readonly: true, fileMustExist: true });
+      try {
+        db.pragma(`busy_timeout = ${AGY_DB_BUSY_TIMEOUT_MS}`);
+      } catch {
+      }
+      rows = db.prepare(
+        `SELECT idx, step_type, step_payload
+             FROM steps
+            WHERE step_type IN (${AGY_STEP_TYPE_USER}, ${AGY_STEP_TYPE_MODEL})
+            ORDER BY idx ASC`
+      ).all();
+      break;
+    } catch (err) {
+      if (isSqliteBusyError(err)) {
+        lastBusyErr = err;
+        if (attempt < AGY_DB_MAX_ATTEMPTS) {
+          sleepBusy(AGY_DB_RETRY_BACKOFF_MS[attempt - 1] ?? 150);
+          continue;
+        }
+        LOG.warn(
+          "NativeHistory",
+          `antigravity .db ${path31.basename(filePath)} stayed locked (SQLITE_BUSY) after ${AGY_DB_MAX_ATTEMPTS} attempts: ${err instanceof Error ? err.message : String(err)} (WAL write/checkpoint lock contention \u2014 assistant answers may transiently not surface this read)`
+        );
+        return null;
+      }
+      LOG.debug(
+        "NativeHistory",
+        `antigravity .db ${path31.basename(filePath)} not readable: ${err instanceof Error ? err.message : String(err)}`
+      );
+      return null;
+    } finally {
+      try {
+        db?.close();
+      } catch {
+      }
     }
   }
+  void lastBusyErr;
   if (!Array.isArray(rows) || rows.length === 0) return null;
   const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
   const baseTs = statMtimeMs3(filePath) || Date.now();
@@ -51962,6 +52047,10 @@ var meshStatusHandlers = {
       const sessionHostRecords = ctx.deps.sessionHostControl?.listSessions ? await ctx.deps.sessionHostControl.listSessions().catch(() => []) : [];
       const liveMeshSessions = partitionSessionHostRecords(Array.isArray(sessionHostRecords) ? sessionHostRecords : []).liveRuntimes;
       const localMachineId = loadConfig().machineId || "";
+      const localMachineNickname = (() => {
+        const nick = loadConfig().machineNickname;
+        return typeof nick === "string" && nick.trim() ? nick.trim() : "";
+      })();
       const requireDirectPeerTruth = args?.requireDirectPeerTruth === true;
       const meshGitProbeCache = ctx.meshGitProbeCache;
       const directTruth = requireDirectPeerTruth ? await hydrateInlineMeshDirectTruth({
@@ -52042,6 +52131,9 @@ var meshStatusHandlers = {
         ) || Boolean(
           daemonId && (daemonIdsEquivalent(daemonId, localMachineId) || daemonIdsEquivalent(daemonId, ctx.deps.statusInstanceId))
         ) || Boolean(meshRecord?.inline && nodeIndex === 0) || sparseConfiguredCoordinatorNode;
+        if (isSelfNode && localMachineNickname && !readStringValue(node.machineNickname, node.machine_nickname)) {
+          node.machineNickname = localMachineNickname;
+        }
         const machineIdentity = buildMeshNodeMachineIdentity(node, {
           localMachineId,
           localDaemonId: ctx.deps.statusInstanceId,
@@ -52930,7 +53022,7 @@ function buildLivePeerGitConnection(connection, timestamp = (/* @__PURE__ */ new
 }
 function recordInlineMeshDirectGitTruth(node, git, source) {
   if (!node || typeof node !== "object" || Array.isArray(node)) {
-    return { reporterPlatform: null, reporterArch: null };
+    return { reporterPlatform: null, reporterArch: null, reporterMachineNickname: null };
   }
   const checkedAt = readNumberValue(git.lastCheckedAt) ?? Date.now();
   const updatedAt = new Date(checkedAt).toISOString();
@@ -52955,7 +53047,9 @@ function recordInlineMeshDirectGitTruth(node, git, source) {
   stampNodeReporterPlatform(node, reporterPlatform, reporterArch);
   if (reporterPlatform) node.reportedPlatform = reporterPlatform;
   if (reporterArch) node.reportedArch = reporterArch;
-  return { reporterPlatform, reporterArch };
+  const reporterMachineNickname = readStringValue(git.reporterMachineNickname) ?? null;
+  if (reporterMachineNickname) node.machineNickname = reporterMachineNickname;
+  return { reporterPlatform, reporterArch, reporterMachineNickname };
 }
 function stampNodeReporterPlatform(node, platform10, arch2) {
   if (!node || typeof node !== "object" || Array.isArray(node)) return;
@@ -52978,8 +53072,9 @@ function persistNodeReporterPlatform(meshSource, mesh, nodeId, reporter) {
   if (!meshId || !nodeId) return;
   const reportedPlatform = reporter.reporterPlatform ?? void 0;
   const reportedArch = reporter.reporterArch ?? void 0;
-  if (!reportedPlatform && !reportedArch) return;
-  void Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports)).then(({ updateNode: updateNode2 }) => updateNode2(meshId, nodeId, { reportedPlatform, reportedArch })).catch(() => {
+  const reportedMachineNickname = reporter.reporterMachineNickname ?? void 0;
+  if (!reportedPlatform && !reportedArch && !reportedMachineNickname) return;
+  void Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports)).then(({ updateNode: updateNode2 }) => updateNode2(meshId, nodeId, { reportedPlatform, reportedArch, reportedMachineNickname })).catch(() => {
   });
 }
 function buildCachedInlineMeshGitStatus(node) {
@@ -53631,9 +53726,11 @@ async function probeRemoteMeshGitStatus(args) {
   if (!remoteGit || typeof remoteGit !== "object" || typeof remoteGit.isGitRepo !== "boolean") return null;
   const reporterPlatform = readStringValue(remoteResult?.reporterPlatform);
   const reporterArch = readStringValue(remoteResult?.reporterArch);
+  const reporterMachineNickname = readStringValue(remoteResult?.reporterMachineNickname);
   const git = remoteGit;
   if (reporterPlatform) git.reporterPlatform = reporterPlatform;
   if (reporterArch) git.reporterArch = reporterArch;
+  if (reporterMachineNickname) git.reporterMachineNickname = reporterMachineNickname;
   return git;
 }
 var MESH_DIRECT_PROBE_MAX_RETRIES = 2;