delimit-cli 4.1.19 → 4.1.20

package/bin/delimit-cli.js

@@ -874,11 +874,20 @@ program
             } catch (e) {}
         }
 
-        // 7. Shims
+        // 7. Shims + wrapped binaries
         const shimsDir = path.join(HOME, '.delimit', 'shims');
         if (fs.existsSync(shimsDir)) {
             changes.push({ target: '~/.delimit/shims/', action: 'Remove CLI shims directory' });
         }
+        for (const tool of ['claude', 'codex', 'gemini']) {
+            const searchPaths = [`/usr/local/bin/${tool}-real`, `/usr/bin/${tool}-real`, path.join(HOME, '.local', 'bin', `${tool}-real`)];
+            for (const p of searchPaths) {
+                if (fs.existsSync(p)) {
+                    changes.push({ target: p.replace(HOME, '~'), action: `Restore original ${tool} binary` });
+                    break;
+                }
+            }
+        }
 
         // 8. Cross-model governance hooks (LED-202)
         const claudeSettingsPath = path.join(HOME, '.claude', 'settings.json');
@@ -992,6 +1001,29 @@ program
             } catch (e) {}
         }
 
+        // Restore wrapped binaries before removing shims
+        for (const tool of ['claude', 'codex', 'gemini']) {
+            const searchPaths = [
+                `/usr/local/bin/${tool}`,
+                `/usr/bin/${tool}`,
+                path.join(HOME, '.local', 'bin', tool),
+            ];
+            try {
+                const npmBin = execSync('npm bin -g 2>/dev/null', { encoding: 'utf-8', timeout: 3000 }).trim();
+                if (npmBin) searchPaths.push(path.join(npmBin, tool));
+            } catch {}
+            for (const p of searchPaths) {
+                const realPath = p + '-real';
+                try {
+                    if (fs.existsSync(realPath)) {
+                        fs.renameSync(realPath, p);
+                        console.log(chalk.green(`✓ Restored original ${tool} binary`));
+                        break;
+                    }
+                } catch {}
+            }
+        }
+
         // Remove shims
         if (fs.existsSync(shimsDir)) {
             try {

package/bin/delimit-setup.js

@@ -743,12 +743,16 @@ printf "  \${MAGENTA}\${BOLD}[Delimit]\${RESET} \${MAGENTA}═══════
 sleep 0.08
 printf "  \${GREEN}\${BOLD}[Delimit]\${RESET} \${GREEN}✓ Allowed\${RESET}\\n"
 echo ""
-# Find real binary — check common paths then fallback to PATH search (excluding shim dir)
+# Find real binary — check renamed binary first, then common paths
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+# 1. Check for renamed binary (tool-real) next to this shim
+[ -x "$SCRIPT_DIR/${toolName}-real" ] && exec "$SCRIPT_DIR/${toolName}-real" "$@"
+# 2. Check common paths (skip self)
 SELF="$(readlink -f "$0" 2>/dev/null || echo "$0")"
-for c in /usr/bin/${toolName} /usr/local/bin/${toolName} "$HOME/.local/bin/${toolName}" "$(npm bin -g 2>/dev/null)/${toolName}"; do
+for c in /usr/local/bin/${toolName}-real /usr/bin/${toolName}-real "$HOME/.local/bin/${toolName}-real" /usr/bin/${toolName} /usr/local/bin/${toolName} "$HOME/.local/bin/${toolName}" "$(npm bin -g 2>/dev/null)/${toolName}"; do
     [ -x "$c" ] && [ "$(readlink -f "$c" 2>/dev/null)" != "$SELF" ] && exec "$c" "$@"
 done
-# Last resort: search PATH excluding shim directory
+# 3. Last resort: search PATH excluding shim directory
 REAL=$(PATH=$(echo "$PATH" | tr ':' '\\n' | grep -v '.delimit/shims' | tr '\\n' ':') command -v ${toolName} 2>/dev/null)
 [ -x "$REAL" ] && exec "$REAL" "$@"
 echo "[Delimit] ${toolName} not found in PATH" >&2
@@ -767,6 +771,60 @@ exit 127
                 fs.chmodSync(shimPath, '755');
             }
 
+            // Rename+wrap: place shim at the real binary's location
+            // so it works immediately without PATH changes
+            for (const tool of ['claude', 'codex', 'gemini']) {
+                try {
+                    // Find real binary location
+                    let realPath = null;
+                    const searchPaths = [
+                        `/usr/local/bin/${tool}`,
+                        `/usr/bin/${tool}`,
+                        path.join(os.homedir(), '.local', 'bin', tool),
+                    ];
+                    // Also check npm global bin
+                    try {
+                        const npmBin = execSync('npm bin -g 2>/dev/null', { encoding: 'utf-8', timeout: 3000 }).trim();
+                        if (npmBin) searchPaths.push(path.join(npmBin, tool));
+                    } catch {}
+
+                    for (const p of searchPaths) {
+                        try {
+                            if (fs.existsSync(p) && fs.statSync(p).isFile()) {
+                                // Check it's the real binary, not already our shim
+                                const content = fs.readFileSync(p, 'utf-8').substring(0, 200);
+                                if (!content.includes('Delimit Governance Shim')) {
+                                    realPath = p;
+                                    break;
+                                }
+                            }
+                        } catch {}
+                    }
+
+                    if (realPath) {
+                        const dir = path.dirname(realPath);
+                        const realDest = path.join(dir, `${tool}-real`);
+                        // Only rename if not already renamed
+                        if (!fs.existsSync(realDest)) {
+                            fs.renameSync(realPath, realDest);
+                        }
+                        // Place our shim at the original location
+                        const shimContent = fs.readFileSync(path.join(shimsDir, tool), 'utf-8');
+                        // Update shim to also check for tool-real in same directory
+                        const patchedShim = shimContent.replace(
+                            `echo "[Delimit] ${tool} not found in PATH"`,
+                            `# Check for renamed binary next to shim\n` +
+                            `SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"\n` +
+                            `[ -x "$SCRIPT_DIR/${tool}-real" ] && exec "$SCRIPT_DIR/${tool}-real" "$@"\n` +
+                            `echo "[Delimit] ${tool} not found in PATH"`
+                        );
+                        fs.writeFileSync(realPath, patchedShim);
+                        fs.chmodSync(realPath, '755');
+                        log(`  ${green('✓')} ${tool}: wrapped at ${dim(realPath)}`);
+                    }
+                } catch {}
+            }
+
             // Add to PATH in shell rc files (create if missing)
             const pathLine = `export PATH="${shimsDir}:$PATH"  # Delimit governance wrapping`;
             let pathWritten = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "delimit-cli",
   "mcpName": "io.github.delimit-ai/delimit-mcp-server",
-  "version": "4.1.19",
+  "version": "4.1.20",
   "description": "Unify Claude Code, Codex, Cursor, and Gemini CLI with persistent context, governance, and multi-model debate.",
   "main": "index.js",
   "files": [