@cestoliv/wt 0.1.0-pr5.g3ca944a → 0.1.0-pr5.gd63269d

package/dist/{agent-SKQRHH3U.js → agent-PR7PGIE5.js}

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 import {
-  openConfiguredIde,
   prepareWorktree
-} from "./chunk-YNGWUXCX.js";
-import "./chunk-FSARWOCW.js";
+} from "./chunk-D4BVSTNE.js";
+import {
+  openIde
+} from "./chunk-FSARWOCW.js";
 import "./chunk-IQWENLPW.js";
 
 // src/commands/agent.ts
@@ -13,6 +14,7 @@ import pc from "picocolors";
 // src/lib/zed.ts
 import { spawn } from "child_process";
 import {
+  copyFileSync,
   existsSync,
   mkdirSync,
   readdirSync,
@@ -37,6 +39,13 @@ function buildAgentTask(agentCommand, prompt, label) {
     shell: "system"
   };
 }
+function upsertTask(tasks, task) {
+  const idx = tasks.findIndex((t) => t.label === task.label);
+  if (idx === -1) return [...tasks, task];
+  const next = [...tasks];
+  next[idx] = task;
+  return next;
+}
 function removeTask(tasks, label) {
   return tasks.filter((t) => t.label !== label);
 }
@@ -55,12 +64,6 @@ function upsertKeymapBinding(keymap, chord, label) {
   if (already) return keymap;
   return [...keymap, target];
 }
