@hasna/machines 0.0.20 → 0.0.22

package/dist/index.js

@@ -11117,7 +11117,8 @@ var MACHINES_CONSUMER_CAPABILITIES = {
   compatibility: true,
   route_resolution: true,
   cli_json_fallback: true,
-  workspace_path_mapping: true
+  workspace_path_mapping: true,
+  workspace_diagnostics: true
 };
 var MACHINES_CONSUMER_CONTRACT = {
   schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
@@ -11531,6 +11532,170 @@ function inferRepoRoot(workspaceRoot, repoName) {
   }
   return joinPath(root, repoName);
 }
+function shellQuote(value) {
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
+function shellCommand(command) {
+  return command.map(shellQuote).join(" ");
+}
+function canCheckPathForMachine(machine, localMachineId) {
+  if (!machine)
+    return false;
+  if (machine.machine_id === localMachineId)
+    return true;
+  return machine.route_hints.some((hint) => hint.kind === "local");
+}
+function checkedPathExists(path, check) {
+  if (!path || !check)
+    return null;
+  return existsSync4(path);
+}
+function repairHint(input) {
+  const command = [
+    "machines",
+    "workspace",
+    "repair",
+    "--machine",
+    input.machineId,
+    "--project",
+    input.projectId
+  ];
+  if (input.repoName)
+    command.push("--repo", input.repoName);
+  if (input.openFilesRepoName)
+    command.push("--open-files-repo", input.openFilesRepoName);
+  command.push("--json");
+  const applyCommand = [...command.slice(0, -1), "--apply", "--json"];
+  return {
+    id: `repair:${input.machineId}:${input.projectId}`,
+    reason: input.reason,
+    command,
+    shell_command: shellCommand(command),
+    apply_command: applyCommand,
+    apply_shell_command: shellCommand(applyCommand)
+  };
+}
+function pathDiagnostic(input) {
+  if (!input.path.path) {
+    return {
+      id: input.id,
+      status: "missing",
+      severity: input.required ? "fail" : "warn",
+      message: `${input.label} is unresolved.`,
+      path: null,
+      source: input.path.source,
+      path_exists: null
+    };
+  }
+  if (input.pathExists === false) {
+    return {
+      id: input.id,
+      status: "stale",
+      severity: "fail",
+      message: `${input.label} points to a path that does not exist on this machine.`,
+      path: input.path.path,
+      source: input.path.source,
+      path_exists: false
+    };
+  }
+  if (input.path.source === "inferred") {
+    return {
+      id: input.id,
+      status: "inferred",
+      severity: "warn",
+      message: `${input.label} was inferred from the workspace root; write an explicit manifest mapping for repeatable downstream sync.`,
+      path: input.path.path,
+      source: input.path.source,
+      path_exists: input.pathExists
+    };
+  }
+  return {
+    id: input.id,
+    status: "ok",
+    severity: "ok",
+    message: `${input.label} is explicit enough for downstream sync.`,
+    path: input.path.path,
+    source: input.path.source,
+    path_exists: input.pathExists
+  };
+}
+function workspaceDiagnostics(input) {
+  const checkPaths = canCheckPathForMachine(input.machine, input.localMachineId);
+  const diagnostics = [];
+  if (!input.machine) {
+    diagnostics.push({
+      id: "manifest",
+      status: "missing_manifest",
+      severity: "fail",
+      message: "Machine is not present in topology or manifest.",
+      path: null,
+      source: "manifest",
+      path_exists: null
+    });
+  } else if (!input.resolution.evidence.manifest_declared) {
+    diagnostics.push({
+      id: "manifest",
+      status: "missing_manifest",
+      severity: "warn",
+      message: "Machine came from live topology but is not declared in the manifest.",
+      path: null,
+      source: "manifest",
+      path_exists: null
+    });
+  }
+  diagnostics.push(pathDiagnostic({
+    id: "workspace_root",
+    label: "Workspace root",
+    path: input.resolution.paths.workspace_root,
+    pathExists: checkedPathExists(input.resolution.paths.workspace_root.path, checkPaths),
+    required: false
+  }));
+  diagnostics.push(pathDiagnostic({
+    id: "project_root",
+    label: "Project root",
+    path: input.resolution.paths.project_root,
+    pathExists: checkedPathExists(input.resolution.paths.project_root.path, checkPaths),
+    required: true
+  }));
+  diagnostics.push(pathDiagnostic({
+    id: "open_files_root",
+    label: "Open-files root",
+    path: input.resolution.paths.open_files_root,
+    pathExists: checkedPathExists(input.resolution.paths.open_files_root.path, checkPaths),
+    required: false
+  }));
+  if (input.resolution.machine.trust_status !== "trusted") {
+    diagnostics.push({
+      id: "trust",
+      status: "untrusted",
+      severity: "warn",
+      message: `Machine trust status is ${input.resolution.machine.trust_status}; manifest repair apply requires trust or --allow-untrusted.`,
+      path: null,
+      source: "trust",
+      path_exists: null
+    });
+  }
+  if (input.resolution.machine.auth_status !== "authenticated") {
+    diagnostics.push({
+      id: "auth",
+      status: "unknown_auth",
+      severity: "warn",
+      message: `Machine auth status is ${input.resolution.machine.auth_status}; remote sync may still fail if SSH is unavailable.`,
+      path: null,
+      source: "auth",
+      path_exists: null
+    });
+  }
+  const needsRepair = diagnostics.some((entry) => (entry.id === "project_root" || entry.id === "open_files_root") && (entry.status === "missing" || entry.status === "inferred" || entry.status === "stale"));
+  const repairHints = needsRepair ? [repairHint({
+    machineId: input.resolution.machine_id ?? input.resolution.requested_machine_id,
+    projectId: input.resolution.project.project_id,
+    repoName: input.resolution.project.repo_name,
+    openFilesRepoName: input.openFilesRepoName,
+    reason: "Write explicit workspace_paths and open_files_roots manifest metadata."
+  })] : [];
+  return { diagnostics, repairHints };
+}
 function projectPathFromMetadata(metadata, projectId, repoName) {
   const keys = [projectId, repoName].filter((value) => Boolean(value));
   return readMappedPath({
@@ -11606,7 +11771,7 @@ function resolveMachineWorkspace(options) {
   const openFilesRepoName = options.openFilesRepoName ?? "open-files";
   if (!machine) {
     warnings.push(`machine_not_found:${options.machineId}`);
-    return {
+    const resolution2 = {
       schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
       package: topology.package,
       ok: false,
@@ -11620,6 +11785,8 @@ function resolveMachineWorkspace(options) {
         project_root: { path: null, source: "unresolved" },
         open_files_root: { path: null, source: "unresolved" }
       },
+      diagnostics: [],
+      repair_hints: [],
       evidence: {
         topology: true,
         matched_by: matchedBy,
@@ -11628,6 +11795,17 @@ function resolveMachineWorkspace(options) {
       },
       warnings
     };
+    const diagnostics2 = workspaceDiagnostics({
+      machine,
+      localMachineId: topology.local_machine_id,
+      resolution: resolution2,
+      openFilesRepoName
+    });
+    return {
+      ...resolution2,
+      diagnostics: diagnostics2.diagnostics,
+      repair_hints: diagnostics2.repairHints
+    };
   }
   const metadata = machine.metadata;
   const workspaceRootPath = options.workspaceRoot ?? machine.workspace_path;
@@ -11646,7 +11824,7 @@ function resolveMachineWorkspace(options) {
     warnings.push(`open_files_root_inferred:${options.projectId}`);
   if (!projectRootPath)
     warnings.push(`project_root_unresolved:${options.projectId}`);
-  return {
+  const resolution = {
     schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
     package: topology.package,
     ok: Boolean(projectRootPath),
@@ -11669,6 +11847,8 @@ function resolveMachineWorkspace(options) {
       project_root: { path: projectRootPath, source: projectRootSource },
       open_files_root: { path: openFilesRootPath, source: openFilesRootSource }
     },
+    diagnostics: [],
+    repair_hints: [],
     evidence: {
       topology: true,
       matched_by: matchedBy,
@@ -11677,6 +11857,17 @@ function resolveMachineWorkspace(options) {
     },
     warnings
   };
+  const diagnostics = workspaceDiagnostics({
+    machine,
+    localMachineId: topology.local_machine_id,
+    resolution,
+    openFilesRepoName
+  });
+  return {
+    ...resolution,
+    diagnostics: diagnostics.diagnostics,
+    repair_hints: diagnostics.repairHints
+  };
 }
 function getLocalMachineTopology(options = {}) {
   const topology = discoverMachineTopology(options);
@@ -11702,7 +11893,7 @@ import { spawnSync as spawnSync2 } from "child_process";
 import { hostname as hostname4 } from "os";
 
 // src/commands/ssh.ts
-function shellQuote(value) {
+function shellQuote2(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
 function resolveSshTarget(machineId, options = {}) {
@@ -11723,11 +11914,11 @@ function resolveSshTarget(machineId, options = {}) {
 }
 function buildSshCommand(machineId, remoteCommand, options = {}) {
   const resolved = resolveSshTarget(machineId, options);
-  return remoteCommand ? `ssh ${resolved.target} ${shellQuote(remoteCommand)}` : `ssh ${resolved.target}`;
+  return remoteCommand ? `ssh ${resolved.target} ${shellQuote2(remoteCommand)}` : `ssh ${resolved.target}`;
 }
 
 // src/remote.ts
-function shellQuote2(value) {
+function shellQuote3(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
 function machineIsLocal(machineId, localMachineId) {
@@ -11745,7 +11936,7 @@ function resolveMachineCommand(machineId, command, localMachineId = getLocalMach
   } catch (error) {
     const message = String(error.message ?? error);
     if (message.includes("Machine route not found") || message.includes("Machine not found in manifest")) {
-      return { source: "ssh", shellCommand: `ssh ${shellQuote2(machineId)} ${shellQuote2(command)}` };
+      return { source: "ssh", shellCommand: `ssh ${shellQuote3(machineId)} ${shellQuote3(command)}` };
     }
     throw error;
   }
@@ -11773,7 +11964,7 @@ var DEFAULT_COMMANDS = [
 function defaultPackages() {
   return [{ name: "@hasna/machines", command: "machines", expectedVersion: getPackageVersion(), required: true }];
 }
-function shellQuote3(value) {
+function shellQuote4(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
 function commandId(value) {
@@ -11824,7 +12015,7 @@ function defaultRunner2(machineId, command) {
   return runMachineCommand(machineId, command);
 }
 function inspectCommand(machineId, spec, runner) {
-  const command = shellQuote3(spec.command);
+  const command = shellQuote4(spec.command);
   const versionArgs = spec.versionArgs ?? "--version";
   const script = [
     `cmd=${command}`,
@@ -11853,7 +12044,7 @@ function fieldCommand(field) {
 }
 function inspectWorkspace(machineId, spec, runner) {
   const script = [
-    `path=${shellQuote3(spec.path)}`,
+    `path=${shellQuote4(spec.path)}`,
     'printf "exists=%s\\n" "$(test -d "$path" && printf yes || printf no)"',
     'pkg="$path/package.json"',
     'printf "package_json=%s\\n" "$(test -f "$pkg" && printf yes || printf no)"',
@@ -12148,7 +12339,7 @@ function getAppManager(machine, app) {
     return "winget";
   return "apt";
 }
-function shellQuote4(value) {
+function shellQuote5(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function buildAppCommand(machine, app) {
@@ -12169,7 +12360,7 @@ function buildAppCommand(machine, app) {
   return `sudo apt-get install -y ${packageName}`;
 }
 function buildAppProbeCommand(machine, app) {
-  const packageName = shellQuote4(getPackageName(app));
+  const packageName = shellQuote5(getPackageName(app));
   const manager = getAppManager(machine, app);
   if (manager === "custom") {
     return `if command -v ${packageName} >/dev/null 2>&1; then printf 'installed=1\\nversion=custom\\n'; else printf 'installed=0\\n'; fi`;
@@ -12705,7 +12896,7 @@ var notificationConfigSchema = exports_external.object({
 function sortChannels(channels) {
   return [...channels].sort((left, right) => left.id.localeCompare(right.id));
 }
-function shellQuote5(value) {
+function shellQuote6(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function hasCommand2(binary) {
@@ -12752,7 +12943,7 @@ ${message}
     };
   }
   if (hasCommand2("mail")) {
-    const command = `printf %s ${shellQuote5(message)} | mail -s ${shellQuote5(subject)} ${shellQuote5(channel.target)}`;
+    const command = `printf %s ${shellQuote6(message)} | mail -s ${shellQuote6(subject)} ${shellQuote6(channel.target)}`;
     const result = Bun.spawnSync(["bash", "-lc", command], {
       stdout: "pipe",
       stderr: "pipe",
@@ -13568,6 +13759,154 @@ function runSync(machineId, options = {}) {
   recordSyncRun(plan.machineId, "completed", summary);
   return summary;
 }
+// src/commands/workspace.ts
+function isRecord2(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function cloneMetadata(metadata) {
+  return isRecord2(metadata) ? { ...metadata } : {};
+}
+function mappedPath(metadata, field, key) {
+  const container = metadata[field];
+  if (!isRecord2(container))
+    return null;
+  const value = container[key];
+  if (typeof value === "string" && value.trim())
+    return value.trim();
+  if (isRecord2(value)) {
+    const nested = value["path"] ?? value["root"] ?? value["workspacePath"] ?? value["workspace_path"];
+    if (typeof nested === "string" && nested.trim())
+      return nested.trim();
+  }
+  return null;
+}
+function writeMappedPath(metadata, field, key, path) {
+  const existing = metadata[field];
+  const container = isRecord2(existing) ? { ...existing } : {};
+  container[key] = path;
+  metadata[field] = container;
+}
+function buildPatch(input) {
+  const previous = mappedPath(input.metadata, input.field, input.key);
+  if (!input.path) {
+    return {
+      field: input.field,
+      key: input.key,
+      path: null,
+      previous_path: previous,
+      status: "unresolved"
+    };
+  }
+  const status = previous === input.path ? "unchanged" : input.apply ? "written" : "would_write";
+  return {
+    field: input.field,
+    key: input.key,
+    path: input.path,
+    previous_path: previous,
+    status
+  };
+}
+function upsertMachineMetadata(manifest, machineId, metadata) {
+  return {
+    ...manifest,
+    machines: manifest.machines.map((machine) => machine.id === machineId ? { ...machine, metadata } : machine)
+  };
+}
+function repairWorkspaceManifestMappings(options) {
+  const projectId = options.projectId;
+  const repoName = options.repoName ?? projectId;
+  const openFilesRepoName = options.openFilesRepoName ?? "open-files";
+  const apply = options.apply === true;
+  const resolution = resolveMachineWorkspace({
+    machineId: options.machineId,
+    projectId,
+    repoName,
+    openFilesRepoName,
+    projectRoot: options.projectRoot,
+    openFilesRoot: options.openFilesRoot,
+    workspaceRoot: options.workspaceRoot,
+    includeTailscale: options.includeTailscale,
+    now: options.now
+  });
+  const warnings = [...resolution.warnings];
+  const manifest = readManifest();
+  const manifestMachineId = resolution.machine_id ?? options.machineId;
+  const machine = manifest.machines.find((entry) => entry.id === manifestMachineId) ?? null;
+  const trusted = resolution.machine.trust_status === "trusted" || options.allowUntrusted === true;
+  if (!machine) {
+    warnings.push(`manifest_machine_missing:${manifestMachineId}`);
+    return {
+      ok: false,
+      applied: false,
+      manifest_path: getManifestPath(),
+      machine_id: resolution.machine_id,
+      project_id: projectId,
+      repo_name: repoName,
+      open_files_repo_name: openFilesRepoName,
+      trusted,
+      resolution,
+      patches: [],
+      warnings
+    };
+  }
+  const metadata = cloneMetadata(machine.metadata);
+  const patches = [
+    buildPatch({
+      metadata,
+      field: "workspace_paths",
+      key: projectId,
+      path: options.projectRoot ?? resolution.paths.project_root.path,
+      apply
+    }),
+    buildPatch({
+      metadata,
+      field: "open_files_roots",
+      key: projectId,
+      path: options.openFilesRoot ?? resolution.paths.open_files_root.path,
+      apply
+    })
+  ];
+  const hasUnresolved = patches.some((patch) => patch.status === "unresolved");
+  const hasWrites = patches.some((patch) => patch.status === "would_write" || patch.status === "written");
+  if (apply && hasWrites && !trusted) {
+    warnings.push(`manifest_repair_requires_trusted_machine:${manifestMachineId}`);
+    return {
+      ok: false,
+      applied: false,
+      manifest_path: getManifestPath(),
+      machine_id: manifestMachineId,
+      project_id: projectId,
+      repo_name: repoName,
+      open_files_repo_name: openFilesRepoName,
+      trusted,
+      resolution,
+      patches: patches.map((patch) => patch.status === "written" ? { ...patch, status: "would_write" } : patch),
+      warnings
+    };
+  }
+  let applied = false;
+  if (apply && !hasUnresolved && hasWrites) {
+    for (const patch of patches) {
+      if (patch.path && patch.status === "written")
+        writeMappedPath(metadata, patch.field, patch.key, patch.path);
+    }
+    writeManifest(upsertMachineMetadata(manifest, manifestMachineId, metadata));
+    applied = true;
+  }
+  return {
+    ok: resolution.ok && !hasUnresolved && (!apply || applied || !hasWrites),
+    applied,
+    manifest_path: getManifestPath(),
+    machine_id: manifestMachineId,
+    project_id: projectId,
+    repo_name: repoName,
+    open_files_repo_name: openFilesRepoName,
+    trusted,
+    resolution,
+    patches,
+    warnings
+  };
+}
 // node_modules/zod/v4/core/core.js
 var NEVER2 = Object.freeze({
   status: "aborted"
@@ -22725,6 +23064,7 @@ export {
   resolveMachineWorkspace,
   resolveMachineRoute,
   resolveBackupTarget,
+  repairWorkspaceManifestMappings,
   renderDomainMapping,
   renderDashboardHtml,
   removeNotificationChannel,