syntaur 0.17.2 → 0.17.4

package/dist/index.js

@@ -7856,6 +7856,52 @@ var init_git_worktree = __esm({
   }
 });
 
+// src/launch/cwd.ts
+import { existsSync as existsSync2, statSync as statSync2 } from "fs";
+import { isAbsolute as isAbsolute3 } from "path";
+function isExistingDir(p) {
+  if (!p || !isAbsolute3(p)) return false;
+  try {
+    return existsSync2(p) && statSync2(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function resolveWorkspaceCwd(input4) {
+  const { worktreePath, repository, branch, assignmentSlug } = input4;
+  if (isExistingDir(worktreePath)) {
+    return { cwd: worktreePath, fallbackWarning: null, invalidReason: null };
+  }
+  if (isExistingDir(repository)) {
+    const fallbackWarning = worktreePath ? `syntaur: workspace.worktreePath ${worktreePath} is not an existing directory for ${assignmentSlug} \u2014 launching in ${repository}` : formatFallbackCwdWarning({
+      assignmentSlug,
+      workspaceDir: repository,
+      worktreePath,
+      branch
+    });
+    return { cwd: repository, fallbackWarning, invalidReason: null };
+  }
+  const shown = (p) => p && p.trim().length > 0 ? p : "(unset)";
+  return {
+    cwd: null,
+    fallbackWarning: null,
+    invalidReason: `workspace path invalid for ${assignmentSlug}: tried worktreePath ${shown(worktreePath)} and repository ${shown(repository)} \u2014 neither is an existing directory`
+  };
+}
+function formatFallbackCwdWarning(opts) {
+  const missing = [];
+  if (!opts.worktreePath) missing.push("worktreePath");
+  if (!opts.branch) missing.push("branch");
+  if (missing.length === 0) return null;
+  const fields = missing.map((m) => `workspace.${m}`).join(" and ");
+  return `syntaur: ${fields} not set for ${opts.assignmentSlug} \u2014 launching in ${opts.workspaceDir}`;
+}
+var init_cwd = __esm({
+  "src/launch/cwd.ts"() {
+    "use strict";
+  }
+});
+
 // src/utils/promote-todos.ts
 var promote_todos_exports = {};
 __export(promote_todos_exports, {
@@ -8047,15 +8093,7 @@ __export(launch_exports, {
 });
 import { spawn as spawn3 } from "child_process";
 import { mkdir as mkdir6, writeFile as writeFile10 } from "fs/promises";
-import { isAbsolute as isAbsolute4, resolve as resolve43 } from "path";
-function formatFallbackCwdWarning(opts) {
-  const missing = [];
-  if (!opts.worktreePath) missing.push("worktreePath");
-  if (!opts.branch) missing.push("branch");
-  if (missing.length === 0) return null;
-  const fields = missing.map((m) => `workspace.${m}`).join(" and ");
-  return `syntaur: ${fields} not set for ${opts.assignmentSlug} \u2014 launching in ${opts.workspaceDir}`;
-}
+import { isAbsolute as isAbsolute5, resolve as resolve43 } from "path";
 function shellQuote(arg) {
   if (arg === "") return "''";
   return `'${arg.replace(/'/g, `'\\''`)}'`;
@@ -8068,7 +8106,7 @@ function buildAgentArgv(agent, prompt, env = process.env) {
     const requested = env.SHELL;
     let shell = requested;
     let warning = null;
-    if (!shell || !isAbsolute4(shell)) {
+    if (!shell || !isAbsolute5(shell)) {
       warning = `syntaur: $SHELL ${requested ? `("${requested}") is not absolute` : "is unset"} \u2014 falling back to /bin/sh for shell-alias resolution`;
       shell = "/bin/sh";
     }
@@ -8093,10 +8131,30 @@ async function launchAgent(options) {
   }
   const projectDir = resolve43(projectsDir2, projectSlug);
   const assignmentDir = resolve43(projectDir, "assignments", assignmentSlug);
-  const resolvedFromWorkspace = cwdOverride ?? detail.workspace.worktreePath ?? (detail.workspace.repository?.startsWith("/") ? detail.workspace.repository : null);
-  const workspaceDir = resolvedFromWorkspace ?? process.cwd();
-  if (!cwdOverride) {
-    const warning = formatFallbackCwdWarning({
+  let workspaceDir;
+  if (cwdOverride) {
+    if (!isExistingDir(cwdOverride)) {
+      console.error(
+        `syntaur: --cwd ${cwdOverride} is not an existing directory \u2014 refusing to launch.`
+      );
+      exitWith(1);
+      return;
+    }
+    workspaceDir = cwdOverride;
+  } else {
+    const picked = resolveWorkspaceCwd({
+      worktreePath: detail.workspace.worktreePath,
+      repository: detail.workspace.repository,
+      branch: detail.workspace.branch,
+      assignmentSlug
+    });
+    if (picked.cwd === null) {
+      console.error(`syntaur: ${picked.invalidReason} \u2014 refusing to launch.`);
+      exitWith(1);
+      return;
+    }
+    workspaceDir = picked.cwd;
+    const warning = picked.fallbackWarning ?? formatFallbackCwdWarning({
       assignmentSlug,
       workspaceDir,
       worktreePath: detail.workspace.worktreePath,
@@ -8127,8 +8185,9 @@ async function launchAgent(options) {
   if (shellFallbackWarning) {
     console.warn(shellFallbackWarning);
   }
+  const spawnImpl = options.spawnFn ?? spawn3;
   return new Promise((resolvePromise) => {
-    const child = spawn3(argv.command, argv.args, {
+    const child = spawnImpl(argv.command, argv.args, {
       cwd: workspaceDir,
       stdio: "inherit"
     });
@@ -8161,6 +8220,8 @@ var init_launch = __esm({
   "src/tui/launch.ts"() {
     "use strict";
     init_api();
+    init_cwd();
+    init_cwd();
     INITIAL_PROMPT = (params2) => {
       if (params2.projectSlug) {
         return `/grab-assignment ${params2.projectSlug} ${params2.assignmentSlug}`;
@@ -8179,7 +8240,7 @@ __export(install_macos_url_handler_exports, {
   registerMacosUrlHandler: () => registerMacosUrlHandler
 });
 import {
-  existsSync as existsSync2,
+  existsSync as existsSync4,
   mkdirSync as mkdirSync2,
   rmSync,
   writeFileSync,
@@ -8189,15 +8250,15 @@ import {
   unlinkSync
 } from "fs";
 import { fileURLToPath as fileURLToPath6, pathToFileURL } from "url";
-import { dirname as dirname14, resolve as resolve45, join as join5 } from "path";
-import { homedir as homedir6, tmpdir as tmpdir2 } from "os";
+import { dirname as dirname14, resolve as resolve45, join as join6 } from "path";
+import { homedir as homedir7, tmpdir as tmpdir2 } from "os";
 import { spawnSync as spawnSync6 } from "child_process";
 function syntaurRootMjs() {
   const override = process.env.SYNTAUR_HOME;
   if (override && override.length > 0) {
     return override;
   }
-  return join5(homedir6(), ".syntaur");
+  return join6(homedir7(), ".syntaur");
 }
 async function registerMacosUrlHandler(options = { throwOnFailure: false }) {
   const { throwOnFailure } = options;
@@ -8230,19 +8291,19 @@ async function registerMacosUrlHandler(options = { throwOnFailure: false }) {
     const pkgRoot = resolve45(dirname14(fileURLToPath6(import.meta.url)), "..");
     const cliBin = realpathSync2(resolve45(pkgRoot, "bin/syntaur.js"));
     const nodeBin = process.execPath;
-    const bundleParent = join5(
-      homedir6(),
+    const bundleParent = join6(
+      homedir7(),
       "Library",
       "Application Support",
       "Syntaur"
     );
-    const bundlePath = join5(bundleParent, "syntaur-url.app");
+    const bundlePath = join6(bundleParent, "syntaur-url.app");
     mkdirSync2(bundleParent, { recursive: true });
-    if (existsSync2(bundlePath)) {
+    if (existsSync4(bundlePath)) {
       rmSync(bundlePath, { recursive: true, force: true });
     }
     const installedTerminals = detectInstalledTerminals();
-    const scriptPath = join5(
+    const scriptPath = join6(
       tmpdir2(),
       `syntaur-url-handler-${process.pid}.applescript`
     );
@@ -8261,8 +8322,8 @@ async function registerMacosUrlHandler(options = { throwOnFailure: false }) {
         `osacompile exited with code ${compile.status}: ${compile.stderr || compile.stdout}`
       );
     }
-    const infoPlistPath = join5(bundlePath, "Contents", "Info.plist");
-    if (!existsSync2(infoPlistPath)) {
+    const infoPlistPath = join6(bundlePath, "Contents", "Info.plist");
+    if (!existsSync4(infoPlistPath)) {
       throw new Error(`osacompile did not produce ${infoPlistPath}`);
     }
     runPlistBuddy(infoPlistPath, [
@@ -8351,6 +8412,12 @@ function detectInstalledTerminals() {
     ghostty: "com.mitchellh.ghostty",
     warp: "dev.warp.Warp-Stable"
   };
+  const bundleNames = {
+    iterm: "iTerm.app",
+    ghostty: "Ghostty.app",
+    warp: "Warp.app"
+  };
+  const appDirs = ["/Applications", join6(homedir7(), "Applications")];
   for (const [id, bundleId] of Object.entries(bundleIds)) {
     const r = spawnSync6(
       "mdfind",
@@ -8359,6 +8426,11 @@ function detectInstalledTerminals() {
     );
     if (r.status === 0 && r.stdout.trim().length > 0) {
       installed.add(id);
+      continue;
+    }
+    const name = bundleNames[id];
+    if (name && appDirs.some((dir) => existsSync4(join6(dir, name)))) {
+      installed.add(id);
     }
   }
   return installed;
@@ -8452,11 +8524,17 @@ function renderAppleScript({ nodeBin, cliBin, installedTerminals }) {
     "	-- Step 1: ask the CLI for the launch plan (two lines: terminal, shellCmd).",
     '	set planOutput to ""',
     "	try",
-    `		set planOutput to (do shell script quoted form of nodeBin & " " & quoted form of cliBin & " url --print-plan " & quoted form of theURL & " 2>> " & quoted form of logFile)`,
+    `		set planOutput to (do shell script quoted form of nodeBin & " " & quoted form of cliBin & " url --print-plan " & quoted form of theURL)`,
     "	on error errMsg number errNum",
+    "		-- No `2>>` redirect above, so a non-zero CLI exit surfaces its stderr",
+    "		-- (the formatUrlCommandError message, e.g. workspace-path-invalid) in",
+    "		-- errMsg. Log it AND show the user a visible alert.",
     "		try",
     `			do shell script "/usr/bin/printf '%s\\\\n' " & quoted form of ("syntaur:// plan resolution failed for " & theURL & ": " & errMsg & " (" & errNum & ")") & " >> " & quoted form of logFile`,
     "		end try",
+    "		try",
+    '			display alert "Open in agent failed" message errMsg as critical',
+    "		end try",
     "		return",
     "	end try",
     "",
@@ -8481,6 +8559,9 @@ function renderAppleScript({ nodeBin, cliBin, installedTerminals }) {
     "		try",
     `			do shell script "/usr/bin/printf '%s\\\\n' " & quoted form of ("syntaur:// launch failed for " & theURL & " (terminal=" & theTerminal & "): " & errMsg & " (" & errNum & ")") & " >> " & quoted form of logFile`,
     "		end try",
+    "		try",
+    '			display alert "Open in agent failed" message errMsg as critical',
+    "		end try",
     "	end try",
     "end open location",
     "",
@@ -13091,17 +13172,43 @@ import { Router as Router6 } from "express";
 
 // src/utils/terminal-probe.ts
 import { spawnSync as spawnSync4 } from "child_process";
+import { existsSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
 var APP_BUNDLE_IDS = {
   "terminal-app": "com.apple.Terminal",
   iterm: "com.googlecode.iterm2",
   ghostty: "com.mitchellh.ghostty",
   warp: "dev.warp.Warp-Stable"
 };
+var APP_BUNDLE_NAMES = {
+  iterm: "iTerm.app",
+  ghostty: "Ghostty.app",
+  warp: "Warp.app"
+};
+var APP_FIXED_PATHS = {
+  "terminal-app": "/System/Applications/Utilities/Terminal.app"
+};
+function defaultApplicationsDirs() {
+  return ["/Applications", join2(homedir2(), "Applications")];
+}
+function findAppBundle(terminal, dirs = defaultApplicationsDirs()) {
+  const fixed = APP_FIXED_PATHS[terminal];
+  if (fixed && existsSync(fixed)) return fixed;
+  const bundleName = APP_BUNDLE_NAMES[terminal];
+  if (bundleName) {
+    for (const dir of dirs) {
+      const candidate = join2(dir, bundleName);
+      if (existsSync(candidate)) return candidate;
+    }
+  }
+  return null;
+}
 var CLI_NAMES = {
   alacritty: "alacritty",
   kitty: "kitty"
 };
-function probeTerminalInstalled(terminal) {
+function probeTerminalInstalled(terminal, opts = {}) {
   const bundleId = APP_BUNDLE_IDS[terminal];
   if (bundleId) {
     const result = spawnSync4(
@@ -13112,6 +13219,10 @@ function probeTerminalInstalled(terminal) {
     if (result.status === 0 && result.stdout.trim().length > 0) {
       return { ok: true, foundPath: result.stdout.trim().split("\n")[0] };
     }
+    const bundlePath = findAppBundle(terminal, opts.applicationsDirsOverride);
+    if (bundlePath) {
+      return { ok: true, foundPath: bundlePath };
+    }
     return { ok: false, reason: "not-installed" };
   }
   const cliName = CLI_NAMES[terminal];
@@ -13126,7 +13237,9 @@ function probeTerminalInstalled(terminal) {
 }
 
 // src/dashboard/api-launch-preflight.ts
-function createLaunchPreflightRouter() {
+init_api();
+init_cwd();
+function createLaunchPreflightRouter(projectsDir2, assignmentsDir2) {
   const router = Router6();
   router.post("/preflight", async (req, res) => {
     try {
@@ -13140,18 +13253,44 @@ function createLaunchPreflightRouter() {
       const config = await readConfig();
       const terminal = body.terminal ?? getTerminal(config);
       const probe = probeTerminalInstalled(terminal);
-      if (probe.ok) {
-        const response2 = { ok: true, terminal };
+      if (!probe.ok) {
+        const suggestedFallback = getTerminal({ ...config, terminal: null });
+        const response2 = {
+          ok: false,
+          terminal,
+          reason: "not-installed",
+          suggestedFallback
+        };
         res.json(response2);
         return;
       }
-      const suggestedFallback = getTerminal({ ...config, terminal: null });
-      const response = {
-        ok: false,
-        terminal,
-        reason: "not-installed",
-        suggestedFallback
-      };
+      const target = body.target;
+      if (target && target.kind === "assignment" && typeof target.id === "string") {
+        const detail = await getAssignmentDetailById(
+          projectsDir2,
+          assignmentsDir2,
+          target.id
+        );
+        if (detail) {
+          const picked = resolveWorkspaceCwd({
+            worktreePath: detail.workspace.worktreePath,
+            repository: detail.workspace.repository,
+            branch: detail.workspace.branch,
+            assignmentSlug: detail.slug
+          });
+          if (picked.cwd === null) {
+            const response2 = {
+              ok: false,
+              terminal,
+              reason: "workspace-path-invalid",
+              message: picked.invalidReason ?? "This assignment has no valid workspace directory."
+            };
+            res.json(response2);
+            return;
+          }
+        }
+      }
+      const response = { ok: true, terminal };
       res.json(response);
     } catch (error) {
       console.error("Error in launch preflight:", error);
@@ -16909,7 +17048,7 @@ init_config2();
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
 import { cp, mkdtemp, rm as rm3, readFile as readFile20, writeFile as writeFile5, unlink as unlink5, stat, open as open2, rename as rename7 } from "fs/promises";
-import { resolve as resolve29, join as join2 } from "path";
+import { resolve as resolve29, join as join3 } from "path";
 import { tmpdir } from "os";
 var exec2 = promisify2(execFile2);
 var VALID_CATEGORIES = ["projects", "playbooks", "todos", "servers", "config"];
@@ -17039,11 +17178,11 @@ async function backupToGithub(overrides) {
   let tmpDir = null;
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   try {
-    tmpDir = await mkdtemp(join2(tmpdir(), "syntaur-backup-"));
+    tmpDir = await mkdtemp(join3(tmpdir(), "syntaur-backup-"));
     await cloneOrInit(repo, tmpDir);
     for (const category of categories) {
       const { sourcePath, repoPath, isFile } = await resolveCategoryPath(category);
-      const destPath = join2(tmpDir, repoPath);
+      const destPath = join3(tmpDir, repoPath);
       if (isFile) {
         await rm3(destPath, { force: true });
       } else {
@@ -17171,7 +17310,7 @@ async function restoreFromGithub(overrides) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   try {
     await updateBackupConfig({ lastRestore: timestamp });
-    tmpDir = await mkdtemp(join2(tmpdir(), "syntaur-restore-"));
+    tmpDir = await mkdtemp(join3(tmpdir(), "syntaur-restore-"));
     await cloneOrInit(repo, tmpDir);
     for (const category of categories) {
       if (category === "config") {
@@ -17180,7 +17319,7 @@ async function restoreFromGithub(overrides) {
       }
       try {
         const { sourcePath: localPath, repoPath, isFile } = await resolveCategoryPath(category);
-        const repoSrcPath = join2(tmpDir, repoPath);
+        const repoSrcPath = join3(tmpDir, repoPath);
         if (!await fileExists(repoSrcPath)) {
           console.warn(`Category "${category}" not found in backup repo, skipping.`);
           continue;
@@ -18034,7 +18173,10 @@ function createDashboardServer(options) {
   app.use("/api/usage", createUsageRouter());
   app.use("/api/agent-sessions", createAgentSessionsRouter(projectsDir2, broadcast, assignmentsDir2));
   app.use("/api/config/agents", createAgentsRouter());
-  app.use("/api/launch", createLaunchPreflightRouter());
+  app.use(
+    "/api/launch",
+    createLaunchPreflightRouter(projectsDir2, assignmentsDir2)
+  );
   app.use("/api/playbooks", createPlaybooksRouter(playbooksDir3));
   app.get("/api/memories", async (_req, res) => {
     try {
@@ -18570,9 +18712,9 @@ import {
   unlink as unlink7,
   writeFile as writeFile7
 } from "fs/promises";
-import { existsSync } from "fs";
-import { homedir as homedir2 } from "os";
-import { basename as basename4, dirname as dirname10, isAbsolute as isAbsolute3, relative as relative2, resolve as resolve35 } from "path";
+import { existsSync as existsSync3 } from "fs";
+import { homedir as homedir3 } from "os";
+import { basename as basename4, dirname as dirname10, isAbsolute as isAbsolute4, relative as relative2, resolve as resolve35 } from "path";
 
 // src/utils/package-root.ts
 init_fs();
@@ -18605,20 +18747,20 @@ function getPluginManifestRelativePath(pluginKind) {
   return pluginKind === "claude" ? ".claude-plugin/plugin.json" : ".codex-plugin/plugin.json";
 }
 function getDefaultPluginTargetDir(pluginKind) {
-  const home = homedir2();
+  const home = homedir3();
   return pluginKind === "claude" ? resolve35(home, ".claude", "plugins", "syntaur") : resolve35(home, "plugins", "syntaur");
 }
 function getDefaultMarketplacePath() {
-  return resolve35(homedir2(), ".agents", "plugins", "marketplace.json");
+  return resolve35(homedir3(), ".agents", "plugins", "marketplace.json");
 }
 function getClaudeMarketplacesRoot() {
-  return resolve35(homedir2(), ".claude", "plugins", "marketplaces");
+  return resolve35(homedir3(), ".claude", "plugins", "marketplaces");
 }
 function getClaudeKnownMarketplacesPath() {
-  return resolve35(homedir2(), ".claude", "plugins", "known_marketplaces.json");
+  return resolve35(homedir3(), ".claude", "plugins", "known_marketplaces.json");
 }
 function getClaudeInstalledPluginsPath() {
-  return resolve35(homedir2(), ".claude", "plugins", "installed_plugins.json");
+  return resolve35(homedir3(), ".claude", "plugins", "installed_plugins.json");
 }
 function getInstallMarkerPath(targetDir) {
   return resolve35(targetDir, INSTALL_MARKER_FILENAME);
@@ -18728,7 +18870,7 @@ async function removeInstallMarker(targetDir) {
 }
 function normalizeAbsoluteInstallPath(pathValue, label) {
   const expanded = expandHome(pathValue.trim());
-  if (!isAbsolute3(expanded)) {
+  if (!isAbsolute4(expanded)) {
     throw new Error(`${label} must be an absolute path.`);
   }
   return resolve35(expanded);
@@ -18970,7 +19112,7 @@ async function ensureKnownClaudeMarketplaceForRoot(options) {
   return registerKnownClaudeMarketplace(options.name, options.rootDir);
 }
 async function setSyntaurPluginEnabled(options) {
-  const settingsPath = resolve35(homedir2(), ".claude", "settings.json");
+  const settingsPath = resolve35(homedir3(), ".claude", "settings.json");
   const key = `syntaur@${options.marketplaceName}`;
   let parsed = {};
   if (await fileExists(settingsPath)) {
@@ -19468,16 +19610,16 @@ async function textPrompt(question, defaultValue) {
 // src/utils/install-skills.ts
 init_fs();
 import { readFile as readFile24, readdir as readdir15, mkdir as mkdir4, copyFile, rm as rm5, lstat as lstat2 } from "fs/promises";
-import { resolve as resolve37, relative as relative3, join as join3 } from "path";
-import { homedir as homedir4 } from "os";
+import { resolve as resolve37, relative as relative3, join as join4 } from "path";
+import { homedir as homedir5 } from "os";
 
 // src/utils/plugin-state.ts
 init_fs();
 import { readFile as readFile23 } from "fs/promises";
 import { resolve as resolve36 } from "path";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 function settingsPathFor(agent) {
-  if (agent === "claude") return resolve36(homedir3(), ".claude", "settings.json");
+  if (agent === "claude") return resolve36(homedir4(), ".claude", "settings.json");
   return null;
 }
 async function readJsonOrNull(path) {
@@ -19536,15 +19678,15 @@ async function getSkillsDir() {
   return resolve37(packageRoot, "skills");
 }
 function defaultSkillTargetDir(target) {
-  if (target === "claude") return resolve37(homedir4(), ".claude", "skills");
-  return resolve37(homedir4(), ".codex", "skills");
+  if (target === "claude") return resolve37(homedir5(), ".claude", "skills");
+  return resolve37(homedir5(), ".codex", "skills");
 }
 async function walkFiles(root) {
   const out = [];
   async function walk(dir) {
     const entries = await readdir15(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = join3(dir, entry.name);
+      const full = join4(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(full);
       } else if (entry.isFile()) {
@@ -19568,8 +19710,8 @@ async function copyDir(srcDir, destDir) {
   await mkdir4(destDir, { recursive: true });
   const entries = await readdir15(srcDir, { withFileTypes: true });
   for (const entry of entries) {
-    const src = join3(srcDir, entry.name);
-    const dest = join3(destDir, entry.name);
+    const src = join4(srcDir, entry.name);
+    const dest = join4(destDir, entry.name);
     if (entry.isDirectory()) {
       await copyDir(src, dest);
     } else if (entry.isFile()) {
@@ -19582,7 +19724,7 @@ async function skillMatches(srcDir, destDir) {
   const srcFiles = await walkFiles(srcDir);
   for (const srcFile of srcFiles) {
     const rel = relative3(srcDir, srcFile);
-    const destFile = join3(destDir, rel);
+    const destFile = join4(destDir, rel);
     if (!await filesEqual(srcFile, destFile)) return false;
   }
   const destFiles = await walkFiles(destDir);
@@ -19625,7 +19767,7 @@ async function discoverSkillNames(sourceDir) {
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
     if (entry.name.startsWith(".")) continue;
-    if (await fileExists(join3(sourceDir, entry.name, "SKILL.md"))) {
+    if (await fileExists(join4(sourceDir, entry.name, "SKILL.md"))) {
       names.push(entry.name);
     }
   }
@@ -19652,8 +19794,8 @@ async function installSkillsWithReport(options) {
   const results = [];
   await mkdir4(targetRoot, { recursive: true });
   for (const skill of skillNames) {
-    const srcDir = join3(source, skill);
-    const destDir = join3(targetRoot, skill);
+    const srcDir = join4(source, skill);
+    const destDir = join4(targetRoot, skill);
     results.push(await installSkillDir(srcDir, destDir, skill, force));
   }
   return { results };
@@ -19674,10 +19816,10 @@ async function uninstallSkills(options) {
   }
   const removed = [];
   for (const skill of known) {
-    const destDir = join3(targetRoot, skill);
+    const destDir = join4(targetRoot, skill);
     if (!await fileExists(destDir)) continue;
     if (await isSymlink(destDir)) continue;
-    const skillMd = join3(destDir, "SKILL.md");
+    const skillMd = join4(destDir, "SKILL.md");
     if (!await fileExists(skillMd)) continue;
     const content = await readFile24(skillMd, "utf-8").catch(() => "");
     const match = content.match(/^name:\s*(\S+)\s*$/m);
@@ -19870,7 +20012,7 @@ init_paths();
 init_fs();
 import { readFile as readFile26, writeFile as writeFile9, copyFile as copyFile2, rm as rm6, stat as stat2, symlink as symlink2, unlink as unlink8, lstat as lstat3 } from "fs/promises";
 import { resolve as resolve39, dirname as dirname12 } from "path";
-import { homedir as homedir5 } from "os";
+import { homedir as homedir6 } from "os";
 import { fileURLToPath as fileURLToPath4 } from "url";
 
 // src/commands/configure-statusline.ts
@@ -20171,7 +20313,7 @@ async function installScript(sourceScript, destScript, link) {
 }
 async function installStatuslineCommand(options = {}) {
   const mode = options.mode ?? "ask";
-  const settingsPath = options.settingsPath ?? resolve39(homedir5(), ".claude", "settings.json");
+  const settingsPath = options.settingsPath ?? resolve39(homedir6(), ".claude", "settings.json");
   const installRoot = options.installRoot ?? syntaurRoot();
   const sourceScript = options.sourceScript ?? getPackageStatuslineSource();
   const destScript = resolve39(installRoot, "statusline.sh");
@@ -20267,7 +20409,7 @@ async function chmodExec(path) {
   }
 }
 async function uninstallStatuslineCommand(options = {}) {
-  const settingsPath = options.settingsPath ?? resolve39(homedir5(), ".claude", "settings.json");
+  const settingsPath = options.settingsPath ?? resolve39(homedir6(), ".claude", "settings.json");
   const installRoot = options.installRoot ?? syntaurRoot();
   const destScript = resolve39(installRoot, "statusline.sh");
   const confPath = resolve39(installRoot, "statusline.conf");
@@ -20926,12 +21068,12 @@ init_config2();
 init_assignment_resolver();
 init_api();
 init_launch();
+init_cwd();
 init_agent_sessions();
-import { isAbsolute as isAbsolute6 } from "path";
 
 // src/launch/argv.ts
 init_launch();
-import { isAbsolute as isAbsolute5 } from "path";
+import { isAbsolute as isAbsolute6 } from "path";
 var buildFreshArgv = buildAgentArgv;
 function buildSessionArgv(agent, sessionId, mode, env = process.env) {
   const invocation = agent[mode];
@@ -20950,7 +21092,7 @@ function buildSessionArgv(agent, sessionId, mode, env = process.env) {
     const requested = env.SHELL;
     let shell = requested;
     let warning = null;
-    if (!shell || !isAbsolute5(shell)) {
+    if (!shell || !isAbsolute6(shell)) {
       warning = `syntaur: $SHELL ${requested ? `("${requested}") is not absolute` : "is unset"} \u2014 falling back to /bin/sh for shell-alias resolution`;
       shell = "/bin/sh";
     }
@@ -21015,13 +21157,17 @@ async function resolveAssignmentPlan(input4, terminal) {
       `Assignment ${input4.id} resolver returned a directory but detail could not be loaded`
     );
   }
-  const { cwd, fallbackWarning } = pickCwd({
+  const picked = resolveWorkspaceCwd({
     worktreePath: detail.workspace.worktreePath,
     repository: detail.workspace.repository,
     branch: detail.workspace.branch,
-    assignmentSlug: resolved.assignmentSlug,
-    fallbackPath: process.cwd()
+    assignmentSlug: resolved.assignmentSlug
   });
+  if (picked.cwd === null) {
+    throw new LaunchError("workspace-path-invalid", picked.invalidReason);
+  }
+  const cwd = picked.cwd;
+  const fallbackWarning = picked.fallbackWarning;
   const agent = pickAgent(input4.config);
   const { argv, shellFallbackWarning } = buildFreshArgv(
     agent,
@@ -21058,15 +21204,23 @@ async function resolveSessionPlan(input4, terminal) {
       session.assignmentSlug
     );
     if (detail) {
-      const picked = pickCwd({
+      const picked = resolveWorkspaceCwd({
         worktreePath: detail.workspace.worktreePath,
         repository: detail.workspace.repository,
         branch: detail.workspace.branch,
-        assignmentSlug: session.assignmentSlug,
-        fallbackPath: session.path
+        assignmentSlug: session.assignmentSlug
       });
-      cwd = picked.cwd;
-      fallbackWarning = picked.fallbackWarning;
+      if (picked.cwd !== null) {
+        cwd = picked.cwd;
+        fallbackWarning = picked.fallbackWarning;
+      } else {
+        fallbackWarning = formatFallbackCwdWarning({
+          assignmentSlug: session.assignmentSlug,
+          workspaceDir: session.path,
+          worktreePath: detail.workspace.worktreePath,
+          branch: detail.workspace.branch
+        });
+      }
     }
   }
   const agent = getAgents(input4.config).find((a) => a.id === session.agent);
@@ -21091,19 +21245,6 @@ async function resolveSessionPlan(input4, terminal) {
     shellFallbackWarning
   };
 }
-function pickCwd(input4) {
-  if (input4.worktreePath && isAbsolute6(input4.worktreePath)) {
-    return { cwd: input4.worktreePath, fallbackWarning: null };
-  }
-  const workspaceDir = input4.repository && isAbsolute6(input4.repository) ? input4.repository : input4.fallbackPath;
-  const fallbackWarning = formatFallbackCwdWarning({
-    assignmentSlug: input4.assignmentSlug,
-    workspaceDir,
-    worktreePath: input4.worktreePath,
-    branch: input4.branch
-  });
-  return { cwd: workspaceDir, fallbackWarning };
-}
 
 // src/launch/execute.ts
 init_launch();
@@ -21286,7 +21427,7 @@ function appleScriptString(value) {
 init_paths();
 init_fs();
 import { fileURLToPath as fileURLToPath5 } from "url";
-import { dirname as dirname13, resolve as resolve44, join as join4 } from "path";
+import { dirname as dirname13, resolve as resolve44, join as join5 } from "path";
 import { realpathSync, readFileSync, mkdirSync } from "fs";
 var NPX_PATTERNS = [
   { kind: "npm", re: /\/_npx\/([^/]+)\/node_modules(?:\/|$)/ },
@@ -21330,7 +21471,7 @@ function detectInstallKind(scriptUrl, opts = {}) {
   }
   let dir = dirname13(resolved);
   for (let depth = 0; depth < 8; depth++) {
-    const pkgJsonPath = join4(dir, "package.json");
+    const pkgJsonPath = join5(dir, "package.json");
     let raw;
     try {
       raw = readFile53(pkgJsonPath);
@@ -21371,7 +21512,7 @@ function sanitizeHash(hash) {
   return hash.replace(/[^A-Za-z0-9_-]/g, "_") || "_";
 }
 function nudgeStampPath(hash) {
-  return join4(nudgeStampDir(), sanitizeHash(hash));
+  return join5(nudgeStampDir(), sanitizeHash(hash));
 }
 async function hasNudgedHash(hash) {
   return fileExists(nudgeStampPath(hash));
@@ -21456,6 +21597,9 @@ function formatUrlCommandError(err2) {
     return `Invalid syntaur:// URL (${err2.code}): ${err2.message}`;
   }
   if (err2 instanceof LaunchError) {
+    if (err2.code === "workspace-path-invalid") {
+      return `Open in agent failed \u2014 ${err2.message}. Set a valid workspace.worktreePath or workspace.repository for this assignment.`;
+    }
     return `Could not launch (${err2.code}): ${err2.message}`;
   }
   if (err2 instanceof TerminalNotFoundError) {
@@ -23213,7 +23357,7 @@ import { isAbsolute as isAbsolute10, resolve as resolve62 } from "path";
 // src/utils/doctor/index.ts
 import { fileURLToPath as fileURLToPath8 } from "url";
 import { readFile as readFile37 } from "fs/promises";
-import { dirname as dirname17, join as join8 } from "path";
+import { dirname as dirname17, join as join9 } from "path";
 
 // src/utils/doctor/context.ts
 init_config2();
@@ -23261,7 +23405,7 @@ init_paths();
 import { resolve as resolve52, isAbsolute as isAbsolute8 } from "path";
 import { readFile as readFile31, stat as stat3 } from "fs/promises";
 import { fileURLToPath as fileURLToPath7 } from "url";
-import { dirname as dirname15, join as join6 } from "path";
+import { dirname as dirname15, join as join7 } from "path";
 var CATEGORY = "env";
 var syntaurRootExists = {
   id: "env.syntaur-root-exists",
@@ -23594,7 +23738,7 @@ async function readLocalPkg() {
     const here = fileURLToPath7(import.meta.url);
     let dir = dirname15(here);
     for (let i = 0; i < 6; i++) {
-      const candidate = join6(dir, "package.json");
+      const candidate = join7(dir, "package.json");
       try {
         const text = await readFile31(candidate, "utf-8");
         return JSON.parse(text);
@@ -24598,7 +24742,7 @@ function skipped(check, reason) {
 init_fs();
 import { resolve as resolve57, dirname as dirname16, basename as basename5 } from "path";
 import { readdir as readdir21, readFile as readFile33 } from "fs/promises";
-import { homedir as homedir7 } from "os";
+import { homedir as homedir8 } from "os";
 var CATEGORY6 = "integrations";
 var claudePluginLinked = {
   id: "integrations.claude-plugin-linked",
@@ -24679,7 +24823,7 @@ var backupConfigured = {
   }
 };
 async function readKnownMarketplaces() {
-  const path = resolve57(homedir7(), ".claude", "plugins", "known_marketplaces.json");
+  const path = resolve57(homedir8(), ".claude", "plugins", "known_marketplaces.json");
   if (!await fileExists(path)) return {};
   try {
     const raw = await readFile33(path, "utf-8");
@@ -24767,7 +24911,7 @@ var claudeMarketplaceRegistered = {
       title: this.title,
       status: "error",
       detail: issues.join("; "),
-      affected: [marketplaceManifest, resolve57(homedir7(), ".claude", "plugins", "known_marketplaces.json")],
+      affected: [marketplaceManifest, resolve57(homedir8(), ".claude", "plugins", "known_marketplaces.json")],
       remediation: {
         kind: "manual",
         suggestion: "Re-run install-plugin to ensure both files are in sync.",
@@ -25196,7 +25340,7 @@ var terminalInstalled = {
         autoFixable: false
       };
     }
-    const detail = bundleId ? `${terminal} (bundle id ${bundleId}) not found via Spotlight` : `${cliName} not found on PATH`;
+    const detail = bundleId ? `${terminal} (bundle id ${bundleId}) not found via Spotlight or in /Applications` : `${cliName} not found on PATH`;
     const suggestion = bundleId ? `Install ${terminal} or change \`terminal:\` in ~/.syntaur/config.md to a different choice` : `Install ${cliName} or change \`terminal:\` in ~/.syntaur/config.md to a different choice`;
     return {
       id: this.id,
@@ -25265,13 +25409,13 @@ var terminalChecks = [
 
 // src/utils/doctor/checks/skills.ts
 init_fs();
-import { resolve as resolve60, join as join7 } from "path";
+import { resolve as resolve60, join as join8 } from "path";
 import { readdir as readdir22, readFile as readFile36, lstat as lstat4 } from "fs/promises";
-import { homedir as homedir8 } from "os";
+import { homedir as homedir9 } from "os";
 var CATEGORY10 = "skills";
 var skillTargets = [
-  { agent: "claude", dir: resolve60(homedir8(), ".claude", "skills"), label: "~/.claude/skills" },
-  { agent: "codex", dir: resolve60(homedir8(), ".codex", "skills"), label: "~/.codex/skills" }
+  { agent: "claude", dir: resolve60(homedir9(), ".claude", "skills"), label: "~/.claude/skills" },
+  { agent: "codex", dir: resolve60(homedir9(), ".codex", "skills"), label: "~/.codex/skills" }
 ];
 var skillsDedupCheck = {
   id: "skills.dedup",
@@ -25293,14 +25437,14 @@ var skillsDedupCheck = {
       for (const entry of entries) {
         if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
         if (!KNOWN_SKILLS.includes(entry.name)) continue;
-        const skillMd = join7(dir, entry.name, "SKILL.md");
+        const skillMd = join8(dir, entry.name, "SKILL.md");
         if (!await fileExists(skillMd)) continue;
         const content = await readFile36(skillMd, "utf-8").catch(() => "");
         const match = content.match(/^name:\s*(\S+)\s*$/m);
         if (!match || match[1] !== entry.name) continue;
         let isSymlink2 = false;
         try {
-          isSymlink2 = (await lstat4(join7(dir, entry.name))).isSymbolicLink();
+          isSymlink2 = (await lstat4(join8(dir, entry.name))).isSymbolicLink();
         } catch {
         }
         present.push({ name: entry.name, isSymlink: isSymlink2 });
@@ -25312,7 +25456,7 @@ var skillsDedupCheck = {
           findings.push(
             `${label}: ${nonSymlink.length} syntaur skill(s) installed globally while the syntaur plugin is enabled (${agent}) \u2014 duplicate registrations`
           );
-          for (const p of nonSymlink) affected.push(join7(dir, p.name));
+          for (const p of nonSymlink) affected.push(join8(dir, p.name));
         }
       }
     }
@@ -25667,7 +25811,7 @@ async function readVersion() {
     let dir = dirname17(here);
     for (let i = 0; i < 6; i++) {
       try {
-        const raw = await readFile37(join8(dir, "package.json"), "utf-8");
+        const raw = await readFile37(join9(dir, "package.json"), "utf-8");
         const parsed = JSON.parse(raw);
         return typeof parsed.version === "string" ? parsed.version : null;
       } catch {
@@ -26184,7 +26328,7 @@ ${entry}`;
 // src/commands/capture.ts
 import { resolve as resolve67, relative as relative4, dirname as dirname18 } from "path";
 import { copyFile as copyFile3, mkdir as mkdir9, realpath as realpath2, rm as rm12, stat as stat8, writeFile as writeFile13 } from "fs/promises";
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 
 // src/utils/assignment-target.ts
 init_paths();
@@ -26381,7 +26525,7 @@ init_fs();
 import { spawn as spawn5 } from "child_process";
 import { mkdtemp as mkdtemp2, rm as rm8, stat as stat6 } from "fs/promises";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 function argsFor(mode, pngPath) {
   switch (mode) {
     case "interactive":
@@ -26414,8 +26558,8 @@ async function captureScreenshot(mode) {
       "screencapture is only available on macOS. Use --file <path> to attach an existing image."
     );
   }
-  const tmpDir = await mkdtemp2(join9(tmpdir3(), "syntaur-screenshot-"));
-  const pngPath = join9(tmpDir, "shot.png");
+  const tmpDir = await mkdtemp2(join10(tmpdir3(), "syntaur-screenshot-"));
+  const pngPath = join10(tmpDir, "shot.png");
   const cleanup = async () => {
     await rm8(tmpDir, { recursive: true, force: true }).catch(() => {
     });
@@ -26455,7 +26599,7 @@ async function captureScreenshot(mode) {
 import { spawn as spawn6 } from "child_process";
 import { mkdtemp as mkdtemp3, readFile as readFile41, rm as rm9 } from "fs/promises";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 var SAFE_RE = /^[A-Za-z0-9_@%+=:,./-]+$/;
 function shellQuote2(s) {
   if (s.length === 0) return `''`;
@@ -26492,8 +26636,8 @@ function runAsciinema(args, stdio) {
   });
 }
 async function captureAsciinema(opts) {
-  const tmpDir = await mkdtemp3(join10(tmpdir4(), "syntaur-asciinema-"));
-  const castPath = join10(tmpDir, "session.cast");
+  const tmpDir = await mkdtemp3(join11(tmpdir4(), "syntaur-asciinema-"));
+  const castPath = join11(tmpDir, "session.cast");
   const cleanup = async () => {
     await rm9(tmpDir, { recursive: true, force: true }).catch(() => {
     });
@@ -26546,7 +26690,7 @@ init_paths();
 import { spawn as spawn7 } from "child_process";
 import { mkdir as mkdir8, mkdtemp as mkdtemp4, open as open3, readFile as readFile42, rm as rm10, stat as stat7, unlink as unlink9, writeFile as writeFile12 } from "fs/promises";
 import { tmpdir as tmpdir5 } from "os";
-import { join as join11, resolve as resolve65 } from "path";
+import { join as join12, resolve as resolve65 } from "path";
 import { setTimeout as sleep } from "timers/promises";
 function sigintPollIntervalMs() {
   const raw = process.env.SYNTAUR_RECORDING_POLL_INTERVAL_MS;
@@ -26671,8 +26815,8 @@ async function startRecording(input4) {
   let acquiredPid = null;
   try {
     logHandle = await open3(log, "w");
-    tmpDir = await mkdtemp4(join11(tmpdir5(), "syntaur-recording-"));
-    const mp4Path = join11(tmpDir, "recording.mp4");
+    tmpDir = await mkdtemp4(join12(tmpdir5(), "syntaur-recording-"));
+    const mp4Path = join12(tmpDir, "recording.mp4");
     let child;
     try {
       child = spawn7("ffmpeg", ffmpegArgs(input4.device, input4.fps, mp4Path), {
@@ -26922,7 +27066,7 @@ function listArtifactsByAssignment(assignmentId) {
 import { spawn as spawn8 } from "child_process";
 import { mkdtemp as mkdtemp5, readFile as readFile43, rm as rm11 } from "fs/promises";
 import { tmpdir as tmpdir6 } from "os";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 var SCRIBE_URL = "https://api.elevenlabs.io/v1/speech-to-text";
 var NO_AUDIO_MARKERS = [
   "Stream map '0:a:0' matches no streams",
@@ -27012,8 +27156,8 @@ var elevenLabsScribe = {
         "ELEVENLABS_API_KEY is not set. Export it (e.g. `export ELEVENLABS_API_KEY=\u2026`) and re-run. A config-file slot will land later."
       );
     }
-    const tmp = await mkdtemp5(join12(tmpdir6(), "syntaur-transcribe-"));
-    const wav = join12(tmp, "audio.wav");
+    const tmp = await mkdtemp5(join13(tmpdir6(), "syntaur-transcribe-"));
+    const wav = join13(tmp, "audio.wav");
     try {
       await extractAudio(videoAbsPath, wav);
       return await callScribe(wav, apiKey, opts);
@@ -27395,7 +27539,7 @@ async function captureCommand(target, options = {}) {
     }
     if (options.transcribe && kind === "video" && absPath && id) {
       const sidecarPath2 = resolve67(destDir, `${id}.transcript.md`);
-      if (existsSync3(sidecarPath2)) {
+      if (existsSync5(sidecarPath2)) {
         console.warn(
           `transcript: ${sidecarPath2} already exists, skipping (delete to re-transcribe)`
         );
@@ -28534,8 +28678,8 @@ function isoToCcusageDate(iso) {
 // src/usage/cwd-extractor.ts
 init_paths();
 import { open as open4, readdir as readdir24, stat as stat10 } from "fs/promises";
-import { join as join13 } from "path";
-import { homedir as homedir9 } from "os";
+import { join as join14 } from "path";
+import { homedir as homedir10 } from "os";
 var SCAN_LINE_CAP = 50;
 var TAIL_READ_BYTES = 8 * 1024;
 var TAIL_READ_BYTES_MAX = 64 * 1024;
@@ -28609,12 +28753,12 @@ async function* walkClaudeProjects(opts = {}) {
   const dirs = await listDirSafe(root);
   for (const dirent of dirs) {
     if (!dirent.isDirectory) continue;
-    const dirPath = join13(root, dirent.name);
+    const dirPath = join14(root, dirent.name);
     const files = await listDirSafe(dirPath);
     let cachedCwd = null;
     for (const f of files) {
       if (!f.isFile || !f.name.endsWith(".jsonl")) continue;
-      const filePath = join13(dirPath, f.name);
+      const filePath = join14(dirPath, f.name);
       if (opts.sinceMtimeMs !== void 0) {
         const mtime = await mtimeMs(filePath);
         if (mtime !== null && mtime < opts.sinceMtimeMs) continue;
@@ -28651,8 +28795,8 @@ function resolveCodexSessionsRoot(override) {
   const fromSessionsEnv = process.env.CODEX_SESSIONS_DIR;
   if (fromSessionsEnv && fromSessionsEnv.length > 0) return expandHome(fromSessionsEnv);
   const fromHomeEnv = process.env.CODEX_HOME;
-  if (fromHomeEnv && fromHomeEnv.length > 0) return join13(expandHome(fromHomeEnv), "sessions");
-  return join13(homedir9(), ".codex", "sessions");
+  if (fromHomeEnv && fromHomeEnv.length > 0) return join14(expandHome(fromHomeEnv), "sessions");
+  return join14(homedir10(), ".codex", "sessions");
 }
 async function listDirSafe(path) {
   try {
@@ -28672,7 +28816,7 @@ async function* walkJsonlRecursive(root) {
     const current = stack.pop();
     const entries = await listDirSafe(current);
     for (const e of entries) {
-      const full = join13(current, e.name);
+      const full = join14(current, e.name);
       if (e.isDirectory) {
         stack.push(full);
       } else if (e.isFile && e.name.endsWith(".jsonl")) {
@@ -29890,19 +30034,19 @@ init_paths();
 init_fs();
 import { fileURLToPath as fileURLToPath10 } from "url";
 import { readFile as readFile52 } from "fs/promises";
-import { dirname as dirname21, join as join15, resolve as resolve77 } from "path";
+import { dirname as dirname21, join as join16, resolve as resolve77 } from "path";
 import { spawn as spawn10 } from "child_process";
 import { createInterface as createInterface2 } from "readline/promises";
 
 // src/utils/version.ts
 import { fileURLToPath as fileURLToPath9 } from "url";
 import { readFile as readFile51 } from "fs/promises";
-import { dirname as dirname20, join as join14 } from "path";
+import { dirname as dirname20, join as join15 } from "path";
 async function readPackageVersion(scriptUrl) {
   try {
     const scriptPath = fileURLToPath9(scriptUrl);
     const pkgRoot = dirname20(dirname20(scriptPath));
-    const raw = await readFile51(join14(pkgRoot, "package.json"), "utf-8");
+    const raw = await readFile51(join15(pkgRoot, "package.json"), "utf-8");
     const parsed = JSON.parse(raw);
     return typeof parsed.version === "string" ? parsed.version : null;
   } catch {
@@ -29946,7 +30090,7 @@ async function resolveNpmBin() {
   const nodeDir = dirname21(process.execPath);
   const isWin = process.platform === "win32";
   const npmName = isWin ? "npm.cmd" : "npm";
-  const nearNode = join15(nodeDir, npmName);
+  const nearNode = join16(nodeDir, npmName);
   if (await fileExists(nearNode)) {
     return { cmd: nearNode, shell: false };
   }
@@ -29989,7 +30133,7 @@ async function readGlobalVersion() {
   });
   if (!rootPath) return null;
   try {
-    const manifestPath = join15(rootPath, "syntaur", "package.json");
+    const manifestPath = join16(rootPath, "syntaur", "package.json");
     if (!await fileExists(manifestPath)) return null;
     const raw = await readFile52(manifestPath, "utf-8");
     const parsed = JSON.parse(raw);