impel-cli 0.16.0 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impel-cli",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Configure Claude Code and Codex CLI to talk to Impel's gateway, authenticated by an Impel Personal Access Token",
   "type": "module",
   "bin": {

package/src/apps.js

@@ -10,6 +10,7 @@ import {
   secureManagedCodexHome,
 } from "./codexSecurity.js";
 import { normalizeTenantId } from "./tenants.js";
+import { impelCliInvocation } from "./selfInvocation.js";
 import { crossAppModelsEnabled, redactSecretText } from "./config.js";
 import { ADHOC_IDENTITY, codesignIdentityArgs, desiredSigningMode, resolveSigningIdentity } from "./codesign.js";
 
@@ -925,9 +926,16 @@ function writeChatGPTConfig(paths, config, models, vendorCodexModels, invocation
   };
   writeAtomic(paths.chatgpt.catalog, JSON.stringify(catalog, null, 2) + "\n", 0o600);
   const auth = invocations?.auth || { command: paths.tokenHelper, args: null };
+  // Finder/Dock-launched apps inherit a minimal PATH without npm/nvm bin
+  // directories, so a PATH-relative "impel" never spawns there. Bake the
+  // absolute node + CLI invocation; the launch-time `app refresh` rewrites
+  // this config whenever those paths change.
+  const mcpInvocation = impelCliInvocation(
+    config.tenantId ? ["mcp", "--tenant", config.tenantId] : ["mcp"]
+  );
   const mcp = invocations?.mcp || {
-    command: "impel",
-    args: config.tenantId ? ["mcp", "--tenant", config.tenantId] : ["mcp"],
+    command: mcpInvocation.command,
+    args: [...mcpInvocation.args],
   };
 
   const managedToml = [
@@ -1153,20 +1161,63 @@ function readTopLevelTomlString(toml, key) {
   }
 }
 
+/**
+ * Rewrite one tenant's app token helper with the current node/CLI paths.
+ * Cheap and Impel-owned, so install recovery can use it to heal helpers whose
+ * baked interpreter or checkout paths went stale.
+ */
+export function rewriteTenantTokenHelper(tenantId, homeDir = os.homedir()) {
+  const paths = appPaths(homeDir, tenantId);
+  if (!fs.existsSync(path.dirname(paths.tokenHelper))) return false;
+  writeTokenHelper(paths.tokenHelper, tenantId);
+  return true;
+}
+
 function writeTokenHelper(target, tenantId) {
   const cliPath = fileURLToPath(new URL("../bin/impel.js", import.meta.url));
   const node = shellQuote(process.execPath);
   const cli = shellQuote(cliPath);
   const tenantArgs = tenantId ? ` --tenant ${shellQuote(tenantId)}` : "";
-  const refreshTenantArgs = tenantId ? ` --tenant ${shellQuote(tenantId)}` : "";
   // The apps invoke this helper whenever they need auth, which makes it the
   // one hook that fires on Finder/Dock launches too. Piggyback a detached,
   // TTL-gated config/catalog/skills refresh (`app refresh --stale-only`) so
   // the managed apps keep themselves current without touching stdout — the
   // caller consumes stdout as the token.
+  //
+  // The baked interpreter/CLI paths are only first choices: an nvm upgrade or
+  // a moved checkout deletes them, and a helper that hardcodes them strands
+  // every managed app with no auth (observed as "provider auth command exited
+  // with status 1" outages). Resolve again at call time before giving up, and
+  // prefer the global npm install next to whichever node is found so the
+  // refresh keeps rewriting this helper with current paths.
   const script = `#!/bin/sh
-(${node} ${cli} app refresh --stale-only${refreshTenantArgs} </dev/null >/dev/null 2>&1 &)
-exec ${node} ${cli} token${tenantArgs}
+# Managed by impel-cli; regenerated by \`impel app refresh\`.
+NODE=${node}
+CLI=${cli}
+if ! [ -x "$NODE" ]; then
+  NODE="$(command -v node 2>/dev/null || true)"
+fi
+if ! [ -x "$NODE" ]; then
+  for candidate in /opt/homebrew/bin/node /usr/local/bin/node "$HOME"/.nvm/versions/node/*/bin/node; do
+    if [ -x "$candidate" ]; then NODE="$candidate"; fi
+  done
+fi
+if ! [ -x "$NODE" ]; then
+  echo 'impel token helper: no usable node runtime found; re-run \`impel setup\`' >&2
+  exit 1
+fi
+if ! [ -f "$CLI" ]; then
+  CLI="$(dirname "$NODE")/../lib/node_modules/impel-cli/bin/impel.js"
+fi
+if ! [ -f "$CLI" ]; then
+  CLI="$(command -v impel 2>/dev/null || true)"
+fi
+if [ -z "$CLI" ] || ! [ -f "$CLI" ]; then
+  echo 'impel token helper: impel-cli not found; re-run \`impel setup\`' >&2
+  exit 1
+fi
+("$NODE" "$CLI" app refresh --stale-only${tenantArgs} </dev/null >/dev/null 2>&1 &)
+exec "$NODE" "$CLI" token${tenantArgs}
 `;
   writeAtomic(target, script, 0o700);
 }

package/src/commands/setup.js

@@ -17,6 +17,7 @@ import {
 import { promptSecret, promptText } from "../prompt.js";
 import { ensureImpelClaudeProfile, ensureImpelCodexProfile } from "../cliProfiles.js";
 import { fetchTenants, normalizeTenantId, tenantCredential } from "../tenants.js";
+import { rewriteTenantTokenHelper } from "../apps.js";
 import { cmdApps } from "./apps.js";
 import { prepareWindowsClis, windowsCliInstallCommands } from "../windowsSetup.js";
 import { runInstallRecovery } from "../installRecovery/engine.js";
@@ -490,6 +491,9 @@ export async function cmdSetup(argv, overrides = {}) {
                 crossAppModels: crossAppModelsEnabled(config),
               });
               ensureImpelCodexProfile(gatewayUrl, tenant.id);
+              // Also refresh the app token helper: a stale baked node/CLI
+              // path there breaks every managed app's auth.
+              rewriteTenantTokenHelper(tenant.id);
               return true;
             },
             installVendorApp,

