@hasna/machines 0.0.20 → 0.0.21

package/README.md

@@ -113,6 +113,15 @@ workspace inference second; consumers can still pass manual overrides.
 machines workspace resolve --machine spark01 --project open-knowledge --repo open-knowledge --json
 ```
 
+If a resolver result reports inferred project or open-files roots, repair the
+manifest metadata explicitly. The command previews changes by default and only
+writes when `--apply` is passed:
+
+```bash
+machines workspace repair --machine spark01 --project open-knowledge --repo open-knowledge --json
+machines workspace repair --machine spark01 --project open-knowledge --repo open-knowledge --apply --json
+```
+
 ## Compatibility SDK
 
 Open-core consumers can use `@hasna/machines` to preflight a peer before

package/dist/cli/index.js

@@ -9038,6 +9038,156 @@ function getStatus() {
   };
 }
 
+// src/commands/workspace.ts
+init_paths();
+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
+  };
+}
+
 // src/compatibility.ts
 init_db();
 var DEFAULT_COMMANDS = [
@@ -10784,6 +10934,25 @@ function renderWorkspaceResolution(result) {
     ["warnings", result.warnings.join(", ") || "none"]
   ]);
 }
+function renderWorkspaceRepairResult(result) {
+  const patchLines = result.patches.map((patch) => {
+    const path = patch.path ?? "unresolved";
+    const previous = patch.previous_path ? ` previous=${patch.previous_path}` : "";
+    return `${patch.field}.${patch.key}: ${patch.status} ${path}${previous}`;
+  });
+  return [
+    renderKeyValueTable([
+      ["machine", result.machine_id ?? "unresolved"],
+      ["project", result.project_id],
+      ["trusted", String(result.trusted)],
+      ["applied", String(result.applied)],
+      ["manifest", result.manifest_path],
+      ["warnings", result.warnings.join(", ") || "none"]
+    ]),
+    renderList("patches", patchLines)
+  ].join(`
+`);
+}
 function renderFleetStatus(status) {
   return [
     renderKeyValueTable([
@@ -10951,6 +11120,23 @@ workspaceCommand.command("resolve").description("Resolve repo and open-files roo
   if (!result.ok && !options.json)
     process.exitCode = 1;
 });
+workspaceCommand.command("repair").description("Preview or write explicit manifest path mappings for inferred workspace roots").requiredOption("--machine <id>", "Machine identifier").requiredOption("--project <id>", "Canonical project id").option("--repo <name>", "Repository name; defaults to project id").option("--open-files-repo <name>", "Open-files repository name", "open-files").option("--workspace-root <path>", "Override the machine workspace root for resolution").option("--project-root <path>", "Explicit project root to write").option("--open-files-root <path>", "Explicit open-files root to write").option("--apply", "Write the mappings into the manifest", false).option("--allow-untrusted", "Allow writing mappings for machines not marked trusted", false).option("--no-tailscale", "Skip tailscale status probing").option("-j, --json", "Print JSON output", false).action((options) => {
+  const result = repairWorkspaceManifestMappings({
+    machineId: options.machine,
+    projectId: options.project,
+    repoName: options.repo,
+    openFilesRepoName: options.openFilesRepo,
+    workspaceRoot: options.workspaceRoot,
+    projectRoot: options.projectRoot,
+    openFilesRoot: options.openFilesRoot,
+    apply: options.apply,
+    allowUntrusted: options.allowUntrusted,
+    includeTailscale: options.tailscale !== false
+  });
+  printJsonOrText(result, renderWorkspaceRepairResult(result), options.json);
+  if (!result.ok && !options.json)
+    process.exitCode = 1;
+});
 program2.command("diff").description("Show manifest differences between two machines").requiredOption("--left <id>", "Left machine identifier").option("--right <id>", "Right machine identifier (defaults to current machine)").option("-j, --json", "Print JSON output", false).action((options) => {
   const result = diffMachines(options.left, options.right);
   console.log(JSON.stringify(result, null, 2));

package/dist/commands/workspace.d.ts

@@ -0,0 +1,37 @@
+import { type MachineWorkspaceResolution } from "../topology.js";
+export interface WorkspaceManifestRepairOptions {
+    machineId: string;
+    projectId: string;
+    repoName?: string;
+    openFilesRepoName?: string;
+    projectRoot?: string;
+    openFilesRoot?: string;
+    workspaceRoot?: string;
+    includeTailscale?: boolean;
+    apply?: boolean;
+    allowUntrusted?: boolean;
+    now?: Date;
+}
+export type WorkspaceManifestRepairStatus = "unchanged" | "would_write" | "written" | "unresolved";
+export interface WorkspaceManifestRepairPatch {
+    field: "workspace_paths" | "open_files_roots";
+    key: string;
+    path: string | null;
+    previous_path: string | null;
+    status: WorkspaceManifestRepairStatus;
+}
+export interface WorkspaceManifestRepairResult {
+    ok: boolean;
+    applied: boolean;
+    manifest_path: string;
+    machine_id: string | null;
+    project_id: string;
+    repo_name: string;
+    open_files_repo_name: string;
+    trusted: boolean;
+    resolution: MachineWorkspaceResolution;
+    patches: WorkspaceManifestRepairPatch[];
+    warnings: string[];
+}
+export declare function repairWorkspaceManifestMappings(options: WorkspaceManifestRepairOptions): WorkspaceManifestRepairResult;
+//# sourceMappingURL=workspace.d.ts.map

package/dist/commands/workspace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAG1F,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,MAAM,MAAM,6BAA6B,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,GAAG,YAAY,CAAC;AAEnG,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,CAAC;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,6BAA6B,CAAC;CACvC;AAED,MAAM,WAAW,6BAA6B;IAC5C,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,0BAA0B,CAAC;IACvC,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACxC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAqED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,8BAA8B,GAAG,6BAA6B,CAkGtH"}

package/dist/index.d.ts

@@ -23,6 +23,7 @@ export * from "./commands/setup.js";
 export * from "./commands/ssh.js";
 export * from "./commands/sync.js";
 export * from "./commands/status.js";
+export * from "./commands/workspace.js";
 export * from "./mcp/server.js";
 export { MACHINES_STORAGE_ENV, MACHINES_STORAGE_FALLBACK_ENV, MACHINES_STORAGE_MODE_ENV, MACHINES_STORAGE_MODE_FALLBACK_ENV, MACHINES_STORAGE_TABLES, STORAGE_DATABASE_ENV, STORAGE_MODE_ENV, STORAGE_TABLES, getStorageDatabaseEnv, getStorageDatabaseEnvName, getStorageDatabaseUrl, getStorageMode, getStoragePg, getStorageStatus, getSyncMetaAll, parseStorageTables, resolveTables, runStorageMigrations, storagePull, storagePush, storageSync, } from "./storage.js";
 export type { StorageEnv, StorageMode, StorageStatus, SyncMeta, SyncResult as StorageSyncResult } from "./storage.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,yBAAyB,EACzB,kCAAkC,EAClC,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,WAAW,EACX,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtH,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,yBAAyB,EACzB,kCAAkC,EAClC,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,WAAW,EACX,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtH,cAAc,cAAc,CAAC"}

package/dist/index.js

@@ -13568,6 +13568,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 +22873,7 @@ export {
   resolveMachineWorkspace,
   resolveMachineRoute,
   resolveBackupTarget,
+  repairWorkspaceManifestMappings,
   renderDomainMapping,
   renderDashboardHtml,
   removeNotificationChannel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/machines",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Machine fleet management CLI + MCP for developers",
   "type": "module",
   "license": "Apache-2.0",