@taranek/orche 0.0.16 → 0.0.18

package/dist/cli.js

@@ -7,25 +7,12 @@ import { pruneCommand } from "./prune.js";
 import { getMultiplexer } from "./multiplexer.js";
 import { buildLayout } from "./layout.js";
 import { getReviewBinaryPath } from "./review-manager.js";
+import { loadConfig, parsePresetFlag } from "./config.js";
 const CONFIG_NAME = ".orche.json";
-const CONFIG_LOCAL_NAME = ".orche.local.json";
 function die(msg) {
     console.error(`error: ${msg}`);
     process.exit(1);
 }
-function loadConfig(cwd) {
-    const localPath = path.join(cwd, CONFIG_LOCAL_NAME);
-    const configPath = path.join(cwd, CONFIG_NAME);
-    if (existsSync(localPath)) {
-        const raw = readFileSync(localPath, "utf-8");
-        return JSON.parse(raw);
-    }
-    if (!existsSync(configPath)) {
-        die(`no ${CONFIG_NAME} found in ${cwd}`);
-    }
-    const raw = readFileSync(configPath, "utf-8");
-    return JSON.parse(raw);
-}
 function deliverReview(pendingPath) {
     try {
         const pending = JSON.parse(readFileSync(pendingPath, "utf-8"));
@@ -134,8 +121,10 @@ function getRepoRoot(cwd) {
 function startSession() {
     const cwd = getRepoRoot(process.cwd());
     const repoName = path.basename(cwd);
-    const taskName = process.argv.slice(3).find((a) => !a.startsWith("--")) || "session";
-    const config = loadConfig(cwd);
+    const args = process.argv.slice(3);
+    const preset = parsePresetFlag(args);
+    const taskName = args.find((a) => !a.startsWith("-") && a !== preset) || "session";
+    const config = loadConfig(cwd, preset);
     const muxFlag = process.argv.includes("--tmux") ? "tmux" :
         process.argv.includes("--cmux") ? "cmux" :
             undefined;
@@ -157,20 +146,26 @@ function printUsage() {
 orche — orchestrate agents across git worktrees
 
 Usage:
-  orche start <task>         Start a new session for <task>
-  orche review [path]        Open the review UI for a worktree
-  orche prune [--all] [-f]   Remove orche worktrees (interactive multiselect)
+  orche start <task> [-p <preset>]   Start a new session for <task>
+  orche review [path]                Open the review UI for a worktree
+  orche prune [--all] [-f]           Remove orche worktrees (interactive multiselect)
+
+Options:
+  -p, --preset=<name>    Load .orche.<name>.json instead of .orche.json
 
 Examples:
-  orche start fix-auth       Create worktree + session for "fix-auth"
-  orche review               Review changes in current directory
-  orche review ./worktree    Review changes in a specific worktree
-  orche prune                Pick worktrees to remove
-  orche prune --all          Remove all orche worktrees
-  orche prune --force        Allow removing worktrees with uncommitted changes
+  orche start fix-auth              Create worktree + session for "fix-auth"
+  orche start fix-auth -p mobile    Use .orche.mobile.json preset
+  orche start fix-auth -p debug     Use .orche.debug.json preset
+  orche review                      Review changes in current directory
+  orche review ./worktree           Review changes in a specific worktree
+  orche prune                       Pick worktrees to remove
+  orche prune --all                 Remove all orche worktrees
+  orche prune --force               Allow removing worktrees with uncommitted changes
 
 Requires a ${CONFIG_NAME} file in the current directory.
-Use ${CONFIG_LOCAL_NAME} for local overrides (not committed).
+Use .orche.local.json for local overrides (not committed).
+Use .orche.<preset>.json for named presets (e.g. .orche.mobile.json).
 See .orche.example.json for the config format.
 `);
 }

package/dist/config.d.ts

@@ -0,0 +1,7 @@
+import type { AgentsConfig } from "./types.js";
+export declare class ConfigError extends Error {
+    constructor(message: string);
+}
+export declare function listPresets(cwd: string): string[];
+export declare function loadConfig(cwd: string, preset?: string): AgentsConfig;
+export declare function parsePresetFlag(args: string[]): string | undefined;

package/dist/config.js

@@ -0,0 +1,52 @@
+import { readFileSync, readdirSync, existsSync } from "node:fs";
+import path from "node:path";
+const CONFIG_NAME = ".orche.json";
+const CONFIG_LOCAL_NAME = ".orche.local.json";
+const CONFIG_PRESET_PREFIX = ".orche.";
+const CONFIG_PRESET_SUFFIX = ".json";
+export class ConfigError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ConfigError";
+    }
+}
+export function listPresets(cwd) {
+    const files = readdirSync(cwd);
+    return files
+        .filter(f => f.startsWith(CONFIG_PRESET_PREFIX) && f.endsWith(CONFIG_PRESET_SUFFIX) && f !== CONFIG_NAME && f !== CONFIG_LOCAL_NAME)
+        .map(f => f.slice(CONFIG_PRESET_PREFIX.length, -CONFIG_PRESET_SUFFIX.length));
+}
+export function loadConfig(cwd, preset) {
+    if (preset) {
+        const presetPath = path.join(cwd, `${CONFIG_PRESET_PREFIX}${preset}${CONFIG_PRESET_SUFFIX}`);
+        if (!existsSync(presetPath)) {
+            const available = listPresets(cwd);
+            const list = available.length > 0
+                ? `\navailable presets: ${available.join(", ")}`
+                : "\nno preset files found in current directory";
+            throw new ConfigError(`preset "${preset}" not found (looked for ${CONFIG_PRESET_PREFIX}${preset}${CONFIG_PRESET_SUFFIX})${list}`);
+        }
+        const raw = readFileSync(presetPath, "utf-8");
+        return JSON.parse(raw);
+    }
+    const localPath = path.join(cwd, CONFIG_LOCAL_NAME);
+    const configPath = path.join(cwd, CONFIG_NAME);
+    if (existsSync(localPath)) {
+        const raw = readFileSync(localPath, "utf-8");
+        return JSON.parse(raw);
+    }
+    if (!existsSync(configPath)) {
+        throw new ConfigError(`no ${CONFIG_NAME} found in ${cwd}`);
+    }
+    const raw = readFileSync(configPath, "utf-8");
+    return JSON.parse(raw);
+}
+export function parsePresetFlag(args) {
+    const idx = args.indexOf("-p");
+    if (idx !== -1 && idx + 1 < args.length)
+        return args[idx + 1];
+    const long = args.find(a => a.startsWith("--preset="));
+    if (long)
+        return long.split("=")[1];
+    return undefined;
+}

package/dist/config.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/config.test.js

@@ -0,0 +1,124 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
+import path from "node:path";
+import os from "node:os";
+import { loadConfig, listPresets, parsePresetFlag, ConfigError } from "./config.js";
+function makeTmpDir() {
+    return mkdtempSync(path.join(os.tmpdir(), "orche-test-"));
+}
+function writeJSON(dir, name, data) {
+    writeFileSync(path.join(dir, name), JSON.stringify(data));
+}
+const baseConfig = { layout: { name: "main", command: "echo hi" } };
+const mobileConfig = { layout: { name: "mobile", command: "echo mobile" } };
+const debugConfig = { layout: { name: "debug", command: "echo debug" } };
+describe("parsePresetFlag", () => {
+    it("parses -p flag", () => {
+        expect(parsePresetFlag(["-p", "mobile"])).toBe("mobile");
+    });
+    it("parses --preset= flag", () => {
+        expect(parsePresetFlag(["--preset=debug"])).toBe("debug");
+    });
+    it("returns undefined when no preset flag", () => {
+        expect(parsePresetFlag(["fix-auth", "--tmux"])).toBeUndefined();
+    });
+    it("returns undefined when -p has no value", () => {
+        expect(parsePresetFlag(["-p"])).toBeUndefined();
+    });
+    it("ignores -p when it is the last arg", () => {
+        expect(parsePresetFlag(["start", "-p"])).toBeUndefined();
+    });
+});
+describe("loadConfig", () => {
+    let tmp;
+    beforeEach(() => {
+        tmp = makeTmpDir();
+    });
+    afterEach(() => {
+        rmSync(tmp, { recursive: true, force: true });
+    });
+    it("loads .orche.json", () => {
+        writeJSON(tmp, ".orche.json", baseConfig);
+        const config = loadConfig(tmp);
+        expect(config.layout).toEqual(baseConfig.layout);
+    });
+    it("prefers .orche.local.json over .orche.json", () => {
+        writeJSON(tmp, ".orche.json", baseConfig);
+        writeJSON(tmp, ".orche.local.json", mobileConfig);
+        const config = loadConfig(tmp);
+        expect(config.layout).toEqual(mobileConfig.layout);
+    });
+    it("throws ConfigError when no config found", () => {
+        expect(() => loadConfig(tmp)).toThrow(ConfigError);
+        expect(() => loadConfig(tmp)).toThrow(".orche.json");
+    });
+    it("loads a preset config", () => {
+        writeJSON(tmp, ".orche.mobile.json", mobileConfig);
+        const config = loadConfig(tmp, "mobile");
+        expect(config.layout).toEqual(mobileConfig.layout);
+    });
+    it("throws ConfigError for missing preset", () => {
+        expect(() => loadConfig(tmp, "nonexistent")).toThrow(ConfigError);
+        expect(() => loadConfig(tmp, "nonexistent")).toThrow('preset "nonexistent" not found');
+    });
+    it("lists available presets in error when preset not found", () => {
+        writeJSON(tmp, ".orche.mobile.json", mobileConfig);
+        writeJSON(tmp, ".orche.debug.json", debugConfig);
+        try {
+            loadConfig(tmp, "nonexistent");
+            expect.unreachable("should have thrown");
+        }
+        catch (err) {
+            const msg = err.message;
+            expect(msg).toContain("available presets:");
+            expect(msg).toContain("mobile");
+            expect(msg).toContain("debug");
+        }
+    });
+    it("shows 'no preset files found' when none exist", () => {
+        try {
+            loadConfig(tmp, "nonexistent");
+            expect.unreachable("should have thrown");
+        }
+        catch (err) {
+            expect(err.message).toContain("no preset files found");
+        }
+    });
+    it("preset flag ignores .orche.local.json", () => {
+        writeJSON(tmp, ".orche.local.json", baseConfig);
+        writeJSON(tmp, ".orche.mobile.json", mobileConfig);
+        const config = loadConfig(tmp, "mobile");
+        expect(config.layout).toEqual(mobileConfig.layout);
+    });
+});
+describe("listPresets", () => {
+    let tmp;
+    beforeEach(() => {
+        tmp = makeTmpDir();
+    });
+    afterEach(() => {
+        rmSync(tmp, { recursive: true, force: true });
+    });
+    it("returns empty array when no presets", () => {
+        expect(listPresets(tmp)).toEqual([]);
+    });
+    it("lists preset names without .orche. prefix and .json suffix", () => {
+        writeJSON(tmp, ".orche.mobile.json", {});
+        writeJSON(tmp, ".orche.debug.json", {});
+        writeJSON(tmp, ".orche.test.json", {});
+        const presets = listPresets(tmp).sort();
+        expect(presets).toEqual(["debug", "mobile", "test"]);
+    });
+    it("excludes .orche.json and .orche.local.json", () => {
+        writeJSON(tmp, ".orche.json", {});
+        writeJSON(tmp, ".orche.local.json", {});
+        writeJSON(tmp, ".orche.mobile.json", {});
+        expect(listPresets(tmp)).toEqual(["mobile"]);
+    });
+    it("ignores non-orche json files", () => {
+        writeJSON(tmp, "package.json", {});
+        writeJSON(tmp, "tsconfig.json", {});
+        writeJSON(tmp, ".orche.mobile.json", {});
+        expect(listPresets(tmp)).toEqual(["mobile"]);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taranek/orche",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "type": "module",
   "bin": {
     "orche": "./dist/cli.js"
@@ -16,11 +16,14 @@
   },
   "scripts": {
     "build": "tsc",
-    "dev": "tsc --watch"
+    "dev": "tsc --watch",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "devDependencies": {
     "@types/node": "^25.2.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "vitest": "^4.1.5"
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",

package/src/cli.ts

@@ -8,33 +8,16 @@ import { pruneCommand } from "./prune.js";
 import { getMultiplexer } from "./multiplexer.js";
 import { buildLayout } from "./layout.js";
 import { getReviewBinaryPath } from "./review-manager.js";
-import type { AgentsConfig, MultiplexerType } from "./types.js";
+import { loadConfig, parsePresetFlag } from "./config.js";
+import type { MultiplexerType } from "./types.js";
 
 const CONFIG_NAME = ".orche.json";
-const CONFIG_LOCAL_NAME = ".orche.local.json";
 
 function die(msg: string): never {
   console.error(`error: ${msg}`);
   process.exit(1);
 }
 
-
-function loadConfig(cwd: string): AgentsConfig {
-  const localPath = path.join(cwd, CONFIG_LOCAL_NAME);
-  const configPath = path.join(cwd, CONFIG_NAME);
-
-  if (existsSync(localPath)) {
-    const raw = readFileSync(localPath, "utf-8");
-    return JSON.parse(raw) as AgentsConfig;
-  }
-
-  if (!existsSync(configPath)) {
-    die(`no ${CONFIG_NAME} found in ${cwd}`);
-  }
-  const raw = readFileSync(configPath, "utf-8");
-  return JSON.parse(raw) as AgentsConfig;
-}
-
 function deliverReview(pendingPath: string): void {
   try {
     const pending = JSON.parse(readFileSync(pendingPath, "utf-8"));
@@ -142,9 +125,11 @@ function getRepoRoot(cwd: string): string {
 function startSession(): void {
   const cwd = getRepoRoot(process.cwd());
   const repoName = path.basename(cwd);
-  const taskName = process.argv.slice(3).find((a) => !a.startsWith("--")) || "session";
+  const args = process.argv.slice(3);
+  const preset = parsePresetFlag(args);
+  const taskName = args.find((a) => !a.startsWith("-") && a !== preset) || "session";
 
-  const config = loadConfig(cwd);
+  const config = loadConfig(cwd, preset);
   const muxFlag: MultiplexerType | undefined =
     process.argv.includes("--tmux") ? "tmux" :
     process.argv.includes("--cmux") ? "cmux" :
@@ -176,20 +161,26 @@ function printUsage(): void {
 orche — orchestrate agents across git worktrees
 
 Usage:
-  orche start <task>         Start a new session for <task>
-  orche review [path]        Open the review UI for a worktree
-  orche prune [--all] [-f]   Remove orche worktrees (interactive multiselect)
+  orche start <task> [-p <preset>]   Start a new session for <task>
+  orche review [path]                Open the review UI for a worktree
+  orche prune [--all] [-f]           Remove orche worktrees (interactive multiselect)
+
+Options:
+  -p, --preset=<name>    Load .orche.<name>.json instead of .orche.json
 
 Examples:
-  orche start fix-auth       Create worktree + session for "fix-auth"
-  orche review               Review changes in current directory
-  orche review ./worktree    Review changes in a specific worktree
-  orche prune                Pick worktrees to remove
-  orche prune --all          Remove all orche worktrees
-  orche prune --force        Allow removing worktrees with uncommitted changes
+  orche start fix-auth              Create worktree + session for "fix-auth"
+  orche start fix-auth -p mobile    Use .orche.mobile.json preset
+  orche start fix-auth -p debug     Use .orche.debug.json preset
+  orche review                      Review changes in current directory
+  orche review ./worktree           Review changes in a specific worktree
+  orche prune                       Pick worktrees to remove
+  orche prune --all                 Remove all orche worktrees
+  orche prune --force               Allow removing worktrees with uncommitted changes
 
 Requires a ${CONFIG_NAME} file in the current directory.
-Use ${CONFIG_LOCAL_NAME} for local overrides (not committed).
+Use .orche.local.json for local overrides (not committed).
+Use .orche.<preset>.json for named presets (e.g. .orche.mobile.json).
 See .orche.example.json for the config format.
 `);
 }

package/src/config.test.ts

@@ -0,0 +1,148 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, writeFileSync, mkdirSync, rmSync } from "node:fs";
+import path from "node:path";
+import os from "node:os";
+import { loadConfig, listPresets, parsePresetFlag, ConfigError } from "./config.js";
+
+function makeTmpDir(): string {
+  return mkdtempSync(path.join(os.tmpdir(), "orche-test-"));
+}
+
+function writeJSON(dir: string, name: string, data: unknown): void {
+  writeFileSync(path.join(dir, name), JSON.stringify(data));
+}
+
+const baseConfig = { layout: { name: "main", command: "echo hi" } };
+const mobileConfig = { layout: { name: "mobile", command: "echo mobile" } };
+const debugConfig = { layout: { name: "debug", command: "echo debug" } };
+
+describe("parsePresetFlag", () => {
+  it("parses -p flag", () => {
+    expect(parsePresetFlag(["-p", "mobile"])).toBe("mobile");
+  });
+
+  it("parses --preset= flag", () => {
+    expect(parsePresetFlag(["--preset=debug"])).toBe("debug");
+  });
+
+  it("returns undefined when no preset flag", () => {
+    expect(parsePresetFlag(["fix-auth", "--tmux"])).toBeUndefined();
+  });
+
+  it("returns undefined when -p has no value", () => {
+    expect(parsePresetFlag(["-p"])).toBeUndefined();
+  });
+
+  it("ignores -p when it is the last arg", () => {
+    expect(parsePresetFlag(["start", "-p"])).toBeUndefined();
+  });
+});
+
+describe("loadConfig", () => {
+  let tmp: string;
+
+  beforeEach(() => {
+    tmp = makeTmpDir();
+  });
+
+  afterEach(() => {
+    rmSync(tmp, { recursive: true, force: true });
+  });
+
+  it("loads .orche.json", () => {
+    writeJSON(tmp, ".orche.json", baseConfig);
+    const config = loadConfig(tmp);
+    expect(config.layout).toEqual(baseConfig.layout);
+  });
+
+  it("prefers .orche.local.json over .orche.json", () => {
+    writeJSON(tmp, ".orche.json", baseConfig);
+    writeJSON(tmp, ".orche.local.json", mobileConfig);
+    const config = loadConfig(tmp);
+    expect(config.layout).toEqual(mobileConfig.layout);
+  });
+
+  it("throws ConfigError when no config found", () => {
+    expect(() => loadConfig(tmp)).toThrow(ConfigError);
+    expect(() => loadConfig(tmp)).toThrow(".orche.json");
+  });
+
+  it("loads a preset config", () => {
+    writeJSON(tmp, ".orche.mobile.json", mobileConfig);
+    const config = loadConfig(tmp, "mobile");
+    expect(config.layout).toEqual(mobileConfig.layout);
+  });
+
+  it("throws ConfigError for missing preset", () => {
+    expect(() => loadConfig(tmp, "nonexistent")).toThrow(ConfigError);
+    expect(() => loadConfig(tmp, "nonexistent")).toThrow('preset "nonexistent" not found');
+  });
+
+  it("lists available presets in error when preset not found", () => {
+    writeJSON(tmp, ".orche.mobile.json", mobileConfig);
+    writeJSON(tmp, ".orche.debug.json", debugConfig);
+    try {
+      loadConfig(tmp, "nonexistent");
+      expect.unreachable("should have thrown");
+    } catch (err) {
+      const msg = (err as Error).message;
+      expect(msg).toContain("available presets:");
+      expect(msg).toContain("mobile");
+      expect(msg).toContain("debug");
+    }
+  });
+
+  it("shows 'no preset files found' when none exist", () => {
+    try {
+      loadConfig(tmp, "nonexistent");
+      expect.unreachable("should have thrown");
+    } catch (err) {
+      expect((err as Error).message).toContain("no preset files found");
+    }
+  });
+
+  it("preset flag ignores .orche.local.json", () => {
+    writeJSON(tmp, ".orche.local.json", baseConfig);
+    writeJSON(tmp, ".orche.mobile.json", mobileConfig);
+    const config = loadConfig(tmp, "mobile");
+    expect(config.layout).toEqual(mobileConfig.layout);
+  });
+});
+
+describe("listPresets", () => {
+  let tmp: string;
+
+  beforeEach(() => {
+    tmp = makeTmpDir();
+  });
+
+  afterEach(() => {
+    rmSync(tmp, { recursive: true, force: true });
+  });
+
+  it("returns empty array when no presets", () => {
+    expect(listPresets(tmp)).toEqual([]);
+  });
+
+  it("lists preset names without .orche. prefix and .json suffix", () => {
+    writeJSON(tmp, ".orche.mobile.json", {});
+    writeJSON(tmp, ".orche.debug.json", {});
+    writeJSON(tmp, ".orche.test.json", {});
+    const presets = listPresets(tmp).sort();
+    expect(presets).toEqual(["debug", "mobile", "test"]);
+  });
+
+  it("excludes .orche.json and .orche.local.json", () => {
+    writeJSON(tmp, ".orche.json", {});
+    writeJSON(tmp, ".orche.local.json", {});
+    writeJSON(tmp, ".orche.mobile.json", {});
+    expect(listPresets(tmp)).toEqual(["mobile"]);
+  });
+
+  it("ignores non-orche json files", () => {
+    writeJSON(tmp, "package.json", {});
+    writeJSON(tmp, "tsconfig.json", {});
+    writeJSON(tmp, ".orche.mobile.json", {});
+    expect(listPresets(tmp)).toEqual(["mobile"]);
+  });
+});

package/src/config.ts

@@ -0,0 +1,59 @@
+import { readFileSync, readdirSync, existsSync } from "node:fs";
+import path from "node:path";
+import type { AgentsConfig } from "./types.js";
+
+const CONFIG_NAME = ".orche.json";
+const CONFIG_LOCAL_NAME = ".orche.local.json";
+const CONFIG_PRESET_PREFIX = ".orche.";
+const CONFIG_PRESET_SUFFIX = ".json";
+
+export class ConfigError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "ConfigError";
+  }
+}
+
+export function listPresets(cwd: string): string[] {
+  const files = readdirSync(cwd);
+  return files
+    .filter(f => f.startsWith(CONFIG_PRESET_PREFIX) && f.endsWith(CONFIG_PRESET_SUFFIX) && f !== CONFIG_NAME && f !== CONFIG_LOCAL_NAME)
+    .map(f => f.slice(CONFIG_PRESET_PREFIX.length, -CONFIG_PRESET_SUFFIX.length));
+}
+
+export function loadConfig(cwd: string, preset?: string): AgentsConfig {
+  if (preset) {
+    const presetPath = path.join(cwd, `${CONFIG_PRESET_PREFIX}${preset}${CONFIG_PRESET_SUFFIX}`);
+    if (!existsSync(presetPath)) {
+      const available = listPresets(cwd);
+      const list = available.length > 0
+        ? `\navailable presets: ${available.join(", ")}`
+        : "\nno preset files found in current directory";
+      throw new ConfigError(`preset "${preset}" not found (looked for ${CONFIG_PRESET_PREFIX}${preset}${CONFIG_PRESET_SUFFIX})${list}`);
+    }
+    const raw = readFileSync(presetPath, "utf-8");
+    return JSON.parse(raw) as AgentsConfig;
+  }
+
+  const localPath = path.join(cwd, CONFIG_LOCAL_NAME);
+  const configPath = path.join(cwd, CONFIG_NAME);
+
+  if (existsSync(localPath)) {
+    const raw = readFileSync(localPath, "utf-8");
+    return JSON.parse(raw) as AgentsConfig;
+  }
+
+  if (!existsSync(configPath)) {
+    throw new ConfigError(`no ${CONFIG_NAME} found in ${cwd}`);
+  }
+  const raw = readFileSync(configPath, "utf-8");
+  return JSON.parse(raw) as AgentsConfig;
+}
+
+export function parsePresetFlag(args: string[]): string | undefined {
+  const idx = args.indexOf("-p");
+  if (idx !== -1 && idx + 1 < args.length) return args[idx + 1];
+  const long = args.find(a => a.startsWith("--preset="));
+  if (long) return long.split("=")[1];
+  return undefined;
+}