create-walle 0.10.2 → 0.10.3

package/template/coding-task-manager/lib/macos-capabilities.js

@@ -157,22 +157,39 @@ function probePathReadDenied(p, {
 }
 
 // ---- FDA guidance (paths + deep link shown to the user) -----------------------------
-
-const BUNDLE_ROOT = process.env.WALLE_BUNDLE_DIR || path.join(os.homedir(), '.walle', 'bundles');
-
-function ctmBundleAppPath() {
-  return path.join(BUNDLE_ROOT, 'Coding Task Manager.app');
+//
+// macOS keys an FDA grant to the RESPONSIBLE process (the exec launchd started), so the hint
+// must name the binary/app that ACTUALLY runs — never a fixed bundle path. `targets` comes from
+// shared/macos-fda-target.js `fdaTargetForExec(process.execPath)` (CTM) plus the Wall-E exec the
+// supervisor resolves. See docs/signin-flow-restart-settle-and-fda-target-identity-2026-10-26.html
+// §5 D-6 (hint wording, the "other node rows" caveat) and D-7 (open/reveal commands).
+
+// PURE: build the user-facing hint from the already-resolved targets.
+function fdaGuidance({ targets = [] } = {}) {
+  const named = (Array.isArray(targets) ? targets : []).map((t) => t && t.path).filter(Boolean);
+  const bundlePath = named.length ? named[0] : '';
+  let hint = named.length
+    ? `Open System Settings → Privacy & Security → Full Disk Access, click +, press ⌘⇧G, paste ${named.join(' and ')}, and turn it on.`
+    : 'Open System Settings → Privacy & Security → Full Disk Access, click +, press ⌘⇧G, and turn it on.';
+  // Homebrew's `node` is ad-hoc signed with a versioned Cellar path, so its row can look granted
+  // while the running binary never matches. Name that trap only when the target really is `node`.
+  const namesNode = (Array.isArray(targets) ? targets : [])
+    .some((t) => t && t.kind === 'binary' && t.displayName === 'node');
+  if (namesNode) {
+    hint += ' Settings lists it as “node”; other “node” rows (for example Homebrew’s) do not count.';
+  }
+  return { targets, bundlePath, settingsUrl: FDA_SETTINGS_URL, hint };
 }
 
-function fdaGuidance({ bundlePath = ctmBundleAppPath() } = {}) {
-  return {
-    bundlePath,
-    settingsUrl: FDA_SETTINGS_URL,
-    hint:
-      'Open System Settings → Privacy & Security → Full Disk Access, click +, press ⌘⇧G, ' +
-      `paste ${bundlePath}, add "Coding Task Manager", and turn it on. Then restart CTM once — ` +
-      'macOS will stop asking for network-volume / file access on every restart.',
-  };
+// PURE: the argv list for `open`, one entry per command: the settings pane first, then `open -R`
+// for every target that EXISTS. A path we could not confirm is never revealed (D-7 / anti-goal A-5).
+function fdaOpenCommands(guidance = {}) {
+  const targets = Array.isArray(guidance.targets) ? guidance.targets : [];
+  const commands = [[guidance.settingsUrl || FDA_SETTINGS_URL]];
+  for (const target of targets) {
+    if (target && target.exists === true && target.path) commands.push(['-R', target.path]);
+  }
+  return commands;
 }
 
 module.exports = {
@@ -185,6 +202,6 @@ module.exports = {
   probePathReadDenied,
   fullDiskAccessGranted,
   fdaGuidance,
-  ctmBundleAppPath,
+  fdaOpenCommands,
   _fdaProbePaths,
 };