@tinyrack/devsync 1.3.0 → 1.4.0

package/README.md

@@ -1,26 +1,27 @@
 # devsync
 
-`devsync` is a cross-platform CLI for managing the configuration files in your home directory with git and syncing them across multiple machines.
+`devsync` is a cross-platform CLI for managing the configuration files in your home directory with git and syncing them across multiple devices.
 
-Instead of treating the repository as the source of truth, `devsync` treats your actual local config as the truth. You choose files and directories under `HOME`, `devsync` mirrors them into a git-backed sync repository, and later restores that repository onto another machine when you need it.
+Instead of treating the repository as the source of truth, `devsync` treats your actual local config as the truth. You choose files and directories under `HOME`, `devsync` mirrors them into a git-backed sync repository, and later restores that repository onto another device when you need it.
 
 ## 1. Purpose and how it differs
 
-Most dotfiles tools start from the repository and ask you to shape your local machine around it.
+Most dotfiles tools start from the repository and ask you to shape your local system around it.
 
 `devsync` takes the opposite approach:
 
 - Your real config under `HOME` is the source of truth.
 - The git repository is a sync artifact, not the primary authoring location.
-- `push` captures your current machine state into the repository.
-- `pull` applies the repository back onto another machine.
+- `push` captures your current local state into the repository.
+- `pull` applies the repository back onto another device.
 
 That makes `devsync` a good fit when you want to:
 
 - manage existing dotfiles and app configs without reorganizing your home directory,
-- keep machine-specific config workflows intact,
+- keep profile-specific config workflows intact,
 - sync plain files and encrypted secrets together,
-- use normal git remotes as the transport layer between PCs.
+- use normal git remotes as the transport layer between PCs,
+- handle platform-specific paths across Windows, macOS, and Linux.
 
 Core capabilities:
 
@@ -28,6 +29,8 @@ Core capabilities:
 - store synced artifacts in `~/.config/devsync/sync`,
 - mark paths as `normal`, `secret`, or `ignore`,
 - encrypt secret artifacts with `age`,
+- assign entries to profiles so different machines sync different subsets,
+- support platform-specific local paths per entry,
 - preview both directions with `status`, `push --dry-run`, and `pull --dry-run`.
 
 ## 2. Installation
@@ -71,9 +74,9 @@ devsync init
 Track a few configs:
 
 ```bash
-devsync add ~/.gitconfig
-devsync add ~/.zshrc
-devsync add ~/.config/mytool --secret
+devsync track ~/.gitconfig
+devsync track ~/.zshrc
+devsync track ~/.config/mytool --mode secret
 ```
 
 Review what would be captured:
@@ -92,14 +95,13 @@ devsync push
 Open the sync repository and publish it with git:
 
 ```bash
-devsync cd
-git status
+cd "$(devsync dir)"
 git add .
 git commit -m "Update synced config"
 git push
 ```
 
-On another machine, clone and restore from the same repo:
+On another device, clone and restore from the same repo:
 
 ```bash
 devsync init https://example.com/my-sync-repo.git
@@ -118,7 +120,7 @@ Notes:
 
 ### How tracking works
 
-- You add files or directories that live under your home directory.
+- You track files or directories that live under your home directory.
 - `devsync` mirrors them into `~/.config/devsync/sync/default/<repoPath>` for the default profile, or `~/.config/devsync/sync/<profile>/<repoPath>` for a named profile.
 - Plain artifacts are stored as-is.
 - Secret artifacts are stored with the `.devsync.secret` suffix.
@@ -138,58 +140,81 @@ Each tracked path can use one of three modes:
 - `secret`: encrypt before storing in the repo
 - `ignore`: skip during push and pull
 
-You can apply modes to tracked roots or nested paths inside tracked directories.
+Set modes when tracking, or update them later:
 
-Profile-specific behavior inherits the tracked root mode and only changes nested paths inside tracked directories.
+```bash
+devsync track ~/.config/mytool --mode secret
+devsync track ~/.config/mytool/cache --mode ignore
+devsync track ~/.config/mytool/public.json --mode normal
+```
+
+Child entries inside a tracked directory inherit the parent mode unless explicitly overridden.
 
-Examples:
+### Profiles
+
+Profiles let you sync different subsets of entries on different machines. Each entry can be assigned to one or more profiles. When a profile is active, only entries assigned to that profile (plus entries with no profile restriction) are synced.
 
 ```bash