-function hasConflictingChord(keymap, chord, label) {
-  const ours = JSON.stringify(buildKeymapBinding(chord, label).bindings[chord]);
-  return keymap.some(
-    (e) => e.bindings != null && e.bindings[chord] !== void 0 && JSON.stringify(e.bindings[chord]) !== ours
-  );
-}
 var MODIFIER_MAP = {
   ctrl: "control down",
   control: "control down",
@@ -72,37 +75,6 @@ var MODIFIER_MAP = {
   opt: "option down",
   option: "option down"
 };
-var KEY_CODE_MAP = {
-  space: 49,
-  tab: 48,
-  return: 36,
-  enter: 36,
-  escape: 53,
-  esc: 53,
-  delete: 51,
-  backspace: 51,
-  forwarddelete: 117,
-  up: 126,
-  down: 125,
-  left: 123,
-  right: 124,
-  home: 115,
-  end: 119,
-  pageup: 116,
-  pagedown: 121,
-  f1: 122,
-  f2: 120,
-  f3: 99,
-  f4: 118,
-  f5: 96,
-  f6: 97,
-  f7: 98,
-  f8: 100,
-  f9: 101,
-  f10: 109,
-  f11: 103,
-  f12: 111
-};
 function parseChord(chord) {
   const parts = chord.split("-").map((p) => p.trim().toLowerCase()).filter(Boolean);
   if (parts.length === 0) {
@@ -122,35 +94,17 @@ function buildOsascript(chord, opts = {}) {
   const { loadDelay = 3, activateDelay = 0.8 } = opts;
   const { key, modifiers } = parseChord(chord);
   const using = modifiers.length > 0 ? ` using {${modifiers.join(", ")}}` : "";
-  let press;
-  if (key.length === 1) {
-    const escaped = key.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    press = `keystroke "${escaped}"`;
-  } else {
-    const code = KEY_CODE_MAP[key];
-    if (code === void 0) {
-      throw new Error(
-        `Unsupported key "${key}" in chord "${chord}". Use a single character or one of: ${Object.keys(KEY_CODE_MAP).join(", ")}.`
-      );
-    }
-    press = `key code ${code}`;
-  }
   return [
     `delay ${loadDelay}`,
     'tell application "Zed" to activate',
     `delay ${activateDelay}`,
-    `tell application "System Events" to ${press}${using}`
+    `tell application "System Events" to keystroke "${key}"${using}`
   ].join("\n");
 }
-function parseTasks(raw) {
-  const errors = [];
-  const parsed = parse(raw, errors, { allowTrailingComma: true });
-  if (errors.length > 0 || !Array.isArray(parsed)) return null;
-  return parsed;
-}
 function readTasks(tasksPath) {
   try {
-    return parseTasks(readFileSync(tasksPath, "utf8")) ?? [];
+    const parsed = JSON.parse(readFileSync(tasksPath, "utf8"));
+    return Array.isArray(parsed) ? parsed : [];
   } catch {
     return [];
   }
@@ -161,28 +115,9 @@ function writeAgentTask(worktreePath, task) {
   const createdDir = !existsSync(zedDir);
   if (createdDir) mkdirSync(zedDir, { recursive: true });
   const createdFile = !existsSync(tasksPath);
-  if (createdFile) {
-    writeFileSync(tasksPath, `${JSON.stringify([task], null, 2)}
-`);
-    return { createdDir, createdFile };
-  }
-  const raw = readFileSync(tasksPath, "utf8");
-  const tasks = parseTasks(raw);
-  if (tasks === null) {
-    process.stderr.write(
-      `
-Warning: could not parse ${tasksPath}; not modifying it. The agent task was not added.
-`
-    );
-    return { createdDir, createdFile };
-  }
-  const idx = tasks.findIndex((t) => t.label === task.label);
-  const edits = modify(raw, idx === -1 ? [tasks.length] : [idx], task, {
-    isArrayInsertion: idx === -1,
-    formattingOptions: { insertSpaces: true, tabSize: 2 }
-  });
-  const updated = applyEdits(raw, edits);
-  writeFileSync(tasksPath, updated.endsWith("\n") ? updated : `${updated}
+  const existing = createdFile ? [] : readTasks(tasksPath);
+  const next = upsertTask(existing, task);
+  writeFileSync(tasksPath, `${JSON.stringify(next, null, 2)}
 `);
   return { createdDir, createdFile };
 }
@@ -190,30 +125,12 @@ function cleanupAgentTask(worktreePath, label, created) {
   const zedDir = join(worktreePath, ".zed");
   const tasksPath = join(zedDir, "tasks.json");
   if (existsSync(tasksPath)) {
-    try {
-      if (created.createdFile) {
-        const next = removeTask(readTasks(tasksPath), label);
-        if (next.length === 0) {
-          rmSync(tasksPath, { force: true });
-        } else {
-          writeFileSync(tasksPath, `${JSON.stringify(next, null, 2)}
+    const next = removeTask(readTasks(tasksPath), label);
+    if (next.length === 0 && created.createdFile) {
+      rmSync(tasksPath, { force: true });
+    } else {
+      writeFileSync(tasksPath, `${JSON.stringify(next, null, 2)}
 `);
-        }
-      } else {
-        const raw = readFileSync(tasksPath, "utf8");
-        const tasks = parseTasks(raw);
-        const idx = tasks?.findIndex((t) => t.label === label) ?? -1;
-        if (idx !== -1) {
-          const edits = modify(raw, [idx], void 0, {});
-          const updated = applyEdits(raw, edits);
-          writeFileSync(
-            tasksPath,
-            updated.endsWith("\n") ? updated : `${updated}
-`
-          );
-        }
-      }
-    } catch {
     }
   }
   if (created.createdDir && existsSync(zedDir)) {
@@ -255,18 +172,12 @@ ${JSON.stringify(binding, null, 2)}
   if (upsertKeymapBinding(keymap, chord, label) === keymap) {
     return true;
   }
-  if (hasConflictingChord(keymap, chord, label)) {
-    process.stderr.write(
-      `
-Note: "${chord}" is already bound in ${keymapPath}; wt's agent binding will take precedence.
-`
-    );
-  }
   const edits = modify(raw, [keymap.length], binding, {
     isArrayInsertion: true,
     formattingOptions: { insertSpaces: true, tabSize: 2 }
   });
   const updated = applyEdits(raw, edits);
+  copyFileSync(keymapPath, `${keymapPath}.bak`);
   writeFileSync(keymapPath, updated.endsWith("\n") ? updated : `${updated}
 `);
   return true;
@@ -318,7 +229,7 @@ function openAccessibilitySettings(open = defaultOpen) {
 }
 
 // src/commands/agent.ts
-var CLEANUP_DELAY_MS = 2e4;
+var CLEANUP_DELAY_MS = 2e3;
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function createAgentWorktree(branch, planPrompt, options = {}) {
   const prepared = await prepareWorktree(branch, options);
@@ -330,14 +241,15 @@ async function createAgentWorktree(branch, planPrompt, options = {}) {
         `\u26A0 Agent auto-start requires Zed (ide is "${config.ide}"). Opening without starting the agent.`
       )
     );
-    await openConfiguredIde(config, worktreePath);
+    if (config.ide) {
+      await openIde(config.ide, config.ide_open_args, worktreePath);
+    }
     return;
   }
   if (!config.agent_command) {
     console.error(
       pc.red("No agent_command configured. Set it with `wt config`.")
     );
-    await openConfiguredIde(config, worktreePath);
     return;
   }
   const task = buildAgentTask(
@@ -346,21 +258,14 @@ async function createAgentWorktree(branch, planPrompt, options = {}) {
     AGENT_TASK_LABEL
   );
   const created = writeAgentTask(worktreePath, task);
-  const keymapOk = ensureKeymap(config.agent_trigger_chord, AGENT_TASK_LABEL);
-  const opened = await openConfiguredIde(config, worktreePath);
+  ensureKeymap(config.agent_trigger_chord, AGENT_TASK_LABEL);
+  const opened = await openIde("zed", config.ide_open_args, worktreePath);
   if (!opened) {
     console.error(pc.red("\u2717 Could not open Zed."));
     cleanupAgentTask(worktreePath, AGENT_TASK_LABEL, created);
     return;
   }
-  if (!keymapOk) {
-    console.warn(
-      pc.yellow(
-        `\u26A0 Could not install the Zed keybinding (see above). In Zed, press ${config.agent_trigger_chord} to start the agent manually.`
-      )
-    );
-    return;
-  }
+  console.log(pc.green("\u2713 Opened Zed"));
   console.log(pc.dim("Starting agent in Zed\u2026"));
   let result = await triggerChord(config.agent_trigger_chord);
   while (!result.ok && result.reason === "accessibility" && process.stdin.isTTY) {

package/dist/{chunk-YNGWUXCX.js → chunk-D4BVSTNE.js}

@@ -140,22 +140,23 @@ async function prepareWorktree(branch, options = {}) {
   }
   return { repoRoot, worktreePath, config };
 }
-async function openConfiguredIde(config, worktreePath) {
-  if (!config.ide) return false;
-  const opened = await openIde(config.ide, config.ide_open_args, worktreePath);
-  if (opened) {
-    console.log(pc.green(`\u2713 Opened ${config.ide}`));
-  }
-  return opened;
-}
 async function createWorktree(branch, options = {}) {
   const prepared = await prepareWorktree(branch, options);
   if (!prepared) return;
-  await openConfiguredIde(prepared.config, prepared.worktreePath);
+  const { config, worktreePath } = prepared;
+  if (config.ide) {
+    const opened = await openIde(
+      config.ide,
+      config.ide_open_args,
+      worktreePath
+    );
+    if (opened) {
+      console.log(pc.green(`\u2713 Opened ${config.ide}`));
+    }
+  }
 }
 
 export {
   prepareWorktree,
-  openConfiguredIde,
   createWorktree
 };

package/dist/cli.js

@@ -3,16 +3,16 @@
 // src/cli.ts
 import { Command } from "commander";
 var program = new Command();
-program.name("wt").description("Git worktree manager").version("0.1.0-pr5.g3ca944a").action(async () => {
-  const { runList } = await import("./list-KG6HKRMK.js");
+program.name("wt").description("Git worktree manager").version("0.1.0-pr5.gd63269d").action(async () => {
+  const { runList } = await import("./list-HO42YAEG.js");
   await runList();
 });
 program.command("create [branch]").description("Create a new worktree").action(async (branch) => {
-  const { createWorktree } = await import("./create-66LRJRWI.js");
+  const { createWorktree } = await import("./create-55SXEUZV.js");
   await createWorktree(branch);
 });
 program.command("agent <branch> <plan_prompt>").description("Create a worktree and auto-start an AI agent in Zed (macOS)").action(async (branch, planPrompt) => {
-  const { createAgentWorktree } = await import("./agent-SKQRHH3U.js");
+  const { createAgentWorktree } = await import("./agent-PR7PGIE5.js");
   await createAgentWorktree(branch, planPrompt);
 });
 program.command("config").description("Open the config file in $EDITOR").option("--path", "Print the config file path and exit").action(async (options) => {

package/dist/{create-66LRJRWI.js → create-55SXEUZV.js}

@@ -1,13 +1,11 @@
 #!/usr/bin/env node
 import {
   createWorktree,
-  openConfiguredIde,
   prepareWorktree
-} from "./chunk-YNGWUXCX.js";
+} from "./chunk-D4BVSTNE.js";
 import "./chunk-FSARWOCW.js";
 import "./chunk-IQWENLPW.js";
 export {
   createWorktree,
-  openConfiguredIde,
   prepareWorktree
 };

package/dist/{list-KG6HKRMK.js → list-HO42YAEG.js}

@@ -93,7 +93,7 @@ ${dirty.map((f) => `  ${f}`).join("\n")}`
     },
     onCreate: async () => {
       if (repoRoot) {
-        const { createWorktree } = await import("./create-66LRJRWI.js");
+        const { createWorktree } = await import("./create-55SXEUZV.js");
         await createWorktree(void 0, { cwd: repoRoot, store });
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cestoliv/wt",
-  "version": "0.1.0-pr5.g3ca944a",
+  "version": "0.1.0-pr5.gd63269d",
   "description": "Fast, interactive TUI to browse, create, open, and delete git worktrees across repos.",
   "repository": {
     "type": "git",