@azrico/azcli 1.2.1 → 1.2.4

package/README.md

@@ -33,7 +33,12 @@ With Yarn available on PATH, the equivalent commands are `yarn install --immutab
 | `transcripts <claude\|codex>` | Export sessions to Markdown with an `index.json`. |
 | `optimize-transcripts <claude\|codex>` | Prepare a transcript snapshot and run the selected analysis agent. |
 | `verify-changes` | Run the checks from `.azcli/verify.json` that match files changed since the base ref. Reports `passed`, `failed`, or `not-run`; exits 1 on failure (`--strict` also on not-run). `--profile`, `--base`, `--json`. |
+| `worktree start <path>` | Install the worktree's locked dependencies, pick a free port above the configured default, run the dev server detached, and wait for it to answer or exit. Reports URL, pid, compile result, and log file (inside the git dir). Fails at once if the process exits; `--timeout` bounds the wait. `--page`, `--port`, `--skip-install`. |
+| `worktree status <path>` | Branch tips and dirty files of the worktree and the target, ahead/behind counts, whether the branch is merged, and dependency manifests changed on each side. |
+| `worktree sync <path> --direction in|out|both` | Merge the target into the worktree branch (`in`) and/or the branch into the target (`out`). Refuses dirty trees; on conflict stops with the merge in progress and writes base/ours/theirs copies under the git dir, flagging whitespace-only conflicts. Never resolves conflicts; exits 1 on conflict. |
 
+Worktree commands read `.azcli/worktree.json` from the worktree, else from `--project`; run `azcli worktree start --help` for the format. All three accept `--target` and `--json`.
+
 Project commands accept `--path` to select a working directory. Build, update, clean, and publish accept `--type`, direct flags such as `--python`, and exclusions such as `--nopython` or `--no-python`. Use `--quiet` to suppress progress. Errors go to stderr and cause a nonzero exit status.
 
 External tools must already be available on PATH. Commands run with explicit argument arrays and working directories. On Windows, standard Node and Composer `.cmd`/`.bat` shims are resolved to their entry points without a command shell. Custom batch launchers are rejected with an explanatory error.

package/dist/cli/create-cli.js

@@ -13,6 +13,7 @@ const command_5 = __importDefault(require("../features/package/command"));
 const command_6 = __importDefault(require("../features/transcripts/command"));
 const command_7 = __importDefault(require("../features/optimize-transcripts/command"));
 const command_8 = __importDefault(require("../features/verify-changes/command"));
+const command_9 = __importDefault(require("../features/worktree/command"));
 const commands_1 = require("../features/yarn/commands");
 function createCli(args) {
     return (0, yargs_1.default)(args)
@@ -27,6 +28,7 @@ function createCli(args) {
         .command(command_6.default)
         .command(command_7.default)
         .command(command_8.default)
+        .command(command_9.default)
         .command(commands_1.installCommand)
         .command(commands_1.buildCommand)
         .command(commands_1.testCommand)

package/dist/cli/create-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-cli.js","sourceRoot":"","sources":["../../src/cli/create-cli.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,wEAA8C;AAC9C,wEAA8C;AAC9C,yEAAgD;AAChD,0EAAkD;AAClD,0EAAmD;AACnD,8EAA0D;AAC1D,uFAAgE;AAChE,iFAA+D;AAC/D,wDAAsF;AAEtF,SAAgB,SAAS,CAAC,IAAc;IACvC,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC;SAChB,UAAU,CAAC,OAAO,CAAC;SACnB,KAAK,CAAC,+BAA+B,CAAC;SACtC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,yCAAyC,EAAE,CAAC;SAC5G,OAAO,CAAC,iBAAK,CAAC;SACd,OAAO,CAAC,iBAAK,CAAC;SACd,OAAO,CAAC,iBAAM,CAAC;SACf,OAAO,CAAC,iBAAO,CAAC;SAChB,OAAO,CAAC,iBAAQ,CAAC;SACjB,OAAO,CAAC,iBAAW,CAAC;SACpB,OAAO,CAAC,iBAAQ,CAAC;SACjB,OAAO,CAAC,iBAAa,CAAC;SACtB,OAAO,CAAC,yBAAc,CAAC;SACvB,OAAO,CAAC,uBAAY,CAAC;SACrB,OAAO,CAAC,sBAAW,CAAC;SACpB,aAAa,CAAC,CAAC,CAAC;SAChB,MAAM,EAAE;SACR,IAAI,EAAE;SACN,WAAW,CAAC,KAAK,CAAC;SAClB,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AArBD,8BAqBC"}
+{"version":3,"file":"create-cli.js","sourceRoot":"","sources":["../../src/cli/create-cli.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,wEAA8C;AAC9C,wEAA8C;AAC9C,yEAAgD;AAChD,0EAAkD;AAClD,0EAAmD;AACnD,8EAA0D;AAC1D,uFAAgE;AAChE,iFAA+D;AAC/D,2EAAoD;AACpD,wDAAsF;AAEtF,SAAgB,SAAS,CAAC,IAAc;IACvC,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC;SAChB,UAAU,CAAC,OAAO,CAAC;SACnB,KAAK,CAAC,+BAA+B,CAAC;SACtC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,yCAAyC,EAAE,CAAC;SAC5G,OAAO,CAAC,iBAAK,CAAC;SACd,OAAO,CAAC,iBAAK,CAAC;SACd,OAAO,CAAC,iBAAM,CAAC;SACf,OAAO,CAAC,iBAAO,CAAC;SAChB,OAAO,CAAC,iBAAQ,CAAC;SACjB,OAAO,CAAC,iBAAW,CAAC;SACpB,OAAO,CAAC,iBAAQ,CAAC;SACjB,OAAO,CAAC,iBAAa,CAAC;SACtB,OAAO,CAAC,iBAAQ,CAAC;SACjB,OAAO,CAAC,yBAAc,CAAC;SACvB,OAAO,CAAC,uBAAY,CAAC;SACrB,OAAO,CAAC,sBAAW,CAAC;SACpB,aAAa,CAAC,CAAC,CAAC;SAChB,MAAM,EAAE;SACR,IAAI,EAAE;SACN,WAAW,CAAC,KAAK,CAAC;SAClB,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AAtBD,8BAsBC"}

package/dist/features/verify-changes/command.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("../../core/logger");
+const config_1 = require("./config");
 const report_1 = require("./report");
 const verify_1 = require("./verify");
 const command = {
@@ -11,7 +12,8 @@ const command = {
         .option('base', { type: 'string', describe: 'Compare against this ref (default: config base, else main/master)' })
         .option('profile', { type: 'string', array: true, describe: 'Profiles from .azcli/verify.json (default: all)' })
         .option('json', { type: 'boolean', describe: 'Print the full report as JSON' })
-        .option('strict', { type: 'boolean', describe: 'Treat checks that were not run as failures' }),
+        .option('strict', { type: 'boolean', describe: 'Treat checks that were not run as failures' })
+        .epilog(config_1.configHelp),
     handler: async (args) => {
         const report = await (0, verify_1.verifyChanges)(args);
         if (args.json)

package/dist/features/verify-changes/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/features/verify-changes/command.ts"],"names":[],"mappings":";;AACA,8CAAgD;AAChD,qCAAwD;AACxD,qCAAyC;AASzC,MAAM,OAAO,GAA4C;IACxD,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,wDAAwD;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;SACnB,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;SACjE,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mEAAmE,EAAE,CAAC;SACjH,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,iDAAiD,EAAE,CAAC;SAC/G,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,+BAA+B,EAAE,CAAC;SAC9E,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,4CAA4C,EAAE,CAAC;IAC/F,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;QACzC,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;;YACvD,IAAA,oBAAW,EAAC,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,CAAC,QAAQ,GAAG,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;CACD,CAAC;AACF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/features/verify-changes/command.ts"],"names":[],"mappings":";;AACA,8CAAgD;AAChD,qCAAsC;AACtC,qCAAwD;AACxD,qCAAyC;AASzC,MAAM,OAAO,GAA4C;IACxD,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,wDAAwD;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;SACnB,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;SACjE,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mEAAmE,EAAE,CAAC;SACjH,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,iDAAiD,EAAE,CAAC;SAC/G,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,+BAA+B,EAAE,CAAC;SAC9E,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,4CAA4C,EAAE,CAAC;SAC7F,MAAM,CAAC,mBAAU,CAAC;IACpB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;QACzC,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;;YACvD,IAAA,oBAAW,EAAC,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,CAAC,QAAQ,GAAG,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;CACD,CAAC;AACF,kBAAe,OAAO,CAAC"}

package/dist/features/verify-changes/config.js

@@ -3,11 +3,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfig = exports.parseConfig = exports.configFile = void 0;
+exports.loadConfig = exports.parseConfig = exports.configHelp = exports.configFile = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const json_1 = require("../../core/json");
 exports.configFile = node_path_1.default.join('.azcli', 'verify.json');
+exports.configHelp = `Config file: .azcli/verify.json in the project root (JSON). Example:
+
+{
+  "base": "master",
+  "profiles": {
+    "web": [
+      {
+        "name": "typescript",
+        "command": "yarn",
+        "args": ["tsc", "--noEmit"],
+        "cwd": "web",
+        "paths": ["web/**/*.ts"]
+      }
+    ]
+  }
+}
+
+Fields:
+  base      optional. Ref to compare against. Default: first existing of
+            origin/main, origin/master, main, master, else HEAD.
+  profiles  required. Profile name -> array of checks. Pick with --profile.
+  name      required. Label shown in the report.
+  command   required. Executable on PATH; run without a shell.
+  args      optional. Array of strings, one entry per argument.
+  cwd       optional. Directory relative to the project root, inside it.
+  paths     optional. Globs relative to the project root: * stays within a
+            folder, ** spans folders, ? is one character. Omit to always run.
+
+A check runs only if a file changed since the base (committed, staged,
+unstaged, or untracked) matches its paths. Each check ends as passed, failed
+(nonzero exit), or not-run (no matching changes, or the command could not
+start). Exit code is 1 if any check failed; --strict also fails on not-run.`;
 function stringArray(value, label) {
     if (!Array.isArray(value) || value.some((item) => typeof item !== 'string'))
         throw new Error(`${label} must be an array of strings`);
@@ -45,7 +77,7 @@ exports.parseConfig = parseConfig;
 function loadConfig(root) {
     const file = node_path_1.default.join(root, exports.configFile);
     if (!node_fs_1.default.existsSync(file))
-        throw new Error(`Missing ${exports.configFile} in ${root}`);
+        throw new Error(`Missing ${exports.configFile} in ${root}. Run "azcli verify-changes --help" to see the file format.`);
     let parsed;
     try {
         parsed = JSON.parse(node_fs_1.default.readFileSync(file, 'utf8'));

package/dist/features/verify-changes/config.js.map

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

package/dist/features/worktree/command.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("../../core/logger");
+const config_1 = require("./config");
+const start_1 = require("./start");
+const status_1 = require("./status");
+const sync_1 = require("./sync");
+function print(args, value, text) {
+    if (args.json)
+        console.log(JSON.stringify(value, null, 2));
+    else
+        (0, logger_1.showMessage)(text, 'text', false);
+}
+const command = {
+    command: 'worktree <action> <worktree>',
+    describe: 'Start a dev server in, inspect, or merge a git worktree',
+    builder: (cli) => cli
+        .positional('action', { choices: ['start', 'status', 'sync'], type: 'string', demandOption: true, describe: 'start: install, then run the dev server; status: branch and dependency overview; sync: merge in the requested direction' })
+        .positional('worktree', { type: 'string', demandOption: true, describe: 'Worktree directory' })
+        .option('project', { type: 'string', describe: 'Project directory used when the worktree has no .azcli/worktree.json' })
+        .option('target', { type: 'string', describe: 'Branch to compare with or merge (default: "target" in config)' })
+        .option('direction', { choices: ['in', 'out', 'both'], type: 'string', describe: 'sync only. in: merge target into the worktree branch; out: merge the worktree branch into the target' })
+        .option('port', { type: 'number', describe: 'start only. Port to use (default: first free port above the configured default)' })
+        .option('page', { type: 'string', describe: 'start only. Page name from the config, used for the reported URL' })
+        .option('timeout', { type: 'number', describe: 'start only. Seconds to wait for readiness' })
+        .option('skip-install', { type: 'boolean', describe: 'start only. Do not install dependencies first' })
+        .option('json', { type: 'boolean', describe: 'Print the full report as JSON' })
+        .check((args) => {
+        if (args.action === 'sync' && !args.direction)
+            throw new Error('sync needs --direction in|out|both');
+        return true;
+    })
+        .epilog(config_1.configHelp),
+    handler: async (args) => {
+        const base = { path: args.worktree, project: args.project };
+        if (args.action === 'status') {
+            const status = await (0, status_1.worktreeStatus)({ ...base, target: args.target });
+            print(args, status, (0, status_1.formatStatus)(status));
+        }
+        else if (args.action === 'sync') {
+            const report = await (0, sync_1.syncWorktree)({ ...base, target: args.target, direction: args.direction });
+            print(args, report, (0, sync_1.formatSync)(report));
+            if (report.steps.some((step) => step.result === 'conflict'))
+                process.exitCode = 1;
+        }
+        else {
+            const report = await (0, start_1.startWorktree)({ ...base, port: args.port, page: args.page, timeout: args.timeout, skipInstall: args.skipInstall, quiet: args.quiet || args.json });
+            print(args, report, (0, start_1.formatStart)(report));
+            if (report.state !== 'running' || report.compile === 'failed')
+                process.exitCode = 1;
+        }
+    },
+};
+exports.default = command;
+//# sourceMappingURL=command.js.map

package/dist/features/worktree/command.js.map

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

package/dist/features/worktree/config.js

@@ -0,0 +1,115 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadConfig = exports.parseConfig = exports.configHelp = exports.configFile = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const json_1 = require("../../core/json");
+exports.configFile = node_path_1.default.join('.azcli', 'worktree.json');
+exports.configHelp = `Config file: .azcli/worktree.json (JSON), read from the worktree, else the project. Example:
+
+{
+  "target": "development",
+  "install": { "command": "yarn", "args": ["install", "--immutable"] },
+  "dev": {
+    "command": "react-app-rewired",
+    "args": ["start"],
+    "cwd": "packages_main/web",
+    "defaultPort": 3000,
+    "pages": { "order": "/order" },
+    "binDirs": ["node_modules/.bin"],
+    "timeoutSeconds": 120
+  }
+}
+
+Fields:
+  target          optional. Branch that status and sync compare against (--target overrides).
+  install         optional. Default: yarn install --immutable at the worktree root.
+  dev             required for "start". command and args run without a shell, in cwd.
+  portEnv         optional. Environment variable receiving the port. Default PORT.
+                  "{port}" inside args is replaced too.
+  defaultPort     optional. Port used by the main checkout. Default 3000; start picks
+                  the first free port above it.
+  readyPath       optional. Path polled until the server answers. Default "/".
+  pages           optional. Page name -> path, selected with --page.
+  timeoutSeconds  optional. Maximum wait for readiness. Default 120.
+  binDirs         optional. Directories searched for the command before PATH, relative to
+                  the worktree root and to cwd. Default ["node_modules/.bin"].
+  compiledPattern, failedPattern
+                  optional. Regexes matched against the dev log.`;
+function stringArray(value, label) {
+    if (!Array.isArray(value) || value.some((item) => typeof item !== 'string'))
+        throw new Error(`${label} must be an array of strings`);
+    return value;
+}
+function commandConfig(value, label) {
+    if (!(0, json_1.isRecord)(value))
+        throw new Error(`${label} must be an object`);
+    const command = (0, json_1.asString)(value.command);
+    if (!command)
+        throw new Error(`${label} needs a "command"`);
+    return { command, args: value.args === undefined ? [] : stringArray(value.args, `${label} "args"`), cwd: (0, json_1.asString)(value.cwd) };
+}
+function positive(value, label, fallback) {
+    if (value === undefined)
+        return fallback;
+    if (typeof value !== 'number' || !Number.isInteger(value) || value <= 0)
+        throw new Error(`${label} must be a positive integer`);
+    return value;
+}
+function parseConfig(value) {
+    if (!(0, json_1.isRecord)(value))
+        throw new Error(`${exports.configFile} must contain a JSON object`);
+    const config = {
+        target: (0, json_1.asString)(value.target),
+        install: value.install === undefined ? { command: 'yarn', args: ['install', '--immutable'] } : commandConfig(value.install, '"install"'),
+    };
+    if (value.dev !== undefined) {
+        const base = commandConfig(value.dev, '"dev"');
+        const dev = value.dev;
+        const pages = {};
+        if (dev.pages !== undefined) {
+            if (!(0, json_1.isRecord)(dev.pages))
+                throw new Error('"dev" "pages" must be an object');
+            for (const [name, page] of Object.entries(dev.pages)) {
+                if (typeof page !== 'string')
+                    throw new Error(`"dev" page "${name}" must be a string`);
+                pages[name] = page;
+            }
+        }
+        config.dev = {
+            ...base,
+            portEnv: (0, json_1.asString)(dev.portEnv) ?? 'PORT',
+            defaultPort: positive(dev.defaultPort, '"dev" "defaultPort"', 3000),
+            readyPath: (0, json_1.asString)(dev.readyPath) ?? '/',
+            pages,
+            timeoutSeconds: positive(dev.timeoutSeconds, '"dev" "timeoutSeconds"', 120),
+            binDirs: dev.binDirs === undefined ? ['node_modules/.bin'] : stringArray(dev.binDirs, '"dev" "binDirs"'),
+            compiledPattern: (0, json_1.asString)(dev.compiledPattern) ?? 'Compiled (successfully|with warnings)',
+            failedPattern: (0, json_1.asString)(dev.failedPattern) ?? 'Failed to compile|Module not found|error TS\\d+',
+        };
+    }
+    return config;
+}
+exports.parseConfig = parseConfig;
+/** Read the config from the first root that has one; a missing file everywhere yields the defaults. */
+function loadConfig(...roots) {
+    for (const root of roots) {
+        const file = node_path_1.default.join(root, exports.configFile);
+        if (!node_fs_1.default.existsSync(file))
+            continue;
+        let parsed;
+        try {
+            parsed = JSON.parse(node_fs_1.default.readFileSync(file, 'utf8'));
+        }
+        catch (error) {
+            throw new Error(`Could not read ${file}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return parseConfig(parsed);
+    }
+    return parseConfig({});
+}
+exports.loadConfig = loadConfig;
+//# sourceMappingURL=config.js.map