-devsync set secret ~/.config/mytool/token.json
-devsync set ignore ~/.config/mytool/cache --recursive
-devsync set normal ~/.config/mytool/public.json
-devsync set secret ~/.config/mytool/token.json --profile work
+devsync track ~/.ssh/config --mode secret --profile work
+devsync track ~/.gitconfig --profile work --profile personal
+devsync track ~/.zshrc
+devsync profile use work
+devsync profile list
 ```
 
-### Profile-specific overrides
+Key behaviors:
+
+- Entries without `--profile` are synced on all profiles (including when no profile is active).
+- Entries with `--profile` are only synced when one of the listed profiles is active.
+- Pass `--profile ''` to clear profile restrictions from an entry.
+- The `default` profile namespace is reserved for entries with no profile restriction.
+- Commands like `push`, `pull`, and `status` accept `--profile` to override the active profile for a single operation.
 
-- Track the root once without `--profile`.
-- Use `devsync set --profile <name>` only for child paths inside tracked directories.
-- Profile-specific rules inherit the parent root mode and only override nested paths.
-- Named profile artifacts are stored under `<profile>/<repoPath>`.
-- `default` is reserved for the base layout and cannot be used as a named profile.
-- Standalone profiled roots and profiled file entries are not supported.
+### Platform-specific paths
 
-Example `config.json`:
+Entries can specify different local paths per platform, so the same sync config works across Windows, macOS, and Linux:
+
+Example `manifest.json`:
 
 ```json
 {
-  "version": 1,
+  "version": 6,
   "age": {
     "identityFile": "$XDG_CONFIG_HOME/devsync/age/keys.txt",
     "recipients": ["age1example..."]
   },
   "entries": [
+    {
+      "kind": "file",
+      "localPath": {
+        "default": "~/.gitconfig",
+        "win": "%USERPROFILE%/.gitconfig"
+      },
+      "mode": "normal"
+    },
     {
       "kind": "directory",
-      "localPath": "~/.config/mytool",
-      "mode": "normal",
-      "overrides": {
-        "cache/": "ignore"
+      "localPath": {
+        "default": "~/.config/mytool",
+        "win": "%APPDATA%/mytool"
       },
-      "profiles": {
-        "work": {
-          "overrides": {
-            "token.json": "secret"
-          }
-        }
+      "mode": "normal",
+      "profiles": ["work"]
+    },
+    {
+      "kind": "file",
+      "localPath": {
+        "default": "~/.config/mytool/token.json"
       },
-      "repoPath": ".config/mytool"
+      "mode": "secret",
+      "profiles": ["work"]
     }
   ]
 }
 ```
 
+The `localPath` object supports `default`, `win`, `mac`, and `linux` keys. The `default` key is required and is used as a fallback when no platform-specific path is set for the current OS.
+
 ### Common workflow
 
 Check what changed:
@@ -204,7 +229,7 @@ Capture local config into the repository:
 devsync push
 ```
 
-Restore repository state onto the machine:
+Restore repository state locally:
 
 ```bash
 devsync pull
@@ -217,6 +242,14 @@ devsync push --dry-run
 devsync pull --dry-run
 ```
 
+Override the active profile for a single operation:
+
+```bash
+devsync push --profile work
+devsync pull --profile personal
+devsync status --profile work
+```
+
 ### Command reference
 
 #### `init`
@@ -229,47 +262,31 @@ devsync init https://example.com/my-sync-repo.git
 devsync init --identity "$XDG_CONFIG_HOME/devsync/age/keys.txt" --recipient age1...
 ```
 
-#### `add`
+#### `track`
 
 Track a file or directory under your home directory.
 
 ```bash
-devsync add ~/.gitconfig
-devsync add ~/.config/mytool
-devsync add ~/.config/mytool --secret
+devsync track ~/.gitconfig
+devsync track ~/.gitconfig ~/.zshrc ~/.config/nvim
+devsync track ~/.ssh/config --mode secret
+devsync track ~/.ssh/config --mode secret --profile work
+devsync track ~/.config/mytool/cache --mode ignore
 ```
 
-`add --profile` is not supported for tracked roots. Track the root first, then use `set --profile` for child overrides.
+If the target is already tracked, its mode is updated. Targets may also be repository paths inside a tracked directory to create child entries with a specific mode.
 
-#### `set`
+#### `untrack`
 
-Change the sync mode for a tracked root, child path, or subtree.
+Remove a tracked entry from the sync config.
 
 ```bash
-devsync set secret ~/.config/mytool/token.json
-devsync set ignore ~/.config/mytool/cache --recursive
-devsync set secret ~/.config/mytool/token.json --profile work
+devsync untrack ~/.gitconfig
+devsync untrack ~/.config/mytool
+devsync untrack .config/mytool/token.json
 ```
 
-With `--profile`, the target must be a child path inside a tracked directory, and `default` cannot be used as the profile name. Profile-specific root mode changes are not supported.
-
-#### `forget`
-
-Remove a tracked path or nested override from config.
-
-```bash
-devsync forget ~/.gitconfig
-devsync forget ~/.config/mytool
-devsync forget .config/mytool/token.json --profile work
-```
-
-#### `list`
-
-Show tracked entries, default modes, root overrides, and profile-specific child overrides.
-
-```bash
-devsync list
-```
+This only updates the sync config; actual file changes happen on the next push or pull.
 
 #### `status`
 
@@ -277,6 +294,7 @@ Preview planned push and pull changes.
 
 ```bash
 devsync status
+devsync status --profile work
 ```
 
 #### `doctor`
@@ -294,24 +312,45 @@ Write local state into the sync repository.
 ```bash
 devsync push
 devsync push --dry-run
+devsync push --profile work
 ```
 
 #### `pull`
 
-Apply repository state back onto the local machine.
+Apply repository state back onto local paths.
 
 ```bash
 devsync pull
 devsync pull --dry-run
+devsync pull --profile work
+```
+
+#### `profile list`
+
+Show configured profiles and which one is active.
+
+```bash
+devsync profile list
 ```
 
-#### `cd`
+#### `profile use`
+
+Set or clear the active sync profile.
+
+```bash
+devsync profile use work
+devsync profile use
+```
+
+Omit the profile name to clear the active profile.
+
+#### `dir`
 
-Open the sync repository in your shell, or print its path.
+Print the sync repository path.
 
 ```bash
-devsync cd
-devsync cd --print
+devsync dir
+cd "$(devsync dir)"
 ```
 
 For flag-level details, use built-in help:
@@ -319,8 +358,7 @@ For flag-level details, use built-in help:
 ```bash
 devsync --help
 devsync init --help
-devsync add --help
-devsync set --help
+devsync track --help
 ```
 
 ## Development

package/dist/cli/base-command.d.ts

@@ -6,6 +6,9 @@ type CommandError = Error & {
     };
 };
 export declare abstract class BaseCommand extends Command {
+    static baseFlags: {
+        verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     protected print(output: string): void;
     protected printError(message: Error | string): void;
     catch(error: CommandError): Promise<unknown>;

package/dist/cli/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/cli/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAStC,KAAK,YAAY,GAAG,KAAK,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAMF,8BAAsB,WAAY,SAAQ,OAAO;IAC/C,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;IAI9B,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM;IAItB,KAAK,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAQnE"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/cli/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAS7C,KAAK,YAAY,GAAG,KAAK,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAMF,8BAAsB,WAAY,SAAQ,OAAO;IAC/C,OAAuB,SAAS;;MAK9B;IAEF,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;IAI9B,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM;IAItB,KAAK,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAQnE"}

package/dist/cli/base-command.js

@@ -1,10 +1,16 @@
-import { Command } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import { formatErrorMessage, writeStderr, writeStdout, } from "#app/lib/output.js";
 import { formatDevsyncError } from "#app/services/error.js";
 const resolveExitCode = (error) => {
     return error.oclif?.exit ?? error.exitCode ?? 1;
 };
 export class BaseCommand extends Command {
+    static baseFlags = {
+        verbose: Flags.boolean({
+            default: false,
+            summary: "Show detailed output including file paths",
+        }),
+    };
     print(output) {
         writeStdout(output);
     }

package/dist/cli/base-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/cli/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAS5D,MAAM,eAAe,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC9C,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,OAAgB,WAAY,SAAQ,OAAO;IACrC,KAAK,CAAC,MAAc;QAC5B,WAAW,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAES,UAAU,CAAC,OAAuB;QAC1C,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC;IAEe,KAAK,CAAC,KAAK,CAAC,KAAmB;QAC7C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;CACF"}
+{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/cli/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAS5D,MAAM,eAAe,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC9C,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,OAAgB,WAAY,SAAQ,OAAO;IACxC,MAAM,CAAU,SAAS,GAAG;QACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,2CAA2C;SACrD,CAAC;KACH,CAAC;IAEQ,KAAK,CAAC,MAAc;QAC5B,WAAW,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAES,UAAU,CAAC,OAAuB;QAC1C,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC;IAEe,KAAK,CAAC,KAAK,CAAC,KAAmB;QAC7C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC"}

package/dist/cli/commands/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,OAAuB,OAAO,SAC2C;IAEzE,OAAuB,WAAW,SACsK;IAExM,OAAuB,QAAQ,WAA2C;IAEpD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAU3C"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,OAAuB,OAAO,SAC2C;IAEzE,OAAuB,WAAW,SACsK;IAExM,OAAuB,QAAQ,WAA2C;IAEpD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAU3C"}

package/dist/cli/commands/doctor.js

@@ -1,15 +1,14 @@
 import { BaseCommand } from "#app/cli/base-command.js";
 import { formatSyncDoctorResult } from "#app/lib/output.js";
 import { runSyncDoctor } from "#app/services/doctor.js";
-import { createSyncContext } from "#app/services/runtime.js";
 export default class SyncDoctor extends BaseCommand {
     static summary = "Check sync repository, config, age identity, and tracked local paths";
     static description = "Run health checks for the local sync setup, including repository availability, config validity, age identity configuration, and whether tracked local paths still exist where devsync expects them.";
     static examples = ["<%= config.bin %> <%= command.id %>"];
     async run() {
-        await this.parse(SyncDoctor);
-        const result = await runSyncDoctor(createSyncContext());
-        this.print(formatSyncDoctorResult(result));
+        const { flags } = await this.parse(SyncDoctor);
+        const result = await runSyncDoctor(process.env);
+        this.print(formatSyncDoctorResult(result, { verbose: flags.verbose }));
         if (result.hasFailures) {
             this.exit(1);
         }

package/dist/cli/commands/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IAC1C,MAAM,CAAU,OAAO,GAC5B,sEAAsE,CAAC;IAElE,MAAM,CAAU,WAAW,GAChC,qMAAqM,CAAC;IAEjM,MAAM,CAAU,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAE1D,KAAK,CAAC,GAAG;QACvB,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC;QAE3C,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;IACH,CAAC"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IAC1C,MAAM,CAAU,OAAO,GAC5B,sEAAsE,CAAC;IAElE,MAAM,CAAU,WAAW,GAChC,qMAAqM,CAAC;IAEjM,MAAM,CAAU,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAE1D,KAAK,CAAC,GAAG;QACvB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAEvE,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;IACH,CAAC"}

package/dist/cli/commands/index.d.ts

@@ -1,8 +1,8 @@
 import SyncDir from "#app/cli/commands/dir.js";
 import SyncDoctor from "#app/cli/commands/doctor.js";
 import SyncInit from "#app/cli/commands/init.js";
-import SyncMachineList from "#app/cli/commands/machine/list.js";
-import SyncMachineUse from "#app/cli/commands/machine/use.js";
+import SyncProfileList from "#app/cli/commands/profile/list.js";
+import SyncProfileUse from "#app/cli/commands/profile/use.js";
 import SyncPull from "#app/cli/commands/pull.js";
 import SyncPush from "#app/cli/commands/push.js";
 import SyncStatus from "#app/cli/commands/status.js";
@@ -12,8 +12,8 @@ export declare const COMMANDS: {
     dir: typeof SyncDir;
     doctor: typeof SyncDoctor;
     init: typeof SyncInit;
-    "machine:list": typeof SyncMachineList;
-    "machine:use": typeof SyncMachineUse;
+    "profile:list": typeof SyncProfileList;
+    "profile:use": typeof SyncProfileUse;
     pull: typeof SyncPull;
     push: typeof SyncPush;
     status: typeof SyncStatus;

package/dist/cli/commands/index.js

@@ -1,8 +1,8 @@
 import SyncDir from "#app/cli/commands/dir.js";
 import SyncDoctor from "#app/cli/commands/doctor.js";
 import SyncInit from "#app/cli/commands/init.js";
-import SyncMachineList from "#app/cli/commands/machine/list.js";
-import SyncMachineUse from "#app/cli/commands/machine/use.js";
+import SyncProfileList from "#app/cli/commands/profile/list.js";
+import SyncProfileUse from "#app/cli/commands/profile/use.js";
 import SyncPull from "#app/cli/commands/pull.js";
 import SyncPush from "#app/cli/commands/push.js";
 import SyncStatus from "#app/cli/commands/status.js";
@@ -12,8 +12,8 @@ export const COMMANDS = {
     dir: SyncDir,
     doctor: SyncDoctor,
     init: SyncInit,
-    "machine:list": SyncMachineList,
-    "machine:use": SyncMachineUse,
+    "profile:list": SyncProfileList,
+    "profile:use": SyncProfileUse,
     pull: SyncPull,
     push: SyncPush,
     status: SyncStatus,

package/dist/cli/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,OAAuB,OAAO,SAA8C;IAE5E,OAAuB,WAAW,SAC8N;IAEhQ,OAAuB,QAAQ,WAI7B;IAEF,OAAuB,IAAI;;MAKzB;IAEF,OAAuB,KAAK;;;MAc1B;IAEoB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAe3C"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,OAAuB,OAAO,SAA8C;IAE5E,OAAuB,WAAW,SAC8N;IAEhQ,OAAuB,QAAQ,WAI7B;IAEF,OAAuB,IAAI;;MAKzB;IAEF,OAAuB,KAAK;;;MAc1B;IAEoB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgB3C"}

package/dist/cli/commands/init.js

@@ -2,7 +2,6 @@ import { Args, Flags } from "@oclif/core";
 import { BaseCommand } from "#app/cli/base-command.js";
 import { formatSyncInitResult } from "#app/lib/output.js";
 import { initializeSync } from "#app/services/init.js";
-import { createSyncContext } from "#app/services/runtime.js";
 export default class SyncInit extends BaseCommand {
     static summary = "Initialize the git-backed sync directory";
     static description = "Create or connect the local devsync repository under your XDG config directory, then store the sync settings used by later pull and push operations. If you omit the repository argument, devsync initializes a local git repository in the sync directory.";
@@ -36,7 +35,7 @@ export default class SyncInit extends BaseCommand {
             identityFile: flags.identity,
             recipients: flags.recipient ?? [],
             repository: args.repository,
-        }, createSyncContext()));
+        }, process.env), { verbose: flags.verbose });
         this.print(output);
     }
 }

package/dist/cli/commands/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IACxC,MAAM,CAAU,OAAO,GAAG,0CAA0C,CAAC;IAErE,MAAM,CAAU,WAAW,GAChC,6PAA6P,CAAC;IAEzP,MAAM,CAAU,QAAQ,GAAG;QAChC,qCAAqC;QACrC,0EAA0E;QAC1E,4GAA4G;KAC7G,CAAC;IAEK,MAAM,CAAU,IAAI,GAAG;QAC5B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,kDAAkD;YAC/D,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH,CAAC;IAEK,MAAM,CAAU,KAAK,GAAG;QAC7B,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,SAAS,EAAE,MAAM;YACjB,OAAO,EAAE,mCAAmC;YAC5C,WAAW,EACT,gJAAgJ;SACnJ,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,qCAAqC;YAC9C,WAAW,EACT,uIAAuI;YACzI,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEc,KAAK,CAAC,GAAG;QACvB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,oBAAoB,CACjC,MAAM,cAAc,CAClB;YACE,YAAY,EAAE,KAAK,CAAC,QAAQ;YAC5B,UAAU,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,EACD,iBAAiB,EAAE,CACpB,CACF,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IACxC,MAAM,CAAU,OAAO,GAAG,0CAA0C,CAAC;IAErE,MAAM,CAAU,WAAW,GAChC,6PAA6P,CAAC;IAEzP,MAAM,CAAU,QAAQ,GAAG;QAChC,qCAAqC;QACrC,0EAA0E;QAC1E,4GAA4G;KAC7G,CAAC;IAEK,MAAM,CAAU,IAAI,GAAG;QAC5B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,kDAAkD;YAC/D,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH,CAAC;IAEK,MAAM,CAAU,KAAK,GAAG;QAC7B,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,SAAS,EAAE,MAAM;YACjB,OAAO,EAAE,mCAAmC;YAC5C,WAAW,EACT,gJAAgJ;SACnJ,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,qCAAqC;YAC9C,WAAW,EACT,uIAAuI;YACzI,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEc,KAAK,CAAC,GAAG;QACvB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,oBAAoB,CACjC,MAAM,cAAc,CAClB;YACE,YAAY,EAAE,KAAK,CAAC,QAAQ;YAC5B,UAAU,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,EACD,OAAO,CAAC,GAAG,CACZ,EACD,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAC3B,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC"}

package/dist/cli/commands/{machine → profile}/list.d.ts

@@ -1,5 +1,5 @@
 import { BaseCommand } from "#app/cli/base-command.js";
-export default class SyncMachineList extends BaseCommand {
+export default class SyncProfileList extends BaseCommand {
     static summary: string;
     static description: string;
     run(): Promise<void>;

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

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

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

@@ -0,0 +1,14 @@
+import { BaseCommand } from "#app/cli/base-command.js";
+import { formatSyncProfileListResult } from "#app/lib/output.js";
+import { listSyncProfiles } from "#app/services/profile.js";
+export default class SyncProfileList extends BaseCommand {
+    static summary = "Show configured and active sync profiles";
+    static description = "List the profile names referenced by the current sync configuration and show which profile is active through ~/.config/devsync/settings.json.";
+    async run() {
+        const { flags } = await this.parse(SyncProfileList);
+        this.print(formatSyncProfileListResult(await listSyncProfiles(process.env), {
+            verbose: flags.verbose,
+        }));
+    }
+}
+//# sourceMappingURL=list.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/cli/commands/profile/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;AAE5D,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,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAEpD,IAAI,CAAC,KAAK,CACR,2BAA2B,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/D,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CACH,CAAC;IACJ,CAAC"}

package/dist/cli/commands/{machine → profile}/use.d.ts

@@ -1,10 +1,10 @@
 import { BaseCommand } from "#app/cli/base-command.js";
-export default class SyncMachineUse extends BaseCommand {
+export default class SyncProfileUse extends BaseCommand {
     static summary: string;
     static description: string;
     static examples: string[];
     static args: {
-        machine: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        profile: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }

package/dist/cli/commands/{machine → profile}/use.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/machine/use.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAW;IACrD,OAAuB,OAAO,SAA0C;IAExE,OAAuB,WAAW,SACuJ;IAEzL,OAAuB,QAAQ,WAG7B;IAEF,OAAuB,IAAI;;MAKzB;IAEoB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAU3C"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/profile/use.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAW;IACrD,OAAuB,OAAO,SAA0C;IAExE,OAAuB,WAAW,SACuJ;IAEzL,OAAuB,QAAQ,WAG7B;IAEF,OAAuB,IAAI;;MAKzB;IAEoB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAW3C"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/cli/commands/profile/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;AAE7E,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,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,MAAM,GACV,IAAI,CAAC,OAAO,KAAK,SAAS;YACxB,CAAC,CAAC,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;YACjD,CAAC,CAAC,MAAM,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3C,IAAI,CAAC,KAAK,CACR,6BAA6B,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAClE,CAAC;IACJ,CAAC"}

package/dist/cli/commands/pull.d.ts

@@ -5,7 +5,7 @@ export default class SyncPull extends BaseCommand {
     static examples: string[];
     static flags: {
         "dry-run": import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        machine: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/cli/commands/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/pull.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,OAAuB,OAAO,SACiC;IAE/D,OAAuB,WAAW,SACyL;IAE3N,OAAuB,QAAQ,WAI7B;IAEF,OAAuB,KAAK;;;MAY1B;IAEoB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAc3C"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/pull.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,OAAuB,OAAO,SACiC;IAE/D,OAAuB,WAAW,SACyL;IAE3N,OAAuB,QAAQ,WAI7B;IAEF,OAAuB,KAAK;;;MAY1B;IAEoB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAe3C"}

package/dist/cli/commands/pull.js

@@ -2,32 +2,31 @@ import { Flags } from "@oclif/core";
 import { BaseCommand } from "#app/cli/base-command.js";
 import { formatSyncPullResult } from "#app/lib/output.js";
 import { pullSync } from "#app/services/pull.js";
-import { createSyncContext } from "#app/services/runtime.js";
 export default class SyncPull extends BaseCommand {
     static summary = "Apply the git-backed sync repository to local config paths";
     static description = "Read tracked artifacts from the sync repository and materialize them back onto local paths under your home directory. Secret artifacts are decrypted with the configured age identity before they are written locally.";
     static examples = [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %> --dry-run",
-        "<%= config.bin %> <%= command.id %> --machine work",
+        "<%= config.bin %> <%= command.id %> --profile work",
     ];
     static flags = {
         "dry-run": Flags.boolean({
             default: false,
             summary: "Preview local file updates only",
-            description: "Show which local files and directories devsync would create, update, or remove without touching the working machine state.",
+            description: "Show which local files and directories devsync would create, update, or remove without touching the local state.",
         }),
-        machine: Flags.string({
-            summary: "Use a specific machine layer for this command",
-            description: "Override the persisted active machine for this pull operation only.",
+        profile: Flags.string({
+            summary: "Use a specific profile layer for this command",
+            description: "Override the persisted active profile for this pull operation only.",
         }),
     };
     async run() {
         const { flags } = await this.parse(SyncPull);
         const output = formatSyncPullResult(await pullSync({
             dryRun: flags["dry-run"],
-            machine: flags.machine,
-        }, createSyncContext()));
+            profile: flags.profile,
+        }, process.env), { verbose: flags.verbose });
         this.print(output);
     }
 }