package/src/installRecovery/checkpoint.js

@@ -36,8 +36,11 @@ export function saveInstallRecoveryCheckpoint(
 ) {
   fs.mkdirSync(path.dirname(filePath), { recursive: true, mode: 0o700 });
   const temporary = `${filePath}.tmp-${process.pid}`;
+  fs.rmSync(temporary, { force: true });
+  // "wx" refuses to follow a pre-planted symlink at the predictable temp path.
   fs.writeFileSync(temporary, `${JSON.stringify(checkpoint, null, 2)}\n`, {
     mode: 0o600,
+    flag: "wx",
   });
   fs.renameSync(temporary, filePath);
   try {

package/src/installRecovery/engine.js

@@ -28,6 +28,7 @@ import {
 import { createRecoveryInference, resolveRecoverySeat } from "./inference.js";
 import {
   installRecoveryFingerprint,
+  redactInstallRecoveryText,
   sanitizeInstallFailureEnvelope,
 } from "./redact.js";
 import {
@@ -93,8 +94,10 @@ async function runGoals(goals) {
 }
 
 function describeToolCall(name, input) {
+  // Model-supplied values render in approval prompts and logs; strip control
+  // sequences so a confused model cannot rewrite what the user is approving.
   const parameters = Object.entries(input || {})
-    .map(([key, value]) => `${key}=${value}`)
+    .map(([key, value]) => `${key}=${redactSecretText(String(value)).slice(0, 160)}`)
     .join(", ");
   return parameters ? `${name} (${parameters})` : name;
 }
@@ -141,7 +144,9 @@ async function executeCall(session, name, input, reason = null) {
 
 function buildFirstUserMessage(session, failure, deterministicSummary, goalReport) {
   const goalLines = goalReport.results.map(
-    (goal) => `- ${goal.ok ? "pass" : "FAIL"} ${goal.id}: ${goal.description}${goal.detail ? ` — ${goal.detail}` : ""}`
+    (goal) => `- ${goal.ok ? "pass" : "FAIL"} ${goal.id}: ${goal.description}${
+      goal.detail ? ` — ${redactInstallRecoveryText(goal.detail).slice(0, 300)}` : ""
+    }`
   );
   const lines = [
     "An `impel` installation step failed on this machine. Diagnose and repair it.",
@@ -359,7 +364,9 @@ export async function runInstallRecovery(options, overrides = {}) {
                 tool_use_id: call.id,
                 content: `Rejected: goal health checks still fail locally:\n${goalReport.results
                   .filter((goal) => !goal.ok)
-                  .map((goal) => `- ${goal.id}: ${goal.description}${goal.detail ? ` — ${goal.detail}` : ""}`)
+                  .map((goal) => `- ${goal.id}: ${goal.description}${
+                    goal.detail ? ` — ${redactInstallRecoveryText(goal.detail).slice(0, 300)}` : ""
+                  }`)
                   .join("\n")}\nKeep repairing or report blocked.`,
                 is_error: true,
               });

package/src/installRecovery/redact.js

@@ -5,9 +5,15 @@ import { redactSecretText } from "../config.js";
 
 const JWT_RE = /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\b/gu;
 const BEARER_RE = /\bBearer\s+[A-Za-z0-9._~+\/-]{8,}/giu;
-const SECRET_ASSIGNMENT_RE = /\b(api[_-]?key|authorization|password|secret|token)\s*[:=]\s*([^\s,;]+)/giu;
+// Quote-aware and prefix-tolerant: catches `token=x`, `"token": "x"`,
+// `ANTHROPIC_API_KEY=x`, and `Authorization: x` shapes alike.
+const SECRET_ASSIGNMENT_RE = /([A-Za-z0-9_.-]*(?:api[_-]?key|authorization|passwords?|secrets?|tokens?|credentials?)["']?\s*[:=]\s*["']?)([^\s"',;]+)/giu;
+// Common vendor credential formats that appear bare in logs with no key= prefix.
+const VENDOR_TOKEN_RE = /\b(?:sk-[A-Za-z0-9-]{2,20}-[A-Za-z0-9_-]{8,}|sk-[A-Za-z0-9_-]{16,}|ghp_[A-Za-z0-9]{8,}|gho_[A-Za-z0-9]{8,}|ghu_[A-Za-z0-9]{8,}|ghs_[A-Za-z0-9]{8,}|github_pat_[A-Za-z0-9_]{8,}|glpat-[A-Za-z0-9_-]{8,}|xox[abposr]-[A-Za-z0-9-]{8,}|AKIA[0-9A-Z]{16}|AIza[0-9A-Za-z_-]{20,})\b/gu;
 const EMAIL_RE = /\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/giu;
-const WINDOWS_USER_PATH_RE = /\b[A-Za-z]:\\Users\\[^\\\s]+/giu;
+// Any per-user directory is PII, not just the current user's home.
+const WINDOWS_USER_PATH_RE = /\b[A-Za-z]:[\\/](?:Users|Profiles)[\\/][^\\/\s"']+/giu;
+const POSIX_USER_PATH_RE = /(?:^|[\s"'=:(])((?:\/Users|\/home)\/)([^\/\s"']+)/gu;
 
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
@@ -20,9 +26,14 @@ export function redactInstallRecoveryText(value, { homeDir = os.homedir() } = {}
   }
   return text
     .replace(WINDOWS_USER_PATH_RE, "%USERPROFILE%")
+    .replace(POSIX_USER_PATH_RE, (_match, prefix, name, offset, whole) => {
+      const lead = whole[offset] === "/" ? "" : whole[offset];
+      return `${lead}${prefix}[USER]`.replace("//", "/");
+    })
     .replace(JWT_RE, "[REDACTED TOKEN]")
     .replace(BEARER_RE, "Bearer [REDACTED]")
-    .replace(SECRET_ASSIGNMENT_RE, (_match, name) => `${name}=[REDACTED]`)
+    .replace(SECRET_ASSIGNMENT_RE, (_match, name) => `${name}[REDACTED]`)
+    .replace(VENDOR_TOKEN_RE, "[REDACTED TOKEN]")
     .replace(EMAIL_RE, "[REDACTED EMAIL]")
     .slice(0, 12_000);
 }

package/src/installRecovery/tools.js

@@ -70,6 +70,12 @@ export const INSTALL_RECOVERY_TOOLS = Object.freeze({
       "Run a synthetic authenticated probe against the Impel gateway. Reports reachable/rejected status; never sends user content.",
     schema: {},
   },
+  check_auth_helper: {
+    risk: "read",
+    description:
+      "Run the tenant's Impel-owned app token helper with a bounded timeout and classify the result (works, missing, stale interpreter/CLI path, or failing). Use when managed apps report auth/credential failures.",
+    schema: {},
+  },
   check_health: {
     risk: "read",
     description:
@@ -297,6 +303,52 @@ function readProfile(input, context) {
   });
 }
 
+function checkAuthHelper(context, io) {
+  if (!context.tenantId) {
+    return result("failed", "No tenant is selected; the app token helper has not been created yet.");
+  }
+  if (context.platform === "win32") {
+    return result("failed", "Windows managed apps do not use a shell token helper; check the CLI profiles instead.");
+  }
+  const helperPath = path.join(
+    CONFIG_DIR,
+    "apps",
+    "tenants",
+    context.tenantId,
+    "bin",
+    "token"
+  );
+  if (!fs.existsSync(helperPath)) {
+    return result("failed", "The tenant app token helper is missing; repair_impel_profile regenerates it.");
+  }
+  const run = io.spawnSync(helperPath, [], {
+    encoding: "utf8",
+    env: context.environment,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: 20_000,
+    windowsHide: true,
+  });
+  if (run?.error) {
+    return result("failed", `The app token helper could not be executed (${run.error.code || run.error.message}).`);
+  }
+  if (run.status === 0 && /impel_/u.test(String(run.stdout || ""))) {
+    return result("succeeded", "The app token helper runs and emits a credential.");
+  }
+  const stderr = String(run.stderr || "");
+  const classified = /Cannot find module|MODULE_NOT_FOUND/iu.test(stderr)
+    ? "its embedded impel-cli path no longer exists"
+    : /No such file or directory|not found|no usable node/iu.test(stderr)
+      ? "its embedded node runtime path no longer exists"
+      : /SyntaxError/iu.test(stderr)
+        ? "it points at an incompatible impel-cli checkout"
+        : "it exited without emitting a credential";
+  return result(
+    "failed",
+    `The app token helper is broken: ${classified}. repair_impel_profile rewrites it with current paths.`,
+    { exitCode: run.status, output: stderr.slice(0, 2_000) }
+  );
+}
+
 async function probeGateway(context) {
   if (typeof context.probeGateway !== "function") {
     return result("failed", "Gateway verification is unavailable in this recovery context.");
@@ -517,6 +569,7 @@ export async function executeInstallRecoveryTool(name, rawInput, context = {}, d
     case "inspect_processes": return inspectProcesses(resolvedContext, io);
     case "check_binary": return checkBinary(input, resolvedContext, io);
     case "read_profile": return readProfile(input, resolvedContext);
+    case "check_auth_helper": return checkAuthHelper(resolvedContext, io);
     case "probe_gateway": return probeGateway(resolvedContext);
     case "check_health": return checkHealth(resolvedContext);
     case "repair_impel_profile": return repairImpelProfile(resolvedContext);
@@ -577,5 +630,19 @@ export function deterministicInstallRecoveryPlan(failure, platform = process.pla
       reason: "Transient npm/network failures often succeed on a clean retry.",
     });
   }
+  if (/provider auth command|cannot find module|module_not_found|token helper/u.test(text)) {
+    plan.push(
+      {
+        tool: "check_auth_helper",
+        input: {},
+        reason: "The failure mentions the app auth helper; classify how it is broken.",
+      },
+      {
+        tool: "repair_impel_profile",
+        input: {},
+        reason: "Regenerating Impel-owned profiles rewrites the token helper with current paths.",
+      }
+    );
+  }
   return plan;
 }