@tinyrack/devsync 1.3.0 → 1.4.0

package/dist/services/set.js

@@ -1,10 +1,11 @@
 import { join } from "node:path";
 import { findOwningSyncEntry, readSyncConfig, resolveEntryRelativeRepoPath, } from "#app/config/sync.js";
+import { isExplicitLocalPath } from "#app/lib/path.js";
 import { createSyncConfigDocument, writeValidatedSyncConfig, } from "./config-file.js";
 import { DevsyncError } from "./error.js";
 import { getPathStats } from "./filesystem.js";
-import { buildConfiguredHomeLocalPath, buildRepoPathWithinRoot, isExplicitLocalPath, resolveCommandTargetPath, tryBuildRepoPathWithinRoot, tryNormalizeRepoPathInput, } from "./paths.js";
-import { ensureSyncRepository } from "./runtime.js";
+import { buildConfiguredHomeLocalPath, buildRepoPathWithinRoot, resolveCommandTargetPath, tryBuildRepoPathWithinRoot, tryNormalizeRepoPathInput, } from "./paths.js";
+import { ensureSyncRepository, resolveSyncPaths } from "./runtime.js";
 const computeLocalPath = (entry, repoPath) => {
     const relativePath = resolveEntryRelativeRepoPath(entry, repoPath);
     if (relativePath === undefined || relativePath === "") {
@@ -12,7 +13,7 @@ const computeLocalPath = (entry, repoPath) => {
     }
     return join(entry.localPath, ...relativePath.split("/"));
 };
-export const resolveSetTarget = async (target, config, context) => {
+export const resolveSetTarget = async (target, config, environment, cwd, homeDirectory) => {
     const trimmedTarget = target.trim();
     if (trimmedTarget.length === 0) {
         throw new DevsyncError("Target path is required.", {
@@ -20,9 +21,8 @@ export const resolveSetTarget = async (target, config, context) => {
             hint: "Pass a tracked path, for example 'devsync mode ~/.ssh/id_ed25519 secret'.",
         });
     }
-    const homeDirectory = context.paths.homeDirectory;
     const explicit = isExplicitLocalPath(trimmedTarget);
-    const localTargetPath = resolveCommandTargetPath(trimmedTarget, context.environment, context.cwd);
+    const localTargetPath = resolveCommandTargetPath(trimmedTarget, environment, cwd);
     const localRepoPath = explicit
         ? buildRepoPathWithinRoot(localTargetPath, homeDirectory, "Sync set target")
         : tryBuildRepoPathWithinRoot(localTargetPath, homeDirectory, "Sync set target");
@@ -107,22 +107,23 @@ export const resolveSetTarget = async (target, config, context) => {
         stats: await getPathStats(localPath),
     };
 };
-export const setSyncTargetMode = async (request, context) => {
-    await ensureSyncRepository(context);
-    const config = await readSyncConfig(context.paths.syncDirectory, context.environment);
-    const target = await resolveSetTarget(request.target, config, context);
+export const setSyncTargetMode = async (request, environment, cwd) => {
+    const { syncDirectory, configPath, homeDirectory } = resolveSyncPaths(environment);
+    await ensureSyncRepository(syncDirectory);
+    const config = await readSyncConfig(syncDirectory, environment);
+    const target = await resolveSetTarget(request.target, config, environment, cwd, homeDirectory);
     const buildResult = (action, extras) => ({
         action,
-        configPath: context.paths.configPath,
+        configPath,
         entryRepoPath: target.entry.repoPath,
         localPath: target.localPath,
-        mode: request.state,
+        mode: request.mode,
         repoPath: target.repoPath,
-        syncDirectory: context.paths.syncDirectory,
+        syncDirectory,
         ...extras,
     });
     if (target.relativePath === "") {
-        const action = target.entry.mode === request.state ? "unchanged" : "updated";
+        const action = target.entry.mode === request.mode ? "unchanged" : "updated";
         const nextConfig = createSyncConfigDocument({
             ...config,
             entries: config.entries.map((entry) => {
@@ -131,12 +132,12 @@ export const setSyncTargetMode = async (request, context) => {
                 }
                 return {
                     ...entry,
-                    mode: request.state,
+                    mode: request.mode,
                 };
             }),
         });
         if (action !== "unchanged") {
-            await writeValidatedSyncConfig(context.paths.syncDirectory, nextConfig, context.environment);
+            await writeValidatedSyncConfig(syncDirectory, nextConfig, environment);
         }
         return buildResult(action);
     }
@@ -145,7 +146,7 @@ export const setSyncTargetMode = async (request, context) => {
     const childConfiguredLocalPath = buildConfiguredHomeLocalPath(childRepoPath);
     const existingChild = config.entries.find((e) => e.repoPath === childRepoPath);
     if (existingChild !== undefined) {
-        if (existingChild.mode === request.state) {
+        if (existingChild.mode === request.mode) {
             return buildResult("unchanged", { reason: "already-set" });
         }
         const nextConfig = createSyncConfigDocument({
@@ -154,31 +155,30 @@ export const setSyncTargetMode = async (request, context) => {
                 if (entry.repoPath !== childRepoPath) {
                     return entry;
                 }
-                return { ...entry, mode: request.state };
+                return { ...entry, mode: request.mode };
             }),
         });
-        await writeValidatedSyncConfig(context.paths.syncDirectory, nextConfig, context.environment);
+        await writeValidatedSyncConfig(syncDirectory, nextConfig, environment);
         return buildResult("updated");
     }
-    if (request.state === target.entry.mode) {
+    if (request.mode === target.entry.mode) {
         return buildResult("unchanged");
     }
     const newEntry = {
         configuredLocalPath: childConfiguredLocalPath,
         kind: childKind,
         localPath: target.localPath,
-        machines: [],
-        machinesExplicit: false,
-        mode: request.state,
+        profiles: [],
+        profilesExplicit: false,
+        mode: request.mode,
         modeExplicit: true,
-        name: childRepoPath,
         repoPath: childRepoPath,
     };
     const nextConfig = createSyncConfigDocument({
         ...config,
         entries: [...config.entries, newEntry],
     });
-    await writeValidatedSyncConfig(context.paths.syncDirectory, nextConfig, context.environment);
+    await writeValidatedSyncConfig(syncDirectory, nextConfig, environment);
     return buildResult("added");
 };
 //# sourceMappingURL=set.js.map

package/dist/services/set.js.map

@@ -1 +1 @@
-{"version":3,"file":"set.js","sourceRoot":"","sources":["../../src/services/set.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"set.js","sourceRoot":"","sources":["../../src/services/set.ts"],"names":[],"mappings":"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"}

package/dist/services/status.d.ts

@@ -1,17 +1,15 @@
-import type { SyncConfigEntryKind, SyncMode } from "#app/config/sync.js";
+import { type SyncConfigEntryKind, type SyncMode } from "#app/config/sync.js";
 import { buildPullResultFromPlan } from "./pull.js";
 import { buildPushResultFromPlan } from "./push.js";
-import { type SyncContext } from "./runtime.js";
 export type SyncStatusEntry = Readonly<{
     kind: SyncConfigEntryKind;
     localPath: string;
-    machines: readonly string[];
+    profiles: readonly string[];
     mode: SyncMode;
-    name: string;
     repoPath: string;
 }>;
 export type SyncStatusResult = Readonly<{
-    activeMachine?: string;
+    activeProfile?: string;
     configPath: string;
     entries: readonly SyncStatusEntry[];
     entryCount: number;
@@ -24,7 +22,7 @@ export type SyncStatusResult = Readonly<{
     recipientCount: number;
     syncDirectory: string;
 }>;
-export declare const getSyncStatus: (context: SyncContext, options?: Readonly<{
-    machine?: string;
+export declare const getSyncStatus: (environment: NodeJS.ProcessEnv, options?: Readonly<{
+    profile?: string;
 }>) => Promise<SyncStatusResult>;
 //# sourceMappingURL=status.d.ts.map

package/dist/services/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEzE,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,aAAa,GACxB,SAAS,WAAW,EACpB,UAAS,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAM,KACN,OAAO,CAAC,gBAAgB,CAmC1B,CAAC"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,WAAW,CAAC;AAOnB,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAAG;QACjD,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,CAAC,UAAU,EAC9B,UAAS,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAM,KACN,OAAO,CAAC,gBAAgB,CAsC1B,CAAC"}

package/dist/services/status.js

@@ -1,35 +1,37 @@
+import { resolveSyncConfigFilePath, } from "#app/config/sync.js";
 import { buildPullPlan, buildPullPlanPreview, buildPullResultFromPlan, } from "./pull.js";
 import { buildPushPlan, buildPushPlanPreview, buildPushResultFromPlan, } from "./push.js";
-import { ensureSyncRepository, loadSyncConfig, } from "./runtime.js";
-export const getSyncStatus = async (context, options = {}) => {
-    await ensureSyncRepository(context);
-    const { effectiveConfig, fullConfig } = await loadSyncConfig(context, options);
-    const pushPlan = await buildPushPlan(effectiveConfig, context);
-    const pullPlan = await buildPullPlan(effectiveConfig, context);
+import { ensureSyncRepository, loadSyncConfig, resolveSyncPaths, } from "./runtime.js";
+export const getSyncStatus = async (environment, options = {}) => {
+    const { syncDirectory } = resolveSyncPaths(environment);
+    const configPath = resolveSyncConfigFilePath(syncDirectory);
+    await ensureSyncRepository(syncDirectory);
+    const { effectiveConfig, fullConfig } = await loadSyncConfig(syncDirectory, environment, options);
+    const pushPlan = await buildPushPlan(effectiveConfig, syncDirectory);
+    const pullPlan = await buildPullPlan(effectiveConfig, syncDirectory);
     return {
-        ...(effectiveConfig.activeMachine === undefined
+        ...(effectiveConfig.activeProfile === undefined
             ? {}
-            : { activeMachine: effectiveConfig.activeMachine }),
-        configPath: context.paths.configPath,
+            : { activeProfile: effectiveConfig.activeProfile }),
+        configPath,
         entries: fullConfig.entries.map((entry) => ({
             kind: entry.kind,
             localPath: entry.localPath,
-            machines: entry.machines,
+            profiles: entry.profiles,
             mode: entry.mode,
-            name: entry.name,
             repoPath: entry.repoPath,
         })),
         entryCount: fullConfig.entries.length,
         pull: {
-            ...buildPullResultFromPlan(pullPlan, context, true),
+            ...buildPullResultFromPlan(pullPlan, syncDirectory, true),
             preview: buildPullPlanPreview(pullPlan),
         },
         push: {
-            ...buildPushResultFromPlan(pushPlan, context, true),
+            ...buildPushResultFromPlan(pushPlan, syncDirectory, true),
             preview: buildPushPlanPreview(pushPlan),
         },
         recipientCount: effectiveConfig.age.recipients.length,
-        syncDirectory: context.paths.syncDirectory,
+        syncDirectory,
     };
 };
 //# sourceMappingURL=status.js.map

package/dist/services/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,oBAAoB,EACpB,cAAc,GAEf,MAAM,cAAc,CAAC;AA0BtB,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,OAAoB,EACpB,UAEK,EAAE,EACoB,EAAE;IAC7B,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,cAAc,CAC1D,OAAO,EACP,OAAO,CACR,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO;QACL,GAAG,CAAC,eAAe,CAAC,aAAa,KAAK,SAAS;YAC7C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,aAAa,EAAE,eAAe,CAAC,aAAa,EAAE,CAAC;QACrD,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;QACpC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;QACrC,IAAI,EAAE;YACJ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;YACnD,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;SACxC;QACD,IAAI,EAAE;YACJ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;YACnD,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;SACxC;QACD,cAAc,EAAE,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM;QACrD,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;KAC3C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/services/status.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,GAG1B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAyBtB,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,WAA8B,EAC9B,UAEK,EAAE,EACoB,EAAE;IAC7B,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAE5D,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAE1C,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,cAAc,CAC1D,aAAa,EACb,WAAW,EACX,OAAO,CACR,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAErE,OAAO;QACL,GAAG,CAAC,eAAe,CAAC,aAAa,KAAK,SAAS;YAC7C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,aAAa,EAAE,eAAe,CAAC,aAAa,EAAE,CAAC;QACrD,UAAU;QACV,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;QACrC,IAAI,EAAE;YACJ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC;YACzD,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;SACxC;QACD,IAAI,EAAE;YACJ,GAAG,uBAAuB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC;YACzD,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;SACxC;QACD,cAAc,EAAE,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM;QACrD,aAAa;KACd,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinyrack/devsync",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A personal CLI tool for git-backed configuration sync.",
   "type": "module",
   "license": "MIT",
@@ -75,18 +75,18 @@
     "release:major": "npm version major -m \"chore(release): %s\""
   },
   "dependencies": {
-    "@oclif/core": "^4.9.0",
-    "@oclif/plugin-autocomplete": "^3.2.41",
+    "@oclif/core": "^4.10.2",
+    "@oclif/plugin-autocomplete": "^3.2.42",
     "age-encryption": "^0.3.0",
     "picocolors": "^1.1.1",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.8",
-    "@types/node": "^25.5.0",
-    "@vitest/coverage-v8": "^4.1.0",
+    "@types/node": "^24.12.0",
+    "@vitest/coverage-v8": "^4.1.1",
     "execa": "^9.6.1",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.0"
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.1"
   }
 }

package/dist/cli/commands/machine/list.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/machine/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW;IACtD,OAAuB,OAAO,SAA8C;IAE5E,OAAuB,WAAW,SACgH;IAE5H,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAK3C"}

package/dist/cli/commands/machine/list.js

@@ -1,12 +0,0 @@
-import { BaseCommand } from "#app/cli/base-command.js";
-import { formatSyncMachineListResult } from "#app/lib/output.js";
-import { listSyncMachines } from "#app/services/machine.js";
-import { createSyncContext } from "#app/services/runtime.js";
-export default class SyncMachineList extends BaseCommand {
-    static summary = "Show configured and active sync machines";
-    static description = "List the machine names referenced by the current sync configuration and show which machine is active through ~/.config/devsync/settings.json.";
-    async run() {
-        this.print(formatSyncMachineListResult(await listSyncMachines(createSyncContext())));
-    }
-}
-//# sourceMappingURL=list.js.map

package/dist/cli/commands/machine/list.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/cli/commands/machine/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW;IAC/C,MAAM,CAAU,OAAO,GAAG,0CAA0C,CAAC;IAErE,MAAM,CAAU,WAAW,GAChC,+IAA+I,CAAC;IAElI,KAAK,CAAC,GAAG;QACvB,IAAI,CAAC,KAAK,CACR,2BAA2B,CAAC,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC,CACzE,CAAC;IACJ,CAAC"}

package/dist/cli/commands/machine/use.js

@@ -1,28 +0,0 @@
-import { Args } from "@oclif/core";
-import { BaseCommand } from "#app/cli/base-command.js";
-import { formatSyncMachineUpdateResult } from "#app/lib/output.js";
-import { clearSyncMachines, useSyncMachine } from "#app/services/machine.js";
-import { createSyncContext } from "#app/services/runtime.js";
-export default class SyncMachineUse extends BaseCommand {
-    static summary = "Set or clear the active sync machine";
-    static description = "Write ~/.config/devsync/settings.json so plain push, pull, status, and doctor commands use the selected machine layer by default. Omit the machine name to clear the active machine.";
-    static examples = [
-        "<%= config.bin %> <%= command.id %> work",
-        "<%= config.bin %> <%= command.id %>",
-    ];
-    static args = {
-        machine: Args.string({
-            description: "Machine name to activate (omit to clear)",
-            required: false,
-        }),
-    };
-    async run() {
-        const { args } = await this.parse(SyncMachineUse);
-        const context = createSyncContext();
-        const result = args.machine !== undefined
-            ? await useSyncMachine(args.machine, context)
-            : await clearSyncMachines(context);
-        this.print(formatSyncMachineUpdateResult(result));
-    }
-}
-//# sourceMappingURL=use.js.map

package/dist/cli/commands/machine/use.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/cli/commands/machine/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAW;IAC9C,MAAM,CAAU,OAAO,GAAG,sCAAsC,CAAC;IAEjE,MAAM,CAAU,WAAW,GAChC,sLAAsL,CAAC;IAElL,MAAM,CAAU,QAAQ,GAAG;QAChC,0CAA0C;QAC1C,qCAAqC;KACtC,CAAC;IAEK,MAAM,CAAU,IAAI,GAAG;QAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;YACnB,WAAW,EAAE,0CAA0C;YACvD,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH,CAAC;IAEc,KAAK,CAAC,GAAG;QACvB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QACpC,MAAM,MAAM,GACV,IAAI,CAAC,OAAO,KAAK,SAAS;YACxB,CAAC,CAAC,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC;YAC7C,CAAC,CAAC,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC"}

package/dist/services/machine.d.ts

@@ -1,40 +0,0 @@
-import { type SyncContext } from "./runtime.js";
-export type SyncMachineAssignment = Readonly<{
-    entryLocalPath: string;
-    entryRepoPath: string;
-    machines: readonly string[];
-}>;
-export type SyncMachineListResult = Readonly<{
-    activeMachine?: string;
-    activeMachinesMode: "none" | "single";
-    assignments: readonly SyncMachineAssignment[];
-    availableMachines: readonly string[];
-    globalConfigExists: boolean;
-    globalConfigPath: string;
-    syncDirectory: string;
-}>;
-export type SyncMachineUpdateResult = Readonly<{
-    activeMachine?: string;
-    globalConfigPath: string;
-    mode: "clear" | "use";
-    machine?: string;
-    syncDirectory: string;
-    warning?: string;
-}>;
-type SyncMachineAssignRequest = Readonly<{
-    machines: readonly string[];
-    target: string;
-}>;
-type SyncMachineAssignResult = Readonly<{
-    action: "assigned" | "unchanged";
-    configPath: string;
-    entryRepoPath: string;
-    machines: readonly string[];
-    syncDirectory: string;
-}>;
-export declare const listSyncMachines: (context: SyncContext) => Promise<SyncMachineListResult>;
-export declare const useSyncMachine: (machine: string, context: SyncContext) => Promise<SyncMachineUpdateResult>;
-export declare const clearSyncMachines: (context: SyncContext) => Promise<SyncMachineUpdateResult>;
-export declare const assignSyncMachines: (request: SyncMachineAssignRequest, context: SyncContext) => Promise<SyncMachineAssignResult>;
-export {};
-//# sourceMappingURL=machine.d.ts.map

package/dist/services/machine.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../src/services/machine.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtE,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,GAAG,QAAQ,CAAC;IACtC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC9C,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,KAAK,wBAAwB,GAAG,QAAQ,CAAC;IACvC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACtC,MAAM,EAAE,UAAU,GAAG,WAAW,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,eAAO,MAAM,gBAAgB,GAC3B,SAAS,WAAW,KACnB,OAAO,CAAC,qBAAqB,CA6B/B,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,MAAM,EACf,SAAS,WAAW,KACnB,OAAO,CAAC,uBAAuB,CA8BjC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAajC,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,SAAS,wBAAwB,EACjC,SAAS,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAsEjC,CAAC"}

package/dist/services/machine.js

@@ -1,113 +0,0 @@
-import { formatGlobalDevsyncConfig, readGlobalDevsyncConfig, } from "#app/config/global-config.js";
-import { collectAllMachineNames, normalizeSyncMachineName, readSyncConfig, } from "#app/config/sync.js";
-import { createSyncConfigDocument, writeValidatedSyncConfig, } from "./config-file.js";
-import { DevsyncError } from "./error.js";
-import { writeTextFileAtomically } from "./filesystem.js";
-import { resolveTrackedEntry } from "./paths.js";
-import { ensureSyncRepository } from "./runtime.js";
-export const listSyncMachines = async (context) => {
-    await ensureSyncRepository(context);
-    const [globalConfig, syncConfig] = await Promise.all([
-        readGlobalDevsyncConfig(context.environment),
-        readSyncConfig(context.paths.syncDirectory, context.environment),
-    ]);
-    return {
-        ...(globalConfig?.activeMachine === undefined
-            ? {}
-            : { activeMachine: globalConfig.activeMachine }),
-        activeMachinesMode: globalConfig?.activeMachine === undefined ? "none" : "single",
-        assignments: syncConfig.entries
-            .filter((entry) => entry.machinesExplicit && entry.machines.length > 0)
-            .map((entry) => ({
-            entryLocalPath: entry.localPath,
-            entryRepoPath: entry.repoPath,
-            machines: entry.machines,
-        }))
-            .sort((left, right) => left.entryRepoPath.localeCompare(right.entryRepoPath)),
-        availableMachines: collectAllMachineNames(syncConfig.entries),
-        globalConfigExists: globalConfig !== undefined,
-        globalConfigPath: context.paths.globalConfigPath,
-        syncDirectory: context.paths.syncDirectory,
-    };
-};
-export const useSyncMachine = async (machine, context) => {
-    const normalizedMachine = normalizeSyncMachineName(machine);
-    await ensureSyncRepository(context);
-    const syncConfig = await readSyncConfig(context.paths.syncDirectory, context.environment);
-    const knownMachines = collectAllMachineNames(syncConfig.entries);
-    const warning = knownMachines.includes(normalizedMachine)
-        ? undefined
-        : `Machine '${normalizedMachine}' is not referenced by any tracked entry.`;
-    await writeTextFileAtomically(context.paths.globalConfigPath, formatGlobalDevsyncConfig({
-        activeMachine: normalizedMachine,
-        version: 3,
-    }));
-    return {
-        activeMachine: normalizedMachine,
-        globalConfigPath: context.paths.globalConfigPath,
-        mode: "use",
-        machine: normalizedMachine,
-        syncDirectory: context.paths.syncDirectory,
-        ...(warning !== undefined ? { warning } : {}),
-    };
-};
-export const clearSyncMachines = async (context) => {
-    await ensureSyncRepository(context);
-    await writeTextFileAtomically(context.paths.globalConfigPath, formatGlobalDevsyncConfig({ version: 3 }));
-    return {
-        globalConfigPath: context.paths.globalConfigPath,
-        mode: "clear",
-        syncDirectory: context.paths.syncDirectory,
-    };
-};
-export const assignSyncMachines = async (request, context) => {
-    const target = request.target.trim();
-    if (target.length === 0) {
-        throw new DevsyncError("Target path is required.", {
-            code: "TARGET_REQUIRED",
-            hint: "Pass a tracked entry path, for example 'devsync track ~/.gitconfig --machine default --machine work'.",
-        });
-    }
-    await ensureSyncRepository(context);
-    const config = await readSyncConfig(context.paths.syncDirectory, context.environment);
-    const entry = resolveTrackedEntry(target, config.entries, context);
-    if (entry === undefined) {
-        throw new DevsyncError(`No tracked sync entry matches: ${target}`, {
-            code: "TARGET_NOT_TRACKED",
-            hint: "Track the root first with 'devsync track'.",
-        });
-    }
-    const normalizedMachines = request.machines.map((m) => normalizeSyncMachineName(m));
-    if (entry.machines.length === normalizedMachines.length &&
-        normalizedMachines.every((m) => entry.machines.includes(m))) {
-        return {
-            action: "unchanged",
-            configPath: context.paths.configPath,
-            entryRepoPath: entry.repoPath,
-            machines: normalizedMachines,
-            syncDirectory: context.paths.syncDirectory,
-        };
-    }
-    const nextConfig = createSyncConfigDocument({
-        ...config,
-        entries: config.entries.map((e) => {
-            if (e.repoPath !== entry.repoPath) {
-                return e;
-            }
-            return {
-                ...e,
-                machines: normalizedMachines,
-                machinesExplicit: normalizedMachines.length > 0,
-            };
-        }),
-    });
-    await writeValidatedSyncConfig(context.paths.syncDirectory, nextConfig, context.environment);
-    return {
-        action: "assigned",
-        configPath: context.paths.configPath,
-        entryRepoPath: entry.repoPath,
-        machines: normalizedMachines,
-        syncDirectory: context.paths.syncDirectory,
-    };
-};
-//# sourceMappingURL=machine.js.map

package/dist/services/machine.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/services/machine.ts"],"names":[],"mappings":"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"}