package/dist/features/worktree/config.js.map

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

package/dist/features/worktree/git.js

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveTarget = exports.gitDir = exports.treeState = exports.listWorktrees = exports.gitOk = exports.git = exports.lines = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const lines = (text) => text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+exports.lines = lines;
+async function git(run, cwd, args) {
+    return (await run('git', args, { cwd, quiet: true })).stdout.trim();
+}
+exports.git = git;
+async function gitOk(run, cwd, args) {
+    try {
+        await run('git', args, { cwd, quiet: true });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+exports.gitOk = gitOk;
+async function listWorktrees(run, cwd) {
+    const text = (await run('git', ['worktree', 'list', '--porcelain'], { cwd, quiet: true })).stdout;
+    return text.split(/\r?\n\r?\n/).map((block) => {
+        const entry = {};
+        for (const line of (0, exports.lines)(block)) {
+            if (line.startsWith('worktree '))
+                entry.path = node_path_1.default.resolve(line.slice(9));
+            else if (line.startsWith('HEAD '))
+                entry.head = line.slice(5);
+            else if (line.startsWith('branch '))
+                entry.branch = line.slice(7).replace(/^refs\/heads\//, '');
+        }
+        return entry;
+    }).filter((entry) => Boolean(entry.path));
+}
+exports.listWorktrees = listWorktrees;
+/** `dirty` holds `git status --porcelain` lines: tracked and untracked changes. */
+async function treeState(run, cwd) {
+    const branch = await git(run, cwd, ['rev-parse', '--abbrev-ref', 'HEAD']);
+    const tip = await git(run, cwd, ['rev-parse', '--short', 'HEAD']);
+    const status = (await run('git', ['status', '--porcelain'], { cwd, quiet: true })).stdout;
+    return { path: cwd, branch: branch === 'HEAD' ? null : branch, tip, dirty: status.split(/\r?\n/).filter(Boolean) };
+}
+exports.treeState = treeState;
+/** Per-worktree git directory; a safe place for logs and scratch files that never dirties the tree. */
+async function gitDir(run, cwd) {
+    return node_path_1.default.resolve(cwd, await git(run, cwd, ['rev-parse', '--absolute-git-dir']));
+}
+exports.gitDir = gitDir;
+async function resolveTarget(run, cwd, requested, configured) {
+    const target = requested ?? configured;
+    if (!target)
+        throw new Error('No target branch: pass --target or set "target" in .azcli/worktree.json');
+    if (!(await gitOk(run, cwd, ['rev-parse', '--verify', '--quiet', `refs/heads/${target}`])))
+        throw new Error(`Target branch not found: ${target}`);
+    return target;
+}
+exports.resolveTarget = resolveTarget;
+//# sourceMappingURL=git.js.map

package/dist/features/worktree/git.js.map

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

package/dist/features/worktree/start.js

@@ -0,0 +1,156 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatStart = exports.startWorktree = exports.pickPort = exports.isPortFree = void 0;
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_http_1 = __importDefault(require("node:http"));
+const node_net_1 = __importDefault(require("node:net"));
+const node_path_1 = __importDefault(require("node:path"));
+const files_1 = require("../../core/files");
+const logger_1 = require("../../core/logger");
+const process_1 = require("../../core/process");
+const config_1 = require("./config");
+const git_1 = require("./git");
+const pollMs = 500;
+const compileGraceMs = 3000;
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function isPortFree(port) {
+    return new Promise((resolve) => {
+        const server = node_net_1.default.createServer();
+        server.once('error', () => resolve(false));
+        server.listen(port, () => server.close(() => resolve(true)));
+    });
+}
+exports.isPortFree = isPortFree;
+/** An explicitly requested port must be free; otherwise take the first free port above the default one. */
+async function pickPort(defaultPort, requested) {
+    if (requested !== undefined) {
+        if (!(await isPortFree(requested)))
+            throw new Error(`Port ${requested} is already in use`);
+        return requested;
+    }
+    for (let port = defaultPort + 1; port < defaultPort + 101; port++)
+        if (await isPortFree(port))
+            return port;
+    throw new Error(`No free port found above ${defaultPort}`);
+}
+exports.pickPort = pickPort;
+function probe(url) {
+    return new Promise((resolve) => {
+        const request = node_http_1.default.get(url, { timeout: 2000 }, (response) => {
+            response.resume();
+            resolve(true);
+        });
+        request.once('timeout', () => request.destroy());
+        request.once('error', () => resolve(false));
+    });
+}
+function killTree(pid) {
+    try {
+        if (process.platform === 'win32')
+            (0, node_child_process_1.spawnSync)('taskkill', ['/pid', String(pid), '/t', '/f'], { windowsHide: true });
+        else
+            process.kill(-pid, 'SIGTERM');
+    }
+    catch {
+        // The process is already gone.
+    }
+}
+function compileState(log, dev) {
+    if (new RegExp(dev.failedPattern, 'i').test(log))
+        return 'failed';
+    return new RegExp(dev.compiledPattern, 'i').test(log) ? 'ok' : 'unknown';
+}
+function launchEnvironment(root, cwd, dev, port) {
+    const env = { ...process.env, [dev.portEnv]: String(port) };
+    const key = Object.keys(env).find((name) => name.toUpperCase() === 'PATH') ?? 'PATH';
+    const directories = dev.binDirs.flatMap((dir) => [(0, files_1.resolveInside)(root, dir), (0, files_1.resolveInside)(cwd, dir)]);
+    env[key] = [...directories, env[key] ?? ''].join(node_path_1.default.delimiter);
+    return env;
+}
+async function startWorktree(options, run = process_1.runCommand) {
+    const root = node_path_1.default.resolve(options.path);
+    if (!node_fs_1.default.existsSync(root))
+        throw new Error(`Worktree not found: ${root}`);
+    const config = (0, config_1.loadConfig)(root, node_path_1.default.resolve(options.project ?? '.'));
+    const dev = config.dev;
+    if (!dev)
+        throw new Error('Missing "dev" in .azcli/worktree.json. Run "azcli worktree start --help" to see the file format.');
+    let pagePath = dev.readyPath;
+    if (options.page) {
+        if (!(options.page in dev.pages))
+            throw new Error(`Unknown page "${options.page}". Configured pages: ${Object.keys(dev.pages).join(', ') || 'none'}`);
+        pagePath = dev.pages[options.page];
+    }
+    if (!options.skipInstall) {
+        const install = config.install;
+        await run(install.command, install.args, { cwd: install.cwd ? (0, files_1.resolveInside)(root, install.cwd) : root, quiet: options.quiet });
+    }
+    const port = await pickPort(dev.defaultPort, options.port);
+    const cwd = dev.cwd ? (0, files_1.resolveInside)(root, dev.cwd) : root;
+    const launch = (0, process_1.resolveCommand)(dev.command, dev.args.map((arg) => arg.replaceAll('{port}', String(port))), cwd, launchEnvironment(root, cwd, dev, port));
+    const logDirectory = node_path_1.default.join(await (0, git_1.gitDir)(run, root), 'azcli');
+    node_fs_1.default.mkdirSync(logDirectory, { recursive: true });
+    const log = node_path_1.default.join(logDirectory, `dev-${port}.log`);
+    const report = (fields) => ({
+        url: `http://localhost:${port}${pagePath}`, port, log, ...fields,
+    });
+    const fd = node_fs_1.default.openSync(log, 'w');
+    let exit;
+    const child = (0, node_child_process_1.spawn)(launch.command, launch.args, {
+        cwd,
+        env: launchEnvironment(root, cwd, dev, port),
+        detached: true,
+        stdio: ['ignore', fd, fd],
+        windowsHide: true,
+    });
+    node_fs_1.default.closeSync(fd);
+    child.once('error', (error) => { exit = `could not start ${dev.command}: ${error.message}`; });
+    child.once('exit', (code, signal) => { exit = signal ? `terminated by ${signal}` : `exit code ${code}`; });
+    const readLog = () => node_fs_1.default.readFileSync(log, 'utf8');
+    const tail = () => readLog().split(/\r?\n/).filter(Boolean).slice(-20).join('\n');
+    const fail = (state, error) => {
+        if (state === 'timeout' && child.pid)
+            killTree(child.pid);
+        return report({ state, compile: compileState(readLog(), dev), pid: child.pid, error, logTail: tail() });
+    };
+    const timeoutMs = (options.timeout ?? dev.timeoutSeconds) * 1000;
+    const started = Date.now();
+    const readyUrl = `http://localhost:${port}${dev.readyPath}`;
+    if (!options.quiet)
+        (0, logger_1.showMessage)(`Waiting for ${readyUrl} (up to ${timeoutMs / 1000}s)`);
+    while (!exit) {
+        if (await probe(readyUrl))
+            break;
+        if (Date.now() - started > timeoutMs)
+            return fail('timeout', `no response from ${readyUrl} within ${timeoutMs / 1000}s`);
+        await sleep(pollMs);
+    }
+    if (exit)
+        return fail('exited', `dev server stopped: ${exit}`);
+    const graceEnd = Date.now() + compileGraceMs;
+    while (compileState(readLog(), dev) === 'unknown' && Date.now() < graceEnd && !exit)
+        await sleep(200);
+    if (exit)
+        return fail('exited', `dev server stopped: ${exit}`);
+    child.unref();
+    return report({ state: 'running', compile: compileState(readLog(), dev), pid: child.pid });
+}
+exports.startWorktree = startWorktree;
+function formatStart(report) {
+    const output = [
+        `state:   ${report.state}${report.error ? ` (${report.error})` : ''}`,
+        `url:     ${report.url}`,
+        `pid:     ${report.pid ?? 'none'}`,
+        `compile: ${report.compile}`,
+        `log:     ${report.log}`,
+    ];
+    if (report.logTail)
+        output.push('last log lines:', report.logTail);
+    return output.join('\n');
+}
+exports.formatStart = formatStart;
+//# sourceMappingURL=start.js.map

package/dist/features/worktree/start.js.map

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

package/dist/features/worktree/status.js

@@ -0,0 +1,50 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatStatus = exports.worktreeStatus = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const process_1 = require("../../core/process");
+const config_1 = require("./config");
+const git_1 = require("./git");
+const manifests = new Set(['package.json', 'yarn.lock', 'package-lock.json', 'pnpm-lock.yaml', 'composer.json', 'composer.lock', 'requirements.txt', 'pyproject.toml', 'poetry.lock']);
+const isManifest = (file) => manifests.has(node_path_1.default.posix.basename(file));
+async function worktreeStatus(options, run = process_1.runCommand) {
+    const root = node_path_1.default.resolve(options.path);
+    const config = (0, config_1.loadConfig)(root, node_path_1.default.resolve(options.project ?? '.'));
+    const target = await (0, git_1.resolveTarget)(run, root, options.target, config.target);
+    const worktree = await (0, git_1.treeState)(run, root);
+    const entry = (await (0, git_1.listWorktrees)(run, root)).find((tree) => tree.branch === target);
+    const [behind, ahead] = (await (0, git_1.git)(run, root, ['rev-list', '--left-right', '--count', `${target}...HEAD`])).split(/\s+/).map(Number);
+    const mergeBase = await (0, git_1.git)(run, root, ['merge-base', target, 'HEAD']);
+    const changed = async (to) => (0, git_1.lines)(await (0, git_1.git)(run, root, ['diff', '--name-only', '--no-renames', mergeBase, to])).filter(isManifest);
+    return {
+        target,
+        worktree,
+        targetTree: entry ? await (0, git_1.treeState)(run, entry.path) : null,
+        behind,
+        ahead,
+        merged: await (0, git_1.gitOk)(run, root, ['merge-base', '--is-ancestor', 'HEAD', target]),
+        dependencyChanges: { incoming: await changed(target), outgoing: await changed('HEAD') },
+    };
+}
+exports.worktreeStatus = worktreeStatus;
+function describeTree(label, tree) {
+    if (!tree)
+        return `${label}: not checked out in any worktree`;
+    const dirty = tree.dirty.length ? `${tree.dirty.length} changed file(s)` : 'clean';
+    return `${label}: ${tree.branch ?? '(detached)'} @ ${tree.tip}, ${dirty}\n  ${tree.path}${tree.dirty.map((line) => `\n    ${line}`).join('')}`;
+}
+function formatStatus(status) {
+    const { incoming, outgoing } = status.dependencyChanges;
+    return [
+        describeTree('worktree', status.worktree),
+        describeTree('target  ', status.targetTree),
+        `vs ${status.target}: ${status.ahead} ahead, ${status.behind} behind${status.merged ? ' (fully merged into target)' : ''}`,
+        `dependency manifests changed on ${status.target}: ${incoming.join(', ') || 'none'}`,
+        `dependency manifests changed on branch: ${outgoing.join(', ') || 'none'}`,
+    ].join('\n');
+}
+exports.formatStatus = formatStatus;
+//# sourceMappingURL=status.js.map

package/dist/features/worktree/status.js.map

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

package/dist/features/worktree/sync.js

@@ -0,0 +1,107 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatSync = exports.syncWorktree = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const process_1 = require("../../core/process");
+const config_1 = require("./config");
+const git_1 = require("./git");
+const stage = (run, cwd, number, file) => run('git', ['show', `:${number}:${file}`], { cwd, quiet: true }).then((result) => result.stdout, () => undefined);
+const squash = (text) => text.replace(/\s+/g, '');
+async function collectConflicts(run, cwd) {
+    const files = (0, git_1.lines)(await (0, git_1.git)(run, cwd, ['diff', '--name-only', '--diff-filter=U']));
+    const directory = node_path_1.default.join(await (0, git_1.gitDir)(run, cwd), 'azcli', 'conflicts');
+    node_fs_1.default.rmSync(directory, { recursive: true, force: true });
+    const conflicts = [];
+    for (const file of files) {
+        const sides = { base: await stage(run, cwd, 1, file), ours: await stage(run, cwd, 2, file), theirs: await stage(run, cwd, 3, file) };
+        const conflict = {
+            file,
+            whitespaceOnly: sides.ours !== undefined && sides.theirs !== undefined && squash(sides.ours) === squash(sides.theirs),
+        };
+        for (const [name, content] of Object.entries(sides)) {
+            if (content === undefined)
+                continue;
+            const target = node_path_1.default.join(directory, `${file}.${name}`);
+            node_fs_1.default.mkdirSync(node_path_1.default.dirname(target), { recursive: true });
+            node_fs_1.default.writeFileSync(target, content);
+            conflict[name] = target;
+        }
+        conflicts.push(conflict);
+    }
+    return conflicts;
+}
+async function assertReady(run, cwd, label) {
+    const state = await (0, git_1.treeState)(run, cwd);
+    if (!state.branch)
+        throw new Error(`${label} is on a detached HEAD: ${cwd}`);
+    if (await (0, git_1.gitOk)(run, cwd, ['rev-parse', '--quiet', '--verify', 'MERGE_HEAD']))
+        throw new Error(`${label} has a merge in progress: ${cwd}`);
+    const tracked = state.dirty.filter((line) => !line.startsWith('??'));
+    if (tracked.length)
+        throw new Error(`${label} has uncommitted changes; commit or stash them first (${cwd}):\n${tracked.join('\n')}`);
+    return state.branch;
+}
+async function merge(run, direction, cwd, into, from) {
+    const step = (result, conflicts = []) => ({ direction, cwd, into, from, result, conflicts });
+    if (await (0, git_1.gitOk)(run, cwd, ['merge-base', '--is-ancestor', from, 'HEAD']))
+        return step('up-to-date');
+    try {
+        await run('git', ['merge', '--no-edit', from], { cwd, quiet: true });
+        return step('merged');
+    }
+    catch (error) {
+        const conflicts = await collectConflicts(run, cwd);
+        if (!conflicts.length)
+            throw error;
+        return step('conflict', conflicts);
+    }
+}
+/**
+ * Performs only the requested merge direction(s). On conflict the merge stays in progress in its worktree,
+ * so the caller can resolve and commit; nothing is resolved here.
+ */
+async function syncWorktree(options, run = process_1.runCommand) {
+    const root = node_path_1.default.resolve(options.path);
+    const config = (0, config_1.loadConfig)(root, node_path_1.default.resolve(options.project ?? '.'));
+    const target = await (0, git_1.resolveTarget)(run, root, options.target, config.target);
+    const branch = await assertReady(run, root, 'Worktree');
+    if (branch === target)
+        throw new Error(`The worktree is on the target branch itself: ${target}`);
+    const targetEntry = (await (0, git_1.listWorktrees)(run, root)).find((tree) => tree.branch === target);
+    if (!targetEntry)
+        throw new Error(`Target branch "${target}" is not checked out in any worktree`);
+    await assertReady(run, targetEntry.path, 'Target worktree');
+    const steps = [];
+    if (options.direction !== 'out')
+        steps.push(await merge(run, 'in', root, branch, target));
+    if (options.direction !== 'in' && !steps.some((step) => step.result === 'conflict'))
+        steps.push(await merge(run, 'out', targetEntry.path, target, branch));
+    return {
+        target,
+        steps,
+        tips: { worktree: await (0, git_1.git)(run, root, ['rev-parse', '--short', 'HEAD']), target: await (0, git_1.git)(run, targetEntry.path, ['rev-parse', '--short', 'HEAD']) },
+    };
+}
+exports.syncWorktree = syncWorktree;
+function formatSync(report) {
+    const output = [];
+    for (const step of report.steps) {
+        output.push(`${step.direction}: merge ${step.from} into ${step.into} -> ${step.result}`);
+        for (const conflict of step.conflicts) {
+            output.push(`  CONFLICT ${conflict.file}${conflict.whitespaceOnly ? ' (whitespace-only)' : ''}`);
+            for (const side of ['base', 'ours', 'theirs'])
+                if (conflict[side])
+                    output.push(`    ${side}: ${conflict[side]}`);
+        }
+        if (step.conflicts.length)
+            output.push(`  The merge is still in progress in ${step.cwd}; resolve, commit, or run "git merge --abort".`);
+    }
+    output.push(`tips: worktree ${report.tips.worktree}, ${report.target} ${report.tips.target}`);
+    return output.join('\n');
+}
+exports.formatSync = formatSync;
+//# sourceMappingURL=sync.js.map

package/dist/features/worktree/sync.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/azcli",
-	"version": "1.2.1",
+	"version": "1.2.4",
 	"description": "Project build, publishing, dependency, and AI transcript helpers",
 	"type": "commonjs",
 	"main": "dist/cli/index.js",
@@ -38,4 +38,4 @@
 	"engines": {
 		"node": ">=20"
 	}
-}
+}